Complete.Org: Mailing Lists: Archives: freeciv-dev: January 2005:
[Freeciv-Dev] (PR#11758) civmanual bugs
Home

[Freeciv-Dev] (PR#11758) civmanual bugs

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: chrisk@xxxxxxxxx
Subject: [Freeciv-Dev] (PR#11758) civmanual bugs
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Sat, 1 Jan 2005 17:24:38 -0800
Reply-to: bugs@xxxxxxxxxxx

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=11758 >

> [chrisk - Sat Jan 01 21:11:56 2005]:
> 
> 
> CVS 01 JAN 2005 S2
> 
> Small bugs are in civmanual:
> 
> The categories and levels are not i18n'd.
> 
> In manual2 (improvements) and manual5 (wonders) the decriptions are
doubled:
> 1 german, 1 english

This patch fixes those problems.  It should work for both branches. 
There may be other problems; it's hard to see since not all strings are
translated.

-jason

? gmon.out
Index: manual/civmanual.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/manual/civmanual.c,v
retrieving revision 1.7
diff -u -r1.7 civmanual.c
--- manual/civmanual.c  29 Dec 2004 04:56:16 -0000      1.7
+++ manual/civmanual.c  2 Jan 2005 01:23:36 -0000
@@ -140,9 +140,9 @@
          fprintf(doc, "<pre>%s</pre>\n\n", abuf.str);
        }
        fprintf(doc, "<p class=\"misc\">");
-       fprintf(doc, _("Level: %s.<br>"), sset_level_names[op->level]);
+       fprintf(doc, _("Level: %s.<br>"), _(sset_level_names[op->level]));
        fprintf(doc, _("Category: %s.<br>"),
-               sset_category_names[op->category]);
+               _(sset_category_names[op->category]));
        if (op->to_client == SSET_SERVER_ONLY) {
          fprintf(doc, _("Can only be used in server console. "));
        }
@@ -300,7 +300,7 @@
          continue;
        }
 
-       helptext_building(buf, sizeof(buf), id, (char *)pimpr->helptext);
+       helptext_building(buf, sizeof(buf), id, NULL);
        fprintf(doc, "%s%s%s\n\n", SECTION_BEGIN, get_improvement_name(id),
                SECTION_END);
        fprintf(doc, "<table>\n");
@@ -329,7 +329,7 @@
          continue;
        }
 
-       helptext_building(buf, sizeof(buf), id, (char *)pimpr->helptext);
+       helptext_building(buf, sizeof(buf), id, NULL);
        fprintf(doc, "%s%s%s\n\n", SECTION_BEGIN, get_improvement_name(id),
                SECTION_END);
        fprintf(doc, "<table>\n");

[Prev in Thread] Current Thread [Next in Thread]