gettext 1.10.0 → 1.90.0
Sign up to get free protection for your applications and to get access to all the features.
- data/ChangeLog +156 -2
- data/NEWS +28 -0
- data/README +128 -138
- data/Rakefile +83 -43
- data/data/locale/es/LC_MESSAGES/rails.mo +0 -0
- data/data/locale/hu/LC_MESSAGES/rails.mo +0 -0
- data/data/locale/hu/LC_MESSAGES/rgettext.mo +0 -0
- data/data/locale/ua/LC_MESSAGES/rails.mo +0 -0
- data/data/locale/ua/LC_MESSAGES/rgettext.mo +0 -0
- data/doc/classes/ActiveRecord/Base.html +360 -0
- data/doc/classes/ActiveRecord/ConnectionAdapters/Column.html +182 -0
- data/doc/classes/ActiveRecord/Migration.html +118 -0
- data/doc/classes/GetText.html +1790 -0
- data/doc/classes/GetText/ActiveRecordParser.html +236 -0
- data/doc/classes/GetText/Container.html +119 -0
- data/doc/classes/GetText/ErbContainer.html +223 -0
- data/doc/classes/GetText/ErbParser.html +156 -0
- data/doc/classes/GetText/GladeParser.html +133 -0
- data/doc/classes/GetText/NoboundTextDomainError.html +119 -0
- data/doc/classes/GetText/PoParser.html +169 -0
- data/doc/classes/GetText/Rails.html +293 -0
- data/doc/classes/GetText/RubyParser.html +123 -0
- data/doc/classes/GetText/TextDomain.html +572 -0
- data/doc/classes/GetText/TextDomainManager.html +443 -0
- data/doc/classes/Iconv.html +257 -0
- data/doc/classes/Iconv/Failure.html +105 -0
- data/doc/classes/Iconv/IllegalSequence.html +118 -0
- data/doc/classes/Iconv/InvalidCharacter.html +118 -0
- data/doc/classes/Iconv/InvalidEncoding.html +118 -0
- data/doc/classes/Locale.html +839 -0
- data/doc/classes/Locale/Object.html +799 -0
- data/doc/classes/Locale/SystemBase.html +271 -0
- data/doc/classes/Locale/SystemCGI.html +312 -0
- data/doc/classes/Locale/SystemJRuby.html +112 -0
- data/doc/classes/Locale/SystemPosix.html +113 -0
- data/doc/classes/Locale/SystemWin32.html +182 -0
- data/doc/classes/MOFile.html +678 -0
- data/doc/classes/MOFile/InvalidFormat.html +111 -0
- data/doc/classes/Module.html +158 -0
- data/doc/classes/String.html +225 -0
- data/doc/created.rid +1 -0
- data/doc/files/ChangeLog.html +2355 -0
- data/doc/files/README.html +510 -0
- data/doc/files/lib/gettext/active_record_rb.html +110 -0
- data/doc/files/lib/gettext/cgi_rb.html +110 -0
- data/doc/files/lib/gettext/container_rb.html +108 -0
- data/doc/files/lib/gettext/erb_rb.html +109 -0
- data/doc/files/lib/gettext/iconv_rb.html +109 -0
- data/doc/files/lib/gettext/mo_rb.html +108 -0
- data/doc/files/lib/gettext/parser/active_record_rb.html +119 -0
- data/doc/files/lib/gettext/parser/erb_rb.html +109 -0
- data/doc/files/lib/gettext/parser/glade_rb.html +109 -0
- data/doc/files/lib/gettext/parser/ruby_rb.html +110 -0
- data/doc/files/lib/gettext/poparser_rb.html +108 -0
- data/doc/files/lib/gettext/rails_compat_rb.html +108 -0
- data/doc/files/lib/gettext/rails_rb.html +112 -0
- data/doc/files/lib/gettext/rgettext_rb.html +110 -0
- data/doc/files/lib/gettext/rmsgfmt_rb.html +112 -0
- data/doc/files/lib/gettext/rmsgmerge_rb.html +112 -0
- data/doc/files/lib/gettext/string_rb.html +101 -0
- data/doc/files/lib/gettext/textdomain_rb.html +109 -0
- data/doc/files/lib/gettext/textdomainmanager_rb.html +109 -0
- data/doc/files/lib/gettext/utils_rb.html +111 -0
- data/doc/files/lib/gettext/version_rb.html +101 -0
- data/doc/files/lib/gettext_rb.html +113 -0
- data/doc/files/lib/locale/base_rb.html +101 -0
- data/doc/files/lib/locale/cgi_rb.html +108 -0
- data/doc/files/lib/locale/jruby_rb.html +110 -0
- data/doc/files/lib/locale/object_rb.html +101 -0
- data/doc/files/lib/locale/posix_rb.html +108 -0
- data/doc/files/lib/locale/win32_rb.html +110 -0
- data/doc/files/lib/locale/win32_table_rb.html +101 -0
- data/doc/files/lib/locale_rb.html +111 -0
- data/doc/fr_class_index.html +57 -0
- data/doc/fr_file_index.html +58 -0
- data/doc/fr_method_index.html +155 -0
- data/doc/index.html +24 -0
- data/doc/rdoc-style.css +208 -0
- data/lib/gettext.rb +102 -50
- data/lib/gettext/cgi.rb +2 -27
- data/lib/gettext/iconv.rb +76 -62
- data/lib/gettext/mo.rb +3 -3
- data/lib/gettext/parser/erb.rb +2 -2
- data/lib/gettext/rails.rb +69 -48
- data/lib/gettext/rgettext.rb +2 -2
- data/lib/gettext/rmsgmerge.rb +2 -2
- data/lib/gettext/string.rb +9 -5
- data/lib/gettext/textdomain.rb +3 -3
- data/lib/gettext/textdomainmanager.rb +5 -5
- data/lib/gettext/utils.rb +4 -3
- data/lib/gettext/version.rb +1 -1
- data/lib/{gettext/locale.rb → locale.rb} +11 -58
- data/lib/locale/base.rb +60 -0
- data/lib/{gettext/locale_cgi.rb → locale/cgi.rb} +30 -28
- data/lib/locale/jruby.rb +36 -0
- data/lib/{gettext/locale_object.rb → locale/object.rb} +78 -24
- data/lib/locale/posix.rb +22 -0
- data/lib/locale/win32.rb +48 -0
- data/lib/{gettext/locale_table_win32.rb → locale/win32_table.rb} +3 -2
- data/po/es/rails.po +1 -2
- data/po/hu/rails.po +139 -0
- data/po/hu/rgettext.po +126 -0
- data/po/ja/rails.po +5 -5
- data/po/ua/rails.po +150 -0
- data/po/ua/rgettext.po +132 -0
- data/pre-setup.rb +2 -4
- data/samples/cgi/cookie.cgi +1 -0
- data/samples/cgi/helloerb1.cgi +6 -3
- data/samples/cgi/helloerb2.cgi +6 -3
- data/samples/cgi/http.rb +3 -7
- data/samples/cgi/index.cgi +2 -1
- data/samples/cgi/locale/hu/LC_MESSAGES/helloerb1.mo +0 -0
- data/samples/cgi/locale/hu/LC_MESSAGES/helloerb2.mo +0 -0
- data/samples/cgi/locale/hu/LC_MESSAGES/hellolib.mo +0 -0
- data/samples/cgi/locale/hu/LC_MESSAGES/main.mo +0 -0
- data/samples/cgi/locale/ua/LC_MESSAGES/helloerb1.mo +0 -0
- data/samples/cgi/locale/ua/LC_MESSAGES/helloerb2.mo +0 -0
- data/samples/cgi/locale/ua/LC_MESSAGES/hellolib.mo +0 -0
- data/samples/cgi/locale/ua/LC_MESSAGES/main.mo +0 -0
- data/samples/cgi/po/hu/helloerb1.po +59 -0
- data/samples/cgi/po/hu/helloerb2.po +51 -0
- data/samples/cgi/po/hu/hellolib.po +23 -0
- data/samples/cgi/po/hu/main.po +82 -0
- data/samples/cgi/po/ua/helloerb1.po +62 -0
- data/samples/cgi/po/ua/helloerb2.po +54 -0
- data/samples/cgi/po/ua/hellolib.po +26 -0
- data/samples/cgi/po/ua/main.po +84 -0
- data/samples/locale/hu/LC_MESSAGES/hello.mo +0 -0
- data/samples/locale/hu/LC_MESSAGES/hello2.mo +0 -0
- data/samples/locale/hu/LC_MESSAGES/hello_noop.mo +0 -0
- data/samples/locale/hu/LC_MESSAGES/hello_plural.mo +0 -0
- data/samples/locale/hu/LC_MESSAGES/helloglade2.mo +0 -0
- data/samples/locale/hu/LC_MESSAGES/hellogtk.mo +0 -0
- data/samples/locale/hu/LC_MESSAGES/hellotk.mo +0 -0
- data/samples/locale/ua/LC_MESSAGES/hello.mo +0 -0
- data/samples/locale/ua/LC_MESSAGES/hello2.mo +0 -0
- data/samples/locale/ua/LC_MESSAGES/hello_noop.mo +0 -0
- data/samples/locale/ua/LC_MESSAGES/hello_plural.mo +0 -0
- data/samples/locale/ua/LC_MESSAGES/helloglade2.mo +0 -0
- data/samples/locale/ua/LC_MESSAGES/hellogtk.mo +0 -0
- data/samples/locale/ua/LC_MESSAGES/hellotk.mo +0 -0
- data/samples/po/hu/hello.po +22 -0
- data/samples/po/hu/hello2.po +30 -0
- data/samples/po/hu/hello_noop.po +26 -0
- data/samples/po/hu/hello_plural.po +25 -0
- data/samples/po/hu/helloglade2.po +31 -0
- data/samples/po/hu/hellogtk.po +22 -0
- data/samples/po/hu/hellotk.po +23 -0
- data/samples/po/ua/hello.po +22 -0
- data/samples/po/ua/hello2.po +30 -0
- data/samples/po/ua/hello_noop.po +26 -0
- data/samples/po/ua/hello_plural.po +29 -0
- data/samples/po/ua/helloglade2.po +34 -0
- data/samples/po/ua/hellogtk.po +22 -0
- data/samples/po/ua/hellotk.po +26 -0
- data/samples/rails/README +15 -31
- data/samples/rails/Rakefile +1 -1
- data/samples/rails/app/controllers/application.rb +11 -4
- data/samples/rails/app/controllers/articles_controller.rb +96 -0
- data/samples/rails/app/helpers/application_helper.rb +1 -1
- data/samples/rails/app/helpers/{blog_helper.rb → articles_helper.rb} +6 -7
- data/samples/rails/app/views/articles/edit.html.erb +18 -0
- data/samples/rails/app/views/articles/index.html.erb +17 -0
- data/samples/rails/app/views/articles/new.html.erb +16 -0
- data/samples/rails/app/views/articles/show.html.erb +6 -0
- data/samples/rails/app/views/layouts/articles.html.erb +26 -0
- data/samples/rails/config/boot.rb +104 -13
- data/samples/rails/config/database.yml +24 -21
- data/samples/rails/config/environment.rb +35 -30
- data/samples/rails/config/environments/development.rb +5 -6
- data/samples/rails/config/environments/production.rb +2 -3
- data/samples/rails/config/environments/test.rb +5 -2
- data/samples/rails/config/initializers/inflections.rb +10 -0
- data/samples/rails/config/initializers/mime_types.rb +5 -0
- data/samples/rails/config/routes.rb +30 -11
- data/samples/rails/db/migrate/001_create_articles.rb +14 -0
- data/samples/rails/db/schema.rb +16 -5
- data/samples/rails/lib/tasks/gettext.rake +2 -2
- data/samples/rails/locale/bs/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/ca/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/cs/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/de/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/el/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/en/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/eo/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/es/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/fr/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/hr/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/hu/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/it/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/ja/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/ko/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/nb/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/nl/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/pt_BR/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/ru/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/ua/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/vi/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/zh/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/locale/zh_TW/LC_MESSAGES/blog.mo +0 -0
- data/samples/rails/po/blog.pot +24 -24
- data/samples/rails/po/bs/blog.po +29 -29
- data/samples/rails/po/ca/blog.po +27 -27
- data/samples/rails/po/cs/blog.po +27 -27
- data/samples/rails/po/de/blog.po +27 -27
- data/samples/rails/po/el/blog.po +27 -27
- data/samples/rails/po/en/blog.po +24 -24
- data/samples/rails/po/eo/blog.po +27 -27
- data/samples/rails/po/es/blog.po +27 -27
- data/samples/rails/po/fr/blog.po +27 -27
- data/samples/rails/po/hr/blog.po +29 -29
- data/samples/rails/po/hu/blog.po +105 -0
- data/samples/rails/po/it/blog.po +27 -27
- data/samples/rails/po/ja/blog.po +27 -27
- data/samples/rails/po/ko/blog.po +27 -27
- data/samples/rails/po/nb/blog.po +26 -27
- data/samples/rails/po/nl/blog.po +27 -27
- data/samples/rails/po/pt_BR/blog.po +27 -27
- data/samples/rails/po/ru/blog.po +27 -27
- data/samples/rails/po/ua/blog.po +108 -0
- data/samples/rails/po/vi/blog.po +26 -31
- data/samples/rails/po/zh/blog.po +27 -27
- data/samples/rails/po/zh_TW/blog.po +27 -27
- data/samples/rails/public/404.html +27 -5
- data/samples/rails/public/422.html +30 -0
- data/samples/rails/public/500.html +27 -5
- data/samples/rails/public/index.html +6 -6
- data/samples/rails/public/javascripts/application.js +2 -0
- data/samples/rails/public/javascripts/controls.js +532 -319
- data/samples/rails/public/javascripts/dragdrop.js +521 -133
- data/samples/rails/public/javascripts/effects.js +708 -442
- data/samples/rails/public/javascripts/prototype.js +3393 -953
- data/samples/rails/public/stylesheets/blog.css +4 -0
- data/samples/rails/public/stylesheets/scaffold.css +5 -5
- data/samples/rails/test/functional/articles_controller_test.rb +51 -0
- data/samples/rails/test/test_helper.rb +31 -19
- data/samples/rails/test/unit/article_test.rb +2 -9
- data/samples/rails/vendor/plugins/gettext/init.rb +5 -3
- data/samples/rails/vendor/plugins/gettext/lib/gettext_plugin.rb +9 -10
- data/samples/rails/vendor/plugins/gettext/locale/eo/LC_MESSAGES/gettext_plugin.mo +0 -0
- data/samples/rails/vendor/plugins/gettext/locale/hu/LC_MESSAGES/gettext_plugin.mo +0 -0
- data/samples/rails/vendor/plugins/gettext/locale/ua/LC_MESSAGES/gettext_plugin.mo +0 -0
- data/samples/rails/vendor/plugins/gettext/po/eo/gettext_plugin.po +28 -0
- data/samples/rails/vendor/plugins/gettext/po/hu/gettext_plugin.po +27 -0
- data/samples/rails/vendor/plugins/gettext/po/ua/gettext_plugin.po +30 -0
- data/test/Rakefile +2 -1
- data/test/benchmark.rb +28 -0
- data/test/fixtures/topic.rb +15 -0
- data/test/rails/Rakefile +2 -1
- data/test/rails/app/controllers/articles_controller.rb +1 -1
- data/test/rails/app/controllers/users_controller.rb +10 -0
- data/test/rails/app/models/user.rb +2 -1
- data/test/rails/app/views/articles/{_form.rhtml → _form.html.erb} +0 -0
- data/test/rails/app/views/articles/active_form_error.html.erb +1 -0
- data/test/rails/app/views/articles/change_title_error_messages_for.html.erb +21 -0
- data/test/rails/app/views/articles/{edit.rhtml → edit.html.erb} +0 -0
- data/test/rails/app/views/articles/{list.rhtml → list.html.erb} +0 -3
- data/test/rails/app/views/articles/{list_fr.rhtml → list_fr.html.erb} +0 -0
- data/test/rails/app/views/articles/{multi_error_messages_for.rhtml → multi_error_messages_for.html.erb} +0 -0
- data/test/rails/app/views/articles/{new.rhtml → new.html.erb} +0 -0
- data/test/rails/app/views/articles/{show.rhtml → show.html.erb} +0 -0
- data/test/rails/app/views/layouts/{application.rhtml → application.html.erb} +0 -0
- data/test/rails/app/views/layouts/{mailer.rhtml → mailer.html.erb} +0 -0
- data/test/rails/app/views/layouts/users.html.erb +13 -0
- data/test/rails/app/views/users/custom_error_message.html.erb +13 -0
- data/test/rails/app/views/users/custom_error_message_fr.html.erb +13 -0
- data/test/rails/config/environment.rb +6 -1
- data/test/rails/config/environments/development.rb +0 -3
- data/test/rails/db/schema.rb +17 -10
- data/test/rails/locale/ja/LC_MESSAGES/rails_test.mo +0 -0
- data/test/rails/log/development.log +136 -29
- data/test/rails/log/test.log +2002 -128
- data/test/rails/po/ja/rails_test.po +68 -61
- data/test/rails/po/rails_test.pot +57 -55
- data/test/rails/test/fixtures/users.yml +5 -0
- data/test/rails/test/functional/articles_controller_test.rb +6 -1
- data/test/rails/test/functional/users_controller_test.rb +65 -0
- data/test/rails/test/result/en/custom_error_message.html +83 -0
- data/test/rails/test/result/en/custom_error_message_with_plural.html +83 -0
- data/test/rails/test/result/en/list.html +0 -3
- data/test/rails/test/result/en/multi_error_messages_for.html +1 -1
- data/test/rails/test/result/fr/custom_error_message.html +83 -0
- data/test/rails/test/result/fr/custom_error_message_with_plural.html +83 -0
- data/test/rails/test/result/ja/custom_error_message.html +83 -0
- data/test/rails/test/result/ja/custom_error_message_with_plural.html +83 -0
- data/test/rails/test/result/ja/list.html +0 -3
- data/test/rails/test/result/ja/multi_error_messages_for.html +1 -1
- data/test/test.sh +5 -7
- data/test/{gettext_test_active_record.rb → test_active_record.rb} +20 -10
- data/test/{gettext_test_cgi.rb → test_cgi.rb} +0 -0
- data/test/{gettext_test.rb → test_gettext.rb} +91 -9
- data/test/test_java.sh +12 -0
- data/test/{gettext_test_locale.rb → test_locale.rb} +3 -8
- data/test/{gettext_test_multi_textdomain.rb → test_multi_textdomain.rb} +2 -2
- data/test/{gettext_test_parser.rb → test_parser.rb} +77 -77
- data/test/{gettext_test_rails.rb → test_rails.rb} +0 -0
- data/test/{gettext_test_rails_caching.rb → test_rails_caching.rb} +16 -2
- data/test/{gettext_test_string.rb → test_string.rb} +1 -0
- data/test/{test_rubyparser_N.rb → testlib/N_.rb} +0 -0
- data/test/testlib/erb.rhtml +15 -0
- data/test/testlib/erb.rxml +16 -0
- data/test/{test_rubyparser.rb → testlib/gettext.rb} +0 -0
- data/test/testlib/gladeparser.glade +183 -0
- data/test/{test_rubyparser_n_.rb → testlib/ngettext.rb} +0 -0
- data/test/{test_nsgettext.rb → testlib/nsgettext.rb} +0 -0
- data/test/{test_sgettext.rb → testlib/sgettext.rb} +0 -0
- data/test/{testlib1.rb → testlib/testlib1.rb} +0 -0
- data/test/{testlib2.rb → testlib/testlib2.rb} +1 -1
- data/test/{testlib3.rb → testlib/testlib3.rb} +0 -0
- data/test/{testlib4.rb → testlib/testlib4.rb} +1 -1
- data/test/{testlib5.rb → testlib/testlib5.rb} +0 -0
- data/test/{testlib6.rb → testlib/testlib6.rb} +0 -0
- metadata +1374 -1171
- data/ext/gettext/extconf.rb +0 -20
- data/ext/gettext/locale_system.c +0 -83
- data/lib/gettext/locale_posix.rb +0 -82
- data/lib/gettext/locale_win32.rb +0 -82
- data/samples/cgi/ruby.bat +0 -4
- data/samples/rails/app/controllers/blog_controller.rb +0 -58
- data/samples/rails/app/views/blog/_form.rhtml +0 -25
- data/samples/rails/app/views/blog/edit.rhtml +0 -22
- data/samples/rails/app/views/blog/list.rhtml +0 -29
- data/samples/rails/app/views/blog/new.rhtml +0 -21
- data/samples/rails/app/views/blog/show.rhtml +0 -18
- data/samples/rails/app/views/layouts/blog.rhtml +0 -36
- data/samples/rails/test/functional/blog_controller_test.rb +0 -98
- data/test/gettext_runner.rb +0 -22
@@ -8,7 +8,7 @@
|
|
8
8
|
|
9
9
|
<p style="color: green"></p>
|
10
10
|
|
11
|
-
<div class="errorExplanation" id="errorExplanation"><h2>内容に3つのエラーが発生しました。</h2><p>次の項目を確認してください。</p><ul><li>タイトルを入力してください。</li><li>内容は3文字以上で入力してください。</li><li
|
11
|
+
<div class="errorExplanation" id="errorExplanation"><h2>内容に3つのエラーが発生しました。</h2><p>次の項目を確認してください。</p><ul><li>タイトルを入力してください。</li><li>内容は3文字以上で入力してください。</li><li>名前は10文字以上で入力してください。</li></ul></div>
|
12
12
|
|
13
13
|
<!--[form:article]-->
|
14
14
|
<p><label for="article_title">タイトル</label><br/>
|
data/test/test.sh
CHANGED
@@ -3,12 +3,10 @@
|
|
3
3
|
export LC_ALL="ja_JP.eucJP";
|
4
4
|
export LANG="ja_JP.eucJP";
|
5
5
|
rake rebuilddb
|
6
|
-
|
7
|
-
|
8
|
-
ruby
|
9
|
-
|
10
|
-
ruby -I../lib -I../ext/gettext gettext_test_rails_caching.rb
|
11
|
-
ruby -I../lib -I../ext/gettext gettext_test_active_record.rb
|
6
|
+
for target in test_*.rb
|
7
|
+
do
|
8
|
+
ruby -I../lib $target
|
9
|
+
done
|
12
10
|
cd rails
|
13
|
-
rake -I../../lib
|
11
|
+
rake -I../../lib test
|
14
12
|
cd ..
|
@@ -8,8 +8,6 @@ require 'gettext/parser/active_record'
|
|
8
8
|
require 'test/unit'
|
9
9
|
require 'active_record'
|
10
10
|
require 'active_record/fixtures'
|
11
|
-
require 'active_support/binding_of_caller'
|
12
|
-
require 'active_support/breakpoint'
|
13
11
|
require 'fixtures/topic'
|
14
12
|
require 'fixtures/reply'
|
15
13
|
require 'fixtures/developer'
|
@@ -17,12 +15,12 @@ require 'logger'
|
|
17
15
|
|
18
16
|
version = /activerecord-([^\/]+)/.match($:.join)[1]
|
19
17
|
|
20
|
-
|
21
|
-
#
|
22
|
-
|
23
|
-
|
18
|
+
if version > "2.0.0"
|
19
|
+
#ticket 6657 on dev.rubyonrails.org require this but it becames removed(?)
|
20
|
+
AR_6657 = true
|
21
|
+
else
|
24
22
|
AR_6657 = false
|
25
|
-
|
23
|
+
end
|
26
24
|
puts "The activerecord svn version is #{$1}"
|
27
25
|
|
28
26
|
|
@@ -45,6 +43,11 @@ ActiveRecord::Base.establish_connection(
|
|
45
43
|
:database => 'activerecord_unittest'
|
46
44
|
)
|
47
45
|
|
46
|
+
# Make with_scope public for tests
|
47
|
+
class << ActiveRecord::Base
|
48
|
+
public :with_scope, :with_exclusive_scope
|
49
|
+
end
|
50
|
+
|
48
51
|
class Test::Unit::TestCase #:nodoc:
|
49
52
|
include GetText
|
50
53
|
bindtextdomain("active_record", "locale")
|
@@ -1496,13 +1499,20 @@ class ValidationsTest < Test::Unit::TestCase
|
|
1496
1499
|
d = Developer.new
|
1497
1500
|
d.name = "David"
|
1498
1501
|
assert !d.valid?
|
1499
|
-
|
1500
|
-
|
1502
|
+
if AR_6657
|
1503
|
+
assert_equal d.errors.on(:name).first, "この文字列は'シングル' \"ダブル\"クオートを含む。"
|
1504
|
+
else
|
1505
|
+
assert_equal d.errors.on(:name).last, "この文字列は'シングル' \"ダブル\"クオートを含む。"
|
1506
|
+
end
|
1501
1507
|
GetText.set_locale_all "en"
|
1502
1508
|
d = Developer.new
|
1503
1509
|
d.name = "David"
|
1504
1510
|
assert !d.valid?
|
1505
|
-
|
1511
|
+
if AR_6657
|
1512
|
+
assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
|
1513
|
+
else
|
1514
|
+
assert_equal d.errors.on(:name).last, "This string contains 'single' and \"double\" quotes"
|
1515
|
+
end
|
1506
1516
|
end
|
1507
1517
|
|
1508
1518
|
def test_validates_associated_with_custom_message_using_quotes_fn
|
File without changes
|
@@ -2,14 +2,14 @@ require 'test/unit'
|
|
2
2
|
|
3
3
|
require 'gettext.rb'
|
4
4
|
|
5
|
-
require 'testlib1.rb'
|
6
|
-
require 'testlib2.rb'
|
7
|
-
require 'testlib3.rb'
|
8
|
-
require 'testlib4.rb'
|
9
|
-
require 'testlib6.rb'
|
10
|
-
require '
|
11
|
-
require '
|
12
|
-
require '
|
5
|
+
require 'testlib/testlib1.rb'
|
6
|
+
require 'testlib/testlib2.rb'
|
7
|
+
require 'testlib/testlib3.rb'
|
8
|
+
require 'testlib/testlib4.rb'
|
9
|
+
require 'testlib/testlib6.rb'
|
10
|
+
require 'testlib/gettext.rb'
|
11
|
+
require 'testlib/sgettext.rb'
|
12
|
+
require 'testlib/nsgettext.rb'
|
13
13
|
|
14
14
|
class TestGetText < Test::Unit::TestCase
|
15
15
|
include GetText
|
@@ -74,7 +74,7 @@ class TestGetText < Test::Unit::TestCase
|
|
74
74
|
testlib6.setlocale("ja")
|
75
75
|
assert_equal("FRENCH", _("LANGUAGE")) #no influence of previous line
|
76
76
|
assert_equal("japanese", testlib6.test)
|
77
|
-
|
77
|
+
end
|
78
78
|
|
79
79
|
def test_subclass
|
80
80
|
GetText.locale = nil
|
@@ -297,4 +297,86 @@ DDD
|
|
297
297
|
assert_equal(loc, GetText.locale = loc)
|
298
298
|
assert_equal(Locale::Object, GetText.locale.class)
|
299
299
|
end
|
300
|
+
|
301
|
+
module ::A
|
302
|
+
bindtextdomain("test1", "locale")
|
303
|
+
module B
|
304
|
+
bindtextdomain("test1", "locale")
|
305
|
+
class C
|
306
|
+
bindtextdomain("test1", "locale")
|
307
|
+
end
|
308
|
+
end
|
309
|
+
end
|
310
|
+
|
311
|
+
module A2
|
312
|
+
bindtextdomain("test1", "locale")
|
313
|
+
end
|
314
|
+
|
315
|
+
module ::A::D
|
316
|
+
bindtextdomain("test1", "locale")
|
317
|
+
end
|
318
|
+
class ::A::D::E
|
319
|
+
bindtextdomain("test1", "locale")
|
320
|
+
end
|
321
|
+
|
322
|
+
class ::F
|
323
|
+
bindtextdomain("test1", "locale")
|
324
|
+
end
|
325
|
+
class ::F::G
|
326
|
+
bindtextdomain("test1", "locale")
|
327
|
+
end
|
328
|
+
class ::F::G::H
|
329
|
+
bindtextdomain("test1", "locale")
|
330
|
+
end
|
331
|
+
|
332
|
+
# Anonymous
|
333
|
+
@@anon = Module.new
|
334
|
+
class @@anon::I
|
335
|
+
bindtextdomain("test1", "locale")
|
336
|
+
def self.test
|
337
|
+
_("language")
|
338
|
+
end
|
339
|
+
def test2
|
340
|
+
_("language")
|
341
|
+
end
|
342
|
+
end
|
343
|
+
module @@anon::J
|
344
|
+
bindtextdomain("test1", "locale")
|
345
|
+
end
|
346
|
+
|
347
|
+
def test_bound_target
|
348
|
+
assert_equal(TestGetText::A2, GetText.bound_target(::TestGetText::A2))
|
349
|
+
assert_equal(TestGetText::A2, GetText.bound_target(A2))
|
350
|
+
assert_equal(A::B, GetText.bound_target(A::B))
|
351
|
+
# For object
|
352
|
+
assert_equal(A::D::E, GetText.bound_target(A::D::E.new))
|
353
|
+
assert_equal(F::G::H, GetText.bound_target(F::G::H.new))
|
354
|
+
|
355
|
+
# Anonymous classes are bound to GetText
|
356
|
+
assert_equal(GetText, GetText.bound_target(@@anon::I))
|
357
|
+
assert_equal(GetText, GetText.bound_target(@@anon::I.new))
|
358
|
+
end
|
359
|
+
|
360
|
+
def test_bound_targets
|
361
|
+
GetText.bindtextdomain("test1", "locale")
|
362
|
+
bindtextdomain("test1", "locale")
|
363
|
+
assert_equal([TestGetText::A2, TestGetText, GetText], GetText.bound_targets(::TestGetText::A2))
|
364
|
+
assert_equal([TestGetText::A2, TestGetText, GetText], GetText.bound_targets(A2))
|
365
|
+
|
366
|
+
assert_equal([A::B, A, GetText], GetText.bound_targets(A::B))
|
367
|
+
assert_equal([A::B::C, A::B, A, GetText], GetText.bound_targets(A::B::C))
|
368
|
+
assert_equal([A::D::E, A::D, A, GetText], GetText.bound_targets(A::D::E))
|
369
|
+
assert_equal([F::G::H, F::G, F, GetText], GetText.bound_targets(F::G::H))
|
370
|
+
|
371
|
+
# Anonymous classes/modules are bound to GetText
|
372
|
+
assert_equal([GetText], GetText.bound_targets(@@anon::I))
|
373
|
+
assert_equal([GetText], GetText.bound_targets(@@anon::J))
|
374
|
+
end
|
375
|
+
|
376
|
+
def test_anonymous_module
|
377
|
+
GetText.locale = "ja"
|
378
|
+
assert_equal("japanese", @@anon::I.test)
|
379
|
+
assert_equal("japanese", @@anon::I.new.test2)
|
380
|
+
|
381
|
+
end
|
300
382
|
end
|
data/test/test_java.sh
ADDED
@@ -0,0 +1,12 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
|
3
|
+
export LC_ALL="ja_JP.eucJP";
|
4
|
+
export LANG="ja_JP.eucJP";
|
5
|
+
rake rebuilddb
|
6
|
+
for target in test_*.rb
|
7
|
+
do
|
8
|
+
/usr/java/jruby/bin/jruby -I../lib $target
|
9
|
+
done
|
10
|
+
cd rails
|
11
|
+
/usr/java/jruby/bin/jruby /usr/java/jruby/bin/rake -I../../lib test
|
12
|
+
cd ..
|
@@ -1,5 +1,5 @@
|
|
1
1
|
require 'test/unit'
|
2
|
-
require '
|
2
|
+
require 'locale'
|
3
3
|
|
4
4
|
class TestLocale < Test::Unit::TestCase
|
5
5
|
def test_locale_object
|
@@ -228,13 +228,8 @@ class TestLocale < Test::Unit::TestCase
|
|
228
228
|
assert_equal("iu-CA-Cans", Locale.get.to_win)
|
229
229
|
assert_equal("UNICODE", Locale.get.charset)
|
230
230
|
else
|
231
|
-
loc = Locale.get
|
232
231
|
assert_equal("ja_JP", Locale.get.to_str)
|
233
|
-
|
234
|
-
assert_equal("eucJP", Locale.codeset)
|
235
|
-
else
|
236
|
-
assert_equal("EUC-JP", Locale.codeset)
|
237
|
-
end
|
232
|
+
assert_equal("eucJP", Locale.codeset)
|
238
233
|
|
239
234
|
loc = Locale.set("ja_JP")
|
240
235
|
assert_equal("ja_JP", loc.to_str)
|
@@ -242,7 +237,7 @@ class TestLocale < Test::Unit::TestCase
|
|
242
237
|
if /openbsd/ =~ RUBY_PLATFORM
|
243
238
|
assert_equal(nil, Locale.codeset)
|
244
239
|
else
|
245
|
-
assert_equal("
|
240
|
+
assert_equal("eucJP", Locale.codeset)
|
246
241
|
end
|
247
242
|
|
248
243
|
# Confirm to set Locale::Object
|
@@ -22,79 +22,79 @@ end
|
|
22
22
|
|
23
23
|
class TestGetTextParser < Test::Unit::TestCase
|
24
24
|
def test_ruby
|
25
|
-
ary = GetText::RubyParser.parse('
|
26
|
-
|
27
|
-
assert_equal(['aaa', '
|
28
|
-
assert_equal(['aaa\n', '
|
29
|
-
assert_equal(['bbb\nccc', '
|
30
|
-
assert_equal(['bbb\nccc\nddd\n', '
|
31
|
-
assert_equal(['eee', '
|
32
|
-
assert_equal(['fff', '
|
33
|
-
assert_equal(['ggghhhiii', '
|
34
|
-
assert_equal(['a"b"c"', '
|
35
|
-
assert_equal(['d"e"f"', '
|
36
|
-
assert_equal(['jjj', '
|
37
|
-
assert_equal(['kkk', '
|
38
|
-
assert_equal(['lllmmm', '
|
39
|
-
assert_equal(['nnn\nooo', '
|
40
|
-
assert_equal(["\#", '
|
41
|
-
assert_equal(["\\taaa", '
|
42
|
-
assert_equal(["Here document1\\nHere document2\\n", '
|
43
|
-
# assert_equal(["in_quote", '
|
25
|
+
ary = GetText::RubyParser.parse('testlib/gettext.rb')
|
26
|
+
|
27
|
+
assert_equal(['aaa', 'testlib/gettext.rb:8'], ary[0])
|
28
|
+
assert_equal(['aaa\n', 'testlib/gettext.rb:12'], ary[1])
|
29
|
+
assert_equal(['bbb\nccc', 'testlib/gettext.rb:16'], ary[2])
|
30
|
+
assert_equal(['bbb\nccc\nddd\n', 'testlib/gettext.rb:20'], ary[3])
|
31
|
+
assert_equal(['eee', 'testlib/gettext.rb:27', 'testlib/gettext.rb:31'], ary[4])
|
32
|
+
assert_equal(['fff', 'testlib/gettext.rb:31'], ary[5])
|
33
|
+
assert_equal(['ggghhhiii', 'testlib/gettext.rb:35'], ary[6])
|
34
|
+
assert_equal(['a"b"c"', 'testlib/gettext.rb:41'], ary[7])
|
35
|
+
assert_equal(['d"e"f"', 'testlib/gettext.rb:45'], ary[8])
|
36
|
+
assert_equal(['jjj', 'testlib/gettext.rb:49'], ary[9])
|
37
|
+
assert_equal(['kkk', 'testlib/gettext.rb:50'], ary[10])
|
38
|
+
assert_equal(['lllmmm', 'testlib/gettext.rb:54'], ary[11])
|
39
|
+
assert_equal(['nnn\nooo', 'testlib/gettext.rb:62'], ary[12])
|
40
|
+
assert_equal(["\#", 'testlib/gettext.rb:66', 'testlib/gettext.rb:70'], ary[13])
|
41
|
+
assert_equal(["\\taaa", 'testlib/gettext.rb:74'], ary[14])
|
42
|
+
assert_equal(["Here document1\\nHere document2\\n", 'testlib/gettext.rb:78'], ary[15])
|
43
|
+
# assert_equal(["in_quote", 'testlib/gettext.rb:96'], ary[16])
|
44
44
|
end
|
45
45
|
|
46
46
|
def test_ruby_N
|
47
|
-
ary = GetText::RubyParser.parse('
|
48
|
-
|
49
|
-
assert_equal(['aaa', '
|
50
|
-
assert_equal(['aaa\n', '
|
51
|
-
assert_equal(['bbb\nccc', '
|
52
|
-
assert_equal(['bbb\nccc\nddd\n', '
|
53
|
-
assert_equal(['eee', '
|
54
|
-
assert_equal(['fff', '
|
55
|
-
assert_equal(['ggghhhiii', '
|
56
|
-
assert_equal(['a"b"c"', '
|
57
|
-
assert_equal(['d"e"f"', '
|
58
|
-
assert_equal(['jjj', '
|
59
|
-
assert_equal(['kkk', '
|
60
|
-
assert_equal(['lllmmm', '
|
61
|
-
assert_equal(['nnn\nooo', '
|
47
|
+
ary = GetText::RubyParser.parse('testlib/N_.rb')
|
48
|
+
|
49
|
+
assert_equal(['aaa', 'testlib/N_.rb:8'], ary[0])
|
50
|
+
assert_equal(['aaa\n', 'testlib/N_.rb:12'], ary[1])
|
51
|
+
assert_equal(['bbb\nccc', 'testlib/N_.rb:16'], ary[2])
|
52
|
+
assert_equal(['bbb\nccc\nddd\n', 'testlib/N_.rb:20'], ary[3])
|
53
|
+
assert_equal(['eee', 'testlib/N_.rb:27', 'testlib/N_.rb:31'], ary[4])
|
54
|
+
assert_equal(['fff', 'testlib/N_.rb:31'], ary[5])
|
55
|
+
assert_equal(['ggghhhiii', 'testlib/N_.rb:35'], ary[6])
|
56
|
+
assert_equal(['a"b"c"', 'testlib/N_.rb:41'], ary[7])
|
57
|
+
assert_equal(['d"e"f"', 'testlib/N_.rb:45'], ary[8])
|
58
|
+
assert_equal(['jjj', 'testlib/N_.rb:49'], ary[9])
|
59
|
+
assert_equal(['kkk', 'testlib/N_.rb:50'], ary[10])
|
60
|
+
assert_equal(['lllmmm', 'testlib/N_.rb:54'], ary[11])
|
61
|
+
assert_equal(['nnn\nooo', 'testlib/N_.rb:62'], ary[12])
|
62
62
|
end
|
63
63
|
|
64
64
|
def test_ruby_n
|
65
|
-
ary = GetText::RubyParser.parse('
|
66
|
-
assert_equal(["aaa\000aaa2", '
|
67
|
-
assert_equal(["bbb\\n\000ccc2\\nccc2", '
|
68
|
-
assert_equal(["ddd\\nddd\000ddd2\\nddd2", '
|
69
|
-
assert_equal(["eee\\neee\\n\000eee2\\neee2\\n", '
|
70
|
-
assert_equal(["ddd\\neee\\n\000ddd\\neee2", '
|
71
|
-
assert_equal(["fff\000fff2", '
|
72
|
-
assert_equal(["ggg\000ggg2", '
|
73
|
-
assert_equal(["ggghhhiii\000jjjkkklll", '
|
74
|
-
assert_equal(["a\"b\"c\"\000a\"b\"c\"2", '
|
75
|
-
assert_equal(["mmmmmm\000mmm2mmm2", '
|
76
|
-
assert_equal(["nnn\000nnn2", '
|
65
|
+
ary = GetText::RubyParser.parse('testlib/ngettext.rb')
|
66
|
+
assert_equal(["aaa\000aaa2", 'testlib/ngettext.rb:8'], ary[0])
|
67
|
+
assert_equal(["bbb\\n\000ccc2\\nccc2", 'testlib/ngettext.rb:12'], ary[1])
|
68
|
+
assert_equal(["ddd\\nddd\000ddd2\\nddd2", 'testlib/ngettext.rb:16'], ary[2])
|
69
|
+
assert_equal(["eee\\neee\\n\000eee2\\neee2\\n", 'testlib/ngettext.rb:21'], ary[3])
|
70
|
+
assert_equal(["ddd\\neee\\n\000ddd\\neee2", 'testlib/ngettext.rb:27'], ary[4])
|
71
|
+
assert_equal(["fff\000fff2", 'testlib/ngettext.rb:34', 'testlib/ngettext.rb:38'], ary[5])
|
72
|
+
assert_equal(["ggg\000ggg2", 'testlib/ngettext.rb:38'], ary[6])
|
73
|
+
assert_equal(["ggghhhiii\000jjjkkklll", 'testlib/ngettext.rb:42'], ary[7])
|
74
|
+
assert_equal(["a\"b\"c\"\000a\"b\"c\"2", 'testlib/ngettext.rb:51'], ary[8])
|
75
|
+
assert_equal(["mmmmmm\000mmm2mmm2", 'testlib/ngettext.rb:59'], ary[10])
|
76
|
+
assert_equal(["nnn\000nnn2", 'testlib/ngettext.rb:60'], ary[11])
|
77
77
|
end
|
78
78
|
|
79
79
|
def test_glade
|
80
|
-
ary = GetText::GladeParser.parse('
|
81
|
-
|
82
|
-
assert_equal(['window1', '
|
83
|
-
assert_equal(['normal text', '
|
84
|
-
assert_equal(['1st line\n2nd line\n3rd line', '
|
85
|
-
assert_equal(['<span color="red" weight="bold" size="large">markup </span>', '
|
86
|
-
assert_equal(['<span color="red">1st line markup </span>\n<span color="blue">2nd line markup</span>', '
|
87
|
-
assert_equal(['<span>"markup" with <escaped strings></span>', '
|
88
|
-
assert_equal(['duplicated', '
|
80
|
+
ary = GetText::GladeParser.parse('testlib/gladeparser.glade')
|
81
|
+
|
82
|
+
assert_equal(['window1', 'testlib/gladeparser.glade:8'], ary[0])
|
83
|
+
assert_equal(['normal text', 'testlib/gladeparser.glade:29'], ary[1])
|
84
|
+
assert_equal(['1st line\n2nd line\n3rd line', 'testlib/gladeparser.glade:50'], ary[2])
|
85
|
+
assert_equal(['<span color="red" weight="bold" size="large">markup </span>', 'testlib/gladeparser.glade:73'], ary[3])
|
86
|
+
assert_equal(['<span color="red">1st line markup </span>\n<span color="blue">2nd line markup</span>', 'testlib/gladeparser.glade:94'], ary[4])
|
87
|
+
assert_equal(['<span>"markup" with <escaped strings></span>', 'testlib/gladeparser.glade:116'], ary[5])
|
88
|
+
assert_equal(['duplicated', 'testlib/gladeparser.glade:137', 'testlib/gladeparser.glade:158'], ary[6])
|
89
89
|
end
|
90
90
|
|
91
|
-
def
|
92
|
-
ary = GetText::ErbParser.parse('
|
91
|
+
def testlib_erb
|
92
|
+
ary = GetText::ErbParser.parse('testlib/erb.rhtml')
|
93
93
|
|
94
|
-
assert_equal(['aaa', '
|
95
|
-
assert_equal(['aaa\n', '
|
96
|
-
assert_equal(['bbb', '
|
97
|
-
assert_equal(["ccc1\000ccc2", '
|
94
|
+
assert_equal(['aaa', 'testlib/erb.rhtml:8'], ary[0])
|
95
|
+
assert_equal(['aaa\n', 'testlib/erb.rhtml:11'], ary[1])
|
96
|
+
assert_equal(['bbb', 'testlib/erb.rhtml:12'], ary[2])
|
97
|
+
assert_equal(["ccc1\000ccc2", 'testlib/erb.rhtml:13'], ary[3])
|
98
98
|
end
|
99
99
|
|
100
100
|
|
@@ -180,22 +180,22 @@ class TestGetTextParser < Test::Unit::TestCase
|
|
180
180
|
|
181
181
|
def test_rgettext_parse
|
182
182
|
GetText::ErbParser.init(:extnames => ['.rhtml', '.rxml'])
|
183
|
-
ary = GetText::RGetText.parse('
|
184
|
-
assert_equal(['aaa', '
|
185
|
-
assert_equal(['aaa\n', '
|
186
|
-
assert_equal(['bbb', '
|
187
|
-
assert_equal(["ccc1\000ccc2", '
|
188
|
-
|
189
|
-
ary = GetText::RGetText.parse('
|
190
|
-
assert_equal(['aaa', '
|
191
|
-
assert_equal(['aaa\n', '
|
192
|
-
assert_equal(['bbb', '
|
193
|
-
assert_equal(["ccc1\000ccc2", '
|
194
|
-
|
195
|
-
|
196
|
-
ary = GetText::RGetText.parse('
|
197
|
-
assert_equal(["ooo\000ppp", '
|
198
|
-
assert_equal(["qqq\000rrr", '
|
183
|
+
ary = GetText::RGetText.parse('testlib/erb.rhtml')
|
184
|
+
assert_equal(['aaa', 'testlib/erb.rhtml:8'], ary[0])
|
185
|
+
assert_equal(['aaa\n', 'testlib/erb.rhtml:11'], ary[1])
|
186
|
+
assert_equal(['bbb', 'testlib/erb.rhtml:12'], ary[2])
|
187
|
+
assert_equal(["ccc1\000ccc2", 'testlib/erb.rhtml:13'], ary[3])
|
188
|
+
|
189
|
+
ary = GetText::RGetText.parse('testlib/erb.rxml')
|
190
|
+
assert_equal(['aaa', 'testlib/erb.rxml:9'], ary[0])
|
191
|
+
assert_equal(['aaa\n', 'testlib/erb.rxml:12'], ary[1])
|
192
|
+
assert_equal(['bbb', 'testlib/erb.rxml:13'], ary[2])
|
193
|
+
assert_equal(["ccc1\000ccc2", 'testlib/erb.rxml:14'], ary[3])
|
194
|
+
|
195
|
+
|
196
|
+
ary = GetText::RGetText.parse('testlib/ngettext.rb')
|
197
|
+
assert_equal(["ooo\000ppp", 'testlib/ngettext.rb:64', 'testlib/ngettext.rb:65'], ary[12])
|
198
|
+
assert_equal(["qqq\000rrr", 'testlib/ngettext.rb:69', 'testlib/ngettext.rb:70'], ary[13])
|
199
199
|
end
|
200
200
|
|
201
201
|
end
|