Page MenuHomeWildfire Games

legionnaire → legionary
Needs ReviewPublic

Authored by Nescio on Feb 16 2019, 11:55 AM.

Details

Summary

Because legionary is English, legionnaire is French, legionarius is Latin.
This patch renames the following files:

  • art/actors/props/shields/rome_scutum_legionnaire.xml → rome_scutum_legionary.xml
  • simulation/templates/units/rome_centurio_imperial.xml → rome_champion_infantry_swordsman_4.xml
  • simulation/templates/units/rome_legionnaire_imperial.xml → rome_champion_infantry_swordsman_3.xml
  • simulation/templates/units/rome_legionnaire_marian.xml → rome_champion_infantry_swordsman_2.xml

It also updates the maps that use legionary units:
maps/scenarios/Cinema_Demo.xml
maps/scenarios/Miletus.xml
maps/scenarios/road demo.xml
maps/scenarios/Sandbox - Britons.xml
maps/scenarios/Sandbox - Carthaginians.xml
maps/scenarios/Sandbox - Gauls.xml
maps/scenarios/Sandbox - Romans.xml
maps/scenarios/Tropical Island.xml
maps/scenarios/We are Legion.xml
maps/skirmishes/Egypt (3v3).xml

Test Plan

Check if everything still works and nothing is overlooked.

Diff Detail

Repository
rP 0 A.D. Public Repository
Branch
/ps/trunk
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 7422
Build 12078: Vulcan BuildJenkins
Build 12077: arc lint + arc unit

Event Timeline

Nescio created this revision.Feb 16 2019, 11:55 AM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Feb 16 2019, 11:55 AM
Vulcan added a subscriber: Vulcan.Feb 16 2019, 11:59 AM

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

Link to build: https://jenkins.wildfiregames.com/job/differential/1059/

Nescio updated this revision to Diff 7489.Feb 16 2019, 12:00 PM
Nescio edited the summary of this revision. (Show Details)

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

Link to build: https://jenkins.wildfiregames.com/job/differential/1060/

aeonios added a subscriber: aeonios.EditedFeb 16 2019, 4:33 PM

"legionary" isn't a word that anyone uses. English borrows the french "legionnaire" (breton influence), although the original latin "legionarius" would also be acceptable for a roman unit and might even be preferred in this context.

EDIT: Strike that last bit, since we use the native name as a subtext. Legionnaire is still the most common usage in english.

“Legionnaire” is common in English when referring to a member of e.g. the French foreign legion, however, “legionary” is the English word used specifically for the Roman soldier:

legionary *noun* (pl. legionaries) a soldier in a Roman legion.
*adjective* of an ancient Roman legion.

It's a proper English word and refers to exactly what we have in game, therefore let's use it.

In D1780#72137, @Nescio wrote:

“Legionnaire” is common in English when referring to a member of e.g. the French foreign legion, however, “legionary” is the English word used specifically for the Roman soldier:

legionary *noun* (pl. legionaries) a soldier in a Roman legion.
*adjective* of an ancient Roman legion.

It's a proper English word and refers to exactly what we have in game, therefore let's use it.

I have never once heard the word used, as a native english speaker. Even when referring to the romans it's always "legionnaire". This is probably because no english speaking country has ever had a military unit called a "legion", and it's more natural to borrow from french (which has had such a unit) and english frequently borrows from french anyway.

Here's page from The Cambridge History of Greek and Roman Warfare, Volume I: Greece, the Hellenistic World and the Rise of Rome (2007), with legionary/-ies highlighted:

The fact that one is used doesn't mean that the other is not correct :D
I don't know if those electronic dictionnaries are ok but:
It's explictly in https://en.oxforddictionaries.com/definition/legionnaire
It's in the examples in https://www.merriam-webster.com/dictionary/legionnaire#examples
Only the general meaning without explicit mention to antiquity is in https://www.collinsdictionary.com/dictionary/english/legionnaire
It's not in https://dictionary.cambridge.org/spellcheck/english/?q=legionnaire
(I am not an expert in english - euphemism - not in the position to discuss if this is good or not! Just take that as discussing about things ;-))

Nescio added a comment.EditedFeb 18 2019, 9:50 AM

Also:
https://dictionary.cambridge.org/dictionary/english/legionary
https://en.oxforddictionaries.com/definition/legionary

What matters here is not only whether a word exist; one can translate legionarius with warrior, soldier, regular, or private, all of which would be technically correct; but they're also less specific. The word that should be used, however, is the one that's the closest English equivalent to the original word; in this case legionary is the most appropiate and correct, because it means exactly legionarius.
If one looks at articles discussing the Roman army, one will see that legionary, not legionnaire, is typically used.

[EDIT]: although not a reliable source, Wikipedia has an https://en.wikipedia.org/wiki/Legionary article while legionnaire simply redirects to https://en.wikipedia.org/wiki/French_Foreign_Legion

And those two ones (are those good sources?) doesn't restrict legionary to romans:
https://www.collinsdictionary.com/dictionary/english/legionary
https://www.merriam-webster.com/dictionary/legionary

When looking at online translations of De Bello Gallico, I didn't found "legionnaire"
In http://classics.mit.edu/Caesar/gallic.mb.txt, we found almost "legionnary cohorts" and "legionnary soldiers"
In http://www.gutenberg.org/cache/epub/10657/pg10657.html, we found also "legionnaries" and "legionnary troops"

In "legionnary soldiers" is it used as an adjective?

Yes, E legionary and L legionarius can be used both as a noun and as an adjective.

Stan added a reviewer: Itms.Mar 17 2019, 5:55 PM

I agree with the word change. However, since this change affects filenames beyond the specific word change suggested, I’ll let people more familiar with unit filename conventions give their approval.

Nescio updated this revision to Diff 7629.Mar 30 2019, 11:57 AM
Nescio edited the summary of this revision. (Show Details)
Nescio edited the test plan for this revision. (Show Details)
Nescio added a subscriber: Itms.

Updated, now with map files (let's see what Vulcan does).

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

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

Stan added a subscriber: wowgetoffyourcellphone.EditedMay 9 2019, 5:40 PM

This will likely break @wowgetoffyourcellphone's mod.

If Gallaecio agrees about the name change it's mostly good to me. The only thing I still wonder is whether it should be _01 or _1 It's never been done consistently...

According to the Art Design Document https://trac.wildfiregames.com/wiki/ArtDesignDocument

If using numbers always use two digits. Example: 01, not 1

One could run chekrefs.pl with the --check-maps-xml to make sure nothing was overlooked.

Also the new template name breaks consistency with the rest of the templates. Pretty sure they are all called champions. I don't know if the AI uses that.

Stan requested changes to this revision.May 9 2019, 5:43 PM
This revision now requires changes to proceed.May 9 2019, 5:43 PM
Angen added a subscriber: Angen.May 9 2019, 6:03 PM
In D1780#77386, @Stan wrote:

Also the new template name breaks consistency with the rest of the templates. Pretty sure they are all called champions. I don't know if the AI uses that.

Petra is using for units mostly classes. Only these three template names for units are used:

{civ}_ship_merchant
{civ}_support_trader
{civ}_support_healer_b
Nescio added a comment.EditedMay 9 2019, 6:26 PM

On the actor file names, they used to be called *_c2; moved to *_c_2. Also, art/actors/units/carthaginians has infantry_swordsman_2_b.xml. But if it ought to be *_02 then it can be changed.
As for the template file names, I opted for numbers because they inherit from each other.
So perhaps the templates should become the following?

rome_champion_infantry_swordsman_02.xml
rome_champion_infantry_swordsman_03.xml
rome_champion_infantry_swordsman_04.xml

Other suggestions?

Stan added a comment.May 9 2019, 7:15 PM
In D1780#77398, @Nescio wrote:

On the actor file names, they used to be called *_c2; moved to *_c_2. Also, art/actors/units/carthaginians has infantry_swordsman_2_b.xml. But if it ought to be *_02 then it can be changed.

Yeah I messed up during the big renaming phase. Which is why I really should update that document...

As for the template file names, I opted for numbers because they inherit from each other.
So perhaps the templates should become the following?

rome_champion_infantry_swordsman_02.xml
rome_champion_infantry_swordsman_03.xml
rome_champion_infantry_swordsman_04.xml

Yeah for consistency it might be better. It should be added to the Design Document too.

Nescio updated this revision to Diff 7956.May 10 2019, 6:39 PM
Nescio edited the summary of this revision. (Show Details)

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

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

Stan added a comment.May 10 2019, 6:42 PM

Needs rebasing :)

Nescio updated this revision to Diff 7957.May 10 2019, 6:54 PM

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

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

Nescio updated this revision to Diff 7958.May 10 2019, 7:05 PM

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

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

Stan added a comment.May 10 2019, 7:09 PM

The patch fails to apply on binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml

Does it? What's wrong with it? I don't understand Vulcan.

Angen added a comment.EditedMay 10 2019, 7:13 PM
In D1780#77516, @Stan wrote:

The patch fails to apply on binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml

cannot agree, it fails on maps with spaces in names :)

Angen added a comment.EditedMay 10 2019, 7:17 PM
In D1780#73652, @Vulcan wrote:

Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/differential/1138/display/redirect

@Itms How is this build green when it actually failed ?

Those map file names remain annoying. D1042