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

Improved the internationalization of the construction “Insufficient resources” message

Browse Source 
This was SVN commit r14988.
This commit is contained in:
Adrián Chaves 2014-04-25 02:45:19 +00:00
parent 0c04b90a2d
commit c1c10667df
3 changed files with 72 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
binaries/data/mods/public/globalscripts/l10n.js
View File

@ -73,6 +73,36 @@ function translatePluralWithContext(context, singularMessage, pluralMessage, num
return pluralTranslationWithContext;
}
/**
* The input object should contain either of the following properties:
*
* • A ‘message’ property that contains a message to translate.
*
* • A ‘list’ property that contains a list of messages to translate as a
* comma-separated list of translated.
*
* Optionally, the input object may contain a ‘context’ property. In that case,
* the value of this property is used as translation context, that is, passed to
* the translateWithContext(context, message) function.
*/
function translateMessageObject(object)
{
// the translation function
var trans = translate;
if (object.context)
trans = function(msg) { return translateWithContext(object.context, msg);};
if (object.message)
object = trans(object.message);
else if (object.list)
{
var translatedList = object.list.map(trans);
object = translatedList.join(translateWithContext("enumeration", ", "));
}
return object;
}
/**
* Translates any string value in the specified JavaScript object
* that is associated with a key included in the specified keys array.
@ -115,32 +145,49 @@ function translatePluralWithContext(context, singularMessage, pluralMessage, num
* So you see that the keys array can also contain lower-level keys,
* And that you can include objects in the keys array to translate
* them with a context, or to join a list of translations.
*
* Also, the keys array may be an object where properties are keys to translate
* and values are translation contexts to use for each key.
*/
function translateObjectKeys(object, keys) {
for (var property in object)
// If ‘keys’ is an array, simply translate.
if (keys instanceof Array)
{
if (keys.indexOf(property) > -1)
for (var property in object)
{
if (typeof object[property] == "string")
object[property] = translate(object[property]);
else if (object[property] instanceof Object)
if (keys.indexOf(property) > -1)
{
// the translation function
var trans = translate;
if (object[property].context)
trans = function(msg) { return translateWithContext(object[property].context, msg);};
if (object[property].message)
object[property] = trans(object[property].message);
else if (object[property].list)
if (typeof object[property] == "string")
object[property] = translate(object[property]);
else if (object[property] instanceof Object)
{
var translatedList = object[property].list.map(trans);
object[property] = translatedList.join(translateWithContext("enumeration", ", "));
object[property] = translateMessageObject(object[property]);
}
}
else if (object[property] instanceof Object)
translateObjectKeys(object[property], keys);
}
}
// If ‘keys’ is not an array, it is an object where keys are properties to
// translate and values are translation contexts to use for each key.
// An empty value means no context.
else
{
for (var property in object)
{
if (property in keys)
{
if (typeof object[property] == "string")
if (keys[property])
object[property] = translateWithContext(keys[property], object[property]);
else
object[property] = translate(object[property]);
else if (object[property] instanceof Object)
object[property] = translateMessageObject(object[property]);
}
else if (object[property] instanceof Object)
translateObjectKeys(object[property], keys);
}
else if (object[property] instanceof Object)
translateObjectKeys(object[property], keys);
}
}

4
binaries/data/mods/public/gui/session/messages.js
View File

@ -144,7 +144,7 @@ function displayNotifications()
for each (var n in notifications)
{
var parameters = n.parameters || {};
if (n.translateParameters && n.translateParameters.length)
if (n.translateParameters)
translateObjectKeys(parameters, n.translateParameters);
var message = n.message;
if (n.translateMessage)
@ -164,7 +164,7 @@ function updateTimeNotifications()
if (n.translateMessage)
message = translate(message);
var parameters = n.parameters || {};
if (n.translateParameters && n.translateParameters.length)
if (n.translateParameters)
translateObjectKeys(parameters, n.translateParameters);
parameters.time = timeToString(n.time);
notificationText += sprintf(message, parameters) + "\n";

7
binaries/data/mods/public/simulation/components/Player.js
View File

@ -248,7 +248,12 @@ Player.prototype.SubtractResourcesOrNotify = function(amounts)
"message": msg,
"parameters": parameters,
"translateMessage": true,
"translateParameters": ["resourceType1", "resourceType2", "resourceType3", "resourceType4"],
"translateParameters": {
"resourceType1": "withinSentence",
"resourceType2": "withinSentence",
"resourceType3": "withinSentence",
"resourceType4": "withinSentence",
},
};
var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
cmpGUIInterface.PushNotification(notification);