summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-18 07:17:00 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-18 07:17:00 +0000
commitcfea23b44d36d329934d35d7e91fabf52ea47e92 (patch)
tree581e1ab97d04e0bb2a537e4ed16ce9dab1cbd990
parentaec6e764ad1e9b1564138dd63c3747b92b5d061c (diff)
downloadruby-cfea23b44d36d329934d35d7e91fabf52ea47e92.tar.gz
ruby-cfea23b44d36d329934d35d7e91fabf52ea47e92.tar.xz
ruby-cfea23b44d36d329934d35d7e91fabf52ea47e92.zip
* TkMsgCatalog.callback: bug fix (wrong number of argument)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/lib/tk/msgcat.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15e640741..3d3b2a1fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 18 16:14:29 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
+ ( wrong number of argument )
+
Sun Jul 18 08:13:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_f_sprintf): remove extra sign digit.
diff --git a/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb
index 361b9a5de..34f828f76 100644
--- a/ext/tk/lib/tk/msgcat.rb
+++ b/ext/tk/lib/tk/msgcat.rb
@@ -50,7 +50,8 @@ class TkMsgCatalog < TkObject
}
EOL
- def self.callback(namespace, locale, src_str)
+ def self.callback(namespace, locale, src_str, *args)
+ src_str = sprintf(src_str, *args) unless args.empty?
cmd_tbl = TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]
cmd = cmd_tbl[namespace]
cmd = cmd_tbl['::'] unless cmd # use global scope as interp default