r18n-core 0.4.10 → 0.4.11

data/lib/r18n-core/translated_string.rb

@@ -23,10 +23,10 @@ module R18n
   class TranslatedString < String
     # String locale
     attr_reader :locale
-    
+
     # Path for this translation.
     attr_reader :path
-    
+
     # Returns a new string object containing a copy of +str+, which translated
     # for +path+ to +locale+
     def initialize(str, locale, path)
@@ -34,12 +34,12 @@ module R18n
       @locale = locale
       @path   = path
     end
-    
+
     # Return self for translated string.
     def |(default)
       self
     end
-    
+
     # Return true for translated strings.
     def translated?
       true

data/lib/r18n-core/translation.rb

@@ -23,7 +23,7 @@ require 'pathname'
 module R18n
   # Struct to containt translation with some type for filter.
   Typed = Struct.new(:type, :value, :locale, :path)
-  
+
   # Translation is container of translated messages.
   #
   # You can load several locales and if translation willn’t be found in first,
@@ -46,11 +46,11 @@ module R18n
   #
   #   one: One
   #   two: Two
-  #   
+  #
   #   entry:
   #     between: Between %1 and %2
   #   methods: Is %1 method
-  #   
+  #
   #   comments: !!pl
   #     0: no comments
   #     1: one comment
@@ -60,13 +60,13 @@ module R18n
   #
   #   i18n.one   #=> "Один"
   #   i18n.two   #=> "Two"
-  #   
+  #
   #   i18n.two.locale.code      #=> "en"
   #   i18n.two.locale.ltr?      #=> "ltr"
   #
   #   i18n.entry.between(2, 3)    #=> "between 2 and 3"
   #   i18n['methods', 'object']   #=> "Is object method"
-  #   
+  #
   #   i18n.comments(0)            #=> "no comments"
   #   i18n.comments(10)           #=> "10 comments"
   class Translation
@@ -80,7 +80,7 @@ module R18n
       @locale = main_locale
       merge! data, locale unless data.empty?
     end
-    
+
     # Add another hash with +translations+ for some +locale+. Current data is
     # more priority, that new one in +translations+.
     def merge!(translations, locale)
@@ -108,23 +108,23 @@ module R18n
         end
       end
     end
-    
+
     # Use untranslated filter to print path.
     def to_s
       Filters.process(Filters.enabled, Untranslated, @path, @locale, @path,
                       [@path, '', @path])
     end
-    
+
     # Return current translation keys.
     def _keys
       @data.keys
     end
-    
+
     # Return +default+.
     def |(default)
       default
     end
-    
+
     # Return translation with special +name+.
     #
     # Translation can contain variable part. Just set is as <tt>%1</tt>,

data/lib/r18n-core/unsupported_locale.rb

@@ -24,29 +24,29 @@ module R18n
   class UnsupportedLocale
     # Locale, to get data and pluralization for unsupported locale.
     attr_accessor :base
-    
+
     # Create object for unsupported locale with +code+ and load other locale
     # data from +base+ locale.
     def initialize(code, base = nil)
       @code = code
       @base = Locale.load(I18n.default) if @code != I18n.default
     end
-    
+
     # Is locale has information file. In this class always return false.
     def supported?
       false
     end
-    
+
     # Human readable locale code and title.
     def inspect
       "Unsupported locale #{@code}"
     end
-    
+
     # Locale RFC 3066 code.
     def code
       @code
     end
-    
+
     # Locale code as title.
     def title
       @code
@@ -56,7 +56,7 @@ module R18n
     def ==(locale)
       @code.downcase == locale.code.downcase
     end
-    
+
     #  Proxy to default locale object.
     def method_missing(name, *params)
       @base.send(name, *params)

data/lib/r18n-core/untranslated.rb

@@ -26,54 +26,54 @@ module R18n
   #
   # You can set format to print untranslated string by filters. For example:
   # Disable standart output:
-  # 
+  #
   #   R18n::Filters.off(:untranslated)
-  # 
+  #
   # For development environment:
-  # 
+  #
   #   R18n::Filters.add(R18n::Untranslated, :untranslated_html) do
   #     |content, config, translated_path, untranslated_path, path|
   #     "#{translated_path}<span style='color: red'>#{untranslated_path}</span>"
   #   end
-  # 
+  #
   # For production environment:
-  # 
+  #
   #   R18n::Filters.add(R18n::Untranslated, :hide_untranslated) { '' }
   class Untranslated
     # Path, that isn’t in translation.
     attr_reader :untranslated_path
-    
+
     # Path, that exists in translation.
     attr_reader :translated_path
-    
+
     def initialize(translated_path, untranslated_path, locale)
       @translated_path = translated_path
       @untranslated_path = untranslated_path
       @locale = locale
     end
-    
+
     # Path to translation.
     def path
       "#{@translated_path}#{@untranslated_path}"
     end
-    
+
     def translated?
       false
     end
-    
+
     def method_missing(*params)
       self[params.first]
     end
-    
+
     def [](*params)
       Untranslated.new(translated_path, "#{@untranslated_path}.#{params.first}",
                        @locale)
     end
-    
+
     def |(default)
       default
     end
-    
+
     def to_s
       Filters.process(Filters.enabled, Untranslated, path, @locale, path,
                       [@translated_path, @untranslated_path, path])

data/lib/r18n-core/utils.rb

@@ -26,9 +26,9 @@ module R18n
       jd = Date.send(:civil_to_jd, time.year, time.mon, time.mday, Date::ITALY)
       Date.new!(Date.send(:jd_to_ajd, jd, 0, 0), 0, Date::ITALY)
     end
-    
+
     HTML_ENTRIES = { '&' => '&amp;', '<' => '&lt;', '>' => '&gt;' }
-    
+
     # Escape HTML entries (<, >, &). Copy from HAML helper.
     def self.escape_html(content)
       content.to_s.gsub(/[><&]/) { |s| HTML_ENTRIES[s] }
@@ -44,7 +44,7 @@ module R18n
       end
      result
     end
-  
+
     # Recursively hash merge.
     def self.deep_merge!(a, b)
       b.each_pair do |key, value|
@@ -57,7 +57,7 @@ module R18n
       end
       a
     end
-    
+
     # Call +block+ with Syck yamler. It used to load RedCloth, which isn’t
     # support Psych.
     def self.use_syck(&block)

data/lib/r18n-core/version.rb

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

data/lib/r18n-core/yaml_loader.rb

@@ -26,34 +26,36 @@ module R18n
     # Loader for translations in YAML format. Them should have name like
     # +en.yml+ (English) or en-US.yml (USA English dialect) with
     # language/country code (RFC 3066).
-    # 
+    #
     #   R18n::I18n.new('en', R18n::Loader::YAML.new('dir/with/translations'))
-    # 
+    #
     # YAML loader is default loader, so you can just set constructor parameter
     # to <tt>R18n::I18n.new</tt>:
-    # 
+    #
     #   R18n::I18n.new('en', 'dir/with/translations')
     class YAML
       # 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 '1.8.' == RUBY_VERSION[0..3]
+        @private_type_class = if defined?(JRUBY_VERSION)
+          ::YAML::Yecht::PrivateType
+        elsif '1.8.' == RUBY_VERSION[0..3]
           ::YAML::PrivateType
         else
           ::Syck::PrivateType
         end
       end
-      
+
       # Array of locales, which has translations in +dir+.
       def available
         Dir.glob(File.join(@dir, '**/*.yml')).
           map { |i| File.basename(i, '.yml') }.uniq.
           map { |i| R18n::Locale.load(i) }
       end
-      
+
       # Return Hash with translations for +locale+.
       def load(locale)
         if '1.8.' != RUBY_VERSION[0..3] and 'psych' == ::YAML::ENGINE.yamler
@@ -66,24 +68,24 @@ module R18n
             end
           end
         end
-        
+
         translations = {}
         Dir.glob(File.join(@dir, "**/#{locale.code.downcase}.yml")).each do |file_name|
           Utils.deep_merge!(translations, ::YAML::load_file(file_name) || {})
         end
         transform(translations)
       end
-      
+
       # YAML loader with same +dir+ will be have same +hash+.
       def hash
         self.class.hash + @dir.hash
       end
-      
+
       # Is another +loader+ load YAML translations from same +dir+.
       def ==(loader)
         self.class == loader.class and self.dir == loader.dir
       end
-      
+
       # Wrap YAML private types to Typed.
       def transform(a_hash)
         R18n::Utils.hash_map(a_hash) do |key, value|

data/locales/bg.rb

@@ -2,18 +2,18 @@
 module R18n
   class Locales::Bg < Locale
     set :title => 'Български',
-        
+
         :wday_names => %w{Неделя Понеделник Вторник Сряда Четвъртък Петък
                           Събота},
         :wday_abbrs => %w{Нед Пон Вто Сря Чет Пет Съб},
-        
+
         :month_names => %w{Януари Февруари Март Април Май Юни Юли Август
                            Септември Октомври Ноември Декември},
         :month_abbrs => %w{Яну Фев Мар Апр Май Юни Юли Авг Сеп Окт Ное Дек},
         :month_standalone => %w{Януари Февруари Март Април Май Юни Юли Август
                            Септември Октомври Ноември Декември},
         :date_format => '%d.%m.%Y',
-        
+
         :number_decimal => ",",
         :number_group   => " "
   end

data/locales/ca.rb

@@ -2,18 +2,19 @@
 module R18n
   class Locales::Ca < Locale
     set :title => 'Català',
-        
-        :wday_names => %w{diumenge dilluns dimarts dimecres dijous divendres dissabte},
+
+        :wday_names => %w{diumenge dilluns dimarts dimecres dijous divendres
+                          dissabte},
         :wday_abbrs => %w{dg dl dm dc dj dv ds},
-        
+
         :month_names => %w{Gener Febrer Març Abril Maig Juny Juliol Agost
                            Setembre Octubre Novembre Desembre},
         :month_abbrs => %w{gen feb mar abr mai jun jul ago set oct nov des},
-        
+
         :date_format => '%d/%m/%Y',
         :full_format => '%d de %B',
         :year_format => '_ de %Y',
-        
+
         :number_decimal => ",",
         :number_group   => "."
   end

data/locales/cs.rb

@@ -3,24 +3,24 @@ module R18n
   class Locales::Cs < Locale
     set :title => 'Český',
         :sublocales => %w{cz sk en},
-        
+
         :wday_names => %w{Neděle Pondělí Úterý Středa Čtvrtek Pátek Sobota},
         :wday_abbrs => %w{Ne Po Út St Čt Pá So},
-        
+
         :month_names => %w{ledna února března dubna května června července srpna
                            září října listopadu prosince},
         :month_abbrs => %w{led úno bře dub kvě čer čvc srp zář říj lis pro},
         :month_standalone => %w{Leden Únor Březen Duben Květen Červen Červenec
                                 Srpen Září Říjen Listopad Prosinec},
-        
+
         :time_am => 'dop.',
         :time_pm => 'odp.',
         :date_format => '%e. %m. %Y',
         :full_format => '%e. %B',
-        
+
         :number_decimal => ",",
         :number_group   => " "
-    
+
     def pluralize(n)
       case n
       when 0

data/locales/da.rb

@@ -2,21 +2,21 @@
 module R18n
   class Locales::Da < Locale
     set :title => 'Dansk',
-        
+
         :wday_names => %w{søndag mandag tirsdag onsdag torsdag fredag
                           lørdag},
         :wday_abbrs => %w{søn man tir ons tor fre lør},
-        
+
         :month_names => %w{januar februar marts april Maj juni juli august
                            september oktober november december},
         :month_abbrs => %w{jan. feb. mar. apr. maj jun. jul. aug. sep. okt.
                            nov. dec.},
-        
+
         :time_am => 'om formiddagen',
         :time_pm => 'om eftermiddagen',
         :date_format => '%d.%m.%Y',
         :full_format => '%d. %B %Y',
-        
+
         :number_decimal => ",",
         :number_group   => "."
   end

data/locales/de.rb

@@ -2,21 +2,21 @@
 module R18n
   class Locales::De < Locale
     set :title => 'Deutsch',
-        
+
         :wday_names => %w{Sonntag Montag Dienstag Mittwoch Donnerstag Freitag
                           Samstag},
         :wday_abbrs => %w{So Mo Di Mi Do Fr Sa},
-        
+
         :month_names => %w{Januar Februar März April Mai Juni Juli August
                            September Oktober November Dezember},
         :month_abbrs => %w{Jan. Feb. Mär. Apr. Mai. Jun. Jul. Aug. Sep. Okt.
                            Nov. Dez.},
-        
+
         :time_am => 'vormittags',
         :time_pm => 'nachmittags',
         :date_format => '%d.%m.%Y',
         :full_format => '%e. %B',
-        
+
         :number_decimal => ",",
         :number_group   => "."
   end