Page MenuHomeWildfire Games
Differential D2428

main menu item tooltip corrections.
ClosedPublic
Actions

Authored by Nescio on Nov 16 2019, 8:07 PM.

Details

Reviewers
Gallaecio
Commits
rP23367: main menu item tooltip corrections.
Summary

Minor corrections to several tooltips in the pre-game main menu.

Test Plan

Check for mistakes and omissions.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Nescio created this revision.Nov 16 2019, 8:07 PM
Owners added a subscriber: Restricted Owners Package.Nov 16 2019, 8:07 PM
Vulcan added a comment.Nov 16 2019, 8:08 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/590/display/redirect

Vulcan added a comment.Nov 16 2019, 8:10 PM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 193| 193| 		"tooltip": translate("Exit the game."),
| 194| 194| 		"onPress": () => {
| 195| 195| 			messageBox(
| 196|    |-					400, 200,
|    | 196|+				400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 194| 194| 		"onPress": () => {
| 195| 195| 			messageBox(
| 196| 196| 					400, 200,
| 197|    |-					translate("Are you sure you want to quit 0 A.D.?"),
|    | 197|+				translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 195| 195| 			messageBox(
| 196| 196| 					400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198|    |-					translate("Confirmation"),
|    | 198|+				translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
| 201| 201| 		}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 196| 196| 					400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199|    |-					[translate("No"), translate("Yes")],
|    | 199|+				[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
| 201| 201| 		}
| 202| 202| 	}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200|    |-					[null, Engine.Exit]);
|    | 200|+				[null, Engine.Exit]);
| 201| 201| 		}
| 202| 202| 	}
| 203| 203| ];
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1106/display/redirect

Harbormaster completed remote builds in B10037: Diff 10342.Nov 16 2019, 8:10 PM
Gallaecio accepted this revision.Nov 23 2019, 8:58 AM
This revision is now accepted and ready to land.Nov 23 2019, 8:58 AM
Nescio updated this revision to Diff 10388.Nov 23 2019, 12:13 PM

rebased

Vulcan added a comment.Nov 23 2019, 12:14 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/625/display/redirect

Vulcan added a comment.Nov 23 2019, 12:16 PM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 193| 193| 		"tooltip": translate("Exit the game."),
| 194| 194| 		"onPress": () => {
| 195| 195| 			messageBox(
| 196|    |-					400, 200,
|    | 196|+				400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 194| 194| 		"onPress": () => {
| 195| 195| 			messageBox(
| 196| 196| 					400, 200,
| 197|    |-					translate("Are you sure you want to quit 0 A.D.?"),
|    | 197|+				translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 195| 195| 			messageBox(
| 196| 196| 					400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198|    |-					translate("Confirmation"),
|    | 198|+				translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
| 201| 201| 		}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 196| 196| 					400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199|    |-					[translate("No"), translate("Yes")],
|    | 199|+				[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
| 201| 201| 		}
| 202| 202| 	}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200|    |-					[null, Engine.Exit]);
|    | 200|+				[null, Engine.Exit]);
| 201| 201| 		}
| 202| 202| 	}
| 203| 203| ];
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1141/display/redirect

Harbormaster completed remote builds in B10092: Diff 10388.Nov 23 2019, 12:17 PM
Freagarach mentioned this in rP22854: Rewrite Main Menu..Nov 24 2019, 12:18 PM
Freagarach added a subscriber: Freagarach.
Freagarach added inline comments.
binaries/data/mods/public/gui/pregame/MainMenuItems.js
54 ↗(On Diff #10388)

Click here to start a new single player game. Typo introduced in rP22854.

Nescio updated this revision to Diff 10419.Nov 25 2019, 11:49 AM

Corrected start new match tooltip.

binaries/data/mods/public/gui/pregame/MainMenuItems.js
54 ↗(On Diff #10388)

Nice catch! Now corrected.

Vulcan added a comment.Nov 25 2019, 11:50 AM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/647/display/redirect

Stan added a subscriber: Stan.Nov 25 2019, 11:52 AM
Stan added inline comments.
binaries/data/mods/public/gui/pregame/MainMenuItems.js
54 ↗(On Diff #10388)

Just for the record https://trac.wildfiregames.com/ticket/5641

Vulcan added a comment.Nov 25 2019, 11:55 AM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 193| 193| 		"tooltip": translate("Exit the game."),
| 194| 194| 		"onPress": () => {
| 195| 195| 			messageBox(
| 196|    |-					400, 200,
|    | 196|+				400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 194| 194| 		"onPress": () => {
| 195| 195| 			messageBox(
| 196| 196| 					400, 200,
| 197|    |-					translate("Are you sure you want to quit 0 A.D.?"),
|    | 197|+				translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 195| 195| 			messageBox(
| 196| 196| 					400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198|    |-					translate("Confirmation"),
|    | 198|+				translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
| 201| 201| 		}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 196| 196| 					400, 200,
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199|    |-					[translate("No"), translate("Yes")],
|    | 199|+				[translate("No"), translate("Yes")],
| 200| 200| 					[null, Engine.Exit]);
| 201| 201| 		}
| 202| 202| 	}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js
| 197| 197| 					translate("Are you sure you want to quit 0 A.D.?"),
| 198| 198| 					translate("Confirmation"),
| 199| 199| 					[translate("No"), translate("Yes")],
| 200|    |-					[null, Engine.Exit]);
|    | 200|+				[null, Engine.Exit]);
| 201| 201| 		}
| 202| 202| 	}
| 203| 203| ];
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1163/display/redirect

Harbormaster completed remote builds in B10129: Diff 10419.Nov 25 2019, 11:55 AM
Freagarach added inline comments.Jan 10 2020, 8:22 PM
binaries/data/mods/public/gui/pregame/MainMenuItems.js
54 ↗(On Diff #10388)

rP23360

Nescio updated this revision to Diff 10969.Jan 11 2020, 11:47 AM

rebased

Vulcan added a comment.Jan 11 2020, 11:51 AM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/102/display/redirect

Vulcan added a comment.Jan 11 2020, 11:56 AM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1524/display/redirect

Vulcan added a comment.Jan 11 2020, 11:56 AM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1006/display/redirect

Harbormaster completed remote builds in B10734: Diff 10969.Jan 11 2020, 11:56 AM
Closed by commit rP23367: main menu item tooltip corrections. (authored by Gallaecio). · Explain WhyJan 11 2020, 1:00 PM
This revision was automatically updated to reflect the committed changes.
Gallaecio added a commit: rP23367: main menu item tooltip corrections..

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
gui/
pregame/
16 lines

Diff 10973

View Options

ps/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js

Loading...
Wildfire Games · Phabricator