@@ -25,15 +25,10 @@ using Ruby-GetText-Package. (sudo/su on POSIX system) gem uninstall gettext - #from github (edge/unstable) + #from rubyforge (sudo/su on POSIX system) gem install locale - gem install mutoh-gettext -s http://gems.github.com/ - - #from rubyforge (stable) - (sudo/su on POSIX system) - gem install locale - gem install gettext + gem install gettext_activerecord == Usage === without Rails @@ -88,6 +83,7 @@ using Ruby-GetText-Package. See gettext_rails [http://github.com/mutoh/gettext_rails/tree/master] == Support matrix +* gettext_activerecord-2.1.0 - rails-2.3.2,2.3.3,2.3.4 * gettext_activerecord-2.0.2 - rails-2.3.2 * gettext_activerecord-2.0.1 - rails-2.3.2 * gettext_activerecord-2.0.0 - rails-2.3.2 README.rdoc @@ -64,7 +64,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "gettext" s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|git/} s.require_path = 'lib' - s.add_dependency('gettext', '>= 2.0.4') + s.add_dependency('gettext', '>= 2.1.0') s.add_dependency('activerecord', '>= 2.3.2') s.has_rdoc = true s.description = 'Localization support for ActiveRecord by Ruby-GetText-Package.' Rakefile @@ -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 lib/gettext_activerecord.rb @@ -4,9 +4,7 @@ Copyright (C) 2009 Masao Mutoh You may redistribute it and/or modify it under the same - license terms as Ruby. - - $Id$ + license terms as Ruby or LGPL. =end module ActiveRecord #:nodoc: lib/gettext_activerecord/base.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 module I18n #:nodoc: lib/gettext_activerecord/i18n.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 lib/gettext_activerecord/migration.rb @@ -4,14 +4,13 @@ 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. - $Id$ =end require 'gettext' require 'gettext/tools/rgettext' -require 'gettext/parser/ruby' +require 'gettext/tools/parser/ruby' include GetText @@ -146,22 +145,16 @@ module GetText end end if RubyParser.target?(file) - targets = RubyParser.parse(file, targets) + targets += RubyParser.parse(file) end - targets.uniq! targets end def add_target(targets, file, msgid) # :nodoc: - file_lineno = "#{file}:-" - key_existed = targets.assoc(msgid) - if key_existed - unless targets[targets.index(key_existed)].include?(file_lineno) - targets[targets.index(key_existed)] = key_existed << file_lineno - end - else - targets << [msgid, "#{file}:-"] - end + po = PoMessage.new(:normal) + po.msgid = msgid + po.sources << "#{file}:-" + targets << po targets end lib/gettext_activerecord/parser.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 lib/gettext_activerecord/schema_definitions.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 require 'gettext/tools' lib/gettext_activerecord/tools.rb @@ -4,9 +4,7 @@ Copyright (C) 2006-2009 Masao Mutoh You may redistribute it and/or modify it under the same - license terms as Ruby. - - $Id$ + license terms as Ruby or LGPL. =end module ActiveRecord #:nodoc: lib/gettext_activerecord/validations.rb @@ -4,9 +4,9 @@ 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 module GetTextActiveRecord - RAILS_VERSION = "2.3.2" - VERSION = "2.0.4" + RAILS_VERSION = "2.3.4" + VERSION = "2.1.0" end lib/gettext_activerecord/version.rb @@ -12,7 +12,7 @@ require 'active_record' # use local gettext or current gettext gem begin - $LOAD_PATH.unshift ENV["GETTEXT_LIB_PATH"] || "../../gettext/lib" + $LOAD_PATH.unshift ENV["GETTEXT_LIB_PATH"] || "../../gettext/lib:../" require 'gettext' rescue LoadError gem 'gettext', '>=2.0.0' test/helper.rb @@ -1,6 +1,6 @@ require 'models/topic' -class Reply < Topic +class Reply < Topic # ActiveRecord::Base N_("Reply|Topic") # Need to define relation table names explicity # if you use it in validations. test/models/reply.rb @@ -10,65 +10,68 @@ require 'gettext_activerecord/tools' #) class TestGetTextParser < Test::Unit::TestCase + def assert_parser(ary, po) + poary = [po.msgid, *po.sources] + assert_equal(ary, poary) + end + def test_class - GetText::ActiveRecordParser.target?("models/topic.rb") - ary = GetText::ActiveRecordParser.parse("models/topic.rb") + ary = GetText::RGetText.parse("models/topic.rb") assert_equal(14, ary.size) - assert_equal(["topic", "models/topic.rb:-"], ary[0]) - assert_equal(["Topic|Title", "models/topic.rb:-"], ary[1]) - assert_equal(["Topic|Author name", "models/topic.rb:-"], ary[2]) - assert_equal(["Topic|Author email address", "models/topic.rb:-"], ary[3]) - assert_equal(["Topic|Written on", "models/topic.rb:-"], ary[4]) - assert_equal(["Topic|Bonus time", "models/topic.rb:-"], ary[5]) - assert_equal(["Topic|Last read", "models/topic.rb:-"], ary[6]) - assert_equal(["Topic|Content", "models/topic.rb:-"], ary[7]) - assert_equal(["Topic|Approved", "models/topic.rb:-"], ary[8]) - assert_equal(["Topic|Replies count", "models/topic.rb:-"], ary[9]) - assert_equal(["Topic|Parent", "models/topic.rb:-"], ary[10]) - assert_equal(["Topic|Type", "models/topic.rb:-"], ary[11]) - assert_equal(["Topic|Terms of service", "models/topic.rb:35"], ary[12]) - assert_equal(["must be abided", "models/topic.rb:36"], ary[13]) + assert_parser(["topic", "models/topic.rb:-"], ary[0]) + assert_parser(["Topic|Title", "models/topic.rb:-"], ary[1]) + assert_parser(["Topic|Author name", "models/topic.rb:-"], ary[2]) + assert_parser(["Topic|Author email address", "models/topic.rb:-"], ary[3]) + assert_parser(["Topic|Written on", "models/topic.rb:-"], ary[4]) + assert_parser(["Topic|Bonus time", "models/topic.rb:-"], ary[5]) + assert_parser(["Topic|Last read", "models/topic.rb:-"], ary[6]) + assert_parser(["Topic|Content", "models/topic.rb:-"], ary[7]) + assert_parser(["Topic|Approved", "models/topic.rb:-"], ary[8]) + assert_parser(["Topic|Replies count", "models/topic.rb:-"], ary[9]) + assert_parser(["Topic|Parent", "models/topic.rb:-"], ary[10]) + assert_parser(["Topic|Type", "models/topic.rb:-"], ary[11]) + assert_parser(["Topic|Terms of service", "models/topic.rb:35"], ary[12]) + assert_parser(["must be abided", "models/topic.rb:36"], ary[13]) end def test_subclass - GetText::ActiveRecordParser.target?("models/reply.rb") - ary = GetText::ActiveRecordParser.parse("models/reply.rb") + ary = GetText::RGetText.parse("models/reply.rb") ary.sort!{|a, b| a[0].downcase <=> b[0].downcase} assert_equal(30, ary.size) - assert_equal(["Empty", "models/reply.rb:16", "models/reply.rb:20"], ary[0]) - assert_equal(["is Content Mismatch", "models/reply.rb:25"], ary[1]) - assert_equal(["is Wrong Create", "models/reply.rb:30"], ary[2]) - assert_equal(["is Wrong Update", "models/reply.rb:34"], ary[3]) - assert_equal(["reply", "models/reply.rb:-"], ary[4]) - assert_equal(["Reply|Approved", "models/reply.rb:-"], ary[5]) - assert_equal(["Reply|Author email address", "models/reply.rb:-"], ary[6]) - assert_equal(["Reply|Author name", "models/reply.rb:-"], ary[7]) - assert_equal(["Reply|Bonus time", "models/reply.rb:-"], ary[8]) - assert_equal(["Reply|Content", "models/reply.rb:-"], ary[9]) - assert_equal(["Reply|Last read", "models/reply.rb:-"], ary[10]) - assert_equal(["Reply|Parent", "models/reply.rb:-"], ary[11]) - assert_equal(["Reply|Replies count", "models/reply.rb:-"], ary[12]) - assert_equal(["Reply|Title", "models/reply.rb:-"], ary[13]) + assert_parser(["Empty", "models/reply.rb:16", "models/reply.rb:20"], ary[0]) + assert_parser(["is Content Mismatch", "models/reply.rb:25"], ary[1]) + assert_parser(["is Wrong Create", "models/reply.rb:30"], ary[2]) + assert_parser(["is Wrong Update", "models/reply.rb:34"], ary[3]) + assert_parser(["reply", "models/reply.rb:-"], ary[4]) + assert_parser(["Reply|Approved", "models/reply.rb:-"], ary[5]) + assert_parser(["Reply|Author email address", "models/reply.rb:-"], ary[6]) + assert_parser(["Reply|Author name", "models/reply.rb:-"], ary[7]) + assert_parser(["Reply|Bonus time", "models/reply.rb:-"], ary[8]) + assert_parser(["Reply|Content", "models/reply.rb:-"], ary[9]) + assert_parser(["Reply|Last read", "models/reply.rb:-"], ary[10]) + assert_parser(["Reply|Parent", "models/reply.rb:-"], ary[11]) + assert_parser(["Reply|Replies count", "models/reply.rb:-"], ary[12]) + assert_parser(["Reply|Title", "models/reply.rb:-"], ary[13]) # this target is from N_(). - assert_equal(["Reply|Topic", "models/reply.rb:4"], ary[14]) - assert_equal(["Reply|Type", "models/reply.rb:-"], ary[15]) - assert_equal(["Reply|Written on", "models/reply.rb:-"], ary[16]) + assert_parser(["Reply|Topic", "models/reply.rb:4"], ary[14]) + assert_parser(["Reply|Type", "models/reply.rb:-"], ary[15]) + assert_parser(["Reply|Written on", "models/reply.rb:-"], ary[16]) - assert_equal(["sillyreply", "models/reply.rb:-"], ary[17]) - assert_equal(["SillyReply|Approved", "models/reply.rb:-"], ary[18]) - assert_equal(["SillyReply|Author email address", "models/reply.rb:-"], ary[19]) - assert_equal(["SillyReply|Author name", "models/reply.rb:-"], ary[20]) - assert_equal(["SillyReply|Bonus time", "models/reply.rb:-"], ary[21]) - assert_equal(["SillyReply|Content", "models/reply.rb:-"], ary[22]) - assert_equal(["SillyReply|Last read", "models/reply.rb:-"], ary[23]) - assert_equal(["SillyReply|Parent", "models/reply.rb:-"], ary[24]) - assert_equal(["SillyReply|Replies count", "models/reply.rb:-"], ary[25]) - assert_equal(["SillyReply|Title", "models/reply.rb:-"], ary[26]) - assert_equal(["SillyReply|Type", "models/reply.rb:-"], ary[27]) - assert_equal(["SillyReply|Written on", "models/reply.rb:-"], ary[28]) + assert_parser(["sillyreply", "models/reply.rb:-"], ary[17]) + assert_parser(["SillyReply|Approved", "models/reply.rb:-"], ary[18]) + assert_parser(["SillyReply|Author email address", "models/reply.rb:-"], ary[19]) + assert_parser(["SillyReply|Author name", "models/reply.rb:-"], ary[20]) + assert_parser(["SillyReply|Bonus time", "models/reply.rb:-"], ary[21]) + assert_parser(["SillyReply|Content", "models/reply.rb:-"], ary[22]) + assert_parser(["SillyReply|Last read", "models/reply.rb:-"], ary[23]) + assert_parser(["SillyReply|Parent", "models/reply.rb:-"], ary[24]) + assert_parser(["SillyReply|Replies count", "models/reply.rb:-"], ary[25]) + assert_parser(["SillyReply|Title", "models/reply.rb:-"], ary[26]) + assert_parser(["SillyReply|Type", "models/reply.rb:-"], ary[27]) + assert_parser(["SillyReply|Written on", "models/reply.rb:-"], ary[28]) - assert_equal(["topic", "models/reply.rb:-"], ary[29]) + assert_parser(["topic", "models/reply.rb:-"], ary[29]) end def test_untranslate @@ -76,10 +79,10 @@ class TestGetTextParser < Test::Unit::TestCase ary = GetText::ActiveRecordParser.parse("models/book.rb") ary.sort!{|a, b| a[0].downcase <=> b[0].downcase} assert_equal(4, ary.size) - assert_equal(["book", "models/book.rb:-"], ary[0]) - assert_equal(["Book|Created at", "models/book.rb:-"], ary[1]) - assert_equal(["Book|Price", "models/book.rb:-"], ary[2]) - assert_equal(["Book|Updated at", "models/book.rb:-"], ary[3]) + assert_parser(["book", "models/book.rb:-"], ary[0]) + assert_parser(["Book|Created at", "models/book.rb:-"], ary[1]) + assert_parser(["Book|Price", "models/book.rb:-"], ary[2]) + assert_parser(["Book|Updated at", "models/book.rb:-"], ary[3]) end def test_untranslate_all test/test_parser.rb 3ad19d71a25b7337e2049fbe84688802747a852d Masao Mutoh mutomasa@gmail.com http://github.com/mutoh/gettext_activerecord/commit/0ca4c1fb124a0b25427274e3e321b57c15fef8c5 0ca4c1fb124a0b25427274e3e321b57c15fef8c5 2009-10-25T07:08:06-07:00 2009-10-25T07:08:06-07:00 Support activerecord-2.3.4. Update to work with gettext-2.1.0. fbc736d8c80e67acdc21e2ecaf38c5eb56214c54 Masao Mutoh mutomasa@gmail.com