Ticket #2487: patch_moddata.2.patch

binaries/data/mods/public/gui/pregame/mainmenu.js

@@ -286 +286 @@
     return sprintf(translate("Build: %(buildDate)s (%(revision)s)"), { buildDate: Engine.GetBuildTimestamp(0), revision: Engine.GetBuildTimestamp(2) });
 }
 
+function getModDescription()
+{
+    if (!Engine.ConfigDB_SetFile("mod", "info.cfg"))
+        return "";
+    
+    Engine.ConfigDB_Reload("mod");
+    
+    return "[font=\"sans-bold-16\"]"
+        + sprintf(translate("%(versionName)s: %(versionNickname)s"), 
+            {versionName: translate(Engine.ConfigDB_GetValue("mod", "version.name")), 
+                versionNickname: translate(Engine.ConfigDB_GetValue("mod", "version.nickname"))
+                }
+            )
+        + "[/font]\n\n"
+        + Engine.TranslateLines(Engine.ReadFile("gui/pregame/mod_description.txt"));
+}
+
 /*
  * FUNCTIONS BELOW DO NOT WORK YET
  */

binaries/data/mods/public/gui/pregame/mainmenu.xml

@@ -467 +467 @@
                 style="TranslucentPanelThinBorder"
             >
 
-                <!-- PRE-RELEASE WARNING -->
+                <!-- MOD DESCRIPTION -->
                 <object
                     font="sans-14"
                     type="text"
                     textcolor="white"
                     size="8 8 100%-8 100%-36"
-                                        ghost="true"
+                    ghost="true"
                 >
-                    <!-- IMPORTANT: remember to update session/session.xml in sync with this: -->
-                    <attribute id="caption">
-                        <keep>[font="sans-bold-16"]</keep>
-                        <translate>Alpha XV: Osiris</translate>
-                        <keep>[/font]\n\n</keep>
-                        <translate>WARNING: This is an early development version of the game. Many features have not been added yet.</translate>
-                        <keep>\n\n</keep>
-                        <translate>Get involved at: play0ad.com</translate>
-                    </attribute>
+                    <action on="Load">
+                        this.caption = getModDescription();
+                    </action>
                 </object>
 
                 <!-- CONTACT METHODS -->

binaries/data/mods/public/gui/pregame/mod_description.txt

@@ +1 @@
+WARNING: This is an early development version of the game. Many features have not been added yet.
+
+
+Get involved at: play0ad.com

binaries/data/mods/public/gui/session/session.js

@@ -916 +916 @@
     }
 }
 
+function getVersionLabel()
+{
+    if (!Engine.ConfigDB_SetFile("mod", "info.cfg"))
+        return "";
+    
+    Engine.ConfigDB_Reload("mod");
+    
+    return sprintf(translate("%(versionName)s: %(versionNickname)s"), 
+        {versionName: Engine.ConfigDB_GetValue("mod", "version.name"), versionNickname: Engine.ConfigDB_GetValue("mod", "version.nickname")}
+        );
+}
+
 function getBuildString()
 {
     return sprintf(translate("Build: %(buildDate)s (%(revision)s)"), { buildDate: Engine.GetBuildTimestamp(0), revision: Engine.GetBuildTimestamp(2) });

binaries/data/mods/public/gui/session/session.xml

@@ -764 +764 @@
 
 
         <!-- ================================  ================================ -->
-        <!-- ALPHA LABELS (alpha, build time, revision) -->
+        <!-- VERSION LABELS (alpha, build time, revision) -->
         <!-- ================================  ================================ -->
 
         <!-- Displays Alpha name and number -->
-        <object size="50%+48 0 100%-226 100%" name="alphaLabel" type="text" style="ModernLabelText" text_valign="top" ghost="true">
-            <!-- IMPORTANT: remember to update pregame/mainmenu.xml in sync with this: -->
-            <translatableAttribute id="caption">ALPHA XV : Osiris</translatableAttribute>
+        <object size="50%+48 0 100%-226 100%" name="versionLabel" type="text" style="ModernLabelText" text_valign="top" ghost="true">
+            <action on="Load">this.caption = getVersionLabel()</action>
 
             <!-- Displays build date and revision number-->
             <object size="50%-128 0 50%+128 100%-2" name="buildTimeLabel" type="text" style="BuildNameText" ghost="true">

binaries/data/mods/public/info.cfg

@@ +1 @@
+; Mod Settings
+;
+; **************************************************************
+; * THIS FILE DOES NOT CONTAIN CUSTOMISATION ELEMENTS.         *
+; * It provides information about the current mod, to be used  *
+; * in the game.                                               *
+; **************************************************************
+
+; 0 A.D. Public Mod
+
+title = "0 A.D."
+
+; Version information
+version.name = "Alpha XV"
+version.nickname = "Osiris"
+version.number = "0.0.15"

binaries/data/mods/public/l10n/messages.json

@@ -40 +40 @@
                 "filemasks": [
                     "gui/manual/intro.txt",
                     "gui/manual/userreport.txt",
+                    "gui/pregame/mod_description.txt",
                     "gui/text/quotes.txt",
                     "gui/splashscreen/splashscreen.txt",
                     "gui/text/tips/**.txt"
@@ -48 +49 @@
                     "format": "none"
                 }
             },
+            {
+                "extractor": "ini",
+                "filemasks": [
+                    "info.cfg"
+                ],
+                "options": {
+                    "format": "none",
+                    "keywords": [
+                        "title",
+                        "version.name",
+                        "version.nickname"
+                    ]
+                }
+            },
             {
                 "extractor": "json",
                 "filemasks": [