gettext 1.5.0 → 1.6.0

data/lib/gettext/rgettext.rb

@@ -14,6 +14,7 @@
 
 require 'optparse'
 require 'gettext'
+require 'rbconfig'
 
 module GetText
 
@@ -24,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/02/22 16:42:41 $)[1]
+    DATE = %w($Date: 2006/06/04 15:07:34 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -142,6 +143,7 @@ msgstr ""
 
       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}]"
 	exit
       end
 

data/lib/gettext/rmsgfmt.rb

@@ -11,6 +11,7 @@ require 'optparse'
 require 'fileutils'
 require 'gettext'
 require 'gettext/poparser'
+require 'rbconfig'
 
 module GetText
   GetText.bindtextdomain("rgettext")
@@ -19,7 +20,7 @@ module GetText
     extend GetText 
 
     VERSION = GetText::VERSION 
-    DATE = %w($Date: 2006/02/22 16:42:41 $)[1] # :nodoc:
+    DATE = %w($Date: 2006/06/04 15:07:34 $)[1] # :nodoc:
     
     module_function
     def run(targetfile = nil, output_path = nil) # :nodoc:
@@ -55,6 +56,7 @@ module GetText
 
       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}]"
 	exit
       end
       opts.parse!(ARGV)

data/lib/gettext/rmsgmerge.rb

@@ -11,6 +11,7 @@
 require 'optparse'
 require 'gettext'
 require 'gettext/poparser'
+require 'rbconfig'
 
 module GetText
     
@@ -393,7 +394,7 @@ module GetText
     
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/02/23 14:53:59 $)[1]
+    DATE = %w($Date: 2006/06/04 15:07:34 $)[1]
     
     module_function
 
@@ -419,6 +420,7 @@ module GetText
       
       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}]"
         exit
       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.16 2006/04/29 17:17:15 mutoh Exp $
+  $Id: textdomain.rb,v 1.17 2006/06/04 14:43:37 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -27,7 +27,9 @@ module GetText
     GEM_PATH_RE = /(.*)\/lib$/  # :nodoc:
 
     attr_reader :current_locale
+    attr_reader :locale_paths
     attr_reader :current_mo
+    attr_reader :name
 
     @@check_mo = false
     # Check mo-file is modified or not, and if mo-file is modified,
@@ -46,10 +48,12 @@ module GetText
       @@check_mo = val
     end
     # The default locale paths.
+    CONFIG_PREFIX = Config::CONFIG['prefix'].gsub(/\/local/, "")
     DEFAULT_LOCALE_PATHS = [
       "#{Config::CONFIG['datadir']}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
-      "#{Config::CONFIG['prefix']}/share/locale/%{locale}/LC_MESSAGES/%{name}.mo",
-      "#{Config::CONFIG['prefix']}/local/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
+      "#{Config::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
+      "#{CONFIG_PREFIX}/share/locale/%{locale}/LC_MESSAGES/%{name}.mo",
+      "#{CONFIG_PREFIX}/local/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
     ].uniq
 
     # Add default locale path. Usually you should use GetText.add_default_locale_path instead.
@@ -109,13 +113,13 @@ module GetText
 
     # Gets the translated string.
     # * msgid: the original message.
-    # * Returns: the translated string.
+    # * Returns: the translated string or nil if not found.
     def gettext(msgid)
       return "" if msgid == "" or msgid.nil?
       if @current_mo and @current_mo[msgid] and (@current_mo[msgid].size > 0)
 	@current_mo[msgid]
       else
-        msgid
+        nil
       end
     end
 
@@ -123,11 +127,13 @@ module GetText
     # * msgid: the original message(single).
     # * msgid: the original message(plural).
     # * n: the number
-    # * Returns: the translated string.
+    # * Returns: the translated string or nil if not found.
     def ngettext(msgid, msgid_plural, n)
       key = msgid + "\000" + msgid_plural
       msg = gettext(key)
-      if msg == key
+      if ! msg
+	nil
+      elsif msg == key
 	msg = n == 1 ? msgid : msgid_plural
       elsif msg.include?("\000")
         ary = msg.split("\000")
@@ -172,7 +178,7 @@ module GetText
 	  end
 	end
       end
-      locales = [@current_locale.orig_str, @current_locale.to_posix, @current_locale.language]
+      locales = [@current_locale.orig_str, @current_locale.to_posix, @current_locale.language].uniq
       @locale_paths.each do |dir|
 	locales.each{|locale|
 	  fname = dir % {:locale => locale, :name => @name}

data/lib/gettext/textdomainmanager.rb

@@ -0,0 +1,103 @@
+=begin
+  textdomainmanager.rb - Manage TextDomains.
+
+  Copyright (C) 2006  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: textdomainmanager.rb,v 1.1 2006/06/04 14:44:37 mutoh Exp $
+=end
+
+require 'gettext/locale'
+require 'gettext/textdomain'
+
+module GetText
+  # Manage TextDomain (Internal use only)
+  # A class/module is able to have plural textdomains.
+  class TextDomainManager
+    include Enumerable
+
+    attr_reader :target
+
+    @@output_charset = ENV["OUTPUT_CHARSET"]
+    @@textdomain_all = {}
+
+    # Sets the current output_charset.
+    # * charset: output_charset.
+    # * Returns: output_charset.
+    def self.output_charset=(charset)
+      @@output_charset = charset
+    end
+
+    # Gets the current output_charset.
+    # * Returns: output_charset.
+    def self.output_charset
+      @@output_charset
+    end
+
+    def self.each_all
+      @@textdomain_all.each do |k, textdomain|
+	yield textdomain
+      end
+    end
+
+    def self.textdomain(domainname)
+      @@textdomain_all[domainname]
+    end
+
+    # Initialize a TextDomainManager
+    # * target: a target class/module to bind this TextDomainManager. 
+    # * locale: a Locale::Object.
+    def initialize(target, locale)
+      @target = target
+      @locale = locale
+      @textdomains = {}
+    end
+
+    # Add a textdomain
+    # * options: If they aren't set or invalid, default values are used. 
+    #    * :path - the path to the mo-files. If not set, it will search default paths such as 
+    #              /usr/share/locale, /usr/local/share/locale)
+    def add_textdomain(domainname, options = {})
+      path = options[:path]
+      if $DEBUG
+	$stderr.print "Bind the domain '#{domainname}' to '#{@target}'. "
+	$stderr.print "Current locale is #{@locale.inspect}\n"
+      end
+      textdomain = @@textdomain_all[domainname]
+      if textdomain
+	textdomain.set_locale(@locale)
+      else
+	textdomain = TextDomain.new(domainname, path, @locale)
+	@@textdomain_all[domainname] = textdomain
+      end
+	@textdomains[domainname] = textdomain
+      textdomain
+    end
+
+    # Iterate textdomains.
+    def each
+      @textdomains.each do |k, textdomain|
+	yield textdomain
+      end
+      self
+    end
+
+    # Sets locale such as "de", "fr", "it", "ko", "ja_JP.eucJP", "zh_CN.EUC" ... 
+    #
+    # Notice that you shouldn't use this for your own Libraries.
+    # * locale: a locale string or Locale::Object.
+    # * force: Change locale forcely.
+    # * Returns: self
+    def set_locale(locale, force = false)
+      if locale != @locale or force
+	each do |textdomain|
+	  textdomain.set_locale(locale)
+	end
+	@locale = locale
+      end
+      self
+    end
+  end
+end

data/lib/gettext/version.rb

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

data/po/cs/rails.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.4.0\n"
-"POT-Creation-Date: 2006-04-17 23:03+0900\n"
+"Project-Id-Version: ruby-gettext 1.5.0\n"
+"POT-Creation-Date: 2006-06-04 18:48+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:263
+#: lib/gettext/rails.rb:277
 msgid "%{fn} is not included in the list"
 msgstr "%{fn} není obsaženo v seznamu možností"
 
-#: lib/gettext/rails.rb:264
+#: lib/gettext/rails.rb:278
 msgid "%{fn} is reserved"
 msgstr "%{fn} je rezervováno a nemůže být zvoleno"
 
-#: lib/gettext/rails.rb:265
+#: lib/gettext/rails.rb:279
 msgid "%{fn} is invalid"
 msgstr "%{fn} je chybné"
 
-#: lib/gettext/rails.rb:266
+#: lib/gettext/rails.rb:280
 msgid "%{fn} doesn't match confirmation"
 msgstr "%{fn} není shodné s potvrzením"
 
-#: lib/gettext/rails.rb:267
+#: lib/gettext/rails.rb:281
 msgid "%{fn} must be accepted"
 msgstr "%{fn} musí být zaškrtnuto"
 
-#: lib/gettext/rails.rb:268
+#: lib/gettext/rails.rb:282
 msgid "%{fn} can't be empty"
 msgstr "%{fn} musí být vyplněno"
 
-#: lib/gettext/rails.rb:269
+#: lib/gettext/rails.rb:283
 msgid "%{fn} can't be blank"
 msgstr "%{fn} musí být vyplněno"
 
-#: lib/gettext/rails.rb:270
+#: lib/gettext/rails.rb:284
 msgid "%{fn} is too long (max is %d characters)"
 msgstr "%{fn} je příliš dlouhé (maximum je %d znaků)"
 
-#: lib/gettext/rails.rb:271
+#: lib/gettext/rails.rb:285
 msgid "%{fn} is too short (min is %d characters)"
 msgstr "%{fn} je příliš krátké (minimum je %d znaků)"
 
-#: lib/gettext/rails.rb:272
+#: lib/gettext/rails.rb:286
 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:273
+#: lib/gettext/rails.rb:287
 msgid "%{fn} has already been taken"
 msgstr "%{fn} je již použito"
 
-#: lib/gettext/rails.rb:274
+#: lib/gettext/rails.rb:288
 msgid "%{fn} is not a number"
 msgstr "%{fn} není správné číslo"
 
-#: lib/gettext/rails.rb:337
+#: lib/gettext/rails.rb:354
 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:339
+#: lib/gettext/rails.rb:356
 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.4.0\n"
-"POT-Creation-Date: 2006-04-17 23:02+0900\n"
+"Project-Id-Version: ruby-gettext 1.5.0\n"
+"POT-Creation-Date: 2006-06-04 18:48+0900\n"
 "PO-Revision-Date: 2005-12-17 21:55+0100\n"
 "Last-Translator: Karel Miarka <kajism@yahoo.com>\n"
 "Language-Team: Czech\n"
@@ -95,10 +95,14 @@ msgstr "'%{file}' nebyl nalezen."
 msgid "Ignored '%{file}'. Solve dependencies first."
 msgstr "'%{file}' ignorován. Nejprve vyřešte závislosti."
 
-#: lib/gettext/parser/activerecord.rb:84
+#: lib/gettext/parser/activerecord.rb:85
 msgid "No database is available."
 msgstr "Žádná databáze není k dispozici."
 
+#: lib/gettext/parser/activerecord.rb:116
+msgid "rubygems are not found."
+msgstr ""
+
 #: lib/gettext/parser/glade.rb:75
 msgid "%s is not glade-2.0 format."
 msgstr "%s není ve formátu glade-2.0."

data/po/de/rails.po

@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ruby-gettext 1.4.0\n"
-"POT-Creation-Date: 2006-04-17 23:03+0900\n"
+"Project-Id-Version: ruby-gettext 1.5.0\n"
+"POT-Creation-Date: 2006-06-04 18:48+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:263
+#: lib/gettext/rails.rb:277
 msgid "%{fn} is not included in the list"
 msgstr "%{fn} kommt nicht in der Liste vor"
 
-#: lib/gettext/rails.rb:264
+#: lib/gettext/rails.rb:278
 msgid "%{fn} is reserved"
 msgstr "%{fn} ist reserviert"
 
-#: lib/gettext/rails.rb:265
+#: lib/gettext/rails.rb:279
 msgid "%{fn} is invalid"
 msgstr "%{fn} ist ungültig"
 
-#: lib/gettext/rails.rb:266
+#: lib/gettext/rails.rb:280
 msgid "%{fn} doesn't match confirmation"
 msgstr "%{fn} stimmt nicht mit der Bestätigung überein"
 
-#: lib/gettext/rails.rb:267
+#: lib/gettext/rails.rb:281
 msgid "%{fn} must be accepted"
 msgstr "%{fn} muss akzeptiert werden"
 
-#: lib/gettext/rails.rb:268
+#: lib/gettext/rails.rb:282
 msgid "%{fn} can't be empty"
 msgstr "%{fn} kann nicht leer sein"
 
-#: lib/gettext/rails.rb:269
+#: lib/gettext/rails.rb:283
 msgid "%{fn} can't be blank"
 msgstr "%{fn} kann nicht leer sein"
 
-#: lib/gettext/rails.rb:270
+#: lib/gettext/rails.rb:284
 msgid "%{fn} is too long (max is %d characters)"
 msgstr "%{fn} ist zu lang (max. %d Zeichen)"
 
-#: lib/gettext/rails.rb:271
+#: lib/gettext/rails.rb:285
 msgid "%{fn} is too short (min is %d characters)"
 msgstr "%{fn} ist zu kurz (min. %d Zeichen)"
 
-#: lib/gettext/rails.rb:272
+#: lib/gettext/rails.rb:286
 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:273
+#: lib/gettext/rails.rb:287
 msgid "%{fn} has already been taken"
 msgstr "%{fn} existiert bereits"
 
-#: lib/gettext/rails.rb:274
+#: lib/gettext/rails.rb:288
 msgid "%{fn} is not a number"
 msgstr "%{fn} ist keine Ziffer"
 
-#: lib/gettext/rails.rb:337
+#: lib/gettext/rails.rb:354
 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:339
+#: lib/gettext/rails.rb:356
 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:"