gettext 2.2.1 → 2.3.0

data/samples/po/vi/hello.po

@@ -1,8 +1,8 @@
-# Hello World -- a sample for Ruby-GetText-Package
+# Hello World -- a sample for gettext
 #
 # Copyright (C) 2001-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
 #

data/samples/po/vi/hello2.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
 #

data/samples/po/vi/hello_glade2.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005,2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
 #

data/samples/po/vi/{hello_gtk.po → hello_gtk2.po}

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2001-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
 #

data/samples/po/vi/hello_noop.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
 #

data/samples/po/vi/hello_plural.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
 #

data/samples/po/vi/hello_tk.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Ngoc DAO Thanh <ngocdaothanh at gmail.com>, 2007.
 #

data/samples/po/zh/hello.po

@@ -1,8 +1,8 @@
-# Hello World -- a sample for Ruby-GetText-Package
+# Hello World -- a sample for gettext
 #
 # Copyright (C) 2001-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Yingfeng <blogyingfeng at gmail.com>, 2006.
 #

data/samples/po/zh/hello2.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Yingfeng <blogyingfeng at gmail.com>, 2006.
 #

data/samples/po/zh/hello_glade2.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005,2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Yingfeng <blogyingfeng at gmail.com>, 2006.
 #

data/samples/po/zh/{hello_gtk.po → hello_gtk2.po}

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2001-2006 Masao Mutoh <mutomasa at gmail.com>
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Yingfeng <blogyingfeng at gmail.com>, 2006.
 #

data/samples/po/zh/hello_noop.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Yingfeng <blogyingfeng at gmail.com>, 2006.
 #

data/samples/po/zh/hello_plural.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Yingfeng <blogyingfeng at gmail.com>, 2006.
 #

data/samples/po/zh/hello_tk.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # Yingfeng <blogyingfeng at gmail.com>, 2006.
 #

data/samples/po/zh_TW/hello.po

@@ -1,8 +1,8 @@
-# Hello World -- a sample for Ruby-GetText-Package
+# Hello World -- a sample for gettext
 #
 # Copyright (C) 2001-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # LIN CHUNG-YI <xmarsh at gmail.com>, 2006.
 #

data/samples/po/zh_TW/hello2.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # LIN CHUNG-YI <xmarsh at gmail.com>, 2006.
 #

data/samples/po/zh_TW/hello_glade2.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005,2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # LIN CHUNG-YI <xmarsh at gmail.com>, 2006.
 #

data/samples/po/zh_TW/{hello_gtk.po → hello_gtk2.po}

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2001-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # LIN CHUNG-YI <xmarsh at gmail.com>, 2006.
 #

data/samples/po/zh_TW/hello_noop.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # LIN CHUNG-YI <xmarsh at gmail.com>, 2006.
 #

data/samples/po/zh_TW/hello_plural.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # LIN CHUNG-YI <xmarsh at gmail.com>, 2006.
 #

data/samples/po/zh_TW/hello_tk.po

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004-2006 Masao Mutoh
 #
-# This file is distributed under the same license as the Ruby-GetText-Package.
+# This file is distributed under the same license as the gettext.
 #
 # LIN CHUNG-YI <xmarsh at gmail.com>, 2006.
 #

data/src/poparser.ry

@@ -4,6 +4,7 @@
 #
 #  Copyright (C) 2002-2008 Masao Mutoh <mutomasa at gmail.com>
 #  Copyright (C) 2012 Kouhei Sutou <kou@clear-code.com>
+#  Copyright (C) 2012 Haruka Yoshihara <yoshihara@clear-code.com>
 #
 #  You may redistribute it and/or modify it under the same
 #  license terms as Ruby or LGPL.
@@ -35,26 +36,30 @@ class GetText::PoParser
   single_message
   : MSGID string_list MSGSTR string_list
   {
-    if @fuzzy and ignore_fuzzy?
-      if val[1] != ""
-        if report_warning?
+    msgid_raw = val[1]
+    msgid = unescape(msgid_raw)
+    msgstr = unescape(val[3])
+    use_message_p = true
+    if @fuzzy and not msgid.empty?
+      use_message_p = (not ignore_fuzzy?)
+      if report_warning?
+        if ignore_fuzzy?
           $stderr.print _("Warning: fuzzy message was ignored.\n")
-          $stderr.print "  #{@po_file}: msgid '#{val[1]}'\n"
+        else
+          $stderr.print _("Warning: fuzzy message was used.\n")
         end
-      else
-        on_message('', unescape(val[3]))
+        $stderr.print "  #{@po_file}: msgid '#{msgid_raw}'\n"
       end
-      @fuzzy = false
-    else
-      on_message(@msgctxt + unescape(val[1]), unescape(val[3]))
     end
+    @fuzzy = false
+    on_message(@msgctxt + msgid, msgstr) if use_message_p
     result = ""
   }
 
   plural_message
   : MSGID string_list MSGID_PLURAL string_list msgstr_plural
   {
-    if @fuzzy and $ignore_fuzzy
+    if @fuzzy and ignore_fuzzy?
       if val[1] != ""
         if report_warning?
           $stderr.print _("Warning: fuzzy message was ignored.\n")
@@ -215,10 +220,9 @@ end
   end
 
   def on_message(msgid, msgstr)
-    if msgstr.size > 0
-      @data[msgid] = msgstr
-      @data.set_comment(msgid, @comments.join("\n"))
-    end
+    @data[msgid] = msgstr
+    @data.set_comment(msgid, @comments.join("\n"))
+
     @comments.clear
     @msgctxt = ""
   end

data/test/{testlib/gettext.rb → fixtures/_.rb}

@@ -1,4 +1,24 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
+# Copyright (C) 2009  Vladimir Dobriakov <vladimir@geekq.net>
+# Copyright (C) 2009  Masao Mutoh
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'gettext'
 include GetText
@@ -98,12 +118,18 @@ EOF
       # This is an example from GNU gettext documentation.
       _("Francois Pinard"))
 
+    puts (
+      _("No TRANSLATORS comment"))
+
     puts (
       # This comment should not be extracted because it does
       # not start with 'TRANSLATORS:'
       _('self explaining'))
   end
 
+  def test_includeing_sharp
+    _("This is a # including string.")
+  end
 end
 
 module ActionController

data/test/fixtures/_/one_line.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Fixtures
+  module Method_
+    class OneLine
+      include GetText
+
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _("one line")
+      end
+    end
+  end
+end

data/test/fixtures/backslash.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'gettext'
+
+class Backslash
+  include GetText
+  bindtextdomain("backslash", :path => "locale")
+
+  def backslash_in_message
+    _("You should escape '\\' as '\\\\'.")
+  end
+end

data/test/{testlib/ngettext.rb → fixtures/n_.rb}

@@ -1,4 +1,23 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
+# Copyright (C) 2009  Vladimir Dobriakov <vladimir@geekq.net>
+# Copyright (C) 2009  Masao Mutoh
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'gettext'
 include GetText

data/test/fixtures/np_.rb

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
+# Copyright (C) 2009  Masao Mutoh
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'gettext'
+
+class TestNPGetText
+  include GetText
+  bindtextdomain("np_", :path => "locale")
+
+  def test_1
+    [np_("Magazine", "a book", "%{num} books", 1),
+     np_("Magazine", "a book", "%{num} books", 2)]
+  end
+
+  def test_2
+    [npgettext("Magazine", "a book", "%{num} books", 1),
+     npgettext("Magazine", "a book", "%{num} books", 2)]
+  end
+
+  def test_3
+    [np_("Hardcover", "a book", "%{num} books", 1),
+     np_("Hardcover", "a book", "%{num} books", 2)]
+  end
+
+  def test_4
+    [np_("Magaine", "I have a magazine", "I have %{num} magazines", 1),
+     np_("Magaine", "I have a magazine", "I have %{num} magazines", 2)]
+  end
+
+  def test_5
+    [np_("Hardcover", "a picture", "%{num} pictures", 1),
+     np_("Hardcover", "a picture", "%{num} pictures", 2)]  #not found.
+  end
+end