i18n-country-translations 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5095e321840b32d7b7b213a092f6ba6c922f5d02
-  data.tar.gz: 6e1d58d243088cdc207d049e7fe0d21df21cd8c8
+  metadata.gz: 780e6ea8c874d6fd34987d4f48e8d8447a81c5e7
+  data.tar.gz: 6f170ca9aa9fe7b459c7df3cc2d03e74eccb805e
 SHA512:
-  metadata.gz: 9e0334d0660c6524e78a5fb5676768c3fe836e40e67cc155f6e1a346b52f0598628cbba2eab64b95d8e090200a9cce74b60e3bdf1d80d6c03d3a1c774a3ae7c8
-  data.tar.gz: 37297a94a08257eb80fe69f2fa14ad4689f4fce2e579ae70c2714c03e9a34370efdbb4ea540503a2fdb9fc7aec20d8a2af903d2de122ece3e17a607c483b352e
+  metadata.gz: e3a441dbcac8f4528a0373bed2df5903ff856e58e24e8f893e73775a6caaae7d731f600a171e87d180041b0d387570edb52eaa4d59e8505da731a9f90bbbce07
+  data.tar.gz: 68fd1ac5eef528aadbc658e58d1f33ea558904a64c3cffa30ebbbe55b9850a1845c8b20c1219b68977c11e8de3e93aae1341b0433032396c9dc23a99d9975c7d

data/lib/i18n_country_translations.rb

@@ -1,3 +1,4 @@
+require 'i18n_country_translations/locale_files_pattern_generator'
 require 'i18n_country_translations/railtie'
 
 module I18nCountryTranslations

data/lib/i18n_country_translations/locale_files_pattern_generator.rb

@@ -0,0 +1,32 @@
+module I18nCountryTranslations
+
+  # Generates patterns for locale files, bases on a list of supported locales
+  class LocaleFilesPatternGenerator
+
+    attr_reader :base_pattern, :extension
+
+    def initialize(base_pattern, extension = '.yml')
+      @base_pattern = base_pattern
+      @extension = extension
+    end
+
+    # Generates a glob file pattern for the specified list of locales (i.e. IETF language tags)
+    def pattern_from(locales)
+      locales = Array(locales || [])
+      locales = locales.map { |locale| subpatterns_from locale }.flatten
+      pattern = locales.blank? ? '*' : "{#{locales.join ','}}"
+      "#{base_pattern}#{pattern}#{extension}"
+    end
+
+    protected
+
+    # Generates subpatterns for the specified locale (i.e. IETF language tag).
+    # Subpatterns are all more generic variations of a locale.
+    # E.g. subpatterns for en-US are en-US and en. Subpatterns for az-Latn-IR are az-Latn-IR, az-Latn and az
+    def subpatterns_from(locale)
+      parts = locale.to_s.split('-')
+      parts.map.with_index { |part,index| parts[0..index].join('-') }
+    end
+
+  end
+end

data/lib/i18n_country_translations/railtie.rb

@@ -4,9 +4,8 @@ module I18nCountryTranslations
   class Railtie < ::Rails::Railtie #:nodoc:
     initializer 'i18n-country-translations' do |app|
       I18nCountryTranslations::Railtie.instance_eval do
-        pattern = pattern_from app.config.i18n.available_locales
-
-        add("rails/locale/**/#{pattern}.yml")
+        generator = LocaleFilesPatternGenerator.new('rails/locale/**/')
+        add generator.pattern_from app.config.i18n.available_locales
       end
     end
 
@@ -17,9 +16,5 @@ module I18nCountryTranslations
       I18n.load_path.concat(files)
     end
 
-    def self.pattern_from(args)
-      array = Array(args || [])
-      array.blank? ? '*' : "{#{array.join ','}}"
-    end
   end
 end

data/lib/i18n_country_translations/version.rb

@@ -1,3 +1,3 @@
 module I18nCountryTranslations
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/rails/locale/iso_639-1/ar.yml

@@ -94,7 +94,7 @@ ar:
     GM: غامبيا
     GN: غينيا
     GP: جوادلوب
-    GQ: غينيا الإستوائية
+    GQ: غينيا الاستوائية
     GR: اليونان
     GS: جورجيا الجنوبية وجزر ساندويتش الجنوبية
     GT: غواتيمالا
@@ -108,7 +108,7 @@ ar:
     HT: هايتي
     HU: هنغاريا
     IC: جزر الكناري
-    ID: أندونيسيا
+    ID: إندونيسيا
     IE: أيرلندا
     IL: إسرائيل
     IM: جزيرة مان

data/rails/locale/iso_639-1/ko.yml

@@ -15,7 +15,7 @@ ko:
     AR: 아르헨티나
     AS: 아메리칸 사모아
     AT: 오스트리아
-    AU: 오스트레일리아
+    AU: 호주
     AW: 아루바
     AX: 올란드 제도
     AZ: 아제르바이잔

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-country-translations
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Brian McQuay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ files:
 - lib/i18n-country-translations.rb
 - lib/i18n_country_translations.rb
 - lib/i18n_country_translations/import_two_letter_codes.rb
+- lib/i18n_country_translations/locale_files_pattern_generator.rb
 - lib/i18n_country_translations/railtie.rb
 - lib/i18n_country_translations/version.rb
 - lib/tasks/i18n-country-translations_tasks.rake
@@ -327,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: I18n Country Translations