gettext 3.3.7 → 3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '062339537f378d590d0257675937b866739f3fabefab874a71e22c4962081dd0'
-  data.tar.gz: 45b32dc00ca6d62925de104a25814309f6ec3c3db9407feb6530808f4c273fd7
+  metadata.gz: 854c34e40028ef9e71045cbd1c8f77a4846c5f668de2cef716017b52d05515b2
+  data.tar.gz: bc0a5bcb8a1a30ed0b5de8272bae275a996f5ef5e6533a281997a67bf99f3f95
 SHA512:
-  metadata.gz: c9d94745d0acd678adcc0b9e26eb5e862e4b02dbe12ad8b51f77860860eb941bea5b29f6178db92df02ed2ee496a0aa0153ac3e72655d16f398be98ff6f7e470
-  data.tar.gz: e23e77aba1d2cf1a3b2d1bd3b682b2639837d8539df973cc9d56a1361f26b6f6200d6305516bda527d02670fe67e09d630f733a755e2462d319b7b06c3e22547
+  metadata.gz: 6978df6c5a2e52c5eb9b1101bb89fd2ec3febec663bf1418b054929572a333935cd02cfba15b93818ae3b89971b2fb442b2f8f48c0370fd516bacd7085eac915
+  data.tar.gz: a7fbb7a6b3e93a374440ad2ae3c69f43aeb238c54479825c45e8b14f5f90408fa05b2c06db05078af531defecc7b181bda30e0a2e53068718422ba66bbd7ae94

data/Rakefile

@@ -86,6 +86,10 @@ end
 xgettext_options = ["--add-comments=TRANSLATORS:"]
 GetText::Tools::Task.define do |task|
   task.spec = spec
+  task.files = task.files.reject do |file|
+    file.start_with?("samples/") or
+      file.start_with?("test/")
+  end
   task.xgettext_options.concat(xgettext_options)
 end
 

data/doc/text/news.md

@@ -1,5 +1,30 @@
 # News
 
+## 3.3.8: 2021-06-09 {#version-3-3-8}
+
+### Improvements
+
+  * msginit: Added support for generating plural forms with
+    Unicode's CLDR plural rules data.
+    [GitHub#85][Suggested by Michaël Hoste]
+
+  * rxgettext ui: Added support for GtkBuilder UI definitions format
+    with `.glade` extension.
+    [GitHub#74][Reported by dorle-o]
+
+### Fixes
+
+  * rxgettext ruby: Fixed a bug that `Nn_` isn't extracted.
+    [GitHub#86][Reported by Kai Ramuenke]
+
+### Thanks
+
+  * Kai Ramuenke
+
+  * Michaël Hoste
+
+  * dorle-o
+
 ## 3.3.7: 2021-01-18 {#version-3-3-7}
 
 ### Improvements

data/gettext.gemspec

@@ -30,6 +30,7 @@ So you can use GNU gettext tools for maintaining.
   s.required_ruby_version = ">= 2.5.0"
 
   s.add_runtime_dependency("locale", ">= 2.0.5")
+  s.add_runtime_dependency("red-datasets")
   s.add_runtime_dependency("text", ">= 1.3.0")
   s.add_development_dependency("rake")
   s.add_development_dependency("racc")

data/lib/gettext/mo.rb

@@ -278,11 +278,13 @@ module GetText
 
     def load_from_file(filename)
       @filename = filename
-      begin
-        File.open(filename, 'rb'){|f| load_from_stream(f)}
-      rescue => e
-        e.set_backtrace("File: #{@filename}")
-        raise e
+      File.open(filename, 'rb') do |f|
+        begin
+          load_from_stream(f)
+        rescue => e
+          e.set_backtrace(["#{filename}:#{f.lineno}"] + e.backtrace)
+          raise e
+        end
       end
     end
 

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,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require "etc"
+require "optparse"
+
+require "datasets"
+require "locale/info"
+
 require "gettext"
 require "gettext/po_parser"
 require "gettext/tools/msgmerge"
-require "locale/info"
-require "optparse"
 
 module GetText
   module Tools
@@ -320,53 +323,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 +366,214 @@ module GetText
       def year
         now.year
       end
+
+      class CLDRPluralsConverter
+        def initialize(language)
+          @language = language
+
+        end
+
+        def convert
+          n_plurals = nil
+          expression = nil
+          plurals = Datasets::CLDRPlurals.new
+          plurals.each do |locale|
+            next unless locale.name == @language
+            n_plurals, expression = convert_plural_rules(locale.rules)
+            break
+          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/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