gettext 1.1.1-mswin32 → 1.2.0-mswin32

data/lib/gettext/rails.rb

@@ -1,28 +1,53 @@
 =begin
   gettext/rails.rb - GetText for "Ruby on Rails"
 
-  Copyright (C) 2005  Masao Mutoh
+  Copyright (C) 2005,2006  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.12 2006/01/14 13:48:22 mutoh Exp $
+  $Id: rails.rb,v 1.17 2006/02/23 14:53:59 mutoh Exp $
 =end
 
-require 'gettext'
 require 'gettext/cgi'
 require 'active_record'
 require 'active_support'
 
-module GetText
+module GetText #:nodoc:
+  # = GetText for Ruby on Rails
+  # GetText::Rails supports Ruby on Rails.
+  # You add only 2 lines in your controller, all of the controller/view/models are
+  # targeted the textdomain. 
+  #
+  # See <Ruby-GetText-Package HOWTO for Ruby on Rails (http://www.yotabanana.com/hiki/ruby-gettext-howto-rails.html>.
   module Rails
     include GetText
+    extend GetText
 
-    Rails = ::Rails
+    Rails = ::Rails  #:nodoc:
 
-    alias :_bindtextdomain :bindtextdomain
+    alias :_bindtextdomain :bindtextdomain #:nodoc:
 
+    # Bind a textdomain(#{path}/#{locale}/LC_MESSAGES/#{domainname}.mo) to your program. 
+    # Notes the textdomain scope becomes all of the controllers/views/models in your app. 
+    # This is different from normal GetText.bindtextomain.
+    #
+    # Usually, you don't call this directly in your rails application.
+    # Call init_gettext in ActionController::Base instead.
+    #
+    # On the other hand, you need to call this in helpers/plugins.
+    #
+    # * domainname: the textdomain name.
+    # * locale: the locale value such as "ja-JP". When the value is nil, 
+    # * charset: the charset. Generally UTF-8 is recommanded.
+    # * with_model: false if you want to ignore model support.
+    #
+    # locale is searched the order by this value > "lang" value of QUERY_STRING > 
+    # "lang" value of Cookie > HTTP_ACCEPT_LANGUAGE value > Default locale(en). 
+    # And the charset is set order by "the argument of bindtextdomain" > HTTP_ACCEPT_CHARSET > Default charset(UTF-8).
+    #
     def bindtextdomain(domainname, _cgi = nil, locale = nil, charset = nil, with_model = true)
+      Locale.clear  # IMPORTANT! current locale should be nil once(default is used).
       set_cgi(_cgi) if _cgi
       @gettext_container_domainname = domainname
       path = File.join(RAILS_ROOT, "locale")
@@ -31,20 +56,20 @@ module GetText
       bindtextdomain_to(ActiveRecord::Base, domainname) if with_model
     end
 
-    def bindtextdomain_to(klass, domainname)
+    def bindtextdomain_to(klass, domainname) #:nodoc:
       klass.class_eval {
 	textdomain(domainname)
 
-	def self.human_attribute_name(attribute_key_name)
+	def self.human_attribute_name(attribute_key_name) #:nodoc:
 	  s_("#{self}|#{attribute_key_name.humanize}")
 	end
-	def self.human_attribute_table_name_for_error(table_name)
+	def self.human_attribute_table_name_for_error(table_name) #:nodoc:
 	  _(table_name.gsub(/_/, " "))
 	end
       }
     end
 
-    def callersrc
+    def callersrc  #:nodoc:
       @gettext_container_domainname = nil unless defined? @gettext_container_domainname
       @gettext_container_domainname
     end
@@ -52,7 +77,7 @@ module GetText
 end
 
 
-module ActionController
+module ActionController #:nodoc:
   class Base
     helper GetText::Rails
     include GetText::Rails
@@ -62,13 +87,22 @@ module ActionController
     @@gettext_content_type = nil
 
     prepend_before_filter :init_gettext
-
-    def init_gettext_main
+    after_filter :init_content_type
+    
+    def init_gettext_main #:nodoc:
       bindtextdomain(@@gettext_domainname, request.cgi)  #You need to pass CGI object first.
-      @headers["Content-Type"] = "#{@@gettext_content_type}; charset=#{GetText.output_charset}"
     end
 
-    def init_gettext
+    def init_content_type #:nodoc:
+      if @headers["Content-Type"] and /javascript/ =~ @headers["Content-Type"]
+	@headers["Content-Type"] = "text/javascript; charset=#{GetText.output_charset}"
+      elsif ! @headers["Content-Type"]
+	@headers["Content-Type"] = "#{@@gettext_content_type}; charset=#{GetText.output_charset}"
+      end
+    end
+
+
+    def init_gettext # :nodoc:
       init_gettext_main if @@gettext_domainname
       ActiveRecord::Errors.class_eval{
 	# You need to call bindtextdomain here because ActiveRecord::Errors doesn't know
@@ -77,6 +111,21 @@ module ActionController
       }
     end
     
+    # Bind a 'textdomain' to all of the controllers/views/models. Call this instead of GetText.bindtextdomain.
+    # * textdomain: the textdomain
+    # * charset: the output charset. Default is "UTF-8"
+    # * content_type: the content type. Default is "text/html"
+    #
+    # If you want to separate the textdomain each controllers, you need to call this function in the each controllers.
+    #
+    # app/controller/blog_controller.rb:
+    #  require 'gettext/rails'
+    #  
+    #  class BlogController < ApplicationController
+    #    init_gettext "blog"
+    #      :
+    #      :
+    #    end
     def self.init_gettext(domainname, charset = "UTF-8", content_type = "text/html")
       GetText.output_charset = charset
       @@gettext_domainname = domainname
@@ -84,7 +133,7 @@ module ActionController
     end
   end
 
-  class TestRequest < AbstractRequest 
+  class TestRequest < AbstractRequest  #:nodoc:
     @cgi = nil
     def cgi
       @cgi = CGI.new unless @cgi
@@ -93,18 +142,38 @@ module ActionController
   end
 end
 
-module ActiveRecord
+module ActiveRecord #:nodoc:
   class Base
-    include GetText::Rails
-    extend GetText::Rails
-  end
+    include GetText::Rails  # Important
+    extend GetText::Rails   # Important
+
+    @@error_message_title = nil
+    @@error_message_explanation = nil
+    
+    # Sets a your own title of error message dialog.
+    def self.set_error_message_title(single_msg, plural_msg)
+      @@error_message_title = [single_msg, plural_msg]
+    end
+    
+    # Sets a your own explanation of the error message dialog.
+    def self.set_error_message_explanation(single_msg, plural_msg)
+      @@error_message_explanation = [single_msg, plural_msg]
+    end
 
-  class Errors
+    def error_message_title #:nodoc:
+      @@error_message_title
+    end
+    def error_message_explanation #:nodoc:
+      @@error_message_explanation
+    end
+  end
+  
+  class Errors #:nodoc:
     include GetText
     extend GetText
     
-    RE_FIELD_NAME = /%\{fn\}/
-
+    RE_FIELD_NAME = /%\{fn\}/  #:nodoc:
+    
     # You need to define this here, because this values will be updated by application.
     default_error_messages.update(
 				  :inclusion => N_("%{fn} is not included in the list"),
@@ -120,22 +189,20 @@ module ActiveRecord
 				  :taken => N_("%{fn} has already been taken"),
 				  :not_a_number => N_("%{fn} is not a number")
 				  )
-
     @@default_error_messages_d = {
       :too_long => default_error_messages[:too_long],
       :too_short => default_error_messages[:too_short],
       :wrong_length => default_error_messages[:wrong_length]
     }
 
-    def self.convert_validates_messages_of_validates_length_of
+    def self.convert_validates_messages_of_validates_length_of #:nodoc:
       default_error_messages[:too_long] = _(@@default_error_messages_d[:too_long])
       default_error_messages[:too_short] = _(@@default_error_messages_d[:too_short])
       default_error_messages[:wrong_length] = _(@@default_error_messages_d[:wrong_length])      
     end
 
-    def full_messages
+    def full_messages #:nodoc:
       full_messages = []
-
       @errors.each_key do |attr|
 	@errors[attr].each do |msg|
 	  next if msg.nil?
@@ -152,8 +219,8 @@ module ActiveRecord
     end
   end
 
-  module Validations
-    module ClassMethods
+  module Validations #:nodoc:
+    module ClassMethods #:nodoc:
       alias :_validates_length_of :validates_length_of
       def validates_length_of(*attrs)
 	ActiveRecord::Errors.convert_validates_messages_of_validates_length_of
@@ -164,33 +231,44 @@ module ActiveRecord
 end
 
 
-module ActionView
-  module Helpers
-    module ActiveRecordHelper
+module ActionView #:nodoc:
+  module Helpers  #:nodoc:
+    module ActiveRecordHelper #:nodoc: all
       module L10n
 	# Separate namespace for textdomain
 	include GetText
 	extend GetText
+
+	@error_message_title = Nn_("%{num} error prohibited this %{record} from being saved", 
+				   "%{num} errors prohibited this %{record} from being saved")
+	@error_message_explanation = Nn_("There was a problem with the following field:", 
+					 "There were problems with the following fields:")
+
 	module_function
+	def render_error_message(object, klass, record, count, options)
+	  message_title = object.error_message_title || @error_message_title
+	  message_explanation = object.error_message_explanation || @error_message_explanation
+	  
+	  klass.content_tag("div",
+			    klass.content_tag(
+					      options[:header_tag] || "h2",
+					      n_(message_title, count) % {:num => count, :record => record}
+					      ) +
+			    klass.content_tag("p", n_(message_explanation, count) % {:num => count}) +
+			    klass.content_tag("ul", object.errors.full_messages.collect { |msg| klass.content_tag("li", msg) }),
+			    "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
+			    )
+	end
+
 	def error_messages_for(object, object_name, klass, options = {})
 	  textdomain("rails")
 
 	  options = options.symbolize_keys
-  
+
 	  unless object.errors.empty?
 	    count = object.errors.count
 	    record = ActiveRecord::Base.human_attribute_table_name_for_error(object_name)
-	    klass.content_tag("div",
-			klass.content_tag(
-				    options[:header_tag] || "h2",
-					  n_("%{num} error prohibited this %{record} from being saved", 
-					     "%{num} errors prohibited this %{record} from being saved", count) %
-					  {:num => count, :record => record}) +
-			klass.content_tag("p", n_("There were problems with the following field:", 
-					    "There were problems with the following fields:", count)) +
-			klass.content_tag("ul", object.errors.full_messages.collect { |msg| klass.content_tag("li", msg) }),
-			"id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
-			)
+	    render_error_message(object, klass, record, count, options)
 	  end
 	end
       end

data/lib/gettext/rgettext.rb

@@ -17,14 +17,14 @@ require 'gettext'
 
 module GetText
 
-  module RGetText
+  module RGetText # :nodoc:
     extend GetText
 
     bindtextdomain("rgettext")
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2005/12/25 11:43:20 $)[1]
+    DATE = %w($Date: 2006/02/22 16:42:41 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -46,7 +46,7 @@ module GetText
 
     module_function
 
-    def generate_pot_header
+    def generate_pot_header # :nodoc:
       time = Time.now.strftime("%Y-%m-%d %H:%M")
       off = Time.now.utc_offset
       sign = off <= 0 ? '-' : '+'
@@ -71,7 +71,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"]
     end
 
-    def generate_pot(ary)
+    def generate_pot(ary) # :nodoc:
       str = ""
       result = Array.new
       ary.each do |key|
@@ -102,7 +102,7 @@ msgstr ""
       str
     end
 
-    def parse(files)
+    def parse(files) # :nodoc:
       ary = []
       files.each do |file|
 	begin
@@ -121,7 +121,7 @@ msgstr ""
       ary
     end
 
-    def check_options
+    def check_options # :nodoc:
       output = STDOUT
 
       opts = OptionParser.new
@@ -155,7 +155,7 @@ msgstr ""
       [ARGV, output]
     end
 
-    def run(targetfiles = nil, out = STDOUT)
+    def run(targetfiles = nil, out = STDOUT)  # :nodoc:
       if targetfiles.is_a? String
 	targetfiles = [targetfiles]
       elsif ! targetfiles
@@ -175,13 +175,26 @@ msgstr ""
 	out.puts generate_pot_header
 	out.puts generate_pot(parse(targetfiles))
       end
-
+      self
     end
   end
 
   module_function
+  # Creates a po-file from targetfiles(ruby-script-files, ActiveRecord, .rhtml files, glade-2 XML files), 
+  # then output the result to out. If no parameter is set, it behaves same as command line tools(rgettet). 
+  #
+  # This function is a part of GetText.create_pofiles.
+  # Usually you don't need to call this function directly.
+  #
+  # *Note* for ActiveRecord, you need to run your database server and configure the config/database.xml 
+  # correctly before execute this function.
+  #
+  # * targetfiles: An Array of po-files or nil.
+  # * out: output IO or output path.
+  # * Returns: self
   def rgettext(targetfiles = nil, out = STDOUT)
     RGetText.run(targetfiles, out)
+    self
   end
 end
 

data/lib/gettext/rmsgfmt.rb

@@ -1,7 +1,7 @@
 =begin
   rmsgfmt.rb - Generate a .mo
 
-  Copyright (C) 2003-2005 Masao Mutoh <mutoh@highway.ne.jp>
+  Copyright (C) 2003-2006 Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -15,14 +15,14 @@ require 'gettext/poparser'
 module GetText
   GetText.bindtextdomain("rgettext")
 
-  module RMsgfmt
-    extend GetText
+  module RMsgfmt #:nodoc:
+    extend GetText 
 
-    VERSION = GetText::VERSION
-    DATE = %w($Date: 2005/10/22 10:49:59 $)[1]
+    VERSION = GetText::VERSION 
+    DATE = %w($Date: 2006/02/22 16:42:41 $)[1] # :nodoc:
     
     module_function
-    def run(targetfile = nil, output_path = nil)
+    def run(targetfile = nil, output_path = nil) # :nodoc:
       unless targetfile
 	targetfile, output_path = check_options
       end
@@ -39,7 +39,7 @@ module GetText
       data.save_to_file(output_path)
     end
 
-    def check_options
+    def check_options # :nodoc:
       output = nil
 
       opts = OptionParser.new
@@ -69,14 +69,21 @@ module GetText
   end
 
   module_function
+  # Creates a mo-file from a targetfile(po-file), then output the result to out. 
+  # If no parameter is set, it behaves same as command line tools(rmsgfmt).
+  # * targetfile: An Array of po-files or nil.
+  # * output_path: output path.
+  # * Returns: the MOFile object.
   def rmsgfmt(targetfile = nil, output_path = nil)
     RMsgfmt.run(targetfile, output_path)
   end
 
+  # Move to gettext/utils.rb. This will be removed in the feature. 
+  # This remains for backward compatibility. Use gettext/utils.rb instead.
   def create_mofiles(verbose = false, 
 		     podir = "./po", targetdir = "./data/locale", 
 		     targetpath_rule = "%s/LC_MESSAGES")
-
+    $stderr.puts "This function will be moved to utils.rb. So requires 'utils' first, please."
     modir = File.join(targetdir, targetpath_rule)
     Dir.glob(File.join(podir, "*/*.po")) do |file|
       lang, basename = /\/([^\/]+?)\/(.*)\.po/.match(file[podir.size..-1]).to_a[1,2]
@@ -87,6 +94,7 @@ module GetText
 	$stderr.puts %Q[#{file} -> #{File.join(outdir, "#{basename}.mo")}]
       end
     end
+    self
   end
 end
 

data/lib/gettext/rmsgmerge.rb

@@ -1,8 +1,8 @@
 =begin
   rmsgmerge.rb - Merge old .po to new .po
 
-  Copyright (C) 2005 Masao Mutoh
-  Copyright (C) 2005 speakillof
+  Copyright (C) 2005,2006 Masao Mutoh
+  Copyright (C) 2005,2006 speakillof
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -14,9 +14,9 @@ require 'gettext/poparser'
 
 module GetText
     
-  module RMsgMerge
+  module RMsgMerge #:nodoc:
     
-    class PoData       
+    class PoData  #:nodoc:  
       
       attr_reader :msgids
       
@@ -108,7 +108,10 @@ module GetText
       
       def generate_po_entry(msgid)
         str = ""
-        str << @msgid2comment[msgid] << "\n"
+        str << @msgid2comment[msgid]
+        if str[-1] != "\n"[0]
+          str << "\n"
+        end
         
         id = msgid.gsub(/"/, '\"').gsub(/\r/, '')
         msgstr = @msgid2msgstr[msgid].gsub(/"/, '\"').gsub(/\r/, '')
@@ -134,12 +137,12 @@ module GetText
       
       def __conv(str)
         s = ''
-        
+
         if str.count("\n") > 1
           s << '""' << "\n"
           s << str.gsub(/^(.*)$/, '"\1\n"')
         else
-          s << str.gsub(/^(.*)$/, '"\1\n"')
+          s << '"' << str.sub("\n", "\\n") << '"'
         end
         
         s.rstrip
@@ -147,20 +150,22 @@ module GetText
       
     end
     
-    class Merger__
+    class Merger #:nodoc:
       
-      # From gettext source.
+      # From GNU gettext source.
       # 
       # Merge the reference with the definition: take the #. and
       #	#: comments from the reference, take the # comments from
 	  # the definition, take the msgstr from the definition.  Add
 	  # this merged entry to the output message list.      
-      COMMENT_RE = /\A#\.|\A#\:/
+      DOT_COMMENT_RE = /\A#\./
+      SEMICOLON_COMMENT_RE = /\A#\:/
+      FUZZY_RE = /\A#\,/
+      NOT_SPECIAL_COMMENT_RE = /\A#([^:.,]|\z)/
       
       CRLF_RE = /\r?\n/
-      
-      def initialize
-      end
+      POT_DATE_EXTRACT_RE = /POT-Creation-Date:\s*(.*)?\s*$/
+      POT_DATE_RE = /POT-Creation-Date:.*?$/
       
       def merge(definition, reference)
         # deep copy
@@ -168,7 +173,7 @@ module GetText
         
         used = []        
         merge_header(result, definition)
-        
+
         result.each_msgid do |msgid|
           if definition.msgid?(msgid)
             used << msgid
@@ -176,11 +181,11 @@ module GetText
           elsif other_msgid = definition.search_msgid_fuzzy(msgid, used)
             used << other_msgid
             merge_fuzzy_message(msgid, result, other_msgid, definition) 
+          elsif msgid.index("\000") and ( reference.msgstr(msgid).gsub("\000", '') == '' )
+            # plural
+            result[msgid] = "\000" * definition.nplural
           else
-            if msgid.index("\000") and (reference.msgstr(msgid).gsub("\000", '') == '')
-              #plural              
-              result[msgid] = "\000" * definition.nplural
-            end
+            change_reference_comment(msgid, result)
           end          
         end
         
@@ -191,7 +196,7 @@ module GetText
         definition.each_msgid do |msgid|
           unless used.include?(msgid)
             last_comment << "\n"
-            last_comment << definition.generate_po_entry(msgid).strip.gsub(/^/, '#~ ')
+            last_comment << definition.generate_po_entry(msgid).strip.gsub(/^/, '#. ')
             last_comment << "\n"
           end
         end
@@ -237,23 +242,91 @@ module GetText
       end
       
       def merge_comment(msgid, target, def_msgid, definition)
-        comment = target.comment(msgid)
+        ref_comment = target.comment(msgid)
         def_comment = definition.comment(def_msgid)
-        new_comment = []
+        
+        normal_comment = []
+        dot_comment = []
+        semi_comment = []
+        is_fuzzy = false
         
         def_comment.split(CRLF_RE).each do |l| 
-          unless COMMENT_RE =~ l
-            new_comment << l
+          if NOT_SPECIAL_COMMENT_RE =~ l
+            normal_comment << l
           end           
         end
         
-        comment.split(CRLF_RE).each do |l|
-          if COMMENT_RE =~ l
-            new_comment << l
+        ref_comment.split(CRLF_RE).each do |l|
+          if DOT_COMMENT_RE =~ l 
+            dot_comment << l
+          elsif SEMICOLON_COMMENT_RE =~ l
+            semi_comment << l
+          elsif FUZZY_RE =~ l
+            is_fuzzy = true
+          end
+        end
+        
+        str = format_comment(normal_comment, dot_comment, semi_comment, is_fuzzy)
+        target.set_comment(msgid, str)
+      end
+      
+      def change_reference_comment(msgid, podata)
+        normal_comment = []
+        dot_comment = []
+        semi_comment = []
+        is_fuzzy = false
+        
+        podata.comment(msgid).split(CRLF_RE).each do |l|
+          if DOT_COMMENT_RE =~ l 
+            dot_comment << l
+          elsif SEMICOLON_COMMENT_RE =~ l
+            semi_comment << l
+          elsif FUZZY_RE =~ l
+            is_fuzzy = true
+          else
+            normal_comment << l
           end
         end
         
-        target.set_comment(msgid, new_comment.join("\n"))        
+        str = format_comment(normal_comment, dot_comment, semi_comment, is_fuzzy)
+        podata.set_comment(msgid, str)        
+      end
+      
+      def format_comment(normal_comment, dot_comment, semi_comment, is_fuzzy)
+        str = ''
+        
+        str << normal_comment.join("\n").gsub(/^#(\s*)/){|sss|
+          if $1 == ""
+            "# "
+          else
+            sss
+          end
+        }
+        if normal_comment.size > 0
+          str << "\n"
+        end
+        
+        str << dot_comment.join("\n").gsub(/^#.(\s*)/){|sss|
+          if $1 == ""
+            "#. "
+          else
+            sss
+          end
+        }
+        if dot_comment.size > 0
+          str << "\n"
+        end
+        
+        str << semi_comment.join("\n").gsub(/^#:\s*/, "#: ")
+        if semi_comment.size > 0
+          str << "\n"
+        end
+        
+        if is_fuzzy
+          str << "#, fuzzy\n"
+        end
+        
+        str
       end
       
       def merge_header(target, definition)
@@ -261,9 +334,9 @@ module GetText
         
         msg = target.msgstr('')
         def_msg = definition.msgstr('')
-        if /POT-Creation-Date:\s*(.*)?\s*\\n/ =~ msg
+        if POT_DATE_EXTRACT_RE =~ msg
           time = $1
-          def_msg = def_msg.sub(/POT-Creation-Date:.*\\n/, "POT-Creation-Date: #{time}" + '\n')
+          def_msg = def_msg.sub(POT_DATE_RE, "POT-Creation-Date: #{time}")
         end
         
         target[''] = def_msg
@@ -275,11 +348,42 @@ module GetText
   
 end
 
+module GetText::RMsgMerge #:nodoc:
 
+  class Config #:nodoc:
+    
+    attr_accessor :defpo, :refpot, :output, :fuzzy, :update
+    
+    # update mode options
+    attr_accessor :backup, :suffix
+    
+=begin      
+The result is written back to def.po.
+      --backup=CONTROL        make a backup of def.po
+      --suffix=SUFFIX         override the usual backup suffix
+The version control method may be selected via the --backup option or through
+the VERSION_CONTROL environment variable.  Here are the values:
+  none, off       never make backups (even if --backup is given)
+  numbered, t     make numbered backups
+  existing, nil   numbered if numbered backups exist, simple otherwise
+  simple, never   always make simple backups
+The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX
+environment variable.
+=end      
+      
+    def initialize
+      @output = STDOUT
+      @fuzzy = nil
+      @update = nil
+      @backup = ENV["VERSION_CONTROL"]
+      @suffix= ENV["SIMPLE_BACKUP_SUFFIX"] || "~"
+      @input_dirs = ["."]
+    end
+    
+  end
+  
+end
 
-#
-# commands 
-# 
 module GetText
   
   module RMsgMerge
@@ -289,15 +393,14 @@ module GetText
     
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2005/11/27 15:35:55 $)[1]
+    DATE = %w($Date: 2006/02/23 14:53:59 $)[1]
     
     module_function
 
-    def check_options
-      output = STDOUT
-      
+    def check_options(config)
       opts = OptionParser.new
       opts.banner = _("Usage: %s def.po ref.pot [-o output.pot]") % $0
+      #opts.summary_width = 80
       opts.separator("")
       opts.separator(_("Merges two Uniforum style .po files together. The def.po file is an existing PO file with translations. The ref.pot file is the last created PO file with up-to-date source references. ref.pot is generally created by rgettext."))
       opts.separator("")
@@ -305,13 +408,15 @@ module GetText
       
       opts.on("-o", "--output=FILE", _("write output to specified file")) do |out|
         unless FileTest.exist? out
-          output = File.new(File.expand_path(out), "w+")
+          config.output = out
         else
           #$stderr.puts(_("File '%s' has already existed.") % out)
           #exit 1
         end
       end
       
+      #opts.on("-F", "--fuzzy-matching")
+      
       opts.on_tail("--version", _("display version information and exit")) do
         puts "#{$0} #{VERSION} (#{DATE})"
         exit
@@ -324,27 +429,33 @@ module GetText
         exit 1
       end
       
-      [ARGV[0], ARGV[1], output]
+      config.defpo = ARGV[0]
+      config.refpot = ARGV[1]
     end
     
     def run(reference = nil, definition = nil, out = STDOUT)
-      if reference.nil? or definition.nil?
-        definition, reference, out = check_options()
-      end
+      config = GetText::RMsgMerge::Config.new
+      config.refpot = reference
+      config.defpo = definition
+      config.output = out
+      
+      check_options(config)
       
-      if definition.nil?
+      if config.defpo.nil?
         raise ArgumentError, _("definition po is not given.")
-      elsif reference.nil? 
+      elsif config.refpot.nil? 
         raise ArgumentError, _("reference pot is not given.")
       end
       
       parser = PoParser.new
-      defstr = nil; refstr = nil
-      File.open(definition){|f| defstr = f.read}; File.open(reference){|f| refstr = f.read}
-      defpo = parser.parse(defstr, PoData.new)
-      refpot = parser.parse(refstr, PoData.new)
-      
-      m = Merger__.new
+      defstr = nil
+      refstr = nil      
+      File.open(config.defpo){|f| defstr = f.read}
+      File.open(config.refpot){|f| refstr = f.read}
+      defpo = parser.parse(defstr, PoData.new, false)
+      refpot = parser.parse(refstr, PoData.new, false)
+      
+      m = Merger.new
       result = m.merge(defpo, refpot)      
       pp result if $DEBUG
       print result.generate_po if $DEBUG
@@ -360,16 +471,27 @@ module GetText
       ensure
         out.close
       end
-    end
+    end    
+    
   end
+  
+end
 
+
+
+module GetText
+  
   module_function
+
+  # Experimental
   def rmsgmerge(reference = nil, definition = nil, out = STDOUT)
     RMsgMerge.run(reference, definition, out)
   end
+
 end
 
 
+
 if $0 == __FILE__ then
   require 'pp'