widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/remove-external-websites into lp:widelands.

Commit message:
Removed all references to third-party websites from UI and replaced them with links in the widelands.org domain. Some formatting tweaks to LICENSE.lua.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/remove-external-websites/+merge/342024

Let everything link to widelands.org, so we won't send people to Launchpad when we eventually do the move to GitHub.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/remove-external-websites into lp:widelands.

=== modified file 'data/scripting/win_conditions/artifacts.lua'
--- data/scripting/win_conditions/artifacts.lua	2017-05-12 11:30:43 +0000
+++ data/scripting/win_conditions/artifacts.lua	2018-03-24 09:51:40 +0000
@@ -52,7 +52,7 @@
       local plrs = wl.Game().players
       if #artifact_fields == 0 then
          for idx, plr in ipairs(plrs) do
-            send_message(plr, _"No Artifacts", p(_"There are no artifacts on this map. This should not happen. Please file a bug report on https://launchpad.net/widelands and specify your Widelands version and the map you tried to load."), {popup = true})
+            send_message(plr, _"No Artifacts", p(_"There are no artifacts on this map. This should not happen. Please file a bug report on %s and specify your Widelands version and the map you tried to load."):bformat("https://wl.widelands.org/wiki/ReportingBugs/";), {popup = true})
          end
          return
       end

=== modified file 'data/txts/LICENSE.lua'
--- data/txts/LICENSE.lua	2018-02-15 15:43:53 +0000
+++ data/txts/LICENSE.lua	2018-03-24 09:51:40 +0000
@@ -8,9 +8,10 @@
       p_font("align=center", "size=28 color=2F9131", _"Licensing information for Widelands") ..
       p_font("align=center", "size=14 italic=1 color=D1D1D1", _"Copyright 2002 - 2018 by the Widelands Development Team.") ..
 
-      p(vspace(12) .. b(_"This game is Free and Open Source (FOSS), licensed under the GNU General Public License (GPL) V2.0.")) ..
-
-      p(vspace(6) .. _"You can find more information on FOSS and the GPL by visiting the following webpage: %s"):bformat(a("http://www.gnu.org/licenses/old-licenses/gpl-2.0";)) ..
+      h2(_"This game is Free and Open Source (FOSS), licensed under the GNU General Public License (GPL) V2.0.") ..
+
+      p(vspace(6) .. _"You can find more information on FOSS and the GPL by visiting the following webpage: %s"):bformat(a("https://www.gnu.org/licenses/old-licenses/gpl-2.0.html";)) ..
+
       p(vspace(6) .. _"You can find the full text of the license there as well as further information about its philosophy and the legal implications.") ..
 
       p(vspace(6) .. _"We are also shipping the GPL as a text document with Widelands itself.") ..
@@ -18,10 +19,11 @@
       p(vspace(6) .. _"On Windows, you can find the file called COPYING.txt in the installation folder, and the Widelands Start menu entry provides a link to this file.") ..
       p(vspace(6) .. _"On MacOS, you can find the file called COPYING in the archive you downloaded from the website.") ..
 
-      p_font("", "size=14 color=ff4444", vspace(6) .. b(_"This game comes as-is and without any warranty. For more information and support you can find us at %1% (Website, Wiki, Forum for questions or general support), %2% (Bugtracker), and %3% (Translations).")):
+      h2(_"This game comes as-is and without any warranty.") ..
+      p(_"For more information and support you can find us at %1% (Website, Wiki, Forum for questions or general support), %2% (Bugtracker), and %3% (Translations)."):
          bformat(
-            a("http://wl.widelands.org";),
-            a("https://launchpad.net/widelands";),
-            a("https://www.transifex.com/widelands/";))
+            a("widelands.org"),
+            a("widelands.org/wiki/ReportingBugs"),
+            a("widelands.org/wiki/TranslatingWidelands"))
    )
 }

=== modified file 'data/txts/README.lua'
--- data/txts/README.lua	2017-12-19 08:28:46 +0000
+++ data/txts/README.lua	2018-03-24 09:51:40 +0000
@@ -8,7 +8,7 @@
       p_font("align=center", "size=38 face=Widelands/Widelands.ttf color=2F9131", img("images/logos/wl-ico-32.png") .. "Widelands") ..
       p_font("align=center", "size=14 italic=1 color=D1D1D1", _"an open source strategy game") ..
       help_introduction() ..
-      p(vspace(3)) .. inline_header(_"Check out the Widelands project homepage:", a("https://wl.widelands.org";)) .. p(vspace(3)) ..
+      p(vspace(3)) .. inline_header(_"Check out the Widelands project homepage:", a("widelands.org")) .. p(vspace(3)) ..
       p(_"Widelands is licensed under the GNU General Public License (GPL). For more information, see the file ‘COPYING’.") ..
       h2(_"Status") ..
       p(_"Widelands is nearly feature complete and is much fun to play alone and even more in multiplayer with others. Still, there is always more work to be done in all areas. If you are interested in contributing – be it by making graphics, fixing bugs or adding new features, translating the game into your language or creating new maps – get in touch on our homepage.") ..
@@ -22,7 +22,7 @@
 
       h2(_"Reporting Bugs") ..
       p(_"If you encounter a bug, please report it to our bugtracker:") ..
-      p(a("https://bugs.launchpad.net/widelands";)) ..
+      p(a("widelands.org/wiki/ReportingBugs]")) ..
       p(_"Please provide enough background information. Tell us:") ..
       p(
           li(_"Detailed steps on how to trigger the bug, if possible.") ..

=== modified file 'data/txts/help/common_helptexts.lua'
--- data/txts/help/common_helptexts.lua	2017-12-06 08:16:46 +0000
+++ data/txts/help/common_helptexts.lua	2018-03-24 09:51:40 +0000
@@ -8,7 +8,7 @@
    set_textdomain("texts")
    return
       h2(_[[Online Help]]) ..
-      p(_[[If you need more documentation or help for Widelands or the Widelands Editor, be sure to visit our homepage at %s. You can find online help in our wiki there.]]):bformat(a("https://wl.widelands.org/";))
+      p(_[[If you need more documentation or help for Widelands or the Widelands Editor, be sure to visit our homepage at %s. You can find online help in our wiki there.]]):bformat(a("widelands.org"))
 end
 
 function help_introduction()

=== modified file 'src/wlapplication_messages.cc'
--- src/wlapplication_messages.cc	2017-11-24 21:34:17 +0000
+++ src/wlapplication_messages.cc	2018-03-24 09:51:40 +0000
@@ -160,7 +160,7 @@
 	std::cout << _(" --verbose            Enable verbose debug messages") << endl << endl;
 	std::cout << _(" --help               Show this help") << endl << endl;
 	std::cout << _("Bug reports? Suggestions? Check out the project website:\n"
-	               "        https://launchpad.net/widelands\n\n";
+	               "        https://wl.widelands.org/\n\n";
 	               "Hope you enjoy this game!")
 	          << endl;
 }

=== modified file 'utils/buildcat.py'
--- utils/buildcat.py	2016-12-04 07:02:25 +0000
+++ utils/buildcat.py	2018-03-24 09:51:40 +0000
@@ -126,7 +126,7 @@
 XGETTEXTOPTS += " -F -c\"* TRANSLATORS\""
 # escaped double quotes are necessary for windows, as it ignores single quotes
 XGETTEXTOPTS += " --copyright-holder=\"Widelands Development Team\""
-XGETTEXTOPTS += " --msgid-bugs-address=\"https://bugs.launchpad.net/widelands\"";
+XGETTEXTOPTS += " --msgid-bugs-address=\"https://wl.widelands.org/wiki/ReportingBugs/\"";
 
 # Options for xgettext when parsing Lua scripts
 # Official Lua backend of xgettext does not support pgettext and npgettext right
@@ -150,7 +150,7 @@
 HEAD += "msgid \"\"\n"
 HEAD += "msgstr \"\"\n"
 HEAD += "\"Project-Id-Version: Widelands svnVERSION\\n\"\n"
-HEAD += "\"Report-Msgid-Bugs-To: https://bugs.launchpad.net/widelands\\n\"\n";
+HEAD += "\"Report-Msgid-Bugs-To: https://wl.widelands.org/wiki/ReportingBugs/\\n\"\n";
 HEAD += "\"POT-Creation-Date: " + \
     strftime('%Y-%m-%d %H:%M+0000', time_now) + "\\n\"\n"
 HEAD += "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n"