gettext 2.1.0 → 2.2.0

data/lib/gettext/runtime/textdomain_group.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 =begin
   gettext/textdomain_group - GetText::TextDomainGroup class
 
@@ -12,7 +14,7 @@ module GetText
 
   class TextDomainGroup
     attr_reader :textdomains
-    
+
     def initialize
       @textdomains = []
     end

data/lib/gettext/runtime/textdomain_manager.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 =begin
   gettext/textdomain_manager - GetText::TextDomainManager class
 
@@ -27,13 +29,13 @@ module GetText
     @@cached = ! $DEBUG
 
     extend self
-    
+
     # Find textdomain by name
     def textdomain_pool(domainname)
       @@textdomain_pool[domainname]
     end
 
-    # Set the value whether cache messages or not. 
+    # Set the value whether cache messages or not.
     # true to cache messages, otherwise false.
     #
     # Default is true. If $DEBUG is false, messages are not checked even if
@@ -42,7 +44,7 @@ module GetText
       @@cached = val
       TextDomain.cached = val
     end
-    
+
     # Return the cached value.
     def cached?
       TextDomain.cached?
@@ -50,9 +52,9 @@ module GetText
 
     # Gets the output charset.
     def output_charset
-      @@output_charset 
+      @@output_charset
     end
-    
+
     # Sets the output charset.The program can have a output charset.
     def output_charset=(charset)
       @@output_charset = charset
@@ -60,7 +62,7 @@ module GetText
         textdomain.output_charset = charset
       end
     end
-    
+
     # bind textdomain to the class.
     def bind_to(klass, domainname, options = {})
       warn "Bind the domain '#{domainname}' to '#{klass}'. " if $DEBUG
@@ -70,10 +72,10 @@ module GetText
       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
-      
+
       textdomain
     end
-    
+
     def each_textdomains(klass) #:nodoc:
       lang = Locale.candidates[0]
       ClassInfo.related_classes(klass, @@gettext_classes).each do |target|
@@ -86,12 +88,12 @@ module GetText
       end
     end
 
-    # Translates msgid, but if there are no localized text, 
+    # Translates msgid, but if there are no localized text,
     # it returns a last part of msgid separeted "div" or whole of the msgid with no "div".
     #
     # * msgid: the message id.
     # * div: separator or nil.
-    # * Returns: the localized text by msgid. If there are no localized text, 
+    # * 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)
@@ -103,7 +105,7 @@ module GetText
         msg = textdomain.translate_singluar_message(lang, msgid)
         break if msg
       end
-      
+
       # If not found, return msgid.
       msg ||= msgid
       if div and msg == msgid
@@ -113,15 +115,15 @@ module GetText
       end
       @@singular_message_cache[key] = msg
     end
-    
-    # This function is similar to the get_singluar_message function 
-    # as it finds the message catalogs in the same way. 
+
+    # This function is similar to the get_singluar_message function
+    # as it finds the message catalogs in the same way.
     # But it takes two extra arguments for plural form.
-    # The msgid parameter must contain the singular form of the string to be converted. 
-    # It is also used as the key for the search in the catalog. 
-    # The msgid_plural parameter is the plural form. 
-    # The parameter n is used to determine the plural form. 
-    # If no message catalog is found msgid1 is returned if n == 1, otherwise msgid2. 
+    # The msgid parameter must contain the singular form of the string to be converted.
+    # It is also used as the key for the search in the catalog.
+    # The msgid_plural parameter is the plural form.
+    # The parameter n is used to determine the plural form.
+    # If no message catalog is found msgid1 is returned if n == 1, otherwise msgid2.
     # And if msgid includes "div", it returns a last part of msgid separeted "div".
     #
     # * msgid: the singular form with "div". (e.g. "Special|An apple", "An apple")
@@ -144,12 +146,13 @@ module GetText
         msgid_plural = arg1[1]
         n = arg2
         if arg3 and arg3.kind_of? Numeric
-          raise ArgumentError, _("3rd parmeter is wrong: value = %{number}") % {:number => arg3}
+          raise ArgumentError, _("ngettext: 3rd parmeter is wrong: value = %{number}") % {:number => arg3}
         end
         div = arg3
       else
         msgid = arg1
         msgid_plural = arg2
+        raise ArgumentError, _("ngettext: 3rd parameter should be a number, not nil.")  unless arg3
         n = arg3
         div = arg4
       end
@@ -163,16 +166,16 @@ module GetText
           msgs = textdomain.translate_plural_message(lang, msgid, msgid_plural)
           break if msgs
         end
-        
+
         msgs = [[msgid, msgid_plural], TextDomain::DEFAULT_PLURAL_CALC] unless msgs
-        
+
         msgstrs = msgs[0]
         if div and msgstrs[0] == msgid and index = msgstrs[0].rindex(div)
           msgstrs[0] = msgstrs[0][(index + 1)..-1]
         end
         @@plural_message_cache[key] = msgs
       end
-      
+
       # Return the singular or plural message.
       msgstrs = msgs[0]
       plural = msgs[1].call(n)
@@ -197,14 +200,14 @@ module GetText
     def create_or_find_textdomain_group(klass) #:nodoc:
       group = @@textdomain_group_pool[klass]
       return group if group
-      
+
       @@textdomain_group_pool[klass] = TextDomainGroup.new
     end
-    
+
     def create_or_find_textdomain(name, path, charset)#:nodoc:
       textdomain = @@textdomain_pool[name]
       return textdomain if textdomain
-      
+
       @@textdomain_pool[name] = TextDomain.new(name, path, charset)
     end
   end

data/lib/gettext/tools.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 =begin
   tools.rb - Utility functions
 
@@ -24,7 +26,7 @@ module GetText
 
   BOM_UTF8 = [0xef, 0xbb, 0xbf].pack("c3")
 
-  # Currently, GNU msgmerge doesn't accept BOM. 
+  # Currently, GNU msgmerge doesn't accept BOM.
   # This mesthod remove the UTF-8 BOM from the po-file.
   def remove_bom(path)  #:nodoc:
     bom = IO.read(path, 3)
@@ -34,13 +36,13 @@ module GetText
     end
   end
 
-  # Merges two Uniforum style .po files together. 
+  # Merges two Uniforum style .po files together.
   #
-  # *Note* This function requires "msgmerge" tool included in GNU GetText. So you need to install GNU GetText. 
+  # *Note* This function requires "msgmerge" tool included in GNU GetText. So you need to install GNU GetText.
   #
-  # The def.po file is an existing PO file with translations which will be taken 
+  # The def.po file is an existing PO file with translations which will be taken
   # over to the newly created file as long as they still match; comments will be preserved,
-  # but extracted comments and file positions will be discarded. 
+  # but extracted comments and file positions will be discarded.
   #
   # The ref.pot file is the last created PO file with up-to-date source references but
   # old translations, or a PO Template file (generally created by rgettext);
@@ -53,14 +55,14 @@ module GetText
   # * defpo: a po-file. translations referring to old sources
   # * refpo: a po-file. references to new sources
   # * app_version: the application information which appears "Project-Id-Version: #{app_version}" in the pot/po-files.
-  # * Returns: self 
+  # * Returns: self
   def msgmerge(defpo, refpo, app_version, options={})
     verbose = options.delete(:verbose)
     puts "msgmerge called" if verbose
     $stderr.print defpo + " "
 
     content = merge_po_files(defpo,refpo,options.delete(:msgmerge),verbose)
-    
+
     if content.empty?
       # report failure
       failed_filename = refpo + "~"
@@ -73,12 +75,12 @@ module GetText
       content.sub!(/(Project-Id-Version\:).*$/, "\\1 #{app_version}\\n\"")
       File.open(defpo, "w") {|f|f.write(content)}
     end
-    
+
     self
   end
 
-  # Creates mo-files using #{po_root}/#{lang}/*.po an put them to 
-  # #{targetdir}/#{targetdir_rule}/. 
+  # Creates mo-files using #{po_root}/#{lang}/*.po an put them to
+  # #{targetdir}/#{targetdir_rule}/.
   #
   # This is a convenience function of GetText.rmsgfmt for multiple target files.
   # * options: options as a Hash.
@@ -101,9 +103,9 @@ module GetText
 
   # At first, this creates the #{po_root}/#{domainname}.pot file using GetText.rgettext.
   # In the second step, this updates(merges) the #{po_root}/#{domainname}.pot and all of the
-  # #{po_root}/#{lang}/#{domainname}.po files under "po_root" using "msgmerge". 
+  # #{po_root}/#{lang}/#{domainname}.po files under "po_root" using "msgmerge".
   #
-  # *Note* "msgmerge" tool is included in GNU GetText. So you need to install GNU GetText. 
+  # *Note* "msgmerge" tool is included in GNU GetText. So you need to install GNU GetText.
   #
   # See <HOWTO maintain po/mo files(http://www.yotabanana.com/hiki/ruby-gettext-howto-manage.html)> for more detals.
   # * domainname: the textdomain name.
@@ -181,7 +183,7 @@ module GetText
       :mo_root => "./data/locale",
       :mo_path_rule => "%{lang}/LC_MESSAGES"
     }.merge(options)
-    
+
     lang, textdomain = %r[/([^/]+?)/(.*)\.po].match(po_file[options[:po_root].size..-1]).to_a[1,2]
 
     mo_dir_rule = File.join(options[:mo_root], options[:mo_path_rule])

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

@@ -1,8 +1,10 @@
+# encoding: utf-8
+
 =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
@@ -23,7 +25,7 @@ module GetText
     #   * :extnames: An Array of target files extension. Default is [".rhtml"].
     def init(config)
       config.each{|k, v|
-	@config[k] = v
+  @config[k] = v
       }
     end
 
@@ -37,7 +39,7 @@ module GetText
 
     def target?(file) # :nodoc:
       @config[:extnames].each do |v|
-	return true if File.extname(file) == v
+  return true if File.extname(file) == v
       end
       false
     end

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

@@ -1,8 +1,10 @@
+# encoding: utf-8
+
 =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
@@ -14,13 +16,13 @@ module GetText
   module GladeParser
     extend GetText
     extend self
-    
+
     bindtextdomain("rgettext")
 
     TARGET1 = /<property.*translatable="yes">(.*)/
     TARGET2 = /(.*)<\/property>/
 
-    def parse(file, targets = []) # :nodoc: 
+    def parse(file, targets = []) # :nodoc:
       lines = IO.readlines(file)
       parse_lines(file, lines, targets)
     end
@@ -31,11 +33,11 @@ module GetText
       target = false
       line_no = 0
       val = nil
-      
-      loop do 
+
+      loop do
         line = lines.shift
         break unless line
-        
+
         cnt += 1
         if TARGET1 =~ line
           line_no = cnt
@@ -61,18 +63,18 @@ module GetText
       targets
     end
 
-    XML_RE = /<\?xml/ 
+    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
+  true
       else
-	if File.extname(file) == '.glade'
-	  raise _("`%{file}' is not glade-2.0 format.") % {:file => file}
-	end
-	false
+  if File.extname(file) == '.glade'
+    raise _("`%{file}' is not glade-2.0 format.") % {:file => file}
+  end
+  false
       end
     end
 
@@ -80,7 +82,7 @@ module GetText
       return unless val.size > 0
       assoc_data = targets.assoc(val)
       val = CGI.unescapeHTML(val)
-      if assoc_data 
+      if assoc_data
         targets[targets.index(assoc_data)] = assoc_data << "#{file}:#{line_no}"
       else
         targets << [val.gsub(/\n/, '\n'), "#{file}:#{line_no}"]

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

@@ -5,7 +5,7 @@
   Copyright (C) 2003-2009  Masao Mutoh
   Copyright (C) 2005       speakillof
   Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
- 
+
   You may redistribute it and/or modify it under the same
   license terms as Ruby or LGPL.
 
@@ -23,13 +23,13 @@ module GetText
         s = get_readed
         if RubyToken::TkSTRING === tk
           def tk.value
-            @value 
+            @value
           end
-          
+
           def tk.value=(s)
             @value = s
           end
-          
+
           if @here_header
             s = s.sub(/\A.*?\n/, '').sub(/^.*\n\Z/, '')
           else
@@ -39,10 +39,10 @@ module GetText
               # Do nothing.
             end
           end
-          
+
           tk.value = s
         end
-        
+
         if $DEBUG
           if tk.is_a? TkSTRING
             $stderr.puts("#{tk}: #{tk.value}")
@@ -52,7 +52,7 @@ module GetText
             $stderr.puts(tk)
           end
         end
-        
+
         yield tk
       end
       return nil
@@ -96,7 +96,7 @@ module GetText
 
     def advance_to_next_attribute
       @param_number += 1
-    end    
+    end
   end
   class PoMessage
     include PoMessageForRubyParser
@@ -109,14 +109,14 @@ 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_']
 
     # (Since 2.1.0) the 2nd parameter is deprecated
-    # (and ignored here). 
+    # (and ignored here).
     # And You don't need to keep the pomessages as unique.
 
     def parse(path, deprecated = [])  # :nodoc:
@@ -173,7 +173,7 @@ module GetText
           exit 1
         end
 
-        case tk 
+        case tk
         when RubyToken::TkCOMMENT_WITH_CONTENT
           last_comment = "" if reset_comment
           if last_comment.empty?
@@ -183,7 +183,7 @@ module GetText
               last_comment = $'
             end
           else
-            last_comment += "\n" 
+            last_comment += "\n"
             last_comment += tk.value
           end
           reset_comment = false
@@ -210,7 +210,7 @@ module GetText
         false
       end
     end
-  end 
+  end
 end
 
 if __FILE__ == $0
@@ -218,9 +218,9 @@ if __FILE__ == $0
   ARGV.each do |path|
     pp GetText::RubyParser.parse(path)
   end
-  
-  #rl = GetText::RubyLexX.new; rl.set_input(ARGF)  
+
+  #rl = GetText::RubyLexX.new; rl.set_input(ARGF)
   #rl.parse do |tk|
   #p tk
-  #end  
+  #end
 end