gettext 3.4.0 → 3.4.3

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 ""
 
@@ -144,7 +144,7 @@ msgstr "Формирање бинарног каталога порука из
 msgid "write output to specified file"
 msgstr "писање излаза у задат фајл"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:355
 msgid "display version information and exit"
 msgstr "приказ информација о верзији и излаз"
 
@@ -303,31 +303,35 @@ msgid "require the library before executing xgettext"
 msgstr "захтевај библиотеку пре извршења rgettext-а"
 
 #: ../lib/gettext/tools/xgettext.rb:334
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:335
+#: ../lib/gettext/tools/xgettext.rb:341
 msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:340
+#: ../lib/gettext/tools/xgettext.rb:346
 msgid "run in debugging mode"
 msgstr "ради у дибагинг моду"
 
-#: ../lib/gettext/tools/xgettext.rb:344
+#: ../lib/gettext/tools/xgettext.rb:350
 #, fuzzy
 msgid "display this help and exit"
 msgstr "приказ информација о верзији и излаз"
 
-#: ../lib/gettext/tools/xgettext.rb:375
+#: ../lib/gettext/tools/xgettext.rb:381
 msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""
 

data/po/sr/gettext.po

@@ -251,6 +251,9 @@ msgstr ""
 msgid "require the library before executing xgettext"
 msgstr "захтевај библиотеку пре извршења rgettext-а"
 
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"

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 ""
 
@@ -139,7 +139,7 @@ msgstr "Generera binära meddelandekataloger från textuell översättningsdata.
 msgid "write output to specified file"
 msgstr ""
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:355
 msgid "display version information and exit"
 msgstr ""
 
@@ -292,29 +292,33 @@ msgid "require the library before executing xgettext"
 msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:334
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:335
+#: ../lib/gettext/tools/xgettext.rb:341
 msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:340
+#: ../lib/gettext/tools/xgettext.rb:346
 msgid "run in debugging mode"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:344
+#: ../lib/gettext/tools/xgettext.rb:350
 msgid "display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:375
+#: ../lib/gettext/tools/xgettext.rb:381
 msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""

data/po/sv/gettext.po

@@ -237,6 +237,9 @@ msgstr ""
 msgid "require the library before executing xgettext"
 msgstr ""
 
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"

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 ""
 
@@ -147,7 +147,7 @@ msgstr "Генерує бінарний каталог повідомлень і
 msgid "write output to specified file"
 msgstr "записати результат у вказаний файл"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:355
 msgid "display version information and exit"
 msgstr "показати інформацію про версію і завершити роботу"
 
@@ -306,31 +306,35 @@ msgid "require the library before executing xgettext"
 msgstr "для виконання rgettext необхідна бібліотека"
 
 #: ../lib/gettext/tools/xgettext.rb:334
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:335
+#: ../lib/gettext/tools/xgettext.rb:341
 msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:340
+#: ../lib/gettext/tools/xgettext.rb:346
 msgid "run in debugging mode"
 msgstr "запуск в режимі відлагодження"
 
-#: ../lib/gettext/tools/xgettext.rb:344
+#: ../lib/gettext/tools/xgettext.rb:350
 #, fuzzy
 msgid "display this help and exit"
 msgstr "показати інформацію про версію і завершити роботу"
 
-#: ../lib/gettext/tools/xgettext.rb:375
+#: ../lib/gettext/tools/xgettext.rb:381
 msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""
 

data/po/uk/gettext.po

@@ -255,6 +255,9 @@ msgstr ""
 msgid "require the library before executing xgettext"
 msgstr "для виконання rgettext необхідна бібліотека"
 
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"

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 ""
 
@@ -143,7 +143,7 @@ msgstr "Sinh message catalog nhị phân từ chuỗi văn bản."
 msgid "write output to specified file"
 msgstr "ghi ra tập tin được chỉ định"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:355
 msgid "display version information and exit"
 msgstr "hiện thông tin về phiên bản rồi thoát"
 
@@ -302,31 +302,35 @@ msgid "require the library before executing xgettext"
 msgstr "require thư viện trước khi chạy rgettext"
 
 #: ../lib/gettext/tools/xgettext.rb:334
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:335
+#: ../lib/gettext/tools/xgettext.rb:341
 msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:340
+#: ../lib/gettext/tools/xgettext.rb:346
 msgid "run in debugging mode"
 msgstr "chạy trong chế độ debug"
 
-#: ../lib/gettext/tools/xgettext.rb:344
+#: ../lib/gettext/tools/xgettext.rb:350
 #, fuzzy
 msgid "display this help and exit"
 msgstr "hiện thông tin về phiên bản rồi thoát"
 
-#: ../lib/gettext/tools/xgettext.rb:375
+#: ../lib/gettext/tools/xgettext.rb:381
 msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""
 

data/po/vi/gettext.po

@@ -250,6 +250,9 @@ msgstr ""
 msgid "require the library before executing xgettext"
 msgstr "require thư viện trước khi chạy rgettext"
 
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"

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 ""
 
@@ -146,7 +146,7 @@ msgstr "从文本叙述翻译生成二进制信息目录。"
 msgid "write output to specified file"
 msgstr "输出到指定文件"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:355
 msgid "display version information and exit"
 msgstr "显示版本信息并退出"
 
@@ -305,31 +305,35 @@ msgid "require the library before executing xgettext"
 msgstr "在执行 rgettext 之前需要一个库"
 
 #: ../lib/gettext/tools/xgettext.rb:334
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:335
+#: ../lib/gettext/tools/xgettext.rb:341
 msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:340
+#: ../lib/gettext/tools/xgettext.rb:346
 msgid "run in debugging mode"
 msgstr "运行于调试模式"
 
-#: ../lib/gettext/tools/xgettext.rb:344
+#: ../lib/gettext/tools/xgettext.rb:350
 #, fuzzy
 msgid "display this help and exit"
 msgstr "显示版本信息并退出"
 
-#: ../lib/gettext/tools/xgettext.rb:375
+#: ../lib/gettext/tools/xgettext.rb:381
 msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""
 

data/po/zh/gettext.po

@@ -252,6 +252,9 @@ msgstr ""
 msgid "require the library before executing xgettext"
 msgstr "在执行 rgettext 之前需要一个库"
 
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"

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 ""
 
@@ -145,7 +145,7 @@ msgstr "從textual translation description產生二進位訊息 catalog"
 msgid "write output to specified file"
 msgstr "輸出到指定檔案"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:355
 msgid "display version information and exit"
 msgstr "秀出版本資訊後退出"
 
@@ -304,31 +304,35 @@ msgid "require the library before executing xgettext"
 msgstr "在執行 rgettext 之前需要一個庫"
 
 #: ../lib/gettext/tools/xgettext.rb:334
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:335
+#: ../lib/gettext/tools/xgettext.rb:341
 msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:336
+#: ../lib/gettext/tools/xgettext.rb:342
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:340
+#: ../lib/gettext/tools/xgettext.rb:346
 msgid "run in debugging mode"
 msgstr "執行除錯模式"
 
-#: ../lib/gettext/tools/xgettext.rb:344
+#: ../lib/gettext/tools/xgettext.rb:350
 #, fuzzy
 msgid "display this help and exit"
 msgstr "秀出版本資訊後退出"
 
-#: ../lib/gettext/tools/xgettext.rb:375
+#: ../lib/gettext/tools/xgettext.rb:381
 msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""
 

data/po/zh_TW/gettext.po

@@ -251,6 +251,9 @@ msgstr ""
 msgid "require the library before executing xgettext"
 msgstr "在執行 rgettext 之前需要一個庫"
 
+msgid "Add PARSER to parser list for xgettext"
+msgstr ""
+
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"

data/test/fixtures/erb/case.rhtml

@@ -0,0 +1,16 @@
+<%
+  require 'gettext'
+  include GetText
+  bindtextdomain("helloerb", :path => "locale")
+%>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+  <%= _('Hello') %>
+  <% case 1 %>
+  <% end %>
+  <%= _('World') %>
+</body>
+</html>

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/po/ja/_.po

@@ -133,3 +133,18 @@ msgstr "ONE LINE"
 msgid ""
 "one new line\n"
 msgstr ""
+
+msgid "in_symbol_array"
+msgstr ""
+
+msgid "hello world"
+msgstr ""
+
+msgid "in_string_array"
+msgstr ""
+
+msgid "Hello"
+msgstr ""
+
+msgid "World"
+msgstr ""

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