gettext 3.2.9 → 3.4.9

data/doc/text/news.md

@@ -1,5 +1,302 @@
 # News
 
+## 3.4.9: 2023-10-22 {#version-3-4-9}
+
+### Improvements
+
+  * `rmsgcat`, `rmsgmerge`, `rxgettext`: Added
+    `--use-one-line-per-reference` option.
+
+## 3.4.8: 2023-10-22 {#version-3-4-8}
+
+### Fixes
+
+  * doc: Fixed a wrong description for interpolation.
+    * GH-102
+    * Patch by Ilmari Karonen
+
+  * po: Fixed a parser bug that flags aren't parsed correctly. If a
+    normal comment has "fuzzy", the entry is also treated as a fuzzy
+    entry.
+
+  * po: Fixed an output bug that flags aren't formatted correctly.
+    * GH-105
+    * Patch by Yoshikazu Nojima
+
+### Thanks
+
+  * Ilmari Karonen
+
+  * Yoshikazu Nojima
+
+## 3.4.7: 2023-08-17 {#version-3-4-7}
+
+### Fixes
+
+  * po: Fixed a parser bug that it may add a `fuzzy` flag to non-fuzzy
+    entry with `ignore_fuzzy: true`.
+
+    Example PO:
+
+    ```po
+    #, fuzzy
+    #: file.rb:10
+    msgid "hello"
+    msgstr "bonjour"
+
+    msgid "non-fuzzy"
+    msgstr "non-fuzzy string"
+	```
+
+    `hello` entry is ignored because `ignore_fuzzy` is `true`. The
+    `fuzzy` flag in the `hello` entry is added to `non-fuzzy` entry.
+
+## 3.4.6: 2023-07-12 {#version-3-4-6}
+
+### Fixes
+
+  * po: Fixed a bug that parsed `msgid`/`msgstr`/`msgctxt` in `.po`
+    may be too much unescaped.
+
+## 3.4.5: 2023-07-12 {#version-3-4-5}
+
+### Improvements
+
+  * po: Added support for escaping `\r` in `msgid`/`msgstr`.
+
+## 3.4.4: 2023-06-11 {#version-3-4-4}
+
+### Improvements
+
+  * Added `racc` to runtime dependencies because Ruby 3.3 doesn't
+    include `racc/parser`.
+
+## 3.4.3: 2022-05-20 {#version-3-4-3}
+
+### Improvements
+
+  * Added support for Erubi to parse `.erb`
+    [GitHub#91][Patch by Michaël Hoste]
+
+### Thanks
+
+  * Michaël Hoste
+
+## 3.4.2: 2022-01-11 {#version-3-4-2}
+
+### Improvements
+
+  * Added support for fallback for specific locale.
+    e.g.: `fr_BE_Foo` -> `fr_BE` -> `fr`
+    [GitHub#90][Patch by Michaël Hoste]
+
+  * Added support for Ruby 3.1.
+    [GitHub#92][Reported by ahiru]
+
+### Thanks
+
+  * Michaël Hoste
+
+  * ahiru
+
+## 3.4.1: 2021-09-08 {#version-3-4-1}
+
+### Improvements
+
+  * Listed licenses separately in gemspec.
+    [GitHub#88][Patch by Josh Cooper]
+
+### Thanks
+
+  * Josh Cooper
+
+## 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
+
+  * 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
+
+  * Added support for `%I`.
+    [GitHub#71][Reported by Kai Ramuenke]
+
+### Thanks
+
+  * Kai Ramuenke
+
+## 3.3.2: 2020-01-13 {#version-3-3-2}
+
+### Fixes
+
+  * Fixed a bug that `rake gettext:po:add]` raises an error.
+    [GitHub#70][Patch by KITAITI Makoto]
+
+### Thanks
+
+  * KITAITI Makoto
+
+## 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
+
+  * Fixed README markup.
+    [GitHub#57][Patch by Alexander Paukste]
+
+  * Suppressed warnings.
+    [GitHub#58][Patch by 284km]
+
+  * Improved README.
+    [GitHub#62][Patch by Robert Graff]
+
+  * Added support for finding `racc` of Ruby 2.7.
+    [GitHub#65][Patch by KITAITI Makoto]
+
+  * Added support for Ruby 2.7.
+    [GitHub#64][Reported by Anatol Pomozov]
+
+  * Dropped support for Ruby 2.4.
+
+### Fixes
+
+  * Fixed a bug that `n_` may return nil.
+    [GitHub#60][Patch by Michaël Hoste]
+
+  * Fixed a sort by msgid bug.
+    [GitHub#61][Patch by Robert Graff]
+
+### Thanks
+
+  * Alexander Paukste
+
+  * 284km
+
+  * Michaël Hoste
+
+  * Robert Graff
+
+  * KITAITI Makoto
+
+  * Anatol Pomozov
+
 ## 3.2.9: 2018-03-05 {#version-3-2-9}
 
 ### Fixes
@@ -740,3 +1037,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

@@ -15,8 +15,7 @@ So you can use GNU gettext tools for maintaining.
   EOD
   s.authors = ["Kouhei Sutou", "Masao Mutoh"]
   s.email = ["kou@clear-code.com", "mutomasa at gmail.com"]
-  s.homepage = "http://ruby-gettext.github.com/"
-  s.rubyforge_project = "gettext"
+  s.homepage = "https://ruby-gettext.github.io/"
   s.require_paths = ["lib"]
   Dir.chdir(base_dir) do
     s.files = Dir.glob("{locale,bin,data,doc/text,lib,po,samples,src,test}/**/*")
@@ -28,14 +27,18 @@ So you can use GNU gettext tools for maintaining.
     s.test_files = Dir.glob("test/test_*.rb")
   end
 
+  s.required_ruby_version = ">= 2.5.0"
+
+  s.add_runtime_dependency("erubi")
   s.add_runtime_dependency("locale", ">= 2.0.5")
+  s.add_runtime_dependency("prime")
+  s.add_runtime_dependency("racc")
   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("rake")
+  s.add_development_dependency("red-datasets")
   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+"
+  s.add_development_dependency("yard")
+  s.licenses = ["Ruby", "LGPL-3.0+"]
 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.
@@ -85,7 +89,11 @@ module GetText
         this_path_rules = rule % {:lang => "([^\/]+)", :name => name}
         Dir.glob(rule % {:lang => "*", :name => name}).each do |path|
           if /#{this_path_rules}/ =~ path
-            @locale_paths[$1] = path.untaint unless @locale_paths[$1]
+            locale_path = $1
+            unless @locale_paths[locale_path]
+              path.untaint if RUBY_VERSION < "2.7"
+              @locale_paths[locale_path] = path
+            end
           end
         end
       end

data/lib/gettext/mo.rb

@@ -3,7 +3,7 @@
 =begin
     mo.rb - A simple class for operating GNU MO file.
 
-    Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+    Copyright (C) 2012-2022  Sutou Kouhei <kou@clear-code.com>
     Copyright (C) 2003-2009  Masao Mutoh
     Copyright (C) 2002  Masahiro Sakai, Masao Mutoh
     Copyright (C) 2001  Masahiro Sakai
@@ -19,6 +19,8 @@
 
 require 'stringio'
 
+require 'prime'
+
 module GetText
   class MO < Hash
     class InvalidFormat < RuntimeError; end;
@@ -168,19 +170,8 @@ module GetText
       ('1' * number) !~ /^1?$|^(11+?)\1+$/
     end
 
-    begin
-      require 'prime'
-      def next_prime(seed)
-        Prime.instance.find{|x| x > seed }
-      end
-    rescue LoadError
-      def next_prime(seed)
-        require 'mathn'
-        prime = Prime.new
-        while current = prime.succ
-          return current if current > seed
-        end
-      end
+    def next_prime(seed)
+      Prime.instance.find{|x| x > seed }
     end
 
     HASHWORDBITS = 32
@@ -278,11 +269,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/po.rb

@@ -222,11 +222,11 @@ module GetText
     def sort(entries)
       case @order
       when :reference, :references # :references is deprecated.
-        sorted_entries = sort_by_reference(entries)
+        sort_by_reference(entries)
       when :msgid
-        sorted_entries = sort_by_msgid(entries)
+        sort_by_msgid(entries)
       else
-        sorted_entries = entries.to_a
+        entries.to_a
       end
     end
 
@@ -268,7 +268,7 @@ module GetText
     def sort_by_msgid(entries)
       entries.sort_by do |msgid_entry|
         # msgid_entry = [[msgctxt, msgid], POEntry]
-        msgid_entry[0]
+        msgid_entry[0][1]
       end
     end
   end