Ticket #3200: t3200_fix_message_box_button_order.patch

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

@@ -146 +146 @@
     closeMenu();
     closeOpenDialogs();
     pauseGame();
     if (g_IsNetworked && g_IsController)
     {
-        var btCode = [resumeGame, leaveGame];
         var message = translate("Are you sure you want to quit? Leaving will disconnect all other players.");
+        var btCode = [leaveGame, resumeGame];
     }
     else if (g_IsNetworked && !g_GameEnded && !g_IsObserver)
     {
-        var btCode = [resumeGame, networkReturnQuestion];
         var message = translate("Are you sure you want to quit?");
+        var btCode = [networkReturnQuestion, resumeGame];
     }
     else
     {
-        var btCode = [resumeGame, leaveGame];
         var message = translate("Are you sure you want to quit?");
+        var btCode = [leaveGame, resumeGame];
     }
-    messageBox(400, 200, message, translate("Confirmation"), 0, [translate("No"), translate("Yes")], btCode);
+    messageBox(400, 200, message, translate("Confirmation"), 0, [translate("Yes"), translate("No")], btCode);
 }
 
 function networkReturnQuestion()
 {
-    var btCaptions = [translate("I will return"), translate("I resign")];
-    var btCode = [leaveGame, resignGame];
-    var btArgs = [true, false];
+    var btCaptions = [translate("I resign"), translate("I will return")];
+    var btCode = [resignGame, leaveGame];
+    var btArgs = [false, true];
     messageBox(400, 200, translate("Do you want to resign or will you return soon?"), translate("Confirmation"), 0, btCaptions, btCode, btArgs);
 }
 
 function openDeleteDialog(selection)
 {

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

@@ -474 +475 @@
         var btCode = [null];
         var message = translate("Press OK to continue");
     }
     else
     {
-        var btCaptions = [translate("No"), translate("Yes")];
-        var btCode = [null, leaveGame];
+        var btCaptions = [translate("Yes"), translate("No")];
+        var btCode = [leaveGame, null];
         var message = translate("Do you want to quit?");
     }
 
     if (playerState.state == "defeated")
     {