The civinfo page is currently displayed as “History”, which is a bit of a misnomer, since history strings are also displayed in the structure tree, and what the civinfo page does is not really provide more history, but give an overview of a civilization. This patch therefore changes the name to “Civilization Overview”, which is more accurate.
Details
Details
- Reviewers
s0600204 - Group Reviewers
Restricted Owners Package (Owns No Changed Paths) - Commits
- rP23671: Rename civinfo page from "History" to "Civilization Overview"
Check this patch is correct and complete. It shouldn't break anything.
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Branch
- /ps/trunk
- Lint
Lint OK - Unit
No Unit Test Coverage - Build Status
Buildable 11655 Build 21482: Vulcan Build Jenkins Build 21481: Vulcan Build (macOS) Jenkins Build 21480: Vulcan Build (Windows) Jenkins Build 21479: arc lint + arc unit
Event Timeline
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues:
Executing section Source...
Executing section JS...
| | [NORMAL] ESLintBear (no-trailing-spaces):
| | Trailing spaces not allowed.
|----| | /zpool0/trunk/binaries/data/mods/public/gui/reference/structree/structree.js
| |++++| /zpool0/trunk/binaries/data/mods/public/gui/reference/structree/structree.js
| 4| 4| var g_BuildList = {};
| 5| 5|
| 6| 6| /**
| 7| |- * Array of template names that can be trained from a unit, given a civ and unit template name.
| | 7|+ * Array of template names that can be trained from a unit, given a civ and unit template name.
| 8| 8| */
| 9| 9| var g_TrainList = {};
| 10| 10|
Executing section cli...Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2073/display/redirect
Comment Actions
I think my only criticism is that the text no longer properly fits within the button within the structree. Could you explore button sizes to find something that
- Fits the new text (with plenty of space for translated strings that might be longer), and
- Doesn't look strange/out of place with the rest of the gui?
Also, could you consider changing the text within the banner at the top of the civinfo page?
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues:
Executing section Source...
Executing section JS...
| | [NORMAL] ESLintBear (no-trailing-spaces):
| | Trailing spaces not allowed.
|----| | /zpool0/trunk/binaries/data/mods/public/gui/reference/structree/structree.js
| |++++| /zpool0/trunk/binaries/data/mods/public/gui/reference/structree/structree.js
| 4| 4| var g_BuildList = {};
| 5| 5|
| 6| 6| /**
| 7| |- * Array of template names that can be trained from a unit, given a civ and unit template name.
| | 7|+ * Array of template names that can be trained from a unit, given a civ and unit template name.
| 8| 8| */
| 9| 9| var g_TrainList = {};
| 10| 10|
Executing section cli...Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2113/display/redirect
Comment Actions
Thanks!
We'll no doubt find out if the button is wide enough for translations when it gets translated.
Apart from the spelling correction - which is small enough to not need another revision - I reckon this is ready to go.
| binaries/data/mods/public/gui/civinfo/civinfo.xml | ||
|---|---|---|
| 18 | (Spelling) | |
Comment Actions
@Stan, the text "Civilization Overview" hasn't been pushed to Transifex, subsequently there's currently no translation of that phrase available to generate a longtext version from.
Ah, Phabricator... it was accepted when landed, you silly goose.