r18n-core 1.1.6 → 1.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4d1722656695a79ee26f9232bf464d6052b798a6
+  data.tar.gz: 312898e2722d61e6c924451901f53124124a3209
+SHA512:
+  metadata.gz: a27c2c68f3b9dabe61f797fb10d5d14dacfd24063510b7f171d8036ad648b78fc07b32a045c6b0b171d797946cc3aa5cb327c7d9c750f41ca132ce3560ceb388
+  data.tar.gz: c66260207a48437d4ec10df95663a7e486a349f8531dceb2f441941421a25208b212cdefdb8babb616bf2ffefd59d0da1055bbcf40c04053f745b57c5808a1e3

data/ChangeLog

@@ -1,3 +1,8 @@
+== 1.1.7 (Tujuh)
+* Return nil on untranslated in models with Translated.
+* Add transliterate method to I18n backend.
+* Add Indonesian locale (by Guntur Akhmad).
+
 == 1.1.6 (Vitebsk)
 * Return TranslatedString after global String filters.
 * Fix path in global String filters.

data/Rakefile

@@ -1,33 +1,13 @@
-# encoding: utf-8
-
 require 'rubygems'
 
-begin
-  require 'bundler/setup'
-  Bundler::GemHelper.install_tasks
-rescue LoadError
-  puts "Bundler not available. Install it with: gem install bundler"
-end
-
-PKG_NAME = 'r18n-core'.freeze
-require File.join(File.dirname(__FILE__), 'lib/r18n-core/version')
+require 'bundler/setup'
+Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-
 RSpec::Core::RakeTask.new
+task :default => :spec
 
-require 'yard'
-YARD::Rake::YardocTask.new do |yard|
-  yard.options << "--title='R18n #{R18n::VERSION}'"
-end
-
-task :clobber_doc do
-  rm_r 'doc'     rescue nil
-  rm_r '.yardoc' rescue nil
-end
 task :clobber_package do
   rm_r 'pkg' rescue nil
 end
-task :clobber => [:clobber_package, :clobber_doc]
-
-task :default => :spec
+task :clobber => [:clobber_package]

data/base/id.yml

@@ -0,0 +1,31 @@
+ok: 'OK'
+save: 'Simpan'
+cancel: 'Batal'
+'yes': 'Ya'
+'no': 'Tidak'
+exit: 'Keluar'
+delete: 'Hapus'
+
+human_time:
+  after_days: !!pl
+    1: 'setelah %1 hari'
+    n: 'setelah %1 hari'
+  tomorrow: 'besok'
+  after_hours: !!pl
+    1: 'setelah %1 jam'
+    n: 'setelah %1 jam'
+  after_minutes: !!pl
+    1: 'setelah %1 menit'
+    n: 'setelah %1 menit'
+  now: 'sekarang'
+  today: 'hari ini'
+  minutes_ago: !!pl
+    1: '%1 menit yang lalu'
+    n: '%1 menit yang lalu'
+  hours_ago: !!pl
+    1: '%1 jam yang lalu'
+    n: '%1 jam yang lalu'
+  yesterday: 'kemarin'
+  days_ago: !!pl
+    1: '%1 hari yang lalu'
+    n: '%1 hari yang lalu'

data/lib/r18n-core/translated.rb

@@ -127,6 +127,8 @@ module R18n
         class_eval <<-EOS, __FILE__, __LINE__
           def #{name}(*params)
             unlocalized = self.class.unlocalized_getters(#{name.inspect})
+            result = nil
+
             r18n.locales.each do |locale|
               code = locale.code
               next unless unlocalized.has_key? code
@@ -147,8 +149,7 @@ module R18n
               end
             end
 
-            R18n::Untranslated.new("\#{self.class.name}\#", '#{name}',
-                                   r18n.locale, r18n.filter_list)
+            result
           end
         EOS
 

data/lib/r18n-core/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module R18n
-  VERSION = '1.1.6'.freeze unless defined? R18n::VERSION
+  VERSION = '1.1.7'.freeze unless defined? R18n::VERSION
 end

data/locales/id.rb

@@ -0,0 +1,18 @@
+module R18n
+  class Locales::Id < Locale
+    set :title => 'Bahasa Indonesia',
+
+        :wday_names => %w{Minggu Senin Selasa Rabu Kamis Jumat
+                          Sabtu},
+        :wday_abbrs => %w{Min Sen Sel Rab Kam Jum Sab},
+
+        :month_names => %w{Januari Februari Maret April Mei Juni Juli Agustus
+                           September Oktober Nopember Desember},
+        :month_abbrs => %w{Jan Feb Mar Apr Mei Jun Jul Agu Sep Okt Nop Des},
+
+        :date_format => '%d/%m/%Y',
+
+        :number_decimal => ",",
+        :number_group   => "."
+  end
+end

data/r18n-core.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.author   = 'Andrey "A.I." Sitnik'
   s.email    = 'andrey@sitnik.ru'
   s.homepage = 'https://github.com/ai/r18n'
+  s.license  = 'LGPL-3'
 end

data/spec/filters_spec.rb

@@ -19,7 +19,7 @@ describe R18n::Filters do
     (@system - @enabled).each { |i| R18n::Filters.off(i) if i.enabled? }
   end
 
-  it "should add new filter" do
+  it "adds new filter" do
     filter = R18n::Filters.add('my', :my_filter) { |i, config| i }
 
     filter.should be_a(R18n::Filters::Filter)
@@ -34,14 +34,14 @@ describe R18n::Filters do
     @i18n.my_tree_filter.should == {'name' => 'value'}
   end
 
-  it "should add filter for several types" do
+  it "adds 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
+  it "uses passive filters" do
     filter = double()
     filter.should_receive(:process).twice.and_return(1)
 
@@ -55,14 +55,14 @@ describe R18n::Filters do
     @i18n.my_filter.should == 1
   end
 
-  it "should use cascade filters" do
+  it "uses 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
+  it "returns name for nameless filter" do
     R18n::Filters.instance_variable_set(:@last_auto_name, 0)
 
     R18n::Filters.add('some').name.should == 1
@@ -72,7 +72,7 @@ describe R18n::Filters do
     R18n::Filters.add('some').name.should == 4
   end
 
-  it "should delete filter by name" do
+  it "deletes filter by name" do
     R18n::Filters.add('my', :my_filter) { '1' }
     @i18n.my_filter.should == '1'
 
@@ -81,7 +81,7 @@ describe R18n::Filters do
     @i18n.my_filter.should == 'value'
   end
 
-  it "should delete filter by object" do
+  it "deletes filter by object" do
     filter = R18n::Filters.add('my') { '1' }
     @i18n.my_filter.should == '1'
 
@@ -90,14 +90,14 @@ describe R18n::Filters do
     @i18n.my_filter.should == 'value'
   end
 
-  it "should use global filters" do
+  it "uses 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
+  it "turns off filter" do
     filter = R18n::Filters.add('my', :one) { |i, config| i + '1' }
     filter = R18n::Filters.add('my', :two) { |i, config| i + '2' }
 
@@ -110,7 +110,7 @@ describe R18n::Filters do
     @i18n.my_filter.should == 'value12'
   end
 
-  it "should send config to filter" do
+  it "sends config to filter" do
     R18n::Filters.add('my') do |i, config|
       config[:secret_value] = 1
       config
@@ -121,7 +121,7 @@ describe R18n::Filters do
     @i18n.my_filter[:unknown_value].should be_nil
   end
 
-  it "should set path in config" do
+  it "sets path in config" do
     R18n::Filters.add(String) do |i, config|
       config[:path]
     end
@@ -129,7 +129,7 @@ describe R18n::Filters do
     @i18n.in.another.level.should == 'in.another.level'
   end
 
-  it "should return translated string after filters" do
+  it "returns translated string after filters" do
     R18n::Filters.add(String) { |i, config| i + '1' }
 
     @i18n.one.should be_a(R18n::TranslatedString)
@@ -137,7 +137,7 @@ describe R18n::Filters do
     @i18n.one.locale.should == R18n.locale('en')
   end
 
-  it "should use one config for cascade filters" do
+  it "uses one config for cascade filters" do
     R18n::Filters.add('my') { |content, config| config[:new_secret] ? 2 : 1 }
     @i18n.my_filter.should == 1
 
@@ -148,17 +148,17 @@ describe R18n::Filters do
     @i18n.my_filter.should == 2
   end
 
-  it "should send parameters to filter" do
+  it "sends parameters to filter" do
     R18n::Filters.add('my') { |i, config, a, b| "#{i}#{a}#{b}" }
     @i18n['my_filter', 1, 2].should == 'value12'
     @i18n.my_filter(1, 2).should == 'value12'
   end
 
-  it "should call proc from translation" do
+  it "calls proc from translation" do
     @i18n.sum(2, 3).should == 5
   end
 
-  it "should pluralize translation" do
+  it "pluralizes translation" 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'
@@ -168,32 +168,33 @@ describe R18n::Filters do
     @i18n.files(5000).should == '5,000 files'
   end
 
-  it "shouldn't pluralize without first numeric parameter" do
+  it "doesn't pluralize without first numeric parameter" do
     @i18n.files.should       be_a(R18n::UnpluralizetedTranslation)
     @i18n.files('').should   be_a(R18n::UnpluralizetedTranslation)
     @i18n.files[1].should    == '1 file'
     @i18n.files.n(5).should  == '5 files'
   end
 
-  it "should convert first float parameter to number" do
+  it "converts first float parameter to number" do
     @i18n.files(1.2).should == '1 file'
   end
 
-  it "should pluralize translation without locale" do
+  it "pluralizes translation without locale" do
     i18n = R18n::I18n.new('nolocale', DIR)
     i18n.entries(1).should == 'ONE'
     i18n.entries(5).should == 'N'
   end
 
-  it "should can use params in translation" do
+  it "cans use params in translation" do
     @i18n.params(-1, 2).should == 'Is −1 between −1 and 2?'
   end
 
-  it "should substitute '%2' as param but not value of second param" do
-    @i18n.params('%2 FIRST', 'SECOND').should == 'Is %2 FIRST between %2 FIRST and SECOND?'
+  it "substitutes '%2' as param but not value of second param" do
+    @i18n.params('%2 FIRST', 'SECOND').should ==
+      'Is %2 FIRST between %2 FIRST and SECOND?'
   end
 
-  it "should format untranslated" do
+  it "formats untranslated" do
     @i18n.in.not.to_s.should   == 'in.[not]'
     @i18n.in.not.to_str.should == 'in.[not]'
 
@@ -206,7 +207,7 @@ describe R18n::Filters do
     @i18n.in.not.to_s.should == 'in.not in.[not]'
   end
 
-  it "should format translation path" do
+  it "formats translation path" do
     @i18n.in.another.to_s.should == 'in.another[]'
 
     R18n::Filters.off(:untranslated)
@@ -218,14 +219,14 @@ describe R18n::Filters do
     @i18n.in.another.to_s.should == 'in.another in.another[]'
   end
 
-  it "should format untranslated for web" do
+  it "formats 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 allow to set custom filters" do
+  it "allows to set custom filters" do
     R18n::Filters.add(R18n::Untranslated, :a) { |v, c| "a #{v}" }
     R18n::Filters.off(:a)
 
@@ -234,11 +235,11 @@ describe R18n::Filters do
     html.in.not.to_s.should == 'a in.<span style="color: red">[not]</span>'
   end
 
-  it "should have filter for escape HTML" do
+  it "has 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
+  it "has disabled global filter for escape HTML" do
     @i18n.greater('true').should == '1 < 2 is true'
 
     R18n::Filters.on(:global_escape_html)
@@ -247,7 +248,7 @@ describe R18n::Filters do
     @i18n.html.should == '&lt;script&gt;true &amp;&amp; false&lt;/script&gt;'
   end
 
-  it "should have filter to disable global HTML escape" do
+  it "has filter to disable global HTML escape" do
     @i18n.no_escape.should == '<b>Warning</b>'
 
     R18n::Filters.on(:global_escape_html)
@@ -255,15 +256,15 @@ describe R18n::Filters do
     @i18n.no_escape.should == '<b>Warning</b>'
   end
 
-  it "should have Markdown filter" do
+  it "has Markdown filter" do
     @i18n.markdown.simple.should == "<p><strong>Hi!</strong></p>\n"
   end
 
-  it "should have Textile filter" do
+  it "has Textile filter" do
     @i18n.textile.simple.should == '<p><em>Hi!</em></p>'
   end
 
-  it "should HTML escape before Markdown and Textile filters" do
+  it "HTML escapes before Markdown and Textile filters" do
     @i18n.markdown.html.should == "<p><strong>Hi!</strong> <br /></p>\n"
     @i18n.textile.html.should  == '<p><em>Hi!</em><br /></p>'
 
@@ -273,19 +274,19 @@ describe R18n::Filters do
     @i18n.textile.html.should  == '<p><em>Hi!</em>&lt;br /&gt;</p>'
   end
 
-  it "should allow to listen filters adding" do
+  it "allows 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
+  it "escapes 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
+  it "uses SafeBuffer if it is loaded" do
     require 'active_support'
 
     R18n::Filters.on(:global_escape_html)

data/spec/i18n_spec.rb

@@ -12,19 +12,19 @@ describe R18n::I18n do
     R18n.extension_places = @extension_places
   end
 
-  it "should parse HTTP_ACCEPT_LANGUAGE" do
+  it "parses HTTP_ACCEPT_LANGUAGE" do
     R18n::I18n.parse_http(nil).should == []
     R18n::I18n.parse_http('').should == []
     R18n::I18n.parse_http('ru,en;q=0.9').should == ['ru', 'en']
     R18n::I18n.parse_http('ru;q=0.8,en;q=0.9').should == ['en', 'ru']
   end
 
-  it "should has default locale" do
+  it "has default locale" do
     R18n::I18n.default = 'ru'
     R18n::I18n.default.should == 'ru'
   end
 
-  it "should load locales" do
+  it "loads locales" do
     i18n = R18n::I18n.new('en', DIR)
     i18n.locales.should == [R18n.locale('en')]
 
@@ -35,12 +35,12 @@ describe R18n::I18n do
                             R18n.locale('en')]
   end
 
-  it "should return translations loaders" do
+  it "returns translations loaders" do
     i18n = R18n::I18n.new('en', DIR)
     i18n.translation_places.should == [R18n::Loader::YAML.new(DIR)]
   end
 
-  it "should load translations by loader" do
+  it "loads translations by loader" do
     loader = Class.new do
       def available; [R18n.locale('en')]; end
       def load(locale); { 'custom' => 'Custom' }; end
@@ -48,7 +48,7 @@ describe R18n::I18n do
     R18n::I18n.new('en', loader.new).custom.should == 'Custom'
   end
 
-  it "should pass parameters to default loader" do
+  it "passes parameters to default loader" do
     loader = Class.new do
       def initialize(param); @param = param; end
       def available; [R18n.locale('en')]; end
@@ -58,7 +58,7 @@ describe R18n::I18n do
     R18n::I18n.new('en', 'default').custom.should == 'default'
   end
 
-  it "should load translations" do
+  it "loads translations" do
     i18n = R18n::I18n.new(['ru', 'en'], DIR)
     i18n.one.should    == 'Один'
     i18n[:one].should  == 'Один'
@@ -66,13 +66,13 @@ describe R18n::I18n do
     i18n.only.english.should == 'Only in English'
   end
 
-  it "should load translations from several dirs" do
+  it "loads translations from several dirs" do
     i18n = R18n::I18n.new(['nolocale', 'en'], [TWO, DIR])
     i18n.in.two.should == 'Two'
     i18n.in.another.level.should == 'Hierarchical'
   end
 
-  it "should use extension places" do
+  it "uses extension places" do
     R18n.extension_places << EXT
 
     i18n = R18n::I18n.new('en', DIR)
@@ -80,14 +80,14 @@ describe R18n::I18n do
     i18n.one.should == 'One'
   end
 
-  it "shouldn't use extension without app translations with same locale" do
+  it "doesn't use extension without app translations with same locale" do
     R18n.extension_places << EXT
 
     i18n = R18n::I18n.new(['notransl', 'en'], DIR)
     i18n.ext.should == 'Extension'
   end
 
-  it "should ignore case on loading" do
+  it "ignores case on loading" do
     i18n = R18n::I18n.new('nolocale', [DIR])
     i18n.one.should == 'ONE'
 
@@ -95,13 +95,13 @@ describe R18n::I18n do
     i18n.one.should == 'ONE'
   end
 
-  it "should load default translation" do
+  it "loads default translation" do
     i18n = R18n::I18n.new('nolocale', DIR)
     i18n.one.should == 'ONE'
     i18n.two.should == 'Two'
   end
 
-  it "should load sublocales for first locale" do
+  it "loads sublocales for first locale" do
     R18n::I18n.default = 'notransl'
 
     i18n = R18n::I18n.new('ru', DIR)
@@ -109,14 +109,14 @@ describe R18n::I18n do
     i18n.two.should == 'Two'
   end
 
-  it "should return available translations" do
+  it "returns available translations" do
     i18n = R18n::I18n.new('en', DIR)
     i18n.available_locales.should =~ [R18n.locale('nolocale'),
                                       R18n.locale('ru'),
                                       R18n.locale('en')]
   end
 
-  it "should cache translations" do
+  it "caches translations" do
     counter = CounterLoader.new('en')
 
     R18n::I18n.new('en', counter)
@@ -130,7 +130,7 @@ describe R18n::I18n do
     counter.loaded.should == 2
   end
 
-  it "shouldn't clear cache when custom filters are specified" do
+  it "doesn't clear cache when custom filters are specified" do
     counter = CounterLoader.new('en')
 
     R18n::I18n.new('en', counter, :off_filters => :untranslated,
@@ -142,7 +142,7 @@ describe R18n::I18n do
     counter.loaded.should == 1
   end
 
-  it "should cache translations by used locales" do
+  it "caches translations by used locales" do
     counter = CounterLoader.new('en', 'ru')
 
     R18n::I18n.new('en', counter)
@@ -158,7 +158,7 @@ describe R18n::I18n do
     counter.loaded.should == 5
   end
 
-  it "should cache translations by places" do
+  it "caches translations by places" do
     counter = CounterLoader.new('en', 'ru')
 
     R18n::I18n.new('en', counter)
@@ -180,7 +180,7 @@ describe R18n::I18n do
     different.loaded.should == 1
   end
 
-  it "should reload translations" do
+  it "reloads translations" do
     loader = Class.new do
       def available; [R18n.locale('en')]; end
       def load(locale);
@@ -197,19 +197,19 @@ describe R18n::I18n do
     i18n.one.should == 2
   end
 
-  it "should return translations" do
+  it "returns 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
+  it "returns first locale with locale file" do
     i18n = R18n::I18n.new(['notransl', 'nolocale', 'ru', 'en'], DIR)
     i18n.locale.should      == R18n.locale('nolocale')
     i18n.locale.base.should == R18n.locale('ru')
   end
 
-  it "should localize objects" do
+  it "localizes objects" do
     i18n = R18n::I18n.new('ru')
 
     i18n.l(-123456789).should == '−123 456 789'
@@ -224,7 +224,7 @@ describe R18n::I18n do
     i18n.l(Date.new(0)).should == '01.01.0000'
   end
 
-  it "should return marshalizable values", :not_ruby => 1.8 do
+  it "returns marshalizable values", :not_ruby => 1.8 do
     i18n    = R18n::I18n.new('en', DIR, :off_filters => :untranslated,
                                         :on_filters  => :untranslated_html)
     demarsh = Marshal.load(Marshal.dump(i18n.t.one))