gettext 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30955d3f68dfd548513675212b0b2436aab9c105b24ebd82b02d905a24b33739
-  data.tar.gz: 8f56bde4bf561174dadf631d7ccd434f31fe8945386b85f0fa274e544f8d4c7e
+  metadata.gz: 8b06a32f776c073ec316860952a830ed9941ce67ab34b0e1f111f1009ba8842d
+  data.tar.gz: 9736e8cf70f1faeb97daed575e020e3edd2bd76daab2f069cfaf103dbb0e51e6
 SHA512:
-  metadata.gz: 1129a8825148863c28e8dec1ae2bcf86cc830a98836dcfa4baabeed83e45536389b2fa1e26275f4b54a7060826d6b966783a07e84cb126f1b906c0e77ee81bdf
-  data.tar.gz: 816baa0a49fc068e0e14329828783a97b5122a3b8c6dae7cdefd67dc67f9d14ad9fefe28a90a9ee786ef69b926a80596325fb81cd683798d59dd3a8bb704de4b
+  metadata.gz: f3480005cc4f1a84ef2fbf53c25c5d198b871b5fed9885f4fd352a90815d78ad0bde1c76234fa5f10809c5b0c35e8f9c1518a51ec963e24d95fc7fd98b5ccecf
+  data.tar.gz: fc670a833c0d30e6d3c36b086e9298a39145ca105c9134a12667343f4c863a978b5820ef6c08b0dad35efd7a6a223c677d9085106d4f72241b0f8a0079196575

data/doc/text/news.md

@@ -1,5 +1,22 @@
 # News
 
+## 3.4.2: 2022-01-11 {#version-3-4-2}
+
+### Improvements
+
+  * Added support for fallback for specific locale.
+    e.g.: `fr_BE_Foo` -> `fr_BE` -> `fr`
+    [GitHub#90][Patch by Michaël Hoste]
+
+  * Added support for Ruby 3.1.
+    [GitHub#92][Reported by ahiru]
+
+### Thanks
+
+  * Michaël Hoste
+
+  * ahiru
+
 ## 3.4.1: 2021-09-08 {#version-3-4-1}
 
 ### Improvements

data/gettext.gemspec

@@ -30,6 +30,7 @@ So you can use GNU gettext tools for maintaining.
   s.required_ruby_version = ">= 2.5.0"
 
   s.add_runtime_dependency("locale", ">= 2.0.5")
+  s.add_runtime_dependency("prime")
   s.add_runtime_dependency("text", ">= 1.3.0")
   s.add_development_dependency("kramdown")
   s.add_development_dependency("racc")

data/lib/gettext/mo.rb

@@ -3,7 +3,7 @@
 =begin
     mo.rb - A simple class for operating GNU MO file.
 
-    Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+    Copyright (C) 2012-2022  Sutou Kouhei <kou@clear-code.com>
     Copyright (C) 2003-2009  Masao Mutoh
     Copyright (C) 2002  Masahiro Sakai, Masao Mutoh
     Copyright (C) 2001  Masahiro Sakai
@@ -19,6 +19,8 @@
 
 require 'stringio'
 
+require 'prime'
+
 module GetText
   class MO < Hash
     class InvalidFormat < RuntimeError; end;
@@ -168,19 +170,8 @@ module GetText
       ('1' * number) !~ /^1?$|^(11+?)\1+$/
     end
 
-    begin
-      require 'prime'
-      def next_prime(seed)
-        Prime.instance.find{|x| x > seed }
-      end
-    rescue LoadError
-      def next_prime(seed)
-        require 'mathn'
-        prime = Prime.new
-        while current = prime.succ
-          return current if current > seed
-        end
-      end
+    def next_prime(seed)
+      Prime.instance.find{|x| x > seed }
     end
 
     HASHWORDBITS = 32

data/lib/gettext/text_domain_manager.rb

@@ -77,11 +77,12 @@ module GetText
     end
 
     def each_text_domains(klass) #:nodoc:
-      lang = Locale.candidates[0]
-      ClassInfo.related_classes(klass, @@gettext_classes).each do |target|
-        if group = @@text_domain_group_pool[target]
-          group.text_domains.each do |text_domain|
-            yield text_domain, lang
+      Locale.candidates.each do |lang|
+        ClassInfo.related_classes(klass, @@gettext_classes).each do |target|
+          if group = @@text_domain_group_pool[target]
+            group.text_domains.each do |text_domain|
+              yield text_domain, lang
+            end
           end
         end
       end

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.4.1"
+  VERSION = "3.4.2"
 end

data/po/bg/gettext.edit.po

@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Третият параметър е грешен: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/bs/gettext.edit.po

@@ -21,11 +21,11 @@ msgstr ""
 " && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/ca/gettext.edit.po

@@ -19,11 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "El tercer paràmetre es erroni: valor = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/cs/gettext.edit.po

@@ -22,11 +22,11 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,15,-1\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/de/gettext.edit.po

@@ -23,12 +23,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Der 3. Parameter ist ungültig: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/el/gettext.edit.po

@@ -19,12 +19,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Η τρίτη παράμετρος είναι λανθασμένη: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/eo/gettext.edit.po

@@ -21,12 +21,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # TODO: Should this be "parameter"?
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Malĝusta tria parametro: valoro = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/es/gettext.edit.po

@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "tercer parámetro es erróneo: valor = %{número}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/et/gettext.edit.po

@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Kolmas parameeter on vale: %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/fr/gettext.edit.po

@@ -21,12 +21,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Le 3ème paramètre (de valeur %{number}) est incorrect."
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.4.1\n"
+"Project-Id-Version: gettext 3.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-08 13:05+0900\n"
-"PO-Revision-Date: 2021-09-08 13:05+0900\n"
+"POT-Creation-Date: 2022-01-11 06:23+0900\n"
+"PO-Revision-Date: 2022-01-11 06:23+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/hr/gettext.edit.po

@@ -21,11 +21,11 @@ msgstr ""
 " && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/hu/gettext.edit.po

@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "A harmadik paraméter hibás: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/it/gettext.edit.po

@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/ja/gettext.edit.po

@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "ngettext: 3番目のパラメータが不正です。: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr "ngettext: 3番目のパラメータがnilです。数値にしてください。"
 

data/po/ko/gettext.edit.po

@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/lv/gettext.edit.po

@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "trešais parametrs ir kļūdains: vērtība = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/nb/gettext.edit.po

@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Tredje parameter er feil: verdi = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/nl/gettext.edit.po

@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/pt_BR/gettext.edit.po

@@ -21,12 +21,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "O 3º parâmetro está errado: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/ru/gettext.edit.po

@@ -21,12 +21,12 @@ msgstr ""
 "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Ошибка в третьем параметре: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/sr/gettext.edit.po

@@ -21,12 +21,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4"
 " && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "3. параметар је погрешан: вредност = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/sv/gettext.edit.po

@@ -19,11 +19,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/uk/gettext.edit.po

@@ -24,12 +24,12 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Третій параметр неправильний: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/vi/gettext.edit.po

@@ -20,12 +20,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Tham số thứ 3 sai: giá trị = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/zh/gettext.edit.po

@@ -23,12 +23,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "第三个参数错误：value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/po/zh_TW/gettext.edit.po

@@ -22,12 +22,12 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 #, fuzzy
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "第三个参数錯誤：value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 

data/test/fixtures/simple.rb

@@ -13,4 +13,8 @@ class Simple
   def test_formatted_string
     _("one is %d.") % 1
   end
+
+  def test_plural
+    n_("There is an apple.", "There are %{num} apples.", 5) % {:num => 5}
+  end
 end

data/test/po/fr/test1.po

@@ -13,6 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
 #: simple.rb:10
 msgid "language"
@@ -21,3 +22,9 @@ msgstr "french"
 #: simple.rb:14
 msgid "one is %d."
 msgstr "FRENCH:ONE IS %d."
+
+#: simple.rb:18
+msgid "There is an apple."
+msgid_plural "There are %{num} apples."
+msgstr[0] "FRENCH:Il y a une pomme."
+msgstr[1] "FRENCH:Il y a %{num} pommes."

data/test/po/fr_BE/test1.po

@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2002-01-01 02:24:56+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
+#: simple.rb:10
+msgid "language"
+msgstr "french-Belgium"
+
+#: simple.rb:14
+msgid "one is %d."
+msgstr "FRENCH-BELGIUM:ONE IS %d."

data/test/po/fr_BE_Foo/test1.po

@@ -0,0 +1,20 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2002-01-01 02:24:56+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+
+#: simple.rb:10
+msgid "language"
+msgstr "french-Belgium-Foo"

data/test/test_gettext.rb

@@ -59,6 +59,29 @@ class TestGetText < Test::Unit::TestCase
     assert_equal("nomsgstr", _("nomsgstr"))
   end
 
+  def test_fallbacks
+    bindtextdomain("test1", "locale")
+    test = Simple.new
+
+    # Translation present in all candidates
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("french-Belgium-Foo", test.test)
+    GetText.set_current_locale("fr_BE")
+    assert_equal("french-Belgium", test.test)
+    GetText.set_current_locale("fr")
+    assert_equal("french", test.test)
+
+    # Translation Missing in fr_BE_Foo (fallback to fr_BE)
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("FRENCH-BELGIUM:ONE IS 1.", test.test_formatted_string)
+
+    # Translation Missing in fr_BE_Foo *and* fr_BE (both languages fallback to fr)
+    GetText.set_current_locale("fr_BE_Foo")
+    assert_equal("FRENCH:Il y a 5 pommes.", test.test_plural)
+    GetText.set_current_locale("fr_BE")
+    assert_equal("FRENCH:Il y a 5 pommes.", test.test_plural)
+  end
+
   def test_empty
     bindtextdomain("test1", "locale")
     assert_equal("japanese", gettext("language"))

data/test/test_locale_path.rb

@@ -53,9 +53,11 @@ class TestLocalePath < Test::Unit::TestCase
     testdir = File.dirname(File.expand_path(__FILE__))
     path = GetText::LocalePath.new("test1", "#{testdir}/locale")
     assert_equal({
-                   "ja"      => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
-                   "fr"      => "#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
-                   "zh_Hant" => "#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo"
+                   "ja"        => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
+                   "fr"        => "#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
+                   "fr_BE"     => "#{testdir}/locale/fr_BE/LC_MESSAGES/test1.mo",
+                   "fr_BE_Foo" => "#{testdir}/locale/fr_BE_Foo/LC_MESSAGES/test1.mo",
+                   "zh_Hant"   => "#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo"
                  },
                  path.locale_paths)
     assert_equal("#{testdir}/locale/ja/LC_MESSAGES/test1.mo",
@@ -66,6 +68,12 @@ class TestLocalePath < Test::Unit::TestCase
                  path.current_path(Locale::Tag.parse("ja_JP.UTF-8")))
     assert_equal(nil,
                  path.current_path(Locale::Tag.parse("en")))
+    assert_equal("#{testdir}/locale/fr/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr")))
+    assert_equal("#{testdir}/locale/fr_BE/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr-BE")))
+    assert_equal("#{testdir}/locale/fr_BE_Foo/LC_MESSAGES/test1.mo",
+                 path.current_path(Locale::Tag.parse("fr-BE-Foo")))
     assert_equal("#{testdir}/locale/zh_Hant/LC_MESSAGES/test1.mo",
                  path.current_path(Locale::Tag.parse("zh-Hant")))
   end
@@ -73,7 +81,7 @@ class TestLocalePath < Test::Unit::TestCase
   def test_supported_locales
     testdir = File.dirname(File.expand_path(__FILE__))
     path = GetText::LocalePath.new("test1", "#{testdir}/locale")
-    assert_equal ["fr", "ja", "zh_Hant"], path.supported_locales
+    assert_equal ["fr", "fr_BE", "fr_BE_Foo", "ja", "zh_Hant"], path.supported_locales
 
     path = GetText::LocalePath.new("plural", "#{testdir}/locale")
     assert_equal ["cr", "da", "fr", "ir", "ja", "la", "li", "po", "sl"], path.supported_locales

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locale
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: prime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement
@@ -1563,6 +1577,8 @@ files:
 - test/locale/fr/LC_MESSAGES/plural_error.mo
 - test/locale/fr/LC_MESSAGES/test1.mo
 - test/locale/fr/LC_MESSAGES/test2.mo
+- test/locale/fr_BE/LC_MESSAGES/test1.mo
+- test/locale/fr_BE_Foo/LC_MESSAGES/test1.mo
 - test/locale/ir/LC_MESSAGES/plural.mo
 - test/locale/ja/LC_MESSAGES/_.mo
 - test/locale/ja/LC_MESSAGES/backslash.mo
@@ -1595,6 +1611,8 @@ files:
 - test/po/fr/plural_error.po
 - test/po/fr/test1.po
 - test/po/fr/test2.po
+- test/po/fr_BE/test1.po
+- test/po/fr_BE_Foo/test1.po
 - test/po/hello.pot
 - test/po/ir/plural.po
 - test/po/ja/_.edit.po
@@ -1695,7 +1713,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Gettext is a pure Ruby libary and tools to localize messages.