gettext 1.10.0 → 1.90.0

data/lib/locale/base.rb

@@ -0,0 +1,60 @@
+=begin
+  locale/posix.rb 
+
+  Copyright (C) 2002-2007  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: base.rb,v 1.1 2007/11/08 16:57:49 mutoh Exp $
+=end
+
+
+module Locale 
+  # Locale::SystemBase module. This module overrides from other concrete modules. 
+  # This is a low-level class. Application shouldn't use this directly.
+  module SystemBase
+    @@default_locale = Locale::Object.new("C", nil, "UTF-8")
+
+    def default_locale  # :nodoc:
+      @@default_locale
+    end
+
+    # Gets the charset of the locale.
+    # * locale: Locale::Object
+    # * Returns the charset of the locale
+    def get_charset(locale)
+      locale.charset || @@default_locale.charset
+    end    
+
+    # Gets the system locale using setlocale and nl_langinfo. 
+    # * Returns the system locale (Locale::Object).
+    def locale_from_env
+      locale = nil
+      # At least one environment valiables should be set on *nix system.
+      [ENV["LC_ALL"], ENV["LC_MESSAGES"], ENV["LANG"]].each do |loc|
+	if loc != nil and loc.size > 0
+	  locale = Locale::Object.new(loc)
+	  locale.charset ||= get_charset(locale)
+	  break
+	end
+      end
+      locale
+    end
+
+    # Gets the system locale.
+    # * Returns the system locale (Locale::Object)   
+    def system
+      locale_from_env || default_locale
+    end
+
+    # Gets the charset of the locale.
+    # * locale: Locale::Object
+    # * Returns: the charset of the locale
+    def charset
+      # locale parameter is ignored now.
+      system.charset
+    end
+  end
+end
+

data/lib/{gettext/locale_cgi.rb → locale/cgi.rb}

@@ -1,19 +1,22 @@
 =begin
-  locale_cgi.rb 
+  locale/cgi.rb 
 
-  Copyright (C) 2002-2006  Masao Mutoh
+  Copyright (C) 2002-2007  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_cgi.rb,v 1.7 2006/12/14 16:35:57 mutoh Exp $
+  $Id: cgi.rb,v 1.2 2007/11/08 16:44:22 mutoh Exp $
 =end
 
+require 'locale/base'
 
 module Locale
   # Locale::System module for CGI.
   # This is a low-level class. Application shouldn't use this directly.
   module SystemCGI
+    extend SystemBase
+
     @@default_locale = Locale::Object.new("en", nil, "UTF-8")
     @@cgi = nil
 
@@ -23,7 +26,7 @@ module Locale
     def system
       return @@default_locale unless @@cgi
       cgi_ = cgi
-      if ret = cgi_["lang"] and ret.size > 0
+      if cgi_.has_key?("lang") and ret = cgi_["lang"] and ret.size > 0
       elsif ret = cgi_.cookies["lang"][0]
       elsif lang = cgi_.accept_language and lang.size > 0
 	num = lang.index(/;|,/)
@@ -43,12 +46,6 @@ module Locale
       Locale::Object.new(ret, nil, codeset)
     end
 
-    # Gets the charset of the locale.
-    # * locale: Locale::Object
-    # * Returns: the charset of the locale
-    def get_charset(locale)
-      locale.charset ? locale.charset : @@default_locale.charset
-    end
 
     # Sets a CGI object.
     # * cgi_: CGI object
@@ -73,23 +70,6 @@ module Locale
       @@cgi
     end
 
-    # Sets a default locale. en.UTF-8 is the default value if not set.
-    # * locale: Locale::Object object. You can't set nil.
-    # * Returns: self
-    def set_default_locale(locale)
-      raise "Wrong parameter: #{locale}" if locale.nil?
-      @@default_locale = locale
-      self
-    end
-    
-    # Sets a default locale. en.UTF-8 is the default value if not set.
-    # * locale: Locale::Object
-    # * Returns: locale 
-    def default_locale=(locale)
-      set_default_locale(locale)
-      locale
-    end
-
     # Gets the default Locale::Object. 
     # * Returns: the default locale
     def default_locale
@@ -97,5 +77,27 @@ module Locale
     end
   end
   @@locale_system_module = SystemCGI
-end
 
+  module_function
+  # Sets a CGI object.
+  # * cgi_: CGI object
+  # * Returns: self
+  def set_cgi(cgi_)
+    @@locale_system_module.set_cgi(cgi_)
+    self
+  end
+
+  # Sets a CGI object.
+  # * cgi_: CGI object
+  # * Returns: cgi_ 
+  def cgi=(cgi_)
+    set_cgi(cgi_)
+    cgi_
+  end
+
+  # Gets the CGI object. If it is nil, returns new CGI object.
+  # * Returns: the CGI object
+  def cgi
+    @@locale_system_module.cgi
+  end
+end

data/lib/locale/jruby.rb

@@ -0,0 +1,36 @@
+=begin
+  locale/jruby.rb
+
+  Copyright (C) 2007 Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: jruby.rb,v 1.2 2007/11/08 16:44:22 mutoh Exp $
+=end
+
+require 'locale/base'
+require 'java'
+
+module Locale
+  # Locale::SystemJRuby module for JRuby
+  # This is a low-level class. Application shouldn't use this directly.
+  module SystemJRuby
+    extend SystemBase
+
+    if java.lang.System.getProperties['os.name'].downcase =~ /windows/
+      require 'locale/win32_table'
+
+      extend SystemWin32Table
+    end
+
+    module_function
+    def default_locale  #:nodoc:
+      locale = java.util.Locale.getDefault
+      charset = java.nio.charset.Charset.defaultCharset.name
+      Locale::Object.new(locale, nil, charset)
+    end
+  end
+  @@locale_system_module = SystemJRuby
+end
+

data/lib/{gettext/locale_object.rb → locale/object.rb}

@@ -1,18 +1,58 @@
 =begin
-  locale_object.rb - Locale::Object
+  locale/object.rb - Locale::Object
 
-  Copyright (C) 2006  Masao Mutoh
+  Copyright (C) 2006,2007  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_object.rb,v 1.10 2006/09/10 15:08:32 mutoh Exp $
+  $Id: object.rb,v 1.3 2008/01/27 10:58:10 mutoh Exp $
 =end
 
 
 module Locale
   class Object
-    attr_accessor :language, :country, :charset, :script, :variant, :modifier, :orig_str
+    attr_reader :language, :country, :charset, :script, :variant, :modifier, :orig_str
+
+    # Set the language. e.g.) ja, en, fr, ...
+    def language=(val)
+      @language = val
+      clear
+    end
+
+    # Set the country.  e.g.) JP, US, FR, ...
+    def country=(val)
+      @country = val
+      clear
+    end
+
+    # Set the charset.   e.g.) UTF-8, EUC-JP, Shift_JIS
+    def charset=(val)
+      @charset = val
+      clear
+    end
+
+    # Set the script.   e.g.) Latn
+    def script=(val)
+      @script = val
+      clear
+    end
+
+    # Set the variant.   e.g.) Hant
+    def variant=(val)
+      @variant = val
+      clear
+    end
+
+    # Set the modifier.  e.g.) curreny=DDM
+    def modifier=(val)
+      @modifier = val
+      clear
+    end
+
+    # A fallback locale. With GetText, you don't need to set English(en,C,POSIX) 
+    # by yourself because English is used as the last fallback locale anytime.
+    attr_accessor :fallback
 
     # Parse POSIX or RFC 3066 style locale name to Array.
     #
@@ -112,38 +152,56 @@ module Locale
 	self.class.parse(language_or_locale_name)
       @country = country if country
       @charset = charset if charset
+      @fallback = nil
+      clear
+    end
+
+    def clear
+      @posix = nil
+      @iso3066 = nil
+      @win = nil
+      @general = nil
+      @hash = "#{self.class}:#{to_general}.#{@charset}@#{@modifier}".hash
     end
     
     # Returns the locale as POSIX format(but charset is ignored). (e.g.) "ja_JP"
     def to_posix
-      ret = @language
-      ret += "_#{@country}" if @country
-      ret
+      return @posix if @posix
+      @posix = @language.dup
+
+      @posix << "_#{@country}" if @country
+      @posix
     end
 
     # Returns the locale as ISO3066 format. (e.g.) "ja-JP"
     def to_iso3066
-      ret = @language
-      ret += "-#{@country}" if @country
-      ret
+      return @iso3066 if @iso3066
+
+      @iso3066 = @language.dup
+      @iso3066 << "-#{@country}" if @country
+      @iso3066
     end
 
     # Returns the locale as Win32 format. (e.g.) "az-AZ-Latn".
     # 
     # This is used to find the charset from locale table.
     def to_win
-      ret = @language
-      ret += "-#{@country}" if @country
-      ret += "-#{@script}" if @script
-      ret
+      return @win if @win
+
+      @win = @language.dup
+      @win << "-#{@country}" if @country
+      @win << "-#{@script}" if @script
+      @win
     end
 
     # Returns the locale as 'ruby' general format. (e.g.) "az_AZ_Latn"
     def to_general
-      ret = @language
-      ret += "_#{@country}" if @country
-      ret += "_#{@script}" if @script
-      ret      
+      return @general if @general
+ 
+      @general = @language.dup
+      @general << "_#{@country}" if @country
+      @general << "_#{@script}" if @script 
+      @general
     end
 
     # Gets the locale informations as an Array.
@@ -159,11 +217,7 @@ module Locale
     end
 
     def ==(other)  #:nodoc:
-      other != nil and 
-	@language == other.language and @country == other.country and 
-	@charset == other.charset and @script == other.script and 
-	@variant == other.variant and @modifier == other.modifier and
-	@charset == other.charset
+      other != nil and @hash == other.hash
     end
 
     def eql?(other) #:nodoc:
@@ -171,7 +225,7 @@ module Locale
     end
 
     def hash #:nodoc:
-      "#{self.class}:#{to_general}.#{@charset}@#{modifier}".hash
+      @hash
     end
     alias :to_s :to_posix
     alias :to_str :to_posix

data/lib/locale/posix.rb

@@ -0,0 +1,22 @@
+=begin
+  locale/posix.rb 
+
+  Copyright (C) 2002-2007  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: posix.rb,v 1.2 2007/11/08 16:44:22 mutoh Exp $
+=end
+
+require 'locale/base'
+
+module Locale 
+  # Locale::SystemPosix module for Posix OS (Unix)
+  # This is a low-level class. Application shouldn't use this directly.
+  module SystemPosix
+    extend SystemBase
+  end
+  @@locale_system_module = SystemPosix
+end
+

data/lib/locale/win32.rb

@@ -0,0 +1,48 @@
+=begin
+  locale/win32.rb
+
+  Copyright (C) 2002-2008  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: win32.rb,v 1.4 2008/02/02 16:47:40 mutoh Exp $
+=end
+
+require 'locale/base'
+require 'locale/win32_table'
+require 'dl/win32'
+
+module Locale
+  # Locale::SystemWin32 module for win32.
+  # This is a low-level class. Application shouldn't use this directly.
+  module SystemWin32
+    extend SystemBase
+
+    @@default_locale = Locale::Object.new("en", nil, "CP1252")
+    @@win32 = Win32API.new("kernel32.dll", "GetUserDefaultLangID", nil, "i")
+
+    module_function
+
+    # Gets the Win32 charset of the locale. 
+    # * locale: Locale::Object
+    # * Returns the charset of the locale
+    def get_charset(locale)
+      loc = LocaleTable.find{|v| v[1] == locale.to_win}
+      loc = LocaleTable.find{|v| v[1] =~ /^#{locale.language}-/} unless loc
+      loc ? loc[2] : "CP1252"
+    end
+
+    def default_locale  #:nodoc:
+      lang = LocaleTable.assoc(@@win32.call)
+      if lang
+        ret = Locale::Object.new(lang[1], nil, lang[2])
+      else
+        ret = @@default_locale
+      end
+      ret
+    end
+  end
+  @@locale_system_module = SystemWin32
+end
+

data/lib/{gettext/locale_table_win32.rb → locale/win32_table.rb}

@@ -1,16 +1,17 @@
 =begin
   locale_table_win32.rb - Locale table for win32
 
-  Copyright (C) 2002-2006 Masao Mutoh <mutoh@highway.ne.jp>
+  Copyright (C) 2002-2008 Masao Mutoh <mutoh@highway.ne.jp>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_table_win32.rb,v 1.5 2006/06/11 15:36:20 mutoh Exp $
+  $Id: win32_table.rb,v 1.3 2008/02/02 16:47:40 mutoh Exp $
 =end
 
 module Locale
   module SystemWin32
+
     #LangID, locale name, code page
     LocaleTable = [
         [0x0000, "en", "CP1252"],

data/po/es/rails.po

@@ -51,9 +51,8 @@ msgid "less than a minute"
 msgstr "menos de un minuto"
 
 #: lib/gettext/rails.rb:383
-#, fuzzy
 msgid "about 1 month"
-msgstr "cerca de 1 hora"
+msgstr "cerca de 1 minuto"
 
 #: lib/gettext/rails.rb:384
 #, fuzzy