r18n-core 0.4.14 → 1.0.0

data/locales/fr.rb

@@ -20,7 +20,7 @@ module R18n
     def format_date_full(date, year = true, *params)
       full = super(date, year)
       if ' 1' == full[0..1]
-        '1er' + full[2..-1] 
+        '1er' + full[2..-1]
       else
         full
       end

data/locales/gl.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module R18n
+  class Locales::Gl < Locale
+    set :title => 'Galego',
+        :sublocales => %w{es en},
+
+        :wday_names => %w{domingo luns martes mércores xoves venres sábado},
+        :wday_abbrs => %w{dom lun mar mér xov ven sáb},
+
+        :month_names => %w{xaneiro febreiro marzo abril maio xuño xullo
+                           agosto setembro outubro novembro decembro},
+        :month_abbrs => %w{xan feb mar abr mai xuñ xul ago set out nov dec},
+
+        :date_format => '%d/%m/%Y',
+        :full_format => '%d de %B',
+        :year_format => '_ de %Y',
+
+        :number_decimal => ",",
+        :number_group   => "."
+  end
+end

data/locales/hu.rb

@@ -17,7 +17,7 @@ module R18n
         :time_format => '%H:%M',
 
         :number_decimal => ",",
-        :number_group =>   " "
+        :number_group   => " "
 
     def format_integer(integer)
       str = integer.to_s
@@ -42,6 +42,5 @@ module R18n
     def format_time_full(time, *params)
       format_date_full(time) + ', ' + format_time(time)
     end
-
   end
 end

data/locales/nb-no.rb

@@ -2,8 +2,7 @@
 module R18n
   class Locales::NbNo < Locale
     set :title => 'Norsk', #Bokmål
-        :code =>  'nb-NO',
-        :sublocales => %w{no nn-NO},
+        :sublocales => %w{no nn-NO en},
 
         :week_start => :monday,
         :wday_names => %w{søndag mandag tirsdag onsdag torsdag fredag lørdag},
@@ -11,7 +10,7 @@ module R18n
 
         :month_names => %w{januar februar mars april mai juni juli august
                            september oktober november desember},
-        :month_abbrs => %w{jan feb mar apr mai jun jul aug okt nov des},
+        :month_abbrs => %w{jan feb mar apr mai jun jul aug sep okt nov des},
 
         :date_format => '%d.%m.%Y',
         :full_format => '%e. %B %Y',

data/locales/nl.rb

@@ -3,10 +3,12 @@ module R18n
   class Locales::Nl < Locale
     set :title => 'Nederlands',
 
-        :wday_names => %w{zondag maandag dinsdag woensdag donderdag vrijdag zaterdag},
+        :wday_names => %w{zondag maandag dinsdag woensdag donderdag vrijdag
+                          zaterdag},
         :wday_abbrs => %w{zo ma di wo do vr za},
 
-        :month_names => %w{januari februari maart april mei juni juli augustus september oktober november december},
+        :month_names => %w{januari februari maart april mei juni juli augustus
+                           september oktober november december},
         :month_abbrs => %w{jan feb mrt apr mei jun jul aug sep okt nov dec},
 
         :time_am => '\'s ochtends',

data/locales/pt-br.rb

@@ -4,7 +4,6 @@ require File.join(File.dirname(__FILE__), 'pt')
 module R18n::Locales
   class PtBr < Pt
     set :title => 'Português brasileiro',
-        :code =>  'pt-BR',
         :sublocales => %w{pt en}
   end
 end

data/locales/pt.rb

@@ -2,7 +2,6 @@
 module R18n
   class Locales::Pt < R18n::Locale
     set :title => 'Português',
-        :code =>  'pt',
 
         :wday_names => %w{domingo segunda-feira terça-feira quarta-feira
                           quinta-feira sexta-feira sábado},

data/locales/sv-se.rb

@@ -2,8 +2,7 @@
 module R18n
   class Locales::SvSe < Locale
     set :title => 'Svenska',
-        :code =>  'sv-SE',
-        :sublocales => %w{sv},
+        :sublocales => %w{sv en},
 
         :wday_names => %w{söndag måndag tisdag onsdag torsdag fredag
                           lördag},
@@ -17,6 +16,6 @@ module R18n
         :full_format => '%e %B %Y',
 
         :number_decimal => ",",
-        :number_group =>   "."
+        :number_group   => "."
   end
 end

data/locales/th.rb

@@ -17,7 +17,7 @@ module R18n
       :year_format => '_, %Y',
 
       :number_decimal => ".",
-      :number_group =>   ","
+      :number_group   => ","
 
     def strftime(time, format)
       year = (time.year + 543).to_s

data/locales/tr.rb

@@ -8,7 +8,7 @@ module R18n
                           Cumartesi},
         :wday_abbrs => %w{Paz Pzt Sal Çar Per Cum Cmt},
 
-        :month_names => %w{Ocak Şubat Mart Nisan Mayıs Haziran Temmuz 
+        :month_names => %w{Ocak Şubat Mart Nisan Mayıs Haziran Temmuz
                            Ağustos Eylül Ekim Kasım Aralık},
         :month_abbrs => %w{Oca Şub Mar Nis May Haz Tem Ağu Eyl Eki Kas Ara},
 
@@ -18,8 +18,6 @@ module R18n
         :time_format => '%H:%M',
 
         :number_decimal => ".",
-        :number_group =>   ","
-
-
+        :number_group   => ","
   end
 end

data/locales/zh-cn.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+module R18n
+  class Locales::ZhCn < R18n::Locale
+    set :title => '简体中文',
+        :sublocales => %w{zh en}
+  end
+end

data/locales/zh-tw.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+module R18n
+  class Locales::ZhTw < R18n::Locale
+    set :title => '繁體中文',
+        :sublocales => %w{zh en}
+  end
+end

data/r18n-core.gemspec

@@ -11,18 +11,17 @@ Gem::Specification.new do |s|
     It has nice Ruby-style syntax, filters, flexible locales, custom loaders,
     translation support for any classes, time and number localization, several
     user language support, agnostic core package with out-of-box support for
-    Rails, Sinatra, Merb and desktop applications.
+    Rails, Sinatra and desktop applications.
   EOF
 
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.extra_rdoc_files = ['README.rdoc', 'LICENSE', 'ChangeLog']
-  s.require_path = 'lib'
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.extra_rdoc_files = ['README.md', 'LICENSE', 'ChangeLog']
+  s.require_path     = 'lib'
 
-  s.author = 'Andrey "A.I." Sitnik'
-  s.email = 'andrey@sitnik.ru'
-  s.homepage = 'http://r18n.rubyforge.org/'
-  s.rubyforge_project = 'r18n-core'
+  s.author   = 'Andrey "A.I." Sitnik'
+  s.email    = 'andrey@sitnik.ru'
+  s.homepage = 'https://github.com/ai/r18n'
 
   s.add_development_dependency "bundler",            [">= 1.0.10"]
   s.add_development_dependency "yard",               [">= 0"]
@@ -30,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-core",         [">= 0"]
   s.add_development_dependency "rspec-expectations", [">= 0"]
   s.add_development_dependency "rspec-mocks",        [">= 0"]
-  s.add_development_dependency "maruku",             [">= 0"]
+  s.add_development_dependency "kramdown",           [">= 0"]
   s.add_development_dependency "RedCloth",           [">= 0"]
+  s.add_development_dependency "redcarpet",          [">= 0"]
 end

data/spec/filters_spec.rb

@@ -147,7 +147,7 @@ describe R18n::Filters do
     @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(0).should    == '0 files'
     @i18n.files(-5.5).should == '−5.5 files'
     @i18n.files(5000).should == '5,000 files'
   end
@@ -172,7 +172,8 @@ describe R18n::Filters do
   end
 
   it "should format untranslated" do
-    @i18n.in.not.to_s.should == 'in.[not]'
+    @i18n.in.not.to_s.should   == 'in.[not]'
+    @i18n.in.not.to_str.should == 'in.[not]'
 
     R18n::Filters.off(:untranslated)
     @i18n.in.not.to_s.should == 'in.not'
@@ -198,8 +199,17 @@ describe R18n::Filters do
   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>'
+    @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 allow to set custom filters" do
+    R18n::Filters.add(R18n::Untranslated, :a) { |v, c| "a #{v}" }
+    R18n::Filters.off(:a)
+
+    html = R18n::I18n.new('en', DIR, :off_filters => :untranslated,
+                                     :on_filters  => [:untranslated_html, :a])
+    html.in.not.to_s.should == 'a in.<span style="color: red">[not]</span>'
   end
 
   it "should have filter for escape HTML" do
@@ -224,7 +234,7 @@ describe R18n::Filters do
   end
 
   it "should have Markdown filter" do
-    @i18n.markdown.simple.should == '<p><strong>Hi!</strong></p>'
+    @i18n.markdown.simple.should == "<p><strong>Hi!</strong></p>\n"
   end
 
   it "should have Textile filter" do
@@ -232,13 +242,34 @@ describe R18n::Filters do
   end
 
   it "should HTML escape before Markdown and Textile filters" do
-    @i18n.markdown.html.should == '<p><strong>Hi!</strong> <br /></p>'
+    @i18n.markdown.html.should == "<p><strong>Hi!</strong> <br /></p>\n"
     @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.markdown.html.should == "<p><strong>Hi!</strong> &lt;br /&gt;</p>\n"
     @i18n.textile.html.should  == '<p><em>Hi!</em>&lt;br /&gt;</p>'
   end
 
+  it "should allow to listen filters adding" do
+    R18n::Filters.listen {
+      R18n::Filters.add(String, :a) { }
+    }.should == [R18n::Filters.defined[:a]]
+  end
+
+  it "should escape variables if ActiveSupport is loaded" do
+    @i18n.escape_params('<br>').should == '<b><br></b>'
+    require 'active_support'
+    @i18n.escape_params('<br>').should == '<b>&lt;br&gt;</b>'
+  end
+
+  it "should use SafeBuffer if it is loaded" do
+    require 'active_support'
+
+    R18n::Filters.on(:global_escape_html)
+    @i18n.reload!
+
+    @i18n.greater('<b>'.html_safe).should == '1 &lt; 2 is <b>'
+  end
+
 end

data/spec/i18n_spec.rb

@@ -26,13 +26,13 @@ describe R18n::I18n do
 
   it "should load locales" do
     i18n = R18n::I18n.new('en', DIR)
-    i18n.locales.should == [R18n::Locale.load('en')]
+    i18n.locales.should == [R18n.locale('en')]
 
     i18n = R18n::I18n.new(['ru', 'no-LC'], DIR)
-    i18n.locales.should == [R18n::Locale.load('ru'),
+    i18n.locales.should == [R18n.locale('ru'),
                             R18n::UnsupportedLocale.new('no-LC'),
                             R18n::UnsupportedLocale.new('no'),
-                            R18n::Locale.load('en')]
+                            R18n.locale('en')]
   end
 
   it "should return translations loaders" do
@@ -42,7 +42,7 @@ describe R18n::I18n do
 
   it "should load translations by loader" do
     loader = Class.new do
-      def available; [R18n::Locale.load('en')]; end
+      def available; [R18n.locale('en')]; end
       def load(locale); { 'custom' => 'Custom' }; end
     end
     R18n::I18n.new('en', loader.new).custom.should == 'Custom'
@@ -51,7 +51,7 @@ describe R18n::I18n do
   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 available; [R18n.locale('en')]; end
       def load(locale); { 'custom' => @param }; end
     end
     R18n.default_loader = loader
@@ -110,13 +110,10 @@ 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.available_locales.should =~ [R18n::Locale.load('no-lc'),
-                                      R18n::Locale.load('ru'),
-                                      R18n::Locale.load('en')]
+    i18n.available_locales.should =~ [R18n.locale('no-lc'),
+                                      R18n.locale('ru'),
+                                      R18n.locale('en')]
   end
 
   it "should cache translations" do
@@ -174,7 +171,7 @@ describe R18n::I18n do
   it "should reload translations" do
     loader = Class.new do
       @@answer = 1
-      def available; [R18n::Locale.load('en')]; end
+      def available; [R18n.locale('en')]; end
       def load(locale); { 'one' => @@answer }; end
     end
 
@@ -194,21 +191,21 @@ describe R18n::I18n do
 
   it "should return first locale with locale file" do
     i18n = R18n::I18n.new(['no-TR', 'no-LC', 'ru', 'en'], DIR)
-    i18n.locale.should == R18n::Locale.load('no-LC')
-    i18n.locale.base.should == R18n::Locale.load('ru')
+    i18n.locale.should      == R18n.locale('no-LC')
+    i18n.locale.base.should == R18n.locale('ru')
   end
 
   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'
+    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, '%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(time, :full).should     == ' 1 января 1970 00:00'
 
     i18n.l(Date.new(0)).should == '01.01.0000'
   end

data/spec/locale_spec.rb

@@ -3,8 +3,8 @@ require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::Locale do
   before :all do
-    @ru = R18n::Locale.load('ru')
-    @en = R18n::Locale.load('en')
+    @ru = R18n.locale('ru')
+    @en = R18n.locale('en')
   end
 
   it "should return all available locales" do
@@ -34,12 +34,12 @@ describe R18n::Locale do
   end
 
   it "should load locale by Symbol" do
-    R18n::Locale.load(:ru).should == R18n::Locale.load('ru')
+    R18n.locale(:ru).should == R18n.locale('ru')
   end
 
   it "should be equal to another locale with same code" do
     @en.should_not == @ru
-    @en.should == R18n::Locale.load('en')
+    @en.should == R18n.locale('en')
   end
 
   it "should print human readable representation" do
@@ -55,7 +55,7 @@ describe R18n::Locale do
   it "should use UnsupportedLocale if locale file isn't exists" do
     @en.should be_supported
 
-    unsupported = R18n::Locale.load('no-LC')
+    unsupported = R18n.locale('no-LC')
     unsupported.should_not be_supported
     unsupported.should be_a(R18n::UnsupportedLocale)
 
@@ -76,7 +76,7 @@ describe R18n::Locale do
   end
 
   it "should translate month, week days and am/pm names in strftime" do
-    i18n = R18n::I18n.new 'ru'
+    i18n = R18n::I18n.new('ru')
     time = Time.at(0).utc
 
     @ru.localize(time, '%a %A').should == 'Чтв Четверг'
@@ -84,6 +84,11 @@ describe R18n::Locale do
     @ru.localize(time, '%H:%M%p').should == '00:00 утра'
   end
 
+  it "should generate locale code by locale class name" do
+    R18n.locale('ru').code.should    == 'ru'
+    R18n.locale('zh-CN').code.should == 'zh-CN'
+  end
+
   it "should localize date for human" do
     i18n = R18n::I18n.new('en')
 
@@ -141,26 +146,26 @@ describe R18n::Locale do
   end
 
   it "should delete slashed from locale for security reasons" do
-    locale = R18n::Locale.load('../spec/translations/general/en')
+    locale = R18n.locale('../spec/translations/general/en')
     locale.should be_a(R18n::UnsupportedLocale)
   end
 
   it "should ignore code case in locales" do
-    upcase = R18n::Locale.load('RU')
-    downcase = R18n::Locale.load('ru')
+    upcase   = R18n.locale('RU')
+    downcase = R18n.locale('ru')
     upcase.should == downcase
-    upcase.code.should == 'ru'
+    upcase.code.should   == 'ru'
     downcase.code.should == 'ru'
 
-    upcase = R18n::Locale.load('no-LC')
-    downcase = R18n::Locale.load('no-lc')
+    upcase   = R18n.locale('no-LC')
+    downcase = R18n.locale('no-lc')
     upcase.should == downcase
-    upcase.code.should == 'no-lc'
+    upcase.code.should   == 'no-lc'
     downcase.code.should == 'no-lc'
   end
 
   it "should load locale with underscore" do
-    R18n::Locale.load('no_LC').code.should == 'no-lc'
+    R18n.locale('no_LC').code.should == 'no-lc'
   end
 
 end

data/spec/locales/cs_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Cs do
   it "should use Czech pluralization" do
-    cs = R18n::Locale.load('cs')
+    cs = R18n.locale('cs')
     cs.pluralize(0).should == 0
     cs.pluralize(1).should == 1
 

data/spec/locales/pl_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Pl do
   it "should use Polish pluralization" do
-    pl = R18n::Locale.load 'pl'
+    pl = R18n.locale('pl')
     pl.pluralize(0).should == 0
     pl.pluralize(1).should == 1
 

data/spec/locales/ru_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Ru do
   it "should use Russian pluralization" do
-    ru = R18n::Locale.load 'ru'
+    ru = R18n.locale('ru')
     ru.pluralize(0).should == 0
 
     ru.pluralize(1).should   == 1

data/spec/locales/sk_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Sk do
   it "should use Slovak pluralization" do
-    sk = R18n::Locale.load('Sk')
+    sk = R18n.locale('Sk')
     sk.pluralize(0).should == 0
     sk.pluralize(1).should == 1
 

data/spec/r18n_spec.rb

@@ -6,6 +6,7 @@ describe R18n do
 
   after do
     R18n.default_loader = R18n::Loader::YAML
+    R18n.default_places = nil
     R18n.reset
   end
 
@@ -31,38 +32,58 @@ describe R18n do
   it "shuld create I18n object by shortcut" do
     R18n.set('en', DIR)
     R18n.get.should be_a(R18n::I18n)
-    R18n.get.locales.should == [R18n::Locale.load('en')]
+    R18n.get.locales.should == [R18n.locale('en')]
     R18n.get.translation_places.should == [R18n::Loader::YAML.new(DIR)]
   end
 
-  it "should store I18n via thread_set" do
-    i18n = R18n::I18n.new('en')
-    R18n.thread_set(i18n)
-    R18n.get.should == i18n
-
-    R18n.reset
-    R18n.get.should be_nil
+  it "should allow to return I18n arguments in setter block" do
+    R18n.set { 'en' }
+    R18n.get.locales.should == [R18n.locale('en')]
   end
 
   it "should reset I18n objects and cache" do
     R18n.cache[:a] = 1
-    R18n.thread_set(R18n::I18n.new('en'))
+    R18n.set('en')
+    R18n.thread_set('en')
 
     R18n.reset
     R18n.get.should be_nil
     R18n.cache.should be_empty
   end
 
-  it "should thread_set setter to I18n" do
+  it "should store I18n via thread_set" do
     i18n = R18n::I18n.new('en')
     R18n.thread_set(i18n)
+    R18n.get.should == i18n
 
     i18n = R18n::I18n.new('ru')
     R18n.thread_set { i18n }
-
     R18n.get.should == i18n
   end
 
+  it "should allow to temporary change locale" do
+    R18n.default_places = DIR
+    R18n.change('en').locales.should == [R18n.locale('en')]
+    R18n.change('en').should have(1).translation_places
+    R18n.change('en').translation_places.first.dir.should == DIR.to_s
+  end
+
+  it "should allow to temporary change current locales" do
+    R18n.set('ru')
+    R18n.change('en').locales.should == [R18n.locale('en'), R18n.locale('ru')]
+    R18n.change('en').translation_places.should == R18n.get.translation_places
+    R18n.get.locale.code.should.should == 'ru'
+  end
+
+  it "should allow to get Locale to temporary change" do
+    R18n.set('ru')
+    R18n.change(R18n.locale('en')).locale.code.should == 'en'
+  end
+
+  it "should have shortcut to load locale" do
+    R18n.locale('ru').should == R18n::Locale.load('ru')
+  end
+
   it "should store default loader class" do
     R18n.default_loader.should == R18n::Loader::YAML
     R18n.default_loader = Class
@@ -89,16 +110,11 @@ describe R18n do
   end
 
   it "should merge hash recursively" do
-    a = { :a => 1,
-          :b => {:ba => 1, :bb => 1},
-          :c => 1 }
-    b = { :b => {:bb => 2, :bc => 2},
-          :c => 2 }
+    a = { :a => 1, :b => {:ba => 1, :bb => 1}, :c => 1 }
+    b = {          :b => {:bb => 2, :bc => 2}, :c => 2 }
 
     R18n::Utils.deep_merge!(a, b)
-    a.should == { :a => 1,
-                  :b => { :ba => 1, :bb => 2, :bc => 2 },
-                  :c => 2 }
+    a.should == { :a => 1, :b => { :ba => 1, :bb => 2, :bc => 2 }, :c => 2 }
   end
 
   it "should have l and t methods" do
@@ -108,13 +124,39 @@ describe R18n do
   end
 
   it "should have helpers mixin" do
-    obj = R18n::I18n.new 'en'
+    obj = R18n::I18n.new('en')
     R18n.set(obj)
 
-    r18n.should == obj
-    i18n.should == obj
+    r18n.should  == obj
+    i18n.should  == obj
     t.yes.should == 'Yes'
     l(Time.at(0).utc).should == '01/01/1970 00:00'
   end
 
+  it "should return available translations" do
+    R18n.available_locales(DIR).should =~ [R18n.locale('no-lc'),
+                                           R18n.locale('ru'),
+                                           R18n.locale('en')]
+  end
+
+  it "should use default places" do
+    R18n.default_places = DIR
+    R18n.set('en')
+    t.one.should == 'One'
+    R18n.available_locales.should =~ [R18n.locale('ru'),
+                                      R18n.locale('en'),
+                                      R18n.locale('no-lc')]
+  end
+
+  it "should set default places by block" do
+    R18n.default_places { DIR }
+    R18n.default_places.should == DIR
+  end
+
+  it "should allow to ignore default places" do
+    R18n.default_places = DIR
+    i18n = R18n::I18n.new('en', nil)
+    i18n.one.should_not be_translated
+  end
+
 end