Page MenuHomeWildfire Games

Corrected Mauryans into Mauryas
ClosedPublic

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

Details

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.
Or Gupta, Guptas, Guptan.

Related: D1711, D1712, and D1713.

Test Plan

Ought to be unproblematic.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
/ps/trunk
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 5251
Build 8951: Vulcan BuildJenkins
Build 8950: 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

Itms requested changes to this revision.Dec 27 2018, 7:19 PM

Hi Nescio! I can finally include this patch. It needs to be split however. Can you do the following for me?

  • Create a new revision for the War Elephants tip change.
  • Create a new revision for the Seleucus orthography change.
  • Create a new revision for the renaming of the Kushite emblem.

I will accept and commit those right away. Put me as reviewer so I don't miss anything.

  • Update this revision so that it only contains the Mauryans->Maurya fix, but including renaming folders.

I will double-check this one and tell you if I can see an issue, else I'll accept and commit it.

  • Please wait for the commit of this revision, before creating a last one fixing the emblem of the Mauryan outpost. You can put either me or Stan as reviewer. We'll commit it right away.

Thank you for the work on this, and for your patience! 🙏

This revision now requires changes to proceed.Dec 27 2018, 7:19 PM

(Re: comments in Feb, It's the space. You need to escape it.)

Currently I'm trying to move the banner rename into a separate patch. However, after I run svn mv garrison_flag_mauryans.xml garrison_flag_maur.xml in art/actors/props/special/common/ I get the following error when I run arc diff --preview in 0ad/:

Linting...
 Exception 
Command failed with error #1!
COMMAND
svn propget 'svn:mime-type' '/home/b/Projects/0ad/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_maur.xml'@

STDOUT
(empty)

STDERR
svn: warning: W200017: Property 'svn:mime-type' not found on '/home/b/Projects/0ad/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_maur.xml@'
svn: E200000: A problem occurred; see other errors for details

(Run with `--trace` for a full exception trace.)

And when I run arc diff --preview --trace:

 ARGV  '/home/b/Projects/arcanist/bin/../scripts/arcanist.php' 'diff' '--preview' '--trace'
 LOAD  Loaded "phutil" from "/home/b/Projects/libphutil/src".
 LOAD  Loaded "arcanist" from "/home/b/Projects/arcanist/src".
Config: Reading user configuration file "/home/b/.arcrc"...
Config: Did not find system configuration at "/etc/arcconfig".
Working Copy: Reading .arcconfig from "/home/b/Projects/0ad/.arcconfig".
Working Copy: Path "/home/b/Projects/0ad" is part of `svn` working copy "/home/b/Projects/0ad".
Working Copy: Project root is at "/home/b/Projects/0ad".
Config: Did not find local configuration at "/home/b/Projects/0ad/.svn/arc/config".
>>> [0] (+0) <http> https://code.wildfiregames.com/api/user.whoami
<<< [0] (+423) <http> 423,506 us
>>> [1] (+425) <exec> $ svn --xml status
<<< [1] (+624) <exec> 199,016 us
>>> [2] (+624) <event> diff.didCollectChanges <listeners = 0>
<<< [2] (+624) <event> 61 us
>>> [3] (+624) <event> diff.didBuildMessage <listeners = 0>
<<< [3] (+624) <event> 57 us
Linting...
>>> [4] (+626) <exec> $ svn info '/home/b/Projects/0ad/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_maur.xml'@
<<< [4] (+636) <exec> 10,663 us
>>> [5] (+636) <exec> $ svn propget 'svn:mime-type' '/home/b/Projects/0ad/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_maur.xml'@
<<< [5] (+649) <exec> 12,749 us

[2018-12-28 14:42:11] EXCEPTION: (CommandException) Command failed with error #1!
COMMAND
svn propget 'svn:mime-type' '/home/b/Projects/0ad/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_maur.xml'@

STDOUT
(empty)

STDERR
svn: warning: W200017: Property 'svn:mime-type' not found on '/home/b/Projects/0ad/binaries/data/mods/public/art/actors/props/special/common/garrison_flag_maur.xml@'
svn: E200000: A problem occurred; see other errors for details
 at [<phutil>/src/future/exec/ExecFuture.php:380]
arcanist(head=master, ref.master=25c2381959ac), phutil(head=master, ref.master=cad1985726c9)
  #0 ExecFuture::resolvex() called at [<phutil>/src/future/exec/execx.php:17]
  #1 execx(string, string, string) called at [<arcanist>/src/repository/api/ArcanistSubversionAPI.php:204]
  #2 ArcanistSubversionAPI::getSVNProperty(string, string) called at [<arcanist>/src/repository/api/ArcanistSubversionAPI.php:458]
  #3 ArcanistSubversionAPI::buildSyntheticAdditionDiff(string, string, string) called at [<arcanist>/src/repository/api/ArcanistSubversionAPI.php:393]
  #4 ArcanistSubversionAPI::getRawDiffText(string) called at [<arcanist>/src/workflow/ArcanistWorkflow.php:1263]
  #5 ArcanistWorkflow::getChange(string) called at [<arcanist>/src/workflow/ArcanistWorkflow.php:1241]
  #6 ArcanistWorkflow::getChangedLines(string, string) called at [<arcanist>/src/workflow/ArcanistLintWorkflow.php:288]
  #7 ArcanistLintWorkflow::run() called at [<arcanist>/src/workflow/ArcanistDiffWorkflow.php:1250]
  #8 ArcanistDiffWorkflow::runLint() called at [<arcanist>/src/workflow/ArcanistDiffWorkflow.php:1211]
  #9 ArcanistDiffWorkflow::runLintUnit() called at [<arcanist>/src/workflow/ArcanistDiffWorkflow.php:483]
  #10 ArcanistDiffWorkflow::run() called at [<arcanist>/scripts/arcanist.php:394]

I don't recall having this problem before. What am I doing wrong?

Itms added a comment.Dec 28 2018, 3:51 PM

You can patch your arc as in the link Stan provided, or you can set a property that I won't commit:

svn propset svn:mime-type text/plain garrison_flag_maur.xml

Whatever is easier for you.

Stan added a comment.Dec 28 2018, 3:54 PM

Would it work if he set EOL to native ? or does it have to be a mime type ? The former is always welcome.

svn propset svn:mime-type text/plain garrison_flag_maur.xml

Thanks, that worked: D1712

Mauryans is not a proper word.

I saw that everywhere on internet.
Like Martians are the inhabitant of Mars.

Nescio updated this revision to Diff 7102.Dec 28 2018, 5:46 PM

Updated, after splitting off D1708, D1709, D1710, D1711, D1712, and D1713.

Mauryans is not a proper word.

I saw that everywhere on internet.
Like Martians are the inhabitant of Mars.

It is not surprising some people on the Internet write "Mauryans", it looks good, similar to e.g. Egyptians, Indians, or Syrians. However, Maurya is not a country, it's the name of a dynasty, and “Mauryans” is a hypercorrection.

If you search for publications (e.g. in a university library catalogue), you won't find anyone writing “Mauryans”; you will find e.g.:

  • The Transmission, Patronage, and Prestige of Brahmanical Piety from the Mauryas to the Guptas
  • ETHNOLOGY AND ETHNOGRAPHY: A Comprehensive History of India: The Mauryas and Satavahanas (325 B.C.—A.D. 300). K. A. Nilakanta Sastri
  • Aśoka and the decline of the Mauryas
  • The Mauryas revisited

Also, when in doubt, you can always consult a dictionary. If you do, you'll find that Maurya is the name of a dynasty, and Mauryan is the derived adjective. However, there is no noun Mauryan.

In contrast, “Martians” is correct; “Martian” can be both an adjective and a noun; you can find it in a dictionary, e.g.:

Martian *adjective* relating to the planet Mars or its supposed inhabitants.
*noun* a hypothetical or fictional inhabitant of Mars. - origin late Middle English (in the sense ‘subject to Mars' influence’ and ‘martial’): from Latin *Mars, Mart-* (see Mars) + ian.

Nescio edited the summary of this revision. (Show Details)Dec 28 2018, 6:31 PM

For the dictionnary advice, you should give that to the guys who write that on the internet, not to me.
And I also read books like "History of Early India From the Origins to AD 1300" and indeed in chapter 6, we can read "The Emergence of Empire: Mauryan India" followed by "The Mauryas and their World".

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/845/

Apparently I misunderstood your comment then :)

Nescio edited the summary of this revision. (Show Details)Dec 28 2018, 7:03 PM
Nescio edited the summary of this revision. (Show Details)Dec 28 2018, 7:20 PM
Itms accepted this revision.Jan 2 2019, 3:55 PM

I used this and D1713 to perform the change, which I'm committing now.

Thanks a lot for the patch, and for carrying on despite the delayed review 👍

This revision is now accepted and ready to land.Jan 2 2019, 3:55 PM
This revision was automatically updated to reflect the committed changes.

Thanks, I'm glad it's finally corrected. That's one glaring error less in the game.