worldwide 1.31.1 → 2.0.1

data/data/other/generated/sr-Latn-RS.yml

@@ -29,13 +29,13 @@ sr-Latn-RS:
       default: "%-d.%-m.%Y."
       billing: "%-d.%-m.%Y."
       yearless_ordinal: "%{ordinalized_day} %B"
-      today_at_time: "%02k:%M danas"
-      yesterday_at_time: "%02k:%M juče"
-      tomorrow_at_time: "%02k:%M sutra"
-      on_weekday_at_time: "%02k:%M %A"
-      on_date_time_current_year: "%02k:%M %-d. %b"
+      today_at_time: Danas u %02k:%M
+      yesterday_at_time: Juče u %02k:%M
+      tomorrow_at_time: Sutra u %02k:%M
+      on_weekday_at_time: u %A u %02k:%M
+      on_date_time_current_year: "%-d. %b u %02k:%M"
       on_date: "%-d. %b %Y."
-      ago: "%{time} ago"
+      ago: Pre %{time}
       x_hours_ago:
         few: pre %{count} sata
         one: pre %{count} sata
@@ -130,13 +130,13 @@ sr-Latn-RS:
       short: "%-d. %b %02k:%M"
       billing: "%-d.%-m.%Y."
       yearless_ordinal: "%{ordinalized_day} %B"
-      today_at_time: "%02k:%M danas"
-      yesterday_at_time: "%02k:%M juče"
-      tomorrow_at_time: "%02k:%M sutra"
-      on_weekday_at_time: "%02k:%M %A"
-      on_date_time_current_year: "%02k:%M %-d. %b"
+      today_at_time: Danas u %02k:%M
+      yesterday_at_time: Juče u %02k:%M
+      tomorrow_at_time: Sutra u %02k:%M
+      on_weekday_at_time: u %A u %02k:%M
+      on_date_time_current_year: "%-d. %b u %02k:%M"
       on_date: "%-d. %b %Y."
-      ago: "%{time} ago"
+      ago: Pre %{time}
       x_hours_ago:
         few: pre %{count} sata
         one: pre %{count} sata
@@ -146,7 +146,7 @@ sr-Latn-RS:
         one: pre %{count} minuta
         other: pre %{count} minuta
       cc_expiry_date: "%m/%Y"
-    am: am
-    pm: pm
-    just_now: sada
+    am: pre podne
+    pm: po podne
+    just_now: Upravo sada
     yesterday: juče

data/data/other/generated/sr-Latn-XK.yml

@@ -29,13 +29,13 @@ sr-Latn-XK:
       default: "%-d.%-m.%Y."
       billing: "%-d.%-m.%Y."
       yearless_ordinal: "%{ordinalized_day} %B"
-      today_at_time: "%02k:%M danas"
-      yesterday_at_time: "%02k:%M juče"
-      tomorrow_at_time: "%02k:%M sutra"
-      on_weekday_at_time: "%02k:%M %A"
-      on_date_time_current_year: "%02k:%M %-d. %b"
+      today_at_time: Danas u %02k:%M
+      yesterday_at_time: Juče u %02k:%M
+      tomorrow_at_time: Sutra u %02k:%M
+      on_weekday_at_time: u %A u %02k:%M
+      on_date_time_current_year: "%-d. %b u %02k:%M"
       on_date: "%-d. %b %Y."
-      ago: "%{time} ago"
+      ago: Pre %{time}
       x_hours_ago:
         few: pre %{count} sata
         one: pre %{count} sata
@@ -130,13 +130,13 @@ sr-Latn-XK:
       short: "%-d. %b %02k:%M"
       billing: "%-d.%-m.%Y."
       yearless_ordinal: "%{ordinalized_day} %B"
-      today_at_time: "%02k:%M danas"
-      yesterday_at_time: "%02k:%M juče"
-      tomorrow_at_time: "%02k:%M sutra"
-      on_weekday_at_time: "%02k:%M %A"
-      on_date_time_current_year: "%02k:%M %-d. %b"
+      today_at_time: Danas u %02k:%M
+      yesterday_at_time: Juče u %02k:%M
+      tomorrow_at_time: Sutra u %02k:%M
+      on_weekday_at_time: u %A u %02k:%M
+      on_date_time_current_year: "%-d. %b u %02k:%M"
       on_date: "%-d. %b %Y."
-      ago: "%{time} ago"
+      ago: Pre %{time}
       x_hours_ago:
         few: pre %{count} sata
         one: pre %{count} sata
@@ -146,7 +146,7 @@ sr-Latn-XK:
         one: pre %{count} minuta
         other: pre %{count} minuta
       cc_expiry_date: "%m/%Y"
-    am: am
-    pm: pm
-    just_now: sada
+    am: pre podne
+    pm: po podne
+    just_now: Upravo sada
     yesterday: juče

data/data/other/generated/sr-Latn.yml

@@ -29,13 +29,13 @@ sr-Latn:
       default: "%-d.%-m.%Y."
       billing: "%-d.%-m.%Y."
       yearless_ordinal: "%{ordinalized_day} %B"
-      today_at_time: "%02k:%M danas"
-      yesterday_at_time: "%02k:%M juče"
-      tomorrow_at_time: "%02k:%M sutra"
-      on_weekday_at_time: "%02k:%M %A"
-      on_date_time_current_year: "%02k:%M %-d. %b"
+      today_at_time: Danas u %02k:%M
+      yesterday_at_time: Juče u %02k:%M
+      tomorrow_at_time: Sutra u %02k:%M
+      on_weekday_at_time: u %A u %02k:%M
+      on_date_time_current_year: "%-d. %b u %02k:%M"
       on_date: "%-d. %b %Y."
-      ago: "%{time} ago"
+      ago: Pre %{time}
       x_hours_ago:
         few: pre %{count} sata
         one: pre %{count} sata
@@ -130,13 +130,13 @@ sr-Latn:
       short: "%-d. %b %02k:%M"
       billing: "%-d.%-m.%Y."
       yearless_ordinal: "%{ordinalized_day} %B"
-      today_at_time: "%02k:%M danas"
-      yesterday_at_time: "%02k:%M juče"
-      tomorrow_at_time: "%02k:%M sutra"
-      on_weekday_at_time: "%02k:%M %A"
-      on_date_time_current_year: "%02k:%M %-d. %b"
+      today_at_time: Danas u %02k:%M
+      yesterday_at_time: Juče u %02k:%M
+      tomorrow_at_time: Sutra u %02k:%M
+      on_weekday_at_time: u %A u %02k:%M
+      on_date_time_current_year: "%-d. %b u %02k:%M"
       on_date: "%-d. %b %Y."
-      ago: "%{time} ago"
+      ago: Pre %{time}
       x_hours_ago:
         few: pre %{count} sata
         one: pre %{count} sata
@@ -146,7 +146,7 @@ sr-Latn:
         one: pre %{count} minuta
         other: pre %{count} minuta
       cc_expiry_date: "%m/%Y"
-    am: am
-    pm: pm
-    just_now: sada
+    am: pre podne
+    pm: po podne
+    just_now: Upravo sada
     yesterday: juče

data/data/other/generated/sr.yml

@@ -29,74 +29,74 @@ sr:
       default: "%-d.%-m.%Y."
       billing: "%-d.%-m.%Y."
       yearless_ordinal: "%{ordinalized_day} %B"
-      today_at_time: "%02k:%M данас"
-      yesterday_at_time: "%02k:%M јуче"
-      tomorrow_at_time: "%02k:%M сутра"
-      on_weekday_at_time: "%02k:%M %A"
-      on_date_time_current_year: "%02k:%M %-d. %b"
+      today_at_time: Danas u %02k:%M
+      yesterday_at_time: Juče u %02k:%M
+      tomorrow_at_time: Sutra u %02k:%M
+      on_weekday_at_time: u %A u %02k:%M
+      on_date_time_current_year: "%-d. %b u %02k:%M"
       on_date: "%-d. %b %Y."
-      ago: "%{time} ago"
+      ago: Pre %{time}
       x_hours_ago:
-        few: пре %{count} сата
-        one: пре %{count} сата
-        other: пре %{count} сати
+        few: pre %{count} sata
+        one: pre %{count} sata
+        other: pre %{count} sati
       x_minutes_ago:
-        few: пре %{count} минута
-        one: пре %{count} минута
-        other: пре %{count} минута
+        few: pre %{count} minuta
+        one: pre %{count} minuta
+        other: pre %{count} minuta
       cc_expiry_date: "%m/%Y"
     abbr_day_names:
-    - нед
-    - пон
-    - уто
-    - сре
-    - чет
-    - пет
-    - суб
+    - ned
+    - pon
+    - uto
+    - sre
+    - čet
+    - pet
+    - sub
     abbr_month_names:
     - ''
-    - јан
-    - феб
-    - мар
-    - апр
-    - мај
-    - јун
-    - јул
-    - авг
-    - сеп
-    - окт
-    - нов
-    - дец
+    - jan
+    - feb
+    - mar
+    - apr
+    - maj
+    - jun
+    - jul
+    - avg
+    - sep
+    - okt
+    - nov
+    - dec
     day_names:
-    - недеља
-    - понедељак
-    - уторак
-    - среда
-    - четвртак
-    - петак
-    - субота
+    - nedelja
+    - ponedeljak
+    - utorak
+    - sreda
+    - četvrtak
+    - petak
+    - subota
     month_names:
     - ''
-    - јануар
-    - фебруар
-    - март
-    - април
-    - мај
-    - јун
-    - јул
-    - август
-    - септембар
-    - октобар
-    - новембар
-    - децембар
+    - januar
+    - februar
+    - mart
+    - april
+    - maj
+    - jun
+    - jul
+    - avgust
+    - septembar
+    - oktobar
+    - novembar
+    - decembar
     relative_day_names:
-      this_week: ове недеље
-      this_month: овог месеца
-      day_before_yesterday: прекјуче
-      yesterday: јуче
-      today: данас
-      tomorrow: сутра
-      day_after_tomorrow: прекосутра
+      this_week: ove nedelje
+      this_month: ovog meseca
+      day_before_yesterday: prekjuče
+      yesterday: juče
+      today: danas
+      tomorrow: sutra
+      day_after_tomorrow: prekosutra
     order:
     - :day
     - :month
@@ -130,23 +130,23 @@ sr:
       short: "%-d. %b %02k:%M"
       billing: "%-d.%-m.%Y."
       yearless_ordinal: "%{ordinalized_day} %B"
-      today_at_time: "%02k:%M данас"
-      yesterday_at_time: "%02k:%M јуче"
-      tomorrow_at_time: "%02k:%M сутра"
-      on_weekday_at_time: "%02k:%M %A"
-      on_date_time_current_year: "%02k:%M %-d. %b"
+      today_at_time: Danas u %02k:%M
+      yesterday_at_time: Juče u %02k:%M
+      tomorrow_at_time: Sutra u %02k:%M
+      on_weekday_at_time: u %A u %02k:%M
+      on_date_time_current_year: "%-d. %b u %02k:%M"
       on_date: "%-d. %b %Y."
-      ago: "%{time} ago"
+      ago: Pre %{time}
       x_hours_ago:
-        few: пре %{count} сата
-        one: пре %{count} сата
-        other: пре %{count} сати
+        few: pre %{count} sata
+        one: pre %{count} sata
+        other: pre %{count} sati
       x_minutes_ago:
-        few: пре %{count} минута
-        one: пре %{count} минута
-        other: пре %{count} минута
+        few: pre %{count} minuta
+        one: pre %{count} minuta
+        other: pre %{count} minuta
       cc_expiry_date: "%m/%Y"
-    am: am
-    pm: pm
-    just_now: сада
-    yesterday: јуче
+    am: pre podne
+    pm: po podne
+    just_now: Upravo sada
+    yesterday: juče

data/data/other/hand_translated/sr.yml

@@ -0,0 +1,15 @@
+---
+sr:
+  date_time_translation:
+    today_at_time: Danas u %{time}
+    yesterday_at_time: Juče u %{time}
+    tomorrow_at_time: Sutra u %{time}
+    on_weekday_at_time: u %{weekday_name} u %{time}
+    on_date_time_current_year: "%{month_and_day} u %{time}"
+    on_date: "%{date}"
+    ago: Pre %{time}
+    am: pre podne
+    pm: po podne
+    just_now: Upravo sada
+    this_week: ove nedelje
+    this_month: ovog meseca

data/data/other/paths.txt

@@ -874,6 +874,7 @@
 /data/other/hand_translated/ru.yml
 /data/other/hand_translated/sk.yml
 /data/other/hand_translated/sl.yml
+/data/other/hand_translated/sr.yml
 /data/other/hand_translated/sv.yml
 /data/other/hand_translated/ta.yml
 /data/other/hand_translated/te.yml

data/lib/worldwide/locale.rb

@@ -11,6 +11,7 @@ module Worldwide
 
       @code = code.to_sym
       @name_cache = {}
+      @endonym_cache = {}
     end
 
     # Special CLDR value
@@ -47,7 +48,8 @@ module Worldwide
     end
 
     def name(locale: I18n.locale, context: :middle_of_sentence, throw: true)
-      @name_cache[context] ||= I18n.with_locale(locale) do
+      cache_key = [locale&.to_sym, context]
+      @name_cache[cache_key] ||= I18n.with_locale(locale) do
         # Try to find a language name as specific as possible in the locale we wanted.
         exonym(target_locale: locale, context: context) ||
 
@@ -68,48 +70,46 @@ module Worldwide
           I18n::MissingTranslation.new(locale, "languages.#{code}")
       end
 
-      if @name_cache[context].is_a?(I18n::MissingTranslation)
-        raise @name_cache[context] if throw
+      if @name_cache[cache_key].is_a?(I18n::MissingTranslation)
+        raise @name_cache[cache_key] if throw
 
         return
       end
 
-      @name_cache[context]
+      @name_cache[cache_key]
     end
 
     # The language's name in that language ("endonym").
     def endonym(context: :middle_of_sentence, throw: true)
-      return @endonym if defined?(@endonym)
+      @endonym_cache[context] ||= begin
+        result = begin
+          lookup(code, locale: code)
+        rescue I18n::InvalidLocale => e
+          raise e if throw
+        end
 
-      begin
-        @endonym = lookup(code, locale: code)
-      rescue I18n::InvalidLocale => e
-        raise e if throw
+        result = Worldwide::Cldr::ContextTransforms.transform(result, :languages, context, locale: code) unless result.nil?
+        result || I18n::MissingTranslation.new(code, "languages.#{code}")
       end
 
-      @endonym = Worldwide::Cldr::ContextTransforms.transform(@endonym, :languages, context, locale: code) unless @endonym.nil?
-      @endonym ||= I18n::MissingTranslation.new(code, "languages.#{code}")
-
-      if @endonym.is_a?(I18n::MissingTranslation)
-        raise @endonym if throw
+      if @endonym_cache[context].is_a?(I18n::MissingTranslation)
+        raise @endonym_cache[context] if throw
 
         return
       end
 
-      @endonym
+      @endonym_cache[context]
     end
 
     private
 
     def exonym(target_locale:, context:)
-      return @exonym if defined?(@exonym)
-
       # Try to find a language name as specific as possible in the locale we wanted.
       # We chop the hyphens to get more and more general language names
       # (e.g., "Traditional Chinese as spoken in Hong Kong" (zh-Hant-HK) -> "Traditional Chinese" (zh-Hant) -> "Chinese" (zh))
       # and rely on `territories_suffix` to add in additional details after.
       # It's just a heuristic and definitely not perfect (for the really important ones, we can manually patch the data)
-      @exonym = chop(code.to_s, "-").each_with_index do |language, i|
+      chop(code.to_s, "-").each_with_index do |language, i|
         result = lookup(language, locale: target_locale)
         if result
           transformed = Worldwide::Cldr::ContextTransforms.transform(result, :languages, context, locale: target_locale)
@@ -119,11 +119,8 @@ module Worldwide
     end
 
     def name_in_default_locale(context:)
-      return @name_in_default_locale if defined?(@name_in_default_locale)
-
-      @name_in_default_locale = lookup(code, locale: I18n.default_locale)
-      @name_in_default_locale = Worldwide::Cldr::ContextTransforms.transform(@name_in_default_locale, :languages, context, locale: I18n.default_locale) unless @name_in_default_locale.nil?
-      @name_in_default_locale
+      result = lookup(code, locale: I18n.default_locale)
+      Worldwide::Cldr::ContextTransforms.transform(result, :languages, context, locale: I18n.default_locale) unless result.nil?
     end
 
     def lookup(key, locale:)

data/lib/worldwide/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Worldwide
-  VERSION = "1.31.1"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worldwide
 version: !ruby/object:Gem::Version
-  version: 1.31.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Shopify
@@ -3935,8 +3935,21 @@ files:
 - data/cldr/locales/sr-Cyrl-XK/languages.yml
 - data/cldr/locales/sr-Cyrl-XK/plural_rules.yml
 - data/cldr/locales/sr-Cyrl-XK/territories.yml
+- data/cldr/locales/sr-Cyrl/calendars.yml
 - data/cldr/locales/sr-Cyrl/characters.yml
+- data/cldr/locales/sr-Cyrl/currencies.yml
+- data/cldr/locales/sr-Cyrl/delimiters.yml
+- data/cldr/locales/sr-Cyrl/fields.yml
+- data/cldr/locales/sr-Cyrl/languages.yml
+- data/cldr/locales/sr-Cyrl/lists.yml
+- data/cldr/locales/sr-Cyrl/numbers.yml
 - data/cldr/locales/sr-Cyrl/plural_rules.yml
+- data/cldr/locales/sr-Cyrl/plurals.rb
+- data/cldr/locales/sr-Cyrl/rbnf.yml
+- data/cldr/locales/sr-Cyrl/subdivisions.yml
+- data/cldr/locales/sr-Cyrl/territories.yml
+- data/cldr/locales/sr-Cyrl/timezones.yml
+- data/cldr/locales/sr-Cyrl/units.yml
 - data/cldr/locales/sr-Latn-BA/calendars.yml
 - data/cldr/locales/sr-Latn-BA/characters.yml
 - data/cldr/locales/sr-Latn-BA/currencies.yml
@@ -5596,6 +5609,7 @@ files:
 - data/other/hand_translated/ru.yml
 - data/other/hand_translated/sk.yml
 - data/other/hand_translated/sl.yml
+- data/other/hand_translated/sr.yml
 - data/other/hand_translated/sv.yml
 - data/other/hand_translated/ta.yml
 - data/other/hand_translated/te.yml
@@ -9543,7 +9557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.22
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Internationalization and localization APIs
 test_files: []