Author: jtn
Date: Mon Dec 21 10:40:31 2015
New Revision: 31132
URL: http://svn.gna.org/viewcvs/freeciv?rev=31132&view=rev
Log:
Don't hardcode default metaserver URL in online help.
Requested by Marko Lindqvist (cazfi@gna).
See gna bug #23949.
Modified:
branches/S2_6/client/helpdata.c
branches/S2_6/data/helpdata.txt
Modified: branches/S2_6/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/helpdata.c?rev=31132&r1=31131&r2=31132&view=diff
==============================================================================
--- branches/S2_6/client/helpdata.c (original)
+++ branches/S2_6/client/helpdata.c Mon Dec 21 10:40:31 2015
@@ -348,11 +348,11 @@
} base_type_iterate_end;
}
return TRUE;
- } else if (0 == strcmp (name, "VeteranLevels")) {
+ } else if (0 == strcmp(name, "VeteranLevels")) {
return insert_veteran_help(outbuf, outlen, game.veteran,
_("In this ruleset, the following veteran levels are defined:"),
_("This ruleset has no default veteran levels defined."));
- } else if (0 == strcmp (name, "FreecivVersion")) {
+ } else if (0 == strcmp(name, "FreecivVersion")) {
const char *ver = freeciv_name_version();
cat_snprintf(outbuf, outlen,
@@ -361,6 +361,10 @@
* Second %s is client_string, e.g., "gui-gtk-2.0". */
_("This is %s, %s client."), ver, client_string);
insert_client_build_info(outbuf, outlen);
+
+ return TRUE;
+ } else if (0 == strcmp(name, "DefaultMetaserver")) {
+ cat_snprintf(outbuf, outlen, " %s", FREECIV_META_URL);
return TRUE;
}
Modified: branches/S2_6/data/helpdata.txt
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/helpdata.txt?rev=31132&r1=31131&r2=31132&view=diff
==============================================================================
--- branches/S2_6/data/helpdata.txt (original)
+++ branches/S2_6/data/helpdata.txt Mon Dec 21 10:40:31 2015
@@ -1551,7 +1551,7 @@
If the server is started with the -m flag, it will report to \
the metaserver,\
"), "\
- http://meta.freeciv.org/metaserver.php\
+$DefaultMetaserver\
", _("\
The client can fetch this page, too: use the Metaserver button \
in the connection dialog. If it never shows any results, check \
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
