diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/tk/lib/tk/msgcat.rb | 37 |
2 files changed, 30 insertions, 12 deletions
@@ -1,3 +1,8 @@ +Mon Aug 2 18:04:21 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * 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 17:40:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (blk_free): fixed serious memory leak. [ruby-dev:24013] 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') |