From a1f90c18c12e820c99f1ee89f2328eba16bac2b7 Mon Sep 17 00:00:00 2001 From: nagai Date: Mon, 2 Aug 2004 09:06:18 +0000 Subject: [PATCH] * ext/tk/lib/msgcat.rb (set_translation): bug fix (fail to set trans_str to the same as src_str when trans_str is not given.) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/tk/lib/tk/msgcat.rb | 37 +++++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6a78fada6..be61ac2c29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 2 18:04:21 2004 Hidetoshi NAGAI + + * ext/tk/lib/tk/msgcat.rb (set_translation): bug fix (fail to set + trans_str to the same as src_str when trans_str is not given.) + Mon Aug 2 11:53:06 2004 Dave Thomas * lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion diff --git a/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb index 34f828f768..e7a5499008 100644 --- a/ext/tk/lib/tk/msgcat.rb +++ b/ext/tk/lib/tk/msgcat.rb @@ -217,20 +217,33 @@ class TkMsgCatalog < TkObject alias load load_rb def self.set_translation(locale, src_str, trans_str=None, enc='utf-8') - trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc)) if trans_str != None - Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', - locale, - _get_eval_string(src_str, true), - trans_str)) - end - def set_translation(locale, src_str, trans_str=None, enc='utf-8') - trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc)) if trans_str != None - Tk.UTF8_String(@namespace.eval{ - tk_call_without_enc('::msgcat::mcset', + if trans_str && trans_str != None + trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc)) + Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', locale, _get_eval_string(src_str, true), - trans_str) - }) + trans_str)) + else + Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', + locale, + _get_eval_string(src_str, true))) + end + end + def set_translation(locale, src_str, trans_str=None, enc='utf-8') + if trans_str && trans_str != None + trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc)) + Tk.UTF8_String(@namespace.eval{ + tk_call_without_enc('::msgcat::mcset', + locale, + _get_eval_string(src_str, true), + trans_str) + }) + else + Tk.UTF8_String(@namespace.eval{ + tk_call_without_enc('::msgcat::mcset', + locale, + _get_eval_string(src_str, true))}) + end end def self.set_translation_list(locale, trans_list, enc='utf-8')