Page MenuHomeWildfire Games

Corrected Mauryans into Mauryas
Needs ReviewPublic

Authored by Nescio on Feb 27 2018, 3:52 PM.

Details

Reviewers
Itms
Summary

Maurya is the name of the dynasty and its founder. The plural is Mauryas. Mauryan is the adjective. Mauryans is not a proper word.
For comparison: Ptolemy, Ptolemies, Ptolemaic, but not Ptolemaics.

Also corrected a single instance of “Seleukus I” into “Seleucus I” for consistency.
Update: and included Kush in identity list.

Test Plan

Ought to be unproblematic.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
master
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 5876
Build 9824: Vulcan BuildJenkins
Build 9823: arc lint + arc unit

Event Timeline

Nescio created this revision.Feb 27 2018, 3:52 PM
Vulcan added a subscriber: Vulcan.Feb 27 2018, 3:57 PM

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

Link to build: https://jenkins.wildfiregames.com/job/differential/110/display/redirect

Itms added a reviewer: Itms.Feb 27 2018, 4:48 PM
smiley added a subscriber: smiley.Feb 27 2018, 4:54 PM

There are some other strings using "Mauryans" in the following files.

simulation/data/technologies/mauryans/wooden_walls.json
gui/text/tips/war_elephants.txt

and the mauryan demo map i guess.

Nescio updated this revision to Diff 5963.Feb 27 2018, 5:34 PM

Updated.

Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Feb 27 2018, 5:34 PM
Nescio updated this revision to Diff 5964.Feb 27 2018, 5:47 PM
Nescio edited the summary of this revision. (Show Details)

Updated again (also included kush in Identity list).

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/differential/111/display/redirect

Nescio updated this revision to Diff 5965.Feb 27 2018, 6:36 PM

Updated again (hopefully no build error this time).

Stan added a subscriber: Stan.Feb 27 2018, 6:50 PM

Changes look good from a quick look. Not sure about the translators though.
As for mauryas vs mauryans I wasn't convinced until I saw this.
http://m.oxfordscholarship.com/mobile/view/10.1093/acprof:oso/9780198077244.001.0001/acprof-9780198077244

Angen added a subscriber: Angen.Feb 27 2018, 7:47 PM

@ping Itms
We have maybe some name problems? File cannot be find even exists.

my arc output - even Jenkins

can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml
|===================================================================
|--- binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml
|+++ binaries/data/mods/public/maps/scenarios/Sandbox - Mauryans.xml

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/differential/113/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/differential/114/display/redirect

Angen added a comment.Feb 27 2018, 8:36 PM

Sign '-' in file names such as Sandbox - "something" is coded as minus, renaming introduced in rP12752.
But arcanist is coding it as dash, so file cannot be found.

It seems to be a normal hyphen though, not a minus, en-dash, em-dash, or other similar sign. I guess the problem might actually be the space in the map file name. I vaguely recall having problems with that before, which is why I proposed to rename map files in D1042.

Nescio updated this revision to Diff 5966.Feb 27 2018, 9:04 PM

Update, this time without problematic map file.

Itms added a subscriber: mimo.Feb 27 2018, 9:06 PM
In D1342#54982, @Nescio wrote:

It seems to be a normal hyphen though, not a minus, en-dash, em-dash, or other similar sign. I guess the problem might actually be the space in the map file name. I vaguely recall having problems with that before, which is why I proposed to rename map files in D1042.

I think we also had an issue with this just before the release of A22, and @mimo fixed it in a tutorial map. Maybe he would have input on D1042.

Angen added a comment.Feb 27 2018, 9:07 PM

Do you upload them manually or do you use arcanist?

Do you upload them manually or do you use arcanist?

Command line arcanist. Is there also a manual option then?

Angen added a comment.Feb 27 2018, 9:24 PM

well, that strange, since arcanist creates the patch, it should be able aplly it without errors with file names.
yes, there is: https://trac.wildfiregames.com/wiki/Phabricator#Manuallyuploadingapatch but I never used that

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

Linter detected issues:
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (space-before-function-paren):
|    | Unexpected space before function parentheses.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/simulation/components/Identity.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/simulation/components/Identity.js
|  97|  97| 	this.visibleClassesList = GetVisibleIdentityClasses(this.template);
|  98|  98| };
|  99|  99| 
| 100|    |-Identity.prototype.Deserialize = function ()
|    | 100|+Identity.prototype.Deserialize = function()
| 101| 101| {
| 102| 102| 	this.Init();
| 103| 103| };

Link to build: https://jenkins.wildfiregames.com/job/differential/115/display/redirect

I suppose you should go all the way and rename any "mauryans" folders too.

Itms added a comment.Apr 10 2018, 4:23 PM

I was thinking I could commit this but I'd like to rename folders at the same time and it could mess up the translations. Just before the release is not a good time :(

I was thinking I could commit this but I'd like to rename folders at the same time and it could mess up the translations. Just before the release is not a good time :(

A23 has been "just around the corner" for months. If is to be released in a couple of days, then yes, it would be better to wait; but if A23 won't be released in the next few weeks, you might as well correct this name now.

Itms added a comment.Apr 14 2018, 3:43 PM
In D1342#59127, @Nescio wrote:

A23 has been "just around the corner" for months. If is to be released in a couple of days, then yes, it would be better to wait; but if A23 won't be released in the next few weeks, you might as well correct this name now.

I understand the frustration but adding new things is the reason we have been delaying the release for so much time. For instance at the moment I am working on something that blocks the release. If I didn't have it I could land this, but if it was the case we would be releasing already. We need to make choices at each release, that is never easy 🙁

smiley added inline comments.Apr 14 2018, 4:37 PM
binaries/data/mods/public/gui/text/tips/war_elephants.txt
8

That Mauryans is an oversight?

I understand the frustration but adding new things is the reason we have been delaying the release for so much time. For instance at the moment I am working on something that blocks the release. If I didn't have it I could land this, but if it was the case we would be releasing already. We need to make choices at each release, that is never easy 🙁

Appearing to be frustrated was certainly not my intention, I apologize. I'm fully aware you're all volunteers who're devoting a lot of your spare time to this game. Although having more than one release per year would be nice, it shouldn't be rushed; one of the great things of this project is that nothing is released prematurely. And yes, it's perfectly understandable to make a cut-off somewhere.

I don't really care if and when this patch will be implemented. It could have been done six weeks ago, or might be six months from now. Typo fixes, file renaming, and other minor changes and straightforward patches like this are not too time-consuming to implement; they are not urgent either. However, postponement often increases rather than decreases the backlog and workload.

Nescio updated this revision to Diff 6403.Apr 15 2018, 9:29 PM

Update: renamed a few more miscellaneous files

Directories are not yet renamed, to be done later:
art/actors/props/structures/mauryans → mauryas
art/actors/structures/mauryans → mauryas
art/actors/units/mauryans → mauryas
simulation/data/technologies/mauryans → mauryas

Owners added a subscriber: Restricted Owners Package.Apr 15 2018, 9:29 PM

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

Linter detected issues:
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (space-before-function-paren):
|    | Unexpected space before function parentheses.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/simulation/components/Identity.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/simulation/components/Identity.js
|  97|  97| 	this.visibleClassesList = GetVisibleIdentityClasses(this.template);
|  98|  98| };
|  99|  99| 
| 100|    |-Identity.prototype.Deserialize = function ()
|    | 100|+Identity.prototype.Deserialize = function()
| 101| 101| {
| 102| 102| 	this.Init();
| 103| 103| };

Link to build: https://jenkins.wildfiregames.com/job/differential/389/display/redirect