gettext 1.0.0 → 1.1.0

data/bin/rgettext

@@ -6,6 +6,8 @@
   
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
+
+  $Id: rgettext,v 1.4 2005/11/27 15:35:54 mutoh Exp $
 =end
 
 begin

data/bin/rmsgfmt

@@ -6,6 +6,8 @@
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
+
+  $Id: rmsgfmt,v 1.3 2005/11/27 15:35:54 mutoh Exp $
 =end
 
 begin

data/bin/rmsgmerge

@@ -0,0 +1,24 @@
+#! /usr/bin/ruby
+=begin
+  rmsgmerge - ruby version of msgmerge
+
+  Copyright (C) 2005  Masao Mutoh
+ 
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: rmsgmerge,v 1.2 2005/11/27 15:35:54 mutoh Exp $
+=end
+
+begin
+  require 'gettext/rmsgmerge'
+rescue LoadError
+  begin
+    require 'rubygems'
+    require_gem 'gettext/rmsgmerge'
+  rescue LoadError
+    raise 'Ruby-GetText-Package are not installed.'
+  end
+end
+
+GetText.rmsgmerge

data/lib/gettext.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+  $Id: gettext.rb,v 1.5 2005/11/30 17:59:14 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -18,6 +18,7 @@ require 'gettext/version'
 require 'gettext/mo'
 require 'gettext/locale'
 require 'gettext/textdomain'
+require 'gettext/string'
 
 module GetText
   class NoboundTextDomainError < RuntimeError
@@ -27,9 +28,15 @@ module GetText
   @@__textdomain_key = Hash.new
 
   @@output_charset = nil
+  @@locale = nil
 
   def bindtextdomain(domainname, path = nil, locale = nil, charset = nil)
-    locale ||= Locale.get
+    if @@locale
+      locale = @@locale
+      Locale.set(Locale::CTYPE, locale)
+    else
+      locale ||= Locale.get
+    end
     if @@output_charset
       charset = @@output_charset
     else
@@ -43,6 +50,7 @@ module GetText
       textdomain = @@__textdomain_key[domainname]
       @@__textdomain[src] = textdomain
     end
+
     if ! textdomain or ! textdomain.same_property?(domainname, path, locale, charset)
       textdomain = TextDomain.new(domainname, path, locale, charset)
       @@__textdomain_key[domainname] = textdomain
@@ -67,7 +75,7 @@ module GetText
   
   def ngettext(msgid, msgid_plural, n)
     textdomain = @@__textdomain[callersrc]
-    textdomain ? textdomain.ngettext(msgid, msgid_plural, n) : msgid
+    textdomain ? textdomain.ngettext(msgid, msgid_plural, n) : (n == 1 ? msgid : msgid_plural)
   end
   
   def N_(msgid)
@@ -94,6 +102,7 @@ module GetText
   end
 
   def locale=(locale)
+    @@locale = locale
     textdomain = @@__textdomain[callersrc]
     textdomain.set_locale(locale) if textdomain
     locale
@@ -107,6 +116,10 @@ module GetText
     @@output_charset
   end
 
+  def locale
+    @@locale
+  end
+
   def charset=(cs)
     textdomain = @@__textdomain[callersrc]
     textdomain.set_charset(cs) if textdomain
@@ -122,6 +135,6 @@ module GetText
   module_function :bindtextdomain, :textdomain, 
     :N_, :gettext, :_, :ngettext, :n_, 
     :sgettext, :s_, :callersrc,
-    :setlocale, :set_locale, :locale=, :charset=,
+    :setlocale, :set_locale, :locale=, :locale, :charset=,
     :set_output_charset, :output_charset=, :output_charset
 end

data/lib/gettext/cgi.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: cgi.rb,v 1.2 2005/08/27 18:52:20 mutoh Exp $
+  $Id: cgi.rb,v 1.4 2005/12/07 17:09:39 mutoh Exp $
 =end
 
 require 'cgi'
@@ -14,8 +14,10 @@ require 'gettext'
 
 module Locale
   alias :orig_get :get
+  alias :orig_set :set
 
   @@cgi = nil
+  @@locale_cgi = nil
 
   module_function
   def cgi=(cgi)
@@ -27,28 +29,40 @@ module Locale
     @@cgi
   end
 
-  def get
-    @@cgi = CGI.new unless @@cgi
-    if ret = @@cgi["lang"] and ret.size > 0
-      $stderr.print "query_string: lang = #{ret}\n" if $DEBUG
-    elsif ret = @@cgi.cookies["lang"][0]
-      print "cookie: lang = #{ret}\n" if $DEBUG
-    elsif lang = @@cgi.accept_language
-      $stderr.print "accept lanaugage: lang = #{lang}\n" if $DEBUG
- 
-      lang = lang.split(',').first.split('-') rescue []
-      language = lang[0]
-      dialect  = lang[1]
-      language = language ? language.downcase : 'en' # default is en
-      dialect  = dialect ? "_#{dialect.upcase}" : ""
-      ret = "#{language}#{dialect}"
-    else
-      ret = "en"
+  def normalize(lang)
+    lang = lang.split(',').first.gsub(/_/, "-").split('-') rescue []
+    language = lang[0]
+    dialect  = lang[1]
+    language = language ? language.downcase : 'en' # default is en
+    dialect  = dialect ? "_#{dialect.upcase}" : ""
+    ret = "#{language}#{dialect}" 
+  end
+
+  def get(lctype = Locale::CTYPE) #lctype doesn't used here.
+    ret = @@locale_cgi
+    unless ret
+      @@cgi = CGI.new unless @@cgi
+      if ret = @@cgi["lang"] and ret.size > 0
+	$stderr.print "query_string: lang = #{ret}\n" if $DEBUG
+      elsif ret = @@cgi.cookies["lang"][0]
+	$stderr.print "cookie: lang = #{ret}\n" if $DEBUG
+      elsif lang = @@cgi.accept_language
+	$stderr.print "accept lanaugage: lang = #{lang}\n" if $DEBUG
+	ret = normalize(lang)
+      else
+	ret = "en"
+      end
     end
     $stderr.print "Locale.get = #{ret}\n" if $DEBUG
     ret
   end
 
+  def set(lctype, loc)
+    # Override this method. Because the value from WWW browser doesn't
+    # match to the locale strings of POSIX setlocale.
+    @@locale_cgi = loc
+  end
+
   def codeset
     @@cgi = CGI.new unless @@cgi
     codesets = @@cgi.accept_charset
@@ -61,9 +75,10 @@ module Locale
   end
 
   alias :charset :codeset
+  alias :setlocale :set
   alias :set_cgi :cgi=
 
-  module_function :charset, :set_cgi
+  module_function :charset, :set_cgi, :set, :setlocale
 end
 
 module GetText

data/lib/gettext/locale.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale.rb,v 1.3 2005/08/22 16:56:33 mutoh Exp $
+  $Id: locale.rb,v 1.4 2005/09/04 17:47:54 mutoh Exp $
 =end
 
 begin
@@ -41,18 +41,8 @@ else
 end
 
 module Locale
-  def get
-    ret = __get
-    return ret if ret
-    
-    ret = nil
-    ["LC_ALL", "LC_MESSAGES", "LANG"].each do |env|
-      ret = ENV[env]
-      break if ret
-    end
-    
-    ret = "C" unless ret
-    ret
+  def get(lctype = Locale::CTYPE)
+    __get(lctype)
   end
   
   alias :setlocale :set

data/lib/gettext/locale_default.rb

@@ -6,14 +6,14 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_default.rb,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+  $Id: locale_default.rb,v 1.3 2005/09/04 17:47:54 mutoh Exp $
 =end
 
 module Locale
   @@locale_initialized = false
   alias :__set :set
   def __get(lctype = Locale::CTYPE)
-    # Initialize CTYPE first lazily. 
+    # Initialize lctype lazily. 
     # This isn't called when 'gettext/cgi' is required.
     unless @@locale_initialized
       Locale.set(lctype, "") 

data/lib/gettext/locale_win32.rb

@@ -6,19 +6,39 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_win32.rb,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+  $Id: locale_win32.rb,v 1.4 2005/12/29 07:02:52 mutoh Exp $
 =end
 
 require 'gettext/locale_table_win32'
 
 module Locale
-  def __get
-    pri_id, sub_id = __locale_id
-    lang = LocaleTable.assoc(pri_id)
-    if lang.size == 3
-      lang = lang[2].assoc(sub_id)
+  @@locale_win32 = {}
+  def __get(lctype = Locale::CTYPE)
+    ret = nil
+    if @@locale_win32[lctype] 
+      ret = @@locale_win32[lctype]
+    else
+      ["LC_ALL", "LC_MESSAGES", "LANG"].each do |env|
+	ret = ENV[env]
+	break if ret
+      end
+      unless ret
+	pri_id, sub_id = __locale_id
+	lang = LocaleTable.assoc(pri_id)
+	if lang.size == 3
+	  lang = lang[2].assoc(sub_id)
+	end
+	ret = lang ? lang[1] : "C"
+      end
+      @@locale_win32[lctype] = ret
+    end
+    ret
+  end
+
+  def set(lctype, loc)
+    if lctype == ALL
+      @@locale_win32[lctype] = loc
     end
-    lang ? lang[1] : nil
   end
 
   unless defined? CTYPE

data/lib/gettext/mo.rb

@@ -12,7 +12,7 @@
     of Ruby.  License of Ruby is included with Ruby distribution in
     the file "README".
 
-    $Id: mo.rb,v 1.1.1.1 2005/08/13 02:38:09 mutoh Exp $
+    $Id: mo.rb,v 1.2 2005/10/22 10:49:59 mutoh Exp $
 =end
 
 require 'gettext/iconv'
@@ -233,6 +233,11 @@ class MOFile < Hash
     File.open(filename, 'wb'){|f| save_to_stream(f)}
   end
 
+  def set_comment(msgid_or_sym, comment)
+    #Do nothing
+  end
+
+
   attr_accessor :little_endian
   attr_reader :charset, :nplurals, :plural
 end

data/lib/gettext/parser/activerecord.rb

@@ -0,0 +1,115 @@
+#!/usr/bin/ruby
+=begin
+  parser/activerecord.rb - parser for ActiveRecord
+
+  Copyright (C) 2005  Masao Mutoh
+ 
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+  $Id: activerecord.rb,v 1.2 2005/12/25 11:43:20 mutoh Exp $
+=end
+
+require 'gettext'
+require 'gettext/parser/ruby'
+
+module GetText
+  module ActiveRecordParser
+    extend GetText
+    include GetText
+    GetText.bindtextdomain("rgettext")
+
+    @config = {
+      :db_yml => "config/database.yml",
+      :db_mode => "development",
+      :activerecord_classes => ["ActiveRecord::Base"],
+      :use_classname => true,
+    }
+
+    @ar_re = nil
+
+    module_function
+    def require_rails(file)
+      begin
+	require file
+      rescue MissingSourceFile
+	$stderr.puts _("'%{file}' is not found.") % {:file => file}
+      end
+    end
+
+    def init(config)
+      if config
+	config.each{|k, v|
+	  @config[k] = v
+	}
+      end
+      @ar_re = /class.*(#{@config[:activerecord_classes].join("|")})/
+    end
+
+    def parse(file, targets = [])
+      ActiveRecord::Base.establish_connection(@db)
+
+      old_constants = constants
+      begin
+        eval(open(file).read)
+      rescue
+        $stderr.puts _("Ignored '%{file}'. Solve dependencies first.") % {:file => file}
+        $stderr.puts $! 
+      end
+      loaded_constants = constants - old_constants
+      loaded_constants.each do |classname|
+	klass = eval(classname)
+	if klass < ActiveRecord::Base
+	  tablename = klass.human_attribute_name(klass.class_name)
+	  targets << [tablename, "#{file}:-"]
+	  begin
+	    klass.columns.each do |column|
+	      if @config[:use_classname]
+		targets << [tablename + "|" +  klass.human_attribute_name(column.name), "#{file}:-"]
+	      else
+		targets << [klass.human_attribute_name(column.name), "#{file}:-"]
+	      end
+	    end
+	  rescue
+	    $stderr.puts _("No database is available.")
+	    $stderr.puts $!
+	  end
+	end
+      end
+      if RubyParser.target?(file)
+	RubyParser.parse(file, targets)
+      end
+    end
+
+    def target?(file)
+      init(nil) unless @ar_re
+      data = IO.readlines(file)
+      data.each do |v|
+	if @ar_re =~ v
+	  unless @db
+	    require 'rubygems'
+	    require 'active_record'
+	    yml = YAML.load_file(@config[:db_yml])
+	    @db = yml[:db_mode]
+	    @db = yml["production"] unless @db
+	    require_rails 'config/boot.rb'
+	    require_rails 'config/environment.rb'
+	    require_rails 'app/controllers/application.rb'
+	  end
+	  return true
+	end
+      end
+      false
+    end
+  end
+end
+
+if __FILE__ == $0
+  # ex) ruby model1.rb model2.rb 
+  ARGV.each do |file|
+    if GetText::ActiveRecordParser.target?(file)
+      p file
+      p GetText::ActiveRecordParser.parse(file)
+    end
+  end
+end