gettext 1.4.0-mswin32 → 1.5.0-mswin32

data/lib/gettext/parser/activerecord.rb

@@ -7,7 +7,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: activerecord.rb,v 1.6 2006/02/22 16:42:41 mutoh Exp $
+  $Id: activerecord.rb,v 1.8 2006/05/06 14:59:08 mutoh Exp $
 =end
 
 require 'gettext'
@@ -70,15 +70,16 @@ module GetText
       loaded_constants.each do |classname|
 	klass = eval(classname)
 	if klass < ActiveRecord::Base
-	  targets << [::Inflector.singularize(klass.table_name.gsub(/_/, " ")), "#{file}:-"]
+	  add_target(targets, file, ::Inflector.singularize(klass.table_name.gsub(/_/, " ")))
 	  tablename = klass.class_name
 	  begin
 	    klass.columns.each do |column|
 	      if @config[:use_classname]
-		targets << [tablename + "|" +  klass.human_attribute_name(column.name), "#{file}:-"]
+		msgid = tablename + "|" +  klass.human_attribute_name(column.name)
 	      else
-		targets << [klass.human_attribute_name(column.name), "#{file}:-"]
+		msgid = klass.human_attribute_name(column.name)
 	      end
+	      add_target(targets, file, msgid)
 	    end
 	  rescue
 	    $stderr.puts _("No database is available.")
@@ -93,6 +94,16 @@ module GetText
       targets
     end
 
+    def add_target(targets, file, msgid) # :nodoc:
+      key_existed = targets.assoc(msgid)
+      if key_existed 
+	targets[targets.index(key_existed)] = key_existed << "#{file}:-"
+      else
+	targets << [msgid, "#{file}:-"]
+      end
+      targets
+    end
+
     def target?(file) # :nodoc:
       init(nil) unless @ar_re
       data = IO.readlines(file)

data/lib/gettext/poparser.rb

@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..idca67f10f94', 'src/poparser.ry', 90
+module_eval <<'..end src/poparser.ry modeval..id0da1ccb1f3', 'src/poparser.ry', 90
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -103,7 +103,7 @@ module_eval <<'..end src/poparser.ry modeval..idca67f10f94', 'src/poparser.ry',
     @comments << comment
   end 
 
-..end src/poparser.ry modeval..idca67f10f94
+..end src/poparser.ry modeval..id0da1ccb1f3
 
 ##### racc 1.4.5 generates ###
 

data/lib/gettext/rails.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.29 2006/03/25 08:32:53 mutoh Exp $
+  $Id: rails.rb,v 1.33 2006/05/06 14:59:08 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -360,9 +360,9 @@ module ActionView #:nodoc:
 
 	  options = options.symbolize_keys
 
-	  unless object.errors.empty?
+	  if object && ! object.errors.empty?
 	    count = object.errors.count
-	    record = ActiveRecord::Base.human_attribute_table_name_for_error(object_name)
+	    record = ActiveRecord::Base.human_attribute_table_name_for_error(object_name.to_s)
 	    render_error_message(object, klass, record, count, options)
 	  end
 	end
@@ -409,6 +409,15 @@ module ActionMailer #:nodoc:
   end
 end
 
-Rails::Info.property("GetText version") do 
-  GetText::VERSION 
+begin
+  Rails::Info.property("GetText version") do 
+    GetText::VERSION 
+  end
+rescue Exception
+  $stderr.puts "GetText: #{GetText::VERSION} Rails::Info is not found." if $DEBUG
+end
+
+
+if ::RAILS_ENV == "development"
+  GetText::TextDomain.check_mo = true
 end

data/lib/gettext/string.rb

@@ -42,7 +42,12 @@ class String
       ret
     else
       ret = gsub(/%\{/, '%%{')
-      ret._old_format_m(args)
+      begin
+	ret._old_format_m(args)
+      rescue ArgumentError
+	$stderr.puts "  The string:#{ret}"
+	$stderr.puts "  args:#{args.inspect}"
+      end
     end
   end
 end

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.15 2006/03/15 16:55:47 mutoh Exp $
+  $Id: textdomain.rb,v 1.16 2006/04/29 17:17:15 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -29,6 +29,22 @@ module GetText
     attr_reader :current_locale
     attr_reader :current_mo
 
+    @@check_mo = false
+    # Check mo-file is modified or not, and if mo-file is modified,
+    # reload mo-file again. This is effective in debug mode.
+    # Default is false. If $DEBUG is true, mo-file is checked even if
+    # this value is false.
+    # * Returns: true if "check mo" mode.
+    def self.check_mo?
+      @@check_mo
+    end
+
+    # Sets to check mo-file or not. See GetText::TextDoman.check_mo? for more details.
+    # * val: true if "check mo" mode.
+    # * Returns: val
+    def self.check_mo=(val)
+      @@check_mo = val
+    end
     # The default locale paths.
     DEFAULT_LOCALE_PATHS = [
       "#{Config::CONFIG['datadir']}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
@@ -145,8 +161,15 @@ module GetText
       unless reload
 	@current_mo = @mofiles[@current_locale]
 	if @current_mo
-	  @current_mo = (@current_mo == :empty) ? nil : @current_mo
-	  return @current_mo
+	  if @current_mo == :empty
+	    @current_mo = nil
+	    return nil unless (@@check_mo or $DEBUG)
+	  elsif (@@check_mo or $DEBUG)
+	    @current_mo.update!
+	    return @current_mo
+	  else
+	    return @current_mo
+	  end
 	end
       end
       locales = [@current_locale.orig_str, @current_locale.to_posix, @current_locale.language]
@@ -163,7 +186,13 @@ module GetText
 	}
       end
       unless @current_mo
-	@mofiles[@current_locale] = :empty
+        @mofiles[@current_locale] = :empty
+        if $DEBUG
+          $stderr.puts "MO file is not found in"
+          @search_files.each do |v|
+            $stderr.puts "  #{v}"
+          end
+        end
       end
       @current_mo
     end

data/lib/gettext/version.rb

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

data/po/cs/rails.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.2.0\n"
-"POT-Creation-Date: 2006-03-04 22:50+0900\n"
+"Project-Id-Version: ruby-gettext 1.4.0\n"
+"POT-Creation-Date: 2006-04-17 23:03+0900\n"
 "PO-Revision-Date: 2005-12-17 21:43+0100\n"
 "Last-Translator: Karel Miarka <kajism@yahoo.com>\n"
 "Language-Team: Czech\n"
@@ -20,62 +20,62 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Czech\n"
 
-#: lib/gettext/rails.rb:235
+#: lib/gettext/rails.rb:263
 msgid "%{fn} is not included in the list"
 msgstr "%{fn} není obsaženo v seznamu možností"
 
-#: lib/gettext/rails.rb:236
+#: lib/gettext/rails.rb:264
 msgid "%{fn} is reserved"
 msgstr "%{fn} je rezervováno a nemůže být zvoleno"
 
-#: lib/gettext/rails.rb:237
+#: lib/gettext/rails.rb:265
 msgid "%{fn} is invalid"
 msgstr "%{fn} je chybné"
 
-#: lib/gettext/rails.rb:238
+#: lib/gettext/rails.rb:266
 msgid "%{fn} doesn't match confirmation"
 msgstr "%{fn} není shodné s potvrzením"
 
-#: lib/gettext/rails.rb:239
+#: lib/gettext/rails.rb:267
 msgid "%{fn} must be accepted"
 msgstr "%{fn} musí být zaškrtnuto"
 
-#: lib/gettext/rails.rb:240
+#: lib/gettext/rails.rb:268
 msgid "%{fn} can't be empty"
 msgstr "%{fn} musí být vyplněno"
 
-#: lib/gettext/rails.rb:241
+#: lib/gettext/rails.rb:269
 msgid "%{fn} can't be blank"
 msgstr "%{fn} musí být vyplněno"
 
-#: lib/gettext/rails.rb:242
+#: lib/gettext/rails.rb:270
 msgid "%{fn} is too long (max is %d characters)"
 msgstr "%{fn} je příliš dlouhé (maximum je %d znaků)"
 
-#: lib/gettext/rails.rb:243
+#: lib/gettext/rails.rb:271
 msgid "%{fn} is too short (min is %d characters)"
 msgstr "%{fn} je příliš krátké (minimum je %d znaků)"
 
-#: lib/gettext/rails.rb:244
+#: lib/gettext/rails.rb:272
 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:245
+#: lib/gettext/rails.rb:273
 msgid "%{fn} has already been taken"
 msgstr "%{fn} je již použito"
 
-#: lib/gettext/rails.rb:246
+#: lib/gettext/rails.rb:274
 msgid "%{fn} is not a number"
 msgstr "%{fn} není správné číslo"
 
-#: lib/gettext/rails.rb:289
+#: lib/gettext/rails.rb:337
 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:291
+#: lib/gettext/rails.rb:339
 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:"

data/po/cs/rgettext.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.2.0\n"
-"POT-Creation-Date: 2006-03-04 22:50+0900\n"
+"Project-Id-Version: ruby-gettext 1.4.0\n"
+"POT-Creation-Date: 2006-04-17 23:02+0900\n"
 "PO-Revision-Date: 2005-12-17 21:55+0100\n"
 "Last-Translator: Karel Miarka <kajism@yahoo.com>\n"
 "Language-Team: Czech\n"

data/po/de/rails.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.2.0\n"
-"POT-Creation-Date: 2006-03-04 22:50+0900\n"
+"Project-Id-Version: ruby-gettext 1.4.0\n"
+"POT-Creation-Date: 2006-04-17 23:03+0900\n"
 "PO-Revision-Date: 2005-12-27 17:00W. Europe Standard Time\n"
 "Last-Translator: Sasa Ebach <se@digitale-wertschoepfung.de>\n"
 "Language-Team: German\n"
@@ -18,55 +18,55 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/gettext/rails.rb:235
+#: lib/gettext/rails.rb:263
 msgid "%{fn} is not included in the list"
 msgstr "%{fn} kommt nicht in der Liste vor"
 
-#: lib/gettext/rails.rb:236
+#: lib/gettext/rails.rb:264
 msgid "%{fn} is reserved"
 msgstr "%{fn} ist reserviert"
 
-#: lib/gettext/rails.rb:237
+#: lib/gettext/rails.rb:265
 msgid "%{fn} is invalid"
 msgstr "%{fn} ist ungültig"
 
-#: lib/gettext/rails.rb:238
+#: lib/gettext/rails.rb:266
 msgid "%{fn} doesn't match confirmation"
 msgstr "%{fn} stimmt nicht mit der Bestätigung überein"
 
-#: lib/gettext/rails.rb:239
+#: lib/gettext/rails.rb:267
 msgid "%{fn} must be accepted"
 msgstr "%{fn} muss akzeptiert werden"
 
-#: lib/gettext/rails.rb:240
+#: lib/gettext/rails.rb:268
 msgid "%{fn} can't be empty"
 msgstr "%{fn} kann nicht leer sein"
 
-#: lib/gettext/rails.rb:241
+#: lib/gettext/rails.rb:269
 msgid "%{fn} can't be blank"
 msgstr "%{fn} kann nicht leer sein"
 
-#: lib/gettext/rails.rb:242
+#: lib/gettext/rails.rb:270
 msgid "%{fn} is too long (max is %d characters)"
 msgstr "%{fn} ist zu lang (max. %d Zeichen)"
 
-#: lib/gettext/rails.rb:243
+#: lib/gettext/rails.rb:271
 msgid "%{fn} is too short (min is %d characters)"
 msgstr "%{fn} ist zu kurz (min. %d Zeichen)"
 
-#: lib/gettext/rails.rb:244
+#: lib/gettext/rails.rb:272
 msgid "%{fn} is the wrong length (should be %d characters)"
 msgstr "%{fn} hat eine falsche Länge (sollte %d Zeichen lang sein)"
 
-#: lib/gettext/rails.rb:245
+#: lib/gettext/rails.rb:273
 msgid "%{fn} has already been taken"
 msgstr "%{fn} existiert bereits"
 
-#: lib/gettext/rails.rb:246
+#: lib/gettext/rails.rb:274
 msgid "%{fn} is not a number"
 msgstr "%{fn} ist keine Ziffer"
 
-#: lib/gettext/rails.rb:289
+#: lib/gettext/rails.rb:337
 msgid "%{num} error prohibited this %{record} from being saved"
 msgid_plural "%{num} errors prohibited this %{record} from being saved"
 msgstr[0] ""
@@ -75,7 +75,7 @@ msgstr[1] ""
 "%{num} Fehler haben verhindert, dass dieser %{record} gespeichert werden "
 "konnte"
 
-#: lib/gettext/rails.rb:291
+#: lib/gettext/rails.rb:339
 msgid "There was a problem with the following field:"
 msgid_plural "There were problems with the following fields:"
 msgstr[0] "Folgendes Feld hat Probleme verursacht:"

data/po/de/rgettext.po

@@ -10,9 +10,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.2.0\n"
+"Project-Id-Version: ruby-gettext 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-04 22:50+0900\n"
+"POT-Creation-Date: 2006-04-17 23:02+0900\n"
 "PO-Revision-Date: 2005-12-27 17:00W. Europe Standard Time\n"
 "Last-Translator: Sasa Ebach <se@digitale-wertschoepfung.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"

data/po/el/rails.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.2.0\n"
-"POT-Creation-Date: 2006-03-04 22:50+0900\n"
+"Project-Id-Version: ruby-gettext 1.4.0\n"
+"POT-Creation-Date: 2006-04-17 23:03+0900\n"
 "PO-Revision-Date: 2006-01-06 19:50+0100\n"
 "Last-Translator: damphyr <damphyr@gmx.net>\n"
 "Language-Team: Greek\n"
@@ -18,61 +18,61 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/gettext/rails.rb:235
+#: lib/gettext/rails.rb:263
 msgid "%{fn} is not included in the list"
 msgstr "το %{fn} δεν περιλαμβάνεται στη λίστα"
 
-#: lib/gettext/rails.rb:236
+#: lib/gettext/rails.rb:264
 msgid "%{fn} is reserved"
 msgstr "το %{fn} είναι κατειλημένο"
 
-#: lib/gettext/rails.rb:237
+#: lib/gettext/rails.rb:265
 msgid "%{fn} is invalid"
 msgstr "το %{fn} είναι άκυρο"
 
-#: lib/gettext/rails.rb:238
+#: lib/gettext/rails.rb:266
 msgid "%{fn} doesn't match confirmation"
 msgstr "το %{fn} δεν ταιριάζει με την επιβεβαίωση του"
 
-#: lib/gettext/rails.rb:239
+#: lib/gettext/rails.rb:267
 msgid "%{fn} must be accepted"
 msgstr "το %{fn} πρέπει να γίνει δεκτό"
 
-#: lib/gettext/rails.rb:240
+#: lib/gettext/rails.rb:268
 msgid "%{fn} can't be empty"
 msgstr "το %{fn} δεν γίνεται να είναι κενό"
 
-#: lib/gettext/rails.rb:241
+#: lib/gettext/rails.rb:269
 msgid "%{fn} can't be blank"
 msgstr "το %{fn} δεν γίνεται να είναι κενό"
 
-#: lib/gettext/rails.rb:242
+#: lib/gettext/rails.rb:270
 msgid "%{fn} is too long (max is %d characters)"
 msgstr "το %{fn} είναι πολύ μακρύ (το μέγιστο είναι %d χαρακτήρες)"
 
-#: lib/gettext/rails.rb:243
+#: lib/gettext/rails.rb:271
 msgid "%{fn} is too short (min is %d characters)"
 msgstr "το %{fn} είναι πολύ μικρό (το ελάχιστο είναι %d χαρακτήρες)"
 
-#: lib/gettext/rails.rb:244
+#: lib/gettext/rails.rb:272
 msgid "%{fn} is the wrong length (should be %d characters)"
 msgstr "το %{fn} έχει λάθος μήκος (πρέπει να είναι %d χαρακτήρες)"
 
-#: lib/gettext/rails.rb:245
+#: lib/gettext/rails.rb:273
 msgid "%{fn} has already been taken"
 msgstr "το %{fn} είναι ήδη κατειλημένο"
 
-#: lib/gettext/rails.rb:246
+#: lib/gettext/rails.rb:274
 msgid "%{fn} is not a number"
 msgstr "το %{fn} δεν είναι αριθμός"
 
-#: lib/gettext/rails.rb:289
+#: lib/gettext/rails.rb:337
 msgid "%{num} error prohibited this %{record} from being saved"
 msgid_plural "%{num} errors prohibited this %{record} from being saved"
 msgstr[0] "%{num} λάθος απέτρεψε την αποθήκευση της εγγραφής %{record}"
 msgstr[1] "%{num} λάθη απέτρεψαν την αποθήκευση της εγγραφής %{record}"
 
-#: lib/gettext/rails.rb:291
+#: lib/gettext/rails.rb:339
 msgid "There was a problem with the following field:"
 msgid_plural "There were problems with the following fields:"
 msgstr[0] "Υπάρχουν προβλήματα στο παρακάτω πεδίο:"