Internationalizes in-game menu text, based on patch by Jaison, fixes #2540.
Fixes inconsistent use of "Settings" to refer to game options dialog This was SVN commit r15906.
This commit is contained in:
1 parent
e3e86e2a29
commit
e2536ae4bc
5 files changed
+9
-21
No files matched your search
Binary file not shown.
@@ -105,11 +105,11 @@ function toggleMenu()
|
||||
|
||||
// Menu buttons
|
||||
// =============================================================================
|
||||
function settingsMenuButton()
|
||||
function optionsMenuButton()
|
||||
{
|
||||
closeMenu();
|
||||
closeOpenDialogs();
|
||||
openSettings();
|
||||
openOptions();
|
||||
}
|
||||
|
||||
function chatMenuButton()
|
||||
@@ -201,7 +201,7 @@ function openSave()
|
||||
Engine.PushGuiPage("page_savegame.xml", {"savedGameData":savedGameData, "callback":"resumeGame"});
|
||||
}
|
||||
|
||||
function openSettings()
|
||||
function openOptions()
|
||||
{
|
||||
pauseGame();
|
||||
Engine.PushGuiPage("page_options.xml", {"callback":"resumeGame"});
|
||||
|
||||
@@ -42,15 +42,15 @@
|
||||
</action>
|
||||
</object>
|
||||
|
||||
<!-- Settings button -->
|
||||
<!-- Options button -->
|
||||
<object type="button"
|
||||
name="settingsButton"
|
||||
name="optionsButton"
|
||||
style="StoneButtonFancy"
|
||||
size="0 96 100% 124"
|
||||
tooltip_style="sessionToolTip"
|
||||
>
|
||||
<translatableAttribute id="caption">Settings</translatableAttribute>
|
||||
<action on="Press">settingsMenuButton();</action>
|
||||
<translatableAttribute id="caption">Options</translatableAttribute>
|
||||
<action on="Press">optionsMenuButton();</action>
|
||||
</object>
|
||||
|
||||
<!-- Pause / Resume Button -->
|
||||
|
||||
@@ -13,14 +13,6 @@
|
||||
<!-- Menu -->
|
||||
<!-- ================================ ================================ -->
|
||||
|
||||
<sprite name="menuButton">
|
||||
<image
|
||||
texture="session/icons/menu.png"
|
||||
real_texture_placement="6 10 60 23"
|
||||
size="6 10 60 23"
|
||||
/>
|
||||
</sprite>
|
||||
|
||||
<sprite name="horizontalThinBorder">
|
||||
<image
|
||||
texture="global/border/line_horiz.png"
|
||||
|
||||
@@ -11,9 +11,8 @@
|
||||
them on top of the main menu button -->
|
||||
<object size="0 -4 100% 0" type="image" sprite="horizontalThinBorder" ghost="true"/>
|
||||
|
||||
<object size="50%-32 50%-16 50%+32 50%+16" type="image" sprite="menuButton" ghost="true">
|
||||
<translatableAttribute id="caption">MENU</translatableAttribute>
|
||||
</object>
|
||||
<translatableAttribute id="caption">Menu</translatableAttribute>
|
||||
|
||||
<action on="Press">
|
||||
toggleMenu();
|
||||
</action>
|
||||
|
||||
Reference in new issue
Block a user