[Freeciv-Dev] Re: (PR#2373) Re: [FreeCiv-Cvs] jdorje: Add 16 new possible city report columns. Ch...

["Jason Short via RT" <rt@xxxxxxxxxxxxxx>]

mateusz stefek via RT wrote:
> Dnia 2002.11.14 04:41 freeciv@xxxxxxxxxxxxxxxxxxx napisa³(a):
> 
>>This is an automated notification of a change to freeciv cvs,
>>on Wed Nov 13 19:39:43 PST 2002 = Thu Nov 14 03:39:43 2002 (GMT)
>>by Jason Dorje Short <jdorje@xxxxxxxxxxxxxxxxxxxxx>
>>
>>---- Files affected:
>>
>>freeciv/client cityrepdata.c cityrepdata.h
>>freeciv/client/gui-gtk cityrep.c
>>
>>---- Log message:
>>      Tag: HEAD
>>
>>Add 16 new possible city report columns.  Change the GTK client's city
>>report so that when editing the list of columns used the choices are
>>put
>>into two columns.
>>
>>Patch by Tuomas Airaksinen <tuomas.airaksinen@xxxxxxxxxx> as PR#737,
>>with
>>changes by me.
>>
>>
> 
> N_("?entertainers/scientists/taxmen:E/S/T"),
>      N_("Entertainers, Scientists, Taxmen"),
>      FUNC_TAG(specialists) },
>    { FALSE, 2, 1, "", N_("?Entertainers:E"), N_("Entertainers"),
>      FUNC_TAG(entertainers) },
>    { FALSE, 2, 1, "", N_("?Scientists:S"), N_("Scientists"),
>      FUNC_TAG(scientists) },
>    { FALSE, 2, 1, "", N_("?Taxmen:T"), N_("Taxmen"),
>      FUNC_TAG(taxmen) },
> 
> Shouldn't there be NULL instead of ""  ?
> Seems to be completly untested. (Or tested only on machines without 
> gettext)

Hey, don't be too hard on it - it was written over a year ago, and sat 
untouched in jitterbug while all around it the code was changing :-(. 
Back then this code wasn't translated with Q_(), so the use of an empty 
string was fine.  And when I tested it in English, I obviously didn't 
run into any problems.  But I should have noticed it used a different 
form than the some of the other code...

So, here's a patch to fix it.

jason

Index: client/cityrepdata.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/cityrepdata.c,v
retrieving revision 1.25
diff -u -r1.25 cityrepdata.c
--- client/cityrepdata.c        2002/11/14 09:14:50     1.25
+++ client/cityrepdata.c        2002/11/21 08:10:24
@@ -422,23 +422,23 @@
     N_("?happy/content/unhappy/angry:H/C/U/A"),
     N_("Workers: Happy, Content, Unhappy, Angry"),
     FUNC_TAG(workers) },
-  { FALSE, 2, 1, "", N_("?Happy workers:H"), N_("Workers: Happy"),
+  { FALSE, 2, 1, NULL, N_("?Happy workers:H"), N_("Workers: Happy"),
     FUNC_TAG(happy) },
-  { FALSE, 2, 1, "", N_("?Content workers:C"), N_("Workers: Content"),
+  { FALSE, 2, 1, NULL, N_("?Content workers:C"), N_("Workers: Content"),
     FUNC_TAG(content) },
-  { FALSE, 2, 1, "", N_("?Unhappy workers:U"), N_("Workers: Unhappy"),
+  { FALSE, 2, 1, NULL, N_("?Unhappy workers:U"), N_("Workers: Unhappy"),
     FUNC_TAG(unhappy) },
-  { FALSE, 2, 1, "", N_("?Angry workers:A"), N_("Workers: Angry"),
+  { FALSE, 2, 1, NULL, N_("?Angry workers:A"), N_("Workers: Angry"),
     FUNC_TAG(angry) },
   { FALSE, 7, 1, N_("Special"),
     N_("?entertainers/scientists/taxmen:E/S/T"),
     N_("Entertainers, Scientists, Taxmen"),
     FUNC_TAG(specialists) },
-  { FALSE, 2, 1, "", N_("?Entertainers:E"), N_("Entertainers"),
+  { FALSE, 2, 1, NULL, N_("?Entertainers:E"), N_("Entertainers"),
     FUNC_TAG(entertainers) },
-  { FALSE, 2, 1, "", N_("?Scientists:S"), N_("Scientists"),
+  { FALSE, 2, 1, NULL, N_("?Scientists:S"), N_("Scientists"),
     FUNC_TAG(scientists) },
-  { FALSE, 2, 1, "", N_("?Taxmen:T"), N_("Taxmen"),
+  { FALSE, 2, 1, NULL, N_("?Taxmen:T"), N_("Taxmen"),
     FUNC_TAG(taxmen) },
   { FALSE, 8, 1, N_("Best"), N_("attack"),
     N_("Best attacking units"), FUNC_TAG(attack)},
@@ -452,20 +452,20 @@
   { TRUE,  10, 1, N_("Surplus"), N_("?food/prod/trade:F/P/T"),
                                  N_("Surplus: Food, Production, Trade"),
                                       FUNC_TAG(resources) },
-  { FALSE, 3, 1, "", N_("?Food surplus:F+"), N_("Surplus: Food"),
+  { FALSE, 3, 1, NULL, N_("?Food surplus:F+"), N_("Surplus: Food"),
     FUNC_TAG(foodplus) },
-  { FALSE, 3, 1, "", N_("?Production surplus:P+"),
+  { FALSE, 3, 1, NULL, N_("?Production surplus:P+"),
     N_("Surplus: Production"), FUNC_TAG(prodplus) },
-  { FALSE, 3, 1, "", N_("?Trade surplus:T+"), N_("Surplus: Trade"),
+  { FALSE, 3, 1, NULL, N_("?Trade surplus:T+"), N_("Surplus: Trade"),
     FUNC_TAG(tradeplus) },
   { TRUE,  10, 1, N_("Economy"), N_("?gold/lux/sci:G/L/S"),
                                  N_("Economy: Gold, Luxuries, Science"),
                                       FUNC_TAG(output) },
-  { FALSE, 3, 1, "", N_("?Gold:G"), N_("Economy: Gold"),
+  { FALSE, 3, 1, NULL, N_("?Gold:G"), N_("Economy: Gold"),
     FUNC_TAG(gold) },
-  { FALSE, 3, 1, "", N_("?Luxury:L"), N_("Economy: Luxury"),
+  { FALSE, 3, 1, NULL, N_("?Luxury:L"), N_("Economy: Luxury"),
     FUNC_TAG(luxury) },
-  { FALSE, 3, 1, "", N_("?Science:S"), N_("Economy: Science"),
+  { FALSE, 3, 1, NULL, N_("?Science:S"), N_("Economy: Science"),
     FUNC_TAG(science) },
   { FALSE,  1, 1, N_("?trade_routes:n"), N_("?trade_routes:T"),
                                          N_("Number of Trade Routes"),