gettext_activerecord 2.0.1 → 2.0.2

data/ChangeLog

@@ -1,3 +1,9 @@
+= gettext_activerecord-2.0.2 (2009-05-07)
+
+  * Update version.
+  * Update Dutch translation [by Bart ten Brinke]
+  * Enhance ruby-1.9.1 support.
+
 = gettext_activerecord-2.0.1 (2009-04-18)
 
   * parser.rb: skip anonymous classes by TieTew.

data/README.rdoc

@@ -88,6 +88,8 @@ using Ruby-GetText-Package.
 See gettext_rails [http://github.com/mutoh/gettext_rails/tree/master]
 
 == Support matrix
+* 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
 
 == License
@@ -107,7 +109,8 @@ This program is licenced under the same licence as Ruby.
   * LIN CHUNG-YI <xmarsh at gmail.com>
 * Croatian(hr)               - Sanjin Sehic <saserr at gmail.com>
 * Czech(cs)                  - Karel Miarka <kajism at yahoo.com>
-* Dutch(nl)                  - Menno Jonkers <ruby-gettext at jonkers.com>
+* Dutch(nl)                  - Bart ten Brinke <info at retrosync.com> (current)
+                               Menno Jonkers <ruby-gettext at jonkers.com>
 * Esperanto(eo)              - Malte Milatz <malte at gmx-topmail.de>
 * Estonian(et)               - Erkki Eilonen <erkki at itech.ee>
 * French(fr)
@@ -148,7 +151,7 @@ This program is licenced under the same licence as Ruby.
 * Chinese(zh_CN)            - 2.0.0
 * Chinese(zh_TW)            - 2.0.0
 * Czech(cs)                 - 1.9.0 (old)
-* Dutch(nl)                 - 1.90.0 (old)
+* Dutch(nl)                 - 2.0.2
 * English(default)          - 1.90.0 (old)
 * Esperanto(eo)             - 2.0.0
 * Estonian(et)              - 2.0.0
@@ -157,7 +160,7 @@ This program is licenced under the same licence as Ruby.
 * Greek(el)                 - 2.0.0
 * Hungarian(hu)             - 2.0.0
 * Italian(it)               - 1.6.0 (old)
-* Japanese(ja)              - 2.0.0
+* Japanese(ja)              - 2.0.2
 * Korean(ko)                - 1.9.0 (old)
 * Latvian(lv)               - 2.0.0 
 * Norwegian(nb)             - 2.0.0

data/Rakefile

@@ -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.1')
+  s.add_dependency('gettext', '>= 2.0.2')
   s.add_dependency('activerecord', '>= 2.3.2')
   s.has_rdoc = true
   s.description = 'Localization support for ActiveRecord by Ruby-GetText-Package.'
@@ -97,7 +97,7 @@ Rake::RDocTask.new { |rdoc|
 }
 
 desc "Publish the release files to RubyForge."
-task :release => [:makemo, :package ] do
+task :release => [ :package ] do
   require 'rubyforge'
 
   rubyforge = RubyForge.new

data/lib/gettext_activerecord/base.rb

@@ -19,6 +19,10 @@ module ActiveRecord #:nodoc:
 
     class << self
       # Untranslate all of the tablename/fieldnames in this model class.
+      #  (e.g.)
+      #  Person < ActiveRecord::Base
+      #    untranslate_all
+      #  end
       def untranslate_all
         @@gettext_untranslate[self] = true
       end
@@ -29,7 +33,10 @@ module ActiveRecord #:nodoc:
       end
 
       # Sets the untranslate columns.
-      # (e.g.) untranslate :foo, :bar, :baz
+      #  (e.g.) 
+      #  Person < ActiveRecord::Base
+      #    untranslate :age, :address
+      #  end
       def untranslate(*w)
         ary = @@gettext_untranslate_columns[self] || []
         ary += w.collect{|v| v.to_s}
@@ -37,7 +44,7 @@ module ActiveRecord #:nodoc:
       end
       
       # Returns true if the column is set "untranslate".
-      # (e.g.) untranslate? :foo
+      #  (e.g.) untranslate? :foo
       def untranslate?(columnname)
         ary = @@gettext_untranslate_columns[self] || []
         ary.include?(columnname)

data/lib/gettext_activerecord/parser.rb

@@ -18,8 +18,6 @@ include GetText
 ActiveRecord::Base.instance_eval do
   alias inherited_without_log inherited
 
-  @@active_record_classes_list = []
-
   def inherited(subclass)
     puts "registering an ActiveRecord model for later processing: #{subclass}" if $DEBUG
     active_record_classes_list << "#{subclass}" unless subclass.name.empty?
@@ -27,11 +25,11 @@ ActiveRecord::Base.instance_eval do
   end
 
   def active_record_classes_list
-    @@active_record_classes_list
+    $active_record_classes_list ||= []
   end
 
   def reset_active_record_classes_list
-    @@active_record_classes_list = []
+    $active_record_classes_list = []
   end
 end
 
@@ -187,7 +185,6 @@ module GetText
               gem 'activerecord'
               require_rails 'activesupport'
               require_rails 'active_record'
-              require_rails 'activesupport'
               require_rails 'gettext_activerecord'
             end
             begin

data/lib/gettext_activerecord/tools.rb

@@ -14,9 +14,14 @@ require 'gettext_activerecord/parser'
 module GetText
   extend self
 
-  alias :create_mofiles_org :create_mofiles
-  alias :update_pofiles_org :update_pofiles
+  alias :create_mofiles_org :create_mofiles  #:nodoc:
+  alias :update_pofiles_org :update_pofiles  #:nodoc:
 
+  # update_pofiles for ActiveRecord.
+  # In this method, GetText::ActiveRecordParser.init is called 
+  # with "options".
+  #  (e.g.)
+  #  GetText.update_po_files("foo", Dir.glob("lib/**/*"), "1.0.0", :untranslate_classes = ["UntranslateClass"]
   def update_pofiles(textdomain, files, app_version, options = {})
     GetText::ActiveRecordParser.init(options)
     GetText.update_pofiles_org(textdomain, files, app_version, options)

data/lib/gettext_activerecord/validations.rb

@@ -156,7 +156,9 @@ module ActiveRecord #:nodoc:
           symbol = obj[:default][0].to_s.split(".").last.to_sym
           msgid = @@default_error_messages[symbol]
         end
-        attr, count, value = obj[:attribute], obj[:count], obj[:value]
+        #attr, count, value = obj[:attribute], obj[:count], obj[:value]
+        count, value = obj[:count], obj[:value]
+        attr = obj[:attribute] if obj[:attribute]
       end
       msgstr = @base.gettext(msgid)
       msgstr = _(msgid) if msgstr == msgid 

data/lib/gettext_activerecord/version.rb

@@ -8,5 +8,5 @@
 =end
 module GetTextActiveRecord
   RAILS_VERSION = "2.3.2"
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/po/nl/gettext_activerecord.po

@@ -5,6 +5,7 @@
 #
 # This file is distributed under the same license as the Ruby-GetText-Package.
 #
+# Bart ten Brinke <info at retrosync.com>, 2009.
 # Menno Jonkers <ruby-gettext at jonkers.com>, 2005-2007.
 #
 msgid ""
@@ -12,8 +13,8 @@ msgstr ""
 "Project-Id-Version: gettext_activerecord 0.1.0\n"
 "POT-Creation-Date: 2009-02-09 01:48+0900\n"
 "PO-Revision-Date: 2007-06-26 20:52+0100\n"
-"Last-Translator: Menno Jonkers <ruby_gettext at jonkers.com>\n"
-"Language-Team: Dutch <ruby_gettext at jonkers.com>\n"
+"Last-Translator: Bart ten Brinke <info at retrosync.com>\n"
+"Language-Team: Dutch <info at retrosync.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,19 +22,19 @@ msgstr ""
 
 #: lib/gettext_activerecord/parser.rb:60
 msgid "'%{file}' is not found."
-msgstr ""
+msgstr "Kan het bestand '%{file}' niet vinden."
 
 #: lib/gettext_activerecord/parser.rb:104
 msgid "Ignored '%{file}'. Solve dependencies first."
-msgstr ""
+msgstr "Bestand '%{file}' wordt overgeslagen. Dependency probleem."
 
 #: lib/gettext_activerecord/parser.rb:131
 msgid "No database is available."
-msgstr ""
+msgstr "Er is geen database beschikbaar."
 
 #: lib/gettext_activerecord/parser.rb:167
 msgid "rubygems are not found."
-msgstr ""
+msgstr "Kan rubygems niet vinden."
 
 #: lib/gettext_activerecord/active_record.rb:27
 msgid "Validation failed: %{error_messages}"
@@ -45,7 +46,7 @@ msgstr "%{attribute} komt niet voor in de lijst"
 
 #: lib/gettext_activerecord/active_record.rb:219
 msgid "%{attribute} is reserved"
-msgstr "%{attribute} is gereserveerd"
+msgstr "%{attribute} mag niet worden gebruikt"
 
 #: lib/gettext_activerecord/active_record.rb:220
 msgid "%{attribute} is invalid"
@@ -69,11 +70,11 @@ msgstr "%{attribute} mag niet leeg zijn"
 
 #: lib/gettext_activerecord/active_record.rb:225
 msgid "%{attribute} is too long (maximum is %{count} characters)"
-msgstr "%{attribute} is te lang (maximum is %{count} tekens)"
+msgstr "%{attribute} is te lang (maximaal %{count} tekens)"
 
 #: lib/gettext_activerecord/active_record.rb:226
 msgid "%{attribute} is too short (minimum is %{count} characters)"
-msgstr "%{attribute} is te kort (minimum is %{count} tekens)"
+msgstr "%{attribute} is te kort (minimaal %{count} tekens)"
 
 #: lib/gettext_activerecord/active_record.rb:227
 msgid "%{attribute} is the wrong length (should be %{count} characters)"
@@ -88,36 +89,29 @@ msgid "%{attribute} is not a number"
 msgstr "%{attribute} is geen getal"
 
 #: lib/gettext_activerecord/active_record.rb:230
-#, fuzzy
 msgid "%{attribute} must be greater than %{count}"
-msgstr "%{attribute} moet geaccepteerd worden"
+msgstr "%{attribute} moet groter zijn dan %{count}"
 
 #: lib/gettext_activerecord/active_record.rb:231
-#, fuzzy
 msgid "%{attribute} must be greater than or equal to %{count}"
-msgstr "%{attribute} moet geaccepteerd worden"
+msgstr "%{attribute} moet groter of gelijk zijn aan %{count}"
 
 #: lib/gettext_activerecord/active_record.rb:232
-#, fuzzy
 msgid "%{attribute} must be equal to %{count}"
-msgstr "%{attribute} moet geaccepteerd worden"
+msgstr "%{attribute} moet gelijk zijn aan %{count}"
 
 #: lib/gettext_activerecord/active_record.rb:233
-#, fuzzy
 msgid "%{attribute} must be less than %{count}"
-msgstr "%{attribute} moet geaccepteerd worden"
+msgstr "%{attribute} moet minder zijn dan %{count}"
 
 #: lib/gettext_activerecord/active_record.rb:234
-#, fuzzy
 msgid "%{attribute} must be less than or equal to %{count}"
-msgstr "%{attribute} moet geaccepteerd worden"
+msgstr "%{attribute} moet minder dan of gelijk zijn aan %{count}"
 
 #: lib/gettext_activerecord/active_record.rb:235
-#, fuzzy
 msgid "%{attribute} must be odd"
-msgstr "%{attribute} moet geaccepteerd worden"
+msgstr "%{attribute} moet een oneven aantal zijn"
 
 #: lib/gettext_activerecord/active_record.rb:236
-#, fuzzy
 msgid "%{attribute} must be even"
-msgstr "%{attribute} moet geaccepteerd worden"
+msgstr "%{attribute} moet even aantal zijn"

data/test/Rakefile

@@ -38,6 +38,6 @@ end
 desc 'Run all tests'
 task :test do
   Dir.glob("test_*.rb").each do |path|
-    ruby "-I../lib", "-I#{gettext_path}", "-rubygems", path rescue nil
+    ruby "-I../lib:../../locale/lib", "-I#{gettext_path}", "-rubygems", path rescue nil
   end
 end

data/test/db/sqlite.rb

@@ -1,6 +1,11 @@
 #create a connection
+if /java/ =~ RUBY_PLATFORM
+  adapter = "jdbcsqlite3"
+else
+  adapter = "sqlite3"
+end
 ActiveRecord::Base.configurations = {"test" => {
-  :adapter => "sqlite3",
+  :adapter => adapter,
   :database => ":memory:"
 }.with_indifferent_access}
 

data/test/helper.rb

@@ -1,4 +1,8 @@
-$KCODE = "UTF8"
+# encoding: utf-8
+
+unless RUBY_VERSION >= "1.9.0"
+  $KCODE = "UTF8"
+end
 $LOAD_PATH.unshift "."
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '/../lib')
 

data/test/test_validations.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'helper'
 
 require 'models/topic'
@@ -108,11 +109,11 @@ class ValidationsTest < ActiveRecord::TestCase
     assert !r.save
 
     assert r.errors.invalid?("title"), "A reply without title should mark that attribute as invalid"
-    assert_equal "Replyタイトル 空です。", r.errors.full_messages[0]
+    assert_equal ["Replyタイトル 空です。", "Reply内容 空です。"].sort, r.errors.full_messages.sort
     assert_equal "空です。", r.errors.on("title")
 
     assert r.errors.invalid?("content"), "A reply without content should mark that attribute as invalid"
-    assert_equal "Reply内容 空です。", r.errors.full_messages[1]
+    assert_equal ["Replyタイトル 空です。", "Reply内容 空です。"].sort, r.errors.full_messages.sort
     assert_equal "空です。", r.errors.on("content")
 
     assert_equal 2, r.errors.count
@@ -122,11 +123,11 @@ class ValidationsTest < ActiveRecord::TestCase
     assert !r.save
 
     assert r.errors.invalid?("title"), "A reply without title should mark that attribute as invalid"
-    assert_equal "Title Empty", r.errors.full_messages[0]
+    assert_equal ["Content Empty", "Title Empty"], r.errors.full_messages.sort
     assert_equal "Empty", r.errors.on("title"), "A reply without title should contain an error"
 
     assert r.errors.invalid?("content"), "A reply without content should mark that attribute as invalid"
-    assert_equal "Content Empty", r.errors.full_messages[1]
+    assert_equal ["Content Empty", "Title Empty"], r.errors.full_messages.sort
     assert_equal "Empty", r.errors.on("content"), "A reply without content should contain an error"
 
     assert_equal 2, r.errors.count
@@ -138,7 +139,7 @@ class ValidationsTest < ActiveRecord::TestCase
     r.title = "Wrong Create"
     assert !r.save
     assert r.errors.invalid?("title"), "A reply with a bad title should mark that attribute as invalid"
-    assert_equal "Replyタイトル が不正に生成されました。", r.errors.full_messages[0]
+    assert_equal ["Replyタイトル が不正に生成されました。", "Reply内容 空です。"], r.errors.full_messages.sort
     assert_equal "が不正に生成されました。", r.errors.on("title")
 
     GetText.set_locale "en"
@@ -146,7 +147,7 @@ class ValidationsTest < ActiveRecord::TestCase
     r.title = "Wrong Create"
     assert !r.save
     assert r.errors.invalid?("title"), "A reply with a bad title should mark that attribute as invalid"
-    assert_equal "Title is Wrong Create", r.errors.full_messages[0]
+    assert_equal ["Content Empty", "Title is Wrong Create"], r.errors.full_messages.sort
     assert_equal "is Wrong Create", r.errors.on("title")
   end
 
@@ -188,7 +189,7 @@ class ValidationsTest < ActiveRecord::TestCase
       flunk
     rescue ActiveRecord::RecordInvalid => invalid
       assert_equal r, invalid.record
-      assert_equal "入力値が正しくありません。: Replyタイトル 空です。, Reply内容 空です。", invalid.message
+      assert ["入力値が正しくありません。: Replyタイトル 空です。, Reply内容 空です。", "入力値が正しくありません。: Reply内容 空です。, Replyタイトル 空です。"].include? invalid.message
     end
 
     GetText.set_locale "en"
@@ -198,7 +199,7 @@ class ValidationsTest < ActiveRecord::TestCase
       flunk
     rescue ActiveRecord::RecordInvalid => invalid
       assert_equal r, invalid.record
-      assert_equal "Validation failed: Title Empty, Content Empty", invalid.message
+      assert ["Validation failed: Title Empty, Content Empty", "Validation failed: Content Empty, Title Empty"].include? invalid.message
     end
   end
 
@@ -283,7 +284,7 @@ class ValidationsTest < ActiveRecord::TestCase
       begin
         Reply.create!
       rescue ActiveRecord::RecordInvalid => invalid
-        assert_equal "入力値が正しくありません。: Replyタイトル 空です。, Reply内容 空です。", invalid.message
+        assert ["入力値が正しくありません。: Replyタイトル 空です。, Reply内容 空です。", "入力値が正しくありません。: Reply内容 空です。, Replyタイトル 空です。"].include? invalid.message
       end
     end
 
@@ -292,7 +293,7 @@ class ValidationsTest < ActiveRecord::TestCase
       begin
         Reply.create!
       rescue ActiveRecord::RecordInvalid => invalid
-        assert_equal "Validation failed: Title Empty, Content Empty", invalid.message
+        assert ["Validation failed: Title Empty, Content Empty", "Validation failed: Content Empty, Title Empty"].include? invalid.message
       end
     end
   end
@@ -2360,42 +2361,31 @@ class ValidationsTest < ActiveRecord::TestCase
     GetText.set_locale "ja_JP.UTF-8"
     t = Topic.create
     assert !t.save
-    assert_equal "タイトルを入力してください。", t.errors.full_messages[0]
-    assert_equal "内容を入力してください。", t.errors.full_messages[1]
+    assert_equal ["タイトルを入力してください。", "内容を入力してください。"].sort, t.errors.full_messages.sort
     assert_equal "タイトルを入力してください。", t.errors.on(:title)
     assert_equal "内容を入力してください。", t.errors.on(:content)
 
     t = Reply.create
     assert !t.save
-    assert_equal "Replyタイトルを入力してください。", t.errors.full_messages[0]
-    assert_equal "Replyタイトル 空です。", t.errors.full_messages[1]
-    assert_equal "Reply内容を入力してください。", t.errors.full_messages[2]
-    assert_equal "Reply内容 空です。", t.errors.full_messages[3]
+    assert_equal ["Replyタイトルを入力してください。", "Replyタイトル 空です。", "Reply内容を入力してください。", "Reply内容 空です。"].sort, t.errors.full_messages.sort
     assert_equal ["Replyタイトルを入力してください。","空です。"], t.errors.on(:title)
     assert_equal ["Reply内容を入力してください。", "空です。"], t.errors.on(:content)
 
     t = Reply.create
     t.title = "Wrong Create"
     assert !t.save
-    assert_equal "Replyタイトル が不正に生成されました。", t.errors.full_messages[0]
-    assert_equal "Reply内容を入力してください。", t.errors.full_messages[1]
-    assert_equal "Reply内容 空です。", t.errors.full_messages[2]
+    assert_equal ["Replyタイトル が不正に生成されました。", "Reply内容を入力してください。", "Reply内容 空です。"].sort, t.errors.full_messages.sort
 
     t = SillyReply.create
     assert !t.save
-    assert_equal "Sillyタイトルを入力してください。", t.errors.full_messages[0]
-    assert_equal "Sillyタイトル 空です。", t.errors.full_messages[1]
-    assert_equal "Silly内容を入力してください。", t.errors.full_messages[2]
-    assert_equal "Silly内容 空です。", t.errors.full_messages[3]
+    assert_equal ["Sillyタイトルを入力してください。", "Sillyタイトル 空です。", "Silly内容を入力してください。", "Silly内容 空です。"].sort, t.errors.full_messages.sort
     assert_equal ["Sillyタイトルを入力してください。","空です。"], t.errors.on(:title)
     assert_equal ["Silly内容を入力してください。","空です。"], t.errors.on(:content)
 
     t = SillyReply.create
     t.title = "Wrong Create"
     assert !t.save
-    assert_equal "Sillyタイトル が不正に生成されました。", t.errors.full_messages[0]
-    assert_equal "Silly内容を入力してください。", t.errors.full_messages[1]
-    assert_equal "Silly内容 空です。", t.errors.full_messages[2]
+    assert_equal ["Sillyタイトル が不正に生成されました。", "Silly内容を入力してください。", "Silly内容 空です。"].sort, t.errors.full_messages.sort
   end
 
   def test_original_model_with_validation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_activerecord
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Masao Mutoh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 +09:00
+date: 2009-05-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 2.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord