# HG changeset patch # User Wuzzy # Date 1480078402 -3600 # Node ID 6c734d8defefd57b0325a1dc5db0871d15ce1286 # Parent 8f222872d432d26556837a61bdd969251d37d28a Clean up strings in Control mission maps (more translator-friendly) diff -r 8f222872d432 -r 6c734d8defef share/hedgewars/Data/Maps/Control/map.lua --- a/share/hedgewars/Data/Maps/Control/map.lua Fri Nov 25 13:38:24 2016 +0100 +++ b/share/hedgewars/Data/Maps/Control/map.lua Fri Nov 25 13:53:22 2016 +0100 @@ -62,6 +62,10 @@ local gameWon = false local pointLimit = 300 +local missionName = loc("Control") +local missionCaption = loc("Domination game") +local missionHelp + local vCirc = {} local vCircCount = 0 @@ -355,6 +359,9 @@ for i = 0, (numTeams-1) do pointLimit = pointLimit - 25 end + + missionHelp = loc("Control pillars to score points.") .. "|" .. + string.format(loc("Score goal: %d"), pointLimit) -- reposition hogs if they are on control points until they are not or sanity limit kicks in reN = 0 @@ -370,11 +377,7 @@ --AddCaption(zz) -- number of times it took to work end - ShowMission(loc("Control"), - loc("Domination game"), - loc("Control pillars to score points.") .. "|" .. - loc("Goal") .. ": " .. pointLimit .. " " .. loc("points"), 0, 0) - + ShowMission(missionName, missionCaption, missionHelp, 0, 0) end @@ -411,17 +414,18 @@ totalComment = "" for i = 0,(TeamsCount-1) do - if teamNameArr[i] ~= " " then -- i - teamComment[i] = teamNameArr[i] .. ": " .. teamScore[teamClan[i]] .. " " .. loc("points") .. "|" + if teamNameArr[i] ~= " " then + -- Team scores (“: ”) + teamComment[i] = string.format(loc("%s: %d"), teamNameArr[i], teamScore[teamClan[i]]) .. "|" totalComment = totalComment .. teamComment[i] elseif teamNameArr[i] == " " then teamComment[i] = "|" end end - ShowMission(loc("Control"), - loc("Domination game"), - loc("Team Scores") .. ":" .. "|" .. + ShowMission(missionName, missionCaption, + missionHelp .. "|" .. + loc("Team Scores:") .. "|" .. totalComment, 0, 1600) end