r18n-core 0.3.2 → 0.4

data/locales/it.rb

@@ -1,14 +1,26 @@
 # encoding: utf-8
 module R18n
-  module Locales
-    class It < R18n::Locale
-      def format_date_full(i18n, date, year = true)
-        full = super(i18n, date, year)
-        if ' 1' == full[0..1]
-          "1º" + full[2..-1]
-        else
-          full
-        end
+  class Locales::It < Locale
+    set :title => 'Italiano',
+        
+        :wday_names => %w{domenica lunedì martedì mercoledì giovedì venerdì
+                          sabato},
+        :wday_abbrs => %w{dom lun mar mer gio ven sab},
+        
+        :month_names => %w{gennaio febbraio marzo aprile maggio giugno luglio},
+        :month_abbrs => %w{gen feb mar apr mag giu lug ago set ott nov dic},
+        
+        :date_format => '%d/%m/%Y',
+        
+        :number_decimal => ",",
+        :number_group   => " "
+    
+    def format_date_full(date, year = true, *params)
+      full = super(date, year)
+      if ' 1' == full[0..1]
+        "1º" + full[2..-1]
+      else
+        full
       end
     end
   end

data/locales/kk.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+module R18n
+  class Locales::Kk < Locale
+    set :title => 'Қазақша',
+        :sublocales => %w{ru en},
+        
+        :wday_names => %w{Жексенбі Дүйсенбі Сейсенбі Сәрсенбі Бейсенбі Жұма
+                          Сенбі},
+        :wday_abbrs => %w{Жк Дс Сс Ср Бс Жм Сн},
+        
+        :month_names => %w{қаңтар ақпан наурыз сәуір мамыр маусым шілде тамыз
+                           қырқүйек қазан қараша желтоқсан},
+        :month_abbrs => %w{қаң ақп нау сәу мам мау шіл там қыр қаз қар жел},
+        :month_standalone => %w{Қаңтар Ақпан Наурыз Сәуір Мамыр Маусым Шілде
+                                Тамыз Қыркүйек Қазан Қараша Желтоқсан},
+        
+        :time_am => ' ертеңің',
+        :time_pm => ' кештің',
+        :date_format => '%Y-%m-%d',
+        :full_format => '%B %e-і',
+        :year_format => '%Y жылы _',
+        
+        :number_decimal => ",",
+        :number_group   => " "
+  end
+end

data/locales/pl.rb

@@ -1,22 +1,34 @@
+# encoding: utf-8
 module R18n
-  module Locales
-    class Pl < R18n::Locale
-      def pluralize(n)
-        return 0 if n == 0
-        # 0 - 0
-        # 1 - 1
-        # 2..4 - 2
-        # n
-    
-        case n % 10
-        when 1
-          n > 10 ? 'n' : 1
-        when 2..4
-          n % 100 > 10 && n % 100 < 20 ? 'n' : 2
-        else
-          'n'
-        end
+  class Locales::Pl < R18n::Locale
+    set :title => 'Polski',
+        
+        :wday_names => %w{niedziela poniedziałek wtorek środa czwartek piątek
+                          sobota},
+        :wday_abbrs => %w{nd pn wt śr czw pt sob},
+        
+        :month_names => %w{stycznia lutego marca kwietnia maja czerwca lipca
+                           sierpnia września pażdziernika listopada grudnia},
+        :month_abbrs => %w{I II III IV V VI VII VIII IX X XI XII},
+        :month_standalone => %w{styczeń luty marzec kwiecień maj czerwiec lipiec
+                                sierpień wrzesień październik listopad
+                                grudzień},
+        
+        :date_format => '%d/%m/%Y',
+        
+        :number_decimal => ",",
+        :number_group   => " "
+        
+    def pluralize(n)
+      return 0 if n == 0
+      case n % 10
+      when 1
+        n > 10 ? 'n' : 1
+      when 2..4
+        n % 100 > 10 && n % 100 < 20 ? 'n' : 2
+      else
+        'n'
       end
     end
   end
-end
+end

data/locales/pt-br.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+module R18n
+  class Locales::PtBr < R18n::Locale
+    set :title => 'Português brasileiro',
+        :code =>  'pt-BR',
+        
+        :wday_names => %w{domingo segunda-feira terça-feira quarta-feira
+                          quinta-feira sexta-feira sábado},
+        :wday_abbrs => %w{dom seg ter qua qui sex sab},
+        
+        :month_names => %w{janeiro fevereiro março abril maio junho julho agosto
+                           setembro outubro novembro dezembro},
+        :month_abbrs => %w{jan fev mar abr mai jun jul ago set out nov dez},
+        :month_standalone => %w{Janeiro Fevereiro Março Abril Maio Junho Julho
+                                Agosto Setembro Outubro Novembro Dezembro},
+        
+        :date_format => '%d/%m/%Y',
+        :full_format => '%d de %B',
+        :year_format => '_ de %Y',
+        
+        :number_decimal => ",",
+        :number_group   => "."
+  end
+end

data/locales/ru.rb

@@ -1,16 +1,34 @@
+# encoding: utf-8
 module R18n
-  module Locales
-    class Ru < R18n::Locale
-      def pluralize(n)
-        if 0 == n
-          0
-        elsif 1 == n % 10 and 11 != n % 100
-          1
-        elsif 2 <= n % 10 and 4 >= n % 10 and (10 > n % 100 or 20 <= n % 100)
-          2
-        else
-          'n'
-        end
+  class Locales::Ru < Locale
+    set :title => 'Русский',
+        
+        :wday_names => %w{Воскресенье Понедельник Вторник Среда Четверг Пятница
+                          Суббота},
+        :wday_abbrs => %w{Вск Пнд Втр Срд Чтв Птн Сбт},
+        
+        :month_names => %w{января февраля марта апреля мая июня июля августа
+                           сентября октября ноября декабря},
+        :month_abbrs => %w{янв фев мар апр май июн июл авг сен окт ноя дек},
+        :month_standalone => %w{Январь Февраль Март Апрель Май Июнь Июль Август
+                                Сентябрь Октябрь Ноябрь Декабрь},
+        
+        :time_am => ' утра',
+        :time_pm => ' вечера',
+        :date_format => '%d.%m.%Y',
+        
+        :number_decimal => ",",
+        :number_group   => " "
+    
+    def pluralize(n)
+      if 0 == n
+        0
+      elsif 1 == n % 10 and 11 != n % 100
+        1
+      elsif 2 <= n % 10 and 4 >= n % 10 and (10 > n % 100 or 20 <= n % 100)
+        2
+      else
+        'n'
       end
     end
   end

data/locales/zh.rb

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

data/spec/filters_spec.rb

@@ -88,21 +88,21 @@ describe R18n::Filters do
   
   it "should send config to filter" do
     R18n::Filters.add('my') do |i, config|
-      config.secret_value = 1
+      config[:secret_value] = 1
       config
     end
-    @i18n.my_filter.locale.should == @i18n.locale
-    @i18n.my_filter.path.should == 'my_filter'
-    @i18n.my_filter.secret_value.should == 1
-    @i18n.my_filter.unknown_value.should be_nil
+    @i18n.my_filter[:locale].should == @i18n.locale
+    @i18n.my_filter[:path].should == 'my_filter'
+    @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 }
+    R18n::Filters.add('my') { |content, config| config[:new_secret] ? 2 : 1 }
     @i18n.my_filter.should == 1
     
     R18n::Filters.add('my', nil, 0) do |content, config|
-      config.new_secret = true
+      config[:new_secret] = true
       content
     end
     @i18n.my_filter.should == 2
@@ -127,6 +127,11 @@ describe R18n::Filters do
     @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 pluralize translation without locale" do
     i18n = R18n::I18n.new('no-LC', DIR)
@@ -150,6 +155,18 @@ describe R18n::Filters do
     @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 have filter for escape HTML" do
     @i18n.html.should == '<script>true && false</script>'
   end

data/spec/i18n_spec.rb

@@ -2,8 +2,15 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe R18n::I18n do
+  before do
+    @extension_places = R18n.extension_places.clone
+    R18n.cache.clear
+  end
+  
   after do
     R18n::I18n.default = 'en'
+    R18n.default_loader = R18n::Loader::YAML
+    R18n.extension_places = @extension_places
   end
 
   it "should parse HTTP_ACCEPT_LANGUAGE" do
@@ -26,20 +33,68 @@ describe R18n::I18n do
     i18n.locales.should == [R18n::Locale.load('ru'),
                             R18n::UnsupportedLocale.new('no-LC'),
                             R18n::UnsupportedLocale.new('no'),
-                            R18n::UnsupportedLocale.new('en')]
+                            R18n::Locale.load('en')]
   end
 
-  it "should return translations dir" do
+  it "should return translations loaders" do
     i18n = R18n::I18n.new('en', DIR)
-    i18n.translation_dirs.expand_path.to_s.should == DIR.expand_path.to_s
+    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
+      def load(locale); { 'custom' => 'Custom' }; end
+    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
+      def available; [R18n::Locale.load('en')]; end
+      def load(locale); { 'custom' => @param }; end
+    end
+    R18n.default_loader = loader
+    R18n::I18n.new('en', 'default').custom.should == 'default'
   end
 
   it "should load translations" do
     i18n = R18n::I18n.new(['ru', 'en'], DIR)
     i18n.one.should == 'Один'
+    i18n[:one].should == 'Один'
     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'
+    i18n.in.another.level.should == 'Hierarchical'
+  end
+
+  it "should use extension places" do
+    R18n.extension_places << EXT
+    
+    i18n = R18n::I18n.new('en', DIR)
+    i18n.ext.should == 'Extension'
+    i18n.one.should == 'One'
+  end
+
+  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
 
   it "should load default translation" do
     i18n = R18n::I18n.new('no-LC', DIR)
@@ -56,9 +111,86 @@ describe R18n::I18n do
   end
 
   it "should return available translations" do
+    R18n::I18n.available_locales(DIR).should =~ [R18n::Locale.load('no-lc'),
+                                                 R18n::Locale.load('ru'),
+                                                 R18n::Locale.load('en')]
     i18n = R18n::I18n.new('en', DIR)
-    i18n.translations.should == { 'no-lc' => 'no-lc', 'ru' => 'Русский',
-                                  'en' => 'English' }
+    i18n.available_locales.should =~ [R18n::Locale.load('no-lc'),
+                                      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)
+    i18n.t.one.should == 'One'
   end
 
   it "should return first locale with locale file" do
@@ -81,50 +213,5 @@ describe R18n::I18n do
     
     i18n.l(Date.new(0)).should == '01.01.0000'
   end
-  
-  it "should localize date for human" do
-    i18n = R18n::I18n.new('ru')
-    
-    i18n.l(Date.today + 2, :human).should == 'через 2 дня'
-    i18n.l(Date.today + 1, :human).should == 'завтра'
-    i18n.l(Date.today,     :human).should == 'сегодня'
-    i18n.l(Date.today - 1, :human).should == 'вчера'
-    i18n.l(Date.today - 3, :human).should == '3 дня назад'
-    
-    y2000 = Date.parse('2000-01-08')
-    i18n.l(y2000, :human, Date.parse('2000-01-01')).should == ' 8 января'
-    i18n.l(y2000, :human, Date.parse('1999-01-01')).should == ' 8 января 2000'
-  end
-  
-  it "should localize times for human" do
-    i18n = R18n::I18n.new('ru')
-    minute = 60
-    hour   = 60 * minute
-    day    = 24 * hour
-    zero   = Time.at(0).utc
-    
-    i18n.l( zero + 7 * day,     :human, zero).should == ' 8 января 00:00'
-    i18n.l( zero + 50 * hour,   :human, zero).should == 'через 2 дня 02:00'
-    i18n.l( zero + 25 * hour,   :human, zero).should == 'завтра 01:00'
-    i18n.l( zero + 70 * minute, :human, zero).should == 'через 1 час'
-    i18n.l( zero + 38 * minute, :human, zero).should == 'через 38 минут'
-    i18n.l( zero + 5,           :human, zero).should == 'сейчас'
-    i18n.l( zero - 15,          :human, zero).should == 'сейчас'
-    i18n.l( zero - minute,      :human, zero).should == '1 минуту назад'
-    i18n.l( zero - 2 * hour,    :human, zero).should == '2 часа назад'
-    i18n.l( zero - 13 * hour,   :human, zero).should == 'вчера 11:00'
-    i18n.l( zero - 50 * hour,   :human, zero).should == '3 дня назад 22:00'
-    i18n.l( zero - 9 * day,     :human, zero).should == '23 декабря 1969 00:00'
-  end
-  
-  it "should use standard formatter by default" do
-    R18n::I18n.new('ru').l(Time.at(0).utc).should == '01.01.1970 00:00'
-  end
-  
-  it "should raise error on unknown formatter" do
-    lambda {
-      R18n::I18n.new('ru').l(Time.at(0).utc, :unknown)
-    }.should raise_error(ArgumentError, /formatter/)
-  end
 
 end