gettext 1.91.0 → 1.92.0

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.75 2008/05/11 11:37:34 mutoh Exp $
+  $Id: rails.rb,v 1.79 2008/08/02 08:42:06 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -271,20 +271,36 @@ end
 
 module ActionView #:nodoc:
   class Base #:nodoc:
-    alias render_file_without_locale render_file #:nodoc:
-    # This provides to find localized template files such as foo_ja.rhtml, foo_ja_JP.rhtml
-    # instead of foo.rhtml. If the file isn't found, foo.rhtml is used.
-    def render_file(template_path, use_full_path = true, local_assigns = {})
+    # This provides to find localized template files such as foo_ja.html.erb, foo_ja_JP.html.erb
+    # instead of foo.html.erb. If the file isn't found, foo.html.erb is used.
+    def render_file_with_gettext(template_path, use_full_path = true, local_assigns = {})
       locale = GetText.locale
       [locale.to_general, locale.to_s, locale.language, Locale.default.language].uniq.each do |v|
 	localized_path = "#{template_path}_#{v}"
-	return render_file_without_locale(localized_path, use_full_path, local_assigns) if file_exists? localized_path
+        if (respond_to? :file_exists?) ? file_exists?(localized_path) : (finder.file_exists? localized_path)
+          return render_file_without_gettext(localized_path, use_full_path, local_assigns)
+        end
       end
-      render_file_without_locale(template_path, use_full_path, local_assigns)
+      render_file_without_gettext(template_path, use_full_path, local_assigns)
     end
-    
+    alias_method_chain :render_file, :gettext
   end
 
+if defined? TemplateFinder
+  class TemplateFinder
+    def pick_template_with_gettext(template_path, extension)
+      locale = GetText.locale
+      [locale.to_general, locale.to_s, locale.language, Locale.default.language].uniq.each do |v|
+        file_name = "#{template_path}_#{v}.#{extension}"
+        base_path = find_base_path_for(file_name)
+        return "#{base_path}/#{file_name}" unless base_path.blank?
+      end
+      pick_template_without_gettext(template_path, extension)
+    end
+    alias_method_chain :pick_template, :gettext
+  end
+end
+
   module Helpers  #:nodoc:
     class FormBuilder
       include GetText
@@ -490,16 +506,17 @@ module ActionController #:nodoc: all
       def expire_fragment_with_gettext(name, options = nil)
         return unless perform_caching
 
-        key = fragment_cache_key_without_gettext(name)
+        fc_store = (defined? :cache_store) ? cache_store : fragment_cache_store
+        key = name.is_a?(Regexp) ? name : fragment_cache_key_without_gettext(name)
         if key.is_a?(Regexp)
           self.class.benchmark "Expired fragments matching: #{key.source}" do
-            fragment_cache_store.delete_matched(key, options)
+            fc_store.delete_matched(key, options)
           end
         else
           key = key.gsub(/:/, ".")
           self.class.benchmark "Expired fragment: #{key}, lang = #{available_locales.inspect}" do
             available_locales.each do |lang|
-              fragment_cache_store.delete("#{key}_#{lang}", options)
+              fc_store.delete("#{key}_#{lang}", options)
             end
           end
         end

data/lib/gettext/rgettext.rb

@@ -25,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2008/01/27 10:58:10 $)[1]
+    DATE = %w($Date: 2008/07/26 06:59:34 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -115,6 +115,11 @@ msgstr ""
 	  str << "msgid_plural \"" << ids[1] << "\"\n"
 	  str << "msgstr[0] \"\"\n"
 	  str << "msgstr[1] \"\"\n"
+	elsif msgid.include?("\004")
+	  ids = msgid.split(/\004/)
+	  str << "\nmsgctxt \"" << ids[0] << "\"\n"
+	  str << "msgid \"" << ids[1] << "\"\n"
+	  str << "msgstr \"\"\n"
 	else
 	  str << "\nmsgid \"" << msgid << "\"\n"
 	  str << "msgstr \"\"\n"

data/lib/gettext/rmsgfmt.rb

@@ -20,7 +20,7 @@ module GetText
     extend GetText 
 
     VERSION = GetText::VERSION 
-    DATE = %w($Date: 2006/06/11 15:36:20 $)[1] # :nodoc:
+    DATE = %w($Date: 2008/07/26 06:59:34 $)[1] # :nodoc:
     
     module_function
     def run(targetfile = nil, output_path = nil) # :nodoc:
@@ -86,16 +86,8 @@ module GetText
 		     podir = "./po", targetdir = "./data/locale", 
 		     targetpath_rule = "%s/LC_MESSAGES") #:nodoc:
     $stderr.puts "This function will be moved to utils.rb. So requires 'utils' first, please."
-    modir = File.join(targetdir, targetpath_rule)
-    Dir.glob(File.join(podir, "*/*.po")) do |file|
-      lang, basename = /\/([^\/]+?)\/(.*)\.po/.match(file[podir.size..-1]).to_a[1,2]
-      outdir = modir % lang
-      FileUtils.mkdir_p(outdir) unless File.directory?(outdir)
-      rmsgfmt(file, File.join(outdir, "#{basename}.mo"))
-      if verbose
-	$stderr.puts %Q[#{file} -> #{File.join(outdir, "#{basename}.mo")}]
-      end
-    end
+    require 'gettext/utils'
+    GetText.create_mofiles(verbose, podir, targetdir, targetpath_rule)
     self
   end
 end

data/lib/gettext/utils.rb

@@ -102,10 +102,14 @@ module GetText
       lang, basename = /\/([^\/]+?)\/(.*)\.po/.match(file[podir.size..-1]).to_a[1,2]
       outdir = modir % lang
       FileUtils.mkdir_p(outdir) unless File.directory?(outdir)
-      rmsgfmt(file, File.join(outdir, "#{basename}.mo"))
-      if verbose
-	$stderr.puts %Q[#{file} -> #{File.join(outdir, "#{basename}.mo")}]
+      $stderr.print %Q[#{file} -> #{File.join(outdir, "#{basename}.mo")} ... ] if verbose
+      begin
+        rmsgfmt(file, File.join(outdir, "#{basename}.mo"))
+      rescue Exception => e
+        $stderr.puts "Error." if verbose
+        raise e
       end
+      $stderr.puts "Done." if verbose
     end
   end
 

data/lib/gettext/version.rb

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

data/po/bs/rails.po

@@ -1,16 +1,16 @@
 # translation of rails.po to Bosnian
-# 
+#
 # a po-file for Ruby-GetText-Package and Ruby on Rails.
-# 
+#
 # Copyright (C) 2005-2007 Masao Mutoh
-# 
+#
 # This file is distributed under the same license as the Ruby-GetText-Package.
-# 
+#
 # Sanjin Sehic <saserr at gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.90.0\n"
-"POT-Creation-Date: 2008-05-10 01:52+0900\n"
+"Project-Id-Version: ruby-gettext 1.92.0\n"
+"POT-Creation-Date: 2008-07-13 12:12+0900\n"
 "PO-Revision-Date: 2007-06-26 19:02+0200\n"
 "Last-Translator: Sanjin Sehic <saserr at gmail.com>\n"
 "Language-Team: Bosnian <saserr at gmail.com>\n"
@@ -21,77 +21,77 @@ msgstr ""
 "%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/gettext/rails.rb:295
+#: lib/gettext/rails.rb:308
 msgid "%{num} error prohibited this %{record} from being saved"
 msgid_plural "%{num} errors prohibited this %{record} from being saved"
 msgstr[0] "%{num} greška je spriječila %{record} od spašavanja"
 msgstr[1] "%{num} greške su spriječile %{record} od spašavanja"
 msgstr[2] "%{num} grešaka su spriječile %{record} od spašavanja"
 
-#: lib/gettext/rails.rb:297
+#: lib/gettext/rails.rb:310
 msgid "There was a problem with the following field:"
 msgid_plural "There were problems with the following fields:"
 msgstr[0] "Postoji problem u sljedečem polju:"
 msgstr[1] "Postoje problemi u sljedečim poljima:"
 msgstr[2] "Postoje problemi u sljedečim poljima:"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:416
 msgid "less than 5 seconds"
 msgstr "manje od 5 sekundi"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:416
 msgid "less than 10 seconds"
 msgstr "manje od 10 sekundi"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:416
 msgid "less than 20 seconds"
 msgstr "manje od 20 sekundi"
 
-#: lib/gettext/rails.rb:404
+#: lib/gettext/rails.rb:417
 msgid "half a minute"
 msgstr "pola minute"
 
-#: lib/gettext/rails.rb:404
+#: lib/gettext/rails.rb:417
 msgid "less than a minute"
 msgstr "manje od minute"
 
-#: lib/gettext/rails.rb:404
+#: lib/gettext/rails.rb:417
 msgid "about 1 month"
 msgstr "oko 1 mjesec"
 
-#: lib/gettext/rails.rb:405
+#: lib/gettext/rails.rb:418
 msgid "about 1 year"
 msgstr "oko godinu dana"
 
-#: lib/gettext/rails.rb:406
+#: lib/gettext/rails.rb:419
 msgid "1 minute"
 msgid_plural "%{num} minutes"
 msgstr[0] "1 minuta"
 msgstr[1] "%{num} minute"
 msgstr[2] "%{num} minuta"
 
-#: lib/gettext/rails.rb:407
+#: lib/gettext/rails.rb:420
 msgid "about 1 hour"
 msgid_plural "about %{num} hours"
 msgstr[0] "oko 1 sat"
 msgstr[1] "oko %{num} sata"
 msgstr[2] "oko %{num} sati"
 
-#: lib/gettext/rails.rb:408
+#: lib/gettext/rails.rb:421
 msgid "1 day"
 msgid_plural "%{num} days"
 msgstr[0] "1 dan"
 msgstr[1] "%{num} dana"
 msgstr[2] "%{num} dana"
 
-#: lib/gettext/rails.rb:409
+#: lib/gettext/rails.rb:422
 msgid "1 month"
 msgid_plural "%{num} months"
 msgstr[0] "1 mjesec"
 msgstr[1] "%{num} mjeseca"
 msgstr[2] "%{num} mjeseci"
 
-#: lib/gettext/rails.rb:410
+#: lib/gettext/rails.rb:423
 msgid "over 1 year"
 msgid_plural "over %{num} years"
 msgstr[0] "preko 1 godine"
@@ -148,3 +148,38 @@ msgstr "%{fn} se već koristi"
 #: lib/gettext/active_record.rb:230
 msgid "%{fn} is not a number"
 msgstr "%{fn} nije broj"
+
+#: lib/gettext/active_record.rb:231
+#, fuzzy
+msgid "%{fn} must be greater than %d"
+msgstr "%{fn} se mora prihvatiti"
+
+#: lib/gettext/active_record.rb:232
+#, fuzzy
+msgid "%{fn} must be greater than or equal to %d"
+msgstr "%{fn} se mora prihvatiti"
+
+#: lib/gettext/active_record.rb:233
+#, fuzzy
+msgid "%{fn} must be equal to %d"
+msgstr "%{fn} se mora prihvatiti"
+
+#: lib/gettext/active_record.rb:234
+#, fuzzy
+msgid "%{fn} must be less than %d"
+msgstr "%{fn} se mora prihvatiti"
+
+#: lib/gettext/active_record.rb:235
+#, fuzzy
+msgid "%{fn} must be less than or equal to %d"
+msgstr "%{fn} se mora prihvatiti"
+
+#: lib/gettext/active_record.rb:236
+#, fuzzy
+msgid "%{fn} must be odd"
+msgstr "%{fn} se mora prihvatiti"
+
+#: lib/gettext/active_record.rb:237
+#, fuzzy
+msgid "%{fn} must be even"
+msgstr "%{fn} se mora prihvatiti"

data/po/bs/rgettext.po

@@ -8,8 +8,8 @@
 # Sanjin Sehic <saserr@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.90.0\n"
-"POT-Creation-Date: 2008-05-10 01:52+0900\n"
+"Project-Id-Version: ruby-gettext 1.92.0\n"
+"POT-Creation-Date: 2008-07-13 12:12+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"
@@ -128,7 +128,7 @@ msgstr "Databaza nije dostupna."
 msgid "rubygems are not found."
 msgstr "rubygems se ne mogu pronaći."
 
-#: lib/gettext.rb:363
+#: lib/gettext.rb:364
 msgid "3rd parmeter is wrong: value = %{number}"
 msgstr ""
 

data/po/ca/rails.po

@@ -1,16 +1,16 @@
-# 
+#
 # a po-file for Ruby-GetText-Package and Ruby on Rails.
-# 
-# Copyright (C) 2005-2007 Masao Mutoh
-# 
+#
+# Copyright (C) 2005-2008 Masao Mutoh
+#
 # This file is distributed under the same license as the Ruby-GetText-Package.
-# 
-# Ramon Salvadó <rsalvado at gnuine.com>, 2006,2007.
-# 
+#
+# Ramon Salvadó <rsalvado at gnuine.com>, 2006-2008.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.90.0\n"
-"POT-Creation-Date: 2008-05-10 01:52+0900\n"
+"Project-Id-Version: ruby-gettext 1.92.0\n"
+"POT-Creation-Date: 2008-07-13 12:12+0900\n"
 "PO-Revision-Date: 2005-12-17 14:33+0900\n"
 "Last-Translator: Ramon Salvadó <rsalvado at gnuine.com>\n"
 "Language-Team: Catalan\n"
@@ -19,75 +19,74 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/gettext/rails.rb:295
+#: lib/gettext/rails.rb:308
 msgid "%{num} error prohibited this %{record} from being saved"
 msgid_plural "%{num} errors prohibited this %{record} from being saved"
 msgstr[0] "%{num} error impedeix que es pugui guardar %{record}"
 msgstr[1] "%{num} errors impedeixen que es pugui guardar %{record}"
 
-#: lib/gettext/rails.rb:297
+#: lib/gettext/rails.rb:310
 msgid "There was a problem with the following field:"
 msgid_plural "There were problems with the following fields:"
 msgstr[0] "Hi ha problemes amb el següent camp:"
 msgstr[1] "Hi ha problemes amb els següents camps:"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:416
 msgid "less than 5 seconds"
 msgstr "menys de 5 segons"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:416
 msgid "less than 10 seconds"
 msgstr "menys de 10 segons"
 
-#: lib/gettext/rails.rb:403
+#: lib/gettext/rails.rb:416
 msgid "less than 20 seconds"
 msgstr "menys de 20 segons"
 
-#: lib/gettext/rails.rb:404
+#: lib/gettext/rails.rb:417
 msgid "half a minute"
 msgstr "mig minut"
 
-#: lib/gettext/rails.rb:404
+#: lib/gettext/rails.rb:417
 msgid "less than a minute"
 msgstr "menys d'un minut"
 
-#: lib/gettext/rails.rb:404
+#: lib/gettext/rails.rb:417
 msgid "about 1 month"
-msgstr "al voltant d'1 mes"
+msgstr "al voltant d'un mes"
 
-#: lib/gettext/rails.rb:405
+#: lib/gettext/rails.rb:418
 msgid "about 1 year"
-msgstr "al voltant d'1 any"
+msgstr "al voltant d'un any"
 
-#: lib/gettext/rails.rb:406
+#: lib/gettext/rails.rb:419
 msgid "1 minute"
 msgid_plural "%{num} minutes"
-msgstr[0] "1 minut"
+msgstr[0] "un minut"
 msgstr[1] "%{num} minuts"
 
-#: lib/gettext/rails.rb:407
+#: lib/gettext/rails.rb:420
 msgid "about 1 hour"
 msgid_plural "about %{num} hours"
-msgstr[0] "al voltant d'1 hora"
+msgstr[0] "al voltant d'una hora"
 msgstr[1] "al voltant de %{num} hores"
 
-#: lib/gettext/rails.rb:408
+#: lib/gettext/rails.rb:421
 msgid "1 day"
 msgid_plural "%{num} days"
-msgstr[0] "1 dia"
+msgstr[0] "un dia"
 msgstr[1] "%{num} dies"
 
-#: lib/gettext/rails.rb:409
+#: lib/gettext/rails.rb:422
 msgid "1 month"
 msgid_plural "%{num} months"
-msgstr[0] "1 mes"
+msgstr[0] "un mes"
 msgstr[1] "%{num} mesos"
 
-#: lib/gettext/rails.rb:410
-#, fuzzy
+#: lib/gettext/rails.rb:423
 msgid "over 1 year"
 msgid_plural "over %{num} years"
-msgstr[0] "més de 1 anys"
+msgstr[0] "més d'un any"
 msgstr[1] "més de %{num} anys"
 
 #: lib/gettext/active_record.rb:28
@@ -141,3 +140,31 @@ msgstr "%{fn} ja existent"
 #: lib/gettext/active_record.rb:230
 msgid "%{fn} is not a number"
 msgstr "%{fn} no és un número"
+
+#: lib/gettext/active_record.rb:231
+msgid "%{fn} must be greater than %d"
+msgstr "%{fn} ha de ser més gran que %d"
+
+#: lib/gettext/active_record.rb:232
+msgid "%{fn} must be greater than or equal to %d"
+msgstr "%{fn} ha de ser més gran o igual a %d"
+
+#: lib/gettext/active_record.rb:233
+msgid "%{fn} must be equal to %d"
+msgstr "%{fn} ha de ser igual a %d"
+
+#: lib/gettext/active_record.rb:234
+msgid "%{fn} must be less than %d"
+msgstr "%{fn} ha de ser menor que %d"
+
+#: lib/gettext/active_record.rb:235
+msgid "%{fn} must be less than or equal to %d"
+msgstr "%{fn} ha de ser menor o igual que %d"
+
+#: lib/gettext/active_record.rb:236
+msgid "%{fn} must be odd"
+msgstr "%{fn} ha de ser senar"
+
+#: lib/gettext/active_record.rb:237
+msgid "%{fn} must be even"
+msgstr "%{fn} ha de ser parell"