gettext 2.0.4 → 2.1.0

data/lib/gettext/core_ext/string.rb

@@ -4,7 +4,7 @@
   Copyright (C) 2005-2009 Masao Mutoh
  
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 =end
 
 # Extension for String class. This feature is included in Ruby 1.9 or later but not occur TypeError.
@@ -22,8 +22,8 @@ class String
 
   PERCENT_MATCH_RE = Regexp.union(
       /%%/,
-      /%\{(\w+)\}/,
-      /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/
+      /%\{(.+?)\}/,
+      /%<(.+?)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/
   )
 
   # call-seq:

data/lib/gettext/parser/erb.rb

@@ -1,54 +1,3 @@
-=begin
-  parser/erb.rb - parser for ERB
+warn "DEPRECATED: Use 'gettext/tools/parser/erb' instead."
 
-  Copyright (C) 2005  Masao Mutoh
- 
-  You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  $Id: erb.rb,v 1.5 2007/08/01 01:39:14 mutoh Exp $
-=end
-
-require 'erb'
-require 'gettext/parser/ruby.rb'
-
-module GetText
-  module ErbParser
-    extend self
-
-    @config = {
-      :extnames => ['.rhtml', '.erb']
-    }
-
-    # 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"].
-    def init(config)
-      config.each{|k, v|
-	@config[k] = v
-      }
-    end
-
-    def parse(file, targets = []) # :nodoc:
-      src = ERB.new(IO.readlines(file).join).src
-      # Remove magic comment prepended by erb in Ruby 1.9.
-      src.sub!(/\A#.*?coding[:=].*?\n/, '') if src.respond_to?(:encode)
-      erb = src.split(/$/)
-      RubyParser.parse_lines(file, erb, targets)
-    end
-
-    def target?(file) # :nodoc:
-      @config[:extnames].each do |v|
-	return true if File.extname(file) == v
-      end
-      false
-    end
-  end
-end
-
-if __FILE__ == $0
-  # ex) ruby glade.rhtml foo.rhtml  bar.rhtml
-  ARGV.each do |file|
-    p GetText::ErbParser.parse(file)
-  end
-end
+require 'gettext/tools/parser/erb'

data/lib/gettext/parser/glade.rb

@@ -1,100 +1,3 @@
-=begin
-  parser/glade.rb - parser for Glade-2
+warn "DEPRECATED: Use 'gettext/tools/parser/glade' instead."
 
-  Copyright (C) 2004,2005  Masao Mutoh
- 
-  You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  $Id: glade.rb,v 1.5 2006/06/11 15:36:20 mutoh Exp $
-=end
-
-require 'cgi'
-require 'gettext'
-
-module GetText
-  module GladeParser
-    extend GetText
-    extend self
-    
-    bindtextdomain("rgettext")
-
-    TARGET1 = /<property.*translatable="yes">(.*)/
-    TARGET2 = /(.*)<\/property>/
-
-    def parse(file, targets = []) # :nodoc: 
-      lines = IO.readlines(file)
-      parse_lines(file, lines, targets)
-    end
-
-    #from ary of lines.
-    def parse_lines(file, lines, targets) # :nodoc:
-      cnt = 0
-      target = false
-      line_no = 0
-      val = nil
-      
-      loop do 
-        line = lines.shift
-        break unless line
-        
-        cnt += 1
-        if TARGET1 =~ line
-          line_no = cnt
-          val = $1 + "\n"
-          target = true
-          if TARGET2 =~ $1
-            val = $1
-            add_target(val, file, line_no, targets)
-            val = nil
-            target = false
-          end
-        elsif target
-          if TARGET2 =~ line
-            val << $1
-            add_target(val, file, line_no, targets)
-            val = nil
-            target = false
-          else
-            val << line
-          end
-        end
-      end
-      targets
-    end
-
-    XML_RE = /<\?xml/ 
-    GLADE_RE = /glade-2.0.dtd/
- 
-    def target?(file) # :nodoc:
-      data = IO.readlines(file)
-      if XML_RE =~ data[0] and GLADE_RE =~ data[1]
-	true
-      else
-	if File.extname(file) == '.glade'
-	  raise _("`%{file}' is not glade-2.0 format.") % {:file => file}
-	end
-	false
-      end
-    end
-
-    def add_target(val, file, line_no, targets) # :nodoc:
-      return unless val.size > 0
-      assoc_data = targets.assoc(val)
-      val = CGI.unescapeHTML(val)
-      if assoc_data 
-        targets[targets.index(assoc_data)] = assoc_data << "#{file}:#{line_no}"
-      else
-        targets << [val.gsub(/\n/, '\n'), "#{file}:#{line_no}"]
-      end
-      targets
-    end
-  end
-end
-
-if __FILE__ == $0
-  # ex) ruby glade.rb foo.glade  bar.glade
-  ARGV.each do |file|
-    p GetText::GladeParser.parse(file)
-  end
-end
+require 'gettext/tools/parser/glade'

data/lib/gettext/parser/ruby.rb

@@ -9,11 +9,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: ruby.rb,v 1.13 2008/12/01 14:30:30 mutoh Exp $
 =end
 
 require 'irb/ruby-lex.rb'
 require 'stringio'
+warn "DEPRECATED: Use 'gettext/tools/parser/ruby' instead."
 
 class RubyLexX < RubyLex  # :nodoc: all
   # Parser#parse resemlbes RubyLex#lex
@@ -63,10 +63,12 @@ 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_']
+    unless defined? ID
+      ID = ['gettext', '_', 'N_', 'sgettext', 's_']
+      PLURAL_ID = ['ngettext', 'n_', 'Nn_', 'ns_', 'nsgettext']
+      MSGCTXT_ID = ['pgettext', 'p_']
+      MSGCTXT_PLURAL_ID = ['npgettext', 'np_']
+    end
 
     def parse(file, targets = [])  # :nodoc:
       lines = IO.readlines(file)

data/lib/gettext/{class_info.rb → runtime/class_info.rb}

@@ -9,9 +9,10 @@ module GetText
     include Locale::Util::Memoizable
 
     # normalize the class name
+    # klass should kind of the class, not object.
     def normalize_class(klass)
       ret = (klass.kind_of? Module) ? klass : klass.class
-      if ret.name.to_s =~ /^\#<|^$/ or ret == GetText
+      if ret.name =~ /^\#<|^$/ or ret == GetText
         ret = Object
       end
       ret

data/lib/gettext/{locale_path.rb → runtime/locale_path.rb}

@@ -4,7 +4,7 @@
   Copyright (C) 2001-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 
 =end
 
@@ -82,7 +82,6 @@ module GetText
         path_rules = ["#{topdir}/%{lang}/LC_MESSAGES/%{name}.mo", "#{topdir}/%{lang}/%{name}.mo"]
       else
         path_rules = self.class.default_path_rules
-
       end
 
       @locale_paths = {}

data/lib/gettext/{textdomain.rb → runtime/textdomain.rb}

@@ -8,14 +8,12 @@
       Masao Mutoh       <mutomasa at gmail.com>
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  $Id$
+  license terms as Ruby or LGPL.
 =end
 
 require 'gettext/core_ext/string'
-require 'gettext/mofile'
-require 'gettext/locale_path'
+require 'gettext/runtime/mofile'
+require 'gettext/runtime/locale_path'
 
 module GetText
   # GetText::TextDomain class manages mo-files of a textdomain.

data/lib/gettext/{textdomain_group.rb → runtime/textdomain_group.rb}

@@ -4,7 +4,7 @@
   Copyright (C) 2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 
 =end
 

data/lib/gettext/{textdomain_manager.rb → runtime/textdomain_manager.rb}

@@ -4,13 +4,13 @@
   Copyright (C) 2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 
 =end
 
-require 'gettext/class_info'
-require 'gettext/textdomain'
-require 'gettext/textdomain_group'
+require 'gettext/runtime/class_info'
+require 'gettext/runtime/textdomain'
+require 'gettext/runtime/textdomain_group'
 
 module GetText
 
@@ -67,7 +67,6 @@ module GetText
 
       charset = options[:output_charset] || self.output_charset
       textdomain = create_or_find_textdomain(domainname,options[:path],charset)
-
       target_klass = ClassInfo.normalize_class(klass)
       create_or_find_textdomain_group(target_klass).add(textdomain)
       @@gettext_classes << target_klass unless @@gettext_classes.include? target_klass
@@ -95,6 +94,7 @@ module GetText
     # * Returns: the localized text by msgid. If there are no localized text, 
     #   it returns a last part of msgid separeted "div".
     def translate_singluar_message(klass, msgid, div = nil)
+      klass = ClassInfo.normalize_class(klass)
       key = [Locale.current, klass, msgid, div].hash
       msg = @@singular_message_cache[key]
       return msg if msg and @@cached
@@ -137,6 +137,7 @@ module GetText
     # * n: a number used to determine the plural form.
     # * div: the separator. Default is "|".
     def translate_plural_message(klass, arg1, arg2, arg3 = "|", arg4 = "|")
+      klass = ClassInfo.normalize_class(klass)
       # parse arguments
       if arg1.kind_of?(Array)
         msgid = arg1[0]
@@ -184,6 +185,11 @@ module GetText
       @@textdomain_pool = {}
       @@textdomain_group_pool = {}
       @@gettext_classes = []
+      clear_caches
+    end
+
+    # for testing.
+    def clear_caches
       @@singular_message_cache = {}
       @@plural_message_cache = {}
     end

data/lib/gettext/tools.rb

@@ -4,7 +4,7 @@
   Copyright (C) 2005-2008 Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 =end
 
 require 'rbconfig'
@@ -16,7 +16,7 @@ end
 
 require 'gettext/tools/rgettext'
 require 'gettext/tools/rmsgfmt'
-require 'gettext/mofile'
+require 'gettext/runtime/mofile'
 require 'fileutils'
 
 module GetText

data/lib/gettext/tools/parser/erb.rb

@@ -0,0 +1,52 @@
+=begin
+  parser/erb.rb - parser for ERB
+
+  Copyright (C) 2005-2009  Masao Mutoh
+ 
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby or LGPL.
+=end
+
+require 'erb'
+require 'gettext/tools/parser/ruby'
+
+module GetText
+  module ErbParser
+    extend self
+
+    @config = {
+      :extnames => ['.rhtml', '.erb']
+    }
+
+    # 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"].
+    def init(config)
+      config.each{|k, v|
+	@config[k] = v
+      }
+    end
+
+    def parse(file, targets = []) # :nodoc:
+      src = ERB.new(IO.readlines(file).join).src
+      # Remove magic comment prepended by erb in Ruby 1.9.
+      src.sub!(/\A#.*?coding[:=].*?\n/, '') if src.respond_to?(:encode)
+      erb = src.split(/$/)
+      RubyParser.parse_lines(file, erb, targets)
+    end
+
+    def target?(file) # :nodoc:
+      @config[:extnames].each do |v|
+	return true if File.extname(file) == v
+      end
+      false
+    end
+  end
+end
+
+if __FILE__ == $0
+  # ex) ruby glade.rhtml foo.rhtml  bar.rhtml
+  ARGV.each do |file|
+    p GetText::ErbParser.parse(file)
+  end
+end

data/lib/gettext/tools/parser/glade.rb

@@ -0,0 +1,98 @@
+=begin
+  parser/glade.rb - parser for Glade-2
+
+  Copyright (C) 2004,2005  Masao Mutoh
+ 
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby or LGPL.
+=end
+
+require 'cgi'
+require 'gettext'
+
+module GetText
+  module GladeParser
+    extend GetText
+    extend self
+    
+    bindtextdomain("rgettext")
+
+    TARGET1 = /<property.*translatable="yes">(.*)/
+    TARGET2 = /(.*)<\/property>/
+
+    def parse(file, targets = []) # :nodoc: 
+      lines = IO.readlines(file)
+      parse_lines(file, lines, targets)
+    end
+
+    #from ary of lines.
+    def parse_lines(file, lines, targets) # :nodoc:
+      cnt = 0
+      target = false
+      line_no = 0
+      val = nil
+      
+      loop do 
+        line = lines.shift
+        break unless line
+        
+        cnt += 1
+        if TARGET1 =~ line
+          line_no = cnt
+          val = $1 + "\n"
+          target = true
+          if TARGET2 =~ $1
+            val = $1
+            add_target(val, file, line_no, targets)
+            val = nil
+            target = false
+          end
+        elsif target
+          if TARGET2 =~ line
+            val << $1
+            add_target(val, file, line_no, targets)
+            val = nil
+            target = false
+          else
+            val << line
+          end
+        end
+      end
+      targets
+    end
+
+    XML_RE = /<\?xml/ 
+    GLADE_RE = /glade-2.0.dtd/
+ 
+    def target?(file) # :nodoc:
+      data = IO.readlines(file)
+      if XML_RE =~ data[0] and GLADE_RE =~ data[1]
+	true
+      else
+	if File.extname(file) == '.glade'
+	  raise _("`%{file}' is not glade-2.0 format.") % {:file => file}
+	end
+	false
+      end
+    end
+
+    def add_target(val, file, line_no, targets) # :nodoc:
+      return unless val.size > 0
+      assoc_data = targets.assoc(val)
+      val = CGI.unescapeHTML(val)
+      if assoc_data 
+        targets[targets.index(assoc_data)] = assoc_data << "#{file}:#{line_no}"
+      else
+        targets << [val.gsub(/\n/, '\n'), "#{file}:#{line_no}"]
+      end
+      targets
+    end
+  end
+end
+
+if __FILE__ == $0
+  # ex) ruby glade.rb foo.glade  bar.glade
+  ARGV.each do |file|
+    p GetText::GladeParser.parse(file)
+  end
+end