twitter_cldr 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3393ba4d3d98613d00528bdcec456e18bc6a3aed3f9c51a40d75a390056c6c6
-  data.tar.gz: 0d7d4ffd39998e264f25d25ba8fdb5d56d79d10c47ccadb7d4856a83e432a113
+  metadata.gz: e16faa9cf2e7fda6f36008b520e7f18cc1cd64c9e5c0a9c01cc3c787cfddf38d
+  data.tar.gz: 0750c3375803f85d1c126b473d15b11e91429af41ca6940da670732ebe57ce8d
 SHA512:
-  metadata.gz: 4844ca03544ed92311170d968c9915bfc2b5865a17db8d0dbfb7834364f8ab208cb3f603c99a3a7695fbc619a07df98161245cf2247b957e7d51a461bfebe309
-  data.tar.gz: 9c7d78338b5eb3199b016161eecc4c6d293fbe8628934a33e9deaaf828f90b771404ca2e77e4a2e09846397c45b34c97d7e315a2bc26393af5e0ce9f07648e1c
+  metadata.gz: ffa52ad4c2ae417fca4e1d87c23272845dbfd7069f14984b4c123ebdf770410cef4ae38c552d1fe225727897f926fb671a3b7624a48a3429e6ba8518722ba412
+  data.tar.gz: f839fa10c1623407fa95a8f7e044376b3f139ba2bd602d0d57c6982899455c046f0e947d9f047a6f7150bbbc4b75bf1010562c720656afec25fde2ebe2b55853

data/lib/twitter_cldr/shared/locale.rb

@@ -104,22 +104,24 @@ module TwitterCldr
             types << :script   if script?(subtag)
             types << :region   if region?(subtag)
             types << :variant  if variant?(subtag)
+
+            types << :language if language?(normalize_subtag(subtag, :language))
+            types << :script   if script?(normalize_subtag(subtag, :script))
+            types << :region   if region?(normalize_subtag(subtag, :region))
+            types << :variant  if variant?(normalize_subtag(subtag, :variant))
           end
         end
 
         def language?(subtag)
-          subtag = normalize_subtag(subtag, :language)
           languages.include?(subtag) || language_aliases.include?(subtag.to_sym)
         end
 
         def script?(subtag)
-          subtag = normalize_subtag(subtag, :script)
           scripts.include?(subtag) ||
             !!PropertyValueAliases.long_alias_for('sc', subtag)
         end
 
         def region?(subtag)
-          subtag = normalize_subtag(subtag, :region)
           territories.include?(subtag) || region_aliases.include?(subtag.to_sym)
         end
 

data/lib/twitter_cldr/version.rb

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

data/spec/shared/likely_subtags_spec.rb

@@ -49,6 +49,14 @@ describe TwitterCldr::Shared::LikelySubtags do
       verify_subtags(locale, 'en', 'Latn', 'US')
     end
 
+    it 'disambiguates between a language and region with the same code' do
+      locale = described_class.locale_for('und-CH')
+      verify_subtags(locale, 'de', 'Latn', 'CH')
+
+      locale = described_class.locale_for('und_Arab_AF')
+      verify_subtags(locale, 'ar', 'Arab', 'AF')
+    end
+
     it "raises an error if the subtags can't be identified" do
       locale = TwitterCldr::Shared::Locale.new('xz')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_cldr
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: camertron-eprun
@@ -3908,7 +3908,7 @@ homepage: https://twitter.com
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -3923,8 +3923,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby implementation of the ICU (International Components for Unicode) that
   uses the Common Locale Data Repository to format dates, plurals, and more.