gettext 2.3.9 → 3.0.0

data/samples/hello.rb

@@ -10,7 +10,8 @@ require 'gettext'
 class HelloWorld
   include GetText
 
-  bindtextdomain("hello", :path => "locale")
+  base_dir = File.dirname(__FILE__)
+  bindtextdomain("hello", :path => File.join(base_dir, "locale"))
 
   def hello
     print _("Hello World\n")
@@ -26,7 +27,7 @@ if __FILE__ == $0
   p old.to_s # Show current locale
 
   # Change the locale to "en".
-  GetText.set_locale_all("en")
+  GetText.set_locale("en")
   p GetText.locale.to_s
   a.hello # Show in English
 

data/samples/hello2.rb

@@ -10,7 +10,8 @@ require 'gettext'
 module Hello
   include GetText
 
-  bindtextdomain("hello2", :path => "locale")
+  base_dir = File.dirname(__FILE__)
+  bindtextdomain("hello2", :path => File.join(base_dir, "locale"))
 
   module_function
   def hello

data/samples/hello_gtk2.rb

@@ -11,7 +11,10 @@ require 'gtk2'
 class LocalizedWindow < Gtk::Window
   include GetText
 
-  bindtextdomain("hello_gtk2", :path => "locale", :output_charset => "utf-8")
+  base_dir = File.dirname(__FILE__)
+  bindtextdomain("hello_gtk2",
+                 :path => File.join(base_dir, "locale"),
+                 :output_charset => "utf-8")
 
   def initialize
     super

data/samples/hello_gtk_builder.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# hello_gtk_builder.rb - sample for Gtk::Builder in Ruby/GTK3
+#
+# Copyright (C) 2013 Kouhei Sutou <kou@clear-code.com>
+# This file is distributed under the same license as gettext.
+
+require "gtk3"
+
+class HelloGtkBuilder
+  def initialize
+    domain = "hello_gtk_builder"
+    base_dir = File.dirname(__FILE__)
+    GLib::GetText.bindtextdomain(domain, File.join(base_dir, "locale"))
+
+    @builder = Gtk::Builder.new
+    @builder.translation_domain = domain
+    @builder << File.join(base_dir, "hello_gtk_builder.ui")
+    @builder.connect_signals do |name|
+      method(name)
+    end
+
+    @window = @builder["window1"]
+    @window.show_all
+  end
+
+  def on_quit
+    Gtk.main_quit
+  end
+end
+
+HelloGtkBuilder.new
+Gtk.main

data/samples/hello_gtk_builder.ui

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">window1</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">first line
+second line
+third line</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button1">
+            <property name="label" translatable="yes">&lt;Hello world&gt;</property>
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_action_appearance">False</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="on_quit" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/samples/hello_noop.rb

@@ -16,7 +16,8 @@ class HelloNoop
     # You can call bindtextdomain as instance methods.
     # In this case, it initializes(decided the locale lazily)
     # in a instance.
-    bindtextdomain("hello_noop", :path => "locale")
+    base_dir = File.dirname(__FILE__)
+    bindtextdomain("hello_noop", :path => File.join(base_dir, "locale"))
   end
 
   def hello

data/samples/hello_plural.rb

@@ -11,7 +11,8 @@ class HelloPlural
   include GetText
 
   def initialize
-    bindtextdomain("hello_plural", :path => "locale")
+    base_dir = File.dirname(__FILE__)
+    bindtextdomain("hello_plural", :path => File.join(base_dir, "locale"))
   end
 
   def hello

data/samples/hello_tk.rb

@@ -9,7 +9,8 @@ require 'gettext'
 require 'tk'
 
 include GetText
-bindtextdomain("hello_tk", :path => "locale")
+base_dir = File.dirname(__FILE__)
+bindtextdomain("hello_tk", :path => File.join(base_dir, "locale"))
 
 TkLabel.new {
   text _("hello, tk world")

data/src/{poparser.ry → po_parser.ry}

@@ -1,9 +1,9 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
-#  poparser.ry - ruby version of msgfmt
+#  po_parser.ry - ruby version of msgfmt
 #
 #  Copyright (C) 2002-2008 Masao Mutoh <mutomasa at gmail.com>
-#  Copyright (C) 2012 Kouhei Sutou <kou@clear-code.com>
+#  Copyright (C) 2012-2013 Kouhei Sutou <kou@clear-code.com>
 #  Copyright (C) 2012-2013 Haruka Yoshihara <yoshihara@clear-code.com>
 #
 #  You may redistribute it and/or modify it under the same
@@ -66,7 +66,7 @@ class GetText::POParser
           $stderr.print "msgid = '#{val[1]}\n"
         end
       else
-        on_message('', unescape(val[3]))
+        on_message("", unescape(val[3]))
       end
       @fuzzy = false
     else
@@ -117,17 +117,8 @@ class GetText::POParser
 end
 
 ---- header
-require "gettext/tools/po"
+require "gettext/po"
 
-# For suppressing warning. PoData is deprecated and will be removed.
-module GetText
-  module Tools
-    class MsgMerge
-      class PoData
-      end
-    end
-  end
-end
 ---- inner
   if GetText.respond_to?(:bindtextdomain)
     include GetText
@@ -219,7 +210,7 @@ end
 	str = str[1..-1]
       end
     end
-    @q.push [false, '$end']
+    @q.push [false, "$end"]
     if $DEBUG
       @q.each do |a,b|
       puts "[#{a}, #{b}]"
@@ -241,8 +232,7 @@ end
   def on_message(msgid, msgstr)
     msgstr = nil if msgstr.empty?
 
-    if @data.instance_of?(PO) or
-        @data.instance_of?(GetText::Tools::MsgMerge::PoData)
+    if @data.instance_of?(PO)
       type = detect_entry_type
       entry = POEntry.new(type)
       entry.translator_comment = format_comment(@translator_comments)
@@ -255,15 +245,7 @@ end
       entry.msgid_plural = @msgid_plural
       entry.msgstr = msgstr
 
-      if @data.instance_of?(PO)
-        @data[@msgctxt, msgid] = entry
-      elsif @data.instance_of?(GetText::Tools::MsgMerge::PoData)
-        id = ""
-        id << "#{@msgctxt}\004" unless @msgctxt.nil?
-        id << msgid
-        id << "\000#{@msgid_plural}" unless @msgid_plural.nil?
-        @data[id] = entry
-      end
+      @data[@msgctxt, msgid] = entry
     else
       options = {}
       options[:msgctxt] = @msgctxt
@@ -293,8 +275,7 @@ end
 
   def on_comment(comment)
     @fuzzy = true if (/fuzzy/ =~ comment)
-    if @data.instance_of?(PO) or
-        @data.instance_of?(GetText::Tools::MsgMerge::PoData)
+    if @data.instance_of?(PO)
       if comment == "#"
         @translator_comments << ""
       elsif /\A(#.)\s*(.*)\z/ =~ comment
@@ -306,7 +287,7 @@ end
         when POEntry::EXTRACTED_COMMENT_MARK
           @extracted_comments << content
         when POEntry::REFERENCE_COMMENT_MARK
-          @references << content
+          @references.concat(parse_references_line(content))
         when POEntry::FLAG_MARK
           @flag << content
         when POEntry::PREVIOUS_COMMENT_MARK
@@ -331,15 +312,31 @@ end
     parse(File.open(*args) {|io| io.read }, data)
   end
 
+  private
   def detect_file_encoding(po_file)
-    open(po_file, :encoding => 'ASCII-8BIT') do |input|
+    open(po_file, :encoding => "ASCII-8BIT") do |input|
+      in_header = false
       input.each_line do |line|
-        return Encoding.find($1) if %r["Content-Type:.*\scharset=(.*)\\n"] =~ line
+        case line.chomp
+        when /\Amsgid\s+"(.*)"\z/
+          id = $1
+          break unless id.empty?
+          in_header = true
+        when /\A"Content-Type:.*\scharset=(.*)\\n"\z/
+          charset = $1
+          next unless in_header
+          break if template_charset?(charset)
+          return Encoding.find(charset)
+        end
       end
     end
     Encoding.default_external
   end
 
+  def template_charset?(charset)
+    charset == "CHARSET"
+  end
+
   def detect_entry_type
     if @msgctxt.nil?
       if @msgid_plural.nil?
@@ -355,10 +352,9 @@ end
       end
     end
   end
-  private :detect_file_encoding
----- footer
-  # for backward compatibility.
-  module GetText
-    PoParser = POParser
+
+  def parse_references_line(line)
+    line.split(/\s+/)
   end
+---- footer
 

data/test/fixtures/N_.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 require 'gettext'
 include GetText

data/test/fixtures/_/double_quote_in_double_quote.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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 DoubleQuoteInDoubleQuote
+      include GetText
+
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _("double \"quote\" in double quote")
+      end
+    end
+  end
+end

data/test/fixtures/_/double_quote_in_single_quote.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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 DoubleQuoteInSingleQuote
+      include GetText
+
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _('double "quote" in single quote')
+      end
+    end
+  end
+end

data/test/fixtures/_/literal_concatenation_with_continuation_line.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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 LiteralConcatenationWithContinuationLine
+      include GetText
+
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _("literal " \
+          "concatenation " \
+          "with " \
+          "continuation " \
+          "line")
+      end
+    end
+  end
+end

data/test/fixtures/_/middle_new_line.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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 MiddleNewLine
+      include GetText
+
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _("middle\nnew line")
+      end
+    end
+  end
+end

data/test/fixtures/_/multiple_lines_literal.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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 MultipleLinesLiteral
+      include GetText
+
+      bindtextdomain("_", :path => GetTextTestUtils.locale_path)
+
+      def message
+        _("multiple
+lines
+literal
+")
+      end
+    end
+  end
+end