gettext 1.9.0-mswin32 → 1.10.0-mswin32

data/test/Rakefile

@@ -3,6 +3,8 @@ require 'gettext/utils'
 desc "Create mo files"
 task :makemo do
   GetText.create_mofiles(true, "po", "locale")
+  GetText.create_mofiles(true, "rails/po", "rails/locale")
+  mkdir "rails/log" unless File.exists? "rails/log"
 end
 
 SCHEMA_PATH = File.join(File.dirname(__FILE__), "db")

data/test/gettext_test.rb

@@ -9,6 +9,7 @@ require 'testlib4.rb'
 require 'testlib6.rb'
 require 'test_rubyparser.rb'
 require 'test_sgettext.rb'
+require 'test_nsgettext.rb'
 
 class TestGetText < Test::Unit::TestCase
   include GetText
@@ -54,7 +55,7 @@ class TestGetText < Test::Unit::TestCase
     assert_equal("japanese", _("language"))
   end
 
-  def test_gettext
+  def test_empty
     set_locale(nil)
     bindtextdomain("test1", "locale")
     assert_equal("japanese", gettext("language"))
@@ -117,6 +118,7 @@ DDD
   def test_sgettext
     GetText.locale = nil
     testlib5 = TestSGetText.new
+
     assert_equal("MATCHED", testlib5.test_1)
     assert_equal("MATCHED", testlib5.test_2)
     assert_equal("AAA", testlib5.test_3)
@@ -128,6 +130,20 @@ DDD
     assert_equal("BBB", testlib5.test_9)
   end
 
+  def test_nsgettext
+    GetText.locale = nil
+    testlib5 = TestNSGetText.new
+    assert_equal(["single", "plural"], testlib5.test_1)
+    assert_equal(["single", "plural"], testlib5.test_2)
+    assert_equal(["AAA", "BBB"], testlib5.test_3)
+    assert_equal(["CCC", "DDD"], testlib5.test_4)
+    assert_equal(["CCC", "DDD"], testlib5.test_5)
+    assert_equal(["BBB", "CCC"], testlib5.test_6)
+    assert_equal(["B|BB", "CCC"], testlib5.test_7)
+    assert_equal(["single", "plural"], testlib5.test_8)
+    assert_equal(["BBB", "DDD"], testlib5.test_9)
+  end
+
   def test_plural
     GetText.locale = nil
     bindtextdomain("plural", "locale", "ja")
@@ -184,22 +200,22 @@ DDD
     setlocale(nil)
     bindtextdomain("plural_error", "locale", "ja")
     #If it defines msgstr[0] only, msgstr[0] is used everytime.
-    assert_equal("a", n_("one", "two", 0)) 
-    assert_equal("a", n_("one", "two", 1)) 
-    assert_equal("a", n_("one", "two", 2)) 
+    assert_equal("a", n_("first", "second", 0)) 
+    assert_equal("a", n_("first", "second", 1)) 
+    assert_equal("a", n_("first", "second", 2)) 
     # Use default(plural = 0)
     setlocale("fr")
-    assert_equal("fr_one", n_("one", "two", 0))   
-    assert_equal("fr_one", n_("one", "two", 1))
-    assert_equal("fr_one", n_("one", "two", 2))
+    assert_equal("fr_first", n_("first", "second", 0))   
+    assert_equal("fr_first", n_("first", "second", 1))
+    assert_equal("fr_first", n_("first", "second", 2))
     setlocale("da")
-    assert_equal("da_one", n_("one", "two", 0))   
-    assert_equal("da_one", n_("one", "two", 1))
-    assert_equal("da_one", n_("one", "two", 2))
+    assert_equal("da_first", n_("first", "second", 0))   
+    assert_equal("da_first", n_("first", "second", 1))
+    assert_equal("da_first", n_("first", "second", 2))
     setlocale("la")
-    assert_equal("la_one", n_("one", "two", 0))   
-    assert_equal("la_one", n_("one", "two", 1))
-    assert_equal("la_one", n_("one", "two", 2))
+    assert_equal("la_first", n_("first", "second", 0))   
+    assert_equal("la_first", n_("first", "second", 1))
+    assert_equal("la_first", n_("first", "second", 2))
   end
 
   def test_plural_array
@@ -210,6 +226,28 @@ DDD
     assert_equal("da_plural", n_(["one", "two"], 2))
   end
 
+  def test_plural_with_single
+    GetText.locale = nil
+    bindtextdomain("plural", "locale", "ja")
+    assert_equal("hitotsu", _("single"))
+    assert_equal("hitotsu", n_("single", "plural", 1))
+    assert_equal("hitotsu", n_("single", "plural", 2))
+    assert_equal("all", n_("one", "two", 1))
+    assert_equal("all", n_("one", "two", 2))
+    assert_equal("all", _("one"))
+
+    bindtextdomain("plural", "locale", "fr")
+    assert_equal("fr_hitotsu", _("single"))
+    assert_equal("fr_hitotsu", n_("single", "plural", 1))
+    assert_equal("fr_fukusu", n_("single", "plural", 2))
+    assert_equal("fr_one", n_("one", "two", 1))
+    assert_equal("fr_plural", n_("one", "two", 2))
+    assert_equal("fr_one", _("one"))
+
+    assert_equal("fr_hitotsu", n_("single", "not match", 1))
+    assert_equal("fr_fukusu", n_("single", "not match", 2))
+  end
+
   def test_Nn_
     GetText.locale = nil
     bindtextdomain("plural", "locale", "da")

data/test/gettext_test_active_record.rb

@@ -33,6 +33,7 @@ end
 begin
   `rake createdb`
 rescue
+  p $!
 end
 
 ActiveRecord::Base.establish_connection(
@@ -63,6 +64,22 @@ class Topic
   end
 end
 
+class MyModel
+  attr_accessor :title
+  def save; end
+  def save!;  end
+  def update_attribute(name, value); end
+  def new_record?
+    false
+  end
+  def self.human_attribute_name(name)
+     name
+  end
+  include ActiveRecord::Validations
+
+  validates_presence_of :title
+end
+
 class ValidationsTest < Test::Unit::TestCase
   fixtures :topics, :developers
 
@@ -1755,5 +1772,21 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "Sillyタイトル が不正に生成されました。", t.errors.full_messages[0]
     assert_equal "Silly内容 空です。", t.errors.full_messages[1]
   end
+
+  def test_original_model_with_validation
+    GetText.set_locale_all "ja_JP.UTF-8"
+    t = MyModel.new
+    t.title = nil
+    t.save
+    assert_equal "Titleを入力してください。", t.errors.full_messages[0]
+    assert_equal "Titleを入力してください。", t.errors.on(:title)
+
+    GetText.set_locale_all "en"
+    t = MyModel.new
+    t.title = nil
+    t.save
+    assert_equal "Title can't be blank", t.errors.full_messages[0]
+    assert_equal "Title can't be blank", t.errors.on(:title)
+  end
 end
 

data/test/gettext_test_parser.rb

@@ -191,6 +191,11 @@ class TestGetTextParser < Test::Unit::TestCase
     assert_equal(['aaa\n', 'test_erb.rxml:12'], ary[1])
     assert_equal(['bbb', 'test_erb.rxml:13'], ary[2])
     assert_equal(["ccc1\000ccc2", 'test_erb.rxml:14'], ary[3])
+
+
+    ary = GetText::RGetText.parse('test_rubyparser_n_.rb')
+    assert_equal(["ooo\000ppp", 'test_rubyparser_n_.rb:64', 'test_rubyparser_n_.rb:65'], ary[12])
+    assert_equal(["qqq\000rrr", 'test_rubyparser_n_.rb:69', 'test_rubyparser_n_.rb:70'], ary[13])
   end
 
 end

data/test/gettext_test_rails_caching.rb

@@ -0,0 +1,211 @@
+$KCODE = "U"
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'fileutils'
+require 'rubygems'
+require 'yaml'
+require 'test/unit'
+require 'active_support'
+require 'action_controller'
+require 'breakpoint'
+require 'action_controller/test_process'
+gem 'rails'
+require 'initializer'
+
+require 'gettext/rails'
+
+ActiveSupport::Deprecation.debug = true
+
+ActionController::Base.logger = nil
+ActionController::Base.ignore_missing_templates = false
+ActionController::Routing::Routes.reload rescue nil
+
+CACHE_DIR = 'test_cache'
+# Don't change '/../temp/' cavalierly or you might hoze something you don't want hozed
+FILE_STORE_PATH = File.join(File.dirname(__FILE__), 'cache', CACHE_DIR)
+ActionController::Base.perform_caching = true
+ActionController::Base.page_cache_directory = FILE_STORE_PATH
+ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
+
+RAILS_ROOT = File.join(File.dirname(__FILE__))
+
+class ActionCachingTestController < ActionController::Base
+  init_gettext "test"
+
+  caches_action :index
+
+  def index
+    @cache_this = Time.now.to_f.to_s
+    render :text => @cache_this
+  end
+
+  def expire
+    expire_action :controller => 'action_caching_test', :action => 'index'
+    render :nothing => true
+  end
+
+end
+
+class ActionCachingMockController
+  attr_accessor :mock_url_for
+  attr_accessor :mock_path
+
+  def initialize
+    yield self if block_given?
+  end
+
+  def url_for(*args)
+    @mock_url_for
+  end
+
+  def request
+    mocked_path = @mock_path
+    Object.new.instance_eval(<<-EVAL)
+      def path; '#{@mock_path}' end
+      self
+    EVAL
+  end
+end
+
+class ActionCacheTest < Test::Unit::TestCase
+  def setup
+    reset!
+    FileUtils.mkdir_p(FILE_STORE_PATH)
+    @path_class = ActionController::Caching::Actions::ActionCachePath
+    @mock_controller = ActionCachingMockController.new
+  end
+
+  def teardown
+    FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
+  end
+
+  def test_simple_action_cache
+    get :index, :lang => "ja"
+    cached_time = content_to_cache
+    assert_equal cached_time, @response.body
+    reset!
+
+    get :index, :lang => "ja"
+    assert_equal cached_time, @response.body
+    reset!
+
+    get :index, :lang => "en"
+    cached_time_en = content_to_cache
+    assert_not_equal cached_time, @response.body
+
+    get :index, :lang => "ja"
+    assert_equal cached_time, @response.body
+    reset!
+
+    get :index, :lang => "en"
+    assert_equal cached_time_en, @response.body
+
+    get :index    # Same as en
+    assert_equal cached_time_en, @response.body
+  end
+
+  def test_cache_expiration
+    get :index, :lang => "ja"
+    cached_time = content_to_cache
+    reset!
+
+    get :index, :lang => "ja"
+    assert_equal cached_time, @response.body
+    reset!
+
+    get :index, :lang => "en"
+    cached_time_en = content_to_cache
+    assert_not_equal cached_time, @response.body
+    reset!
+
+    get :index, :lang => "en"
+    assert_equal cached_time_en, @response.body
+    reset!
+
+    get :expire
+    reset!
+
+    get :index, :lang => "ja"
+    new_cached_time = content_to_cache
+    assert_not_equal cached_time, @response.body
+    reset!
+
+    get :index, :lang => "ja"
+    assert_response :success
+    assert_equal new_cached_time, @response.body
+    reset!
+
+    get :index, :lang => "en"
+    new_cached_time_en = content_to_cache
+    assert_not_equal new_cached_time, @response.body
+    assert_not_equal cached_time_en, @response.body
+    reset!
+
+    get :index, :lang => "en"
+    assert_response :success
+    assert_equal new_cached_time_en, @response.body
+    reset!
+  end
+
+  def test_cache_is_scoped_by_subdomain
+    @request.host = 'jamis.hostname.com'
+    get :index, :lang => "ja"
+    jamis_cache = content_to_cache
+
+    @request.host = 'david.hostname.com'
+    get :index, :lang => "ja"
+    david_cache = content_to_cache
+    assert_not_equal jamis_cache, @response.body
+
+    @request.host = 'jamis.hostname.com'
+    get :index, :lang => "ja"
+    assert_equal jamis_cache, @response.body
+
+    @request.host = 'david.hostname.com'
+    get :index, :lang => "ja"
+    assert_equal david_cache, @response.body
+  end
+
+  def test_xml_version_of_resource_is_treated_as_different_cache
+    @mock_controller.mock_url_for = 'http://example.org/posts/'
+    @mock_controller.mock_path    = '/posts/index.xml'
+    path_object = @path_class.new(@mock_controller)
+    assert_equal 'xml', path_object.extension
+    assert_equal 'example.org/posts/index.xml', path_object.path
+  end
+
+  def test_empty_path_is_normalized
+    @mock_controller.mock_url_for = 'http://example.org/'
+    @mock_controller.mock_path    = '/'
+
+    assert_equal 'example.org/index', @path_class.path_for(@mock_controller)
+  end
+
+  def test_file_extensions
+    get :index, :id => 'kitten.jpg', :lang => "ja"
+    assert_response :success
+    reset!
+    get :index, :id => 'kitten.jpg', :lang => "ja"
+    assert_response :success
+    reset!
+
+    get :index, :id => 'kitten.jpg', :lang => "en"
+    assert_response :success
+    reset!
+    get :index, :id => 'kitten.jpg', :lang => "en"
+    assert_response :success
+    reset!
+  end
+
+  private
+    def content_to_cache
+      assigns(:cache_this)
+    end
+
+    def reset!
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+      @controller = ActionCachingTestController.new
+      @request.host = 'hostname.com'
+    end
+end

data/test/po/da/plural_error.po

@@ -16,6 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: hello_plural.rb:11
-msgid "one"
-msgid_plural "two"
-msgstr[0] "da_one"
+msgid "first"
+msgid_plural "second"
+msgstr[0] "da_first"

data/test/po/fr/plural.po

@@ -20,3 +20,9 @@ msgid "one"
 msgid_plural "two"
 msgstr[0] "fr_one"
 msgstr[1] "fr_plural"
+
+#: hello_plural.rb:14
+msgid "single"
+msgid_plural "plural"
+msgstr[0] "fr_hitotsu"
+msgstr[1] "fr_fukusu"

data/test/po/fr/plural_error.po

@@ -15,6 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: hello_plural.rb:11
-msgid "one"
-msgid_plural "two"
-msgstr[0] "fr_one"
+msgid "first"
+msgid_plural "second"
+msgstr[0] "fr_first"

data/test/po/ja/plural.po

@@ -20,3 +20,9 @@ msgid "one"
 msgid_plural "two"
 msgstr[0] "all"
 msgstr[1] ""
+
+#: hello_plural.rb:13
+msgid "single"
+msgid_plural "plural"
+msgstr[0] "hitotsu"
+msgstr[1] "fukusu"

data/test/po/ja/plural_error.po

@@ -15,6 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: hello_plural.rb:11
-msgid "one"
-msgid_plural "two"
+msgid "first"
+msgid_plural "second"
 msgstr[0] "a"

data/test/po/ja/test_nsgettext.po

@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2007-07-03 00:20+0900\n"
+"PO-Revision-Date: 2007-07-03 00:20+0900\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: test_nsgettext.rb:10 test_nsgettext.rb:14
+msgid "AAA|BBB"
+msgid_plural "CCC"
+msgstr[0] "single"
+msgstr[1] "plural"
+
+#: test_nsgettext.rb:18
+msgid "AAA"
+msgid_plural "BBB"
+msgstr[0] ""
+msgstr[1] ""
+
+#: test_nsgettext.rb:22
+msgid "AAA|CCC"
+msgid_plural "DDD"
+msgstr[0] ""
+msgstr[1] ""
+
+#: test_nsgettext.rb:26
+msgid "AAA|BBB|CCC"
+msgid_plural "DDD"
+msgstr[0] ""
+msgstr[1] ""
+
+#: test_nsgettext.rb:30
+msgid "AAA$BBB"
+msgid_plural "CCC"
+msgstr[0] ""
+msgstr[1] ""
+
+#: test_nsgettext.rb:34
+msgid "AAA$B|BB"
+msgid_plural "CCC"
+msgstr[0] ""
+msgstr[1] ""
+
+#: test_nsgettext.rb:38
+msgid "AAA$B|CC"
+msgid_plural "DDD"
+msgstr[0] "single"
+msgstr[1] "plural"
+
+#: test_nsgettext.rb:42
+msgid "AAA|CCC|BBB"
+msgid_plural "DDD"
+msgstr[0] ""
+msgstr[1] ""

data/test/po/la/plural_error.po

@@ -16,6 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural= n != 1;\n"
 
 #: hello_plural.rb:11
-msgid "one"
-msgid_plural "two"
-msgstr[0] "la_one"
+msgid "first"
+msgid_plural "second"
+msgstr[0] "la_first"

data/test/rails/README

@@ -0,0 +1,5 @@
+This directory is a test application for RoR.
+
+$ rake createdb
+$ rake makemo
+$ rake test

data/test/rails/Rakefile

@@ -0,0 +1,35 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'
+
+desc 'Build the MySQL test databases'
+task :createdb do
+  %x( mysqladmin -u root create rails_unittest )
+  %x( rake db:schema:load )
+end
+
+desc 'Drop the MySQL test databases'
+task :dropdb do
+  %x( mysqladmin -u root -f drop rails_unittest )
+end
+
+desc "Create mo-files for L10n"
+task :makemo do
+  require 'gettext/utils'
+  GetText.create_mofiles(true, "po", "locale")
+  mkdir "log" unless File.exists? "log"
+end
+
+desc "Update pot/po files to match new version."
+task :updatepo do
+  require 'gettext/utils'
+  GetText.update_pofiles("rails_test", Dir.glob("{app,lib}/**/*.{rb,rhtml}"),
+                         "rails_test 1.2.0")
+end

data/test/rails/app/controllers/application.rb

@@ -0,0 +1,8 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  # Pick a unique cookie name to distinguish our session data from others'
+  session :session_key => '_rails_session_id'
+  init_gettext "rails_test"
+end

data/test/rails/app/controllers/articles_controller.rb

@@ -0,0 +1,61 @@
+class ArticlesController < ApplicationController
+  def index
+    list
+    render :action => 'list'
+  end
+
+  # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
+  verify :method => :post, :only => [ :destroy, :create, :update ],
+         :redirect_to => { :action => :list }
+
+  def list
+    @article_pages, @articles = paginate :articles, :per_page => 10
+  end
+
+  def show
+    @article = Article.find(params[:id])
+  end
+
+  def new
+    @article = Article.new
+    @article.lastupdate = Date.new(2007, 4, 1)
+  end
+
+  def create
+    @article = Article.new(params[:article])
+    if @article.save
+      flash[:notice] = _('Article was successfully created.')
+      redirect_to :action => 'list'
+    else
+      render :action => 'new'
+    end
+  end
+
+  def edit
+    @article = Article.find(params[:id])
+  end
+
+  def multi_error_messages_for
+    @user = User.new
+    @user.lastupdate = Date.new(2007, 4, 1)
+    @article = Article.new
+    @article.lastupdate = Date.new(2007, 4, 1)
+    @user.valid?
+    @article.valid?
+  end
+
+  def update
+    @article = Article.find(params[:id])
+    if @article.update_attributes(params[:article])
+      flash[:notice] = _('Article was successfully updated.')
+      redirect_to :action => 'show', :id => @article
+    else
+      render :action => 'edit'
+    end
+  end
+
+  def destroy
+    Article.find(params[:id]).destroy
+    redirect_to :action => 'list'
+  end
+end

data/test/rails/app/controllers/mailer_controller.rb

@@ -0,0 +1,19 @@
+class MailerController < ApplicationController
+  layout "mailer"
+
+  init_gettext "rails_test"
+  
+  def index
+    render :nothing => true, :layout => true
+  end
+
+  def singlepart
+    Mailer.deliver_singlepart
+    render :text => Mailer.create_singlepart.encoded, :layout => true
+  end
+
+  def multipart
+    Mailer.deliver_multipart
+    render :text => Mailer.create_multipart.encoded, :layout => true
+  end
+end

data/test/rails/app/helpers/application_helper.rb

@@ -0,0 +1,3 @@
+# Methods added to this helper will be available to all templates in the application.
+module ApplicationHelper
+end