remove trailing white-spaces and code clean up init i18n test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5707 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-05-08 07:12:34 +00:00
parent ab768cecdd
commit e68206852e
1 changed files with 22 additions and 23 deletions

View File

@ -1,16 +1,16 @@
# Redmine - project management software # Redmine - project management software
# Copyright (C) 2006-2009 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@ -20,25 +20,25 @@ require File.expand_path('../../../../test_helper', __FILE__)
class Redmine::I18nTest < ActiveSupport::TestCase class Redmine::I18nTest < ActiveSupport::TestCase
include Redmine::I18n include Redmine::I18n
include ActionView::Helpers::NumberHelper include ActionView::Helpers::NumberHelper
def setup def setup
@hook_module = Redmine::Hook @hook_module = Redmine::Hook
end end
def test_date_format_default def test_date_format_default
set_language_if_valid 'en' set_language_if_valid 'en'
today = Date.today today = Date.today
Setting.date_format = '' Setting.date_format = ''
assert_equal I18n.l(today), format_date(today) assert_equal I18n.l(today), format_date(today)
end end
def test_date_format def test_date_format
set_language_if_valid 'en' set_language_if_valid 'en'
today = Date.today today = Date.today
Setting.date_format = '%d %m %Y' Setting.date_format = '%d %m %Y'
assert_equal today.strftime('%d %m %Y'), format_date(today) assert_equal today.strftime('%d %m %Y'), format_date(today)
end end
def test_date_and_time_for_each_language def test_date_and_time_for_each_language
Setting.date_format = '' Setting.date_format = ''
valid_languages.each do |lang| valid_languages.each do |lang|
@ -47,17 +47,19 @@ class Redmine::I18nTest < ActiveSupport::TestCase
format_date(Date.today) format_date(Date.today)
format_time(Time.now) format_time(Time.now)
format_time(Time.now, false) format_time(Time.now, false)
assert_not_equal 'default', ::I18n.l(Date.today, :format => :default), "date.formats.default missing in #{lang}" assert_not_equal 'default', ::I18n.l(Date.today, :format => :default),
assert_not_equal 'time', ::I18n.l(Time.now, :format => :time), "time.formats.time missing in #{lang}" "date.formats.default missing in #{lang}"
assert_not_equal 'time', ::I18n.l(Time.now, :format => :time),
"time.formats.time missing in #{lang}"
end end
assert l('date.day_names').is_a?(Array) assert l('date.day_names').is_a?(Array)
assert_equal 7, l('date.day_names').size assert_equal 7, l('date.day_names').size
assert l('date.month_names').is_a?(Array) assert l('date.month_names').is_a?(Array)
assert_equal 13, l('date.month_names').size assert_equal 13, l('date.month_names').size
end end
end end
def test_time_format def test_time_format
set_language_if_valid 'en' set_language_if_valid 'en'
now = Time.parse('2011-02-20 15:45:22') now = Time.parse('2011-02-20 15:45:22')
@ -66,14 +68,13 @@ class Redmine::I18nTest < ActiveSupport::TestCase
assert_equal '02/20/2011 15:45', format_time(now) assert_equal '02/20/2011 15:45', format_time(now)
assert_equal '15:45', format_time(now, false) assert_equal '15:45', format_time(now, false)
end end
with_settings :date_format => '%Y-%m-%d' do with_settings :date_format => '%Y-%m-%d' do
assert_equal '2011-02-20 15:45', format_time(now) assert_equal '2011-02-20 15:45', format_time(now)
assert_equal '15:45', format_time(now, false) assert_equal '15:45', format_time(now, false)
end end
end end
end end
def test_time_format_default def test_time_format_default
set_language_if_valid 'en' set_language_if_valid 'en'
now = Time.parse('2011-02-20 15:45:22') now = Time.parse('2011-02-20 15:45:22')
@ -82,14 +83,13 @@ class Redmine::I18nTest < ActiveSupport::TestCase
assert_equal '02/20/2011 03:45 pm', format_time(now) assert_equal '02/20/2011 03:45 pm', format_time(now)
assert_equal '03:45 pm', format_time(now, false) assert_equal '03:45 pm', format_time(now, false)
end end
with_settings :date_format => '%Y-%m-%d' do with_settings :date_format => '%Y-%m-%d' do
assert_equal '2011-02-20 03:45 pm', format_time(now) assert_equal '2011-02-20 03:45 pm', format_time(now)
assert_equal '03:45 pm', format_time(now, false) assert_equal '03:45 pm', format_time(now, false)
end end
end end
end end
def test_time_format def test_time_format
set_language_if_valid 'en' set_language_if_valid 'en'
now = Time.now now = Time.now
@ -98,7 +98,7 @@ class Redmine::I18nTest < ActiveSupport::TestCase
assert_equal now.strftime('%d %m %Y %H %M'), format_time(now) assert_equal now.strftime('%d %m %Y %H %M'), format_time(now)
assert_equal now.strftime('%H %M'), format_time(now, false) assert_equal now.strftime('%H %M'), format_time(now, false)
end end
def test_utc_time_format def test_utc_time_format
set_language_if_valid 'en' set_language_if_valid 'en'
now = Time.now now = Time.now
@ -107,7 +107,7 @@ class Redmine::I18nTest < ActiveSupport::TestCase
assert_equal now.strftime('%d %m %Y %H %M'), format_time(now.utc) assert_equal now.strftime('%d %m %Y %H %M'), format_time(now.utc)
assert_equal now.strftime('%H %M'), format_time(now.utc, false) assert_equal now.strftime('%H %M'), format_time(now.utc, false)
end end
def test_number_to_human_size_for_each_language def test_number_to_human_size_for_each_language
valid_languages.each do |lang| valid_languages.each do |lang|
set_language_if_valid lang set_language_if_valid lang
@ -116,12 +116,12 @@ class Redmine::I18nTest < ActiveSupport::TestCase
end end
end end
end end
def test_valid_languages def test_valid_languages
assert valid_languages.is_a?(Array) assert valid_languages.is_a?(Array)
assert valid_languages.first.is_a?(Symbol) assert valid_languages.first.is_a?(Symbol)
end end
def test_valid_language def test_valid_language
to_test = {'fr' => :fr, to_test = {'fr' => :fr,
'Fr' => :fr, 'Fr' => :fr,
@ -129,17 +129,16 @@ class Redmine::I18nTest < ActiveSupport::TestCase
'zh-tw' => :"zh-TW", 'zh-tw' => :"zh-TW",
'zh-TW' => :"zh-TW", 'zh-TW' => :"zh-TW",
'zh-ZZ' => nil } 'zh-ZZ' => nil }
to_test.each {|lang, expected| assert_equal expected, find_language(lang)} to_test.each {|lang, expected| assert_equal expected, find_language(lang)}
end end
def test_fallback def test_fallback
::I18n.backend.store_translations(:en, {:untranslated => "Untranslated string"}) ::I18n.backend.store_translations(:en, {:untranslated => "Untranslated string"})
::I18n.locale = 'en' ::I18n.locale = 'en'
assert_equal "Untranslated string", l(:untranslated) assert_equal "Untranslated string", l(:untranslated)
::I18n.locale = 'fr' ::I18n.locale = 'fr'
assert_equal "Untranslated string", l(:untranslated) assert_equal "Untranslated string", l(:untranslated)
::I18n.backend.store_translations(:fr, {:untranslated => "Pas de traduction"}) ::I18n.backend.store_translations(:fr, {:untranslated => "Pas de traduction"})
::I18n.locale = 'en' ::I18n.locale = 'en'
assert_equal "Untranslated string", l(:untranslated) assert_equal "Untranslated string", l(:untranslated)