gettext 1.93.0 → 2.0.0

data/lib/gettext/parser/erb.rb

@@ -14,11 +14,12 @@ require 'gettext/parser/ruby.rb'
 
 module GetText
   module ErbParser
+    extend self
+
     @config = {
       :extnames => ['.rhtml', '.erb']
     }
 
-    module_function
     # Sets some preferences to parse ERB files.
     # * config: a Hash of the config. It can takes some values below:
     #   * :extnames: An Array of target files extension. Default is [".rhtml"].

data/lib/gettext/parser/glade.rb

@@ -15,12 +15,13 @@ require 'gettext'
 module GetText
   module GladeParser
     extend GetText
+    extend self
+    
     bindtextdomain("rgettext")
 
     TARGET1 = /<property.*translatable="yes">(.*)/
     TARGET2 = /(.*)<\/property>/
 
-    module_function
     def parse(file, targets = []) # :nodoc: 
       lines = IO.readlines(file)
       parse_lines(file, lines, targets)

data/lib/gettext/parser/ruby.rb

@@ -9,7 +9,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: ruby.rb,v 1.12 2008/08/06 17:35:52 mutoh Exp $
+  $Id: ruby.rb,v 1.13 2008/12/01 14:30:30 mutoh Exp $
 =end
 
 require 'irb/ruby-lex.rb'
@@ -32,11 +32,11 @@ class RubyLexX < RubyLex  # :nodoc: all
         if @here_header
           s = s.sub(/\A.*?\n/, '').sub(/^.*\n\Z/, '')
         else
-	  begin
-	    s = eval(s)
-	  rescue Exception
-	    # Do nothing.
-	  end
+          begin
+            s = eval(s)
+          rescue Exception
+            # Do nothing.
+          end
         end
         
         tk.value = s
@@ -61,12 +61,13 @@ end
 
 module GetText
   module RubyParser
+    extend self
+    
     ID = ['gettext', '_', 'N_', 'sgettext', 's_']
     PLURAL_ID = ['ngettext', 'n_', 'Nn_', 'ns_', 'nsgettext']
     MSGCTXT_ID = ['pgettext', 'p_']
     MSGCTXT_PLURAL_ID = ['npgettext', 'np_']
 
-    module_function
     def parse(file, targets = [])  # :nodoc:
       lines = IO.readlines(file)
       parse_lines(file, lines, targets)
@@ -84,64 +85,67 @@ module GetText
       line_no = nil
       tk = nil
       begin
-	rl.parse do |tk|
-	  case tk
-	  when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT
-	    if ID.include?(tk.name)
-	      target = :normal
-	    elsif PLURAL_ID.include?(tk.name)
-	      target = :plural
-	    elsif MSGCTXT_ID.include?(tk.name)
-	      target = :msgctxt
-	    elsif MSGCTXT_PLURAL_ID.include?(tk.name)
-	      target = :msgctxt_plural
-	    else
-	      target = nil
-	    end
-	    line_no = tk.line_no.to_s
-	  when RubyToken::TkSTRING
-	    if target
-	      if msgid
-		msgid += tk.value
-	      else
-		msgid = tk.value 
-	      end
-	    end
-	  when RubyToken::TkPLUS, RubyToken::TkNL
-	    #do nothing
-	  when RubyToken::TkCOMMA
-	    if msgid
-	      if target == :plural
-	        msgid += "\000"
-	      elsif target == :msgctxt
-	        msgid += "\004"
-	      elsif target == :msgctxt_plural
-	        msgid += "\004"
-		target = :plural
-	      else   
-       	        target = :normal
-	      end
-	    end
-	  else
-	    if msgid
-	      key_existed = targets.assoc(msgid.gsub(/\n/, '\n'))
-	      if key_existed 
-		targets[targets.index(key_existed)] = key_existed <<
-		  file_name + ":" + line_no
-	      else
-		targets << [msgid.gsub(/\n/, '\n'), file_name + ":" + line_no]
-	      end
-	      msgid = nil
-	      target = nil
-	    end
-	  end
-	  targets
-	end
+        rl.parse do |tk|
+          case tk
+          when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT
+            if ID.include?(tk.name)
+              target = :normal
+            elsif PLURAL_ID.include?(tk.name)
+              target = :plural
+            elsif MSGCTXT_ID.include?(tk.name)
+              target = :msgctxt
+            elsif MSGCTXT_PLURAL_ID.include?(tk.name)
+              target = :msgctxt_plural
+            else
+              target = nil
+            end
+            line_no = tk.line_no.to_s
+          when RubyToken::TkSTRING
+            if target
+              if msgid
+                msgid += tk.value
+              else
+                msgid = tk.value
+              end
+            end
+          when RubyToken::TkPLUS, RubyToken::TkNL
+            #do nothing
+          when RubyToken::TkCOMMA
+            if msgid
+              case target
+              when :plural
+                msgid += "\000"
+                target = :normal
+              when :msgctxt
+                msgid += "\004"
+                target = :normal
+              when :msgctxt_plural
+                msgid += "\004"
+                target = :plural
+              else
+                target = :normal
+              end
+            end
+          else
+            if msgid
+              key_existed = targets.assoc(msgid.gsub(/\n/, '\n'))
+              if key_existed
+                targets[targets.index(key_existed)] = key_existed <<
+                file_name + ":" + line_no
+              else
+                targets << [msgid.gsub(/\n/, '\n'), file_name + ":" + line_no]
+              end
+              msgid = nil
+              target = nil
+            end
+          end
+          targets
+        end
       rescue
-	$stderr.print "\n\nError: #{$!.inspect} "
+        $stderr.print "\n\nError: #{$!.inspect} "
         $stderr.print " in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}" if tk
         $stderr.print "\n"
-	exit
+        exit 1
       end
       targets
     end
@@ -149,7 +153,6 @@ module GetText
     def target?(file)  # :nodoc:
       true # always true, as default parser.
     end
-    
   end 
 end
 

data/lib/gettext/poparser.rb

@@ -1,7 +1,7 @@
 =begin
   poparser.rb - Generate a .mo
 
-  Copyright (C) 2003-2005 Masao Mutoh <mutoh@highway.ne.jp>
+  Copyright (C) 2003-2009 Masao Mutoh <mutomasa at gmail.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..ida6d91c8151', 'src/poparser.ry', 108
+module_eval <<'..end src/poparser.ry modeval..id7a99570e05', 'src/poparser.ry', 108
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -111,7 +111,7 @@ module_eval <<'..end src/poparser.ry modeval..ida6d91c8151', 'src/poparser.ry',
   end 
 
 
-..end src/poparser.ry modeval..ida6d91c8151
+..end src/poparser.ry modeval..id7a99570e05
 
 ##### racc 1.4.5 generates ###
 

data/lib/gettext/textdomain.rb

@@ -1,131 +1,100 @@
 =begin
   textdomain.rb - GetText::Textdomain
 
-  Copyright (C) 2001-2008  Masao Mutoh
+  Copyright (C) 2001-2009  Masao Mutoh
   Copyright (C) 2001-2003  Masahiro Sakai
 
       Masahiro Sakai    <s01397ms@sfc.keio.ac.jp>
-      Masao Mutoh       <mutoh@highway.ne.jp>
+      Masao Mutoh       <mutomasa at gmail.com>
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: textdomain.rb,v 1.24 2008/03/31 06:26:47 mutoh Exp $
+  $Id$
 =end
 
-require 'gettext/string'
-require 'rbconfig'
+require 'gettext/core_ext/string'
+require 'gettext/mofile'
+require 'gettext/locale_path'
 
 module GetText
-  # GetText::TextDomain class manages mo-files of a textdomain. 
-  # 
+  # GetText::TextDomain class manages mo-files of a textdomain.
+  #
   # Usually, you don't need to use this class directly.
   #
   # Notice: This class is unstable. APIs will be changed.
   class TextDomain
 
-    GEM_PATH_RE = /(.*)\/lib$/  # :nodoc:
-
-    attr_reader :current_locale
-    attr_reader :locale_paths
-    attr_reader :current_mo
+    attr_reader :output_charset
+    attr_reader :mofiles
     attr_reader :name
 
-    @@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
+    @@cached = ! $DEBUG
+    # Cache the mo-file or not.
+    # Default is true. If $DEBUG is set then false.
+    def self.cached?
+      @@cached
     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
+    # Set to cache the mo-file or not.
+    # * val: true if cached, otherwise false.
+    def self.cached=(val)
+      @@cached = 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['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.
-    # * path: a new locale path. (e.g.) "/usr/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
+    # * path: a new locale path. (e.g.) "/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
     #   ('locale' => "ja_JP", 'name' => "textdomain")
     # * Returns: the new DEFAULT_LOCALE_PATHS
     def self.add_default_locale_path(path)
-      DEFAULT_LOCALE_PATHS.unshift(path)
+      warn "Deprecated. Use GetText::LocalePath.add_default_rule instead."
+      LocalePath.add_default_rule(path)
     end
 
     # Creates a new GetText::TextDomain.
     # * name: the textdomain name.
-    # * topdir: the locale path ("%{topdir}/%{locale}/LC_MESSAGES/%{name}.mo").
-    # * locale: the Locale::Object or nil.
+    # * topdir: the locale path ("%{topdir}/%{lang}/LC_MESSAGES/%{name}.mo") or nil.
+    # * output_charset: output charset.
     # * Returns: a newly created GetText::TextDomain object.
-    def initialize(name, topdir = nil, locale = nil)
-      @name, @topdir = name, topdir
-      @search_files = Array.new
-
-      @locale_paths = []
-      if ENV["GETTEXT_PATH"]
-        ENV["GETTEXT_PATH"].split(/,/).each {|i| 
-      @locale_paths += ["#{i}/%{locale}/LC_MESSAGES/%{name}.mo", "#{i}/%{locale}/%{name}.mo"]
-    }
-      elsif @topdir
-        @locale_paths += ["#{@topdir}/%{locale}/LC_MESSAGES/%{name}.mo", "#{@topdir}/%{locale}/%{name}.mo"]
-      end
+    def initialize(name, topdir = nil, output_charset = nil)
+      @name, @output_charset = name, output_charset
 
-      unless @topdir
-    @locale_paths += DEFAULT_LOCALE_PATHS
-    
-    if defined? Gem
-      $:.each do |path|
-        if GEM_PATH_RE =~ path
-          @locale_paths += [
-        "#{$1}/data/locale/%{locale}/LC_MESSAGES/%{name}.mo", 
-        "#{$1}/data/locale/%{locale}/%{name}.mo", 
-        "#{$1}/locale/%{locale}/%{name}.mo"]
-        end
-      end
-    end
-      end
-   
-      @mofiles = Hash.new
-      set_locale(locale)
+      @locale_path = LocalePath.new(@name, topdir)
+      @mofiles = {}
     end
     
-    # Sets a new Locale::Object.
-    # * locale: a Locale::Object
-    # * reload: true if the mo-file is reloaded forcely
-    # * Returns: self
-    def set_locale(locale, reload = false)
-      @current_locale = locale
-      load_mo(reload)
-      self
-    end
-
-    # Gets the translated string.
+    # Translates the translated string.
+    # * lang: Locale::Tag::Simple's subclass.
     # * msgid: the original message.
-    # * Returns: the translated string or nil if not found.
-    def gettext(msgid)
+    # * Returns: the translated string or nil.
+    def translate_singluar_message(lang, msgid)
       return "" if msgid == "" or msgid.nil?
-      return nil unless @current_mo
-      if @current_mo[msgid] and (@current_mo[msgid].size > 0)
-        @current_mo[msgid]
+
+      lang_key = lang.to_s
+
+      mofile = nil
+      if self.class.cached?
+        mofile = @mofiles[lang_key]
+      end
+      unless mofile
+        mofile = load_mo(lang)
+      end
+     
+      if (! mofile) or (mofile ==:empty)
+        return nil
+      end
+
+      msgstr = mofile[msgid]
+      if msgstr and (msgstr.size > 0)
+        msgstr
       elsif msgid.include?("\000")
+        # Check "aaa\000bbb" and show warning but return the singluar part.
         ret = nil
         msgid_single = msgid.split("\000")[0]
-        @current_mo.each{|key, val| 
+        mofile.each{|key, val| 
           if key =~ /^#{Regexp.quote(msgid_single)}\000/
-              # Usually, this is not caused to make po-files from rgettext.
-              warn %Q[Warning: n_("#{msgid_single}", "#{msgid.split("\000")[1]}") and n_("#{key.gsub(/\000/, '", "')}") are duplicated.] if $DEBUG
+            # Usually, this is not caused to make po-files from rgettext.
+            warn %Q[Warning: n_("#{msgid_single}", "#{msgid.split("\000")[1]}") and n_("#{key.gsub(/\000/, '", "')}") are duplicated.]
             ret = val
             break
           end
@@ -133,9 +102,9 @@ module GetText
         ret
       else
         ret = nil
-        @current_mo.each{|key, val| 
+        mofile.each{|key, val| 
           if key =~ /^#{Regexp.quote(msgid)}\000/
-              ret = val.split("\000")[0]
+            ret = val.split("\000")[0]
             break
           end
         }
@@ -143,45 +112,21 @@ module GetText
       end
     end
 
-    # Gets the translated string. (Deprecated. Don't call this method directly)
-    # * msgid: the original message(single).
-    # * msgid: the original message(plural).
-    # * n: the number
-    # * 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
-    nil  # do nothing.
-      elsif msg == key
-    msg = n == 1 ? msgid : msgid_plural
-      elsif msg.include?("\000")
-        ary = msg.split("\000")
-        if @current_mo
-          plural = eval(@current_mo.plural)
-          if plural.kind_of?(Numeric)
-            msg = ary[plural]
-          else
-            msg = plural ? ary[1] : ary[0]
-          end
-        else
-          msg = n == 1 ? ary[0] : ary[1]
-        end
-      end
-      msg
-    end
-
-    def ngettext_data(msgid, msgid_plural)   #:nodoc:
+    # Translates the translated string.
+    # * lang: Locale::Tag::Simple's subclass.
+    # * msgid: the original message.
+    # * msgid_plural: the original message(plural).
+    # * Returns: the translated string as an Array ([[msgstr1, msgstr2, ...], cond]) or nil.
+    def translate_plural_message(lang, msgid, msgid_plural)   #:nodoc:
       key = msgid + "\000" + msgid_plural
-      msg = gettext(key)
+      msg = translate_singluar_message(lang, key)
       ret = nil
       if ! msg
         ret = nil
-      elsif msg == key
-        ret = nil
       elsif msg.include?("\000")
         # [[msgstr[0], msgstr[1], msgstr[2],...], cond]
-        cond = @current_mo ? @current_mo.plural : nil
+        mofile = @mofiles[lang.to_posix.to_s]
+        cond = (mofile and mofile != :empty) ? mofile.plural : nil
         cond ||= "n != 1"
         ret = [msg.split("\000"), cond]
       else
@@ -190,62 +135,43 @@ module GetText
       ret
     end
 
-    # Compare this object has the same name, topdir and locale.
-    # * name: the textdomain name
-    # * topdir: the top directory of mo files or nil.
-    # * locale: the Locale::Object or nil.
-    # * Returns: true if this object has all of the same name, topdir and locale. 
-    def same_property?(name, topdir, locale)
-      @name == name and @topdir == topdir and @current_locale == locale
+    # Clear cached mofiles.
+    def clear
+      @mofiles = {}
     end
-    
+
+    # Set output_charset.
+    # * charset: output charset.
+    def output_charset=(charset)
+      @output_charset = charset
+      clear
+    end
+
     private
-    def load_mo(reload = false)
-      @current_mo = nil
-      return nil unless @current_locale
-
-      unless reload
-        @current_mo = @mofiles[@current_locale]
-        if @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
+    # Load a mo-file from the file.
+    # lang is the subclass of Locale::Tag::Simple.
+    def load_mo(lang)
+      lang = lang.to_posix unless lang.kind_of? Locale::Tag::Posix
+      lang_key = lang.to_s
+
+      mofile = @mofiles[lang_key]
+      if mofile
+        if mofile == :empty
+          return :empty
+        elsif ! self.class.cached?
+          mofile.update!
         end
+        return mofile
       end
-      locales = [@current_locale.orig_str, @current_locale.to_posix, @current_locale.language].uniq
-      matched = false
-      @locale_paths.each do |dir|
-        locales.each{|locale|
-          fname = dir % {:locale => locale, :name => @name}
-          if $DEBUG
-            @search_files << fname unless @search_files.include?(fname)
-          end
-          if File.exist?(fname)
-            $stderr.puts "GetText::TextDomain#load_mo: mo file is #{fname}" if $DEBUG
-            @current_mo = MOFile.open(fname, @current_locale.charset)
-            @mofiles[@current_locale] = @current_mo
-            matched = true
-            break
-          end
-        }
-        break if matched
-      end
-      unless @current_mo
-        @mofiles[@current_locale] = :empty
-        if $DEBUG
-          $stderr.puts "MO file is not found in"
-          @search_files.each do |v|
-            $stderr.puts "  #{v}"
-          end
-        end
+
+      path = @locale_path.current_path(lang)
+
+      if path
+        charset = @output_charset || lang.charset || Locale.charset || "UTF-8"
+        @mofiles[lang_key] = MOFile.open(path, charset)
+      else
+        @mofiles[lang_key] = :empty
       end
-      @current_mo
     end
   end
 end