real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Moved the translation of map data to the loadMap() function

Browse Source 
This avoids the translation of strings that had been previously
translated later in the code.

This was SVN commit r15026.
This commit is contained in:
Adrián Chaves 2014-04-27 13:28:47 +00:00
parent e344225b72
commit d91756b251
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -499,7 +499,9 @@ function handleNetMessage(message)
}
}
// Get display name from map data
// Get display name from map data.
// At this point the map name is already translated, do not translate the
// display name returned.
function getMapDisplayName(map)
{
var mapData = loadMapData(map);
@ -625,12 +627,23 @@ function initMapNameList()
}
// Update the list control
translateObjectKeys(mapListNames, Object.keys(mapListNames));
mapSelectionBox.list = mapListNames;
mapSelectionBox.list_data = mapListFiles;
mapSelectionBox.selected = selected;
}
function translateMapSettings(mapSettings)
{
if ("PlayerData" in mapSettings.settings)
translateObjectKeys(mapSettings.settings.PlayerData, ["Name"]);
mapSettings.settings.Name = translate(mapSettings.settings.Name);
if (mapSettings.settings.Description) // Might be empty.
mapSettings.settings.Description = translate(mapSettings.settings.Description);
else
mapSettings.settings.Description = translate("Sorry, no description available.");
return mapSettings;
}
function loadMapData(name)
{
if (!name)
@ -642,14 +655,14 @@ function loadMapData(name)
{
case "scenario":
case "skirmish":
g_MapData[name] = Engine.LoadMapSettings(name);
g_MapData[name] = translateMapSettings(Engine.LoadMapSettings(name));
break;
case "random":
if (name == "random")
g_MapData[name] = { settings: { "Name": translateWithContext("map", "Random"), "Description": translate("Randomly selects a map from the list") } };
else
g_MapData[name] = parseJSONData(name+".json");
g_MapData[name] = translateMapSettings(parseJSONData(name+".json"));
break;
default:
@ -1208,16 +1221,16 @@ function onGameAttributesChange()
}
// Display map name
Engine.GetGUIObjectByName("mapInfoName").caption = translate(getMapDisplayName(mapName));
Engine.GetGUIObjectByName("mapInfoName").caption = getMapDisplayName(mapName);
// Load the description from the map file, if there is one
var description = mapSettings.Description || translate("Sorry, no description available.");
// Load the description from the map settings.
var description = mapSettings.Description;
if (g_GameAttributes.mapFilter == "naval")
description += g_NavalWarning;
// Describe the number of players
var playerString = sprintf(translatePlural("%(number)s player. %(description)s", "%(number)s players. %(description)s", numPlayers), { number: numPlayers, description: translate(description) });
var playerString = sprintf(translatePlural("%(number)s player. %(description)s", "%(number)s players. %(description)s", numPlayers), { number: numPlayers, description: description });
for (var i = 0; i < MAX_PLAYERS; ++i)
{
@ -1242,7 +1255,7 @@ function onGameAttributesChange()
// Common to all game types
var color = iColorToString(getSetting(pData, pDefs, "Colour"));
pColor.sprite = "colour:"+color+" 100";
pName.caption = translate(getSetting(pData, pDefs, "Name"));
pName.caption = getSetting(pData, pDefs, "Name");
var team = getSetting(pData, pDefs, "Team");
var civ = getSetting(pData, pDefs, "Civ");