gettext 1.2.0-mswin32 → 1.3.0-mswin32

data/lib/gettext/poparser.rb

@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..id4a44ddde81', 'src/poparser.ry', 90
+module_eval <<'..end src/poparser.ry modeval..id3abd401c4d', 'src/poparser.ry', 90
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -103,7 +103,7 @@ module_eval <<'..end src/poparser.ry modeval..id4a44ddde81', 'src/poparser.ry',
     @comments << comment
   end 
 
-..end src/poparser.ry modeval..id4a44ddde81
+..end src/poparser.ry modeval..id3abd401c4d
 
 ##### 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.17 2006/02/23 14:53:59 mutoh Exp $
+  $Id: rails.rb,v 1.26 2006/03/11 13:16:39 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -28,6 +28,7 @@ module GetText #:nodoc:
 
     alias :_bindtextdomain :bindtextdomain #:nodoc:
 
+    module_function
     # Bind a textdomain(#{path}/#{locale}/LC_MESSAGES/#{domainname}.mo) to your program. 
     # Notes the textdomain scope becomes all of the controllers/views/models in your app. 
     # This is different from normal GetText.bindtextomain.
@@ -47,7 +48,7 @@ module GetText #:nodoc:
     # And the charset is set order by "the argument of bindtextdomain" > HTTP_ACCEPT_CHARSET > Default charset(UTF-8).
     #
     def bindtextdomain(domainname, _cgi = nil, locale = nil, charset = nil, with_model = true)
-      Locale.clear  # IMPORTANT! current locale should be nil once(default is used).
+      Locale.set_current(nil)  # IMPORTANT! current locale should be nil once(default is used).
       set_cgi(_cgi) if _cgi
       @gettext_container_domainname = domainname
       path = File.join(RAILS_ROOT, "locale")
@@ -59,7 +60,6 @@ module GetText #:nodoc:
     def bindtextdomain_to(klass, domainname) #:nodoc:
       klass.class_eval {
 	textdomain(domainname)
-
 	def self.human_attribute_name(attribute_key_name) #:nodoc:
 	  s_("#{self}|#{attribute_key_name.humanize}")
 	end
@@ -73,6 +73,24 @@ module GetText #:nodoc:
       @gettext_container_domainname = nil unless defined? @gettext_container_domainname
       @gettext_container_domainname
     end
+
+    # true to use localized templates such as list.rhtml, list_ja.rhtml, list_ja_JP.rhtml.
+    # * setting: true if localized, otherwise false. Default is true.
+    # * Returns: setting
+    def use_localized_templates(setting)
+      @@gettext_use_localized_templates = setting
+    end
+
+    # true if it use localized templates. See GetText::Rails.use_localized_templates 
+    # for more details.
+    # * Returns: true or false.
+    def use_localized_templates?
+      if defined? @@gettext_use_localized_templates
+	@@gettext_use_localized_templates 
+      else
+	true
+      end
+    end
   end
 end
 
@@ -90,7 +108,9 @@ module ActionController #:nodoc:
     after_filter :init_content_type
     
     def init_gettext_main #:nodoc:
-      bindtextdomain(@@gettext_domainname, request.cgi)  #You need to pass CGI object first.
+      cgi_ = request.cgi
+      cgi_.params["lang"] = [@params["lang"]] if @params["lang"]
+      bindtextdomain(@@gettext_domainname, cgi_)  #You need to pass CGI object first.
     end
 
     def init_content_type #:nodoc:
@@ -143,6 +163,17 @@ module ActionController #:nodoc:
 end
 
 module ActiveRecord #:nodoc:
+  module ConnectionAdapters #:nodoc:
+    # An abstract definition of a column in a table.
+    class Column
+      attr_accessor :table_class
+
+      def human_name
+        table_class.human_attribute_name(@name)
+      end
+    end
+  end
+  
   class Base
     include GetText::Rails  # Important
     extend GetText::Rails   # Important
@@ -150,21 +181,66 @@ module ActiveRecord #:nodoc:
     @@error_message_title = nil
     @@error_message_explanation = nil
     
+    # call-seq:
+    # set_error_message_title(msg)
+    #
     # Sets a your own title of error message dialog.
-    def self.set_error_message_title(single_msg, plural_msg)
+    # * msg: [single_msg, plural_msg]. Usually you need to call this with Nn_().
+    # * Returns: [single_msg, plural_msg]
+    def self.set_error_message_title(msg, plural_msg = nil)
+      if msg.kind_of? Array
+        single_msg = msg[0]
+        plural_msg = msg[1]
+      else
+        single_msg = msg
+      end
       @@error_message_title = [single_msg, plural_msg]
     end
-    
+
+    def self.columns
+      unless @columns
+	@columns = connection.columns(table_name, "#{name} Columns")
+	@columns.each {|column| 
+	  column.table_class = self
+	  column.primary = column.name == primary_key
+	}
+      end
+      @columns
+    end
+
+    # call-seq:
+    # set_error_message_explanation(msg)
+    #
     # Sets a your own explanation of the error message dialog.
-    def self.set_error_message_explanation(single_msg, plural_msg)
+    # * msg: [single_msg, plural_msg]. Usually you need to call this with Nn_().
+    # * Returns: [single_msg, plural_msg]
+    def self.set_error_message_explanation(msg, plural_msg = nil)
+      if msg.kind_of? Array
+        single_msg = msg[0]
+        plural_msg = msg[1]
+      else
+        single_msg = msg
+      end
       @@error_message_explanation = [single_msg, plural_msg]
     end
 
     def error_message_title #:nodoc:
-      @@error_message_title
+      if @@error_message_title
+	[_(@@error_message_title[0]), _(@@error_message_title[1])]
+      else
+	nil
+      end
     end
     def error_message_explanation #:nodoc:
-      @@error_message_explanation
+      if @@error_message_explanation
+	[_(@@error_message_explanation[0]), _(@@error_message_explanation[1])]
+      else
+	nil
+      end
+    end
+
+    def gettext(str)  #:nodoc:
+      _(str)
     end
   end
   
@@ -190,48 +266,59 @@ module ActiveRecord #:nodoc:
 				  :not_a_number => N_("%{fn} is not a number")
 				  )
     @@default_error_messages_d = {
-      :too_long => default_error_messages[:too_long],
-      :too_short => default_error_messages[:too_short],
-      :wrong_length => default_error_messages[:wrong_length]
+      :too_long => /#{Regexp.escape(default_error_messages[:too_long]).sub(/%d/, '(\d+)')}/,
+      :too_short => /#{Regexp.escape(default_error_messages[:too_short]).sub(/%d/, '(\d+)')}/,
+      :wrong_length => /#{Regexp.escape(default_error_messages[:wrong_length]).sub(/%d/, '(\d+)')}/,
     }
 
-    def self.convert_validates_messages_of_validates_length_of #:nodoc:
-      default_error_messages[:too_long] = _(@@default_error_messages_d[:too_long])
-      default_error_messages[:too_short] = _(@@default_error_messages_d[:too_short])
-      default_error_messages[:wrong_length] = _(@@default_error_messages_d[:wrong_length])      
-    end
-
     def full_messages #:nodoc:
       full_messages = []
       @errors.each_key do |attr|
 	@errors[attr].each do |msg|
 	  next if msg.nil?
+	  #Ugly but... :-<
+	  @@default_error_messages_d.each do |key, regexp|
+	    if regexp =~ msg
+	      msg = _(default_error_messages[key]) % $1.to_i
+	      break
+	    end
+	  end
+	  custom_msg = @base.gettext(msg)
+	  custom_msg = _(msg) if custom_msg == msg 
+
 	  if attr == "base"
-	    full_messages << _(msg)
+	    full_messages << custom_msg
 	  elsif  RE_FIELD_NAME =~ msg
-	    full_messages << _(msg) % {:fn => @base.class.human_attribute_name(attr)}
+	    full_messages << custom_msg % {:fn => @base.class.human_attribute_name(attr)}
 	  else
-	    full_messages << @base.class.human_attribute_name(attr) + " " + msg
+	    full_messages << @base.class.human_attribute_name(attr) + " " + custom_msg
 	  end
 	end
       end
       full_messages
     end
   end
+end
+
 
-  module Validations #:nodoc:
-    module ClassMethods #:nodoc:
-      alias :_validates_length_of :validates_length_of
-      def validates_length_of(*attrs)
-	ActiveRecord::Errors.convert_validates_messages_of_validates_length_of
-	_validates_length_of(*attrs)
+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 = {})
+      if GetText::Rails.use_localized_templates?
+	locale = GetText.locale
+	[locale.to_general, locale.to_s, locale.language, Locale.default.language].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
+	end
       end
+      render_file_without_locale(template_path, use_full_path, local_assigns)
     end
+    
   end
-end
-
 
-module ActionView #:nodoc:
   module Helpers  #:nodoc:
     module ActiveRecordHelper #:nodoc: all
       module L10n
@@ -280,6 +367,39 @@ module ActionView #:nodoc:
   end
 end
 
+module ActionMailer #:nodoc:
+  class Base #:nodoc:
+    helper GetText::Rails 
+    include GetText::Rails 
+    extend GetText::Rails
+
+    alias :_create! :create! #:nodoc:
+
+    def base64(text, charset="iso-2022-jp", convert=true)
+      if convert
+        if charset == "iso-2022-jp"
+          text = NKF.nkf('-j -m0', text)
+        end
+      end
+      text = TMail::Base64.folding_encode(text)
+      "=?#{charset}?B?#{text}?="
+    end
+
+    def create!(*arg) #:nodoc:
+      if Locale.get.language == "ja"
+	require 'nkf'
+        _create!(*arg)
+	@mail.charset = 'iso-2022-jp'
+	@mail.subject = base64(@mail.subject)
+	@mail.body = NKF.nkf('-j', @mail.body)
+      else
+        _create!(*arg)
+      end
+      @mail
+    end
+  end
+end
+
 Rails::Info.property("GetText version") do 
   GetText::VERSION 
 end

data/lib/gettext/version.rb

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

data/po/cs/rails.po

@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 1.2.0\n"
-"POT-Creation-Date: 2006-02-23 00:44+0900\n"
+"POT-Creation-Date: 2006-03-04 22:50+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,64 +20,64 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Czech\n"
 
-#: lib/gettext/rails.rb:117
-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:123
-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:135
+#: lib/gettext/rails.rb:235
 msgid "%{fn} is not included in the list"
 msgstr "%{fn} není obsaženo v seznamu možností"
 
-#: lib/gettext/rails.rb:136
+#: lib/gettext/rails.rb:236
 msgid "%{fn} is reserved"
 msgstr "%{fn} je rezervováno a nemůže být zvoleno"
 
-#: lib/gettext/rails.rb:137
+#: lib/gettext/rails.rb:237
 msgid "%{fn} is invalid"
 msgstr "%{fn} je chybné"
 
-#: lib/gettext/rails.rb:138
+#: lib/gettext/rails.rb:238
 msgid "%{fn} doesn't match confirmation"
 msgstr "%{fn} není shodné s potvrzením"
 
-#: lib/gettext/rails.rb:139
+#: lib/gettext/rails.rb:239
 msgid "%{fn} must be accepted"
 msgstr "%{fn} musí být zaškrtnuto"
 
-#: lib/gettext/rails.rb:140
+#: lib/gettext/rails.rb:240
 msgid "%{fn} can't be empty"
 msgstr "%{fn} musí být vyplněno"
 
-#: lib/gettext/rails.rb:141
+#: lib/gettext/rails.rb:241
 msgid "%{fn} can't be blank"
 msgstr "%{fn} musí být vyplněno"
 
-#: lib/gettext/rails.rb:142
+#: lib/gettext/rails.rb:242
 msgid "%{fn} is too long (max is %d characters)"
 msgstr "%{fn} je příliš dlouhé (maximum je %d znaků)"
 
-#: lib/gettext/rails.rb:143
+#: lib/gettext/rails.rb:243
 msgid "%{fn} is too short (min is %d characters)"
 msgstr "%{fn} je příliš krátké (minimum je %d znaků)"
 
-#: lib/gettext/rails.rb:144
+#: lib/gettext/rails.rb:244
 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:145
+#: lib/gettext/rails.rb:245
 msgid "%{fn} has already been taken"
 msgstr "%{fn} je již použito"
 
-#: lib/gettext/rails.rb:146
+#: lib/gettext/rails.rb:246
 msgid "%{fn} is not a number"
 msgstr "%{fn} není správné číslo"
+
+#: lib/gettext/rails.rb:289
+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
+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:"

data/po/cs/rgettext.po

@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 1.2.0\n"
-"POT-Creation-Date: 2006-02-23 00:44+0900\n"
+"POT-Creation-Date: 2006-03-04 22:50+0900\n"
 "PO-Revision-Date: 2005-12-17 21:55+0100\n"
 "Last-Translator: Karel Miarka <kajism@yahoo.com>\n"
 "Language-Team: Czech\n"
@@ -21,11 +21,11 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,15,-1\n"
 
-#: lib/gettext/rmsgmerge.rb:405
+#: lib/gettext/rmsgmerge.rb:402
 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:408
+#: lib/gettext/rmsgmerge.rb:405
 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 "
@@ -36,26 +36,26 @@ msgstr ""
 "soubor s aktuálními zdrojovými referencemi. ref.pot je většinou vytvořen "
 "rgettextem."
 
-#: lib/gettext/rmsgmerge.rb:410 lib/gettext/rgettext.rb:132
+#: lib/gettext/rmsgmerge.rb:407 lib/gettext/rgettext.rb:132
 #: lib/gettext/rmsgfmt.rb:50
 msgid "Specific options:"
 msgstr "Volby:"
 
-#: lib/gettext/rmsgmerge.rb:412 lib/gettext/rgettext.rb:134
+#: lib/gettext/rmsgmerge.rb:409 lib/gettext/rgettext.rb:134
 #: lib/gettext/rmsgfmt.rb:52
 msgid "write output to specified file"
 msgstr "zapsat výstup od určeného souboru"
 
-#: lib/gettext/rmsgmerge.rb:423 lib/gettext/rgettext.rb:143
+#: lib/gettext/rmsgmerge.rb:420 lib/gettext/rgettext.rb:143
 #: lib/gettext/rmsgfmt.rb:56
 msgid "display version information and exit"
 msgstr "zobrazit informaci o verzi a skončit"
 
-#: lib/gettext/rmsgmerge.rb:448
+#: lib/gettext/rmsgmerge.rb:445
 msgid "definition po is not given."
 msgstr "definiční po soubor není zadán."
 
-#: lib/gettext/rmsgmerge.rb:450
+#: lib/gettext/rmsgmerge.rb:447
 msgid "reference pot is not given."
 msgstr "referenční pot soubor není zadán."