From 070a7259ad1b286a8279dd43afce9271d035cf6d Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Thu, 15 Oct 2015 04:07:37 +0000 Subject: [PATCH] Fixes more dialog button order issues, based on patch by stanislas69, fixes #3524 This was SVN commit r17135. --- .../data/mods/public/gui/replaymenu/replay_actions.js | 4 ++-- binaries/data/mods/public/gui/savedgames/load.js | 8 ++++---- binaries/data/mods/public/gui/savedgames/save.js | 8 ++++---- binaries/data/mods/public/gui/session/session.js | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/binaries/data/mods/public/gui/replaymenu/replay_actions.js b/binaries/data/mods/public/gui/replaymenu/replay_actions.js index 90df682c23..29a6df9647 100644 --- a/binaries/data/mods/public/gui/replaymenu/replay_actions.js +++ b/binaries/data/mods/public/gui/replaymenu/replay_actions.js @@ -108,8 +108,8 @@ function deleteReplay() var replay = g_ReplaysFiltered[selected]; // Show confirmation message - var btCaptions = [translate("Yes"), translate("No")]; - var btCode = [function() { reallyDeleteReplay(replay.directory); }, null]; + var btCaptions = [translate("No"), translate("Yes")]; + var btCode = [null, function() { reallyDeleteReplay(replay.directory); }]; var title = translate("Delete replay"); var question = translate("Are you sure to delete this replay permanently?") + "\n" + escapeText(replay.file); diff --git a/binaries/data/mods/public/gui/savedgames/load.js b/binaries/data/mods/public/gui/savedgames/load.js index d89082fae1..38b4389310 100644 --- a/binaries/data/mods/public/gui/savedgames/load.js +++ b/binaries/data/mods/public/gui/savedgames/load.js @@ -46,8 +46,8 @@ function loadGame() if (!sameEngineVersion || !sameSavegameVersion || !sameMods) { // version not compatible ... ask for confirmation - var btCaptions = [translate("Yes"), translate("No")]; - var btCode = [function(){ reallyLoadGame(gameId); }, init]; + var btCaptions = [translate("No"), translate("Yes")]; + var btCode = [init, function(){ reallyLoadGame(gameId); }]; var message = translate("This saved game may not be compatible:"); if (!sameEngineVersion) @@ -120,8 +120,8 @@ function deleteGame() var gameID = gameSelection.list_data[gameSelection.selected]; // Ask for confirmation - var btCaptions = [translate("Yes"), translate("No")]; - var btCode = [function(){ reallyDeleteGame(gameID); }, null]; + var btCaptions = [translate("No"), translate("Yes")]; + var btCode = [null, function(){ reallyDeleteGame(gameID); }]; messageBox(500, 200, sprintf(translate("\"%(label)s\""), { label: gameLabel }) + "\n" + translate("Saved game will be permanently deleted, are you sure?"), translate("DELETE"), 0, btCaptions, btCode); } diff --git a/binaries/data/mods/public/gui/savedgames/save.js b/binaries/data/mods/public/gui/savedgames/save.js index bc7d76ae55..6710c0d422 100644 --- a/binaries/data/mods/public/gui/savedgames/save.js +++ b/binaries/data/mods/public/gui/savedgames/save.js @@ -56,8 +56,8 @@ function saveGame() if (gameSelection.selected != -1) { // Ask for confirmation - var btCaptions = [translate("Yes"), translate("No")]; - var btCode = [function(){ reallySaveGame(name, desc, false); }, null]; + var btCaptions = [translate("No"), translate("Yes")]; + var btCode = [null, function(){ reallySaveGame(name, desc, false); }]; messageBox(500, 200, sprintf(translate("\"%(label)s\""), { label: gameLabel }) + "\n" + translate("Saved game will be permanently overwritten, are you sure?"), translate("OVERWRITE SAVE"), 0, btCaptions, btCode); } else @@ -86,8 +86,8 @@ function deleteGame() var gameID = gameSelection.list_data[gameSelection.selected]; // Ask for confirmation - var btCaptions = [translate("Yes"), translate("No")]; - var btCode = [function(){ reallyDeleteGame(gameID); }, null]; + var btCaptions = [translate("No"), translate("Yes")]; + var btCode = [null, function(){ reallyDeleteGame(gameID); }]; messageBox(500, 200, sprintf(translate("\"%(label)s\""), { label: gameLabel }) + "\n" + translate("Saved game will be permanently deleted, are you sure?"), translate("DELETE"), 0, btCaptions, btCode); } diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js index 52484188cc..06416ba949 100644 --- a/binaries/data/mods/public/gui/session/session.js +++ b/binaries/data/mods/public/gui/session/session.js @@ -566,8 +566,8 @@ function onReplayFinished() closeMenu(); closeOpenDialogs(); pauseGame(); - var btCaptions = [translateWithContext("replayFinished", "Yes"), translateWithContext("replayFinished", "No")]; - var btCode = [leaveGame, resumeGame]; + var btCaptions = [translateWithContext("replayFinished", "No"), translateWithContext("replayFinished", "Yes")]; + var btCode = [resumeGame, leaveGame]; messageBox(400, 200, translateWithContext("replayFinished", "The replay has finished. Do you want to quit?"), translateWithContext("replayFinished","Confirmation"), 0, btCaptions, btCode); }