diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-02 09:06:18 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-02 09:06:18 +0000 |
| commit | 87de8e045a9b315cc319a99207c0f8d69b11bddf (patch) | |
| tree | 15a8a66ca9491a912f180beaedff8d3dfdc0c06e | |
| parent | d576cd3a9201d004125b11b418a817fa7d693028 (diff) | |
| download | ruby-87de8e045a9b315cc319a99207c0f8d69b11bddf.tar.gz ruby-87de8e045a9b315cc319a99207c0f8d69b11bddf.tar.xz ruby-87de8e045a9b315cc319a99207c0f8d69b11bddf.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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 11:53:06 2004 Dave Thomas <dave@pragprog.com> * 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 34f828f76..e7a549900 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') |