gettext 1.7.0-mswin32 → 1.8.0-mswin32

data/lib/gettext/rgettext.rb

@@ -25,19 +25,19 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/06/11 15:36:20 $)[1]
+    DATE = %w($Date: 2006/09/10 15:08:32 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
     [
       ["glade.rb", "GladeParser"],
       ["erb.rb", "ErbParser"],
-      ["activerecord.rb", "ActiveRecordParser"],
+      ["active_record.rb", "ActiveRecordParser"],
 #      ["ripper.rb", "RipperParser"],
       ["ruby.rb", "RubyParser"] # Default parser.
     ].each do |f, klass|
       begin
-	require File.join("gettext/parser/#{f}")
+	require "gettext/parser/#{f}"
 	@ex_parsers << GetText.const_get(klass)
       rescue
 	$stderr.puts _("'%{klass}' is ignored.") % {:klass => klass}
@@ -47,6 +47,26 @@ module GetText
 
     module_function
 
+    # Add an option parser
+    # the option parser module requires to have target?(file) and parser(file, ary) method.
+    # 
+    #  require 'gettext/rgettext'
+    #  module FooParser
+    #    module_function
+    #    def target?(file)
+    #      File.extname(file) == '.foo'  # *.foo file only.
+    #    end
+    #    def parse(file, ary)
+    #      :
+    #      return ary # [["msgid1", "foo.rb:200"], ["msgid2", "bar.rb:300", "baz.rb:400"], ...]
+    #    end
+    #  end
+    #  
+    #  GetText::RGetText.add_parser(FooParser)
+    def add_parser(klass)
+      @ex_parsers.insert(0, klass)
+    end
+
     def generate_pot_header # :nodoc:
       time = Time.now.strftime("%Y-%m-%d %H:%M")
       off = Time.now.utc_offset
@@ -114,8 +134,8 @@ msgstr ""
 	    end
 	  end
 	rescue
-	  puts $!
-	  exit 1
+	  puts "Error occurs in " + file
+	  raise
 	end
       end
 
@@ -126,7 +146,7 @@ msgstr ""
       output = STDOUT
 
       opts = OptionParser.new
-      opts.banner = _("Usage: %s input.rb [-o output.pot]") % $0
+      opts.banner = _("Usage: %s input.rb [-r parser.rb] [-o output.pot]") % $0
       opts.separator("")
       opts.separator(_("Extract translatable strings from given input files."))
       opts.separator("")
@@ -141,6 +161,14 @@ msgstr ""
 	end
       end
 
+      opts.on("-r", "--require=PARSER", _("read an option parser")) do |out|
+	require out
+      end
+
+      opts.on("-d", "--debug", _("run in debugging mode")) do
+	$DEBUG = true
+      end
+
       opts.on_tail("--version", _("display version information and exit")) do
 	puts "#{$0} #{VERSION} (#{DATE})"
 	puts "#{File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"

data/lib/gettext/string.rb

@@ -14,7 +14,7 @@
 # the meaning of the msgids using "named argument" instead of %s/%d style.
 class String
   alias :_old_format_m :% # :nodoc:
-
+    
   # call-seq:
   #  %(arg)
   #  %(hash)
@@ -34,6 +34,7 @@ class String
   # * Returns: formatted String
   #
   #  (e.g.) "%{firstname}, %{familyname}" % {:firstname => "Masao", :familyname => "Mutoh"}
+  REGEXP_NORMAL = /%\{/  #:nodoc:
   def %(args)
     if args.kind_of?(Hash)
       ret = dup
@@ -42,7 +43,7 @@ class String
       }
       ret
     else
-      ret = gsub(/%\{/, '%%{')
+      ret = gsub(REGEXP_NORMAL, '%%{')
       begin
 	ret._old_format_m(args)
       rescue ArgumentError

data/lib/gettext/textdomain.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: textdomain.rb,v 1.18 2006/06/11 15:36:20 mutoh Exp $
+  $Id: textdomain.rb,v 1.20 2006/09/11 16:30:31 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -61,12 +61,12 @@ module GetText
     #   ('locale' => "ja_JP", 'name' => "textdomain")
     # * Returns: the new DEFAULT_LOCALE_PATHS
     def self.add_default_locale_path(path)
-      DEFAULT_LOCALE_PATHS << path
+      DEFAULT_LOCALE_PATHS.unshift(path)
     end
 
     # Creates a new GetText::TextDomain.
     # * name: the textdomain name.
-    # * topdir: the top directory of mo files or nil.
+    # * topdir: the locale path ("%{topdir}/%{locale}/LC_MESSAGES/%{name}.mo").
     # * locale: the Locale::Object or nil.
     # * Returns: a newly created GetText::TextDomain object.
     def initialize(name, topdir = nil, locale = nil)

data/lib/gettext/version.rb

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

data/po/cs/rails.po

@@ -8,117 +8,117 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.7.0\n"
-"POT-Creation-Date: 2006-07-08 18:46+0900\n"
+"Project-Id-Version: ruby-gettext 1.8.0\n"
+"POT-Creation-Date: 2006-08-23 00:28+0900\n"
 "PO-Revision-Date: 2006-07-10 10:08+0100\n"
 "Last-Translator: Karel Miarka <kajism at yahoo.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Czech\n"
 
-#: lib/gettext/rails.rb:281
-msgid "%{fn} is not included in the list"
-msgstr "%{fn} není obsaženo v seznamu možností"
-
-#: lib/gettext/rails.rb:282
-msgid "%{fn} is reserved"
-msgstr "%{fn} je rezervováno a nemůže být zvoleno"
-
-#: lib/gettext/rails.rb:283
-msgid "%{fn} is invalid"
-msgstr "%{fn} je chybné"
-
-#: lib/gettext/rails.rb:284
-msgid "%{fn} doesn't match confirmation"
-msgstr "%{fn} není shodné s potvrzením"
-
-#: lib/gettext/rails.rb:285
-msgid "%{fn} must be accepted"
-msgstr "%{fn} musí být zaškrtnuto"
-
-#: lib/gettext/rails.rb:286
-msgid "%{fn} can't be empty"
-msgstr "%{fn} musí být vyplněno"
-
-#: lib/gettext/rails.rb:287
-msgid "%{fn} can't be blank"
-msgstr "%{fn} musí být vyplněno"
-
-#: lib/gettext/rails.rb:288
-msgid "%{fn} is too long (max is %d characters)"
-msgstr "%{fn} je příliš dlouhé (maximum je %d znaků)"
-
-#: lib/gettext/rails.rb:289
-msgid "%{fn} is too short (min is %d characters)"
-msgstr "%{fn} je příliš krátké (minimum je %d znaků)"
-
-#: lib/gettext/rails.rb:290
-msgid "%{fn} is the wrong length (should be %d characters)"
-msgstr "%{fn} má nesprávnou délku (musí mít %d znaků)"
-
-#: lib/gettext/rails.rb:291
-msgid "%{fn} has already been taken"
-msgstr "%{fn} je již použito"
-
-#: lib/gettext/rails.rb:292
-msgid "%{fn} is not a number"
-msgstr "%{fn} není správné číslo"
-
-#: lib/gettext/rails.rb:359
+#: lib/gettext/rails.rb:271
 msgid "%{num} error prohibited this %{record} from being saved"
 msgid_plural "%{num} errors prohibited this %{record} from being saved"
 msgstr[0] "%{num} chyba znemožnila uložení záznamu %{record} "
 msgstr[1] "%{num} chyby znemožnily uložení záznamu %{record} "
 msgstr[2] "%{num} chyb znemožnilo uložení záznamu %{record} "
 
-#: lib/gettext/rails.rb:361
+#: lib/gettext/rails.rb:273
 msgid "There was a problem with the following field:"
 msgid_plural "There were problems with the following fields:"
 msgstr[0] "Problémy jsou s následujícím polem:"
 msgstr[1] "Problémy jsou s následujícími poli:"
 msgstr[2] "Problémy jsou s následujícími poli:"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:360
 msgid "less than 5 seconds"
 msgstr "méně než 5 sekund"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:360
 msgid "less than 10 seconds"
 msgstr "méně než 10 sekund"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:360
 msgid "less than 20 seconds"
 msgstr "méně než 20 sekund"
 
-#: lib/gettext/rails.rb:404
+#: lib/gettext/rails.rb:361
 msgid "half a minute"
 msgstr "půl minuty"
 
-#: lib/gettext/rails.rb:404
+#: lib/gettext/rails.rb:361
 msgid "less than a minute"
 msgstr "méně než minutu"
 
-#: lib/gettext/rails.rb:405
+#: lib/gettext/rails.rb:362
 msgid "1 minute"
 msgid_plural "%{num} minutes"
 msgstr[0] "1 minuta"
 msgstr[1] "%{num} minuty"
 msgstr[2] "%{num} minut"
 
-#: lib/gettext/rails.rb:406
+#: lib/gettext/rails.rb:363
 msgid "about 1 hour"
 msgid_plural "about %{num} hours"
 msgstr[0] "asi 1 hodina"
 msgstr[1] "asi %{num} hodiny"
 msgstr[2] "asi %{num} hodin"
 
-#: lib/gettext/rails.rb:407
+#: lib/gettext/rails.rb:364
 msgid "1 day"
 msgid_plural "%{num} days"
 msgstr[0] "1 den"
 msgstr[1] "%{num} dny"
 msgstr[2] "%{num} dnů"
 
+#: lib/gettext/active_record.rb:166
+msgid "%{fn} is not included in the list"
+msgstr "%{fn} není obsaženo v seznamu možností"
+
+#: lib/gettext/active_record.rb:167
+msgid "%{fn} is reserved"
+msgstr "%{fn} je rezervováno a nemůže být zvoleno"
+
+#: lib/gettext/active_record.rb:168
+msgid "%{fn} is invalid"
+msgstr "%{fn} je chybné"
+
+#: lib/gettext/active_record.rb:169
+msgid "%{fn} doesn't match confirmation"
+msgstr "%{fn} není shodné s potvrzením"
+
+#: lib/gettext/active_record.rb:170
+msgid "%{fn} must be accepted"
+msgstr "%{fn} musí být zaškrtnuto"
+
+#: lib/gettext/active_record.rb:171
+msgid "%{fn} can't be empty"
+msgstr "%{fn} musí být vyplněno"
+
+#: lib/gettext/active_record.rb:172
+msgid "%{fn} can't be blank"
+msgstr "%{fn} musí být vyplněno"
+
+#: lib/gettext/active_record.rb:173
+msgid "%{fn} is too long (maximum is %d characters)"
+msgstr "%{fn} je příliš dlouhé (maximum je %d znaků)"
+
+#: lib/gettext/active_record.rb:174
+msgid "%{fn} is too short (minimum is %d characters)"
+msgstr "%{fn} je příliš krátké (minimum je %d znaků)"
+
+#: lib/gettext/active_record.rb:175
+msgid "%{fn} is the wrong length (should be %d characters)"
+msgstr "%{fn} má nesprávnou délku (musí mít %d znaků)"
+
+#: lib/gettext/active_record.rb:176
+msgid "%{fn} has already been taken"
+msgstr "%{fn} je již použito"
+
+#: lib/gettext/active_record.rb:177
+msgid "%{fn} is not a number"
+msgstr "%{fn} není správné číslo"

data/po/cs/rgettext.po

@@ -8,15 +8,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.7.0\n"
-"POT-Creation-Date: 2006-07-08 18:46+0900\n"
+"Project-Id-Version: ruby-gettext 1.8.0\n"
+"POT-Creation-Date: 2006-08-23 00:28+0900\n"
 "PO-Revision-Date: 2006-07-10 10:20+0100\n"
 "Last-Translator: Karel Miarka <kajism@yahoo.com>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,15,-1\n"
 
@@ -25,23 +26,27 @@ msgid "Usage: %s def.po ref.pot [-o output.pot]"
 msgstr "Použití: %s def.po ref.pot [-o output.pot]"
 
 #: lib/gettext/rmsgmerge.rb:406
-msgid "Merges two Uniforum style .po files together. The def.po file is an existing PO file with translations. The ref.pot file is the last created PO file with up-to-date source references. ref.pot is generally created by rgettext."
-msgstr "Sloučí dohromady dva (Uniforum style) .po soubory. Soubor def.po je existující PO soubor s překlady. Soubor ref.pot je naposledy vytvořený PO soubor s aktuálními zdrojovými referencemi. ref.pot je většinou vytvořen rgettextem."
+msgid ""
+"Merges two Uniforum style .po files together. The def.po file is an existing "
+"PO file with translations. The ref.pot file is the last created PO file with "
+"up-to-date source references. ref.pot is generally created by rgettext."
+msgstr ""
+"Sloučí dohromady dva (Uniforum style) .po soubory. Soubor def.po je "
+"existující PO soubor s překlady. Soubor ref.pot je naposledy vytvořený PO "
+"soubor s aktuálními zdrojovými referencemi. ref.pot je většinou vytvořen "
+"rgettextem."
 
-#: lib/gettext/rmsgmerge.rb:408
-#: lib/gettext/rgettext.rb:133
+#: lib/gettext/rmsgmerge.rb:408 lib/gettext/rgettext.rb:153
 #: lib/gettext/rmsgfmt.rb:51
 msgid "Specific options:"
 msgstr "Volby:"
 
-#: lib/gettext/rmsgmerge.rb:410
-#: lib/gettext/rgettext.rb:135
+#: lib/gettext/rmsgmerge.rb:410 lib/gettext/rgettext.rb:155
 #: lib/gettext/rmsgfmt.rb:53
 msgid "write output to specified file"
 msgstr "zapsat výstup od určeného souboru"
 
-#: lib/gettext/rmsgmerge.rb:421
-#: lib/gettext/rgettext.rb:144
+#: lib/gettext/rmsgmerge.rb:421 lib/gettext/rgettext.rb:172
 #: lib/gettext/rmsgfmt.rb:57
 msgid "display version information and exit"
 msgstr "zobrazit informaci o verzi a skončit"
@@ -58,20 +63,27 @@ msgstr "referenční pot soubor není zadán."
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}' je ignorován."
 
-#: lib/gettext/rgettext.rb:129
-msgid "Usage: %s input.rb [-o output.pot]"
-msgstr "Použití: %s input.rb [-o output.pot]"
+#: lib/gettext/rgettext.rb:149
+msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
+msgstr "Použití: %s input.rb [-r parser.rb] [-o output.pot]"
 
-#: lib/gettext/rgettext.rb:131
+#: lib/gettext/rgettext.rb:151
 msgid "Extract translatable strings from given input files."
 msgstr "Extrahuj přeložitelné texty ze zadaných vstupních souborů."
 
-#: lib/gettext/rgettext.rb:139
+#: lib/gettext/rgettext.rb:159
 msgid "File '%s' has already existed."
 msgstr "Soubor '%s' již existoval."
 
+#: lib/gettext/rgettext.rb:164
+msgid "read an option parser"
+msgstr ""
+
 #: lib/gettext/rgettext.rb:168
-#: lib/gettext/rmsgfmt.rb:31
+msgid "run in debugging mode"
+msgstr ""
+
+#: lib/gettext/rgettext.rb:196 lib/gettext/rmsgfmt.rb:31
 msgid "no input files"
 msgstr "vstupní soubory nenalezeny"
 
@@ -83,60 +95,30 @@ msgstr "Použití: %s input.po [-o output.mo]"
 msgid "Generate binary message catalog from textual translation description."
 msgstr "Generovat binání katalog zpráv z textového popisu překladu."
 
-#: lib/gettext/rails_ext.rb:21
-msgid "Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id"
-msgstr "Zavolána metoda id na objektu nil -- pokud jste opravdu chtěli získat id nilu, použijte metodu object_id"
-
-#: lib/gettext/rails_ext.rb:27
-msgid "You have a nil object when you didn't expect it!"
-msgstr "Máte nil objekt tam, kde nebyl očekáván!"
-
-#: lib/gettext/rails_ext.rb:28
-msgid ""
-"\n"
-"You might have expected an instance of %{klass}."
-msgstr ""
-"\n"
-"Možná jste očekávali instanci třídy %{klass}."
-
-#: lib/gettext/rails_ext.rb:29
-msgid ""
-"\n"
-"The error occured while evaluating nil.%{selector}"
-msgstr ""
-"\n"
-"Chyba nastala při vykonávání nil.%{selector}"
-
-#: lib/gettext/rails_ext.rb:43
-msgid "uninitialized constant %{const}"
-msgstr "nenainicializovaná konstanta %{const}"
+#: lib/gettext/parser/glade.rb:74
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "`%{file}' není ve formátu glade-2.0."
 
-#: lib/gettext/parser/activerecord.rb:38
+#: lib/gettext/parser/active_record.rb:39
 msgid "'%{file}' is not found."
 msgstr "'%{file}' nebyl nalezen."
 
-#: lib/gettext/parser/activerecord.rb:66
+#: lib/gettext/parser/active_record.rb:79
 msgid "Ignored '%{file}'. Solve dependencies first."
 msgstr "'%{file}' ignorován. Nejprve vyřešte závislosti."
 
-#: lib/gettext/parser/activerecord.rb:85
+#: lib/gettext/parser/active_record.rb:104
 msgid "No database is available."
 msgstr "Žádná databáze není k dispozici."
 
-#: lib/gettext/parser/activerecord.rb:116
+#: lib/gettext/parser/active_record.rb:138
 msgid "rubygems are not found."
 msgstr "rubygems nenalezeny"
 
-#: lib/gettext/parser/glade.rb:74
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "`%{file}' není ve formátu glade-2.0."
-
-#: src/poparser.ry:26
-#: src/poparser.ry:41
+#: src/poparser.ry:26 src/poparser.ry:41
 msgid "Warning: fuzzy message was ignored.\n"
 msgstr "Varování: neurčitý (fuzzy) překlad byl ignorován.\n"
 
 #: src/poparser.ry:125
 msgid "Warning: obsolete msgid exists.\n"
 msgstr "Varování: existoval zastaralý (obsolete) msgid.\n"
-