gettext 3.3.6 → 3.4.9

data/lib/gettext/tools/msgcat.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -200,7 +200,8 @@ module GetText
           @output = nil
           @order = nil
           @po_format_options = {
-            :max_line_width => POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+            max_line_width: POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+            use_one_line_per_reference: false,
           }
           @include_fuzzy = true
           @report_warning = true
@@ -322,6 +323,12 @@ module GetText
             @po_format_options[:max_line_width] = max_line_width
           end
 
+          parser.on("--[no-]use-one-line-per-reference",
+                    _("Use one line for each reference comment"),
+                    "(#{@po_format_options[:use_one_line_per_reference]})") do |use|
+            @po_format_options[:use_one_line_per_reference] = use
+          end
+
           parser.on("--no-fuzzy",
                     _("Ignore fuzzy entries")) do |include_fuzzy|
             @include_fuzzy = include_fuzzy

data/lib/gettext/tools/msginit.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2021  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -19,11 +19,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require "etc"
+require "optparse"
+
+begin
+  require "datasets"
+rescue LoadError
+end
+require "locale/info"
+
 require "gettext"
 require "gettext/po_parser"
 require "gettext/tools/msgmerge"
-require "locale/info"
-require "optparse"
 
 module GetText
   module Tools
@@ -320,53 +326,8 @@ module GetText
       end
 
       def plural_forms(language)
-        case language
-        when "ja", "vi", "ko", /\Azh.*\z/
-          nplural = "1"
-          plural_expression = "0"
-        when "en", "de", "nl", "sv", "da", "no", "fo", "es", "pt",
-             "it", "bg", "el", "fi", "et", "he", "eo", "hu", "tr",
-             "ca", "nb"
-          nplural = "2"
-          plural_expression = "n != 1"
-        when "pt_BR", "fr"
-          nplural = "2"
-          plural_expression = "n>1"
-        when "lv"
-          nplural = "3"
-          plural_expression = "n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2"
-        when "ga"
-          nplural = "3"
-          plural_expression = "n==1 ? 0 : n==2 ? 1 : 2"
-        when "ro"
-          nplural = "3"
-          plural_expression = "n==1 ? 0 : " +
-                                "(n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2"
-        when "lt", "bs"
-          nplural = "3"
-          plural_expression = "n%10==1 && n%100!=11 ? 0 : " +
-                                "n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2"
-        when "ru", "uk", "sr", "hr"
-          nplural = "3"
-          plural_expression = "n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +
-                                "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2"
-        when "cs", "sk"
-          nplural = "3"
-          plural_expression = "(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2"
-        when "pl"
-          nplural = "3"
-          plural_expression = "n==1 ? 0 : n%10>=2 && " +
-                                "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2"
-        when "sl"
-          nplural = "4"
-          plural_expression = "n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 " +
-                                "|| n%100==4 ? 2 : 3"
-        else
-          nplural = nil
-          plural_expression = nil
-        end
-
-        "nplurals=#{nplural}; plural=#{plural_expression};"
+        converter = CLDRPluralsConverter.new(language)
+        converter.convert
       end
 
       DESCRIPTION_TITLE = /^SOME DESCRIPTIVE TITLE\.$/
@@ -408,6 +369,216 @@ module GetText
       def year
         now.year
       end
+
+      class CLDRPluralsConverter
+        def initialize(language)
+          @language = language
+
+        end
+
+        def convert
+          n_plurals = nil
+          expression = nil
+          if defined?(Datasets::CLDRPlurals)
+            plurals = Datasets::CLDRPlurals.new
+            plurals.each do |locale|
+              next unless locale.name == @language
+              n_plurals, expression = convert_plural_rules(locale.rules)
+              break
+            end
+          end
+          "nplurals=#{n_plurals}; plural=#{expression};"
+        end
+
+        private
+        def convert_plural_rules(rules)
+          n_plurals = 1
+          conditions = []
+          order = [
+            "one",
+            "zero",
+            "two",
+            "few",
+            "many",
+            "other",
+          ]
+          rules = rules.reject do |rule|
+            rule.integer_samples.nil?
+          end
+          rules = rules.sort_by do |rule|
+            order.index(rule.count)
+          end
+          rules[0..-2].each do |rule|
+            next if rule.condition.nil?
+            condition = convert_plural_condition(rule.condition)
+            next if condition.nil?
+            next if condition == false
+            n_plurals += 1
+            conditions << condition
+          end
+          expression = ""
+          case conditions.size
+          when 0
+            expression << "0"
+          when 1
+            condition = conditions[0]
+            case condition
+            when "(n == 1)"
+              expression << "n != 1"
+            when "(n <= 1)"
+              expression << "n > 1"
+            else
+              expression << "#{condition} ? 1 : 0"
+            end
+          else
+            (conditions.size + 1).times do |i|
+              if i == conditions.size
+                expression << i.to_s
+              else
+                condition = conditions[i]
+                expression << "#{condition} ? #{i} : "
+              end
+            end
+          end
+          [n_plurals, expression]
+        end
+
+        def convert_plural_condition(condition)
+          case condition[0]
+          when :and
+            gettext_condition = nil
+            condition[1..-1].each do |sub_condition|
+              sub_gettext_condition = convert_plural_condition(sub_condition)
+              case sub_gettext_condition
+              when String
+                if gettext_condition.is_a?(String)
+                  gettext_condition << " && #{sub_gettext_condition}"
+                else
+                  gettext_condition = sub_gettext_condition
+                end
+              when TrueClass
+                unless gettext_condition.is_a?(String)
+                  gettext_condition = true
+                end
+              when FalseClass
+                return false
+              else
+                raise "unknown value #{sub_gettext_condition.inspect}"
+              end
+            end
+            gettext_condition
+          when :or
+            gettext_condition = false
+            condition[1..-1].each do |sub_condition|
+              sub_gettext_condition = convert_plural_condition(sub_condition)
+              case sub_gettext_condition
+              when String
+                if gettext_condition.is_a?(String)
+                  gettext_condition << " || #{sub_gettext_condition}"
+                else
+                  gettext_condition = sub_gettext_condition
+                end
+              when TrueClass
+                return true
+              when FalseClass
+              else
+                raise "unknown value #{sub_gettext_condition.inspect}"
+              end
+            end
+            gettext_condition
+          when :equal
+            left = convert_plural_condition(condition[1])
+            right = condition[2]
+            case left
+            when String
+              right = compact_equal_values(right)
+              gettext_conditions = right.collect do |right_value|
+                case right_value
+                when Range
+                  if right_value.begin.zero?
+                    "(#{left} <= #{right_value.end})"
+                  else
+                    "(#{left} >= #{right_value.begin} && " +
+                      "#{left} <= #{right_value.end})"
+                  end
+                else
+                  "(#{left} == #{right_value})"
+                end
+              end
+              if gettext_conditions.size == 1
+                gettext_conditions[0]
+              else
+                gettext_conditions.join(" || ")
+              end
+            when 0
+              if right.include?(0)
+                true
+              else
+                false
+              end
+            else
+              false
+            end
+          when :not_equal
+            left = convert_plural_condition(condition[1])
+            right = condition[2]
+            case left
+            when String
+              right = compact_equal_values(right)
+              gettext_conditions = right.collect do |right_value|
+                case right_value
+                when Range
+                  "(#{left} < #{right_value.begin} || " +
+                    "#{left} > #{right_value.end})"
+                else
+                  "(#{left} != #{right_value})"
+                end
+              end
+              if gettext_conditions.size == 1
+                gettext_conditions[0]
+              else
+                gettext_conditions = gettext_conditions.collect do |gettext_condition|
+                  "(#{gettext_condition})"
+                end
+                gettext_conditions.join(" && ")
+              end
+            when 0
+              if right.include?(0)
+                false
+              else
+                true
+              end
+            else
+              false
+            end
+          when :mod
+            left = convert_plural_condition(condition[1])
+            right = condition[2]
+            case left
+            when "n"
+              "(n % #{right})"
+            else
+              false
+            end
+          when "n", "i"
+            "n"
+          when "v", "w"
+            0
+          when "f", "t", "c", "e"
+            false
+          else
+            raise "unknown operator: #{condition[0].inspect}"
+          end
+        end
+
+        def compact_equal_values(values)
+          if values == [0, 1]
+            [0..1]
+          else
+            values
+          end
+        end
+      end
     end
   end
 end

data/lib/gettext/tools/msgmerge.rb

@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2012-2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
-# Copyright (C) 2005-2009 Masao Mutoh
-# Copyright (C) 2005,2006 speakillof
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2005-2009  Masao Mutoh
+# Copyright (C) 2005,2006  speakillof
 #
 # License: Ruby's or LGPL
 #
@@ -49,6 +47,7 @@ module GetText
         config.parse(command_line)
 
         parser = POParser.new
+        parser.report_warning = config.report_warning?
         parser.ignore_fuzzy = false
         definition_po = PO.new
         reference_pot = PO.new
@@ -309,10 +308,12 @@ module GetText
           @output = nil
           @order = :reference
           @po_format_options = {
-            :max_line_width => POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+            max_line_width: POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
+            use_one_line_per_reference: false,
           }
           @enable_fuzzy_matching = true
           @update = nil
+          @report_warning = true
           @output_obsolete_entries = true
           @backup = ENV["VERSION_CONTROL"]
           @suffix = ENV["SIMPLE_BACKUP_SUFFIX"] || "~"
@@ -337,6 +338,12 @@ module GetText
           @enable_fuzzy_matching
         end
 
+        # @return [Bool] true if reporting warning is enabled,
+        #    false otherwise.
+        def report_warning?
+          @report_warning
+        end
+
         # @return [Bool] true if outputting obsolete entries is
         #    enabled, false otherwise.
         def output_obsolete_entries?
@@ -416,12 +423,23 @@ module GetText
             @po_format_options[:max_line_width] = max_line_width
           end
 
+          parser.on("--[no-]use-one-line-per-reference",
+                    _("Use one line for each reference comment"),
+                    "(#{@po_format_options[:use_one_line_per_reference]})") do |use|
+            @po_format_options[:use_one_line_per_reference] = use
+          end
+
           parser.on("--[no-]fuzzy-matching",
                     _("Disable fuzzy matching"),
                     _("(enable)")) do |boolean|
             @enable_fuzzy_matching = boolean
           end
 
+          parser.on("--no-report-warning",
+                    _("Don't report warning messages")) do |report_warning|
+            @report_warning = report_warning
+          end
+
           parser.on("--no-obsolete-entries",
                     _("Don't output obsolete entries")) do |boolean|
             @output_obsolete_entries = boolean

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

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+
+=begin
+  parser/erubi.rb - parser for ERB using Erubi
+
+  Copyright (C) 2005-2009  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby or LGPL.
+=end
+
+require "erubi"
+require 'gettext/tools/parser/ruby'
+
+module GetText
+  class ErubiParser
+    @config = {
+      :extnames => ['.rhtml', '.erb']
+    }
+
+    class << self
+      # Sets some preferences to parse ERB files.
+      # * config: a Hash of the config. It can takes some values below:
+      #   * :extnames: An Array of target files extension. Default is [".rhtml"].
+      def init(config)
+        config.each{|k, v|
+          @config[k] = v
+        }
+      end
+
+      def target?(file) # :nodoc:
+        @config[:extnames].each do |v|
+          return true if File.extname(file) == v
+        end
+        false
+      end
+
+      # Parses eRuby script located at `path`.
+      #
+      # This is a short cut method. It equals to `new(path,
+      # options).parse`.
+      #
+      # @return [Array<POEntry>] Extracted messages
+      # @see #initialize and #parse
+      def parse(path, options={})
+        parser = new(path, options)
+        parser.parse
+      end
+    end
+
+    # @param path [String] eRuby script path to be parsed
+    # @param options [Hash]
+    def initialize(path, options={})
+      @path = path
+      @options = options
+    end
+
+    # Extracts messages from @path.
+    #
+    # @return [Array<POEntry>] Extracted messages
+    def parse
+      content = IO.read(@path)
+
+      encoding = detect_encoding(content)
+      content.force_encoding(encoding)
+
+      erb = Erubi::Engine.new(content)
+      src = erb.src
+
+      RubyParser.new(@path, @options).parse_source(src)
+    end
+
+    def detect_encoding(content)
+      if /#.*coding: (\S*)/ =~ content.lines.first
+        $1.upcase
+      else
+        content.encoding
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  # ex) ruby glade.rhtml foo.rhtml  bar.rhtml
+  ARGV.each do |file|
+    p GetText::ErubiParser.parse(file)
+  end
+end

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

@@ -1,14 +1,20 @@
-# -*- coding: utf-8 -*-
-
-=begin
-  parser/glade.rb - parser for Glade-2
-
-  Copyright (C) 2013       Kouhei Sutou <kou@clear-code.com>
-  Copyright (C) 2004,2005  Masao Mutoh
-
-  You may redistribute it and/or modify it under the same
-  license terms as Ruby or LGPL.
-=end
+# Copyright (C) 2004,2005  Masao Mutoh
+# 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/>.
 
 require 'cgi'
 require 'gettext'
@@ -24,15 +30,11 @@ module GetText
       GLADE_RE = /glade-2.0.dtd/
 
       def target?(file) # :nodoc:
-        data = IO.readlines(file)
-        if XML_RE =~ data[0] and GLADE_RE =~ data[1]
-          true
-        else
-          if File.extname(file) == '.glade'
-            raise _("`%{file}' is not glade-2.0 format.") % {:file => file}
-          end
-          false
-        end
+        return false unless File.extname(file) == ".glade"
+        data = File.read(file)
+        return false unless data.include?("<?xml")
+        return false unless data.include?("glade-2.0.dtd")
+        true
       end
 
       def parse(path, options={})
@@ -57,7 +59,7 @@ module GetText
 
     private
     def parse_source(input) # :nodoc:
-      targets = []
+      po = []
       target = false
       start_line_no = nil
       val = nil
@@ -69,14 +71,14 @@ module GetText
           target = true
           if TARGET2 =~ $1
             val = $1
-            add_target(val, start_line_no, targets)
+            add_po_entry(po, val, start_line_no)
             val = nil
             target = false
           end
         elsif target
           if TARGET2 =~ line
             val << $1
-            add_target(val, start_line_no, targets)
+            add_po_entry(po, val, start_line_no)
             val = nil
             target = false
           else
@@ -84,26 +86,22 @@ module GetText
           end
         end
       end
-      targets
+      po
     end
 
-    def add_target(val, line_no, targets) # :nodoc:
-      return unless val.size > 0
-      assoc_data = targets.assoc(val)
-      val = CGI.unescapeHTML(val)
-      if assoc_data
-        targets[targets.index(assoc_data)] = assoc_data << "#{@path}:#{line_no}"
-      else
-        targets << [val.gsub(/\n/, '\n'), "#{@path}:#{line_no}"]
+    def add_po_entry(po, value, line_no) # :nodoc:
+      return if value.empty?
+      value = CGI.unescapeHTML(value)
+      value = value.gsub(/\n/, "\n")
+      po_entry = po.find do |entry|
+        entry.msgid == value
       end
-      targets
+      if po_entry.nil?
+        po_entry = POEntry.new(:normal)
+        po_entry.msgid = value
+        po << po_entry
+      end
+      po_entry.references << "#{@path}:#{line_no}"
     end
   end
 end
-
-if __FILE__ == $0
-  # ex) ruby glade.rb foo.glade  bar.glade
-  ARGV.each do |file|
-    p GetText::GladeParser.parse(file)
-  end
-end

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

@@ -24,13 +24,14 @@ require "gettext/po_entry"
 module GetText
   class GtkBuilderUIDefinitionsParser
     @config = {
-      :extnames => [".ui"]
+      :extnames => [".ui", ".glade"]
     }
 
     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"].
+      #   * :extnames: An Array of target files extension.
+      #     Default is [".ui", ".glade"].
       def init(config)
         config.each do |k, v|
           @config[k] = v
@@ -39,7 +40,9 @@ module GetText
 
       def target?(file) # :nodoc:
         @config[:extnames].each do |extname|
-          return true if File.extname(file) == extname
+          next unless File.extname(file) == extname
+          next unless File.read(file).include?("<interface>")
+          return true
         end
         false
       end

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

@@ -1,7 +1,7 @@
 =begin
   parser/ruby.rb - parser for ruby script
 
-  Copyright (C) 2013-2019  Sutou Kouhei <kou@clear-code.com>
+  Copyright (C) 2013-2021  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2003-2009  Masao Mutoh
   Copyright (C) 2005       speakillof
   Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
@@ -95,7 +95,7 @@ module GetText
 
       def process_on_const(token, po)
         case token
-        when "N_"," Nn_"
+        when "N_", "Nn_"
           # TODO: Check the next token is :on_lparen
           process_on_ident(token, po)
         else

data/lib/gettext/tools/task.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -452,8 +450,8 @@ module GetText
             locale = args.locale || ENV["LOCALE"]
             if locale.nil?
               raise "specify locale name by " +
-                "'rake #{_task.name}[${LOCALE}]' or " +
-                "rake #{_task.name} LOCALE=${LOCALE}'"
+                    "rake '#{_task.name}[${LOCALE}]' or " +
+                    "rake #{_task.name} LOCALE=${LOCALE}'"
             end
             define_edit_po_file_task(locale)
             define_po_file_task(locale)