gettext 3.3.2 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6b8ac74bbe41d5b0a942c489cdc9d4c99ccde14e4e8fd7332168e85c0711c9
-  data.tar.gz: 6644e0c768ad64cc2e6339809953bbcab6198b5fed86d7fb84d76d97b74f3850
+  metadata.gz: '062339537f378d590d0257675937b866739f3fabefab874a71e22c4962081dd0'
+  data.tar.gz: 45b32dc00ca6d62925de104a25814309f6ec3c3db9407feb6530808f4c273fd7
 SHA512:
-  metadata.gz: b3cc2e18fcb5e68a66678d359a325b3af5c4b74a9cea7a595066022984c172cefacafd9272cb688167b4eab09bc21f9acede3f6ee567feb1ce6344dc0448ce98
-  data.tar.gz: 71995c31d3eba398f1680295fa59c4c00454306460522a962ebd2107c36c80320395ee63d1883dc331ca4c8455b8147d65efc451f81f16a20844a1934718c351
+  metadata.gz: c9d94745d0acd678adcc0b9e26eb5e862e4b02dbe12ad8b51f77860860eb941bea5b29f6178db92df02ed2ee496a0aa0153ac3e72655d16f398be98ff6f7e470
+  data.tar.gz: e23e77aba1d2cf1a3b2d1bd3b682b2639837d8539df973cc9d56a1361f26b6f6200d6305516bda527d02670fe67e09d630f733a755e2462d319b7b06c3e22547

data/doc/text/news.md

@@ -1,5 +1,68 @@
 # News
 
+## 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
@@ -817,3 +880,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

@@ -36,7 +36,6 @@ So you can use GNU gettext tools for maintaining.
   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/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

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

@@ -57,12 +57,20 @@ module GetText
       @options = options
     end
 
+    @@erb_accept_keyword_arguments =
+      ERB.instance_method(:initialize).parameters.any? {|type, _| type == :key}
+
     # Extracts messages from @path.
     #
     # @return [Array<POEntry>] Extracted messages
     def parse
       content = IO.read(@path)
-      src = ERB.new(content).src
+      if @@erb_accept_keyword_arguments
+        erb = ERB.new(content, trim_mode: "-")
+      else
+        erb = ERB.new(content, nil, "-")
+      end
+      src = erb.src
 
       # Force the src encoding back to the encoding in magic comment
       # or original content.

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

@@ -50,9 +50,6 @@ module GetText
       end
     end
 
-    TARGET1 = /<property.*translatable="yes">(.*)/
-    TARGET2 = /(.*)<\/property>/
-
     def initialize(path, options={})
       @path = path
       @options = options

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

@@ -28,9 +28,9 @@ module GetText
       attr_accessor :comment_tag
       def initialize(*args)
         super(*args)
+        @start_block = false
         @in_block_arguments = false
         @ignore_next_comma = false
-        @context_stack = []
         @need_definition_name = false
         @current_po_entry = nil
         @current_po_entry_nth_attribute = 0
@@ -43,28 +43,31 @@ module GetText
       end
 
       def process_on_op(token, po)
-        @in_block_arguments = !@in_block_arguments if token == "|"
+        if @start_block
+          @in_block_arguments = (token == "|")
+        else
+          if @in_block_arguments and token == "|"
+            @in_block_arguments = false
+          end
+        end
         po
       end
 
       def process_on_kw(token, po)
         store_po_entry(po)
         case token
-        when "begin", "case", "do", "for"
-          @context_stack.push(token)
-        when "class", "def", "module"
-          @context_stack.push(token)
-        when "if", "unless", "until", "while"
-          # postfix case
-          unless state.allbits?(Ripper::EXPR_LABEL)
-            @context_stack.push(token)
-          end
-        when "end"
-          @context_stack.pop
+        when "do"
+          @start_block = true
         end
         po
       end
 
+      def process_on_lbrace(token, po)
+        store_po_entry(po)
+        @start_block = (state == Ripper::EXPR_BEG)
+        po
+      end
+
       def process_on_ident(token, po)
         store_po_entry(po)
 
@@ -203,18 +206,18 @@ module GetText
         po
       end
 
-      def process_on_embexpr_beg(token, po)
-        @current_po_entry = nil
-        @current_po_entry_nth_attribute = 0
-        po
-      end
-
       def process_on_regexp_end(token, po)
         @string_mark_stack.pop
         @string_stack.pop
         po
       end
 
+      def process_on_embexpr_beg(token, po)
+        @current_po_entry = nil
+        @current_po_entry_nth_attribute = 0
+        po
+      end
+
       def process_on_int(token, po)
         @ignore_next_comma = true
         po
@@ -253,12 +256,24 @@ module GetText
         po
       end
 
+      def process_on_symbols_beg(token, po)
+        @string_mark_stack << "\""
+        @string_stack << ""
+        po
+      end
+
       def process_on_qsymbols_beg(token, po)
         @string_mark_stack << token
         @string_stack << ""
         po
       end
 
+      def process_on_words_beg(token, po)
+        @string_mark_stack << "\""
+        @string_stack << ""
+        po
+      end
+
       def process_on_qwords_beg(token, po)
         @string_mark_stack << token
         @string_stack << ""
@@ -268,11 +283,14 @@ module GetText
       def on_default(event, token, po)
         trace(event, token) do
           process_method = "process_#{event}"
+          start_block = @start_block
           if respond_to?(process_method)
-            __send__(process_method, token, po)
-          else
-            po
+            po = __send__(process_method, token, po)
+          end
+          if start_block and event != :on_sp
+            @start_block = false
           end
+          po
         end
       end
 
@@ -283,7 +301,16 @@ module GetText
       end
 
       def trace(event_name, token)
-        pp [event_name, token, state, @context_stack.last] if debug?
+        if debug?
+          status = [
+            event_name,
+            token,
+            state,
+          ]
+          status << :start_block if @start_block
+          status << :in_block_arguments if @in_block_arguments
+          pp status
+        end
         yield
       end