r18n-core 1.1.0 → 1.1.1

data/ChangeLog

@@ -1,3 +1,11 @@
+== 1.1.1 (Dunhuang)
+* Don’t change YAML parser in Ruby 1.9.
+* Allow to change locale by argument in R18n Rails backend.
+* Set also Rails I18n locale in Rails autodetect filter.
+* Fix caching with custom filters (by Anton Onyshchenko).
+* Fix translation variables  with “%1” text inside (by Taras Kunch).
+* Fix Latvian locale (by Aleksandrs Ļedovskis).
+
 == 1.1.0 (Leipzig)
 * A lot of fixes in Rails I18n compatibility (thanks for Stephan Schubert).
 * Return Untranslted, when user try to call another translation key on

data/base/lv.yml

@@ -8,24 +8,24 @@ delete: 'Dzēst'
 
 human_time:
   after_days: !!pl
-    1: 'nākamajā dienā'
+    1: 'pēc %1 dienas'
     n: 'pēc %1 dienām'
   tomorrow: 'rīt'
   after_hours: !!pl
-    1: 'nākamajā stundā'
-    n: 'pēc %1 stundas'
+    1: 'pēc %1 stundas'
+    n: 'pēc %1 stundām'
   after_minutes: !!pl
-    1: 'nākamajā minūtē'
+    1: 'pēc %1 minūtes'
     n: 'pēc %1 minūtēm'
   now: 'tagad'
   today: 'šodien'
   minutes_ago: !!pl
-    1: 'pirms minūtes'
+    1: 'pirms %1 minūtes'
     n: 'pirms %1 minūtēm'
   hours_ago: !!pl
-    1: 'pirms stundas'
+    1: 'pirms %1 stundas'
     n: 'pirms %1 stundām'
   yesterday: 'vakar'
   days_ago: !!pl
-    1: 'pirms vienas dienas'
-    n: 'pirms %1 stundām'
+    1: 'pirms %1 dienas'
+    n: 'pirms %1 dienām'

data/lib/r18n-core/filter_list.rb

@@ -153,5 +153,8 @@ module R18n
       enabled += @on_by_type[type]
     end
 
+    def hash
+      [@on, @off].hash
+    end
   end
 end

data/lib/r18n-core/filters.rb

@@ -230,13 +230,19 @@ module R18n
   end
 
   Filters.add(String, :variables) do |content, config, *params|
+    cached_params = []
     content = content.clone
-    params.each_with_index do |param, i|
-      param = config[:locale].localize(param)
-      if defined? ActiveSupport::SafeBuffer
-        param = ActiveSupport::SafeBuffer.new + param
+    content.gsub!(/\%\d/) do |key|
+      i = key[1..-1].to_i
+      unless cached_params.include? i - 1
+        param = config[:locale].localize(params[i - 1])
+        if defined? ActiveSupport::SafeBuffer
+          param = ActiveSupport::SafeBuffer.new + param
+        end
+
+        cached_params[i - 1] = param
       end
-      content.gsub! "%#{i+1}", param
+      cached_params[i - 1]
     end
     content
   end

data/lib/r18n-core/untranslated.rb

@@ -18,8 +18,6 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-require 'singleton'
-
 module R18n
   # Return if translation isn’t exists. Unlike nil, it didn’t raise error when
   # you try to access for subtranslations.

data/lib/r18n-core/version.rb

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

data/lib/r18n-core/yaml_loader.rb

@@ -18,9 +18,6 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-require 'yaml'
-require 'syck' if '1.8.' != RUBY_VERSION[0..3] and RUBY_PLATFORM != 'java'
-
 module R18n
   module Loader
     # Loader for translations in YAML format. Them should have name like
@@ -34,19 +31,15 @@ module R18n
     #
     #   R18n::I18n.new('en', 'dir/with/translations')
     class YAML
+      include ::R18n::YamlMethods
+
       # Dir with translations.
       attr_reader :dir
 
       # Create new loader for +dir+ with YAML translations.
       def initialize(dir)
         @dir = File.expand_path(dir)
-        @private_type_class = if defined?(JRUBY_VERSION)
-          ::YAML::Yecht::PrivateType
-        elsif '1.8.' == RUBY_VERSION[0..3]
-          ::YAML::PrivateType
-        else
-          ::Syck::PrivateType
-        end
+        detect_yaml_private_type
       end
 
       # Array of locales, which has translations in +dir+.
@@ -58,16 +51,7 @@ module R18n
 
       # Return Hash with translations for +locale+.
       def load(locale)
-        if '1.8.' != RUBY_VERSION[0..3] and 'psych' == ::YAML::ENGINE.yamler
-          Filters.by_type.keys.each do |type|
-            next unless type.is_a? String
-            # Yeah, I add R18n’s types to global, send me patch if you really
-            # use YAML types too ;).
-            Psych.add_domain_type('yaml.org,2002', type) do |full_type, value|
-              Typed.new(type, value)
-            end
-          end
-        end
+        initialize_types
 
         translations = {}
         Dir.glob(File.join(@dir, "**/#{locale.code.downcase}.yml")).each do |i|
@@ -89,17 +73,14 @@ module R18n
       # Wrap YAML private types to Typed.
       def transform(a_hash)
         R18n::Utils.hash_map(a_hash) do |key, value|
-          value = case value
-          when @private_type_class
+          if value.is_a? Hash
+            value = transform(value)
+          elsif @private_type_class and value.is_a? @private_type_class
             v = value.value
             if v.respond_to?(:force_encoding) and v.encoding != __ENCODING__
               v = v.force_encoding(__ENCODING__)
             end
-            Typed.new(value.type_id, v)
-          when Hash
-            transform(value)
-          else
-            value
+            value = Typed.new(value.type_id, v)
           end
           [key, value]
         end

data/lib/r18n-core/yaml_methods.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+=begin
+Base methods to load translations for YAML.
+
+Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+require 'yaml'
+require 'yecht' if RUBY_PLATFORM == 'java'
+
+module R18n
+  # Base methods to load translations for YAML.
+  # It is used by YAML and Rails loaders.
+  module YamlMethods
+    # Detect class for private type depend on YAML parser.
+    def detect_yaml_private_type
+      @private_type_class = if defined?(JRUBY_VERSION)
+        ::YAML::Yecht::PrivateType
+      elsif '1.8.' == RUBY_VERSION[0..3]
+        ::YAML::PrivateType
+      elsif 'syck' == ::YAML::ENGINE.yamler
+        ::Syck::PrivateType
+      end
+    end
+
+    # Register global types in Psych
+    def initialize_types
+      if '1.8.' != RUBY_VERSION[0..3] and 'psych' == ::YAML::ENGINE.yamler
+        Filters.by_type.keys.each do |type|
+          next unless type.is_a? String
+          # Yeah, I add R18n’s types to global, send me patch if you really
+          # use YAML types too ;).
+          Psych.add_domain_type('yaml.org,2002', type) do |full_type, value|
+            Typed.new(type, value)
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/r18n-core.rb

@@ -32,12 +32,11 @@ require dir.join('untranslated').to_s
 require dir.join('translation').to_s
 require dir.join('filters').to_s
 require dir.join('filter_list').to_s
+require dir.join('yaml_methods').to_s
 require dir.join('yaml_loader').to_s
 require dir.join('i18n').to_s
 require dir.join('helpers').to_s
 
-require 'yecht' if RUBY_PLATFORM == 'java'
-
 module R18n
   autoload :Translated, 'r18n-core/translated'
 

data/locales/lv.rb

@@ -3,19 +3,21 @@ module R18n
   class Locales::Lv < Locale
     set :title => 'Latviešu',
 
+        :week_start => :monday,
         :wday_names => %w{Svētdiena Pirmdiena Otrdiena Trešdiena Ceturtdiena
-                          Piektiena Sestdiena},
+                          Piektdiena Sestdiena},
         :wday_abbrs => %w{Sv P O T C P S},
 
-        :month_names => %w{janvāris februāris marts aprīlis maijs jūnijs jūlijs
-                           augusts septembris oktobris novembris decembris},
+        :month_names => %w{janvārī februārī martā aprīlī maijā jūnijā jūlijā
+                           augustā septembrī oktobrī novembrī decembrī},
         :month_abbrs => %w{jan feb mar apr mai jūn jūl aug sep okt nov dec},
-        :month_standalone => %w{Janvāris Februāris Marts Aprīlis Maijs Jūnijs
-                                Jūlijs Augusts Septembris Oktobris Novembris
-                                Decembris},
+        :month_standalone => %w{janvāris februāris marts aprīlis maijs jūnijs
+                                jūlijs augusts septembris oktobris novembris
+                                decembris},
 
-        :date_format => '%d.%m.%Y',
-        :year_format => '_, %Y',
+        :date_format => '%d.%m.%Y.',
+        :full_format => '%e.%B',
+        :year_format => '%Y.gada _',
 
         :number_decimal => ",",
         :number_group   => " "

data/spec/filters_spec.rb

@@ -173,6 +173,10 @@ describe R18n::Filters 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?'
+  end
+
   it "should format untranslated" do
     @i18n.in.not.to_s.should   == 'in.[not]'
     @i18n.in.not.to_str.should == 'in.[not]'

data/spec/i18n_spec.rb

@@ -130,6 +130,16 @@ describe R18n::I18n do
     counter.loaded.should == 2
   end
 
+  it "shouldn't clear cache when custom filters are specified" do
+    counter = CounterLoader.new('en')
+
+    R18n::I18n.new('en', counter, :off_filters => :untranslated, :on_filters => :untranslated_html)
+    counter.loaded.should == 1
+
+    R18n::I18n.new('en', counter, :off_filters => :untranslated, :on_filters => :untranslated_html)
+    counter.loaded.should == 1
+  end
+
   it "should cache translations by used locales" do
     counter = CounterLoader.new('en', 'ru')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -222,6 +222,7 @@ files:
 - lib/r18n-core/utils.rb
 - lib/r18n-core/version.rb
 - lib/r18n-core/yaml_loader.rb
+- lib/r18n-core/yaml_methods.rb
 - locales/bg.rb
 - locales/ca.rb
 - locales/cs.rb
@@ -297,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1266686224539252765
+      hash: 1126722854268271207
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -306,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1266686224539252765
+      hash: 1126722854268271207
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23