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

["Christian Knoke" <chrisk@xxxxxxxxx>]

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

On Sat, Jan 01, 2005 at 05:24:38PM -0800, Jason Short wrote:
> 
> > 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.

Besides the diff format problem, your patch works good.

Here is another (additional) patch, which fixes i18n for 2 headlines and
adds the word 'Freeciv' to the version string for 2 other headlines.

Christian

-- 
Christian Knoke            * * *            http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.

--- manual/civmanual.c.orig     2005-01-02 11:27:51.000000000 +0100
+++ manual/civmanual.c  2005-01-02 11:29:56.000000000 +0100
@@ -126,7 +126,7 @@
 

     switch (manuals) {

     case MANUAL_SETTINGS:

-      fprintf(doc, "<h1>Freeciv %s server options</h1>\n\n", VERSION_STRING);

+      fprintf(doc, _("<h1>Freeciv %s server options</h1>\n\n"), 
VERSION_STRING);

       for (i = 0; settings[i].name; i++) {

        struct settings_s *op = &settings[i];

        static struct astring abuf = ASTRING_INIT;

@@ -187,7 +187,7 @@
       break;

 

     case MANUAL_COMMANDS:

-      fprintf(doc, "<h1>Freeciv %s server commands</h1>\n\n",

+      fprintf(doc, _("<h1>Freeciv %s server commands</h1>\n\n"),

              VERSION_STRING);

       for (i = 0; i < CMD_NUM; i++) {

        const struct command *cmd = &commands[i];

@@ -295,7 +295,7 @@
       break;

 

     case MANUAL_BUILDINGS:

-      fprintf(doc, _("<h1>Buildings help for %s</h1>\n\n"), VERSION_STRING);

+      fprintf(doc, _("<h1>Freeciv %s buildings help</h1>\n\n"), 
VERSION_STRING);

       impr_type_iterate(id) {

        struct impr_type *pimpr = get_improvement_type(id);

        char buf[64000];

@@ -324,7 +324,7 @@
       break;

 

     case MANUAL_WONDERS:

-      fprintf(doc, _("<h1>Wonder help for %s</h1>\n\n"), VERSION_STRING);

+      fprintf(doc, _("<h1>Freeciv %s wonders help</h1>\n\n"), VERSION_STRING);

       impr_type_iterate(id) {

        struct impr_type *pimpr = get_improvement_type(id);

        char buf[64000];