r18n-core 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489041ceb7db5e8cf6b743a024fb28208a2b8aa8bb259b33fc1b5c83af27adcc
-  data.tar.gz: 2a8bba59036684b3c5ea7e3c5794adc87d10fe67e9970ed6f43fe519a5c9eef7
+  metadata.gz: ea9e0df5d7d9a6465ecbb70590f24b69578fe9bcf703a825f7f861dae17ab8d5
+  data.tar.gz: ce67040d879d2edd3e14bb17d5b3cebff9a4824a25ace0d4caf15d5c4292a6e2
 SHA512:
-  metadata.gz: 6e307a9fac93250e9616ddac0b375ae23817dcc09179beb851bdc6e81c41bd5b14f55b1dc0705ff0bcc0d513197c967adf79f0727d72ee225504d6fedac0cdf3
-  data.tar.gz: 0bb8acf70cb671e5e43b31795c9e930e508223d0f3504d383c92e2dd33c3356f71461fe536e2586adc725acf5c7c8f7680ef94ee5181eb8ed72787bd577dc239
+  metadata.gz: ed567f238f886118551f5243c409fea38722c3508733943731489840bb69507613edb9f5d46031bfbe230d1f339d1c7f757d3cdc5adb102d92559df07b3c18d4
+  data.tar.gz: 825933ccff178daf0648cf78f1f8b9378149cb151bfcddf2835165c66c7dec0bb785368910b6ec0435ccfb39331d953de6d9029b8e5f916ee7420e53fa0b6cab

data/README.md

@@ -71,7 +71,7 @@ In your translation files you can use:
     robots: !!pl
       0: No robots
       1: One robot
-      n: %1 robots
+      n: '%1 robots'
     ```
 
 * Filters

data/base/cy.yml

@@ -0,0 +1,34 @@
+ok: 'Iawn'
+save: 'Cadw'
+cancel: 'Canslo'
+'yes': 'Ie'
+'no': 'Na'
+exit: 'Gadael'
+delete: 'Dileu'
+
+human_time:
+  after_days: !!pl
+    1: 'ar ôl %1 diwrnod'
+    2: 'ar ôl %1 ddiwrnod'
+    n: 'ar ôl %1 diwrnod'
+  tomorrow: 'yfory'
+  after_hours: !!pl
+    1: 'ar ôl %1 awr'
+    n: 'ar ôl %1 awr'
+  after_minutes: !!pl
+    1: 'ar ôl %1 munud'
+    n: 'ar ôl %1 munud'
+  now: 'nawr'
+  today: 'heddiw'
+  minutes_ago: !!pl
+    1: '%1 munud yn ôl'
+    2: '%1 funud yn ôl'
+    n: '%1 munud yn ôl'
+  hours_ago: !!pl
+    1: '%1 awr yn ôl'
+    n: '%1 awr yn ôl'
+  yesterday: 'ddoe'
+  days_ago: !!pl
+    1: '%1 diwrnod yn ôl'
+    2: '%1 ddiwrnod yn ôl'
+    n: '%1 diwrnod yn ôl'

data/lib/r18n-core/i18n.rb

@@ -199,7 +199,7 @@ module R18n
 
     # Reload translations.
     def reload!
-      @available = @available_codes = nil
+      @available_locales = @available_codes = nil
       @translation_places = self.class.convert_places(@original_places)
 
       available_in_places = @translation_places.map { |i| [i, i.available] }
@@ -207,8 +207,6 @@ module R18n
         R18n.extension_places.map { |i| [i, i.available] }
 
       unless defined? @locale
-        # It's array!
-        # rubocop:disable Perfomance/HashEachMethods
         available_in_places.each do |_place, available|
           @locales.each do |locale|
             if available.include? locale
@@ -218,7 +216,6 @@ module R18n
           end
           break if defined? @locale
         end
-        # rubocop:enable Perfomance/HashEachMethods
       end
       @locale ||= @locales.first
       unless @locale.supported?
@@ -255,7 +252,7 @@ module R18n
 
     # Return Array of locales with available translations.
     def available_locales
-      @available ||= R18n.available_locales(@translation_places)
+      @available_locales ||= R18n.available_locales(@translation_places)
     end
 
     # Convert +object+ to String, according to the rules of the current locale.

data/lib/r18n-core/locale.rb

@@ -70,10 +70,13 @@ module R18n
       File.exist?(File.join(LOCALES_DIR, "#{locale}.rb"))
     end
 
+    def self.sanitize_code(code)
+      code.to_s.gsub(/[^-_a-zA-Z]/, '').tr('_', '-').downcase
+    end
+
     # Load locale by RFC 3066 +code+.
     def self.load(code)
-      original = code.to_s.gsub(/[^-_a-zA-Z]/, '')
-      code = original.tr('_', '-').downcase
+      code = sanitize_code code
 
       @@loaded[code] ||= begin
         if exists? code
@@ -81,7 +84,7 @@ module R18n
           name = code.gsub(/\w+/, &:capitalize).delete('-')
           R18n::Locales.const_get(name).new
         else
-          UnsupportedLocale.new(original)
+          UnsupportedLocale.new(code)
         end
       end
     end
@@ -115,7 +118,7 @@ module R18n
         time_am:     'AM',
         time_pm:     'PM',
         time_format: '_ %H:%M',
-        full_format: '%e %B',
+        full_format: '%-d %B',
         year_format: '_ %Y'
 
     def month_standalone
@@ -178,7 +181,12 @@ module R18n
 
         send format_method_name, obj, *params
       else
-        obj.to_s
+        format_method_name =
+          "format_#{Utils.underscore(obj.class.name)}_#{format}"
+
+        return obj.to_s unless respond_to? format_method_name
+
+        send format_method_name, obj, *params
       end
     end
 
@@ -234,7 +242,7 @@ module R18n
     # Format +time+ in human usable form. For example “5 minutes ago” or
     # “yesterday”. In +now+ you can set base time, which be used to get relative
     # time. For special cases you can replace it in locale’s class.
-    def format_time_human(time, i18n, now = Time.now, *_params)
+    def format_time_human(time, i18n, now = time.class.now, *_params)
       diff = time - now
       minutes = time.is_a?(DateTime) ? diff * 24 * 60.0 : diff / 60.0
       diff = minutes.abs
@@ -299,10 +307,10 @@ module R18n
       strftime(date, format)
     end
 
-    # Return pluralization type for +n+ items. This is simple form. For special
-    # cases you can replace it in locale’s class.
-    def pluralize(n)
-      case n
+    # Return pluralization type for +number+ of items. This is simple form.
+    # For special cases you can replace it in locale’s class.
+    def pluralize(number)
+      case number
       when 0
         0
       when 1

data/lib/r18n-core/translated_string.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'untranslated'
+
 # Translation string for i18n support.
 #
 # Copyright (C) 2008 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
@@ -52,7 +54,7 @@ module R18n
 
     # Override to_s to make string html safe if `html_safe` method is defined.
     def to_s
-      if respond_to? :html_safe
+      if html_safe?
         super.html_safe
       else
         String.new(super)
@@ -82,9 +84,21 @@ module R18n
       Untranslated.new(translated, key, @locale, @filters)
     end
 
+    NON_KEYS_METHODS = [
+      *Untranslated::NON_KEYS_METHODS,
+      :html_safe,
+      :to_text
+    ].freeze
+
     # Return untranslated, when user try to go deeper in translation.
     def method_missing(name, *_params)
+      return super if NON_KEYS_METHODS.include?(name)
       get_untranslated(name.to_s)
     end
+
+    def respond_to_missing?(name, *args)
+      return super if NON_KEYS_METHODS.include?(name)
+      true
+    end
   end
 end

data/lib/r18n-core/translation.rb

@@ -51,7 +51,7 @@ module R18n
   #   comments: !!pl
   #     0: no comments
   #     1: one comment
-  #     n: %1 comments
+  #     n: '%1 comments'
   #
   # example.rb
   #

data/lib/r18n-core/unsupported_locale.rb

@@ -56,7 +56,12 @@ module R18n
 
     #  Proxy to default locale object.
     def method_missing(name, *params)
-      @base.send(name, *params)
+      return super unless @base.respond_to? name
+      @base.public_send(name, *params)
+    end
+
+    def respond_to_missing?(name, *args)
+      @base.send __method__, name, *args
     end
   end
 end

data/lib/r18n-core/untranslated.rb

@@ -73,15 +73,25 @@ module R18n
       new arr[1], arr[2], R18n.locale(arr[0]), GlobalFilterList.instance
     end
 
+    NON_KEYS_METHODS = %i[
+      to_ary
+      to_hash
+      marshal_dump
+      marshal_load
+    ].freeze
+
     def method_missing(name, *_params)
       # It is need to fix some hack in specs
-      if name == :to_ary
-        raise NoMethodError, "undefined method `to_ary' for #{self}"
-      end
+      return super if NON_KEYS_METHODS.include?(name)
 
       self[name]
     end
 
+    def respond_to_missing?(name, *args)
+      return super if NON_KEYS_METHODS.include?(name)
+      true
+    end
+
     def [](*params)
       Untranslated.new(translated_path, "#{@untranslated_path}.#{params.first}",
                        @locale, @filters)

data/lib/r18n-core/utils.rb

@@ -43,17 +43,26 @@ module R18n
     end
 
     # Recursively hash merge.
-    def self.deep_merge!(a, b)
-      b.each_pair do |key, value|
-        another = a[key]
-        a[key] =
-          if another.is_a?(Hash) && value.is_a?(Hash)
-            deep_merge!(another, value)
+    def self.deep_merge!(one, another)
+      another.each_pair do |key, another_value|
+        value = one[key]
+        one[key] =
+          if value.is_a?(Hash) && another_value.is_a?(Hash)
+            deep_merge!(value, another_value)
           else
-            value
+            another_value
           end
       end
-      a
+      one
+    end
+
+    def self.underscore(string)
+      string
+        .gsub(/::/, '/')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr('-', '_')
+        .downcase
     end
   end
 end

data/lib/r18n-core/version.rb

@@ -2,5 +2,5 @@
 
 # Version of R18n Core
 module R18n
-  VERSION = '3.1.2'.freeze unless defined? R18n::VERSION
+  VERSION = '3.2.0'.freeze unless defined? R18n::VERSION
 end

data/lib/r18n-core/yaml_loader.rb

@@ -32,6 +32,8 @@ module R18n
     class YAML
       include ::R18n::YamlMethods
 
+      FILE_EXT = 'y{,a}ml'.freeze
+
       # Dir with translations.
       attr_reader :dir
 
@@ -43,8 +45,8 @@ module R18n
 
       # Array of locales, which has translations in +dir+.
       def available
-        Dir.glob(File.join(@dir, '**/*.yml'))
-          .map { |i| File.basename(i, '.yml') }.uniq
+        Dir.glob(File.join(@dir, "**/*.#{FILE_EXT}"))
+          .map { |i| File.basename(i, '.*') }.uniq
           .map { |i| R18n.locale(i) }
       end
 
@@ -53,7 +55,9 @@ module R18n
         initialize_types
 
         translations = {}
-        Dir.glob(File.join(@dir, "**/#{locale.code.downcase}.yml")).each do |i|
+        Dir.glob(
+          File.join(@dir, "**/#{locale.code.downcase}.#{FILE_EXT}")
+        ).each do |i|
           Utils.deep_merge!(translations, ::YAML.load_file(i) || {})
         end
         transform(translations)

data/locales/af.rb

@@ -20,7 +20,7 @@ module R18n
         time_pm:     "'s namiddag",
 
         date_format: '%d/%m/%Y',
-        full_format: '%e %B',
+        full_format: '%-d %B',
         year_format: '_, %Y',
         time_format: '_, %H:%M',
 

data/locales/az.rb

@@ -26,7 +26,7 @@ module R18n
         number_group:   ' '
       )
 
-      def pluralize(_n)
+      def pluralize(_number)
         'n'
       end
     end

data/locales/cs.rb

@@ -19,15 +19,15 @@ module R18n
 
         time_am:     'dop.',
         time_pm:     'odp.',
-        date_format: '%e. %m. %Y',
-        full_format: '%e. %B',
+        date_format: '%-d. %m. %Y',
+        full_format: '%-d. %B',
 
         number_decimal: ',',
         number_group:   ' '
       )
 
-      def pluralize(n)
-        case n
+      def pluralize(number)
+        case number
         when 0
           0
         when 1

data/locales/cy.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module R18n
+  module Locales
+    # Welsh locale
+    class Cy < Locale
+      set(
+        title: 'Welsh',
+        sublocales: [],
+
+        week_start: :sunday,
+        wday_names: ["Dydd Sul", "Dydd Llun", "Dydd Mawrth", "Dydd Mercher", "Dydd Iau", "Dydd Gwener", "Dydd Sadwrn"],
+        wday_abbrs: %w[Sul Llu Maw Mer Iau Gwe Sad],
+
+        month_names: %w[Ionawr Chwefror Mawrth Ebrill Mai Mehefin Gorffennaf Awst Medi Hydref Tachwedd Rhagfyr],
+        month_abbrs: %w[Ion Chw Maw Ebr Mai Meh Gor Aws Med Hyd Tac Rha],
+
+        date_format: '%Y-%m-%d',
+        full_format: '%e o %B',
+        year_format: '_, %Y',
+
+        number_decimal: '.',
+        number_group:   ','
+      )
+
+      def ordinalize(n)
+          case n % 10
+            when 1 then "#{n}af"
+            when 2 then "#{n}il"
+            when 3 then "#{n}ydd"
+            when 4 then "#{n}ydd"
+            when 11 then "#{n}eg"
+            when 13 then "#{n}eg"
+            when 14 then "#{n}eg"
+            when 16 then "#{n}eg"
+            when 17 then "#{n}eg"
+            when 19 then "#{n}eg"
+            when 21..31 then "#{n}ain"
+            else "#{n}ed"
+          end
+      end
+
+      def format_date_full(date, year = true, *_params)
+        format = full_format
+        format = year_format.sub('_', format) if year
+        strftime(date, format.sub('%e', ordinalize(date.mday)))
+      end
+    end
+  end
+end

data/locales/de.rb

@@ -19,7 +19,7 @@ module R18n
         time_am:     'vormittags',
         time_pm:     'nachmittags',
         date_format: '%d.%m.%Y',
-        full_format: '%e. %B',
+        full_format: '%-d. %B',
 
         number_decimal: ',',
         number_group:   '.'

data/locales/en-us.rb

@@ -12,7 +12,7 @@ module R18n
 
         time_format: '_ %I:%M %p',
         date_format: '%m/%d/%Y',
-        full_format: '%B %e'
+        full_format: '%B %-d'
       )
     end
   end

data/locales/en.rb

@@ -18,22 +18,22 @@ module R18n
         month_abbrs: %w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec],
 
         date_format: '%Y-%m-%d',
-        full_format: '%e of %B',
+        full_format: '%-d of %B',
         year_format: '_, %Y',
 
         number_decimal: '.',
         number_group:   ','
       )
 
-      def ordinalize(n)
-        if (11..13).cover?(n % 100)
-          "#{n}th"
+      def ordinalize(number)
+        if (11..13).cover?(number % 100)
+          "#{number}th"
         else
-          case n % 10
-          when 1 then "#{n}st"
-          when 2 then "#{n}nd"
-          when 3 then "#{n}rd"
-          else        "#{n}th"
+          case number % 10
+          when 1 then "#{number}st"
+          when 2 then "#{number}nd"
+          when 3 then "#{number}rd"
+          else        "#{number}th"
           end
         end
       end
@@ -41,7 +41,7 @@ module R18n
       def format_date_full(date, year = true, *_params)
         format = full_format
         format = year_format.sub('_', format) if year
-        strftime(date, format.sub('%e', ordinalize(date.mday)))
+        strftime(date, format.sub('%-d', ordinalize(date.mday)))
       end
     end
   end

data/locales/eo.rb

@@ -15,7 +15,7 @@ module R18n
         month_abbrs: %w[jan feb mar apr maj jun jul aŭg sep okt nov dec],
 
         date_format: '%Y-%m-%d',
-        full_format: 'la %e-a de %B',
+        full_format: 'la %-d-a de %B',
         year_format: '_ de %Y',
 
         number_decimal: '.',

data/locales/fa.rb

@@ -20,7 +20,7 @@ module R18n
         ],
 
         date_format: '%Y/%m/%d',
-        full_format: '%e %B',
+        full_format: '%-d %B',
         year_format: '_ %Y',
 
         number_decimal: '٫',

data/locales/fi.rb

@@ -20,7 +20,7 @@ module R18n
                              marraskuu joulukuu],
 
         date_format: '%d.%m.%Y',
-        full_format: '%e. %B',
+        full_format: '%-d. %B',
         time_format: '_ %H.%M',
 
         number_decimal: ',',

data/locales/fr.rb

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

data/locales/hr.rb

@@ -17,18 +17,18 @@ module R18n
         month_abbrs: %w[Sij Velj Ožu Tra Svi Lip Srp Kol Ruj Lis Stu Pro],
 
         date_format: '%d.%m.%Y',
-        full_format: '%e. %B',
+        full_format: '%-d. %B',
 
         number_decimal: ',',
         number_group:   '.'
       )
 
-      def pluralize(n)
-        if n.zero?
+      def pluralize(number)
+        if number.zero?
           0
-        elsif n == 1
+        elsif number == 1
           1
-        elsif n >= 2 && n <= 4
+        elsif number >= 2 && number <= 4
           2
         else
           'n'

data/locales/hu.rb

@@ -16,7 +16,7 @@ module R18n
         month_abbrs: %w[jan feb már ápr máj jún júl aug sze okt nov dec],
 
         date_format: '%Y. %m. %d.',
-        full_format: '%B %e.',
+        full_format: '%B %-d.',
         year_format: '%Y. _',
         time_format: '_, %H:%M',
 
@@ -24,7 +24,7 @@ module R18n
         number_group:   ' '
       )
 
-      def pluralize(_n)
+      def pluralize(_number)
         'n'
       end
 

data/locales/it.rb

@@ -23,8 +23,8 @@ module R18n
 
       def format_date_full(date, year = true, *_params)
         full = super(date, year)
-        if full[0..1] == ' 1'
-          '1º' + full[2..-1]
+        if full[0..1] == '1 '
+          '1º' + full[1..-1]
         else
           full
         end

data/locales/ja.rb

@@ -22,7 +22,7 @@ module R18n
         number_group:   ','
       )
 
-      def pluralize(_n)
+      def pluralize(_number)
         'n'
       end
     end

data/locales/kk.rb

@@ -20,7 +20,7 @@ module R18n
         time_am:     ' ертеңің',
         time_pm:     ' кештің',
         date_format: '%Y-%m-%d',
-        full_format: '%B %e-і',
+        full_format: '%B %-d-і',
         year_format: '%Y жылы _',
 
         number_decimal: ',',

data/locales/lv.rb

@@ -20,17 +20,17 @@ module R18n
                              decembris],
 
         date_format: '%d.%m.%Y.',
-        full_format: '%e.%B',
+        full_format: '%-d.%B',
         year_format: '%Y.gada _',
 
         number_decimal: ',',
         number_group:   ' '
       )
 
-      def pluralize(n)
-        if n.zero?
+      def pluralize(number)
+        if number.zero?
           0
-        elsif n % 10 == 1 && n % 100 != 11
+        elsif number % 10 == 1 && number % 100 != 11
           1
         else
           'n'

data/locales/nb.rb

@@ -17,7 +17,7 @@ module R18n
         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',
+        full_format: '%-d. %B %Y',
 
         number_decimal: ',',
         number_group:   ' '

data/locales/nl.rb

@@ -18,7 +18,7 @@ module R18n
         time_am:     "'s ochtends",
         time_pm:     "'s middags",
         date_format: '%d-%m-%Y',
-        full_format: '%e %B',
+        full_format: '%-d %B',
 
         number_decimal: ',',
         number_group:   '.'

data/locales/pl.rb

@@ -24,13 +24,13 @@ module R18n
         number_group:   ' '
       )
 
-      def pluralize(n)
-        return 0 if n.zero?
-        case n % 10
+      def pluralize(number)
+        return 0 if number.zero?
+        case number % 10
         when 1
-          n > 10 ? 'n' : 1
+          number > 10 ? 'n' : 1
         when 2..4
-          (11..19).cover?(n % 100) ? 'n' : 2
+          (11..19).cover?(number % 100) ? 'n' : 2
         else
           'n'
         end

data/locales/ru.rb

@@ -25,12 +25,12 @@ module R18n
         number_group:   ' '
       )
 
-      def pluralize(n)
-        if n.zero?
+      def pluralize(number)
+        if number.zero?
           0
-        elsif n % 10 == 1 && n % 100 != 11
+        elsif number % 10 == 1 && number % 100 != 11
           1
-        elsif (2..4).cover?(n % 10) && !(10..19).cover?(n % 100)
+        elsif (2..4).cover?(number % 10) && !(10..19).cover?(number % 100)
           2
         else
           'n'

data/locales/sk.rb

@@ -20,14 +20,14 @@ module R18n
         time_am: 'dop.',
         time_pm: 'odp.',
         date_format: '%d.%m.%Y',
-        full_format: '%e. %B',
+        full_format: '%-d. %B',
 
         number_decimal: ',',
         number_group:   ' '
       )
 
-      def pluralize(n)
-        case n
+      def pluralize(number)
+        case number
         when 0
           0
         when 1

data/locales/sr-latn.rb

@@ -16,17 +16,17 @@ module R18n
           month_abbrs: %w[jan feb mar apr maj jun jul avg sep okt nov dec],
 
           date_format: '%d.%m.%Y',
-          full_format: '%e. %B',
+          full_format: '%-d. %B',
 
           number_decimal: ',',
           number_group:   '.'
 
-      def pluralize(n)
-        if n.zero?
+      def pluralize(number)
+        if number.zero?
           0
-        elsif n == 1
+        elsif number == 1
           1
-        elsif n >= 2 && n <= 4
+        elsif number >= 2 && number <= 4
           2
         else
           'n'

data/locales/sv-se.rb

@@ -16,7 +16,7 @@ module R18n
         month_abbrs: %w[jan feb mar apr maj jun jul aug okt nov dec],
 
         date_format: '%Y-%m-%d',
-        full_format: '%e %B %Y',
+        full_format: '%-d %B %Y',
 
         number_decimal: ',',
         number_group:   '.'

data/locales/th.rb

@@ -17,14 +17,14 @@ module R18n
                         พ.ย. ธ.ค.],
 
         date_format: '%d/%m/%Y',
-        full_format: '%e %B',
+        full_format: '%-d %B',
         year_format: '_, %Y',
 
         number_decimal: '.',
         number_group:   ','
       )
 
-      def pluralize(_n)
+      def pluralize(_number)
         'n'
       end
 

data/locales/tr.rb

@@ -15,7 +15,7 @@ module R18n
         month_abbrs: %w[Oca Şub Mar Nis May Haz Tem Ağu Eyl Eki Kas Ara],
 
         date_format: '%d.%m.%Y',
-        full_format: '%B %e.',
+        full_format: '%B %-d.',
         year_format: '%Y. _',
         time_format: '_%H:%M',
 
@@ -23,7 +23,7 @@ module R18n
         number_group:   ','
       )
 
-      def pluralize(_n)
+      def pluralize(_number)
         'n'
       end
     end

data/locales/vi.rb

@@ -17,7 +17,7 @@ module R18n
         month_abbrs: %w[th1 th2 th3 th4 th5 th6 th7 th8 th9 th10 th11 th12],
 
         date_format: '%d/%m/%Y',
-        full_format: 'ngày %e %B',
+        full_format: 'ngày %-d %B',
         year_format: '_ năm %Y',
         time_format: '%H:%M, _',
 
@@ -25,7 +25,7 @@ module R18n
         number_group:   ','
       )
 
-      def pluralize(_n)
+      def pluralize(_number)
         'n'
       end
     end

data/locales/zh.rb

@@ -21,7 +21,7 @@ module R18n
         number_group:   ' '
       )
 
-      def pluralize(_n)
+      def pluralize(_number)
         'n'
       end
     end

data/spec/i18n_spec.rb

@@ -240,7 +240,7 @@ describe R18n::I18n do
     expect(i18n.l(time, '%A')).to      eq('Четверг')
     expect(i18n.l(time, :month)).to    eq('Январь')
     expect(i18n.l(time, :standard)).to eq('01.01.1970 00:00')
-    expect(i18n.l(time, :full)).to     eq(' 1 января 1970 00:00')
+    expect(i18n.l(time, :full)).to     eq('1 января 1970 00:00')
 
     expect(i18n.l(Date.new(0))).to eq('01.01.0000')
   end

data/spec/locale_spec.rb

@@ -60,7 +60,7 @@ describe R18n::Locale do
     expect(unsupported).not_to be_supported
     expect(unsupported).to be_kind_of(R18n::UnsupportedLocale)
 
-    expect(unsupported.code.downcase).to  eq('nolocale-dl')
+    expect(unsupported.code).to eq('nolocale-dl')
     expect(unsupported.title.downcase).to eq('nolocale-dl')
     expect(unsupported.ltr?).to be true
 
@@ -74,7 +74,7 @@ describe R18n::Locale do
 
   it 'formats float in local traditions' do
     expect(@en.localize(-12_345.67)).to eq('−12,345.67')
-    expect(@en.localize(BigDecimal.new('-12345.67'))).to eq('−12,345.67')
+    expect(@en.localize(BigDecimal('-12345.67'))).to eq('−12,345.67')
   end
 
   it 'translates month, week days and am/pm names in strftime' do
@@ -110,28 +110,36 @@ describe R18n::Locale do
     hour   = 60 * minute
     day    = 24 * hour
     zero   = Time.at(0).utc
-    p = [:human, R18n::I18n.new('en'), zero]
-
-    expect(@en.localize(zero + 7  * day,    *p)).to eq('8th of January 00:00')
-    expect(@en.localize(zero + 50 * hour,   *p)).to eq('after 2 days 02:00')
-    expect(@en.localize(zero + 25 * hour,   *p)).to eq('tomorrow 01:00')
-    expect(@en.localize(zero + 70 * minute, *p)).to eq('after 1 hour')
-    expect(@en.localize(zero + hour,        *p)).to eq('after 1 hour')
-    expect(@en.localize(zero + 38 * minute, *p)).to eq('after 38 minutes')
-    expect(@en.localize(zero + 5,           *p)).to eq('now')
-    expect(@en.localize(zero - 15,          *p)).to eq('now')
-    expect(@en.localize(zero - minute,      *p)).to eq('1 minute ago')
-    expect(@en.localize(zero - hour + 59,   *p)).to eq('59 minutes ago')
-    expect(@en.localize(zero - 2  * hour,   *p)).to eq('2 hours ago')
-    expect(@en.localize(zero - 13 * hour,   *p)).to eq('yesterday 11:00')
-    expect(@en.localize(zero - 50 * hour,   *p)).to eq('3 days ago 22:00')
-
-    expect(@en.localize(zero - 9  * day, *p)).to eq(
-      '23rd of December, 1969 00:00'
-    )
-    expect(@en.localize(zero - 365 * day, *p)).to eq(
-      '1st of January, 1969 00:00'
-    )
+    now    = Time.now
+    now_params = [:human, R18n::I18n.new('en')]
+    zero_params = [*now_params, zero]
+
+    expect(@en.localize(now + 70 * minute,   *now_params)).to eq('after 1 hour')
+    expect(@en.localize(now + hour + minute, *now_params)).to eq('after 1 hour')
+    expect(@en.localize(now + 38 * minute,   *now_params))
+      .to eq('after 38 minutes')
+    expect(@en.localize(now + 5,             *now_params)).to eq('now')
+    expect(@en.localize(now - 15,            *now_params)).to eq('now')
+    expect(@en.localize(now - minute,        *now_params)).to eq('1 minute ago')
+    expect(@en.localize(now - hour + 59,     *now_params))
+      .to eq('59 minutes ago')
+    expect(@en.localize(now - 2 * hour,      *now_params)).to eq('2 hours ago')
+
+    expect(@en.localize(zero + 7 * day,   *zero_params))
+      .to eq('8th of January 00:00')
+    expect(@en.localize(zero + 50 * hour, *zero_params))
+      .to eq('after 2 days 02:00')
+    expect(@en.localize(zero + 25 * hour, *zero_params))
+      .to eq('tomorrow 01:00')
+    expect(@en.localize(zero - 13 * hour, *zero_params))
+      .to eq('yesterday 11:00')
+    expect(@en.localize(zero - 50 * hour, *zero_params))
+      .to eq('3 days ago 22:00')
+
+    expect(@en.localize(zero - 9   * day, *zero_params))
+      .to eq('23rd of December, 1969 00:00')
+    expect(@en.localize(zero - 365 * day, *zero_params))
+      .to eq('1st of January, 1969 00:00')
   end
 
   it 'localizes date-times for human' do
@@ -140,28 +148,38 @@ describe R18n::Locale do
     minute = hour / 60
     second = minute / 60
     zero   = DateTime.new(1970)
-    p = [:human, R18n::I18n.new('en'), zero]
-
-    expect(@en.localize(zero + 7  * day,    *p)).to eq('8th of January 00:00')
-    expect(@en.localize(zero + 50 * hour,   *p)).to eq('after 2 days 02:00')
-    expect(@en.localize(zero + 25 * hour,   *p)).to eq('tomorrow 01:00')
-    expect(@en.localize(zero + 70 * minute, *p)).to eq('after 1 hour')
-    expect(@en.localize(zero + hour,        *p)).to eq('after 1 hour')
-    expect(@en.localize(zero + 38 * minute, *p)).to eq('after 38 minutes')
-    expect(@en.localize(zero + 5 * second,  *p)).to eq('now')
-    expect(@en.localize(zero - 15 * second, *p)).to eq('now')
-    expect(@en.localize(zero - minute,      *p)).to eq('1 minute ago')
-    expect(@en.localize(zero - hour + 59 * second, *p)).to eq('59 minutes ago')
-    expect(@en.localize(zero - 2  * hour,   *p)).to eq('2 hours ago')
-    expect(@en.localize(zero - 13 * hour,   *p)).to eq('yesterday 11:00')
-    expect(@en.localize(zero - 50 * hour,   *p)).to eq('3 days ago 22:00')
-
-    expect(@en.localize(zero - 9  * day, *p)).to eq(
-      '23rd of December, 1969 00:00'
-    )
-    expect(@en.localize(zero - 365 * day, *p)).to eq(
-      '1st of January, 1969 00:00'
-    )
+    now    = DateTime.now
+    now_params = [:human, R18n::I18n.new('en')]
+    zero_params = [*now_params, zero]
+
+    expect(@en.localize(now + 70 * minute,   *now_params)).to eq('after 1 hour')
+    expect(@en.localize(now + hour + minute, *now_params)).to eq('after 1 hour')
+    expect(@en.localize(now + 38 * minute,   *now_params))
+      .to eq('after 38 minutes')
+    expect(@en.localize(now + 5 * second,    *now_params)).to eq('now')
+    expect(@en.localize(now - 15 * second,   *now_params)).to eq('now')
+    expect(@en.localize(now - minute,        *now_params)).to eq('1 minute ago')
+
+    expect(@en.localize(now - hour + 59 * second, *now_params))
+      .to eq('59 minutes ago')
+
+    expect(@en.localize(now - 2 * hour, *now_params)).to eq('2 hours ago')
+
+    expect(@en.localize(zero + 7  * day,  *zero_params))
+      .to eq('8th of January 00:00')
+    expect(@en.localize(zero + 50 * hour, *zero_params))
+      .to eq('after 2 days 02:00')
+    expect(@en.localize(zero + 25 * hour, *zero_params))
+      .to eq('tomorrow 01:00')
+    expect(@en.localize(zero - 13 * hour, *zero_params))
+      .to eq('yesterday 11:00')
+    expect(@en.localize(zero - 50 * hour, *zero_params))
+      .to eq('3 days ago 22:00')
+
+    expect(@en.localize(zero - 9  * day,  *zero_params))
+      .to eq('23rd of December, 1969 00:00')
+    expect(@en.localize(zero - 365 * day, *zero_params))
+      .to eq('1st of January, 1969 00:00')
   end
 
   it 'uses standard formatter by default' do
@@ -185,6 +203,24 @@ describe R18n::Locale do
     expect(@en.localize(Date.today - 1, :my_own_way)).to eq('Just another day')
   end
 
+  it 'localizes custom classes if formatter exists' do
+    stub_const(
+      'FooBar', Class.new do
+        attr_reader :value
+
+        def initialize(value)
+          @value = value
+        end
+      end
+    )
+
+    foo_bar = FooBar.new 'something'
+
+    allow(@en).to receive(:format_foo_bar_human, &:value)
+
+    expect(@en.localize(foo_bar, :human)).to eq('something')
+  end
+
   it 'raises error on unknown formatter' do
     expect do
       @ru.localize(Time.at(0).utc, R18n::I18n.new('ru'), :unknown)
@@ -211,6 +247,6 @@ describe R18n::Locale do
   end
 
   it 'loads locale with underscore' do
-    expect(R18n.locale('nolocale-DL').code).to eq('nolocale-dl')
+    expect(R18n.locale('nolocale_DL').code).to eq('nolocale-dl')
   end
 end

data/spec/locales/fr_spec.rb

@@ -4,6 +4,6 @@ describe R18n::Locales::Fr do
   it 'formats French date' do
     fr = R18n::I18n.new('fr')
     expect(fr.l(Date.parse('2009-07-01'), :full)).to eq('1er juillet 2009')
-    expect(fr.l(Date.parse('2009-07-02'), :full)).to eq(' 2 juillet 2009')
+    expect(fr.l(Date.parse('2009-07-02'), :full)).to eq('2 juillet 2009')
   end
 end

data/spec/locales/hu_spec.rb

@@ -12,6 +12,6 @@ describe R18n::Locales::Hu do
   it 'uses Hungarian time format' do
     hu = R18n::I18n.new('hu')
     expect(hu.l(Time.at(0).utc)).to        eq('1970. 01. 01., 00:00')
-    expect(hu.l(Time.at(0).utc, :full)).to eq('1970. január  1., 00:00')
+    expect(hu.l(Time.at(0).utc, :full)).to eq('1970. január 1., 00:00')
   end
 end

data/spec/locales/it_spec.rb

@@ -4,7 +4,7 @@ describe R18n::Locales::It do
   it 'formats Italian date' do
     italian = R18n::I18n.new('it')
     expect(italian.l(Date.parse('2009-07-01'), :full)).to eq('1º luglio 2009')
-    expect(italian.l(Date.parse('2009-07-02'), :full)).to eq(' 2 luglio 2009')
+    expect(italian.l(Date.parse('2009-07-02'), :full)).to eq('2 luglio 2009')
     expect(italian.l(Date.parse('2009-07-12'), :full)).to eq('12 luglio 2009')
   end
 end

data/spec/r18n_spec.rb

@@ -169,4 +169,10 @@ describe R18n do
     i18n = R18n::I18n.new('en', nil)
     expect(i18n.one).not_to be_translated
   end
+
+  it 'allows to load files with `.yaml` extension' do
+    R18n.default_places = File.join(TRANSLATIONS, 'yaml')
+    R18n.set('en')
+    expect(t.one).to eq('One')
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+## https://github.com/stevekinney/pizza/issues/103#issuecomment-136052789
+## https://github.com/docker-library/ruby/issues/45
+Encoding.default_external = 'UTF-8'
+
 require 'pp'
 
 require_relative '../lib/r18n-core'

data/spec/translated_spec.rb

@@ -114,7 +114,13 @@ describe R18n::Translated do
       translation :no_method, methods: { en: :no_method_en }
 
       def method_missing(name, *_params)
-        name.to_s
+        return name.to_s if name.to_s =~ /^no_method*/
+        super
+      end
+
+      def respond_to_missing?(name, *_params)
+        return true if name.to_s =~ /^no_method*/
+        super
       end
     end
     virtual = @virtual_class.new

data/spec/translation_spec.rb

@@ -168,4 +168,19 @@ describe R18n::Translation do
     it { is_expected.to be_translated }
     it { is_expected.to eq 'Not found' }
   end
+
+  it 'handles #to_ary' do
+    i18n = R18n::I18n.new('en', DIR)
+    expect([i18n.one, i18n.two].flatten).to eq [i18n.one, i18n.two]
+  end
+
+  it 'handles #to_hash' do
+    i18n = R18n::I18n.new('en', DIR)
+
+    def foo(*args, **opts)
+      [args, opts]
+    end
+
+    expect(foo(i18n.one)).to eq [[i18n.one], {}]
+  end
 end

data/spec/translations/yaml/en.yaml

@@ -0,0 +1 @@
+one: One

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies: []
 description: |2
       R18n is a i18n tool to translate your Ruby application.
@@ -32,6 +32,7 @@ files:
 - base/bg.yml
 - base/ca.yml
 - base/cs.yml
+- base/cy.yml
 - base/da.yml
 - base/de.yml
 - base/en.yml
@@ -83,6 +84,7 @@ files:
 - locales/bg.rb
 - locales/ca.rb
 - locales/cs.rb
+- locales/cy.rb
 - locales/da.rb
 - locales/de.rb
 - locales/en-au.rb
@@ -151,6 +153,7 @@ files:
 - spec/translations/general/ru.yml
 - spec/translations/two/en.yml
 - spec/translations/two/fr.yml
+- spec/translations/yaml/en.yaml
 - spec/yaml_loader_spec.rb
 homepage: https://github.com/ai/r18n
 licenses:
@@ -205,4 +208,5 @@ test_files:
 - spec/translations/general/ru.yml
 - spec/translations/two/en.yml
 - spec/translations/two/fr.yml
+- spec/translations/yaml/en.yaml
 - spec/yaml_loader_spec.rb