gettext 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f90846d2f7fec5d336b6867dbaef56d739cb0917ccf8d9579e3342d2b281aa
-  data.tar.gz: 5ea3cd94fb22f166310ca120ad9164d73ac0c04c29b6fc74814e6e72bf593d5a
+  metadata.gz: d22629a729714a92e020579fcf8b6958a81f167a5c8126971383584f4cf20767
+  data.tar.gz: 01cd63601bbe76f52566d20015be66891e02022ce5c02691350a5d2da3980f6f
 SHA512:
-  metadata.gz: e3545417d8a7348df2cc46a38cd791cc366c6b7a8eaeb2a82eb8570d98f80afa9fbe9b046a4bfe2e28e09f9f4f2211702a261fb97382aa73876aacb030aa9255
-  data.tar.gz: 3bca29b8aa87ee03734c691d1006fabb9831f3f43017a83ec4e449adcedcf7db0b165790b42c6a2dcc23b9fe363a5aec01cf9fabcf4c551f3f6eea9b631aa07c
+  metadata.gz: 071e7bc118369c5eaffb4b7ba1653572e22a007fb4035e2620ad3bf3c152dd5fe25fafe0c8404b78fade0af264125fd716fc3fd8fa0bd3a70815837a63cc2587
+  data.tar.gz: 7d725646addcf0a3c3dd5460dac0dc8adfe0211190cc91164e25232a9dd392c3903fd98f55feb31ad824e3a6fa23e19202ef2e9b7fa519fbdc1b6aee91887563

data/doc/text/news.md

@@ -1,5 +1,28 @@
 # News
 
+## 3.3.1: 2020-01-12 {#version-3-3-1}
+
+### Improvements
+
+  * Stopped detecting string interpolation literal.
+    [GitHub#21][Reported by Remo]
+
+  * `rxgettext`: Added support for adding a new parser by `--require`.
+
+  * Added support for GtkBuilder UI definitions file.
+    [GitHub#63][Reported by Alex]
+
+  * Improved percent literal parsing.
+    [GitHub#67][Patch by KITAITI Makoto]
+
+### Thanks
+
+  * Remo
+
+  * Alex
+
+  * KITAITI Makoto
+
 ## 3.3.0: 2020-01-08 {#version-3-3-0}
 
 ### Improvements

data/lib/gettext/tools/msginit.rb

@@ -156,7 +156,7 @@ module GetText
         else
           unless File.exist?(@input_file)
             raise(ValidationError,
-                  _("file '%s' does not exist." % @input_file))
+                  _("file '%s' does not exist.") % @input_file)
           end
         end
 
@@ -168,8 +168,9 @@ module GetText
 
         unless valid_locale?(language_tag)
           raise(ValidationError,
-                _("Locale '#{language_tag}' is invalid. " +
-                    "Please check if your specified locale is usable."))
+                _("Locale '%s' is invalid. " +
+                  "Please check if your specified locale is usable.") %
+                language_tag)
         end
         @locale = language_tag.to_simple.to_s
         @language = language_tag.language
@@ -177,7 +178,7 @@ module GetText
         @output_file ||= "#{@locale}.po"
         if File.exist?(@output_file)
           raise(ValidationError,
-                _("file '%s' has already existed." % @output_file))
+                _("file '%s' has already existed.") % @output_file)
         end
       end
 

data/lib/gettext/tools/parser/gtk_builder_ui_definitions.rb

@@ -0,0 +1,129 @@
+# Copyright (C) 2020  Sutou Kouhei <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 "English"
+require "cgi"
+require "strscan"
+
+require "gettext/po_entry"
+
+module GetText
+  class GtkBuilderUIDefinitionsParser
+    @config = {
+      :extnames => [".ui"]
+    }
+
+    class << self
+      # Sets some preferences to parse GtkBuilder UI definitions files.
+      # * config: a Hash of the config. It can takes some values below:
+      #   * :extnames: An Array of target files extension. Default is [".ui"].
+      def init(config)
+        config.each do |k, v|
+          @config[k] = v
+        end
+      end
+
+      def target?(file) # :nodoc:
+        @config[:extnames].each do |extname|
+          return true if File.extname(file) == extname
+        end
+        false
+      end
+
+      def parse(path, options={})
+        parser = new(path, options)
+        parser.parse
+      end
+    end
+
+    TARGET1 = /<property.*translatable="yes">(.*)/
+    TARGET2 = /(.*)<\/property>/
+
+    def initialize(path, options={})
+      @path = path
+      @options = options
+    end
+
+    def parse # :nodoc:
+      File.open(@path) do |file|
+        po = []
+        start_line_no = nil
+        property = nil
+        file.each_line do |line|
+          case line
+          when /<property/
+            property = $POSTMATCH
+            start_line_no = file.lineno
+            if /<\/property>/ =~ property
+              property << $PREMATCH
+              add_po_entry(po, property, start_line_no)
+              property = nil
+            end
+          when /<\/property>/
+            property << $PREMATCH
+            add_po_entry(po, property, start_line_no)
+            property = nil
+          else
+            property << line if property
+          end
+        end
+        po
+      end
+    end
+
+    private
+    def add_po_entry(po, property, line_no)
+      raw_attributes, raw_data_and_close_tag = property.split(">", 2)
+      raw_data, _close_tag = raw_data_and_close_tag.split("<", 2)
+      return if raw_data.empty?
+
+      attributes = parse_attributes(raw_attributes)
+      return unless attributes["translatable"] == "yes"
+
+      data = CGI.unescapeHTML(raw_data)
+      context = attributes["context"]
+      if context
+        po_entry = POEntry.new(:msgctxt)
+        po_entry.msgctxt = context
+      else
+        po_entry = POEntry.new(:normal)
+      end
+      po_entry.msgid = data
+      po_entry.references << "#{@path}:#{line_no}"
+      po << po_entry
+    end
+
+    def parse_attributes(raw_attributes)
+      scanner = StringScanner.new(raw_attributes)
+      attributes = {}
+      loop do
+        scanner.scan(/\s*/m)
+        break if scanner.eos?
+        name = scanner.scan(/[^=]+/)
+        break if name.nil?
+        break unless scanner.scan(/=/)
+        quote = scanner.scan(/["']/)
+        break if quote.nil?
+        value = scanner.scan(/[^#{Regexp.escape(quote)}]+/m)
+        break if value.nil?
+        break unless scanner.scan(/#{Regexp.escape(quote)}/)
+        attributes[name] = CGI.unescapeHTML(value)
+      end
+      attributes
+    end
+  end
+end

data/lib/gettext/tools/parser/ruby.rb

@@ -38,7 +38,6 @@ module GetText
         @comment_tag = nil
         @last_comment = ""
         @reset_comment = false
-        @embed_expression_level = 0
         @string_mark_stack = []
         @string_stack = []
       end
@@ -67,11 +66,6 @@ module GetText
       end
 
       def process_on_ident(token, po)
-        if @embed_expression_level > 0
-          @string_stack.last << token
-          return po
-        end
-
         store_po_entry(po)
 
         return po if @in_block_arguments
@@ -127,13 +121,22 @@ module GetText
       end
 
       def process_on_tstring_beg(token, po)
-        @string_mark_stack << token
+        if token.start_with?("%Q")
+          @string_mark_stack << "\""
+        elsif token.start_with?("%q")
+          @string_mark_stack << "'"
+        elsif token.start_with?("%")
+          @string_mark_stack << "\""
+        else
+          @string_mark_stack << token
+        end
         @string_stack << ""
         po
       end
 
       def process_on_tstring_content(token, po)
-        if @string_mark_stack.last == "\""
+        case @string_mark_stack.last
+        when "\"", "`"
           @string_stack.last << token.gsub(/\\./) do |data|
             case data
             when "\\n"
@@ -167,12 +170,15 @@ module GetText
 
       def process_on_tstring_end(token, po)
         @ignore_next_comma = false
-        @string_mark_stack.pop
-        last_string = @string_stack.pop
-        if @current_po_entry and last_string
-          @current_po_entry[@current_po_entry_nth_attribute] =
-            (@current_po_entry[@current_po_entry_nth_attribute] || "") +
-            last_string
+        string_mark = @string_mark_stack.pop
+        case string_mark
+        when "\"", "'"
+          last_string = @string_stack.pop
+          if @current_po_entry and last_string
+            @current_po_entry[@current_po_entry_nth_attribute] =
+              (@current_po_entry[@current_po_entry_nth_attribute] || "") +
+              last_string
+          end
         end
         po
       end
@@ -198,14 +204,8 @@ module GetText
       end
 
       def process_on_embexpr_beg(token, po)
-        @embed_expression_level += 1
-        @string_stack.last << token
-        po
-      end
-
-      def process_on_embexpr_end(token, po)
-        @embed_expression_level -= 1
-        @string_stack.last << token
+        @current_po_entry = nil
+        @current_po_entry_nth_attribute = 0
         po
       end
 
@@ -239,6 +239,32 @@ module GetText
         po
       end
 
+      def process_on_symbeg(token, po)
+        if token.start_with?("%s") or [":'", ":\""].include?(token)
+          @string_mark_stack << ":"
+          @string_stack << ""
+        end
+        po
+      end
+
+      def process_on_backtick(token, po)
+        @string_mark_stack << "`"
+        @string_stack << ""
+        po
+      end
+
+      def process_on_qsymbols_beg(token, po)
+        @string_mark_stack << token
+        @string_stack << ""
+        po
+      end
+
+      def process_on_qwords_beg(token, po)
+        @string_mark_stack << token
+        @string_stack << ""
+        po
+      end
+
       def on_default(event, token, po)
         trace(event, token) do
           process_method = "process_#{event}"

data/lib/gettext/tools/xgettext.rb

@@ -52,15 +52,15 @@ module GetText
       # @api private
       @@default_parsers = []
       builtin_parser_info_list = [
-        ["glade", "GladeParser"],
+        ["ruby", "RubyParser"], # Default parser.
         ["erb", "ErbParser"],
-        # ["ripper", "RipperParser"],
-        ["ruby", "RubyParser"] # Default parser.
+        ["gtk_builder_ui_definitions", "GtkBuilderUIDefinitionsParser"],
+        ["glade", "GladeParser"],
       ]
       builtin_parser_info_list.each do |f, klass|
         begin
           require "gettext/tools/parser/#{f}"
-          @@default_parsers << GetText.const_get(klass)
+          add_parser(GetText.const_get(klass))
         rescue
           $stderr.puts(_("'%{klass}' is ignored.") % {:klass => klass})
           $stderr.puts($!) if $DEBUG
@@ -74,7 +74,7 @@ module GetText
       attr_reader :parse_options
 
       def initialize #:nodoc:
-        @parsers = @@default_parsers.dup
+        @parsers = []
 
         @input_files = nil
         @output = nil
@@ -357,7 +357,7 @@ Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;
       end
 
       def parse_path(path, po)
-        @parsers.each do |parser|
+        (@parsers + @@default_parsers).each do |parser|
           next unless parser.target?(path)
 
           # For backward compatibility

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

data/po/bg/gettext.edit.po

@@ -192,18 +192,18 @@ msgid "file '%s' does not exist."
 msgstr "Файлът '%s' съществува."
 
 #: ../lib/gettext/tools/msginit.rb:171
-msgid "Locale '#{language_tag}' is invalid. Please check if your specified locale is usable."
+msgid "Locale '%s' is invalid. Please check if your specified locale is usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:180
+#: ../lib/gettext/tools/msginit.rb:181
 msgid "file '%s' has already existed."
 msgstr "Файлът '%s' съществува."
 
-#: ../lib/gettext/tools/msginit.rb:222
+#: ../lib/gettext/tools/msginit.rb:223
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:251
+#: ../lib/gettext/tools/msginit.rb:252
 msgid "Please enter your email address"
 msgstr ""
 
@@ -469,6 +469,10 @@ msgid ""
 "Here document2\n"
 msgstr ""
 
+#: ../test/fixtures/_.rb:109
+msgid "in_quote"
+msgstr ""
+
 #. TRANSLATORS: This is a proper name.  See the gettext
 #. manual, section Names.  Note this is actually a non-ASCII
 #. name: The first name is (with Unicode escapes)
@@ -537,6 +541,10 @@ msgid ""
 "one new line\n"
 msgstr ""
 
+#: ../test/fixtures/_/percent_strings.rb:34
+msgid "hello world"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""

data/po/bg/gettext.po

@@ -158,9 +158,7 @@ msgstr ""
 msgid "file '%s' does not exist."
 msgstr "Файлът '%s' съществува."
 
-msgid ""
-"Locale '#{language_tag}' is invalid. Please check if your specified locale is "
-"usable."
+msgid "Locale '%s' is invalid. Please check if your specified locale is usable."
 msgstr ""
 
 msgid "file '%s' has already existed."
@@ -389,6 +387,9 @@ msgid ""
 "Here document2\n"
 msgstr ""
 
+msgid "in_quote"
+msgstr ""
+
 #. TRANSLATORS: This is a proper name.  See the gettext
 #. manual, section Names.  Note this is actually a non-ASCII
 #. name: The first name is (with Unicode escapes)
@@ -443,6 +444,9 @@ msgid ""
 "one new line\n"
 msgstr ""
 
+msgid "hello world"
+msgstr ""
+
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 

data/po/bs/gettext.edit.po

@@ -194,18 +194,18 @@ msgid "file '%s' does not exist."
 msgstr "Datoteka '%s' već postoji."
 
 #: ../lib/gettext/tools/msginit.rb:171
-msgid "Locale '#{language_tag}' is invalid. Please check if your specified locale is usable."
+msgid "Locale '%s' is invalid. Please check if your specified locale is usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:180
+#: ../lib/gettext/tools/msginit.rb:181
 msgid "file '%s' has already existed."
 msgstr "Datoteka '%s' već postoji."
 
-#: ../lib/gettext/tools/msginit.rb:222
+#: ../lib/gettext/tools/msginit.rb:223
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:251
+#: ../lib/gettext/tools/msginit.rb:252
 msgid "Please enter your email address"
 msgstr ""
 
@@ -474,6 +474,10 @@ msgid ""
 "Here document2\n"
 msgstr ""
 
+#: ../test/fixtures/_.rb:109
+msgid "in_quote"
+msgstr ""
+
 #. TRANSLATORS: This is a proper name.  See the gettext
 #. manual, section Names.  Note this is actually a non-ASCII
 #. name: The first name is (with Unicode escapes)
@@ -542,6 +546,10 @@ msgid ""
 "one new line\n"
 msgstr ""
 
+#: ../test/fixtures/_/percent_strings.rb:34
+msgid "hello world"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""