From 93f7e432659cba65e25f43718a1e5f7e44c339c9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 1 Oct 2023 21:14:53 +0300 Subject: [PATCH 18/18] Qualify remaining "Pollution" strings See osdn #48761 Signed-off-by: Marko Lindqvist --- client/cityrepdata.c | 21 +++++++++++---------- server/report.c | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/client/cityrepdata.c b/client/cityrepdata.c index 75b01b7089..0dd0e91b63 100644 --- a/client/cityrepdata.c +++ b/client/cityrepdata.c @@ -774,7 +774,7 @@ static const struct city_report_spec base_city_report_specs[] = { N_("?number_trade_routes:R"), N_("Number (and total value) of trade routes"), NULL, FUNC_TAG(trade_routes) }, - { FALSE, 3, NULL, N_("?pollution [short]:Pol"), N_("Pollution"), + { FALSE, 3, NULL, N_("?pollution [short]:Pol"), N_("?stats:Pollution"), NULL, FUNC_TAG(pollution) }, { FALSE, 4, N_("?plague risk [short]:Pla"), N_("(%)"), N_("Plague risk per turn"), @@ -815,9 +815,9 @@ const char *city_report_spec_tagname(int i) } /****************************************************************** - Initialize city report data. This deals with ruleset-dependent + Initialize city report data. This deals with ruleset-dependent columns and pre-translates the fields (to make things easier on - the GUI writers). Should be called before the GUI starts up. + the GUI writers). Should be called before the GUI starts up. ******************************************************************/ void init_city_report_game_data(void) { @@ -881,7 +881,7 @@ void init_city_report_game_data(void) if (p->title2) { p->title2 = Q_(p->title2); } - p->explanation = _(p->explanation); + p->explanation = Q_(p->explanation); p++; } @@ -891,15 +891,16 @@ void init_city_report_game_data(void) /********************************************************************** The following several functions allow intelligent sorting city report - fields by column. This doesn't necessarily do the right thing, but + fields by column. This doesn't necessarily do the right thing, but it's better than sorting alphabetically. - The GUI gives us two values to compare (as strings). We try to split + The GUI gives us two values to compare (as strings). We try to split them into an array of numeric and string fields, then we compare - lexicographically. Two numeric fields are compared in the obvious - way, two character fields are compared alphabetically. Arbitrarily, a - numeric field is sorted before a character field (for "justification" - note that numbers are before letters in the ASCII table). + lexicographically. Two numeric fields are compared in the obvious + way, two character fields are compared alphabetically. + Arbitrarily, a numeric field is sorted before a character field + (for "justification" note that numbers are before letters + in the ASCII table). **********************************************************************/ /* A datum is one short string, or one number. diff --git a/server/report.c b/server/report.c index d4df4a7d7c..1b73c95472 100644 --- a/server/report.c +++ b/server/report.c @@ -173,7 +173,7 @@ static struct dem_row { {'P', N_("Production"), get_production, production_to_text, TRUE }, {'E', N_("Economics"), get_economics, economics_to_text, TRUE }, {'M', N_("Military Service"), get_mil_service, mil_service_to_text, FALSE }, - {'O', N_("Pollution"), get_pollution, pollution_to_text, FALSE }, + {'O', N_("?stats:Pollution"), get_pollution, pollution_to_text, FALSE }, {'C', N_("Culture"), get_culture, culture_to_text, TRUE } }; -- 2.40.1