sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes the translation of the map size in the rihgt sidebar of the lobby

Browse Source 
Fixes #2547

This was SVN commit r16031.
This commit is contained in:
Adrián Chaves 2014-12-09 20:11:16 +00:00
parent ae7c2f9586
commit bce404adf2
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
binaries/data/mods/public/gui/lobby/lobby.js
View File

@ -399,10 +399,7 @@ function updateGameList()
list_name.push(name);
list_ip.push(g.ip);
list_mapName.push(translate(g.niceMapName));
if (+g.mapSize !== +g.mapSize) // NaN
list_mapSize.push(translate(g.mapSize));
else
list_mapSize.push(g_mapSizes.shortNames[g_mapSizes.tiles.indexOf(+g.mapSize)]);
list_mapSize.push(translatedMapSize(g_GameList[g].mapSize));
let idx = g_mapTypes.indexOf(g.mapType);
list_mapType.push(idx != -1 ? g_mapTypesText[idx] : "");
list_nPlayers.push(g.nbp + "/" +g.tnbp);
@ -479,6 +476,18 @@ function formatPlayerListEntry(nickname, presence, rating)
return [formattedName, formattedStatus, formattedRating];
}
/**
* Given a map size, returns that map size translated into the current
* language.
*/
function translatedMapSize(mapSize)
{
if (+mapSize !== +mapSize) // NaN
return translate(mapSize);
else
return g_mapSizes.shortNames[g_mapSizes.tiles.indexOf(+mapSize)];
}
/**
* Populate the game info area with information on the current game selection.
*/
@ -517,7 +526,7 @@ function updateGameSelection()
Engine.GetGUIObjectByName("sgMapName").caption = translate(g_GameList[g].niceMapName);
Engine.GetGUIObjectByName("sgNbPlayers").caption = g_GameList[g].nbp + "/" + g_GameList[g].tnbp;
Engine.GetGUIObjectByName("sgPlayersNames").caption = g_GameList[g].players;
Engine.GetGUIObjectByName("sgMapSize").caption = g_GameList[g].mapSize.split("(")[0];
Engine.GetGUIObjectByName("sgMapSize").caption = translatedMapSize(g_GameList[g].mapSize);
let idx = g_mapTypes.indexOf(g_GameList[g].mapType);
Engine.GetGUIObjectByName("sgMapType").caption = idx != -1 ? g_mapTypesText[idx] : "";