gettext 1.1.0-mswin32 → 1.1.1-mswin32

data/ChangeLog

@@ -1,5 +1,49 @@
+2006-01-14  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/po/*/blog.po: Updated.
+	* NEWS: Updated.
+
+2006-01-10  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/activerecord.rb: Fixed to fail loading YAML file.
+	By Karel Miarka.
+
+2006-01-08  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* *po/el/*.po: Convert to UTF-8. By damphyr.
+
+2006-01-07  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test_parser.rb: Add test_rgettext_parse.
+	* test/test_erb.rxml: Added.
+	* lib/gettext/rails.rb: Added ActionController::TestRequest for testing.
+	Reported by Nick Snels.	
+	* samples/rails/README: Added test information.
+	* samples/rails/test/functional/blog_controller_test.rb: Implemented.
+	* **/*po[t]: Revised headers.
+	* samples/po/el/*.po, samples/cgi/po/el/*.po, 
+	samples/rails/po/el/*.po, po/el/rgettext.po, 
+	rails.po: Added Greek locale by damphyr.
+	* README: Updated.
+	* lib/gettext/version.rb: Increment micro version.
+	 
+2006-01-02  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/activerecord.rb: Fixed to read configuration
+	correctly. Reported by Donald Piret.
+	Prevent to output duplicate msgid. Reported by Nick Snels.
+
+2005-12-31  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Check @@gettext_domainname is set first
+	to avoid set the wrong value to the Content-Type when init_gettext
+	is not called. Pointed out by Kazuhiro NISHIYAMA.
+
 2005-12-29  Masao Mutoh  <mutoh@highway.ne.jp>
 
+	* lib/gettext/locale_win32.rb: Fixed a syntax error.
+	* po/{it,sv}/rgettext.po: Updated.
+	* samples/rails/po/ja/blog.po: Fixed a fuzzy message.
 	* po/de/rgettext.po: Fixed a compilingproblem.
 	* README, NEWS: Updated.
 	* lib/gettext/rails.rb: Fix a problem when 

data/NEWS

@@ -1,3 +1,9 @@
+= Ruby-GetText-Package-1.1.1 (2006-01-14)
+
+ * Bugfixes.
+ * Added Greek locale by damphyr.
+ * Support tests for Ruby on Rails.
+
 = Ruby-GetText-Package-1.1.0 (2005-12-29)
 
  * Added some functions which managed po/mo files easily.

data/README

@@ -1,9 +1,12 @@
 Ruby-Gettext-Package
 ====================
 
-  Ruby-GetText-Package is Native Language Support Library and Tools 
+  Ruby-GetText-Package is a Localization(L10n) library and tools 
   which modeled after GNU gettext package.
 
+  It converts the messages to localized messages properly using 
+  client-side locale information(environment variable or CGI variable).
+
   Features:
 
   * Simple APIs(similar GNU gettext)
@@ -12,6 +15,7 @@ Ruby-Gettext-Package
     * ruby scripts 
     * glade-2 XML file(.glade)
     * ERB file(.rhtml)
+    * ActiveRecord(.rb)
     The po-file is compatible to GNU gettext.
 
   * rmsgfmt creates a mo-file from a po-file.
@@ -72,7 +76,7 @@ License
   (See the file 'COPYING'.)
 
 * Ruby-GetText-Package
-  Copyright (C) 2001-2005 Masao Mutoh <mutoh@highwhay.ne.jp>
+  Copyright (C) 2001-2006 Masao Mutoh <mutoh@highwhay.ne.jp>
 
 * mo.rb
   Copyright (C) 2001-2004 Masao Mutoh <mutoh@highwhay.ne.jp>
@@ -94,7 +98,7 @@ License
   This file is released under LGPL. See the top of the install.rb.
 
 * Others
-  Copyright (C) 2001-2005 Masao Mutoh <mutoh@highwhay.ne.jp>
+  Copyright (C) 2001-2006 Masao Mutoh <mutoh@highwhay.ne.jp>
 
 
 Translators
@@ -105,6 +109,7 @@ French             - Laurent Sansonetti <laurent.sansonetti at gmail.com>
 German             - Detlef Reichl <detlef.reichl at gmx.org>
                      Sven Herzberg <herzi at abi02.de>
                      Sascha Ebach <se at digitale-wertschoepfung.de>
+Greek              - Damphyr <damphyr at gmx.net>
 Italian            - Gabriele Renzi <surrender_it at yahoo.it>
 Japanese           - Masao Mutoh <mutoh at highway.ne.jp>
 Korean             - Gyoung-Yoon Noh <nohmad at gmail.com>
@@ -115,15 +120,16 @@ Swedish            - Nikolai Weibull <mailing-lists.ruby-talk at rawuncut.elitem
 
 Status of translations
 ----------------------
-cs    - 1.1.0
-fr    - 1.1.0
-de    - 1.1.0
-es    - 1.1.0
+cs    - 1.1.1
+fr    - 1.1.1
+de    - 1.1.1
+el    - 1.1.1
+es    - 1.1.1
 it    - 1.0.0
-ja    - 1.1.0
-ko    - 1.1.0
-nl    - 1.1.0
-pt_BR - 1.1.0
+ja    - 1.1.1
+ko    - 1.1.1
+nl    - 1.1.1
+pt_BR - 1.1.1
 sv    - 0.8.0
 
 Maintainer

data/bin/rgettext

@@ -1,4 +1,4 @@
-#! e:/ruby/bin/ruby
+#! /usr/bin/ruby
 =begin
   rgettext - ruby version of xgettext
 

data/bin/rmsgfmt

@@ -1,4 +1,4 @@
-#! e:/ruby/bin/ruby
+#! /usr/bin/ruby
 =begin
   rgettext - ruby version of xgettext
 

data/bin/rmsgmerge

@@ -1,4 +1,4 @@
-#! e:/ruby/bin/ruby
+#! /usr/bin/ruby
 =begin
   rmsgmerge - ruby version of msgmerge
 

data/ext/gettext/gettext/_locale.c

@@ -73,7 +73,7 @@ void Init__locale()
 #endif
     rb_define_module_function(mLocale, "set", gt_setlocale, 2);
     rb_define_module_function(mLocale, "codeset", gt_codeset, 0);
-#if defined HAVE_SETLOCALE
+# if defined HAVE_SETLOCALE
     rb_define_const(mLocale, "ALL", INT2NUM(LC_ALL));
     rb_define_const(mLocale, "COLLATE", INT2NUM(LC_COLLATE));
     rb_define_const(mLocale, "CTYPE", INT2NUM(LC_CTYPE));

data/ext/gettext/gettext/mkmf.log

@@ -1,6 +1,6 @@
 have_header: checking for windows.h... -------------------- yes
 
-"cl -IE:/ruby-gettext-package-1.1.0/ext/gettext/gettext -Ie:/ruby/lib/ruby/1.8/i386-mswin32 -I. -I./.. -I./../missing -MD -Zi -O2b2xg- -G6  conftest.c -P"
+"cl -IE:/ruby-gettext-package-1.1.1/ext/gettext/gettext -Ie:/ruby/lib/ruby/1.8/i386-mswin32 -I. -I./.. -I./../missing -MD -Zi -O2b2xg- -G6  conftest.c -P"
 Microsoft (R) 32-bit C/C++ Standard Compiler Version 13.10.3077 for 80x86
 Copyright (C) Microsoft Corporation 1984-2002. All rights reserved.
 

data/lib/gettext/locale_win32.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_win32.rb,v 1.3 2005/09/04 17:47:54 mutoh Exp $
+  $Id: locale_win32.rb,v 1.4 2005/12/29 07:02:52 mutoh Exp $
 =end
 
 require 'gettext/locale_table_win32'
@@ -37,7 +37,7 @@ module Locale
 
   def set(lctype, loc)
     if lctype == ALL
-      @@locale_win32[lctype] = loc
+      @@locale_win32[lctype] = loc
     end
   end
 

data/lib/gettext/parser/activerecord.rb

@@ -7,12 +7,14 @@
   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 $
+  $Id: activerecord.rb,v 1.5 2006/01/14 13:48:23 mutoh Exp $
 =end
 
 require 'gettext'
 require 'gettext/parser/ruby'
 
+include GetText
+
 module GetText
   module ActiveRecordParser
     extend GetText
@@ -47,8 +49,6 @@ module GetText
     end
 
     def parse(file, targets = [])
-      ActiveRecord::Base.establish_connection(@db)
-
       old_constants = constants
       begin
         eval(open(file).read)
@@ -60,8 +60,8 @@ module GetText
       loaded_constants.each do |classname|
 	klass = eval(classname)
 	if klass < ActiveRecord::Base
-	  tablename = klass.human_attribute_name(klass.class_name)
-	  targets << [tablename, "#{file}:-"]
+	  targets << [::Inflector.singularize(klass.table_name.gsub(/_/, " ")), "#{file}:-"]
+	  tablename = klass.class_name
 	  begin
 	    klass.columns.each do |column|
 	      if @config[:use_classname]
@@ -77,8 +77,10 @@ module GetText
 	end
       end
       if RubyParser.target?(file)
-	RubyParser.parse(file, targets)
+	targets = RubyParser.parse(file, targets)
       end
+      targets.uniq!
+      targets
     end
 
     def target?(file)
@@ -89,9 +91,8 @@ module GetText
 	  unless @db
 	    require 'rubygems'
 	    require 'active_record'
-	    yml = YAML.load_file(@config[:db_yml])
-	    @db = yml[:db_mode]
-	    @db = yml["production"] unless @db
+	    yml = YAML.load(ERB.new(IO.read(@config[:db_yml])).result)
+	    ENV["RAILS_ENV"] = @config[:db_mode]
 	    require_rails 'config/boot.rb'
 	    require_rails 'config/environment.rb'
 	    require_rails 'app/controllers/application.rb'

data/lib/gettext/parser/erb.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: erb.rb,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+  $Id: erb.rb,v 1.3 2006/01/07 13:39:13 mutoh Exp $
 =end
 
 require 'erb'
@@ -14,14 +14,27 @@ require 'gettext/parser/ruby.rb'
 
 module GetText
   module ErbParser
+    @config = {
+      :extnames => ['.rhtml']
+    }
+
     module_function
+    def init(config)
+      config.each{|k, v|
+	@config[k] = v
+      }
+    end
+
     def parse(file, targets = [])
       erb = ERB.new(IO.readlines(file).join).src.split(/$/)
       RubyParser.parse_lines(file, erb, targets)
     end
 
     def target?(file)
-      File.extname(file) == '.rhtml'
+      @config[:extnames].each do |v|
+	return true if File.extname(file) == v
+      end
+      false
     end
   end
 end

data/lib/gettext/parser/glade.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: glade.rb,v 1.2 2005/12/17 07:12:40 mutoh Exp $
+  $Id: glade.rb,v 1.3 2006/01/07 13:39:13 mutoh Exp $
 =end
 
 require 'cgi'
@@ -71,7 +71,10 @@ module GetText
 	if GLADE_RE =~ data[1]
 	  return true
 	else
-	  raise _("%s is not glade-2.0 format.") % [file]
+	  if File.extname(file) == '.glade'
+	    raise _("%s is not glade-2.0 format.") % [file]
+	  end
+	  return false
 	end
       else
 	return false

data/lib/gettext/poparser.rb

@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..id9163dcbd5f', 'src/poparser.ry', 90
+module_eval <<'..end src/poparser.ry modeval..id827ea1cb71', 'src/poparser.ry', 90
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -102,7 +102,7 @@ module_eval <<'..end src/poparser.ry modeval..id9163dcbd5f', 'src/poparser.ry',
     @comments << comment
   end 
 
-..end src/poparser.ry modeval..id9163dcbd5f
+..end src/poparser.ry modeval..id827ea1cb71
 
 ##### racc 1.4.4 generates ###
 

data/lib/gettext/rails.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.8 2005/12/28 17:32:58 mutoh Exp $
+  $Id: rails.rb,v 1.12 2006/01/14 13:48:22 mutoh Exp $
 =end
 
 require 'gettext'
@@ -33,19 +33,13 @@ module GetText
 
     def bindtextdomain_to(klass, domainname)
       klass.class_eval {
-	include GetText::Rails
-	extend GetText::Rails
 	textdomain(domainname)
 
 	def self.human_attribute_name(attribute_key_name)
-	  ret = ""
-	  if self == ActiveRecord::Base
-	    #Table name
-	    ret = _(attribute_key_name.humanize)
-	  else
-	    ret = s_("#{self}|#{attribute_key_name.humanize}")
-	  end
-          ret
+	  s_("#{self}|#{attribute_key_name.humanize}")
+	end
+	def self.human_attribute_table_name_for_error(table_name)
+	  _(table_name.gsub(/_/, " "))
 	end
       }
     end
@@ -57,6 +51,7 @@ module GetText
   end
 end
 
+
 module ActionController
   class Base
     helper GetText::Rails
@@ -74,7 +69,7 @@ module ActionController
     end
 
     def init_gettext
-      init_gettext_main
+      init_gettext_main if @@gettext_domainname
       ActiveRecord::Errors.class_eval{
 	# You need to call bindtextdomain here because ActiveRecord::Errors doesn't know
 	# what locale is used in.
@@ -88,9 +83,22 @@ module ActionController
       @@gettext_content_type = content_type
     end
   end
+
+  class TestRequest < AbstractRequest 
+    @cgi = nil
+    def cgi
+      @cgi = CGI.new unless @cgi
+      @cgi
+    end
+  end
 end
 
 module ActiveRecord
+  class Base
+    include GetText::Rails
+    extend GetText::Rails
+  end
+
   class Errors
     include GetText
     extend GetText
@@ -164,13 +172,14 @@ module ActionView
 	include GetText
 	extend GetText
 	module_function
-	def error_messages_for(object, klass, options = {})
+	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_name(object.class.to_s)
+	    record = ActiveRecord::Base.human_attribute_table_name_for_error(object_name)
 	    klass.content_tag("div",
 			klass.content_tag(
 				    options[:header_tag] || "h2",
@@ -187,7 +196,7 @@ module ActionView
       end
       def error_messages_for(object_name, options = {})
 	object = instance_variable_get("@#{object_name}")
-	L10n.error_messages_for(object, self, options)
+	L10n.error_messages_for(object, object_name, self, options)
       end
     end
   end