<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40690 >
As per the i18n guide the attached patches remove a LOG_ERROR
message from translation. Actually I'm not sure how much the
original author expected users to see this message (and if
they should really be made aware of it) rather than using it
as a debugging tool.
-----------------------------------------------------------------------
違法な考えの構造が検出された。
diff --git a/server/savegame.c b/server/savegame.c
index 1e79b76..3baffb8 100644
--- a/server/savegame.c
+++ b/server/savegame.c
@@ -4682,11 +4682,10 @@ static void game_load_internal(struct section_file *file)
&& pplayers_allied(plr, aplayer)
&& pplayer_can_make_treaty(plr, aplayer, DS_ALLIANCE)
== DIPL_ALLIANCE_PROBLEM) {
- /* TRANS: ... <Danish> alliance to <Poles>.... */
- freelog(LOG_ERROR, _("Illegal alliance structure detected: "
- "%s alliance to %s reduced to peace treaty."),
- nation_adjective_for_player(plr),
- nation_plural_for_player(aplayer));
+ freelog(LOG_ERROR, "Illegal alliance structure detected: "
+ "%s alliance to %s reduced to peace treaty.",
+ nation_rule_name(nation_of_player(plr)),
+ nation_rule_name(nation_of_player(aplayer)));
plr->diplstates[player_index(aplayer)].type = DS_PEACE;
aplayer->diplstates[player_index(plr)].type = DS_PEACE;
}
diff --git a/server/savegame.c b/server/savegame.c
index 711c22f..2037bac 100644
--- a/server/savegame.c
+++ b/server/savegame.c
@@ -4069,11 +4069,10 @@ void game_load(struct section_file *file)
&& pplayers_allied(plr, aplayer)
&& pplayer_can_make_treaty(plr, aplayer, DS_ALLIANCE)
== DIPL_ALLIANCE_PROBLEM) {
- /* TRANS: ... <Danish> alliance to <Poles>.... */
- freelog(LOG_ERROR, _("Illegal alliance structure detected: "
- "%s alliance to %s reduced to peace treaty."),
- nation_adjective_for_player(plr),
- nation_plural_for_player(aplayer));
+ freelog(LOG_ERROR, "Illegal alliance structure detected: "
+ "%s alliance to %s reduced to peace treaty.",
+ nation_rule_name(plr->nation),
+ nation_rule_name(aplayer->nation));
plr->diplstates[aplayer->player_no].type = DS_PEACE;
aplayer->diplstates[plr->player_no].type = DS_PEACE;
}
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
