twitter_cldr 6.6.1 → 6.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46779462152c01a424c966b9a2d8a4d7b3d50c41164fd054edc493f96ddef7f5
-  data.tar.gz: 20689d92c66c2a42b1bb9545495b789460a4b892f8fd6b187f9967a459467a00
+  metadata.gz: 86de4e3cfb05e54b776d518c6a4c6decb9aaa36ec36ae2593e487cb12d7299ad
+  data.tar.gz: 8abd9399b1d44d30cd2cf818ef2c881b8dace4cf042b33e8a6086b02b5a0b561
 SHA512:
-  metadata.gz: dc9567be97d3604bfcef46520704ce3d05e2a5f2916e857791cc76de2f67a45a9aa014c6b63327a34caf89e4681696664741037ccf57b5988a30ff5891173a7f
-  data.tar.gz: 99a1b37964339e2d77c9fb295a7269025d6ef6ab81f9514190d55644d96262b848e21f48e84746c7ccb05f138bf0ef611e132de5ad896c67fdfe3091a1ece924
+  metadata.gz: 57f9bb2095d152659a1a34f9a1c565496ddc6ac00cf5148f322709b5236d2c201502d7b9988e8ef7373ecff507b8fac944423d2c9a18dc8e65613fee9faf7440
+  data.tar.gz: 646cf95c956f2fa9655d4b96be566f4b59d18e5665ffe4bf04af3470aa0a75a9dbe1e163c74ed448eebed2b37ea98cd7e6c1b431e0b12c602a12a6cc47c438e4

data/lib/twitter_cldr/formatters/list_formatter.rb

@@ -62,7 +62,13 @@ module TwitterCldr
       end
 
       def resource_for_type(type)
-        resource[type]
+        loop do
+          if resource[type].is_a?(Symbol)
+            type = resource[:type].to_s.split('.').last
+          else
+            break resource[type]
+          end
+        end
       end
 
       def resource

data/lib/twitter_cldr/resources/list_formats_importer.rb

@@ -32,9 +32,23 @@ module TwitterCldr
           import_locale(locale)
           locales << locale
         end
+
+        puts
       end
 
       def import_locale(locale)
+        # The merging that happens here works at the listPatternPart level of granularity.
+        # In other words, a missing part will be filled in by any part with the same key
+        # in the locale's ancestor chain. The raw CLDR data contains the inheritance marker
+        # (i.e. "↑↑↑") for listPatterns that are missing parts, but the expanded data we
+        # get in the downloadable CLDR zip file doesn't include them or the inherited data,
+        # making it impossible for TwitterCLDR to know how it should handle missing keys.
+        # I believe whatever massage tool the CLDR maintainers use to generate the final
+        # data set doesn't take aliases into account, which explains the holes in the data.
+        # By allowing individual listPatternParts to be populated by data from ancestor
+        # locales, we fill in any missing parts at the minor risk of being slightly wrong
+        # when formatting lists. In my opinion, it's far better to produce a slightly wrong
+        # string than to error or produce an entirely empty string.
         data = requirements[:cldr].merge_each_ancestor(locale) do |ancestor_locale|
           ListFormats.new(ancestor_locale, requirements[:cldr]).to_h
         end
@@ -79,11 +93,7 @@ module TwitterCldr
             :default
           end
 
-          if aliased = pattern_node.xpath('alias').first
-            alias_type = aliased.attribute('path').value[/@type='([\w-]+)'/, 1]
-            pattern_result[pattern_type] = :"lists.#{alias_type || 'default'}"
-            next
-          end
+          pattern_node = pattern_for(pattern_type)
 
           pattern_result[pattern_type] = pattern_node.xpath('listPatternPart').each_with_object({}) do |type_node, type_result|
             type_result[type_node.attribute('type').value.to_sym] = type_node.content
@@ -91,6 +101,28 @@ module TwitterCldr
         end
       end
 
+      def pattern_for(type)
+        xpath = xpath_for(type)
+        pattern_node = doc.xpath(xpath)[0]
+        alias_node = pattern_node.xpath('alias')[0]
+
+        if alias_node
+          alias_type = alias_node.attribute('path').value[/@type='([\w-]+)'/, 1] || :default
+          # follow aliases so we can fully expand them
+          pattern_node = pattern_for(alias_type)
+        end
+
+        pattern_node
+      end
+
+      def xpath_for(type)
+        if type == :default
+          '//ldml/listPatterns/listPattern[not(@type)]'
+        else
+          "//ldml/listPatterns/listPattern[@type='#{type}']"
+        end
+      end
+
       def doc
         @doc ||= begin
           locale_fs = locale.to_s.gsub('-', '_')

data/lib/twitter_cldr/version.rb

@@ -4,5 +4,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  VERSION = '6.6.1'
+  VERSION = '6.6.2'
 end

data/resources/locales/af/lists.yml

@@ -13,9 +13,24 @@
       :end: "{0} of {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
-    :standard-narrow: :lists.standard-short
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :standard-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
       ? !ruby/symbol "2"
       : "{0} en {1}"

data/resources/locales/ar/lists.yml

@@ -14,10 +14,20 @@
       :middle: "{0} أو {1}"
       :start: "{0} أو {1}"
     :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
       :start: "{0} أو {1}"
     :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
       :middle: "{0} أو {1}"
+      :start: "{0}, {1}"
     :standard-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
       :end: "{0} و{1}"
       :middle: "{0} و{1}"
       :start: "{0} و{1}"
@@ -34,6 +44,8 @@
       :middle: "{0}، و{1}"
       :start: "{0}، و{1}"
     :unit-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
       :end: "{0} و{1}"
       :middle: "{0} و{1}"
       :start: "{0} و{1}"

data/resources/locales/az/lists.yml

@@ -16,13 +16,21 @@
     :or-narrow: 
       ? !ruby/symbol "2"
       : "{0}, yaxud {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :or-short: 
       ? !ruby/symbol "2"
       : "{0}, yaxud {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-narrow: 
       ? !ruby/symbol "2"
       : "{0}, {1}"
       :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
       ? !ruby/symbol "2"
       : "{0} və {1}"

data/resources/locales/be/lists.yml

@@ -13,9 +13,24 @@
       :end: "{0} ці {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
-    :standard-narrow: :lists.standard-short
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :standard-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
       ? !ruby/symbol "2"
       : "{0} і {1}"

data/resources/locales/bg/lists.yml

@@ -13,12 +13,27 @@
       :end: "{0} или {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-narrow: 
       ? !ruby/symbol "2"
       : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
       :end: "{0} и {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"

data/resources/locales/bn/lists.yml

@@ -13,12 +13,24 @@
       :end: "{0}, বা {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-narrow: 
       ? !ruby/symbol "2"
       : "{0}, {1}"
       :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
       ? !ruby/symbol "2"
       : "{0} এবং {1}"

data/resources/locales/bo/lists.yml

@@ -13,10 +13,45 @@
       :end: "{0}, or {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
-    :standard-narrow: :lists.standard-short
-    :standard-short: :lists.default
-    :unit: :lists.unit-short
-    :unit-narrow: :lists.unit-short
-    :unit-short: :lists.default
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :standard-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :standard-short: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :unit: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :unit-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :unit-short: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"

data/resources/locales/bs/lists.yml

@@ -13,9 +13,24 @@
       :end: "{0} ili {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
-    :standard-narrow: :lists.standard-short
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :standard-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
       ? !ruby/symbol "2"
       : "{0} i {1}"

data/resources/locales/ca/lists.yml

@@ -13,8 +13,18 @@
       :end: "{0} o {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-narrow: 
       ? !ruby/symbol "2"
       : "{0}, {1}"

data/resources/locales/cs/lists.yml

@@ -29,6 +29,8 @@
       ? !ruby/symbol "2"
       : "{0}, {1}"
       :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
       ? !ruby/symbol "2"
       : "{0} a {1}"

data/resources/locales/cy/lists.yml

@@ -13,8 +13,18 @@
       :end: "{0} neu {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-narrow: 
       ? !ruby/symbol "2"
       : "{0}, {1}"

data/resources/locales/da/lists.yml

@@ -17,11 +17,20 @@
       ? !ruby/symbol "2"
       : "{0} el. {1}"
       :end: "{0} el. {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :or-short: 
       ? !ruby/symbol "2"
       : "{0} el. {1}"
       :end: "{0} el. {1}"
-    :standard-narrow: :lists.standard-short
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :standard-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
       ? !ruby/symbol "2"
       : "{0} og {1}"

data/resources/locales/de-AT/lists.yml

@@ -13,9 +13,24 @@
       :end: "{0} oder {1}"
       :middle: "{0}, {1}"
       :start: "{0}, {1}"
-    :or-narrow: :lists.or-short
-    :or-short: :lists.or
-    :standard-narrow: :lists.standard-short
+    :or-narrow: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :or-short: 
+      ? !ruby/symbol "2"
+      : "{0} or {1}"
+      :end: "{0}, or {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
+    :standard-narrow: 
+      ? !ruby/symbol "2"
+      : "{0}, {1}"
+      :end: "{0}, {1}"
+      :middle: "{0}, {1}"
+      :start: "{0}, {1}"
     :standard-short: 
       ? !ruby/symbol "2"
       : "{0} und {1}"