From 72330e508b40cf9dd05f97f78fa441ba891b6883 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 26 Sep 2021 18:10:02 +0300 Subject: [PATCH 37/37] Rename WIKI_URL as HOMEPAGE_URL It does not point to wiki, but to main homepage. See osdn #42929 Signed-off-by: Marko Lindqvist --- client/gui-qt/themes.cpp | 2 +- client/gui-sdl2/themes.c | 2 +- common/version.c | 4 ++-- configure.ac | 6 +++--- doc/man/freeciv-client.6.in | 4 ++-- doc/man/freeciv-modpack.6.in | 4 ++-- doc/man/freeciv-server.6.in | 4 ++-- doc/man/freeciv.6.in | 2 +- gen_headers/meson_fc_config.h.in | 2 +- server/civserver.c | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/gui-qt/themes.cpp b/client/gui-qt/themes.cpp index 0de230a458..3daa72b771 100644 --- a/client/gui-qt/themes.cpp +++ b/client/gui-qt/themes.cpp @@ -107,7 +107,7 @@ void qtg_gui_clear_theme() if (!load_theme(FC_QT_DEFAULT_THEME_NAME)) { /* TRANS: No full stop after the URL, could cause confusion. */ log_fatal(_("No Qt-client theme was found. For instructions on how to " - "get one, please visit %s"), WIKI_URL); + "get one, please visit %s"), HOMEPAGE_URL); exit(EXIT_FAILURE); } } diff --git a/client/gui-sdl2/themes.c b/client/gui-sdl2/themes.c index 5a56bcce11..e6b63d8105 100644 --- a/client/gui-sdl2/themes.c +++ b/client/gui-sdl2/themes.c @@ -65,7 +65,7 @@ void gui_clear_theme(void) if (!load_theme(gui_options.gui_sdl2_default_theme_name)) { /* TRANS: No full stop after the URL, could cause confusion. */ log_fatal(_("No Sdl2-client theme was found. For instructions on how to " - "get one, please visit %s"), WIKI_URL); + "get one, please visit %s"), HOMEPAGE_URL); exit(EXIT_FAILURE); } } diff --git a/common/version.c b/common/version.c index 1fd52805a6..9b5bbdae1f 100644 --- a/common/version.c +++ b/common/version.c @@ -127,12 +127,12 @@ const char *beta_message(void) /* TRANS: No full stop after the URL, could cause confusion. */ _("THIS IS A BETA VERSION\n" "Freeciv %s will be released in %s, at %s"), - NEXT_STABLE_VERSION, _(NEXT_RELEASE_MONTH), WIKI_URL); + NEXT_STABLE_VERSION, _(NEXT_RELEASE_MONTH), HOMEPAGE_URL); } else { fc_snprintf(msgbuf, sizeof(msgbuf), _("THIS IS A BETA VERSION\n" "Freeciv %s will be released at %s"), - NEXT_STABLE_VERSION, WIKI_URL); + NEXT_STABLE_VERSION, HOMEPAGE_URL); } return msgbuf; #else /* IS_BETA_VERSION */ diff --git a/configure.ac b/configure.ac index a1a5c1e7c5..f3b452df26 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_C_BIGENDIAN FC_EMSCRIPTEN BUG_URL="$PACKAGE_BUGREPORT" -WIKI_URL="http://www.freeciv.org/" +HOMEPAGE_URL="http://www.freeciv.org/" MAIL_ADDRESS="freeciv-dev AT freelists.org" dnl Explain fc_config.h to end users (e.g., on Windows) @@ -30,10 +30,10 @@ AH_TOP( AC_DEFINE(FC_CONFIG_H, 1, [Configuration autogenerated]) AC_DEFINE_UNQUOTED([BUG_URL], ["$BUG_URL"], [Bug reporting URL]) -AC_DEFINE_UNQUOTED([WIKI_URL], ["$WIKI_URL"], [Informational URL]) +AC_DEFINE_UNQUOTED([HOMEPAGE_URL], ["$HOMEPAGE_URL"], [Informational URL]) AC_SUBST([BUG_URL]) -AC_SUBST([WIKI_URL]) +AC_SUBST([HOMEPAGE_URL]) AC_SUBST([MAIL_ADDRESS]) dnl client/server should always have the same major and minor versions diff --git a/doc/man/freeciv-client.6.in b/doc/man/freeciv-client.6.in index 389aee2aeb..0de4ee967c 100644 --- a/doc/man/freeciv-client.6.in +++ b/doc/man/freeciv-client.6.in @@ -71,7 +71,7 @@ This manual page only lists the command line arguments. For more details about using \fBfreeciv-gtk3.22\fP, \fBfreeciv-sdl2\fP, or \fBfreeciv-qt\fP, see the Client Manual which can be found at -.UR @WIKI_URL@ +.UR @HOMEPAGE_URL@ the Freeciv website .UE as well as the documentation which is part of the Freeciv distribution. @@ -326,7 +326,7 @@ the Freeciv bug tracker .SH "MORE INFO" See the -.UR @WIKI_URL@ +.UR @HOMEPAGE_URL@ Freeciv homepage .UE \&. diff --git a/doc/man/freeciv-modpack.6.in b/doc/man/freeciv-modpack.6.in index 32b8a3d7eb..0635db379a 100644 --- a/doc/man/freeciv-modpack.6.in +++ b/doc/man/freeciv-modpack.6.in @@ -56,7 +56,7 @@ regarding the operation of .B freeciv-mp-XXX see README.modpack_installer in the Freeciv distribution, and the documentation at -.UR @WIKI_URL@ +.UR @HOMEPAGE_URL@ the Freeciv website .UE . @@ -148,7 +148,7 @@ the Freeciv bug tracker .SH "MORE INFO" See the -.UR @WIKI_URL@ +.UR @HOMEPAGE_URL@ Freeciv homepage .UE \&. diff --git a/doc/man/freeciv-server.6.in b/doc/man/freeciv-server.6.in index fa45c1182b..1ada6aa792 100644 --- a/doc/man/freeciv-server.6.in +++ b/doc/man/freeciv-server.6.in @@ -64,7 +64,7 @@ This manual page only lists the command line arguments. For details of the directives necessary to configure .B freeciv-server see the Server Manual which can be found at -.UR @WIKI_URL@ +.UR @HOMEPAGE_URL@ the Freeciv website .UE as well as the documentation which is part of the Freeciv distribution. @@ -402,7 +402,7 @@ the Freeciv bug tracker .SH "MORE INFO" See the -.UR @WIKI_URL@ +.UR @HOMEPAGE_URL@ Freeciv homepage .UE \&. diff --git a/doc/man/freeciv.6.in b/doc/man/freeciv.6.in index 6ed782c555..3ed1d77189 100644 --- a/doc/man/freeciv.6.in +++ b/doc/man/freeciv.6.in @@ -79,7 +79,7 @@ metaserver. .SH BUGS Please report bugs to the Freeciv bug tracker, @BUG_URL@ . .SH "MORE INFO" -There is a great deal more information at the Freeciv homepage, @WIKI_URL@ . +There is a great deal more information at the Freeciv homepage, @HOMEPAGE_URL@ . Updates and new info are first posted there. A Client Manual, a Server Manual, and a wiki on many topics, are published there. diff --git a/gen_headers/meson_fc_config.h.in b/gen_headers/meson_fc_config.h.in index d38ed39edc..48981eee90 100644 --- a/gen_headers/meson_fc_config.h.in +++ b/gen_headers/meson_fc_config.h.in @@ -11,7 +11,7 @@ #define LOCALEDIR "@LOCALEDIR@" #define BUG_URL "https://osdn.net/projects/freeciv/ticket/" -#define WIKI_URL "http://www.freeciv.org/" +#define HOMEPAGE_URL "http://www.freeciv.org/" #define DATASUBDIR "@DATASUBDIR@" diff --git a/server/civserver.c b/server/civserver.c index 5bb38eb544..7a6679bd42 100644 --- a/server/civserver.c +++ b/server/civserver.c @@ -335,7 +335,7 @@ int main(int argc, char *argv[]) con_write(C_VERSION, _("This is the server for %s"), freeciv_name_version()); /* TRANS: No full stop after the URL, could cause confusion. */ con_write(C_COMMENT, _("You can learn a lot about Freeciv at %s"), - WIKI_URL); + HOMEPAGE_URL); if (showhelp) { struct cmdhelp *help = cmdhelp_new(argv[0]); -- 2.33.0