gettext 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a50a620332a3a49684d87620897190049ebc092b
-  data.tar.gz: 59a027f33d3db49c684d07f52af1070554b0795c
+  metadata.gz: eaf71e7066d87ee462a6d3a6fa5b23775313cdf3
+  data.tar.gz: 1c87100eb987c4e20cbd9da76d07efd0fbf467e5
 SHA512:
-  metadata.gz: ee7420a33fc3c0cd4a76883df01e7112153b1cf6d0db8189678b339251405547dcd0334058f49e809965a0ca4767297b7dfa2edf1555dfcd2b50aacf4364885e
-  data.tar.gz: dfb185db33d8cb776da95540180a1ca84958d4d8a15ee900539e19448916c0fdc4e275c61b1933b08a105063789867fc1325a8896f5fa9355f8b028be3d2f707
+  metadata.gz: caddfcad249c871c823de5eaad0b6c3b6d070eddfca6dc45c31f95b4da9d60b548ff2d055e23311549a30f9aa05c4b70876bd94340d379beb80747470c0da051
+  data.tar.gz: d27b227dc7366c7452539f9d110d958deaffc4a6454bf647acb354b10777c1d119b14449757962bd404437a7cd701f35abbbb82687c7701553d0ac4ad4d2de9f

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## <a id="3-0-7">3.0.7</a>: 2014-02-09
+
+### Improvements
+
+  * `rmsginit`: Added `--no-translator`.
+  * `rmsginit`: Added `--translator-name`.
+  * `rmsginit`: Added `--translator-email`.
+
 ## <a id="3-0-6">3.0.6</a>: 2014-02-02
 
 ### Improvements

data/lib/gettext/tools/msginit.rb

@@ -51,7 +51,7 @@ module GetText
 
       bindtextdomain("gettext")
 
-      def initialize #:nodoc:
+      def initialize
         @input_file = nil
         @output_file = nil
         @locale = nil
@@ -59,6 +59,9 @@ module GetText
         @entry = nil
         @comment = nil
         @translator = nil
+        @set_translator = true
+        @translator_name = nil
+        @translator_eamil = nil
       end
 
       # Create .po file from .pot file, user's inputs and metadata.
@@ -80,7 +83,7 @@ module GetText
       private
       VERSION = GetText::VERSION
 
-      def parse_arguments(*arguments) #:nodoc:
+      def parse_arguments(*arguments)
         parser = OptionParser.new
         description = _("Create a new .po file from initializing .pot " +
                           "file with user's environment and input.")
@@ -109,6 +112,21 @@ module GetText
           @locale = loc
         end
 
+        parser.on("--no-translator",
+                  _("Don't set translator information")) do
+          @set_translator = false
+        end
+
+        parser.on("--translator-name=NAME",
+                  _("Use NAME as translator name")) do |name|
+          @translator_name = name
+        end
+
+        parser.on("--translator-email=EMAIL",
+                  _("Use EMAIL as translator email address")) do |email|
+          @translator_email = email
+        end
+
         parser.on("-h", "--help", _("Display this help and exit")) do
           puts(parser.help)
           exit(true)
@@ -168,7 +186,7 @@ module GetText
         Locale::Info.language_code?(language_tag.language)
       end
 
-      def replace_pot_header(pot) #:nodoc:
+      def replace_pot_header(pot)
         @entry = pot[""].msgstr
         @comment = pot[""].translator_comment
         @translator = translator_info
@@ -185,36 +203,37 @@ module GetText
       end
 
       def translator_info
-        full_name = translator_full_name
-        mail = translator_mail
-        if not full_name.nil? and not mail.nil?
-          "#{full_name} <#{mail}>"
+        return nil unless @set_translator
+        name = translator_name
+        email = translator_email
+        if name and email
+          "#{name} <#{email}>"
         else
           nil
         end
       end
 
-      def translator_full_name
-        read_translator_full_name
+      def translator_name
+        @translator_name ||= read_translator_name
       end
 
-      def read_translator_full_name #:nodoc:
-        prompt(_("Please enter your full name"), guess_full_name)
+      def read_translator_name
+        prompt(_("Please enter your full name"), guess_translator_name)
       end
 
-      def guess_full_name
-        full_name = guess_full_name_from_password_entry
-        full_name ||= ENV["USERNAME"]
-        full_name
+      def guess_translator_name
+        name = guess_translator_name_from_password_entry
+        name ||= ENV["USERNAME"]
+        name
       end
 
-      def guess_full_name_from_password_entry
+      def guess_trnaslator_name_from_password_entry
         password_entry = find_password_entry
         return nil if password_entry.nil?
 
-        full_name = password_entry.gecos.split(/,/).first.strip
-        full_name = nil if full_name.empty?
-        full_name
+        name = password_entry.gecos.split(/,/).first.strip
+        name = nil if name.empty?
+        name
       end
 
       def find_password_entry
@@ -223,15 +242,15 @@ module GetText
         nil
       end
 
-      def translator_mail
-        read_translator_mail
+      def translator_email
+        @translator_email ||= read_translator_email
       end
 
-      def read_translator_mail #:nodoc:
-        prompt(_("Please enter your email address"), guess_mail)
+      def read_translator_email
+        prompt(_("Please enter your email address"), guess_translator_email)
       end
 
-      def guess_mail
+      def guess_translator_email
         ENV["EMAIL"]
       end
 
@@ -265,7 +284,7 @@ module GetText
       EMAIL = "EMAIL@ADDRESS"
       FIRST_AUTHOR_KEY = /^FIRST AUTHOR <#{EMAIL}>, (\d+\.)$/
 
-      def replace_last_translator #:nodoc:
+      def replace_last_translator
         unless @translator.nil?
           @entry = @entry.gsub(LAST_TRANSLATOR_KEY, "\\1 #{@translator}")
         end
@@ -273,14 +292,14 @@ module GetText
 
       POT_REVISION_DATE_KEY = /^(PO-Revision-Date:).+/
 
-      def replace_pot_revision_date #:nodoc:
+      def replace_pot_revision_date
         @entry = @entry.gsub(POT_REVISION_DATE_KEY, "\\1 #{revision_date}")
       end
 
       LANGUAGE_KEY = /^(Language:).+/
       LANGUAGE_TEAM_KEY = /^(Language-Team:).+/
 
-      def replace_language #:nodoc:
+      def replace_language
         language_name = Locale::Info.get_language(@language).name
         @entry = @entry.gsub(LANGUAGE_KEY, "\\1 #{@locale}")
         @entry = @entry.gsub(LANGUAGE_TEAM_KEY, "\\1 #{language_name}")
@@ -289,7 +308,7 @@ module GetText
       PLURAL_FORMS =
         /^(Plural-Forms:) nplurals=INTEGER; plural=EXPRESSION;$/
 
-      def replace_plural_forms #:nodoc:
+      def replace_plural_forms
         plural_entry = plural_forms(@language)
         if PLURAL_FORMS =~ @entry
           @entry = @entry.gsub(PLURAL_FORMS, "\\1 #{plural_entry}\n")
@@ -298,7 +317,7 @@ module GetText
         end
       end
 
-      def plural_forms(language) #:nodoc:
+      def plural_forms(language)
         case language
         when "ja", "vi", "ko", /\Azh.*\z/
           nplural = "1"
@@ -350,7 +369,7 @@ module GetText
 
       DESCRIPTION_TITLE = /^SOME DESCRIPTIVE TITLE\.$/
 
-      def replace_description #:nodoc:
+      def replace_description
         language_name = Locale::Info.get_language(@language).name
         package_name = ""
         @entry.gsub(/Project-Id-Version: (.+?) .+/) do
@@ -364,7 +383,7 @@ module GetText
       YEAR_KEY = /^(FIRST AUTHOR <#{EMAIL}>,) YEAR\.$/
       LAST_TRANSLATOR_KEY = /^(Last-Translator:) FULL NAME <#{EMAIL}>$/
 
-      def replace_first_author #:nodoc:
+      def replace_first_author
         @comment = @comment.gsub(YEAR_KEY, "\\1 #{year}.")
         unless @translator.nil?
           @comment = @comment.gsub(FIRST_AUTHOR_KEY, "#{@translator}, \\1")
@@ -372,7 +391,7 @@ module GetText
       end
 
       COPYRIGHT_KEY = /^(Copyright \(C\)) YEAR (THE PACKAGE'S COPYRIGHT HOLDER)$/
-      def replace_copyright_year #:nodoc:
+      def replace_copyright_year
         @comment = @comment.gsub(COPYRIGHT_KEY, "\\1 #{year} \\2")
       end
 

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 end

data/po/bg/gettext.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 23:46+0900\n"
+"POT-Creation-Date: 2014-02-09 21:39+0900\n"
 "PO-Revision-Date: 2013-09-20 22:58+0900\n"
 "Last-Translator: Sava Chankov <sava.chankov@gmail.com>\n"
 "Language-Team: Bulgarian <ruby-on-rails-bulgaria@googlegroups.com>\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Третият параметър е грешен: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
@@ -37,7 +37,7 @@ msgid "Concatenates and merges PO files."
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:89 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
 #: ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "Специфични опции:"
@@ -122,61 +122,73 @@ msgstr "изходът беше записан в зададения файл"
 msgid "display version information and exit"
 msgstr "показване на версията и изход"
 
-#: ../lib/gettext/tools/msginit.rb:85
+#: ../lib/gettext/tools/msginit.rb:88
 msgid ""
 "Create a new .po file from initializing .pot file with user's environment and "
 "input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:91
+#: ../lib/gettext/tools/msginit.rb:94
 msgid ""
 "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file exis"
 "ting the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:98
+#: ../lib/gettext/tools/msginit.rb:101
 msgid ""
 "Use OUTPUT as a created .po file. If OUTPUT is not specified, OUTPUT depend on"
 " LOCALE or the current locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:105
+#: ../lib/gettext/tools/msginit.rb:108
 msgid ""
 "Use LOCALE as target locale. If LOCALE is not specified, LOCALE is the current"
 " locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msginit.rb:116
+msgid "Don't set translator information"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:121
+msgid "Use NAME as translator name"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:126
+msgid "Use EMAIL as translator email address"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
 msgid "Display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:117
+#: ../lib/gettext/tools/msginit.rb:135
 msgid "Display version and exit"
 msgstr "показване на версията и изход"
 
-#: ../lib/gettext/tools/msginit.rb:135
+#: ../lib/gettext/tools/msginit.rb:153
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:140
+#: ../lib/gettext/tools/msginit.rb:158
 msgid "file '%s' does not exist."
 msgstr "Файлът '%s' съществува."
 
-#: ../lib/gettext/tools/msginit.rb:152
+#: ../lib/gettext/tools/msginit.rb:170
 msgid ""
 "\"Locale '#{language_tag}' is invalid. \"Please check if your specified locale i"
 "s usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:161
+#: ../lib/gettext/tools/msginit.rb:179
 msgid "file '%s' has already existed."
 msgstr "Файлът '%s' съществува."
 
-#: ../lib/gettext/tools/msginit.rb:202
+#: ../lib/gettext/tools/msginit.rb:221
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:231
+#: ../lib/gettext/tools/msginit.rb:250
 msgid "Please enter your email address"
 msgstr ""
 
@@ -356,11 +368,11 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20
@@ -510,11 +522,11 @@ msgid ""
 msgstr ""
 
 #: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
-msgid "multiple"
+msgid "in same line"
 msgstr ""
 
 #: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
-msgid "in same line"
+msgid "multiple"
 msgstr ""
 
 #: ../test/fixtures/_/multiple_same_messages.rb:28

data/po/bs/gettext.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 23:46+0900\n"
+"POT-Creation-Date: 2014-02-09 21:39+0900\n"
 "PO-Revision-Date: 2013-09-20 22:58+0900\n"
 "Last-Translator: Sanjin Sehic <saserr@gmail.com>\n"
 "Language-Team: Bosnian <saserr@gmail.com>\n"
@@ -22,11 +22,11 @@ msgstr ""
 " && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/gettext/text_domain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:149
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:154
+#: ../lib/gettext/text_domain_manager.rb:155
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
@@ -39,7 +39,7 @@ msgid "Concatenates and merges PO files."
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:89 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
 #: ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "Specifične opcije:"
@@ -124,61 +124,73 @@ msgstr "zapiši izlaz u specifičnu datoteku"
 msgid "display version information and exit"
 msgstr "prikaži informaciju o verziji i završi"
 
-#: ../lib/gettext/tools/msginit.rb:85
+#: ../lib/gettext/tools/msginit.rb:88
 msgid ""
 "Create a new .po file from initializing .pot file with user's environment and "
 "input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:91
+#: ../lib/gettext/tools/msginit.rb:94
 msgid ""
 "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file exis"
 "ting the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:98
+#: ../lib/gettext/tools/msginit.rb:101
 msgid ""
 "Use OUTPUT as a created .po file. If OUTPUT is not specified, OUTPUT depend on"
 " LOCALE or the current locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:105
+#: ../lib/gettext/tools/msginit.rb:108
 msgid ""
 "Use LOCALE as target locale. If LOCALE is not specified, LOCALE is the current"
 " locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msginit.rb:116
+msgid "Don't set translator information"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:121
+msgid "Use NAME as translator name"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:126
+msgid "Use EMAIL as translator email address"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
 msgid "Display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:117
+#: ../lib/gettext/tools/msginit.rb:135
 msgid "Display version and exit"
 msgstr "prikaži informaciju o verziji i završi"
 
-#: ../lib/gettext/tools/msginit.rb:135
+#: ../lib/gettext/tools/msginit.rb:153
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:140
+#: ../lib/gettext/tools/msginit.rb:158
 msgid "file '%s' does not exist."
 msgstr "Datoteka '%s' već postoji."
 
-#: ../lib/gettext/tools/msginit.rb:152
+#: ../lib/gettext/tools/msginit.rb:170
 msgid ""
 "\"Locale '#{language_tag}' is invalid. \"Please check if your specified locale i"
 "s usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:161
+#: ../lib/gettext/tools/msginit.rb:179
 msgid "file '%s' has already existed."
 msgstr "Datoteka '%s' već postoji."
 
-#: ../lib/gettext/tools/msginit.rb:202
+#: ../lib/gettext/tools/msginit.rb:221
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:231
+#: ../lib/gettext/tools/msginit.rb:250
 msgid "Please enter your email address"
 msgstr ""