Author: jtn
Date: Mon Dec 21 10:49:19 2015
New Revision: 31134
URL: http://svn.gna.org/viewcvs/freeciv?rev=31134&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_5/client/helpdata.c
branches/S2_5/data/helpdata.txt
Modified: branches/S2_5/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=31134&r1=31133&r2=31134&view=diff
==============================================================================
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Mon Dec 21 10:49:19 2015
@@ -198,7 +198,7 @@
****************************************************************************/
static bool insert_generated_text(char *outbuf, size_t outlen, const char
*name)
{
- if (0 == strcmp (name, "TerrainAlterations")) {
+ if (0 == strcmp(name, "TerrainAlterations")) {
int clean_pollution_time = -1, clean_fallout_time = -1;
bool terrain_independent_extras = FALSE;
@@ -324,17 +324,21 @@
} 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,
/* TRANS: First %s is version string, e.g.,
* "Freeciv version 2.3.0-beta1 (beta version)" (translated).
* Second %s is client_string, e.g., "gui-gtk-2.0". */
_("This is %s, %s client."), ver, client_string);
+ return TRUE;
+ } else if (0 == strcmp(name, "DefaultMetaserver")) {
+ cat_snprintf(outbuf, outlen, " %s", META_URL);
+
return TRUE;
}
log_error("Unknown directive '$%s' in help", name);
Modified: branches/S2_5/data/helpdata.txt
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/helpdata.txt?rev=31134&r1=31133&r2=31134&view=diff
==============================================================================
--- branches/S2_5/data/helpdata.txt (original)
+++ branches/S2_5/data/helpdata.txt Mon Dec 21 10:49:19 2015
@@ -1565,7 +1565,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
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
