gettext 2.0.3 → 2.0.4

data/ChangeLog

@@ -1,3 +1,9 @@
+= Ruby-GetText-Package-2.0.4 (2009-05-23)
+ * 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.
+
 = Ruby-GetText-Package-2.0.3 (2009-05-09)
  * Fixed the dependencies. [Reported by Hans de Graaff]
 

data/Rakefile

@@ -87,13 +87,9 @@ task :updatepo do
     puts "gettext/poparser was not found."
   end
 
-  rails = ["lib/gettext/rails.rb", "lib/gettext/active_record.rb"]
   #lib/gettext/*.rb -> rgettext.po
   GetText.update_pofiles("rgettext",
-                         Dir.glob("lib/**/*.rb") + ["src/poparser.ry"] - rails,
-                         "ruby-gettext #{GetText::VERSION}")
-  #lib/gettext/rails.rb -> rails.po
-  GetText.update_pofiles("rails", rails,
+                         Dir.glob("lib/**/*.rb") + ["src/poparser.ry"],
                          "ruby-gettext #{GetText::VERSION}")
 end
 
@@ -152,8 +148,6 @@ task :deploypo do
     mv_pofiles(srcdir, "po", lang)
     mv_pofiles(srcdir, "samples/cgi/po", lang)
     mv_pofiles(srcdir, "samples/po", lang)
-    mv_pofiles(srcdir, "samples/rails/po", lang)
-    mv_pofiles(srcdir, "samples/rails/vendor/plugins/gettext/po", lang)
 end
 
 ############################################################
@@ -172,7 +166,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.executables = Dir.entries('bin').delete_if {|item| /^\.|CVS|~$/ =~ item }
   s.bindir = 'bin'
-  s.add_dependency('locale', '>= 2.0.3')
+  s.add_dependency('locale', '>= 2.0.4')
   s.has_rdoc = true
   s.description = <<-EOF
         Ruby-GetText-Package is a GNU GetText-like program for Ruby.

data/lib/gettext.rb

@@ -216,7 +216,7 @@ module GetText
   # * Returns: the localized text which key is msgid_plural if n is plural(follow plural-rule) or msgid.
   #   "plural-rule" is defined in po-file.
   def npgettext(msgctxt, msgids, arg2 = nil, arg3 = nil)
-     if msgids.kind_of?(Array)
+    if msgids.kind_of?(Array)
       msgid = msgids[0]
       msgid_ctxt = "#{msgctxt}\004#{msgid}"
       msgid_plural = msgids[1]

data/lib/gettext/class_info.rb

@@ -23,7 +23,7 @@ module GetText
     memoize :root_ancestors
 
     # Internal method for related_classes.
-    def related_classes_internal(klass, all_classes = [], analyzed_classes = [] )0
+    def related_classes_internal(klass, all_classes = [], analyzed_classes = [] )
       ret = []
       klass = normalize_class(klass)
 
@@ -40,8 +40,8 @@ module GetText
       end
       analyzed_classes << klass unless analyzed_classes.include? klass
 
-      klass.ancestors[1..-1].each do |v|
-        ret += related_classes_internal(v, all_classes, analyzed_classes)
+      klass.ancestors[1..-1].each do |a|
+        ret += related_classes_internal(a, all_classes, analyzed_classes)
         ret.uniq!
       end
 

data/lib/gettext/core_ext/string.rb

@@ -64,6 +64,7 @@ class String
           args.has_key?(key) ? sprintf("%#{$3}", args[key]) : match
         end
       }
+      ret
     else
       ret = gsub(/%([{<])/, '%%\1')
       begin

data/lib/gettext/parser/ruby.rb

@@ -83,9 +83,8 @@ module GetText
       target = nil
       msgid = nil
       line_no = nil
-      tk = nil
-      begin
-        rl.parse do |tk|
+      rl.parse do |tk|
+        begin
           case tk
           when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT
             if ID.include?(tk.name)
@@ -140,12 +139,12 @@ module GetText
             end
           end
           targets
+        rescue
+          $stderr.print "\n\nError: #{$!.inspect} "
+          $stderr.print " in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}" if tk
+          $stderr.print "\n"
+          exit 1
         end
-      rescue
-        $stderr.print "\n\nError: #{$!.inspect} "
-        $stderr.print " in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}" if tk
-        $stderr.print "\n"
-        exit 1
       end
       targets
     end

data/lib/gettext/textdomain_manager.rb

@@ -45,7 +45,6 @@ module GetText
     
     # Return the cached value.
     def cached?
-      @@cached
       TextDomain.cached?
     end
 

data/lib/gettext/version.rb

@@ -8,5 +8,5 @@
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/po/bg/rgettext.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 2.0.0\n"
-"POT-Creation-Date: 2009-02-15 11:14+0100\n"
+"Project-Id-Version: ruby-gettext 2.0.3\n"
+"POT-Creation-Date: 2009-05-17 23:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sava Chankov <sava.chankov@gmail.com>\n"
 "Language-Team: Bulgarian <ruby-on-rails-bulgaria@googlegroups.com>\n"
@@ -18,36 +18,85 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/gettext/tools/rgettext.rb:43
-msgid "'%{klass}' is ignored."
-msgstr "'%{klass}' беше игнориран."
+#: lib/gettext/tools.rb:68
+msgid "Failed to merge with %{defpo}"
+msgstr "Пропадна сливането с %{defpo}"
 
-#: lib/gettext/textdomain_manager.rb:157
-msgid "3rd parmeter is wrong: value = %{number}"
-msgstr "Третият параметър е грешен: value = %{number}"
+#: lib/gettext/tools.rb:69
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "Новия .pot беше копиран като %{failed_filename}"
 
-#: lib/gettext/tools.rb:75
+#: lib/gettext/tools.rb:70
 msgid "Check these po/pot-files. It may have syntax errors or something wrong."
 msgstr ""
 "Проверете тези po/pot файлове. Може да имат синтактични грешки или нещо "
 "друго."
 
+#: lib/gettext/tools.rb:173
+msgid ""
+"`%{cmd}' can not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgstr ""
+
+#: lib/gettext/textdomain_manager.rb:147
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr "Третият параметър е грешен: value = %{number}"
+
+#: lib/gettext/tools/rgettext.rb:43
+msgid "'%{klass}' is ignored."
+msgstr "'%{klass}' беше игнориран."
+
+#: lib/gettext/tools/rgettext.rb:190
+msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
+msgstr "Употреба: %s input.rb [-r parser.rb] [-o output.pot] "
+
 #: lib/gettext/tools/rgettext.rb:192
 msgid "Extract translatable strings from given input files."
 msgstr "Извличане на преводните низове от зададените файлове."
 
-#: lib/gettext/tools.rb:73
-msgid "Failed to merge with %{defpo}"
-msgstr "Пропадна сливането с %{defpo}"
+#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgfmt.rb:50
+#: lib/gettext/tools/rmsgmerge.rb:407
+msgid "Specific options:"
+msgstr "Специфични опции:"
+
+#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgfmt.rb:52
+#: lib/gettext/tools/rmsgmerge.rb:409
+msgid "write output to specified file"
+msgstr "изходът беше записан в зададения файл"
 
 #: lib/gettext/tools/rgettext.rb:200
 msgid "File '%s' already exists."
 msgstr "Файлът '%s' съществува."
 
-#: lib/gettext/tools/rmsgfmt.rb:47
+#: lib/gettext/tools/rgettext.rb:205
+msgid "require the library before executing rgettext"
+msgstr "заредете библиотеката с require преди да изпълните rgettext"
+
+#: lib/gettext/tools/rgettext.rb:209
+msgid "run in debugging mode"
+msgstr "изпълнение в режим на дебъгване"
+
+#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgfmt.rb:56
+#: lib/gettext/tools/rmsgmerge.rb:420
+msgid "display version information and exit"
+msgstr "показване на версията и изход"
+
+#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
+msgid "no input files"
+msgstr "няма зададени файлове"
+
+#: lib/gettext/tools/rmsgfmt.rb:46
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Употреба: %s input.po [-o output.mo]"
+
+#: lib/gettext/tools/rmsgfmt.rb:48
 msgid "Generate binary message catalog from textual translation description."
 msgstr "Генериране на двоични файлове с преводите от текстовите описания."
 
+#: lib/gettext/tools/rmsgmerge.rb:402
+msgid "Usage: %s def.po ref.pot [-o output.pot]"
+msgstr "Употреба: %s def.po ref.pot [-o output.pot]"
+
 #: lib/gettext/tools/rmsgmerge.rb:405
 msgid ""
 "Merges two Uniforum style .po files together. The def.po file is an existing "
@@ -58,26 +107,17 @@ msgstr ""
 "pot е пресен PO файл с актуални референции към кода. ref.pot обикновено е "
 "създаден от rgettext."
 
-#: lib/gettext/tools.rb:74
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "Новия .pot беше копиран като %{failed_filename}"
-
-#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgmerge.rb:407
-#: lib/gettext/tools/rmsgfmt.rb:49
-msgid "Specific options:"
-msgstr "Специфични опции:"
-
-#: lib/gettext/tools/rmsgmerge.rb:402
-msgid "Usage: %s def.po ref.pot [-o output.pot]"
-msgstr "Употреба: %s def.po ref.pot [-o output.pot]"
+#: lib/gettext/tools/rmsgmerge.rb:446
+msgid "definition po is not given."
+msgstr "съществуващия po не е зададен."
 
-#: lib/gettext/tools/rmsgfmt.rb:45
-msgid "Usage: %s input.po [-o output.mo]"
-msgstr "Употреба: %s input.po [-o output.mo]"
+#: lib/gettext/tools/rmsgmerge.rb:448
+msgid "reference pot is not given."
+msgstr "pot с референциите не е зададен."
 
-#: lib/gettext/tools/rgettext.rb:190
-msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
-msgstr "Употреба: %s input.rb [-r parser.rb] [-o output.pot] "
+#: lib/gettext/parser/glade.rb:75
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "`%{file}' не е във формат glade-2.0."
 
 #: src/poparser.ry:38 src/poparser.ry:55
 msgid "Warning: fuzzy message was ignored.\n"
@@ -88,55 +128,3 @@ msgid "Warning: obsolete msgid exists.\n"
 msgstr ""
 "Предупреждение: има несъществуващи вече msgid\n"
 "."
-
-#: lib/gettext/tools.rb:178
-msgid ""
-"`%{cmd}' can not be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr ""
-
-#: lib/gettext/parser/glade.rb:75
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "`%{file}' не е във формат glade-2.0."
-
-#: lib/gettext/tools/rmsgmerge.rb:446
-msgid "definition po is not given."
-msgstr "съществуващия po не е зададен."
-
-#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgmerge.rb:420
-#: lib/gettext/tools/rmsgfmt.rb:55
-msgid "display version information and exit"
-msgstr "показване на версията и изход"
-
-#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
-msgid "no input files"
-msgstr "няма зададени файлове"
-
-#: lib/gettext/tools/rmsgmerge.rb:448
-msgid "reference pot is not given."
-msgstr "pot с референциите не е зададен."
-
-#: lib/gettext/tools/rgettext.rb:205
-msgid "require the library before executing rgettext"
-msgstr "заредете библиотеката с require преди да изпълните rgettext"
-
-#: lib/gettext/tools/rgettext.rb:209
-msgid "run in debugging mode"
-msgstr "изпълнение в режим на дебъгване"
-
-#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgmerge.rb:409
-#: lib/gettext/tools/rmsgfmt.rb:51
-msgid "write output to specified file"
-msgstr "изходът беше записан в зададения файл"
-
-#~ msgid "'%{file}' is not found."
-#~ msgstr "'%{file}' не беше намерен."
-
-#~ msgid "Ignored '%{file}'. Solve dependencies first."
-#~ msgstr "'%{file}' беше игнориран. Първо оправете зависимостите."
-
-#~ msgid "No database is available."
-#~ msgstr "Базата данни я е хванала липса."
-
-#~ msgid "rubygems are not found."
-#~ msgstr "rubygems липсват."

data/po/bs/rgettext.po

@@ -8,8 +8,8 @@
 # Sanjin Sehic <saserr@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 2.0.0\n"
-"POT-Creation-Date: 2009-02-15 11:14+0100\n"
+"Project-Id-Version: ruby-gettext 2.0.3\n"
+"POT-Creation-Date: 2009-05-17 23:09+0900\n"
 "PO-Revision-Date: 2007-03-17 16:19+0100\n"
 "Last-Translator: Sanjin Sehic <saserr@gmail.com>\n"
 "Language-Team: Bosnian <saserr@gmail.com>\n"
@@ -20,35 +20,85 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/gettext/tools/rgettext.rb:43
-msgid "'%{klass}' is ignored."
-msgstr "%{klass} je ignorisan."
+#: lib/gettext/tools.rb:68
+#, fuzzy
+msgid "Failed to merge with %{defpo}"
+msgstr "Spajanje sa %{defpo} nije uspjelo - nastavljam dalje!"
 
-#: lib/gettext/textdomain_manager.rb:157
-msgid "3rd parmeter is wrong: value = %{number}"
-msgstr ""
+#: lib/gettext/tools.rb:69
+#, fuzzy
+msgid "New .pot was copied to %{failed_filename}"
+msgstr "Molim da provjerite novi .pot u %{failed_filename}"
 
-#: lib/gettext/tools.rb:75
+#: lib/gettext/tools.rb:70
 msgid "Check these po/pot-files. It may have syntax errors or something wrong."
 msgstr ""
 
+#: lib/gettext/tools.rb:173
+msgid ""
+"`%{cmd}' can not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgstr ""
+
+#: lib/gettext/textdomain_manager.rb:147
+msgid "3rd parmeter is wrong: value = %{number}"
+msgstr ""
+
+#: lib/gettext/tools/rgettext.rb:43
+msgid "'%{klass}' is ignored."
+msgstr "%{klass} je ignorisan."
+
+#: lib/gettext/tools/rgettext.rb:190
+msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
+msgstr "Korištenje: %s ulaz.rb [-r parser.rb] [-o izlaz.pot]"
+
 #: lib/gettext/tools/rgettext.rb:192
 msgid "Extract translatable strings from given input files."
 msgstr "Izvadi niske za prevođenje iz date ulazne datoteke."
 
-#: lib/gettext/tools.rb:73
-#, fuzzy
-msgid "Failed to merge with %{defpo}"
-msgstr "Spajanje sa %{defpo} nije uspjelo - nastavljam dalje!"
+#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgfmt.rb:50
+#: lib/gettext/tools/rmsgmerge.rb:407
+msgid "Specific options:"
+msgstr "Specifične opcije:"
+
+#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgfmt.rb:52
+#: lib/gettext/tools/rmsgmerge.rb:409
+msgid "write output to specified file"
+msgstr "zapiši izlaz u specifičnu datoteku"
 
 #: lib/gettext/tools/rgettext.rb:200
 msgid "File '%s' already exists."
 msgstr "Datoteka '%s' već postoji."
 
-#: lib/gettext/tools/rmsgfmt.rb:47
+#: lib/gettext/tools/rgettext.rb:205
+msgid "require the library before executing rgettext"
+msgstr "zahtjevaj biblioteku prije izvršavanja rgettext-a"
+
+#: lib/gettext/tools/rgettext.rb:209
+msgid "run in debugging mode"
+msgstr "pokreni u modu za nalaženje grešaka"
+
+#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgfmt.rb:56
+#: lib/gettext/tools/rmsgmerge.rb:420
+msgid "display version information and exit"
+msgstr "prikaži informaciju o verziji i završi"
+
+#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
+msgid "no input files"
+msgstr "nema ulaznih datoteka"
+
+#: lib/gettext/tools/rmsgfmt.rb:46
+msgid "Usage: %s input.po [-o output.mo]"
+msgstr "Korištenje: %s ulaz.po [-o izlaz.mo]"
+
+#: lib/gettext/tools/rmsgfmt.rb:48
 msgid "Generate binary message catalog from textual translation description."
 msgstr "Generiši binarni katalog poruka iz tekstualnog opisa prevoda"
 
+#: lib/gettext/tools/rmsgmerge.rb:402
+msgid "Usage: %s def.po ref.pot [-o output.pot]"
+msgstr "Korištenje: %s def.po ref.pot [-o izlaz.pot]"
+
 #: lib/gettext/tools/rmsgmerge.rb:405
 msgid ""
 "Merges two Uniforum style .po files together. The def.po file is an existing "
@@ -60,84 +110,22 @@ msgstr ""
 "datoteka sa najnovijim referencama koda. ref.pot je najčešće napravljen sa "
 "rgettext."
 
-#: lib/gettext/tools.rb:74
-#, fuzzy
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "Molim da provjerite novi .pot u %{failed_filename}"
-
-#: lib/gettext/tools/rgettext.rb:194 lib/gettext/tools/rmsgmerge.rb:407
-#: lib/gettext/tools/rmsgfmt.rb:49
-msgid "Specific options:"
-msgstr "Specifične opcije:"
-
-#: lib/gettext/tools/rmsgmerge.rb:402
-msgid "Usage: %s def.po ref.pot [-o output.pot]"
-msgstr "Korištenje: %s def.po ref.pot [-o izlaz.pot]"
-
-#: lib/gettext/tools/rmsgfmt.rb:45
-msgid "Usage: %s input.po [-o output.mo]"
-msgstr "Korištenje: %s ulaz.po [-o izlaz.mo]"
-
-#: lib/gettext/tools/rgettext.rb:190
-msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
-msgstr "Korištenje: %s ulaz.rb [-r parser.rb] [-o izlaz.pot]"
-
-#: src/poparser.ry:38 src/poparser.ry:55
-msgid "Warning: fuzzy message was ignored.\n"
-msgstr "Upozorenje: čudna poruka je ignorisana.\n"
-
-#: src/poparser.ry:148
-msgid "Warning: obsolete msgid exists.\n"
-msgstr "Upozorenje: nekorišteni msgid postoji.\n"
-
-#: lib/gettext/tools.rb:178
-msgid ""
-"`%{cmd}' can not be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr ""
-
-#: lib/gettext/parser/glade.rb:75
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "'%{file}' nije glade-2.0 format."
-
 #: lib/gettext/tools/rmsgmerge.rb:446
 msgid "definition po is not given."
 msgstr "definicijski po nije dat."
 
-#: lib/gettext/tools/rgettext.rb:213 lib/gettext/tools/rmsgmerge.rb:420
-#: lib/gettext/tools/rmsgfmt.rb:55
-msgid "display version information and exit"
-msgstr "prikaži informaciju o verziji i završi"
-
-#: lib/gettext/tools/rgettext.rb:237 lib/gettext/tools/rmsgfmt.rb:29
-msgid "no input files"
-msgstr "nema ulaznih datoteka"
-
 #: lib/gettext/tools/rmsgmerge.rb:448
 msgid "reference pot is not given."
 msgstr "referencni po nije dat."
 
-#: lib/gettext/tools/rgettext.rb:205
-msgid "require the library before executing rgettext"
-msgstr "zahtjevaj biblioteku prije izvršavanja rgettext-a"
-
-#: lib/gettext/tools/rgettext.rb:209
-msgid "run in debugging mode"
-msgstr "pokreni u modu za nalaženje grešaka"
-
-#: lib/gettext/tools/rgettext.rb:196 lib/gettext/tools/rmsgmerge.rb:409
-#: lib/gettext/tools/rmsgfmt.rb:51
-msgid "write output to specified file"
-msgstr "zapiši izlaz u specifičnu datoteku"
-
-#~ msgid "'%{file}' is not found."
-#~ msgstr "'%{file} nije pronađen."
-
-#~ msgid "Ignored '%{file}'. Solve dependencies first."
-#~ msgstr "Ignorisano '%{file}'. Riješi prvo zavisnosti."
+#: lib/gettext/parser/glade.rb:75
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "'%{file}' nije glade-2.0 format."
 
-#~ msgid "No database is available."
-#~ msgstr "Databaza nije dostupna."
+#: src/poparser.ry:38 src/poparser.ry:55
+msgid "Warning: fuzzy message was ignored.\n"
+msgstr "Upozorenje: čudna poruka je ignorisana.\n"
 
-#~ msgid "rubygems are not found."
-#~ msgstr "rubygems se ne mogu pronaći."
+#: src/poparser.ry:148
+msgid "Warning: obsolete msgid exists.\n"
+msgstr "Upozorenje: nekorišteni msgid postoji.\n"