gettext 3.3.6 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e644842bf5dd767497cbcb53f5ad651604e709bc4a484e460bfd8d2e1040b1cd
-  data.tar.gz: 798048056cf35d51a238480448139a4316fab5decaa26f161add7c1cd53e91e3
+  metadata.gz: f1f67074e07acb7cb3db6bb2ad8919d80a89f8da9c7e69d31ab29297178ea83f
+  data.tar.gz: a4f732674bdca1d8514835839368dea0650119bc1289c84cb91c9cad9ff3f480
 SHA512:
-  metadata.gz: 81e13f5f41667f9885f27b65ad6179151b7c25fdf05e7ac49964d45827e0725fa72bc7b40a6e0a52e69a5a86f46c98f2efb36eb606796636bf407072b372ad01
-  data.tar.gz: 887292f88d3bf9baef49bbf2af55082689b889010a1328f69ec2387b65abf346b348080b5932ac7dd3393c39d5f2a79e9d375fc48c89d28e8ba242cb54f5b95c
+  metadata.gz: bdf37e07ffe50e49fe9eab4854f17a84d50816e44fcf97a36d9d782dec970fe2d2be02edd5717ad477ec6752f125d7e05d7a0b8935114baa322babbec1d579e4
+  data.tar.gz: 30327be21a39f87162332f3487897ac6e3fcadf358b2d93e6a7658cd0ac6f22c3aca28f62feec68cedaa545561c26d136633adecf012e775bb8382c62ea026ff

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,63 @@
 # News
 
+## 3.4.0: 2021-08-26 {#version-3-4-0}
+
+### Improvements
+
+  * test: Added missing Red Datasets availability check.
+    [GitHub#87][Reported by Mamoru TASAKA]
+
+### Thanks
+
+  * Mamoru TASAKA
+
+## 3.3.9: 2021-08-26 {#version-3-3-9}
+
+### Improvements
+
+  * msginit: Made Red Datasets dependency optional.
+    [GitHub:red-datatools/red-datasets#105][Suggested by Mamoru TASAKA]
+
+### Thanks
+
+  * Mamoru TASAKA
+
+## 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
+
+  * msgmerge: Added `--no-report-warning` option.
+    [GitHub#81][Reported by Akim Demaille]
+
+### Thanks
+
+  * Akim Demaille
+
 ## 3.3.6: 2020-08-04 {#version-3-3-6}
 
 ### Improvements

data/gettext.gemspec

@@ -31,11 +31,12 @@ So you can use GNU gettext tools for maintaining.
 
   s.add_runtime_dependency("locale", ">= 2.0.5")
   s.add_runtime_dependency("text", ">= 1.3.0")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("racc")
-  s.add_development_dependency("yard")
   s.add_development_dependency("kramdown")
+  s.add_development_dependency("racc")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("red-datasets")
   s.add_development_dependency("test-unit")
   s.add_development_dependency("test-unit-rr")
+  s.add_development_dependency("yard")
   s.license = "Ruby or LGPLv3+"
 end

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,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

@@ -49,6 +49,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
@@ -313,6 +314,7 @@ module GetText
           }
           @enable_fuzzy_matching = true
           @update = nil
+          @report_warning = true
           @output_obsolete_entries = true
           @backup = ENV["VERSION_CONTROL"]
           @suffix = ENV["SIMPLE_BACKUP_SUFFIX"] || "~"
@@ -337,6 +339,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?
@@ -422,6 +430,11 @@ module GetText
             @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