twitter_cldr 2.4.0 → 2.4.1

data/Gemfile

@@ -9,8 +9,8 @@ group :development, :test do
 end
 
 group :development do
-  gem 'nokogiri'
-  gem 'ruby-cldr', :github => 'camertron/ruby-cldr'
+  gem 'nokogiri', "~> 1.5.9"
+  gem 'ruby-cldr', :github => 'svenfuchs/ruby-cldr'
 end
 
 group :test do

data/History.txt

@@ -1,3 +1,9 @@
+== 2.4.1
+
+* Upgrade to CLDR v23.1, ICU4J 51.2.
+* Adding en-GB locale (British English).
+* Partial support for Ruby 2.0 (yaml no longer breaks, may not dump correctly).
+
 == 2.4.0
 
 * Upgrade to CLDR v23.

data/Rakefile

@@ -80,7 +80,7 @@ namespace :update do
     TwitterCldr::Resources::TailoringImporter.new(
         args[:cldr_path] || './vendor/cldr',
         './resources/collation/tailoring',
-        args[:icu4j_jar_path] ||'./vendor/icu4j-50_1_1.jar'
+        args[:icu4j_jar_path] || './vendor/icu4j-51_2.jar'
     ).import(TwitterCldr.supported_locales)
   end
 

data/lib/twitter_cldr/resources/collation_tries_dumper.rb

@@ -12,7 +12,8 @@ module TwitterCldr
 
         def update_dumps
           update_default_trie_dump
-          TwitterCldr.supported_locales.each { |locale| update_tailoring_trie_dump(locale) }
+          #TwitterCldr.supported_locales
+          [:he].each { |locale| update_tailoring_trie_dump(locale) }
         end
 
         private

data/lib/twitter_cldr/resources/download.rb

@@ -8,8 +8,8 @@ require 'cldr/download'
 module TwitterCldr
   module Resources
 
-    CLDR_URL = 'http://unicode.org/Public/cldr/23/core.zip'
-    ICU4J_URL = 'http://download.icu-project.org/files/icu4j/50.1.1/icu4j-50_1_1.jar'
+    CLDR_URL = 'http://unicode.org/Public/cldr/23.1/core.zip'
+    ICU4J_URL = 'http://download.icu-project.org/files/icu4j/51.2/icu4j-51_2.jar'
 
     class << self
 

data/lib/twitter_cldr/resources/locales_resources_importer.rb

@@ -46,14 +46,27 @@ module TwitterCldr
       end
 
       def import_components
-        Cldr::Export.export(:locales => TwitterCldr.supported_locales, :components => COMPONENTS, :target => File.join(@output_path, 'locales')) do |component, locale, path|
+        export_args = {
+          :locales => TwitterCldr.supported_locales,
+          :components => COMPONENTS,
+          :target => File.join(@output_path, 'locales'),
+          :merge => true  # fill in the gaps, eg fill in sub-locales like en_GB with en
+        }
+
+        Cldr::Export.export(export_args) do |component, locale, path|
           add_buddhist_calendar(component, locale, path)
           process_plurals(component, locale, path)
           downcase_territory_codes(component, locale, path)
           deep_symbolize(component, locale, path)
         end
 
-        Cldr::Export.export(:components => ["currency_digits_and_rounding"], :target => File.join(@output_path, 'shared')) do |component, locale, path|
+        export_args = {
+          :components => ["currency_digits_and_rounding"],
+          :target => File.join(@output_path, 'shared'),
+          :merge => true
+        }
+
+        Cldr::Export.export(export_args) do |component, locale, path|
           deep_symbolize(component, locale, path)
         end
 

data/lib/twitter_cldr/resources/tailoring_importer.rb

@@ -24,15 +24,19 @@ module TwitterCldr
       LAST_BYTE_MASK = 0xFF
 
       LOCALES_MAP = {
-          :'zh-Hant' => :'zh_Hant',
-          :id => :root,
-          :it => :root,
-          :ms => :root,
-          :nl => :root,
-          :pt => :root
+        :'zh-Hant' => :'zh_Hant',
+        :id => :root,
+        :it => :root,
+        :ms => :root,
+        :nl => :root,
+        :pt => :root
       }
 
-      EMPTY_TAILORING_DATA = { :collator_options => {}, :tailored_table => '', :suppressed_contractions => '' }
+      EMPTY_TAILORING_DATA = {
+        :collator_options => {},
+        :tailored_table => '',
+        :suppressed_contractions => ''
+      }
 
       class ImportError < RuntimeError; end
 

data/lib/twitter_cldr/version.rb

@@ -4,5 +4,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/resources/collation/tailoring/be.yml

@@ -3,4 +3,4 @@
 :tailored_table: |-
   0435 0308; [5C35, 5, 5]
   0415 0308; [5C35, 5, 86]
-:suppressed_contractions: "ІАГЕЖЗКОЧЫЭагежзкочыэіѴѵӘәӨө"
+:suppressed_contractions: ІАГЕЖЗКОЧЫЭагежзкочыэіѴѵӘәӨө

data/resources/collation/tailoring/bg.yml

@@ -1,4 +1,4 @@
 ---
 :collator_options: {}
 :tailored_table: ''
-:suppressed_contractions: "ІАГЕЖЗКОУЧЫЭагежзкоучыэіѴѵӘәӨө"
+:suppressed_contractions: ІАГЕЖЗКОУЧЫЭагежзкоучыэіѴѵӘәӨө

data/resources/collation/tailoring/en-GB.yml

@@ -0,0 +1,4 @@
+---
+:collator_options: {}
+:tailored_table: ''
+:suppressed_contractions: ''

data/resources/collation/tailoring/he.yml

@@ -1,6 +1,6 @@
 ---
 :collator_options: {}
 :tailored_table: |-
-  05F3; [C2C, 5, 5]
-  05F4; [C2E, 5, 5]
+  05F3; [A93, 4, 5][34, 0, C0]
+  05F4; [AA1, 4, 5]
 :suppressed_contractions: ''

data/resources/collation/tailoring/ru.yml

@@ -1,4 +1,4 @@
 ---
 :collator_options: {}
 :tailored_table: ''
-:suppressed_contractions: "ІАГЕЖЗКОУЧЫЭагежзкоучыэіѴѵӘәӨө"
+:suppressed_contractions: ІАГЕЖЗКОУЧЫЭагежзкоучыэіѴѵӘәӨө

data/resources/collation/tailoring/sr.yml

@@ -1,4 +1,4 @@
 ---
 :collator_options: {}
 :tailored_table: ''
-:suppressed_contractions: "ІАГЕЖЗИКОУЧЫЭагежзикоучыэіѴѵӘәӨө"
+:suppressed_contractions: ІАГЕЖЗИКОУЧЫЭагежзикоучыэіѴѵӘәӨө

data/resources/collation/tailoring/uk.yml

@@ -3,4 +3,4 @@
 :tailored_table: |-
   0491; [5C1B, 5, 5]
   0490; [5C1B, 5, 86]
-:suppressed_contractions: "АГЕЖЗКОУЧЫЭагежзкоучыэѴѵӘәӨө"
+:suppressed_contractions: АГЕЖЗКОУЧЫЭагежзкоучыэѴѵӘәӨө

data/resources/custom/locales/en-GB/units.yml

@@ -0,0 +1,19 @@
+---
+:en:
+  :units:
+    :day:
+      :abbreviated:
+        :one: ! '{0}d'
+        :other: ! '{0}d'
+    :hour:
+      :abbreviated:
+        :one: ! '{0}h'
+        :other: ! '{0}h'
+    :minute:
+      :abbreviated:
+        :one: ! '{0}m'
+        :other: ! '{0}m'
+    :second:
+      :abbreviated:
+        :one: ! '{0}s'
+        :other: ! '{0}s'

data/resources/locales/af/calendars.yml

@@ -3,11 +3,15 @@
   :calendars:
     :gregorian:
       :additional_formats:
+        :EHm: E HH:mm
+        :EHms: E HH:mm:ss
         :Ed: E d
-        :Gy: G y
-        :GyMMM: G y MMM
-        :GyMMMEd: G y MMM d, E
-        :GyMMMd: G y MMM d
+        :Ehm: E h:mm a
+        :Ehms: E h:mm:ss a
+        :Gy: y G
+        :GyMMM: MMM y G
+        :GyMMMEd: E, MMM d, y G
+        :GyMMMd: MMM d, y G
         :H: HH
         :Hm: HH:mm
         :Hms: HH:mm:ss
@@ -89,7 +93,8 @@
           0: voor Christus
           1: na Christus
         :narrow:
-          0: ''
+          0: B
+          1: A
       :fields:
         :day: Dag
         :dayperiod: AM/PM
@@ -190,10 +195,17 @@
       :periods:
         :format:
           :abbreviated: :calendars.gregorian.dayPeriods.format.wide
-          :narrow: :calendars.gregorian.dayPeriods.format.abbreviated
+          :narrow:
+            :am: a
+            :noon: n
+            :pm: p
           :wide:
             :am: vm.
+            :noon: noon
             :pm: nm.
+            :variant:
+              :am: a.m.
+              :pm: p.m.
         :stand-alone: {}
       :quarters:
         :format: