twitter_cldr 2.2.0 → 2.4.0

data/lib/twitter_cldr/resources/download.rb

@@ -8,7 +8,8 @@ require 'cldr/download'
 module TwitterCldr
   module Resources
 
-    CLDR_URL = 'http://unicode.org/Public/cldr/22.1/core.zip'
+    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'
 
     class << self
 
@@ -35,6 +36,11 @@ module TwitterCldr
         path
       end
 
+      def download_icu4j_if_necessary(path, url = ICU4J_URL)
+        download_if_necessary(path, url)
+        path
+      end
+
     end
 
   end

data/lib/twitter_cldr/resources/language_codes_importer.rb

@@ -13,17 +13,17 @@ module TwitterCldr
       BCP_47_FILE, ISO_639_FILE = %w[bcp-47.txt iso-639.txt]
 
       INPUT_DATA = {
-          BCP_47_FILE  => 'http://www.iana.org/assignments/language-subtag-registry',
-          ISO_639_FILE => 'http://www.sil.org/iso639-3/iso-639-3_20120614.tab'
+        BCP_47_FILE  => 'http://www.iana.org/assignments/language-subtag-registry',
+        ISO_639_FILE => 'http://www-01.sil.org/iso639-3/iso-639-3_20120614.tab'
       }
 
       KEYS_TO_STANDARDS = {
-          :iso_639_1      => :iso_639_1,
-          :iso_639_2      => :iso_639_2,
-          :iso_639_2_term => :iso_639_2,
-          :iso_639_3      => :iso_639_3,
-          :bcp_47         => :bcp_47,
-          :bcp_47_alt     => :bcp_47
+        :iso_639_1      => :iso_639_1,
+        :iso_639_2      => :iso_639_2,
+        :iso_639_2_term => :iso_639_2,
+        :iso_639_3      => :iso_639_3,
+        :bcp_47         => :bcp_47,
+        :bcp_47_alt     => :bcp_47
       }
 
       def initialize(input_path, output_path)

data/lib/twitter_cldr/resources/loader.rb

@@ -77,7 +77,7 @@ module TwitterCldr
         base = YAML.load(read_resource_file(path))
         custom_path = File.join("custom", path)
 
-        if merge_custom && resource_exists?(custom_path)
+        if merge_custom && resource_exists?(custom_path) && !TwitterCldr.disable_custom_locale_resources
           TwitterCldr::Utils.deep_merge!(base, load_resource(custom_path, false))
         end
 

data/lib/twitter_cldr/resources/tailoring_importer.rb

@@ -34,8 +34,6 @@ module TwitterCldr
 
       EMPTY_TAILORING_DATA = { :collator_options => {}, :tailored_table => '', :suppressed_contractions => '' }
 
-      ICU4J_URL = 'http://download.icu-project.org/files/icu4j/49.1/icu4j-49_1.jar'
-
       class ImportError < RuntimeError; end
 
       # Arguments:
@@ -59,7 +57,7 @@ module TwitterCldr
       private
 
       def require_icu4j(icu4j_path)
-        TwitterCldr::Resources.download_if_necessary(icu4j_path, ICU4J_URL)
+        TwitterCldr::Resources.download_icu4j_if_necessary(icu4j_path)
         require icu4j_path
       end
 

data/lib/twitter_cldr/shared/languages.rb

@@ -38,7 +38,7 @@ module TwitterCldr
 
         def is_rtl?(locale)
           locale = TwitterCldr.convert_locale(locale)
-          TwitterCldr.get_locale_resource(locale, :layout)[locale][:layout][:orientation][:characters] == "right-to-left"
+          TwitterCldr.get_locale_resource(locale, :layout)[locale][:layout][:orientation][:character_order] == "right-to-left"
         end
 
         protected

data/lib/twitter_cldr/tokenizers/calendars/datetime_tokenizer.rb

@@ -9,6 +9,7 @@ module TwitterCldr
       attr_reader :placeholders, :calendar_type
 
       VALID_TYPES = [:default, :full, :long, :medium, :short, :additional]
+      DEFAULT_TYPE = :medium
 
       def initialize(options = {})
         @calendar_type = options[:calendar_type] || TwitterCldr::DEFAULT_CALENDAR_TYPE
@@ -33,7 +34,6 @@ module TwitterCldr
         @base_path = [:calendars]
 
         @paths = {
-          :default    => [:formats, :datetime, :default],
           :full       => [:formats, :datetime, :full],
           :long       => [:formats, :datetime, :long],
           :medium     => [:formats, :datetime, :medium],
@@ -47,6 +47,7 @@ module TwitterCldr
       def tokens(options = {})
         @type = options[:type] || @type || :default
         @format = options[:format] || @format
+        @type = DEFAULT_TYPE if @type == :default
         tokens_for(full_path_for(paths[@type]))
       end
 

data/lib/twitter_cldr/version.rb

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

data/resources/collation/tailoring/af.yml

@@ -2,4 +2,3 @@
 :collator_options: {}
 :tailored_table: 0149; [41, 5, 10]
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/ar.yml

@@ -1,23 +1,14 @@
 ---
 :collator_options: {}
-:tailored_table: ! '0629; [6144, 87, 5]
-
+:tailored_table: |-
+  0629; [6144, 87, 5]
   FE94; [6144, 87, 6]
-
   FE93; [6144, 87, 7]
-
   0649; [6287, 87, 5]
-
   FBE8; [6287, 87, 6]
-
   FBE9; [6287, 87, 7]
-
   FEF0; [6287, 87, 8]
-
   FEEF; [6287, 87, 9]
-
   FC90; [6287, 87, A]
-
-  FC5D; [6287, 87, B]'
+  FC5D; [6287, 87, B]
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/be.yml

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

data/resources/collation/tailoring/bg.yml

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

data/resources/collation/tailoring/bn.yml

@@ -1,9 +1,7 @@
 ---
 :collator_options: {}
-:tailored_table: ! '0982; [6925, 5, 5][4, 0, C0]
-
+:tailored_table: |-
+  0982; [6925, 5, 5][4, 0, C0]
   0983; [6925, 5, 5][5, 0, C0]
-
-  0981; [6925, 5, 5][6, 0, C0]'
+  0981; [6925, 5, 5][6, 0, C0]
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/ca.yml

@@ -1,11 +1,8 @@
 ---
 :collator_options: {}
-:tailored_table: ! '0140; [3D, 87, 5]
-
+:tailored_table: |-
+  0140; [3D, 87, 5]
   006C 00B7; [3D, 87, 5]
-
   013F; [3D, 87, 86]
-
-  004C 00B7; [3D, 87, 86]'
+  004C 00B7; [3D, 87, 86]
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/cs.yml

@@ -1,27 +1,16 @@
 ---
 :collator_options: {}
-:tailored_table: ! '0063 030C; [2C04, 5, 5]
-
+:tailored_table: |-
+  0063 030C; [2C04, 5, 5]
   0043 030C; [2C04, 5, 86]
-
   0063 0068; [3604, 5, 5]
-
   0063 0048; [3604, 5, 46]
-
   0043 0068; [3604, 5, 47]
-
   0043 0048; [3604, 5, 88]
-
   0072 030C; [4A04, 5, 5]
-
   0052 030C; [4A04, 5, 86]
-
   0073 030C; [4C04, 5, 5]
-
   0053 030C; [4C04, 5, 86]
-
   007A 030C; [5A04, 5, 5]
-
-  005A 030C; [5A04, 5, 86]'
+  005A 030C; [5A04, 5, 86]
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/cy.yml

@@ -1,51 +1,28 @@
 ---
 :collator_options: {}
-:tailored_table: ! '0063 0068; [2C04, 5, 5]
-
+:tailored_table: |-
+  0063 0068; [2C04, 5, 5]
   0043 0068; [2C04, 5, 46]
-
   0043 0048; [2C04, 5, 87]
-
   0064 0064; [2E04, 5, 5]
-
   0044 0064; [2E04, 5, 46]
-
   0044 0044; [2E04, 5, 87]
-
   0066 0066; [3204, 5, 5]
-
   0046 0066; [3204, 5, 46]
-
   0046 0046; [3204, 5, 87]
-
   006E 0067; [3404, 5, 5]
-
   004E 0067; [3404, 5, 46]
-
   004E 0047; [3404, 5, 87]
-
   006C 006C; [3E04, 5, 5]
-
   004C 006C; [3E04, 5, 46]
-
   004C 004C; [3E04, 5, 87]
-
   0070 0068; [4604, 5, 5]
-
   0050 0068; [4604, 5, 46]
-
   0050 0048; [4604, 5, 87]
-
   0072 0068; [4A04, 5, 5]
-
   0052 0068; [4A04, 5, 46]
-
   0052 0048; [4A04, 5, 87]
-
   0074 0068; [4E04, 5, 5]
-
   0054 0068; [4E04, 5, 46]
-
-  0054 0048; [4E04, 5, 87]'
+  0054 0048; [4E04, 5, 87]
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/da.yml

@@ -1,62 +1,34 @@
 ---
 :collator_options:
   :case_first: :upper
-:tailored_table: ! '0111; [2D, 87, 5]
-
+:tailored_table: |-
+  0111; [2D, 87, 5]
   0110; [2D, 87, 86]
-
   00F0; [2D, 88, 5]
-
   00D0; [2D, 88, 86]
-
   00FE; [4D, 5, 6][35, 5, 5]
-
   00DE; [4D, 5, 90][35, 5, 8F]
-
   0075 0308; [57, 87, 5]
-
   0055 0308; [57, 87, 86]
-
   0075 030B; [57, 88, 5]
-
   0055 030B; [57, 88, 86]
-
   00E6; [5AA1, 5, 5][4, 0, C0]
-
   00C6; [5AA1, 5, 86][4, 0, C0]
-
   0061 0308; [5AA1, 87, 5][4, 0, C0]
-
   0041 0308; [5AA1, 87, 86][4, 0, C0]
-
   0065 0328; [5AA1, 88, 5][4, 0, C0]
-
   0045 0328; [5AA1, 88, 86][4, 0, C0]
-
   00F8; [5AA1, 5, 5][5, 0, C0]
-
   00D8; [5AA1, 5, 86][5, 0, C0]
-
   006F 0308; [5AA1, 87, 5][5, 0, C0]
-
   004F 0308; [5AA1, 87, 86][5, 0, C0]
-
   006F 030B; [5AA1, 88, 5][5, 0, C0]
-
   004F 030B; [5AA1, 88, 86][5, 0, C0]
-
   0153; [5AA1, 89, 5][5, 0, C0]
-
   0152; [5AA1, 89, 86][5, 0, C0]
-
   0061 030A; [5AA1, 5, 5][6, 0, C0]
-
   0041 030A; [5AA1, 5, 86][6, 0, C0]
-
   0061 0061; [5AA1, 5, 7][6, 0, C0]
-
   0041 0061; [5AA1, 5, 48][6, 0, C0]
-
-  0041 0041; [5AA1, 5, 89][6, 0, C0]'
+  0041 0041; [5AA1, 5, 89][6, 0, C0]
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/de.yml

@@ -2,4 +2,3 @@
 :collator_options: {}
 :tailored_table: ''
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/el.yml

@@ -2,4 +2,3 @@
 :collator_options: {}
 :tailored_table: ''
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/en.yml

@@ -2,4 +2,3 @@
 :collator_options: {}
 :tailored_table: ''
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/es.yml

@@ -1,7 +1,6 @@
 ---
 :collator_options: {}
-:tailored_table: ! '006E 0303; [4204, 5, 5]
-
-  004E 0303; [4204, 5, 86]'
+:tailored_table: |-
+  006E 0303; [4204, 5, 5]
+  004E 0303; [4204, 5, 86]
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/eu.yml

@@ -2,4 +2,3 @@
 :collator_options: {}
 :tailored_table: ''
 :suppressed_contractions: ''
-...

data/resources/collation/tailoring/fa.yml

@@ -1,75 +1,40 @@
 ---
 :collator_options: {}
-:tailored_table: ! '0650; [0, D3, 5][0, A, C0]
-
+:tailored_table: |-
+  0650; [0, D3, 5][0, A, C0]
   064F; [0, D3, 5][0, B, C0]
-
   064B; [0, D3, 5][0, C, C0]
-
   064D; [0, D3, 5][0, D, C0]
-
   064C; [0, D3, 5][0, E, C0]
-
   0627 0653; [6125, 5, 5]
-
   0671; [6126, 87, 5]
-
   0621; [6127, 5, 5]
-
   0627 0654; [6127, 87, 5]
-
   0672; [6127, 88, 5]
-
   0627 0655; [6127, 89, 5]
-
   0673; [6127, 8A, 5]
-
   0648 0654; [6127, 8B, 5]
-
   06CC 0654; [6127, 8C, 5]
-
   0649 0654; [6127, 8C, 6]
-
   064A 0654; [6127, 8C, 7]
-
   06AA; [6213, 87, 5]
-
   06AB; [6213, 88, 5]
-
   0643; [6213, 89, 5]
-
   06AC; [6213, 8A, 5]
-
   06AD; [6213, 8B, 5]
-
   06AE; [6213, 8C, 5]
-
   0647; [627E, 5, 5]
-
   06D5; [627E, 87, 5]
-
   06C1; [627E, 88, 5]
-
   0629; [627E, 89, 5]
-
   06C3; [627E, 8A, 5]
-
   06D5 0654; [627E, 8B, 5]
-
   06BE; [627E, 8C, 5]
-
   0649; [6289, 87, 5]
-
   06D2; [6289, 88, 5]
-
   064A; [6289, 89, 5]
-
   06D0; [6289, 8A, 5]
-
   06D1; [6289, 8B, 5]
-
   06CD; [6289, 8C, 5]
-
-  06CE; [6289, 8D, 5]'
+  06CE; [6289, 8D, 5]
 :suppressed_contractions: ''
-...