gettext 2.3.1 → 2.3.2

data/doc/text/news.md

@@ -1,4 +1,17 @@
 # News
+## <a id="2-3-2">2.3.2</a>: 2012-09-20
+
+It's a bug fix release.
+
+### Fixes
+
+  * Fixed the bug that untranslated messages are included in a .mo file.
+    [Github #11][Reported by Ramón Cahenzli]
+
+### Thanks
+
+  * Ramón Cahenzli
+
 ## <a id="2-3-1">2.3.1</a>: 2012-09-13
 
 It's a Bug and package fix release.

data/lib/gettext/runtime/mofile.rb

@@ -152,7 +152,6 @@ module GetText
             @plural = "0" unless @plural
           end
         else
-          msgstr = nil if msgstr.empty?
           unless msgstr.nil?
             msgstr = convert_encoding(msgstr, msgid)
           end
@@ -203,6 +202,12 @@ module GetText
 
     #Save data as little endian format.
     def save_to_stream(io)
+      # remove untranslated message
+      translated_messages = reject do |msgid, msgstr|
+        msgstr.nil?
+      end
+
+      size = translated_messages.size
       header_size = 4 * 7
       table_size  = 4 * 2 * size
 
@@ -219,11 +224,7 @@ module GetText
                           )
       io.write(header.to_a.pack('a4V*'))
 
-      ary = to_a
-      ary = ary.collect do |msgid, msgstr|
-        msgstr ||= ""
-        [msgid, msgstr]
-      end
+      ary = translated_messages.to_a
       ary.sort!{|a, b| a[0] <=> b[0]} # sort by original string
 
       pos = header.hash_table_size * 4 + header.hash_table_offset

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/po/ja/gettext.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-13 14:30+0900\n"
+"POT-Creation-Date: 2012-09-20 14:51+0900\n"
 "PO-Revision-Date: 2012-09-13 14:38+0900\n"
 "Last-Translator: Haruka Yoshihara <yoshihara@clear-code.com>\n"
 "Language-Team: Japanese\n"
@@ -624,9 +624,3 @@ msgstr[0] ""
 msgid "single"
 msgid_plural "plural"
 msgstr[0] ""
-
-
-#. #: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:485
-#. msgid "Dispray this help and exit"
-#. msgstr "このヘルプを表示します"
-

data/samples/po/hello.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello2.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_glade2.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_gtk2.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_noop.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_plural.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/samples/po/hello_tk.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/_.pot

@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-10 18:44+0900\n"
-"PO-Revision-Date: 2012-09-10 18:44+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 

data/test/po/backslash.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/non_ascii.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/np_.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/ns_.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/p_.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/s_.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 18:38+0900\n"
-"PO-Revision-Date: 2012-09-04 18:38+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/po/untranslated.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-11 13:52+0900\n"
-"PO-Revision-Date: 2012-09-11 13:52+0900\n"
+"POT-Creation-Date: 2012-09-20 10:29+0900\n"
+"PO-Revision-Date: 2012-09-20 10:29+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

data/test/test_mofile.rb

@@ -10,6 +10,7 @@ class TestMoFile < Test::Unit::TestCase
 
   def test_untranslated
     mo = load_mo("untranslated.mo")
+    assert_false(mo.has_key?("untranslated"))
     assert_equal(nil, mo["untranslated"])
   end
 

metadata

@@ -1,154 +1,163 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gettext
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 2.3.2
   prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 1
-  version: 2.3.1
 platform: ruby
-authors: 
+authors:
 - Kouhei Sutou
 - Masao Mutoh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-13 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2012-09-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: locale
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: racc
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: redcarpet
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: test-unit
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: test-unit-notify
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: test-unit-rr
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: |
-  Gettext is a GNU gettext-like program for Ruby.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Gettext is a GNU gettext-like program for Ruby.
+
   The catalog file(po-file) is same format with GNU gettext.
+
   So you can use GNU gettext tools for maintaining.
 
-email: 
+'
+email:
 - kou@clear-code.com
 - mutomasa at gmail.com
-executables: 
+executables:
 - rmsginit
 - rxgettext
 - rmsgfmt
 - rmsgmerge
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/rmsginit
 - bin/rxgettext
 - bin/rmsgfmt
@@ -927,41 +936,37 @@ files:
 - Rakefile
 - gettext.gemspec
 - .yardopts
-has_rdoc: true
 homepage: http://ruby-gettext.github.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3127648462262608263
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3127648462262608263
 requirements: []
-
 rubyforge_project: gettext
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Gettext is a pure Ruby libary and tools to localize messages.
-test_files: 
+test_files:
 - test/test_locale_path.rb
 - test/test_class_info.rb
 - test/test_mofile.rb
@@ -975,3 +980,4 @@ test_files:
 - test/test_po_generation.rb
 - test/test_string.rb
 - test/test_gettext.rb
+has_rdoc: