gettext 1.0.0 → 1.1.0

data/samples/rails/Rakefile

@@ -204,9 +204,18 @@ end
 #
 # Added for Ruby-GetText-Package
 #
-require 'gettext/rmsgfmt'
+
+require 'gettext/utils'
 desc "Create mo-files for L10n"
 task :makemo do
   GetText.create_mofiles(true, "po", "locale")
 end
 
+desc "Update pot/po files to match new version."
+task :updatepo do
+  GetText.update_pofiles("blog", Dir.glob("{app,lib}/**/*.{rb,rhtml}"),
+			 "blog 1.1.0")
+
+  GetText.update_pofiles("gettext_plugin", Dir.glob("vendor/**/*.{rb,rhtml}"),
+			 "gettext_plugin 1.1.0")
+end

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

@@ -7,31 +7,23 @@
 # Require 'gettext/rails' first.
 require 'gettext/rails'
 
-# lang_helper is sample helper. It has its own textdomain(lang_helper).
-# (See vendor/lang_helper.rb).
-require 'lang_helper'
-
 class ApplicationController < ActionController::Base
-  # for lang_helper.
-  helper LangHelper
-  include LangHelper
-
   # Initialize GetText and Content-Type.
   # You need to call this once a request from WWW browser.
   # You can select the scope of the textdomain.
-  # 1. If you call bindtextdomain in ApplicationControler,
+  # 1. If you call init_gettext in ApplicationControler,
   #    The textdomain apply whole your application.
-  # 2. If you call bindtextdomain in each controllers
+  # 2. If you call init_gettext in each controllers
   #    (In this sample, blog_controller.rb is applicable)
   #    The textdomains are applied to each controllers/views.
-  before_filter :init_gettext
-  def init_gettext
-    # The locale is set automatically or use Cookie value, parameter "lang".
-    bindtextdomain("blog", request.cgi)  #You need to pass CGI object first.
+  init_gettext "blog"  # textdomain, charset = "UTF-8", content_type = "text/html" 
 
-    # Or set locale forcely.
-    #bindtextdomain("blog", request.cgi, "ja")
-
-    @headers["Content-Type"] = "text/html; charset=UTF-8"
+=begin
+  # You can override the main part of "init_gettext" by yourself.
+  def init_gettext_main
+    GetText.output_charset = "UTF-8"
+    bindtextdomain("blog", request.cgi)  #You need to pass CGI object first.
+    @headers["Content-Type"] = "text/html; charset=#{GetText.output_charset}"
   end
+=end
 end

data/samples/rails/app/controllers/blog_controller.rb

@@ -8,11 +8,7 @@ class BlogController < ApplicationController
   # If you want to have textdomains each as controllers.
   # You need to bind textdomain here.
 
-  #before_filter :init_gettext
-  #def init_gettext
-  #  bindtextdomain("blog", request.cgi)  #You need to pass CGI object first.
-  #  @headers["Content-Type"] = "text/html; charset=UTF-8"
-  #end
+  init_gettext "blog"
 
   def index
     list

data/samples/rails/app/helpers/blog_helper.rb

@@ -35,7 +35,7 @@ module BlogHelper
     articles = BlogController.new.list
     %Q[
 <div class="navigation">
-<img src="http://web.rubyonrails.com/images/rails_logo_remix.gif" />
+<img src="/images/rails.png" width="100" height="100" />
 <div class="window">
 #{show_language}
 </div>

data/samples/rails/app/models/article.rb

@@ -1,2 +1,17 @@
 class Article < ActiveRecord::Base
+  # With default error messages.
+  validates_presence_of :title
+  validates_length_of :description, :minimum => 10
+
+
+  # With your own message with L10n. 
+  # old style(Backward compatibility).
+  # blog.po in RAILS_ROOT/po/*/ is used.
+#  validates_presence_of :title, :message => _("can't be empty")
+#  validates_length_of :description, :minimum => 10, :message => _("is too short (min is %d characters)")
+
+  # new style (you can use %{fn} and %d freely in the message)
+  # blog.po in RAILS_ROOT/po/*/ is used.
+#  validates_presence_of :title, :message => _("%{fn} can't be empty!")
+#  validates_length_of :description, :minimum => 10, :message => _("%{fn} is too short (min is %d characters)")
 end

data/samples/rails/app/views/blog/_form.rhtml

@@ -15,10 +15,10 @@
 <!--[form:article]-->
 <p><label for="article_lastupdate"><%= _("Lastupdate") %></label><br/>
 <%= date_select 'article', 'lastupdate', :use_month_numbers => true  %></p>
-<p><label for="article_title"><%= _("Title") %></label><br/>
+<p><label for="article_title"><%= _("Title: Required.") %></label><br/>
 <%= text_field 'article', 'title'  %></p>
 
-<p><label for="article_description"><%= _("Description") %></label><br/>
+<p><label for="article_description"><%= _("Description: More than 10 characters.") %></label><br/>
 <%= text_area 'article', 'description'  %></p>
 
 <!--[eoform:article]-->

data/samples/rails/config/boot.rb

@@ -0,0 +1,17 @@
+unless defined?(RAILS_ROOT)
+  root_path = File.join(File.dirname(__FILE__), '..')
+  unless RUBY_PLATFORM =~ /mswin32/
+    require 'pathname'
+    root_path = Pathname.new(root_path).cleanpath(true).to_s
+  end
+  RAILS_ROOT = root_path
+end
+
+if File.directory?("#{RAILS_ROOT}/vendor/rails")
+  require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+else
+  require 'rubygems'
+  require 'initializer'
+end
+
+Rails::Initializer.run(:set_load_path)

data/samples/rails/config/database.yml

@@ -11,7 +11,7 @@ development:
 #  adapter: postgresql
 #  database: blog
 #  host: localhost
-#  username: mutoh
+#  username: postgres
 #  password: 
 
 # Warning: The database defined as 'test' will be erased and
@@ -26,7 +26,9 @@ test:
 
 production:
   adapter: mysql
-  database: rails_production
+  socket: /var/lib/mysql/mysql.sock
+#  socket: /tmp/mysql.sock
+  database: blog
   host: localhost
   username: root
-  password: 
+  password:

data/samples/rails/config/environment.rb

@@ -1,88 +1,53 @@
-# Load the Rails framework and configure your application.
-# You can include your own configuration at the end of this file.
-#
-# Be sure to restart your webserver when you modify this file.
+# Be sure to restart your web server when you modify this file.
 
-$KCODE = "u"
+# Uncomment below to force Rails into production mode when 
+# you don't control web/app server and can't set it the proper way
+# ENV['RAILS_ENV'] ||= 'production'
 
-# The path to the root directory of your application.
-RAILS_ROOT = File.join(File.dirname(__FILE__), '..')
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
 
-# The environment your application is currently running.  Don't set
-# this here; put it in your webserver's configuration as the RAILS_ENV
-# environment variable instead.
-#
-# See config/environments/*.rb for environment-specific configuration.
-RAILS_ENV  = ENV['RAILS_ENV'] || 'development'
+Rails::Initializer.run do |config|
+  # Settings in config/environments/* take precedence those specified here
+  
+  # Skip frameworks you're not going to use
+  # config.frameworks -= [ :action_web_service, :action_mailer ]
 
+  # Add additional load paths for your own custom dirs
+  # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
-# Load the Rails framework.  Mock classes for testing come first.
-ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
+  # Force all environments to use the same logger level 
+  # (by default production uses :info, the others :debug)
+  # config.log_level = :debug
 
-# Then model subdirectories.
-ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"])
-ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
+  # Use the database for sessions instead of the file system
+  # (create the session table with 'rake create_sessions_table')
+  # config.action_controller.session_store = :active_record_store
 
-# Followed by the standard includes.
-ADDITIONAL_LOAD_PATHS.concat %w(
-  app 
-  app/models 
-  app/controllers 
-  app/helpers 
-  app/apis 
-  components 
-  config 
-  lib 
-  vendor 
-  vendor/rails/railties
-  vendor/rails/railties/lib
-  vendor/rails/actionpack/lib
-  vendor/rails/activesupport/lib
-  vendor/rails/activerecord/lib
-  vendor/rails/actionmailer/lib
-  vendor/rails/actionwebservice/lib
-).map { |dir| "#{RAILS_ROOT}/#{dir}" }.select { |dir| File.directory?(dir) }
+  # Enable page/fragment caching by setting a file-based store
+  # (remember to create the caching directory and make it readable to the application)
+  # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
 
-# Prepend to $LOAD_PATH
-ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+  # Activate observers that should always be running
+  # config.active_record.observers = :cacher, :garbage_collector
 
-# Require Rails libraries.
-require 'rubygems' unless File.directory?("#{RAILS_ROOT}/vendor/rails")
+  # Make Active Record use UTC-base instead of local time
+  # config.active_record.default_timezone = :utc
+  
+  # Use Active Record's schema dumper instead of SQL when creating the test database
+  # (enables use of different database adapters for development and test environments)
+  # config.active_record.schema_format = :ruby
 
-require 'active_support'
-require 'active_record'
-require 'action_controller'
-require 'action_mailer'
-require 'action_web_service'
-
-# Environment-specific configuration.
-require_dependency "environments/#{RAILS_ENV}"
-ActiveRecord::Base.configurations = File.open("#{RAILS_ROOT}/config/database.yml") { |f| YAML::load(f) }
-ActiveRecord::Base.establish_connection
-
-
-# Configure defaults if the included environment did not.
-begin
-  RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
-  RAILS_DEFAULT_LOGGER.level = (RAILS_ENV == 'production' ? Logger::INFO : Logger::DEBUG)
-rescue StandardError
-  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
-  RAILS_DEFAULT_LOGGER.level = Logger::WARN
-  RAILS_DEFAULT_LOGGER.warn(
-    "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0666. " +
-    "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
-  )
+  # See Rails::Configuration for more options
 end
 
-[ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER }
-[ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" }
-
-# Set up routes.
-ActionController::Routing::Routes.reload
-
-Controllers = Dependencies::LoadingModule.root(
-  File.join(RAILS_ROOT, 'app', 'controllers'),
-  File.join(RAILS_ROOT, 'components')
-)
+# Add new inflection rules using the following format 
+# (all these examples are active by default):
+# Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
 
-# Include your app's configuration here:
+# Include your application configuration below

data/samples/rails/config/environments/development.rb

@@ -1,14 +1,19 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
 # In the development environment your application's code is reloaded on
 # every request.  This slows down response time but is perfect for development
 # since you don't have to restart the webserver when you make code changes.
+config.cache_classes     = false
 
 # Log error messages when you accidentally call methods on nil.
-require 'active_support/whiny_nil'
+config.whiny_nils        = true
+
+# Enable the breakpoint server that script/breakpointer connects to
+config.breakpoint_server = true
 
-# Reload code; show full error reports; disable caching.
-Dependencies.mechanism                             = :load
-ActionController::Base.consider_all_requests_local = true
-ActionController::Base.perform_caching             = false
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
 
-# The breakpoint server port that script/breakpointer connects to.
-BREAKPOINT_SERVER_PORT = 42531
+# Don't care if the mailer can't send
+config.action_mailer.raise_delivery_errors = false

data/samples/rails/config/environments/production.rb

@@ -1,8 +1,19 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
 # The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests, full error reports are disabled,
-# and caching is turned on.
+# Code is not reloaded between requests
+config.cache_classes = true
+
+# Use a different logger for distributed setups
+# config.logger        = SyslogLogger.new
+
+
+# Full error reports are disabled and caching is turned on
+config.action_controller.consider_all_requests_local = false
+config.action_controller.perform_caching             = true
+
+# Enable serving of images, stylesheets, and javascripts from an asset server
+# config.action_controller.asset_host                  = "http://assets.example.com"
 
-# Don't reload code; don't show full error reports; enable caching.
-Dependencies.mechanism                             = :require
-ActionController::Base.consider_all_requests_local = false
-ActionController::Base.perform_caching             = true
+# Disable delivery errors if you bad email addresses should just be ignored
+# config.action_mailer.raise_delivery_errors = false

data/samples/rails/config/environments/test.rb

@@ -1,17 +1,19 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
 # The test environment is used exclusively to run your application's
 # test suite.  You never need to work with it otherwise.  Remember that
 # your test database is "scratch space" for the test suite and is wiped
 # and recreated between test runs.  Don't rely on the data there!
+config.cache_classes = true
 
 # Log error messages when you accidentally call methods on nil.
-require 'active_support/whiny_nil'
+config.whiny_nils    = true
 
-# Don't reload code; show full error reports; disable caching.
-Dependencies.mechanism                             = :require
-ActionController::Base.consider_all_requests_local = true
-ActionController::Base.perform_caching             = false
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
 
 # Tell ActionMailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
-ActionMailer::Base.delivery_method                 = :test
+config.action_mailer.delivery_method = :test

data/samples/rails/po/blog.pot

@@ -9,8 +9,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2005-08-28 00:10+0900\n"
+"Project-Id-Version: blog 1.1.0\n"
+"POT-Creation-Date: 2005-12-23 01:29+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,72 +19,92 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: app/controllers/blog_controller.rb:22
-msgid "Article was successfully created."
+#: app/helpers/blog_helper.rb:43
+msgid "Ruby Links"
 msgstr ""
 
-#: app/controllers/blog_controller.rb:36
-msgid "Article was successfully updated."
+#: app/helpers/blog_helper.rb:51
+msgid "Old articles"
 msgstr ""
 
-#: app/helpers/blog_helper.rb:31
-msgid "Ruby Links"
+#: app/models/article.rb:-
+msgid "Article"
 msgstr ""
 
-#: app/helpers/blog_helper.rb:39
-msgid "Old articles"
+#: app/models/article.rb:-
+msgid "Article|Id"
 msgstr ""
 
-#: app/views/blog/_form.rhtml:4
-msgid "Lastupdate"
+#: app/models/article.rb:-
+msgid "Article|Title"
 msgstr ""
 
-#: app/views/blog/_form.rhtml:6
-msgid "Title"
+#: app/models/article.rb:-
+msgid "Article|Description"
 msgstr ""
 
-#: app/views/blog/_form.rhtml:9
-msgid "Description"
+#: app/models/article.rb:-
+msgid "Article|Lastupdate"
 msgstr ""
 
-#: app/views/blog/edit.rhtml:1
-msgid "Editing article"
+#: app/controllers/blog_controller.rb:37
+msgid "Article was successfully created."
 msgstr ""
 
-#: app/views/blog/edit.rhtml:5 app/views/blog/show.rhtml:4
-msgid "Edit"
+#: app/controllers/blog_controller.rb:51
+msgid "Article was successfully updated."
 msgstr ""
 
-#: app/views/blog/edit.rhtml:8
-msgid "Show"
+#: app/views/blog/new.rhtml:13 app/views/blog/list.rhtml:15
+msgid "New article"
 msgstr ""
 
-#: app/views/blog/edit.rhtml:9
-msgid "Destroy"
+#: app/views/blog/new.rhtml:17
+msgid "Create"
 msgstr ""
 
-#: app/views/blog/edit.rhtml:9
-msgid "Are you sure?"
+#: app/views/blog/new.rhtml:20 app/views/blog/edit.rhtml:21
+#: app/views/blog/show.rhtml:17
+msgid "Back"
 msgstr ""
 
-#: app/views/blog/edit.rhtml:10 app/views/blog/new.rhtml:8
-#: app/views/blog/show.rhtml:5
-msgid "Back"
+#: app/views/blog/_form.rhtml:16
+msgid "Lastupdate"
 msgstr ""
 
-#: app/views/blog/list.rhtml:1 app/views/blog/show.rhtml:1
-#: app/views/layouts/blog.rhtml:3
-msgid "GetText Sample Blog on RoR"
+#: app/views/blog/_form.rhtml:18
+msgid "Title: Required."
 msgstr ""
 
-#: app/views/blog/list.rhtml:3 app/views/blog/new.rhtml:1
-msgid "New article"
+#: app/views/blog/_form.rhtml:21
+msgid "Description: More than 10 characters."
+msgstr ""
+
+#: app/views/blog/list.rhtml:13 app/views/blog/show.rhtml:13
+#: app/views/layouts/blog.rhtml:14
+msgid "GetText Sample Blog on RoR"
 msgstr ""
 
-#: app/views/blog/list.rhtml:6
+#: app/views/blog/list.rhtml:18
 msgid "No articles were found."
 msgstr ""
 
-#: app/views/blog/new.rhtml:5
-msgid "Create"
+#: app/views/blog/edit.rhtml:12
+msgid "Editing article"
+msgstr ""
+
+#: app/views/blog/edit.rhtml:16 app/views/blog/show.rhtml:16
+msgid "Edit"
+msgstr ""
+
+#: app/views/blog/edit.rhtml:19
+msgid "Show"
+msgstr ""
+
+#: app/views/blog/edit.rhtml:20
+msgid "Destroy"
+msgstr ""
+
+#: app/views/blog/edit.rhtml:20
+msgid "Are you sure?"
 msgstr ""