From 6fc0fe5c85f95867929521929050dbdee7d9ba4c Mon Sep 17 00:00:00 2001 From: Haruka Yoshihara Date: Fri, 12 Oct 2012 17:58:28 +0900 Subject: [PATCH] Fix domain name for each tools and po parser rgettext -> gettext refs #12 Reported by mtasaka. Thanks!!! --- lib/gettext/tools.rb | 2 +- lib/gettext/tools/msgfmt.rb | 2 +- lib/gettext/tools/msginit.rb | 2 +- lib/gettext/tools/msgmerge.rb | 2 +- lib/gettext/tools/parser/glade.rb | 2 +- lib/gettext/tools/poparser.rb | 2 +- lib/gettext/tools/xgettext.rb | 2 +- src/poparser.ry | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/gettext/tools.rb b/lib/gettext/tools.rb index e63d4690..80b676c7 100644 --- a/lib/gettext/tools.rb +++ b/lib/gettext/tools.rb @@ -33,7 +33,7 @@ require 'fileutils' module GetText - bindtextdomain "rgettext" + bindtextdomain "gettext" BOM_UTF8 = [0xef, 0xbb, 0xbf].pack("c3") diff --git a/lib/gettext/tools/msgfmt.rb b/lib/gettext/tools/msgfmt.rb index 2039386a..e6d8d505 100644 --- a/lib/gettext/tools/msgfmt.rb +++ b/lib/gettext/tools/msgfmt.rb @@ -41,7 +41,7 @@ def run(*arguments) include GetText - bindtextdomain("rgettext") + bindtextdomain("gettext") def initialize @input_file = nil diff --git a/lib/gettext/tools/msginit.rb b/lib/gettext/tools/msginit.rb index a9e3f558..e8ff2faf 100644 --- a/lib/gettext/tools/msginit.rb +++ b/lib/gettext/tools/msginit.rb @@ -48,7 +48,7 @@ def run(*arguments) include GetText - bindtextdomain("rgettext") + bindtextdomain("gettext") def initialize #:nodoc: @input_file = nil diff --git a/lib/gettext/tools/msgmerge.rb b/lib/gettext/tools/msgmerge.rb index 43226400..1231f9ff 100644 --- a/lib/gettext/tools/msgmerge.rb +++ b/lib/gettext/tools/msgmerge.rb @@ -436,7 +436,7 @@ def run(*arguments) include GetText - bindtextdomain("rgettext") + bindtextdomain("gettext") # constant values VERSION = GetText::VERSION diff --git a/lib/gettext/tools/parser/glade.rb b/lib/gettext/tools/parser/glade.rb index 86394c14..b5e455e5 100644 --- a/lib/gettext/tools/parser/glade.rb +++ b/lib/gettext/tools/parser/glade.rb @@ -17,7 +17,7 @@ module GladeParser extend GetText extend self - bindtextdomain("rgettext") + bindtextdomain("gettext") TARGET1 = /(.*)/ TARGET2 = /(.*)<\/property>/ diff --git a/lib/gettext/tools/poparser.rb b/lib/gettext/tools/poparser.rb index 439a4673..20bb43e3 100644 --- a/lib/gettext/tools/poparser.rb +++ b/lib/gettext/tools/poparser.rb @@ -21,7 +21,7 @@ class PoParser < Racc::Parser module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 119) if GetText.respond_to?(:bindtextdomain) include GetText - GetText.bindtextdomain("rgettext") + GetText.bindtextdomain("gettext") else def _(message_id) message_id diff --git a/lib/gettext/tools/xgettext.rb b/lib/gettext/tools/xgettext.rb index b26bf640..4b73a655 100644 --- a/lib/gettext/tools/xgettext.rb +++ b/lib/gettext/tools/xgettext.rb @@ -46,7 +46,7 @@ def add_parser(parser) include GetText - bindtextdomain("rgettext") + bindtextdomain("gettext") # @api private @@default_parsers = [] diff --git a/src/poparser.ry b/src/poparser.ry index 586028aa..f7d41321 100644 --- a/src/poparser.ry +++ b/src/poparser.ry @@ -118,7 +118,7 @@ end ---- inner if GetText.respond_to?(:bindtextdomain) include GetText - GetText.bindtextdomain("rgettext") + GetText.bindtextdomain("gettext") else def _(message_id) message_id