Upgrade to CLDR v46, Unicode v16

Author: camertron

.github/workflows/unit_tests.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2]
+        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby ${{ matrix.ruby-version }}

CHANGELOG.md

@@ -4,7 +4,6 @@ gemspec
 
 group :development, :test do
   gem 'rake'
-  gem 'pry-byebug' unless RUBY_PLATFORM == 'java'
   gem 'ruby-prof' unless RUBY_PLATFORM == 'java'
   gem 'regexp_parser', '~> 0.5'
   gem 'benchmark-ips'
@@ -13,7 +12,7 @@ group :development, :test do
   # gemspec allows any version, but most people are probably using 1.x, so
   # let's test and develop against that
   gem 'tzinfo', '< 2'
-  gem 'tzinfo-data', '= 1.2023.3'  # try to keep in sync with ICU
+  gem 'tzinfo-data', '= 1.2024.2'  # try to keep in sync with ICU
 end
 
 group :development do

Gemfile

@@ -40,7 +40,7 @@ TwitterCldr patches core Ruby objects like `Integer` and `Date` to make localiza
 1337.localize(:es).to_s                                    # <%= assert(1337.localize(:es).to_s, "1.337").inspect %>
 
 # currencies, default USD
-1337.localize(:es).to_currency.to_s                        # <%= assert(1337.localize(:es).to_currency.to_s, "1.337,00 $").inspect %>
+1337.localize(:es).to_currency.to_s                        # <%= assert(1337.localize(:es).to_currency.to_s, "1.337,00 US$").inspect %>
 1337.localize(:es).to_currency.to_s(:currency => "EUR")    # <%= assert(1337.localize(:es).to_currency.to_s(:currency => "EUR"), "1.337,00 €").inspect %>
 
 # percentages
@@ -60,7 +60,7 @@ num = TwitterCldr::Localized::LocalizedNumber.new(1337, :es)
 num.to_currency.to_s  # ...etc
 ```
 
-<% assert(TwitterCldr::Localized::LocalizedNumber.new(1337, :es).to_currency.to_s, "1.337,00 $") %>
+<% assert(TwitterCldr::Localized::LocalizedNumber.new(1337, :es).to_currency.to_s, "1.337,00 US$") %>
 
 #### More on Currencies
 
@@ -71,7 +71,7 @@ If you're looking for a list of supported currencies, use the `TwitterCldr::Shar
 TwitterCldr::Shared::Currencies.currency_codes             # <%= ellipsize(assert(TwitterCldr::Shared::Currencies.currency_codes.sort[0..3], ["ADP", "AED", "AFA", "AFN"])) %>
 
 # data for a specific currency code
-TwitterCldr::Shared::Currencies.for_code("CAD")            # <%= assert(TwitterCldr::Shared::Currencies.for_code("CAD"), {:currency=>:CAD, :name=>"Canadian Dollar", :cldr_symbol=>"CA$", :symbol=>"$", :code_points=>[36]}).inspect %>
+TwitterCldr::Shared::Currencies.for_code("CAD")            # <%= assert(TwitterCldr::Shared::Currencies.for_code("CAD"), {:currency=>:CAD, :name=>"Canadian Dollar", :cldr_symbol=>"CA$", :symbol=>"CA$", :code_points=>[67, 65, 36]}).inspect %>
 ```
 
 #### Short / Long Decimals
@@ -92,7 +92,7 @@ TwitterCLDR supports formatting numbers with an attached unit, for example "12 d
 
 ```ruby
 12.localize.to_unit.length_mile  # <%= assert(12.localize.to_unit.length_mile, "12 miles").inspect %>
-12.localize(:ru).to_unit.length_mile  # <%= assert(12.localize(:ru).to_unit.length_mile, "12 миль").inspect %>
+12.localize(:ru).to_unit.length_mile  # <%= assert(12.localize(:ru).to_unit.length_mile, "12 милях").inspect %>
 ```
 Units support a few different forms, long, short, and narrow:
 

README.md

@@ -13,8 +13,6 @@ require 'rubygems/package_task'
 
 require './lib/twitter_cldr'
 
-require 'pry-byebug' unless RUBY_PLATFORM == 'java'
-
 Bundler::GemHelper.install_tasks
 
 task default: :spec

README.md.erb

@@ -175,9 +175,8 @@ def formats(type)
       def additional_formats
         return {} unless calendar
 
-        dtd.find_attr('dateFormatItem', 'id').values.each_with_object({}) do |id, result|
-          node = calendar.xpath("dateTimeFormats/availableFormats/dateFormatItem[@id='#{id}']").first
-          result[id] = node.content if node
+        calendar.xpath("dateTimeFormats/availableFormats/dateFormatItem").each_with_object({}) do |date_format_item, result|
+          result[date_format_item.attribute("id").value] = date_format_item.content
         end
       end
 

Rakefile

@@ -82,20 +82,11 @@ def clean_up_name(name)
       end
 
       def import_ruleset(locale, formatter, ruleset_name)
-        test_numbers_for(locale).each_with_object({}) do |num, ret|
+        TEST_NUMBERS.each_with_object({}) do |num, ret|
           ret[num] = formatter.format(num, ruleset_name)
         end
       end
 
-      def test_numbers_for(locale)
-        # for some reason, russian doesn't support large numbers
-        if locale.to_s == 'ru'
-          TEST_NUMBERS - [138_400]
-        else
-          TEST_NUMBERS
-        end
-      end
-
       def output_file_for(locale)
         File.join(params.fetch(:output_path), locale, 'rbnf_test.yml')
       end

lib/twitter_cldr/resources/calendars_importer.rb

@@ -85,6 +85,8 @@ def generate_test_cases_for_locale(locale)
         ulocale = ulocale_class.new(locale.to_s)
 
         TZInfo::Timezone.all_identifiers.each_with_object({}) do |tz_id, ret|
+          next if tz_id == 'Factory'
+
           tz = tz_class.getTimeZone(tz_id)
           offset = tz.getRawOffset
 

lib/twitter_cldr/resources/rbnf_test_importer.rb

@@ -130,7 +130,7 @@ def timezones
             short = nodes_to_hash(zone.xpath('short/*'))
             result[type][:short] = short unless short.empty?
             city = zone.xpath('exemplarCity').first
-            if city && !unconfirmed_draft?(city)
+            if city && !unconfirmed_draft?(city) && !secondary?(city)
               result[type][:city] = city.content
             end
             result
@@ -165,6 +165,12 @@ def unconfirmed_draft?(node)
             node.attributes['draft'].value == 'unconfirmed'
         end
 
+        def secondary?(node)
+          node &&
+            node.attributes['alt'] &&
+            node.attributes['alt'].value == 'secondary'
+        end
+
         def doc
           @doc ||= begin
             locale_fs = locale.to_s.gsub('-', '_')