archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

* ext/tk/lib/msgcat.rb (set_translation): bug fix (fail to set

Browse source 
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
This commit is contained in:
nagai 2004-08-02 09:06:18 +00:00
parent af9afb1033
commit a1f90c18c1
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Mon Aug 2 11:53:06 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion * lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion

17
ext/tk/lib/tk/msgcat.rb
View file

@ -217,20 +217,33 @@ class TkMsgCatalog < TkObject
alias load load_rb alias load load_rb
def self.set_translation(locale, src_str, trans_str=None, enc='utf-8') 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 if trans_str && trans_str != None
trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
locale, locale,
_get_eval_string(src_str, true), _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 end
def set_translation(locale, src_str, trans_str=None, enc='utf-8') 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 if trans_str && trans_str != None
trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
Tk.UTF8_String(@namespace.eval{ Tk.UTF8_String(@namespace.eval{
tk_call_without_enc('::msgcat::mcset', tk_call_without_enc('::msgcat::mcset',
locale, locale,
_get_eval_string(src_str, true), _get_eval_string(src_str, true),
trans_str) trans_str)
}) })
else
Tk.UTF8_String(@namespace.eval{
tk_call_without_enc('::msgcat::mcset',
locale,
_get_eval_string(src_str, true))})
end
end end
def self.set_translation_list(locale, trans_list, enc='utf-8') def self.set_translation_list(locale, trans_list, enc='utf-8')