Index: ps/trunk/binaries/data/mods/mod/globalscripts/l10n.js
===================================================================
--- ps/trunk/binaries/data/mods/mod/globalscripts/l10n.js	(revision 20548)
+++ ps/trunk/binaries/data/mods/mod/globalscripts/l10n.js	(revision 20549)
@@ -1,208 +1,23 @@
 /**
- * These functions rely on the JS cache where possible and
- * should be prefered over the Engine.Translate ones to optimize the performance.
- */
-var g_Translations = {};
-var g_PluralTranslations = {};
-var g_TranslationsWithContext = {};
-var g_PluralTranslationsWithContext = {};
-
-function isTranslatableString(message)
-{
-	return typeof message == "string" && !!message.trim();
-}
-
-/**
- * Translates the specified English message into the current language.
- */
-function translate(message)
-{
-	if (!g_Translations[message])
-		g_Translations[message] = Engine.Translate(message);
-
-	return g_Translations[message];
-}
-
-/**
- * Translates the specified English message into the current language for the specified number.
- */
-function translatePlural(singularMessage, pluralMessage, number)
-{
-	if (!g_PluralTranslations[singularMessage])
-		g_PluralTranslations[singularMessage] = {};
-
-	if (!g_PluralTranslations[singularMessage][number])
-		g_PluralTranslations[singularMessage][number] = Engine.TranslatePlural(singularMessage, pluralMessage, number);
-
-	return g_PluralTranslations[singularMessage][number];
-}
-
-
-/**
- * Translates the specified English message into the current language for the specified context.
- */
-function translateWithContext(context, message)
-{
-	if (!g_TranslationsWithContext[context])
-		g_TranslationsWithContext[context] = {}
-
-	if (!g_TranslationsWithContext[context][message])
-		g_TranslationsWithContext[context][message] = Engine.TranslateWithContext(context, message);
-
-	return g_TranslationsWithContext[context][message];
-}
-
-
-/**
- * Translates the specified English message into the current language for the specified context and number.
- */
-function translatePluralWithContext(context, singularMessage, pluralMessage, number)
-{
-	if (!g_PluralTranslationsWithContext[context])
-		g_PluralTranslationsWithContext[context] = {};
-
-	if (!g_PluralTranslationsWithContext[context][singularMessage])
-		g_PluralTranslationsWithContext[context][singularMessage] = {};
-
-	if (!g_PluralTranslationsWithContext[context][singularMessage][number])
-		g_PluralTranslationsWithContext[context][singularMessage][number] =
-			Engine.TranslatePluralWithContext(context, singularMessage, pluralMessage, number);
-
-	return g_PluralTranslationsWithContext[context][singularMessage][number];
-}
-
-/**
- * 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)
-{
-	let trans = translate;
-	if (object.context)
-		trans = msg => translateWithContext(object.context, msg);
-
-	if (object.message)
-		object = trans(object.message);
-	else if (object.list)
-		object = object.list.map(trans).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.
- *
- * it accepts an object in the form of
- *
- * {
- *   translatedString1: "my first message",
- *   unTranslatedString1: "some English string",
- *   ignoredObject: {
- *     translatedString2: "my second message",
- *     unTranslatedString2: "some English string"
- *   },
- *   translatedObject1: {
- *     message: "my third singular message",
- *     context: "message context",
- *   },
- *   translatedObject2: {
- *     list: ["list", "of", "strings"],
- *     context: "message context",
- *   },
- * }
- *
- * Together with a keys list to translate the strings and objects
- * ["translatedString1", "translatedString2", "translatedObject1",
- * "translatedObject2"]
- *
- * The result will be (f.e. in Dutch)
- * {
- *  translatedString1: "mijn eerste bericht",
- *   unTranslatedString1: "some English string",
- *   ignoredObject: {
- *     translatedString2: "mijn tweede bericht",
- *     unTranslatedString2: "some English string"
- *   },
- *   translatedObject1: "mijn derde bericht",
- *   translatedObject2: "lijst, van, teksten",
- * }
- *
- * 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)
-{
-	if (keys instanceof Array)
-	{
-		for (let property in object)
-		{
-			if (keys.indexOf(property) > -1)
-			{
-				if (isTranslatableString(object[property]))
-					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);
-		}
-	}
-	// 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 (let property in object)
-		{
-			if (property in keys)
-			{
-				if (isTranslatableString(object[property]))
-					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);
-		}
-	}
-}
-
-/**
  * Function is used by the extract-messages tool.
  * So it may only be used on a plain string,
  * it won't have any effect on a calculated string.
  */
 function markForTranslation(message)
 {
 	return message;
 }
 
 function markForTranslationWithContext(context, message)
 {
 	return message;
 }
 
 function markForPluralTranslation(singularMessage, pluralMessage, number)
 {
 	return {
 		"message": singularMessage,
 		"pluralMessage": pluralMessage,
 		"pluralCount": number
 	};
 }
Index: ps/trunk/binaries/data/mods/mod/gui/common/l10n.js
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/common/l10n.js	(nonexistent)
+++ ps/trunk/binaries/data/mods/mod/gui/common/l10n.js	(revision 20549)
@@ -0,0 +1,184 @@
+/**
+ * These functions rely on the JS cache where possible and
+ * should be prefered over the Engine.Translate ones to optimize the performance.
+ */
+var g_Translations = {};
+var g_PluralTranslations = {};
+var g_TranslationsWithContext = {};
+var g_PluralTranslationsWithContext = {};
+
+function isTranslatableString(message)
+{
+	return typeof message == "string" && !!message.trim();
+}
+
+/**
+ * Translates the specified English message into the current language.
+ */
+function translate(message)
+{
+	if (!g_Translations[message])
+		g_Translations[message] = Engine.Translate(message);
+
+	return g_Translations[message];
+}
+
+/**
+ * Translates the specified English message into the current language for the specified number.
+ */
+function translatePlural(singularMessage, pluralMessage, number)
+{
+	if (!g_PluralTranslations[singularMessage])
+		g_PluralTranslations[singularMessage] = {};
+
+	if (!g_PluralTranslations[singularMessage][number])
+		g_PluralTranslations[singularMessage][number] = Engine.TranslatePlural(singularMessage, pluralMessage, number);
+
+	return g_PluralTranslations[singularMessage][number];
+}
+
+
+/**
+ * Translates the specified English message into the current language for the specified context.
+ */
+function translateWithContext(context, message)
+{
+	if (!g_TranslationsWithContext[context])
+		g_TranslationsWithContext[context] = {}
+
+	if (!g_TranslationsWithContext[context][message])
+		g_TranslationsWithContext[context][message] = Engine.TranslateWithContext(context, message);
+
+	return g_TranslationsWithContext[context][message];
+}
+
+
+/**
+ * Translates the specified English message into the current language for the specified context and number.
+ */
+function translatePluralWithContext(context, singularMessage, pluralMessage, number)
+{
+	if (!g_PluralTranslationsWithContext[context])
+		g_PluralTranslationsWithContext[context] = {};
+
+	if (!g_PluralTranslationsWithContext[context][singularMessage])
+		g_PluralTranslationsWithContext[context][singularMessage] = {};
+
+	if (!g_PluralTranslationsWithContext[context][singularMessage][number])
+		g_PluralTranslationsWithContext[context][singularMessage][number] =
+			Engine.TranslatePluralWithContext(context, singularMessage, pluralMessage, number);
+
+	return g_PluralTranslationsWithContext[context][singularMessage][number];
+}
+
+/**
+ * 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)
+{
+	let trans = translate;
+	if (object.context)
+		trans = msg => translateWithContext(object.context, msg);
+
+	if (object.message)
+		object = trans(object.message);
+	else if (object.list)
+		object = object.list.map(trans).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.
+ *
+ * it accepts an object in the form of
+ *
+ * {
+ *   translatedString1: "my first message",
+ *   unTranslatedString1: "some English string",
+ *   ignoredObject: {
+ *     translatedString2: "my second message",
+ *     unTranslatedString2: "some English string"
+ *   },
+ *   translatedObject1: {
+ *     message: "my third singular message",
+ *     context: "message context",
+ *   },
+ *   translatedObject2: {
+ *     list: ["list", "of", "strings"],
+ *     context: "message context",
+ *   },
+ * }
+ *
+ * Together with a keys list to translate the strings and objects
+ * ["translatedString1", "translatedString2", "translatedObject1",
+ * "translatedObject2"]
+ *
+ * The result will be (f.e. in Dutch)
+ * {
+ *  translatedString1: "mijn eerste bericht",
+ *   unTranslatedString1: "some English string",
+ *   ignoredObject: {
+ *     translatedString2: "mijn tweede bericht",
+ *     unTranslatedString2: "some English string"
+ *   },
+ *   translatedObject1: "mijn derde bericht",
+ *   translatedObject2: "lijst, van, teksten",
+ * }
+ *
+ * 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)
+{
+	if (keys instanceof Array)
+	{
+		for (let property in object)
+		{
+			if (keys.indexOf(property) > -1)
+			{
+				if (isTranslatableString(object[property]))
+					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);
+		}
+	}
+	// 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 (let property in object)
+		{
+			if (property in keys)
+			{
+				if (isTranslatableString(object[property]))
+					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);
+		}
+	}
+}

Property changes on: ps/trunk/binaries/data/mods/mod/gui/common/l10n.js
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml	(revision 20548)
+++ ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml	(revision 20549)
@@ -1,204 +1,205 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
+	<script directory="gui/common/"/>
 	<script directory="gui/modmod/"/>
 
 	<object name="modmod" type="image" style="ModernWindow" size="0 0 100% 100%">
 		<!-- Page Title -->
 		<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36">
 			<translatableAttribute id="caption">Modifications</translatableAttribute>
 		</object>
 
 		<!-- Message -->
 		<object name="message" type="text" size="15 40 100%-15 88" text_align="left" textcolor="white"/>
 
 		<!-- reset filters -->
 		<object name="resetFilters" size="15 72 184 100" type="button" style="ModernButtonRed">
 			<translatableAttribute id="caption">Reset Filters</translatableAttribute>
 			<action on="Press">resetFilters();</action>
 		</object>
 
 		<!-- Filter Panel -->
 		<object name="filterPanel" size="184 64 50% 98">
 			<object name="modGenericFilter"
 				type="input"
 				style="ModernInput"
 				size="10 100%-24 170 100%"
 			>
 				<action on="Press">applyFilters();</action>
 			</object>
 
 			<object name="modTypeFilter"
 				type="dropdown"
 				style="ModernDropDown"
 				size="180 100%-24 350 100%"
 				font="sans-bold-13"
 			>
 				<action on="SelectionChange">applyFilters();</action>
 			</object>
 
 			<!-- Checkboxes -->
 			<object name="negateFilter"
 				type="checkbox"
 				checked="false"
 				style="ModernTickBox"
 				size="355 100%-24 375 100%"
 				font="serif-bold-13"
 			>
 				<action on="Press">applyFilters();</action>
 			</object>
 			<object type="text" size="377 100%-24 460 100%" text_align="left" textcolor="white">
 				<translatableAttribute id="caption">Negate</translatableAttribute>
 			</object>
 		</object>
 
 		<!-- Sort by -->
 		<object name="sortingWrapper" size="100%-400 74 100% 98">
 			<object type="text" size="0 0 75 100%" text_align="left" textcolor="white">
 				<translatableAttribute id="caption">Sorting:</translatableAttribute>
 			</object>
 			<object name="sortBy"
 				type="dropdown"
 				style="ModernDropDown"
 				size="75 100%-24 75%-25 100%"
 				font="sans-bold-13"
 			>
 				<action on="SelectionChange">applyFilters();</action>
 			</object>
 			<!-- Checkboxes -->
 			<object type="text" size="75% 100%-24 100% 100%" text_align="left" textcolor="white">
 				<translatableAttribute id="caption">Descending.</translatableAttribute>
 			</object>
 			<object name="isOrderDescending"
 				type="checkbox"
 				checked="false"
 				style="ModernTickBox"
 				size="75%-20 100%-24 75% 100%"
 				font="serif-bold-13"
 			>
 				<action on="Press">applyFilters();</action>
 			</object>
 		</object>
 
 		<!-- Available Mods Wrapper -->
 		<object name="modsAvailable" size="16 100 100%-15 75%-4" style="ModmodScrollbar">
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Available Mods</translatableAttribute>
 			</object>
 
 			<object name="modsAvailableList"
 				style="ModernList"
 				type="olist"
 				size="0 25 100%-2 100%"
 				font="sans-stroke-13"
 			>
 				<action on="SelectionChange">showModDescription(this.name);</action>
 				<!-- List headers -->
 				<column id="name" color="255 255 255" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
 				</column>
 				<column id="modVersion" color="255 255 255" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
 				</column>
 				<column id="modFolderName" color="255 255 255" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
 				</column>
 				<column id="modLabel" color="255 255 255" width="18%">
 					<translatableAttribute id="heading">Mod Label</translatableAttribute>
 				</column>
 				<column id="modType" color="255 255 255" width="12%">
 					<translatableAttribute id="heading">Mod Type</translatableAttribute>
 				</column>
 				<column id="modDependencies" color="255 255 255" width="20%">
 					<translatableAttribute id="heading">Dependencies</translatableAttribute>
 				</column>
 				<column id="modURL" color="255 255 255" width="24%">
 					<translatableAttribute id="heading">Website</translatableAttribute>
 				</column>
 			</object>
 			<object name="globalModDescription" type="text" style="ModmodScrollbar" size="0 100%-28 100%-16 100%">
 				<attribute id="caption"><keep>[color="100 100 100"]</keep><translate>Description</translate><keep>[/color]</keep></attribute>
 			</object>
 			<object type="button" style="ModernButtonRed" size="100%-184 100%-28 100% 100%">
 				<translatableAttribute id="caption">Enable</translatableAttribute>
 				<action on="Press">enableMod();</action>
 			</object>
 		</object>
 
 
 		<!-- Enabled Mods Wrapper -->
 		<object name="modsEnabled" size="16 75% 100%-15 100%-50">
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Enabled Mods</translatableAttribute>
 			</object>
 
 			<object name="modsEnabledList"
 				style="ModernList"
 				type="olist"
 				size="0 25 96%-5 100%"
 				font="sans-stroke-13"
 				tooltip_style="pgToolTip"
 			>
 				<action on="SelectionChange">showModDescription(this.name);</action>
 				<!-- List headers -->
 				<column id="name" color="255 255 255" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
 				</column>
 				<column id="modVersion" color="255 255 255" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
 				</column>
 				<column id="modFolderName" color="255 255 255" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
 				</column>
 				<column id="modLabel" color="255 255 255" width="18%">
 					<translatableAttribute id="heading">Mod Label</translatableAttribute>
 				</column>
 				<column id="modType" color="255 255 255" width="12%">
 					<translatableAttribute id="heading">Mod Type</translatableAttribute>
 				</column>
 				<column id="modDependencies" color="255 255 255" width="20%">
 					<translatableAttribute id="heading">Dependencies</translatableAttribute>
 				</column>
 				<column id="modURL" color="255 255 255" width="24%">
 					<translatableAttribute id="heading">Website</translatableAttribute>
 				</column>
 			</object>
 
 			<object type="button" style="ModernButtonRed" size="96% 23 100% 40%+12">
 				<translatableAttribute id="caption">Up</translatableAttribute>
 				<action on="Press">moveCurrItem(this.parent.name + "List", true);</action>
 			</object>
 			<object type="button" style="ModernButtonRed" size="96% 40%+12 100% 60%+10">
 				<translatableAttribute id="caption">X</translatableAttribute>
 				<action on="Press">disableMod();</action>
 			</object>
 			<object type="button" style="ModernButtonRed" size="96% 60%+10 100% 100%">
 				<translatableAttribute id="caption">Down</translatableAttribute>
 				<action on="Press">moveCurrItem(this.parent.name + "List", false);</action>
 			</object>
 		</object>
 
 
 		<!-- BUTTONS -->
 		<object type="button" style="ModernButtonRed" size="16 100%-44 200 100%-16">
 			<translatableAttribute id="caption">Quit</translatableAttribute>
 			<action on="Press">Engine.Exit();</action>
 		</object>
 
 		<object type="button" style="ModernButtonRed" size="100%-576 100%-44 100%-392 100%-16" hotkey="cancel">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 			<action on="Press">closePage();</action>
 		</object>
 
 		<object name="saveConfigurationButton" type="button" style="ModernButtonRed" size="100%-388 100%-44 100%-204 100%-16">
 			<translatableAttribute id="caption">Save Configuration</translatableAttribute>
 			<action on="Press">saveMods();</action>
 		</object>
 
 		<object name="startModsButton" type="button" style="ModernButtonRed" size="100%-200 100%-44 100%-16 100%-16">
 			<translatableAttribute id="caption">Start Mods</translatableAttribute>
 			<action on="Press">startMods();</action>
 		</object>
 	</object>
 </objects>