gettext 3.3.3 → 3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2b035c2e33e7e5d59eb90ca4bc2ec5f002300cd597bb7170b265ee3dea1017b
-  data.tar.gz: c964321d37fb3e9608527d08c96a3aef18791fc4ce41f9efdc950e49086cdf53
+  metadata.gz: 854c34e40028ef9e71045cbd1c8f77a4846c5f668de2cef716017b52d05515b2
+  data.tar.gz: bc0a5bcb8a1a30ed0b5de8272bae275a996f5ef5e6533a281997a67bf99f3f95
 SHA512:
-  metadata.gz: ff63d36681ef49c5d9ae4478da15f671046b67422477f01a3f408c6a6ee653688354d1502c44f0923691b706fdf2ca8de0fa267715c31f85ac8cb4c531ac7c5f
-  data.tar.gz: 41cc509f2ab0502e3220ca39e37c201a056cbf372aca206fc3f3eb240b49308388c64f09b80aa26397f5cd92d35f750a09cd5f279ca7cd887bea134e119f0514
+  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,82 @@
 # 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
+
+  * 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
+
+  * erb: Added support for `-%>`.
+    [GitHub#77][Reported by lremes]
+
+  * Removed ChangeLog.
+    [GitHub#76][Reported by Will Stephenson]
+
+  * Don't assume `RbConfig::CONFIG["datadir"]` is available. For
+    example, TruffleRuby doesn't provide it.
+
+### Thanks
+
+  * lremes
+
+  * Will Stephenson
+
+## 3.3.5: 2020-02-15 {#version-3-3-5}
+
+### Improvements
+
+  * Added support for `|` method.
+    [GitHub#73][Reported by dorle-o]
+
+### Thanks
+
+  * dorle-o
+
+## 3.3.4: 2020-02-12 {#version-3-3-4}
+
+### Improvements
+
+  * Added support for `%W`.
+    [GitHub#72][Reported by Michaël Hoste]
+
+### Thanks
+
+  * Michaël Hoste
+
 ## 3.3.3: 2020-02-05 {#version-3-3-3}
 
 ### Improvements
@@ -828,3 +905,157 @@ Ruby 1.9 support release.
   * Gunnar Wolf
   * Ivan Pirlik
   * Tatsuki Sugiura
+
+## 2.2.1: 2012-05-20
+
+### Changes
+
+  * Supported non ASCII string in msgid. [GitHub#1]
+    [Patch by Urban Hafner]
+  * Stopped overriding String#% on Ruby 1.9.
+  * Fixed a bug that "\" is too escaped.
+  * Removed GetText.bindtext dependency from GetText::PoParser.
+  * Ranamed GetText::MOFile to GetText::MoFile but GetText::MOFile
+    is still available.
+
+### Thanks
+
+  * Urban Hafner
+
+## 2.2.0: 2012-03-11
+
+### Changes
+
+  * Supported ruby-1.9. [Patch by hallelujah]
+  * Supported $SAFE=1. [Patch by bon]
+  * Improved argument check. [Suggested by Morus Walter]
+  * Supported ruby-1.8.6 again. [Bug#27447] [Reported by Mamoru Tasaka]
+  * Fixed Ukrainan translation path. [Bug#28277] [Reported by Gunnar Wolf]
+  * Fixed a bug that only the last path in GETTEXT_PATH environment
+    variable is used. [Bug#28345] [Reported by Ivan Pirlik]
+  * Fixed a bug that Ruby-GetText-Package modifies $LOAD_PATH. [Bug#28094]
+    [Reported by Tatsuki Sugiura]
+
+### Thanks
+
+  * hallelujah
+  * bon
+  * Morus Walter
+  * Mamoru Tasaka
+  * Gunnar Wolf
+  * Ivan Pirlik
+  * Tatsuki Sugiura
+
+
+## 2.1.0: 2009-11-14
+
+### Changes
+
+  * Implemented parsing of translator comments (GNU gettext feature)
+    [by Vladimir Dobriakov]
+  * Refactor the directory structure.
+    * Move files for runtime to lib/gettext/runtime/*.
+    * Move files for development(rgettext/rmsgfmt) to
+      lib/gettext/tools/*.
+  * Refactor parsers for po. po-message object is defined as GetText::PoMessage
+    class. [by Vladimir Dobriakov, Masao Mutoh]
+  * Speed up when lots of objects are created to share the textdomain in each
+    objects. [Reported by Gaël Séchaud.]
+  * Fix "%{foo.bar}" %{"foo.bar".to_sym => "a"} doesn't work.
+    [Bug#26663, Reported by Danilo Castilho]
+  * lib/gettext.rb: Fixed to work unless gem. [Reported by Vladimir Dobriakov]
+  * Fixed a wrong String literal in a CGI sample.
+    [Bug #26531, by Eugene Mikhailov]
+  * Update license information(explicit to use ruby's or LGPL).
+    [Pointed out by Masateru Yoshikawa]
+  * Code cleanup.
+  * Update minor version.
+
+## 2.0.4: 2009-05-23
+
+### Changes
+
+  * Fix String#% return nil when the string have no place holders. [by okkez]
+  * Update pofiles and remove old messages.
+  * suppress some warnings on Ruby 1.9.x. [by Nobuhiro IMAI]
+  * Fix not to run tests on Win32.
+
+## 2.0.3: 2009-05-09
+
+### Changes
+
+  * Fixed the dependencies. [Reported by Hans de Graaff]
+
+## 2.0.2: 2009-05-04
+
+### Changes
+
+  * Support ruby-1.9.1 style format string such as `%<foo>d`.
+  * Apply new `Locale.set_app_language_tags` and Locale.candidates.
+    [Suggested by Vladimir Dobriakov]
+  * Enhance to support ruby-1.9.x [by OZAWA Sakuro]
+    * poparser work with proper encoding.
+    * string.rb: #bytesize alias to #size in older ruby version such as 1.8.5.
+  * Fixed bugs
+    * `n_()` to work when Plural-Forms line in po-file is not correct.
+      [Reported by Sava Chankov (Bug#25570)]
+    * GetText::Locale.default_rules_path : $LOAD_PATH is not well parsed.
+      [by hallelujah]
+    * locale_path.rb: Fixed warning message.
+
+### Thanks
+
+  * hallelujah
+  * Sava Chankov
+  * OZAWA Sakuro
+  * Vladimir Dobriakov
+
+## 2.0.1: 2009-04-17
+
+### Changes
+
+  * Fixed bugs
+    * doesn't work with ruby-1.8.5. [Reported by Dan Coutu]
+    * GetText.locale= can't keep the locale. [Reported by Adam Ilan]
+    * Break backward compatibility of bindtextdomain
+      [Reported by Mamoru Tasaka(#24947), Mathieu Blondel]
+    * Other trivial fixes/improvement.
+  * 1.8 times faster than 2.0.0.
+  * GetText::LocalePath is separated from GetText::TextDomainManager.
+    Improve to find the locale path.
+  * Enhance to support ruby-1.9.x [by OZAWA Sakuro]
+
+### Thanks
+
+  * OZAWA Sakuro
+  * Tietew
+  * Adam Ilan
+  * Mamoru Tasaka
+  * Mathieu Blondel
+
+## 2.0.0: 2009-03-21
+
+### Changes
+
+  * Separate this library to locale and rails-support to locale,
+    locale\_rails, gettext\_activerecord, gettext\_rails.
+    * Depends on locale(ruby-locale).
+    * Removes to support rails.
+  * A lot of referctoring, improvements.
+  * Thread safe.
+  * New APIs for gettext/tools instead of gettext/utils.
+  * Move to github.com.
+
+### Special thanks
+
+  * Michael Grosser: A lot of improvement.
+
+### Thanks
+
+  * Tietew
+  * Kazuhiro NISHIYAMA
+  * Fabio M.A.
+  * Tuptus
+  * Morus Walter
+  * Vladimir Dobriakov
+  * Ramsey

data/gettext.gemspec

@@ -30,13 +30,13 @@ 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")
   s.add_development_dependency("yard")
   s.add_development_dependency("kramdown")
   s.add_development_dependency("test-unit")
-  s.add_development_dependency("test-unit-notify")
   s.add_development_dependency("test-unit-rr")
   s.license = "Ruby or LGPLv3+"
 end

data/lib/gettext/locale_path.rb

@@ -17,14 +17,18 @@ module GetText
   class LocalePath
     # The default locale paths.
     CONFIG_PREFIX = RbConfig::CONFIG['prefix'].gsub(/\/local/, "")
-    DEFAULT_RULES = [
-                     "./locale/%{lang}/LC_MESSAGES/%{name}.mo",
-                     "./locale/%{lang}/%{name}.mo",
-                     "#{RbConfig::CONFIG['datadir']}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
-                     "#{RbConfig::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
-                     "#{CONFIG_PREFIX}/share/locale/%{lang}/LC_MESSAGES/%{name}.mo",
-                     "#{CONFIG_PREFIX}/local/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
-                    ].uniq
+    default_rules_candidates = [
+      "./locale/%{lang}/LC_MESSAGES/%{name}.mo",
+      "./locale/%{lang}/%{name}.mo",
+    ]
+    data_dir = RbConfig::CONFIG["datadir"]
+    if data_dir
+      default_rules_candidates << "#{data_dir}/locale/%{lang}/LC_MESSAGES/%{name}.mo"
+      default_rules_candidates << "#{data_dir.gsub(/\/local/, "")}/locale/%{lang}/LC_MESSAGES/%{name}.mo"
+    end
+    default_rules_candidates << "#{CONFIG_PREFIX}/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
+    default_rules_candidates << "#{CONFIG_PREFIX}/local/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
+    DEFAULT_RULES = default_rules_candidates.uniq
 
     class << self
       # Add default locale path. Usually you should use GetText.add_default_locale_path instead.

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