gettext 1.9.0 → 1.10.0

data/samples/rails/po/nb/blog.po

@@ -0,0 +1,104 @@
+# GetText Sample Blog on RoR.
+# Copyright (C) 2005,2006 Masao Mutoh
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Runar Ingebrigtsen <runar at mopo.no>, 2007.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: blog 1.2.0\n"
+"POT-Creation-Date: 2006-10-15 00:12+0900\n"
+"PO-Revision-Date: 2007-04-03 13:24+0200\n"
+"Last-Translator:  Runar Ingebrigtsen\n"
+"Language-Team: Norwegian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app/helpers/blog_helper.rb:43
+msgid "Ruby Links"
+msgstr "Rubylenker"
+
+#: app/helpers/blog_helper.rb:51
+msgid "Old articles"
+msgstr "Gamle artikler"
+
+#: app/models/article.rb:-
+msgid "article"
+msgstr "artikkel"
+
+#: app/models/article.rb:-
+msgid "Article|Title"
+msgstr "Tittel"
+
+#: app/models/article.rb:-
+msgid "Article|Description"
+msgstr "Beskrivelse"
+
+#: app/models/article.rb:-
+msgid "Article|Lastupdate"
+msgstr "Siste oppdatering"
+
+#: app/controllers/blog_controller.rb:33
+msgid "Article was successfully created."
+msgstr "Artikkelen ble opprettet"
+
+#: app/controllers/blog_controller.rb:47
+msgid "Article was successfully updated."
+msgstr "Artikkelen ble oppdatert"
+
+#: app/views/blog/new.rhtml:13 app/views/blog/list.rhtml:15
+msgid "New article"
+msgstr "Ny artikkel"
+
+#: app/views/blog/new.rhtml:17
+msgid "Create"
+msgstr "Opprett"
+
+#: app/views/blog/new.rhtml:20 app/views/blog/edit.rhtml:21
+#: app/views/blog/show.rhtml:17
+msgid "Back"
+msgstr "Tilbake"
+
+#: app/views/blog/_form.rhtml:16
+msgid "Lastupdate"
+msgstr "Siste oppdatering"
+
+#: app/views/blog/_form.rhtml:18
+msgid "Title: Required."
+msgstr "Tittel: Påkrevd."
+
+#: app/views/blog/_form.rhtml:21
+msgid "Description: More than 10 characters."
+msgstr "Beskrivelse: Mer enn 10 tegn."
+
+#: app/views/blog/list.rhtml:13 app/views/blog/show.rhtml:13
+#: app/views/layouts/blog.rhtml:14
+msgid "GetText Sample Blog on RoR"
+msgstr "GetText eksempelblogg i Rails"
+
+#: app/views/blog/list.rhtml:18
+msgid "No articles were found."
+msgstr "Ingen artikler funnet."
+
+#: app/views/blog/edit.rhtml:12
+msgid "Editing article"
+msgstr "Endrer artikkel"
+
+#: app/views/blog/edit.rhtml:16 app/views/blog/show.rhtml:16
+msgid "Edit"
+msgstr "Endre"
+
+#: app/views/blog/edit.rhtml:19
+msgid "Show"
+msgstr "Vis"
+
+#: app/views/blog/edit.rhtml:20
+msgid "Destroy"
+msgstr "Slett"
+
+#: app/views/blog/edit.rhtml:20
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+

data/samples/rails/po/vi/blog.po

@@ -0,0 +1,110 @@
+# GetText Sample Blog on RoR.
+#
+# Copyright (C) 2005,2006 Masao Mutoh
+#
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: blog 1.2.0\n"
+"POT-Creation-Date: 2006-10-15 00:12+0900\n"
+"PO-Revision-Date: 2007-03-21 10:10+0900\n"
+"Last-Translator: Ngoc DAO Thanh <ngocdaothanh at gmail.com>\n"
+"Language-Team: Vietnamese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app/helpers/blog_helper.rb:43
+msgid "Ruby Links"
+msgstr "Liên kết Ruby"
+
+#: app/helpers/blog_helper.rb:51
+msgid "Old articles"
+msgstr "Những bài viết cũ"
+
+#: app/models/article.rb:-
+msgid "article"
+msgstr "bài viết"
+
+#: app/models/article.rb:-
+msgid "Article|Title"
+msgstr "Tiêu đề"
+
+#: app/models/article.rb:-
+msgid "Article|Description"
+msgstr "Miêu tả"
+
+#: app/models/article.rb:-
+msgid "Article|Lastupdate"
+msgstr "Lần cập nhật trước"
+
+#: app/controllers/blog_controller.rb:33
+msgid "Article was successfully created."
+msgstr "Bài viết đã được tạo thành công."
+
+#: app/controllers/blog_controller.rb:47
+msgid "Article was successfully updated."
+msgstr "Bài viết đã được cập nhật thành công"
+
+#: app/views/blog/new.rhtml:13
+#: app/views/blog/list.rhtml:15
+msgid "New article"
+msgstr "Bài viết mới"
+
+#: app/views/blog/new.rhtml:17
+msgid "Create"
+msgstr "Tạo"
+
+#: app/views/blog/new.rhtml:20
+#: app/views/blog/edit.rhtml:21
+#: app/views/blog/show.rhtml:17
+msgid "Back"
+msgstr "Quay lui"
+
+#: app/views/blog/_form.rhtml:16
+msgid "Lastupdate"
+msgstr "Lần cập nhật trước"
+
+#: app/views/blog/_form.rhtml:18
+msgid "Title: Required."
+msgstr "Tiêu đề: Phải có."
+
+#: app/views/blog/_form.rhtml:21
+msgid "Description: More than 10 characters."
+msgstr "Miêu tả: Nhiều hơn 10 kí tự."
+
+#: app/views/blog/list.rhtml:13
+#: app/views/blog/show.rhtml:13
+#: app/views/layouts/blog.rhtml:14
+msgid "GetText Sample Blog on RoR"
+msgstr "Ví dụ mẫu về Blog dùng GetText trong RoR"
+
+#: app/views/blog/list.rhtml:18
+msgid "No articles were found."
+msgstr "Không tìm thấy bài viết nào."
+
+#: app/views/blog/edit.rhtml:12
+msgid "Editing article"
+msgstr "Soạn bài viết"
+
+#: app/views/blog/edit.rhtml:16
+#: app/views/blog/show.rhtml:16
+msgid "Edit"
+msgstr "Soạn"
+
+#: app/views/blog/edit.rhtml:19
+msgid "Show"
+msgstr "Hiển thị"
+
+#: app/views/blog/edit.rhtml:20
+msgid "Destroy"
+msgstr "Xóa"
+
+#: app/views/blog/edit.rhtml:20
+msgid "Are you sure?"
+msgstr "Bạn có chắc chắn không?"
+

data/samples/rails/vendor/plugins/gettext/po/bs/gettext_plugin.po

@@ -0,0 +1,27 @@
+# translation of gettext_plugin.po to Bosnian
+# GetText Sample Blog on RoR.
+# Copyright (C) 2005 Masao Mutoh
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Sanjin Sehic <saserr@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext_plugin\n"
+"POT-Creation-Date: 2006-05-31 02:06+0900\n"
+"PO-Revision-Date: 2007-03-20 20:17+0100\n"
+"Last-Translator: Sanjin Sehic <saserr@gmail.com>\n"
+"Language-Team: Bosnian <saserr@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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"
+"X-Generator: KBabel 1.11.4\n"
+
+#: lib/gettext_plugin.rb:18
+msgid "Select locale"
+msgstr "Izaberi lokal"
+
+#: lib/gettext_plugin.rb:30
+msgid "Cookie &quot;lang&quot; is set: %s"
+msgstr "Cookie &quot;lang&quot; je postavljen: %s"
+

data/samples/rails/vendor/plugins/gettext/po/hr/gettext_plugin.po

@@ -0,0 +1,27 @@
+# translation of gettext_plugin.po to Croatian
+# GetText Sample Blog on RoR.
+# Copyright (C) 2005 Masao Mutoh
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Sanjin Sehic <saserr@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext_plugin\n"
+"POT-Creation-Date: 2006-05-31 02:06+0900\n"
+"PO-Revision-Date: 2007-03-20 20:17+0100\n"
+"Last-Translator: Sanjin Sehic <saserr@gmail.com>\n"
+"Language-Team: Croatian <saserr@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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"
+"X-Generator: KBabel 1.11.4\n"
+
+#: lib/gettext_plugin.rb:18
+msgid "Select locale"
+msgstr "Izaberi lokal"
+
+#: lib/gettext_plugin.rb:30
+msgid "Cookie &quot;lang&quot; is set: %s"
+msgstr "Cookie &quot;lang&quot; je postavljen: %s"
+

data/samples/rails/vendor/plugins/gettext/po/nb/gettext_plugin.po

@@ -0,0 +1,27 @@
+# GetText Sample Blog on RoR.
+# Copyright (C) 2005 Masao Mutoh
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Runar Ingebrigtsen <runar at mopo.no>, 2007.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext_plugin 1.2.0\n"
+"POT-Creation-Date: 2006-05-31 02:06+0900\n"
+"PO-Revision-Date: 2007-04-03 13:25+0200\n"
+"Last-Translator:  Runar Ingebrigtsen\n"
+"Language-Team: Norwegian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+
+#: lib/gettext_plugin.rb:18
+msgid "Select locale"
+msgstr "Velg språk"
+
+#: lib/gettext_plugin.rb:30
+msgid "Cookie &quot;lang&quot; is set: %s"
+msgstr "Informasjonskapsel &quot;lang&quot; er satt: %s"
+

data/samples/rails/vendor/plugins/gettext/po/vi/gettext_plugin.po

@@ -0,0 +1,28 @@
+# GetText Sample Blog on RoR.
+#
+# Copyright (C) 2005 Masao Mutoh
+#
+# This file is distributed under the same license as the Ruby-GetText-Package.
+#
+# Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext_plugin 1.2.0\n"
+"POT-Creation-Date: 2006-05-31 02:06+0900\n"
+"PO-Revision-Date: 2007-03-21 10:13+0900\n"
+"Last-Translator: Ngoc DAO Thanh <ngocdaothanh at gmail.com>\n"
+"Language-Team: Vietnamese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/gettext_plugin.rb:18
+msgid "Select locale"
+msgstr "Chọn ngôn ngữ"
+
+#: lib/gettext_plugin.rb:30
+msgid "Cookie &quot;lang&quot; is set: %s"
+msgstr "Cookie &quot;lang&quot; được đặt là: %s"
+

data/src/poparser.ry

@@ -54,7 +54,11 @@ class GetText::PoParser
   msgstr_plural
   : msgstr_plural msgstr_plural_line
   {
-    result = val[0] + "\000" + val[1]
+    if val[0].size > 0
+      result = val[0] + "\000" + val[1]
+    else
+      result = ""
+    end
   }
   | msgstr_plural_line
   ;
@@ -158,9 +162,10 @@ end
   end
 
   def on_message(msgid, msgstr)
-    @data[msgid] = msgstr
- 
-    @data.set_comment(msgid, @comments.join("\n"))
+    if msgstr.size > 0
+      @data[msgid] = msgstr
+      @data.set_comment(msgid, @comments.join("\n"))
+    end
     @comments.clear
   end
       

data/test/README

@@ -14,3 +14,5 @@ rake createdb   # Build the MySQL test databases
 rake dropdb     # Drop the MySQL test databases
 rake rebuilddb  # Rebuild the MySQL test databases
 
+
+See rails/README to test rails application.

data/test/Rakefile

@@ -3,6 +3,8 @@ require 'gettext/utils'
 desc "Create mo files"
 task :makemo do
   GetText.create_mofiles(true, "po", "locale")
+  GetText.create_mofiles(true, "rails/po", "rails/locale")
+  mkdir "rails/log" unless File.exists? "rails/log"
 end
 
 SCHEMA_PATH = File.join(File.dirname(__FILE__), "db")

data/test/db/mysql.drop.sql

@@ -0,0 +1,4 @@
+DROP TABLE topics;
+DROP TABLE developers;
+DROP TABLE books;
+DROP TABLE users;

data/test/db/mysql.sql

@@ -0,0 +1,44 @@
+CREATE TABLE `topics` (
+  `id` int(11) NOT NULL auto_increment,
+  `title` varchar(255) default NULL,
+  `author_name` varchar(255) default NULL,
+  `author_email_address` varchar(255) default NULL,
+  `written_on` datetime default NULL,
+  `bonus_time` time default NULL,
+  `last_read` date default NULL,
+  `content` text,
+  `approved` tinyint(1) default 1,
+  `replies_count` int(11) default 0,
+  `parent_id` int(11) default NULL,
+  `type` varchar(50) default NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+
+CREATE TABLE `developers` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(100) default NULL,
+  `salary` int(11) default 70000,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+
+CREATE TABLE `books` (
+  `id` int(11) NOT NULL auto_increment,
+  `title` varchar(100) default NULL,
+  `price` int(11) default 70000,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+
+CREATE TABLE `users` (
+  `id` int(11) NOT NULL auto_increment,
+  `first_name` varchar(100) default NULL,
+  `last_name` varchar(100) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) TYPE=InnoDB;
+
+

data/test/gettext_test.rb

@@ -9,6 +9,7 @@ require 'testlib4.rb'
 require 'testlib6.rb'
 require 'test_rubyparser.rb'
 require 'test_sgettext.rb'
+require 'test_nsgettext.rb'
 
 class TestGetText < Test::Unit::TestCase
   include GetText
@@ -54,7 +55,7 @@ class TestGetText < Test::Unit::TestCase
     assert_equal("japanese", _("language"))
   end
 
-  def test_gettext
+  def test_empty
     set_locale(nil)
     bindtextdomain("test1", "locale")
     assert_equal("japanese", gettext("language"))
@@ -117,6 +118,7 @@ DDD
   def test_sgettext
     GetText.locale = nil
     testlib5 = TestSGetText.new
+
     assert_equal("MATCHED", testlib5.test_1)
     assert_equal("MATCHED", testlib5.test_2)
     assert_equal("AAA", testlib5.test_3)
@@ -128,6 +130,20 @@ DDD
     assert_equal("BBB", testlib5.test_9)
   end
 
+  def test_nsgettext
+    GetText.locale = nil
+    testlib5 = TestNSGetText.new
+    assert_equal(["single", "plural"], testlib5.test_1)
+    assert_equal(["single", "plural"], testlib5.test_2)
+    assert_equal(["AAA", "BBB"], testlib5.test_3)
+    assert_equal(["CCC", "DDD"], testlib5.test_4)
+    assert_equal(["CCC", "DDD"], testlib5.test_5)
+    assert_equal(["BBB", "CCC"], testlib5.test_6)
+    assert_equal(["B|BB", "CCC"], testlib5.test_7)
+    assert_equal(["single", "plural"], testlib5.test_8)
+    assert_equal(["BBB", "DDD"], testlib5.test_9)
+  end
+
   def test_plural
     GetText.locale = nil
     bindtextdomain("plural", "locale", "ja")
@@ -184,22 +200,22 @@ DDD
     setlocale(nil)
     bindtextdomain("plural_error", "locale", "ja")
     #If it defines msgstr[0] only, msgstr[0] is used everytime.
-    assert_equal("a", n_("one", "two", 0)) 
-    assert_equal("a", n_("one", "two", 1)) 
-    assert_equal("a", n_("one", "two", 2)) 
+    assert_equal("a", n_("first", "second", 0)) 
+    assert_equal("a", n_("first", "second", 1)) 
+    assert_equal("a", n_("first", "second", 2)) 
     # Use default(plural = 0)
     setlocale("fr")
-    assert_equal("fr_one", n_("one", "two", 0))   
-    assert_equal("fr_one", n_("one", "two", 1))
-    assert_equal("fr_one", n_("one", "two", 2))
+    assert_equal("fr_first", n_("first", "second", 0))   
+    assert_equal("fr_first", n_("first", "second", 1))
+    assert_equal("fr_first", n_("first", "second", 2))
     setlocale("da")
-    assert_equal("da_one", n_("one", "two", 0))   
-    assert_equal("da_one", n_("one", "two", 1))
-    assert_equal("da_one", n_("one", "two", 2))
+    assert_equal("da_first", n_("first", "second", 0))   
+    assert_equal("da_first", n_("first", "second", 1))
+    assert_equal("da_first", n_("first", "second", 2))
     setlocale("la")
-    assert_equal("la_one", n_("one", "two", 0))   
-    assert_equal("la_one", n_("one", "two", 1))
-    assert_equal("la_one", n_("one", "two", 2))
+    assert_equal("la_first", n_("first", "second", 0))   
+    assert_equal("la_first", n_("first", "second", 1))
+    assert_equal("la_first", n_("first", "second", 2))
   end
 
   def test_plural_array
@@ -210,6 +226,28 @@ DDD
     assert_equal("da_plural", n_(["one", "two"], 2))
   end
 
+  def test_plural_with_single
+    GetText.locale = nil
+    bindtextdomain("plural", "locale", "ja")
+    assert_equal("hitotsu", _("single"))
+    assert_equal("hitotsu", n_("single", "plural", 1))
+    assert_equal("hitotsu", n_("single", "plural", 2))
+    assert_equal("all", n_("one", "two", 1))
+    assert_equal("all", n_("one", "two", 2))
+    assert_equal("all", _("one"))
+
+    bindtextdomain("plural", "locale", "fr")
+    assert_equal("fr_hitotsu", _("single"))
+    assert_equal("fr_hitotsu", n_("single", "plural", 1))
+    assert_equal("fr_fukusu", n_("single", "plural", 2))
+    assert_equal("fr_one", n_("one", "two", 1))
+    assert_equal("fr_plural", n_("one", "two", 2))
+    assert_equal("fr_one", _("one"))
+
+    assert_equal("fr_hitotsu", n_("single", "not match", 1))
+    assert_equal("fr_fukusu", n_("single", "not match", 2))
+  end
+
   def test_Nn_
     GetText.locale = nil
     bindtextdomain("plural", "locale", "da")