gettext 1.2.0-mswin32 → 1.3.0-mswin32

data/po/sv/rgettext.po

@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 1.2.0\n"
-"POT-Creation-Date: 2006-02-23 00:44+0900\n"
+"POT-Creation-Date: 2006-03-04 22:50+0900\n"
 "PO-Revision-Date: 2004-11-04 20:49+0100\n"
 "Last-Translator: Nikolai Weibull\n"
 "Language-Team: Swedish\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/gettext/rmsgmerge.rb:405
+#: lib/gettext/rmsgmerge.rb:402
 msgid "Usage: %s def.po ref.pot [-o output.pot]"
 msgstr "Användning: %s def.po ref.pot [-o output.pot]"
 
-#: lib/gettext/rmsgmerge.rb:408
+#: lib/gettext/rmsgmerge.rb:405
 msgid ""
 "Merges two Uniforum style .po files together. The def.po file is an existing "
 "PO file with translations. The ref.pot file is the last created PO file with "
 "up-to-date source references. ref.pot is generally created by rgettext."
 msgstr ""
 
-#: lib/gettext/rmsgmerge.rb:410 lib/gettext/rgettext.rb:132
+#: lib/gettext/rmsgmerge.rb:407 lib/gettext/rgettext.rb:132
 #: lib/gettext/rmsgfmt.rb:50
 msgid "Specific options:"
 msgstr ""
 
-#: lib/gettext/rmsgmerge.rb:412 lib/gettext/rgettext.rb:134
+#: lib/gettext/rmsgmerge.rb:409 lib/gettext/rgettext.rb:134
 #: lib/gettext/rmsgfmt.rb:52
 msgid "write output to specified file"
 msgstr ""
 
-#: lib/gettext/rmsgmerge.rb:423 lib/gettext/rgettext.rb:143
+#: lib/gettext/rmsgmerge.rb:420 lib/gettext/rgettext.rb:143
 #: lib/gettext/rmsgfmt.rb:56
 msgid "display version information and exit"
 msgstr ""
 
-#: lib/gettext/rmsgmerge.rb:448
+#: lib/gettext/rmsgmerge.rb:445
 msgid "definition po is not given."
 msgstr ""
 
-#: lib/gettext/rmsgmerge.rb:450
+#: lib/gettext/rmsgmerge.rb:447
 msgid "reference pot is not given."
 msgstr ""
 

data/samples/rails/README

@@ -44,8 +44,9 @@ http://localhost:3000/blog
 Files
 -----
 
-* Rakefile 
-     - a Rakefile generated by rails.
+* lib/tasks/gettext.rake
+     - a rake file for Ruby-GetText-Package.
+       You need to modify this for your application.
        ":makemo" task which creates mo files from po files.
        ":updatepo" task which updates pot/po files from po files.
         If there is no po/*pot files, it creates po/*.pot.

data/samples/rails/Rakefile

@@ -1,221 +1,10 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/switchtower.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'
 
-$VERBOSE = nil
-TEST_CHANGES_SINCE = Time.now - 600
-
-desc "Run all the tests on a fresh test database"
-task :default => [ :test_units, :test_functional ]
-
-
-desc 'Require application environment.'
-task :environment do
-  unless defined? RAILS_ROOT
-    require File.dirname(__FILE__) + '/config/environment'
-  end
-end
-
-desc "Generate API documentation, show coding stats"
-task :doc => [ :appdoc, :stats ]
-
-
-# Look up tests for recently modified sources.
-def recent_tests(source_pattern, test_path, touched_since = 10.minutes.ago)
-  FileList[source_pattern].map do |path|
-    if File.mtime(path) > touched_since
-      test = "#{test_path}/#{File.basename(path, '.rb')}_test.rb"
-      test if File.exists?(test)
-    end
-  end.compact
-end
-
-desc 'Test recent changes.'
-Rake::TestTask.new(:recent => [ :clone_structure_to_test ]) do |t|
-  since = TEST_CHANGES_SINCE
-  touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
-    recent_tests('app/models/*.rb', 'test/unit', since) +
-    recent_tests('app/controllers/*.rb', 'test/functional', since)
-
-  t.libs << 'test'
-  t.verbose = true
-  t.test_files = touched.uniq
-end
-task :test_recent => [ :clone_structure_to_test ]
-
-desc "Run the unit tests in test/unit"
-Rake::TestTask.new("test_units") { |t|
-  t.libs << "test"
-  t.pattern = 'test/unit/**/*_test.rb'
-  t.verbose = true
-}
-task :test_units => [ :clone_structure_to_test ]
-
-desc "Run the functional tests in test/functional"
-Rake::TestTask.new("test_functional") { |t|
-  t.libs << "test"
-  t.pattern = 'test/functional/**/*_test.rb'
-  t.verbose = true
-}
-task :test_functional => [ :clone_structure_to_test ]
-
-desc "Generate documentation for the application"
-Rake::RDocTask.new("appdoc") { |rdoc|
-  rdoc.rdoc_dir = 'doc/app'
-  rdoc.title    = "Rails Application Documentation"
-  rdoc.options << '--line-numbers --inline-source'
-  rdoc.rdoc_files.include('doc/README_FOR_APP')
-  rdoc.rdoc_files.include('app/**/*.rb')
-}
-
-desc "Generate documentation for the Rails framework"
-Rake::RDocTask.new("apidoc") { |rdoc|
-  rdoc.rdoc_dir = 'doc/api'
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-  rdoc.title    = "Rails Framework Documentation"
-  rdoc.options << '--line-numbers --inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('CHANGELOG')
-  rdoc.rdoc_files.include('vendor/rails/railties/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/rails/railties/MIT-LICENSE')
-  rdoc.rdoc_files.include('vendor/rails/activerecord/README')
-  rdoc.rdoc_files.include('vendor/rails/activerecord/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/rails/activerecord/lib/active_record/**/*.rb')
-  rdoc.rdoc_files.exclude('vendor/rails/activerecord/lib/active_record/vendor/*')
-  rdoc.rdoc_files.include('vendor/rails/actionpack/README')
-  rdoc.rdoc_files.include('vendor/rails/actionpack/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/rails/actionpack/lib/action_controller/**/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionpack/lib/action_view/**/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionmailer/README')
-  rdoc.rdoc_files.include('vendor/rails/actionmailer/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/rails/actionmailer/lib/action_mailer/base.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/README')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/api/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/client/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/container/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/dispatcher/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/protocol/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/support/*.rb')
-  rdoc.rdoc_files.include('vendor/rails/activesupport/README')
-  rdoc.rdoc_files.include('vendor/rails/activesupport/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/rails/activesupport/lib/active_support/**/*.rb')
-}
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats => [ :environment ] do
-  require 'code_statistics'
-  CodeStatistics.new(
-    ["Helpers", "app/helpers"], 
-    ["Controllers", "app/controllers"], 
-    ["APIs", "app/apis"],
-    ["Components", "components"],
-    ["Functionals", "test/functional"],
-    ["Models", "app/models"],
-    ["Units", "test/unit"]
-  ).to_s
-end
-
-desc "Recreate the test databases from the development structure"
-task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
-  abcs = ActiveRecord::Base.configurations
-  case abcs["test"]["adapter"]
-    when  "mysql"
-      ActiveRecord::Base.establish_connection(:test)
-      ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
-      IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
-        ActiveRecord::Base.connection.execute(table)
-      end
-    when "postgresql"
-      ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
-      ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
-      ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
-      `psql -U "#{abcs["test"]["username"]}" -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}`
-    when "sqlite", "sqlite3"
-      `#{abcs[RAILS_ENV]["adapter"]} #{abcs["test"]["dbfile"]} < db/#{RAILS_ENV}_structure.sql`
-    when "sqlserver"
-      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
-    else 
-      raise "Unknown database adapter '#{abcs["test"]["adapter"]}'"
-  end
-end
-
-desc "Dump the database structure to a SQL file"
-task :db_structure_dump => :environment do
-  abcs = ActiveRecord::Base.configurations
-  case abcs[RAILS_ENV]["adapter"] 
-    when "mysql"
-      ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
-      File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
-    when "postgresql"
-      ENV['PGHOST']     = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["host"]
-      ENV['PGPORT']     = abcs[RAILS_ENV]["port"].to_s if abcs[RAILS_ENV]["port"]
-      ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"].to_s if abcs[RAILS_ENV]["password"]
-      `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{abcs[RAILS_ENV]["database"]}`
-    when "sqlite", "sqlite3"
-      `#{abcs[RAILS_ENV]["adapter"]} #{abcs[RAILS_ENV]["dbfile"]} .schema > db/#{RAILS_ENV}_structure.sql`
-    when "sqlserver"
-      `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /f db\\#{RAILS_ENV}_structure.sql /q /A /r`
-      `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /F db\ /q /A /r`
-    else 
-      raise "Unknown database adapter '#{abcs["test"]["adapter"]}'"
-  end
-end
-
-desc "Empty the test database"
-task :purge_test_database => :environment do
-  abcs = ActiveRecord::Base.configurations
-  case abcs["test"]["adapter"]
-    when "mysql"
-      ActiveRecord::Base.establish_connection(:test)
-      ActiveRecord::Base.connection.recreate_database(abcs["test"]["database"])
-    when "postgresql"
-      ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
-      ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
-      ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
-      `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
-      `createdb -T template0 -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
-    when "sqlite","sqlite3"
-      File.delete(abcs["test"]["dbfile"]) if File.exist?(abcs["test"]["dbfile"])
-    when "sqlserver"
-      dropfkscript = "#{abcs["test"]["host"]}.#{abcs["test"]["database"]}.DP1".gsub(/\\/,'-')
-      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{dropfkscript}`
-      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
-    else 
-      raise "Unknown database adapter '#{abcs["test"]["adapter"]}'"
-  end
-end
-
-desc "Clears all *.log files in log/"
-task :clear_logs => :environment do
-  FileList["log/*.log"].each do |log_file|
-    f = File.open(log_file, "w")
-    f.close
-  end
-end
-
-desc "Migrate the database according to the migrate scripts in db/migrate (only supported on PG/MySQL). A specific version can be targetted with VERSION=x"
-task :migrate => :environment do
-  ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/db/migrate/', ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-end
-
-#
-# Added for Ruby-GetText-Package
-#
-
-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
+require 'tasks/rails'

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

@@ -25,5 +25,6 @@ class ApplicationController < ActionController::Base
     bindtextdomain("blog", request.cgi)  #You need to pass CGI object first.
     @headers["Content-Type"] = "text/html; charset=#{GetText.output_charset}"
   end
+  use_localized_templates false
 =end
 end

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

@@ -6,26 +6,17 @@ class Article < ActiveRecord::Base
   # 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)")
+#  validates_presence_of :title, :message => N_("can't be empty")
+#  validates_length_of :description, :minimum => 10, :message => N_("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)")
+#  validates_presence_of :title, :message => N_("%{fn} can't be empty!")
+#  validates_length_of :description, :minimum => 10, :message => N_("%{fn} is too short (min is %d characters)")
 
-#
 # you can also redefined the title/explanation of the top of the error message.
 #
-#  def error_message_title(num, record)
-#    n_("%{num} error prohibited this %{record} from being saved", 
-#       "%{num} errors prohibited this %{record} from being saved", num) % 
-#      {:num => num, :record => record}
-#  end
-#
-#  def error_message_explanation(num)
-#    n_("There was a problem with the following field:", 
-#    "There were problems with the following fields:", num) % {:num => num}
-#  end
-
+#  set_error_message_title(N_("An error is occured on %{record}"), 
+#			  N_("%{num} errors are occured on %{record}"))
+#  set_error_message_explanation(N_("The error is:"), N_("The errors are:"))
 end

data/samples/rails/config/database.yml

@@ -6,7 +6,7 @@ development:
   host: localhost
   encoding: utf8
   username: root
-  password: muto987m
+  password:
 
 #development:
 #  adapter: postgresql
@@ -34,5 +34,6 @@ production:
 #  socket: /tmp/mysql.sock
   database: blog
   host: localhost
+  encoding: utf8
   username: root
   password:

data/samples/rails/lib/tasks/gettext.rake

@@ -0,0 +1,18 @@
+#
+# Added for Ruby-GetText-Package
+#
+
+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/po/ja/blog.po

@@ -108,3 +108,15 @@ msgstr "削除"
 msgid "Are you sure?"
 msgstr "よろしいですか？"
 
+#: app/models/article.rb:30
+msgid "An error is occured on %{record}"
+msgstr "ukkikki!"
+msgid "%{num} errors are occured on %{record}"
+msgstr "ukki!"
+
+#: app/models/article.rb:32
+msgid "The error is:"
+msgstr "foo:"
+
+msgid "The errors are:"
+msgstr "bar:"

data/samples/rails/public/index.html

@@ -197,7 +197,7 @@
       window.onload = function() {
         $('search-text').value = '';
         $('search').onsubmit = function() {
-          $('search-text').value = 'site:rubyonrails.com ' + $F('search-text');
+          $('search-text').value = 'site:rubyonrails.org ' + $F('search-text');
         }
       }
     </script>
@@ -209,7 +209,7 @@
           <li>
             <form id="search" action="http://www.google.com/search" method="get">
               <input type="hidden" name="hl" value="en" />
-              <input type="text" id="search-text" name="q" value="site:rubyonrails.com " />
+              <input type="text" id="search-text" name="q" value="site:rubyonrails.org " />
               <input type="submit" value="Search" /> the Rails site
             </form>
           </li>
@@ -217,23 +217,21 @@
           <li>
             <h3>Join the community</h3>
             <ul class="links">
-              <li><a href="http://www.rubyonrails.com/">Ruby on Rails</a></li>
-              <li><a href="http://weblog.rubyonrails.com/">Official weblog</a></li>
+              <li><a href="http://www.rubyonrails.org/">Ruby on Rails</a></li>
+              <li><a href="http://weblog.rubyonrails.org/">Official weblog</a></li>
               <li><a href="http://lists.rubyonrails.org/">Mailing lists</a></li>
-              <li><a href="http://wiki.rubyonrails.com/rails/pages/IRC">IRC channel</a></li>
-              <li><a href="http://wiki.rubyonrails.com/">Wiki</a></li>
-              <li><a href="http://dev.rubyonrails.com/">Bug tracker</a></li>
+              <li><a href="http://wiki.rubyonrails.org/rails/pages/IRC">IRC channel</a></li>
+              <li><a href="http://wiki.rubyonrails.org/">Wiki</a></li>
+              <li><a href="http://dev.rubyonrails.org/">Bug tracker</a></li>
             </ul>
           </li>
           
           <li>
             <h3>Browse the documentation</h3>
             <ul class="links">
-              <li><a href="http://manuals.rubyonrails.com/">Manuals</a></li>
-              <li><a href="http://api.rubyonrails.com/">All APIs</a></li>
-              <li><a href="http://ar.rubyonrails.com/">Active Record</a></li>
-              <li><a href="http://ap.rubyonrails.com/">Action Pack</a></li>
-              <li><a href="http://as.rubyonrails.com/">Active Support</a></li>
+              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
+              <li><a href="http://www.ruby-doc.org/stdlib/">Ruby standard library</a></li>
+              <li><a href="http://www.ruby-doc.org/core/">Ruby core</a></li>
             </ul>
           </li>
         </ul>
@@ -241,7 +239,7 @@
 
       <div id="content">
         <div id="header">
-          <h1>Welcome aboard</h2>
+          <h1>Welcome aboard</h1>
           <h2>You&rsquo;re riding the Rails!</h2>
         </div>
 
@@ -256,18 +254,18 @@
           
           <ol>
             <li>
-              <h2>Create your databases and edit <tt>database.yml</tt></h2>
-              <p>Instructions here</p>
+              <h2>Create your databases and edit <tt>config/database.yml</tt></h2>
+              <p>Rails needs to know your login and password.</p>
             </li>
           
             <li>
               <h2>Use <tt>script/generate</tt> to create your models and controllers</h2>
-              <p>Instructions here</p>
+              <p>To see all available options, run it without parameters.</p>
             </li>
             
             <li>
               <h2>Set up a default route and remove or rename this file</h2>
-              <p>Instructions here</p>
+              <p>Routes are setup in config/routes.rb.</p>
             </li>
           </ol>
         </div>