.gitignore README.rdoc gettext.gemspec test/README test/testlib/helper.rb @@ -195,12 +195,20 @@ end desc 'Run all tests' task :test do Dir.chdir("test") do - sh "rake test" + if RUBY_PLATFORM =~ /win32/ + sh "rake.bat", "test" + else + sh "rake", "test" + end end end Rake::RDocTask.new { |rdoc| - allison = `allison --path`.chop + begin + allison = `allison --path`.chop + rescue + allison = '' + end rdoc.rdoc_dir = 'doc' rdoc.title = "Ruby-GetText-Package API Reference" rdoc.options << '--line-numbers' << '--inline-source' Rakefile @@ -1,4 +1,6 @@ +gem 'locale', '>=0.9' require 'locale' + require 'gettext/version' require 'gettext/textdomain_manager' lib/gettext.rb @@ -11,7 +11,6 @@ require 'cgi' require 'gettext' -require 'locale' Locale.init(:driver => :cgi) lib/gettext/cgi.rb @@ -46,15 +46,15 @@ class String else ret = gsub(/%\{/, '%%{') begin - ret._old_format_m(args) + ret._old_format_m(args) rescue ArgumentError => e if $DEBUG - $stderr.puts " The string:#{ret}" - $stderr.puts " args:#{args.inspect}" - puts e.backtrace - else - raise ArgumentError, e.message - end + $stderr.puts " The string:#{ret}" + $stderr.puts " args:#{args.inspect}" + puts e.backtrace + else + raise ArgumentError, e.message + end end end end lib/gettext/core_ext/string.rb @@ -32,11 +32,11 @@ class RubyLexX < RubyLex # :nodoc: all if @here_header s = s.sub(/\A.*?\n/, '').sub(/^.*\n\Z/, '') else - begin - s = eval(s) - rescue Exception - # Do nothing. - end + begin + s = eval(s) + rescue Exception + # Do nothing. + end end tk.value = s @@ -84,66 +84,67 @@ module GetText line_no = nil tk = nil begin - rl.parse do |tk| - case tk - when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT - if ID.include?(tk.name) - target = :normal - elsif PLURAL_ID.include?(tk.name) - target = :plural - elsif MSGCTXT_ID.include?(tk.name) - target = :msgctxt - elsif MSGCTXT_PLURAL_ID.include?(tk.name) - target = :msgctxt_plural - else - target = nil - end - line_no = tk.line_no.to_s - when RubyToken::TkSTRING - if target - if msgid - msgid += tk.value - else - msgid = tk.value - end - end - when RubyToken::TkPLUS, RubyToken::TkNL - #do nothing - when RubyToken::TkCOMMA - if msgid - if target == :plural - msgid += "\000" - target = :normal - elsif target == :msgctxt - msgid += "\004" - target = :normal - elsif target == :msgctxt_plural - msgid += "\004" - target = :plural - else - target = :normal - end - end - else - if msgid - key_existed = targets.assoc(msgid.gsub(/\n/, '\n')) - if key_existed - targets[targets.index(key_existed)] = key_existed << - file_name + ":" + line_no - else - targets << [msgid.gsub(/\n/, '\n'), file_name + ":" + line_no] - end - msgid = nil - target = nil - end - end - targets - end + rl.parse do |tk| + case tk + when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT + if ID.include?(tk.name) + target = :normal + elsif PLURAL_ID.include?(tk.name) + target = :plural + elsif MSGCTXT_ID.include?(tk.name) + target = :msgctxt + elsif MSGCTXT_PLURAL_ID.include?(tk.name) + target = :msgctxt_plural + else + target = nil + end + line_no = tk.line_no.to_s + when RubyToken::TkSTRING + if target + if msgid + msgid += tk.value + else + msgid = tk.value + end + end + when RubyToken::TkPLUS, RubyToken::TkNL + #do nothing + when RubyToken::TkCOMMA + if msgid + case target + when :plural + msgid += "\000" + target = :normal + when :msgctxt + msgid += "\004" + target = :normal + when :msgctxt_plural + msgid += "\004" + target = :plural + else + target = :normal + end + end + else + if msgid + key_existed = targets.assoc(msgid.gsub(/\n/, '\n')) + if key_existed + targets[targets.index(key_existed)] = key_existed << + file_name + ":" + line_no + else + targets << [msgid.gsub(/\n/, '\n'), file_name + ":" + line_no] + end + msgid = nil + target = nil + end + end + targets + end rescue - $stderr.print "\n\nError: #{$!.inspect} " + $stderr.print "\n\nError: #{$!.inspect} " $stderr.print " in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}" if tk $stderr.print "\n" - exit 1 + exit 1 end targets end @@ -151,7 +152,6 @@ module GetText def target?(file) # :nodoc: true # always true, as default parser. end - end end lib/gettext/parser/ruby.rb @@ -16,6 +16,7 @@ end require 'gettext/tools/rgettext' require 'gettext/tools/rmsgfmt' +require 'gettext/mofile' require 'fileutils' module GetText lib/gettext/tools.rb @@ -37,11 +37,11 @@ module GetText ["ruby.rb", "RubyParser"] # Default parser. ].each do |f, klass| begin - require "gettext/parser/#{f}" - @ex_parsers << GetText.const_get(klass) + require "gettext/parser/#{f}" + @ex_parsers << GetText.const_get(klass) rescue - $stderr.puts _("'%{klass}' is ignored.") % {:klass => klass} - $stderr.puts $! if $DEBUG + $stderr.puts _("'%{klass}' is ignored.") % {:klass => klass} + $stderr.puts $! if $DEBUG end end @@ -73,7 +73,8 @@ module GetText sign = off <= 0 ? '-' : '+' time += sprintf('%s%02d%02d', sign, *(off.abs / 60).divmod(60)) - %Q[# SOME DESCRIPTIVE TITLE. + <<TITLE +# 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. @@ -89,42 +90,42 @@ msgstr "" "MIME-Version: 1.0\\n" "Content-Type: text/plain; charset=UTF-8\\n" "Content-Transfer-Encoding: 8bit\\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"] +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n" +TITLE end def generate_pot(ary) # :nodoc: str = "" - result = Array.new ary.each do |key| - msgid = key.shift - curr_pos = MAX_LINE_LEN - key.each do |e| - if curr_pos + e.size > MAX_LINE_LEN - str << "\n#:" - curr_pos = 3 - else - curr_pos += (e.size + 1) - end - str << " " << e - end - msgid.gsub!(/"/, '\"') - msgid.gsub!(/\r/, '') - if msgid.include?("\004") - msgctxt, msgid = msgid.split(/\004/) - str << "\nmsgctxt \"" << msgctxt << "\"\n" + msgid = key.shift + curr_pos = MAX_LINE_LEN + key.each do |e| + if curr_pos + e.size > MAX_LINE_LEN + str << "\n#:" + curr_pos = 3 + else + curr_pos += (e.size + 1) + end + str << " " << e + end + msgid.gsub!(/"/, '\"') + msgid.gsub!(/\r/, '') + if msgid.include?("\004") + msgctxt, msgid = msgid.split(/\004/) + str << "\nmsgctxt \"" << msgctxt << "\"\n" else str << "\n" - end - if msgid.include?("\000") - ids = msgid.split(/\000/) - str << "msgid \"" << ids[0] << "\"\n" - str << "msgid_plural \"" << ids[1] << "\"\n" - str << "msgstr[0] \"\"\n" - str << "msgstr[1] \"\"\n" - else - str << "msgid \"" << msgid << "\"\n" - str << "msgstr \"\"\n" - end + end + if msgid.include?("\000") + ids = msgid.split(/\000/) + str << "msgid \"" << ids[0] << "\"\n" + str << "msgid_plural \"" << ids[1] << "\"\n" + str << "msgstr[0] \"\"\n" + str << "msgstr[1] \"\"\n" + else + str << "msgid \"" << msgid << "\"\n" + str << "msgstr \"\"\n" + end end str end @@ -142,7 +143,7 @@ msgstr "" single_msg[0] != plural_msg[0]) if single_msg[0] != key warn %Q[Warning: n_("#{plural_msg[0].gsub(/\000/, '", "')}") and n_("#{single_msg[0].gsub(/\000/, '", "')}") are duplicated. First msgid was used.] - used_plural_msgs << single_msg[0] + used_plural_msgs << single_msg[0] end single_msg[1..-1].each do |line_info| @@ -167,17 +168,17 @@ msgstr "" def parse(files) # :nodoc: ary = [] files.each do |file| - begin - @ex_parsers.each do |klass| - if klass.target?(file) - ary = klass.parse(file, ary) - break - end - end - rescue - puts "Error occurs in " + file - raise - end + begin + @ex_parsers.each do |klass| + if klass.target?(file) + ary = klass.parse(file, ary) + break + end + end + rescue + puts "Error occurs in " + file + raise + end end normalize(ary) end @@ -193,33 +194,33 @@ msgstr "" opts.separator(_("Specific options:")) opts.on("-o", "--output=FILE", _("write output to specified file")) do |out| - unless FileTest.exist? out - output = File.new(File.expand_path(out), "w+") - else - $stderr.puts(_("File '%s' already exists.") % out) - exit 1 - end + unless FileTest.exist? out + output = File.new(File.expand_path(out), "w+") + else + $stderr.puts(_("File '%s' already exists.") % out) + exit 1 + end end opts.on("-r", "--require=library", _("require the library before executing rgettext")) do |out| - require out + require out end opts.on("-d", "--debug", _("run in debugging mode")) do - $DEBUG = true + $DEBUG = true end opts.on_tail("--version", _("display version information and exit")) do - puts "#{$0} #{VERSION} (#{DATE})" - puts "#{File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]" - exit + puts "#{$0} #{VERSION} (#{DATE})" + puts "#{File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]" + exit end opts.parse!(ARGV) if ARGV.size == 0 - puts opts.help - exit 1 + puts opts.help + exit 1 end [ARGV, output] @@ -227,38 +228,35 @@ msgstr "" def run(targetfiles = nil, out = STDOUT) # :nodoc: if targetfiles.is_a? String - targetfiles = [targetfiles] + targetfiles = [targetfiles] elsif ! targetfiles - targetfiles, out = check_options + targetfiles, out = check_options end if targetfiles.size == 0 - raise ArgumentError, _("no input files") + raise ArgumentError, _("no input files") end if out.is_a? String - File.open(File.expand_path(out), "w+") do |file| - file.puts generate_pot_header - file.puts generate_pot(parse(targetfiles)) - end + File.open(File.expand_path(out), "w+") do |file| + file.puts generate_pot_header + file.puts generate_pot(parse(targetfiles)) + end else - out.puts generate_pot_header - out.puts generate_pot(parse(targetfiles)) + out.puts generate_pot_header + out.puts generate_pot(parse(targetfiles)) end self end end module_function - # Creates a po-file from targetfiles(ruby-script-files, ActiveRecord, .rhtml files, glade-2 XML files), + # Creates a po-file from targetfiles(ruby-script-files, .rhtml files, glade-2 XML files), # then output the result to out. If no parameter is set, it behaves same as command line tools(rgettet). # # This function is a part of GetText.create_pofiles. # Usually you don't need to call this function directly. # - # *Note* for ActiveRecord, you need to run your database server and configure the config/database.xml - # correctly before execute this function. - # # * targetfiles: An Array of po-files or nil. # * out: output IO or output path. # * Returns: self lib/gettext/tools/rgettext.rb @@ -1,6 +1,9 @@ -$:.unshift "../lib" -require 'rubygems' -require 'rake/testtask' +$LOAD_PATH.unshift "../lib" + +#gems that are required, to run the tests... +gem 'locale' + +task :default => :test desc "Create mo files" task :makemo do @@ -11,6 +14,6 @@ end desc 'Run all tests' task :test do Dir.glob("test_*.rb").each do |path| - ruby "-I../lib", "-rubygems", path + ruby "-I../lib", "-rubygems", path rescue nil end end test/Rakefile @@ -1,4 +1,4 @@ -require 'test/unit' +require 'testlib/helper.rb' require 'gettext/class_info' module M1; end test/test_class_info.rb @@ -1,6 +1,4 @@ -require 'test/unit' -require 'gettext' - +require 'testlib/helper.rb' require 'testlib/simple.rb' require 'testlib/gettext.rb' require 'testlib/sgettext.rb' @@ -77,12 +75,12 @@ DDD GetText.locale = nil test = TestPGetText.new - assert_equal("¤¨¡¼¤Ó¡¼", test.test_1) - assert_equal("¤¨¡¼¤Ó¡¼", test.test_2) - assert_equal("¤¨¡¼¤Ó¡¼¤·¡¼", test.test_3) + assert_equal("ï¿½ï¿½ï¿½ï¿½ï¿½Ó¡ï¿½", test.test_1) + assert_equal("ï¿½ï¿½ï¿½ï¿½ï¿½Ó¡ï¿½", test.test_2) + assert_equal("ï¿½ï¿½ï¿½ï¿½ï¿½Ó¡ï¿½ï¿½ï¿½ï¿½ï¿½", test.test_3) assert_equal("CCC", test.test_4) - assert_equal("¤·¡¼¤Ó¡¼", test.test_5) - assert_equal("¤Ó¡¼", test.test_6) + assert_equal("ï¿½ï¿½ï¿½ï¿½ï¿½Ó¡ï¿½", test.test_5) + assert_equal("ï¿½Ó¡ï¿½", test.test_6) GetText.locale = "en" test = TestPGetText.new @@ -98,10 +96,10 @@ DDD def test_npgettext GetText.locale = nil test = TestNPGetText.new - assert_equal(["°ì¤Ä¤ÎËÜ", "%{num}¤ÎËÜ¤¿¤Á"], test.test_1) - assert_equal(["°ì¤Ä¤ÎËÜ", "%{num}¤ÎËÜ¤¿¤Á"], test.test_2) - assert_equal(["°ì¤Ä¤Î¥Ï¡¼¥É¥«¥Ð¡¼ËÜ", "%{num}¤Î¥Ï¡¼¥É¥«¥Ð¡¼ËÜ¤¿¤Á"], test.test_3) - assert_equal(["¥Þ¥¬¥¸¥ó¤ò1ºý»ý¤Ã¤Æ¤Þ¤¹¡£", "¥Þ¥¬¥¸¥ó¤¿¤Á¤ò%{num}ºý»ý¤Ã¤Æ¤Þ¤¹¡£"], test.test_4) + assert_equal(["ï¿½ï¿½Ä¤ï¿½ï¿½ï¿½", "%{num}ï¿½ï¿½ï¿½Ü¤ï¿½ï¿½ï¿½"], test.test_1) + assert_equal(["ï¿½ï¿½Ä¤ï¿½ï¿½ï¿½", "%{num}ï¿½ï¿½ï¿½Ü¤ï¿½ï¿½ï¿½"], test.test_2) + assert_equal(["ï¿½ï¿½Ä¤Î¥Ï¡ï¿½ï¿½É¥ï¿½ï¿½Ð¡ï¿½ï¿½ï¿½", "%{num}ï¿½Î¥Ï¡ï¿½ï¿½É¥ï¿½ï¿½Ð¡ï¿½ï¿½Ü¤ï¿½ï¿½ï¿½"], test.test_3) + assert_equal(["ï¿½Þ¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½1ï¿½ï¿½ï¿½Ã¤Æ¤Þ¤ï¿½ï¿½ï¿½", "ï¿½Þ¥ï¿½ï¿½ï¿½ï¿½ó¤¿¤ï¿½ï¿½ï¿½%{num}ï¿½ï¿½ï¿½Ã¤Æ¤Þ¤ï¿½ï¿½ï¿½"], test.test_4) assert_equal(["a picture", "%{num} pictures"], test.test_5) end test/test_gettext.rb @@ -1,9 +1,8 @@ -require 'test/unit' +require 'testlib/helper.rb' require 'gettext/parser/ruby' require 'gettext/parser/glade' require 'gettext/parser/erb' -require 'rubygems' require 'gettext/tools/rgettext' class TestGetTextParser < Test::Unit::TestCase test/test_parser.rb @@ -1,5 +1,4 @@ -require 'test/unit' -require 'gettext' +require 'testlib/helper.rb' class TestGetTextString < Test::Unit::TestCase def test_string_sprintf test/test_string.rb @@ -1,6 +1,4 @@ -require 'test/unit' - -require 'gettext' +require 'testlib/helper.rb' require 'testlib/simple' class TestTextDomain < Test::Unit::TestCase test/test_textdomain.rb @@ -1,6 +1,4 @@ -require 'test/unit' - -require 'gettext' +require 'testlib/helper.rb' require 'testlib/multi_textdomain.rb' class TestGetTextMulti < Test::Unit::TestCase test/test_textdomain_multi.rb @@ -1,6 +1,4 @@ -require 'test/unit' - -require 'gettext' +require 'testlib/helper.rb' include GetText bindtextdomain("test1", :path => "locale") test/test_textdomain_toplevel.rb 60979fd7c6e4be04bb93f3cc9efacdcdb0666a2a Masao Mutoh mutoh@highway.ne.jp http://github.com/mutoh/gettext/commit/6c0ef83e3d79f995cb2172937db637eeabba07e5 6c0ef83e3d79f995cb2172937db637eeabba07e5

2009-02-06T10:00:48-08:00

Merge the changes by grosser. e38e0203c45680fb6da2b41a3059c595f8c9f752 Masao Mutoh mutoh@highway.ne.jp