Translate helpmessages in dselect

diff --git a/ChangeLog b/ChangeLog
index ff2ed4d0366869cad39263301a5aa223b0c6d7a2..e41c64d858eae8958fbe64ddc3f6ddb631674fcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 26 19:35:53 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Also translate helpmessages for dselect
+
 Mon Oct 25 21:08:06 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Added Czech translation from Petr Cech <cech@atrey.karlin.mff.cuni.cz>

diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index 07ff4f53b743928243789047bd3ed6646ff7625a..2ef277d796ddf66a7cde4774c129bdd02964c5bd 100644 (file)
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -121,10 +121,10 @@ void baselist::displayhelp(const struct helpmenuentry *helpmenu, int key) {
     for (hme= helpmenu; hme->key && hme->key != key; hme++);
     if (hme->key) {
       attrset(list_attr);
-      mvaddstr(1,0, hme->msg->text);
+      mvaddstr(1,0, gettext(hme->msg->text));
       attrset(title_attr);
       mvaddstr(0,0, _("Help: "));
-      addstr(hme->msg->title);
+      addstr(gettext(hme->msg->title));
       getyx(stdscr,y,x);
       while (++x<maxx) addch(' ');
       attrset(thisstate_attr);
@@ -140,9 +140,9 @@ _("? = help menu    Space = exit help    . = next help    or a help page key ")
       mvaddstr(1,1, _("Help information is available under the following topics:"));
       for (i=0, hme=helpmenu; hme->key; hme++,i++) {
         attrset(A_BOLD);
-        mvaddch(i+3,3, hme->key);
+        mvaddch(i+3,3, gettext(hme->key));
         attrset(A_NORMAL);
-        mvaddstr(i+3,6, hme->msg->title);
+        mvaddstr(i+3,6, gettext(hme->msg->title));
       }
       mvaddstr(i+4,1,
                _("Press a key from the list above, Space to exit help,\n"

diff --git a/dselect/mkhelpmsgs.pl b/dselect/mkhelpmsgs.pl
index d6eb3140c5b11936a8abc4c8d8d35f405fb5b8e6..11b425206e87a427a7369d5490e5412bd07c5434 100755 (executable)
--- a/dselect/mkhelpmsgs.pl
+++ b/dselect/mkhelpmsgs.pl
@@ -25,7 +25,7 @@ while (<SRC>) {
         print(NH "extern const struct helpmessage hlp_$currentname;\n") || die $!;
         print(NC
               "const struct helpmessage hlp_$currentname = {\n".
-              "  \"$currenttitle\", \"") || die $!;
+              "  N_(\"$currenttitle\"), N_(\"") || die $!;
     } elsif (m/^\@\@\@/) {
         die;
     } elsif (!m/\S/) {
@@ -53,7 +53,7 @@ rename("helpmsgs.h.new","helpmsgs.h") || die $!;
     
 sub finishif {
     if ($state ne 'start') {
-        print(NC "\"\n};\n") || die $!;
+        print(NC "\")\n};\n") || die $!;
         printf "\t\t%s: %d lines\n",$currentname,$nlines;
         if ($nlines > $maxnlines) { warn "Too many lines in $currentname"; }
     }