Merge lp:~widelands-dev/widelands/bug-1622199-win-condition-markup into lp:widelands

[GunChleoc]

Fixed RT markup for win condition messages.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1317. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/159282324.
Appveyor build 1159. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1622199_win_condition_markup-1159.

[GunChleoc (gunchleoc)]

Launchpad failed updating the branch... diff is available on Github:

https://github.com/widelands/widelands/commit/ab0d608f22b91b8d52285748f2584fdb1680b551

[SirVer (sirver)]

The github diff is actually way easier to read.... And leaving comments is better there too. We should really get us over there :/.

code lgtm.

@bunnybot merge

review: Approve

=== modified file 'data/scripting/win_conditions/artifacts.lua'
--- data/scripting/win_conditions/artifacts.lua	2016-03-15 08:42:41 +0000
+++ data/scripting/win_conditions/artifacts.lua	2016-09-14 18:27:18 +0000
@@ -24,12 +24,12 @@
       -- set the objective with the game type for all players
       broadcast_objective("win_condition", wc_descname, wc_desc)
 
-      local function _getkey(p)
-         if p.team == 0 then
+      local function _getkey(plr)
+         if plr.team == 0 then
             -- Players without a team have team number 0. To distinguish between them, we use a special key.
-            return "player" .. p.number
+            return "player" .. plr.number
          else
-            return p.team
+            return plr.team
          end
       end
 
@@ -74,9 +74,9 @@
          if player.team == 0 then
             player:send_message(msg.title, msg.body, {msg, field = f})
          else
-            for idx, p in ipairs(plrs) do
-               if p.team == player.team then
-                  p:send_message(msg.title, msg.body, {msg, field = f})
+            for idx, plr in ipairs(plrs) do
+               if plr.team == player.team then
+                  plr:send_message(msg.title, msg.body, {msg, field = f})
                end
             end
          end
@@ -111,12 +111,12 @@
 
       -- All artifacts are found, the game is over.
       local artifacts_per_team = {}
-      for idx, p in ipairs(plrs) do
-         artifacts_per_team[_getkey(p)] = 0
+      for idx, plr in ipairs(plrs) do
+         artifacts_per_team[_getkey(plr)] = 0
       end
 
-      for idx, p in pairs(artifacts_owner) do
-         local key = _getkey(p)
+      for idx, plr in pairs(artifacts_owner) do
+         local key = _getkey(plr)
          artifacts_per_team[key] = artifacts_per_team[key] + 1
       end
 
@@ -132,29 +132,29 @@
 
       local function _get_member_names(t)
          local s = ""
-         for idx, p in ipairs(t) do
+         for idx, plr in ipairs(t) do
             if s == "" then
-               s = p.name
+               s = plr.name
             else
                -- TRANSLATORS: This is used to seperate players’ names in a list, e.g. "Steve, Robert, David"
-               s = s .. _", " .. p.name
+               s = s .. _", " .. plr.name
             end
          end
          return s
       end
 
       local teams = {}
-      local msg = _"Overview:" .. "\n"
-      for idx, p in ipairs(plrs) do
-         if p.team == 0 then
-            local artifacts = (ngettext("%i artifact", "%i artifacts", artifacts_per_team[_getkey(p)])):format(artifacts_per_team[_getkey(p)])
+      local msg = h3(_"Overview:")
+      for idx, plr in ipairs(plrs) do
+         if plr.team == 0 then
+            local artifacts = (ngettext("%i artifact", "%i artifacts", artifacts_per_team[_getkey(plr)])):format(artifacts_per_team[_getkey(plr)])
             -- TRANSLATORS: e.g. Team 1 owns 5 artifacts.
-            msg = msg .. "\n" .. (_"%1$s owns %2$s."):bformat(p.name, artifacts)
+            msg = msg .. p((_"%1$s owns %2$s."):bformat(plr.name, artifacts))
          else
-            if teams[p.team] then
-               teams[p.team][#teams[p.team]+1] = p
+            if teams[plr.team] then
+               teams[plr.team][#teams[plr.team]+1] = plr
             else
-               teams[p.team] = {p}
+               teams[plr.team] = {plr}
             end
          end
       end
@@ -162,19 +162,19 @@
          local members = _get_member_names(t)
          local artifacts = (ngettext("%i artifact", "%i artifacts", artifacts_per_team[_getkey(t[1])])):format(artifacts_per_team[_getkey(t[1])])
          -- TRANSLATORS: %1$i is the team's number; %2$s is a list of team members (e.g. "Steve, Robert, David"), %3$s is something like "x artifact(s)"
-         msg = msg .. "\n" .. (_"Team %1$i (%2$s) owns %3$s."):bformat(t[1].team, members, artifacts)
+         msg = msg .. p((_"Team %1$i (%2$s) owns %3$s."):bformat(t[1].team, members, artifacts))
       end
 
 
-      for idx, p in ipairs(plrs) do
-         local key = _getkey(p)
+      for idx, plr in ipairs(plrs) do
+         local key = _getkey(plr)
          -- If two or more teams have the same amount of artifacts, they are all considered winners.
          if artifacts_per_team[key] == max_artifacts then
-            p:send_message(won_game_over.title, won_game_over.body .. "\n\n" .. msg)
-            wl.game.report_result(p, 1, make_extra_data(p, wc_descname, wc_version, {score=artifacts_per_team[key]}))
+            plr:send_message(won_game_over.title, rt(won_game_over.body .. msg))
+            wl.game.report_result(plr, 1, make_extra_data(plr, wc_descname, wc_version, {score=artifacts_per_team[key]}))
          else
-            p:send_message(lost_game_over.title, lost_game_over.body .. "\n\n" .. msg)
-            wl.game.report_result(p, 0, make_extra_data(p, wc_descname, wc_version, {score=artifacts_per_team[key]}))
+            plr:send_message(lost_game_over.title, rt(lost_game_over.body .. msg))
+            wl.game.report_result(plr, 0, make_extra_data(plr, wc_descname, wc_version, {score=artifacts_per_team[key]}))
          end
       end
    end,

=== modified file 'data/scripting/win_conditions/collectors.lua'
--- data/scripting/win_conditions/collectors.lua	2016-05-20 21:03:41 +0000
+++ data/scripting/win_conditions/collectors.lua	2016-09-14 18:27:18 +0000
@@ -196,10 +196,10 @@
          local lost_or_won = 0
          if (info[2] < win_points) then
             lost_or_won = 0
-            player:send_message(lost_game_over.title, lost_game_over.body)
+            player:send_message(lost_game_over.title, rt(lost_game_over.body))
          else
             lost_or_won = 1
-            player:send_message(won_game_over.title, won_game_over.body)
+            player:send_message(won_game_over.title, rt(won_game_over.body))
          end
          if (player.team == 0) then
             wl.game.report_result(player, lost_or_won, make_extra_data(player, wc_descname, wc_version, {score=info[2]}))

=== modified file 'data/scripting/win_conditions/territorial_lord.lua'
--- data/scripting/win_conditions/territorial_lord.lua	2016-08-07 08:12:58 +0000
+++ data/scripting/win_conditions/territorial_lord.lua	2016-09-14 18:27:18 +0000
@@ -199,10 +199,10 @@
                p.see_all = 1
                if candidateisteam and currentcandidate == p.team
                   or not candidateisteam and currentcandidate == p.name then
-                  p:send_message(won_game_over.title, won_game_over.body)
+                  p:send_message(won_game_over.title, rt(won_game_over.body))
                   wl.game.report_result(p, 1, make_extra_data(p, wc_descname, wc_version, {score=_landsizes[p.number]}))
                else
-                  p:send_message(lost_game_over.title, lost_game_over.body)
+                  p:send_message(lost_game_over.title, rt(lost_game_over.body))
                   wl.game.report_result(p, 0, make_extra_data(p, wc_descname, wc_version, {score=_landsizes[p.number]}))
                end
             end

=== modified file 'data/scripting/win_conditions/territorial_time.lua'
--- data/scripting/win_conditions/territorial_time.lua	2016-05-17 16:40:22 +0000
+++ data/scripting/win_conditions/territorial_time.lua	2016-09-14 18:27:18 +0000
@@ -238,7 +238,7 @@
                   :format(remaining_max_time // 60))
             end
             msg = msg .. "\n\n"
-            msg = msg .. "</rt>" .. game_status.body .. "<rt>"
+            msg = msg .. "</rt>" .. rt(game_status.body) .. "<rt>"
             msg = msg .. _status(points, "has")
             send_message(pl, game_status.title, rt(msg), {popup = true})
          end
@@ -285,9 +285,9 @@
 
          maxpoints = points[1][2]
          local wonmsg = won_game_over.body
-         wonmsg = wonmsg .. "\n\n" .. game_status.body
+         wonmsg = wonmsg .. game_status.body
          local lostmsg = lost_game_over.body
-         lostmsg = lostmsg .. "\n\n" .. game_status.body
+         lostmsg = lostmsg .. game_status.body
          for i=1,#points do
             if points[i][1] == team_str:format(pl.team) or points[i][1] == pl.name then
                if points[i][2] >= maxpoints then

=== modified file 'data/scripting/win_conditions/win_condition_texts.lua'
--- data/scripting/win_conditions/win_condition_texts.lua	2016-03-15 08:42:41 +0000
+++ data/scripting/win_conditions/win_condition_texts.lua	2016-09-14 18:27:18 +0000
@@ -12,15 +12,15 @@
 
 won_game_over = {
   title = _"You won",
-  body = rt(p(_"You are the winner!"))
+  body = h2(_"You are the winner!")
 }
 
 lost_game_over = {
   title = _"You lost",
-  body = rt(p(_"You’ve lost this game!"))
+  body = h2(_"You’ve lost this game!")
 }
 
 game_status = {
   title = _"Status",
-  body = rt(p(_"Player overview:"))
+  body = h3(_"Player overview:")
 }

=== modified file 'data/scripting/win_conditions/wood_gnome.lua'
--- data/scripting/win_conditions/wood_gnome.lua	2016-05-17 16:40:22 +0000
+++ data/scripting/win_conditions/wood_gnome.lua	2016-09-14 18:27:18 +0000
@@ -3,6 +3,7 @@
 -- =======================================================================
 
 include "scripting/coroutine.lua" -- for sleep
+include "scripting/formatting.lua"
 include "scripting/table.lua"
 include "scripting/win_conditions/win_condition_functions.lua"
 
@@ -83,19 +84,16 @@
    local function _send_state()
       set_textdomain("win_conditions")
       local playerpoints = _calc_points()
-      local msg = (ngettext("The game will end in %i minute.", "The game will end in %i minutes.", remaining_time))
+      local msg = p(ngettext("The game will end in %i minute.", "The game will end in %i minutes.", remaining_time))
             :format(remaining_time)
-      msg = msg .. "\n\n"
-      msg = msg .. game_status.body
+      msg = msg .. "<p font-size=8> <br></p>" .. game_status.body
       for idx,plr in ipairs(plrs) do
-         msg = msg .. "\n"
          local trees = (ngettext ("%i tree", "%i trees", playerpoints[plr.number]))
                :format(playerpoints[plr.number])
          -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
-         msg = msg ..  (_"%1$s has %2$s at the moment."):bformat(plr.name,trees)
+         msg = msg .. p(_"%1$s has %2$s at the moment."):bformat(plr.name,trees)
       end
-
-      broadcast(plrs, game_status.title, msg)
+      broadcast(plrs, game_status.title, rt(msg))
    end
 
    -- Start a new coroutine that checks for defeated players
@@ -137,30 +135,29 @@
    end
    table.sort(points, function(a,b) return a[2] < b[2] end)
 
-   local msg = "\n\n"
-   msg = msg .. game_status.body
+   local msg = "<p font-size=8> <br></p>" .. game_status.body
    for idx,plr in ipairs(plrs) do
-      msg = msg .. "\n"
+      msg = msg .. "<p font-size=8> <br></p>"
       local trees = (ngettext ("%i tree", "%i trees", playerpoints[plr.number])):format(playerpoints[plr.number])
       -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
-      msg = msg ..  (_"%1$s had %2$s."):bformat(plr.name,trees)
+      msg = msg ..  p(_"%1$s had %2$s."):bformat(plr.name,trees)
    end
-   msg = msg .. "\n\n"
+   msg = msg .. "<p font-size=8> <br></p>"
    local trees = (ngettext ("%i tree", "%i trees", playerpoints[points[#points][1].number]))
          :format(playerpoints[points[#points][1].number])
    -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
-   msg = msg ..  (_"The winner is %1$s with %2$s."):bformat(points[#points][1].name, trees)
+   msg = msg ..  h3(_"The winner is %1$s with %2$s."):bformat(points[#points][1].name, trees)
 
    local privmsg = ""
    for i=1,#points-1 do
-      privmsg = lost_game_over.title
+      privmsg = lost_game_over.body
       privmsg = privmsg .. msg
-      points[i][1]:send_message(lost_game_over.body, privmsg)
+      points[i][1]:send_message(lost_game_over.title, rt(privmsg))
       wl.game.report_result(points[i][1], 0, make_extra_data(points[i][1], wc_descname, wc_version, {score=points[i][2]}))
    end
-   privmsg = won_game_over.title
+   privmsg = won_game_over.body
    privmsg = privmsg .. msg
-   points[#points][1]:send_message(won_game_over.body, privmsg)
+   points[#points][1]:send_message(won_game_over.title, rt(privmsg))
    wl.game.report_result(points[#points][1], 1,
       make_extra_data(points[#points][1], wc_descname, wc_version, {score=points[#points][2]}))
 end