Bug#340950: Help in aptitude under zh_CN locale show all garbage characters

[Daniel Burrows]

On Sun, Nov 27, 2005 at 06:09:53PM +0800, bear <[EMAIL PROTECTED]> was heard to 
say:
> Package: aptitude
> Version: 0.4.0-3
> Severity: minor
> 
> Dear aptitude-developers,
> 
>   I found Help(pressing ? to activate) in this version of aptitude under
> zh_CN locale show all garbage characters. The characters in the menu are
> OK. Can you help?

  Hm, I get what looks like well-formed Chinese...but then, I'm using UTF-8
instead of GBK.  Actually, I have to admit I don't even know what GBK is :).

  However, it looks like although I provided a way for translators to specify
the encoding of the help file, aptitude doesn't actually use this piece of
information; it just uses the current locale's CTYPE.  Could you check whether
the attached patch clears up the problem?

    Thanks,
  Daniel

Mon Nov 28 12:19:39 CST 2005  Daniel Burrows <[EMAIL PROTECTED]>
  * Use the correct encoding (as specified in the .po) to decode the on-line 
help file.
diff -rN -udp old-head/src/ui.cc new-head/src/ui.cc
--- old-head/src/ui.cc  2005-11-28 12:20:28.000000000 -0600
+++ new-head/src/ui.cc  2005-11-28 12:16:48.000000000 -0600
@@ -870,7 +870,8 @@ static void do_help_help()
 
   vs_widget_ref w=vs_dialog_fileview(buf, NULL,
                                     arg(sigc::ptr_fun(pager_search)),
-                                    arg(sigc::ptr_fun(pager_repeat_search)));
+                                    arg(sigc::ptr_fun(pager_repeat_search)),
+                                    encoding);
   w->show_all();
 
   popup_widget(w);

signature.asc
Description: Digital signature