r18n-core 0.4.10 → 0.4.11

data/locales/zh.rb

@@ -2,16 +2,17 @@
 module R18n
   class Locales::Zh < R18n::Locale
     set :title => '中文',
-        
+
         :wday_names => %w{星期日 星期一 星期二 星期三 星期四 星期五 星期六},
         :wday_abbrs => %w{周日 周一 周二 周三 周四 周五 周六},
-        
-        :month_names => %w{一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月},
-        
+
+        :month_names => %w{一月 二月 三月 四月 五月 六月 七月 八月 九月 十月
+                           十一月 十二月},
+
         :date_format => '%Y年%m月%d日',
         :full_format => '%m月%d日',
         :year_format => '%Y年_',
-        
+
         :number_decimal => ".",
         :number_group   => " "
   end

data/r18n-core.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE', 'ChangeLog']
   s.require_path = 'lib'
-  s.has_rdoc = true
 
   s.author = 'Andrey "A.I." Sitnik'
   s.email = 'andrey@sitnik.ru'

data/spec/filters_spec.rb

@@ -8,108 +8,108 @@ describe R18n::Filters do
     @i18n = R18n::I18n.new('en', DIR)
     @i18n.reload!
   end
-  
+
   after do
     R18n::Filters.defined.values.each do |filter|
       next if @system.include? filter
       R18n::Filters.delete(filter)
     end
-    
+
     @enabled.each { |i| R18n::Filters.on(i) unless i.enabled? }
     (@system - @enabled).each { |i| R18n::Filters.off(i) if i.enabled? }
   end
-  
+
   it "should add new filter" do
     filter = R18n::Filters.add('my', :my_filter) { |i, config| i }
-    
+
     filter.should be_a(R18n::Filters::Filter)
     filter.name.should == :my_filter
     filter.types.should == ['my']
     filter.should be_enabled
-    
+
     R18n::Filters.defined.should have_key(:my_filter)
-    
+
     @i18n.reload!
     @i18n.my_filter.should == 'value'
     @i18n.my_tree_filter.should == {'name' => 'value'}
   end
-  
+
   it "should add filter for several types" do
     filter = R18n::Filters.add(['my', 'your']) { |i, config| i + '1' }
     @i18n.reload!
     @i18n.my_filter.should   == 'value1'
     @i18n.your_filter.should == 'another1'
   end
-  
+
   it "should use passive filters" do
     filter = mock()
     filter.should_receive(:process).twice.and_return(1)
-    
+
     R18n::Filters.add('my', :passive, :passive => true) { filter.process }
-    
+
     @i18n.my_filter.should.should == 'value'
     @i18n.reload!
-    
+
     @i18n.my_tree_filter.should == 1
     @i18n.my_filter.should == 1
     @i18n.my_filter.should == 1
   end
-  
+
   it "should use cascade filters" do
     filter = R18n::Filters.add('my', :one) { |i, config| i + '1' }
     filter = R18n::Filters.add('my', :two) { |i, config| i + '2' }
     filter = R18n::Filters.add('my', :three, :position => 0) { |i, c| i + '3' }
     @i18n.my_filter.should == 'value312'
   end
-  
+
   it "should return name for nameless filter" do
     R18n::Filters.instance_variable_set(:@last_auto_name, 0)
-    
+
     R18n::Filters.add('some').name.should == 1
     R18n::Filters.add('some', :position => 0).name.should == 2
-    
+
     R18n::Filters.add('some', 3)
     R18n::Filters.add('some').name.should == 4
   end
-  
+
   it "should delete filter by name" do
     R18n::Filters.add('my', :my_filter) { '1' }
     @i18n.my_filter.should == '1'
-    
+
     R18n::Filters.delete(:my_filter)
     R18n::Filters.defined.should_not have_key(:my_filter)
     @i18n.my_filter.should == 'value'
   end
-  
+
   it "should delete filter by object" do
     filter = R18n::Filters.add('my') { '1' }
     @i18n.my_filter.should == '1'
-    
+
     R18n::Filters.delete(filter)
     R18n::Filters.defined.should_not have_key(filter.name)
     @i18n.my_filter.should == 'value'
   end
-  
+
   it "should use global filters" do
     R18n::Filters.add(String) { |result, config, a, b| result + a + b }
     R18n::Filters.add(String) { |result, config| result + '!' }
-    
+
     @i18n.one('1', '2').should == 'One12!'
   end
-  
+
   it "should turn off filter" do
     filter = R18n::Filters.add('my', :one) { |i, config| i + '1' }
     filter = R18n::Filters.add('my', :two) { |i, config| i + '2' }
-    
+
     R18n::Filters.off(:one)
     R18n::Filters.defined[:one].should_not be_enabled
     @i18n.my_filter.should == 'value2'
-    
+
     R18n::Filters.on(:one)
     R18n::Filters.defined[:one].should be_enabled
     @i18n.my_filter.should == 'value12'
   end
-  
+
   it "should send config to filter" do
     R18n::Filters.add('my') do |i, config|
       config[:secret_value] = 1
@@ -120,18 +120,18 @@ describe R18n::Filters do
     @i18n.my_filter[:secret_value].should == 1
     @i18n.my_filter[:unknown_value].should be_nil
   end
-  
+
   it "should use one config for cascade filters" do
     R18n::Filters.add('my') { |content, config| config[:new_secret] ? 2 : 1 }
     @i18n.my_filter.should == 1
-    
+
     R18n::Filters.add('my', :second, :position => 0) do |content, config|
       config[:new_secret] = true
       content
     end
     @i18n.my_filter.should == 2
   end
-  
+
   it "should send parameters to filter" do
     R18n::Filters.add('my') { |i, config, a, b| "#{i}#{a}#{b}" }
     @i18n['my_filter', 1, 2].should == 'value12'
@@ -146,17 +146,17 @@ describe R18n::Filters do
     @i18n.comments(0, 'article').should == 'no comments for article'
     @i18n.comments(1, 'article').should == 'one comment for article'
     @i18n.comments(5, 'article').should == '5 comments for article'
-    
+
     @i18n.files(0).should == '0 files'
     @i18n.files(-5.5).should == '−5.5 files'
     @i18n.files(5000).should == '5,000 files'
   end
-  
+
   it "shouldn't pluralize without first numeric parameter" do
     @i18n.files.should     == { 1 => '1 file', 'n' => '%1 files' }
     @i18n.files('').should == { 1 => '1 file', 'n' => '%1 files' }
   end
-  
+
   it "should convert first float parameter to number" do
     @i18n.files(1.2).should == '1 file'
   end
@@ -170,75 +170,75 @@ describe R18n::Filters do
   it "should can use params in translation" do
     @i18n.params(-1, 2).should == 'Is −1 between −1 and 2?'
   end
-  
+
   it "should format untranslated" do
     @i18n.in.not.to_s.should == 'in.[not]'
-    
+
     R18n::Filters.off(:untranslated)
     @i18n.in.not.to_s.should == 'in.not'
-    
+
     R18n::Filters.add(R18n::Untranslated) do |v, c, trans, untrans, path|
       "#{path} #{trans}[#{untrans}]"
     end
     @i18n.in.not.to_s.should == 'in.not in.[not]'
   end
-  
+
   it "should format translation path" do
     @i18n.in.another.to_s.should == 'in.another[]'
-    
+
     R18n::Filters.off(:untranslated)
     @i18n.in.another.to_s.should == 'in.another'
-    
+
     R18n::Filters.add(R18n::Untranslated) do |v, c, trans, untrans, path|
       "#{path} #{trans}[#{untrans}]"
     end
     @i18n.in.another.to_s.should == 'in.another in.another[]'
   end
-  
+
   it "should format untranslated for web" do
     R18n::Filters.off(:untranslated)
     R18n::Filters.on(:untranslated_html)
     @i18n.in.not.to_s.should == 'in.<span style="color: red">not</span>'
     @i18n['<b>'].to_s.should == '<span style="color: red">&lt;b&gt;</span>'
   end
-  
+
   it "should have filter for escape HTML" do
     @i18n.html.should == '&lt;script&gt;true &amp;&amp; false&lt;/script&gt;'
   end
-  
+
   it "should have disabled global filter for escape HTML" do
     @i18n.greater('true').should == '1 < 2 is true'
-    
+
     R18n::Filters.on(:global_escape_html)
     @i18n.reload!
     @i18n.greater('true').should == '1 &lt; 2 is true'
     @i18n.html.should == '&lt;script&gt;true &amp;&amp; false&lt;/script&gt;'
   end
-  
+
   it "should have filter to disable global HTML escape" do
     @i18n.no_escape.should == '<b>Warning</b>'
-    
+
     R18n::Filters.on(:global_escape_html)
     @i18n.reload!
     @i18n.no_escape.should == '<b>Warning</b>'
   end
-  
+
   it "should have Markdown filter" do
     @i18n.markdown.simple.should == '<p><strong>Hi!</strong></p>'
   end
-  
+
   it "should have Textile filter" do
     @i18n.textile.simple.should == '<p><em>Hi!</em></p>'
   end
-  
+
   it "should HTML escape before Markdown and Textile filters" do
     @i18n.markdown.html.should == '<p><strong>Hi!</strong> <br /></p>'
     @i18n.textile.html.should  == '<p><em>Hi!</em><br /></p>'
-    
+
     R18n::Filters.on(:global_escape_html)
     @i18n.reload!
     @i18n.markdown.html.should == '<p><strong>Hi!</strong> &#60;br /&#62;</p>'
     @i18n.textile.html.should  == '<p><em>Hi!</em>&lt;br /&gt;</p>'
   end
-  
+
 end

data/spec/i18n_spec.rb

@@ -5,7 +5,7 @@ describe R18n::I18n do
   before do
     @extension_places = R18n.extension_places.clone
   end
-  
+
   after do
     R18n::I18n.default = 'en'
     R18n.default_loader = R18n::Loader::YAML
@@ -27,7 +27,7 @@ describe R18n::I18n do
   it "should load locales" do
     i18n = R18n::I18n.new('en', DIR)
     i18n.locales.should == [R18n::Locale.load('en')]
-  
+
     i18n = R18n::I18n.new(['ru', 'no-LC'], DIR)
     i18n.locales.should == [R18n::Locale.load('ru'),
                             R18n::UnsupportedLocale.new('no-LC'),
@@ -39,7 +39,7 @@ describe R18n::I18n do
     i18n = R18n::I18n.new('en', DIR)
     i18n.translation_places.should == [R18n::Loader::YAML.new(DIR)]
   end
-  
+
   it "should load translations by loader" do
     loader = Class.new do
       def available; [R18n::Locale.load('en')]; end
@@ -47,7 +47,7 @@ describe R18n::I18n do
     end
     R18n::I18n.new('en', loader.new).custom.should == 'Custom'
   end
-  
+
   it "should pass parameters to default loader" do
     loader = Class.new do
       def initialize(param); @param = param; end
@@ -65,7 +65,7 @@ describe R18n::I18n do
     i18n['one'].should == 'Один'
     i18n.only.english.should == 'Only in English'
   end
-  
+
   it "should load translations from several dirs" do
     i18n = R18n::I18n.new(['no-LC', 'en'], [TWO, DIR])
     i18n.in.two.should == 'Two'
@@ -74,7 +74,7 @@ describe R18n::I18n do
 
   it "should use extension places" do
     R18n.extension_places << EXT
-    
+
     i18n = R18n::I18n.new('en', DIR)
     i18n.ext.should == 'Extension'
     i18n.one.should == 'One'
@@ -82,15 +82,15 @@ describe R18n::I18n do
 
   it "shouldn't use extension without app translations with same locale" do
     R18n.extension_places << EXT
-    
+
     i18n = R18n::I18n.new(['no-TR', 'en'], DIR)
     i18n.ext.should == 'Extension'
   end
-  
+
   it "should ignore case on loading" do
     i18n = R18n::I18n.new('no-lc', [DIR])
     i18n.one.should == 'ONE'
-    
+
     i18n = R18n::I18n.new('no-LC', [DIR])
     i18n.one.should == 'ONE'
   end
@@ -103,7 +103,7 @@ describe R18n::I18n do
 
   it "should load sublocales for first locale" do
     R18n::I18n.default = 'no-TR'
-    
+
     i18n = R18n::I18n.new('ru', DIR)
     i18n.one.should == 'Один'
     i18n.two.should == 'Two'
@@ -118,74 +118,74 @@ describe R18n::I18n do
                                       R18n::Locale.load('ru'),
                                       R18n::Locale.load('en')]
   end
-  
+
   it "should cache translations" do
     counter = CounterLoader.new('en')
-    
+
     R18n::I18n.new('en', counter)
     counter.loaded.should == 1
-    
+
     R18n::I18n.new('en', counter)
     counter.loaded.should == 1
-    
+
     R18n.cache.clear
     R18n::I18n.new('en', counter)
     counter.loaded.should == 2
   end
-  
+
   it "should cache translations by used locales" do
     counter = CounterLoader.new('en', 'ru')
-    
+
     R18n::I18n.new('en', counter)
     counter.loaded.should == 1
-    
+
     R18n::I18n.new(['en', 'fr'], counter)
     counter.loaded.should == 1
-    
+
     R18n::I18n.new(['en', 'ru'], counter)
     counter.loaded.should == 3
-    
+
     R18n::I18n.new(['ru', 'en'], counter)
     counter.loaded.should == 5
   end
-  
+
   it "should cache translations by places" do
     counter = CounterLoader.new('en', 'ru')
-    
+
     R18n::I18n.new('en', counter)
     counter.loaded.should == 1
-    
+
     R18n::I18n.new('en', [counter, DIR])
     counter.loaded.should == 2
-    
+
     R18n.extension_places << EXT
     R18n::I18n.new('en', counter)
     counter.loaded.should == 3
-    
+
     same = CounterLoader.new('en', 'ru')
     R18n::I18n.new('en', same)
     same.loaded.should == 0
-    
+
     different = CounterLoader.new('en', 'fr')
     R18n::I18n.new('en', different)
     different.loaded.should == 1
   end
-  
+
   it "should reload translations" do
     loader = Class.new do
       @@answer = 1
       def available; [R18n::Locale.load('en')]; end
       def load(locale); { 'one' => @@answer }; end
     end
-    
+
     i18n = R18n::I18n.new('en', loader.new)
     i18n.one.should == 1
-    
+
     loader.class_eval { @@answer = 2 }
     i18n.reload!
     i18n.one.should == 2
   end
-  
+
   it "should return translations" do
     i18n = R18n::I18n.new('en', DIR)
     i18n.t.should be_a(R18n::Translation)
@@ -200,16 +200,16 @@ describe R18n::I18n do
 
   it "should localize objects" do
     i18n = R18n::I18n.new('ru')
-    
+
     i18n.l(-123456789).should == '−123 456 789'
     i18n.l(-12345.67).should == '−12 345,67'
-    
+
     time = Time.at(0).utc
     i18n.l(time, '%A').should == 'Четверг'
     i18n.l(time, :month).should == 'Январь'
     i18n.l(time, :standard).should == '01.01.1970 00:00'
     i18n.l(time, :full).should == ' 1 января 1970 00:00'
-    
+
     i18n.l(Date.new(0)).should == '01.01.0000'
   end