blacksmith → forge
ClosedPublic
Actions

Authored by Nescio on Aug 24 2020, 3:22 PM.

Details

Reviewers

Silier
genava55
Freagarach

Commits

rP23998: Rename blacksmith -> forge.

Summary

This patch is similar to e.g. D2756/rP23935.
A blacksmith is a person, not a building. The correct name for a blacksmith's workshop is a forge or a smithy. This misnomer is probably ‘inherited’ from Age of Empires II; that another game is unable to use proper English is no justification for 0 A.D. to do the same.
This patch therefore:

renames the *_blacksmith.xml templates to *_forge.xml;
corrects all relevant lines in the simulation/ files;
updates all occurrences in the maps/ files accordingly.

To keep this patch reviewable, art and audio files are not touched here; that could be done later in a separate patch.

Test Plan

Check for correctness and completeness.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

Lint OK

Severity	Location	Code	Message
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:222	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:223	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:224	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:225	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:226	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:234	ESLintBear (no-multi-spaces)	ESLintBear (no-multi-spaces)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:243	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:244	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:245	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:246	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:247	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:435	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:436	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:437	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:438	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:439	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:440	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:479	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:480	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:482	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:484	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/random/jebel_barkal.js:485	ESLintBear (indent)	ESLintBear (indent)
Warning	binaries/data/mods/public/maps/tutorials/introductory_tutorial.js:379	ESLintBear (no-trailing-spaces)	ESLintBear (no-trailing-spaces)
Warning	binaries/data/mods/public/maps/tutorials/introductory_tutorial.js:383	ESLintBear (no-trailing-spaces)	ESLintBear (no-trailing-spaces)
Warning	binaries/data/mods/public/maps/tutorials/introductory_tutorial.js:392	ESLintBear (no-trailing-spaces)	ESLintBear (no-trailing-spaces)

Unit

No Unit Test Coverage

Build Status

Buildable 12975
Build 25563: Vulcan Build	Jenkins
Build 25562: Vulcan Build (macOS)	Jenkins
Build 25561: Vulcan Build (Windows)	Jenkins
Build 25560: arc lint + arc unit

Event Timeline

Nescio created this revision.Aug 24 2020, 3:22 PM

Owners added subscribers: Restricted Owners Package, Restricted Owners Package, Restricted Owners Package.Aug 24 2020, 3:22 PM

Harbormaster completed remote builds in B12974: Diff 13279.Aug 24 2020, 3:28 PM

Nescio requested review of this revision.Aug 24 2020, 3:28 PM

Herald added a reviewer: Silier. · View Herald TranscriptAug 24 2020, 3:28 PM

I approve totally this change. I was wondering the same but I wasn't confident enough about my English to say so.

This revision is now accepted and ready to land.Aug 24 2020, 3:44 PM

Grep says tutorial needs an update ^^

This revision now requires changes to proceed.Aug 24 2020, 3:57 PM

Can you specify why you chose forge instead of smithy?

include forgotten tutorial, per @Freagarach

Harbormaster completed remote builds in B12975: Diff 13280.Aug 24 2020, 4:13 PM

Correct.
Complete.
Nice change for the better.

This revision is now accepted and ready to land.Aug 24 2020, 4:17 PM

Can you specify why you chose forge instead of smithy?

That's a fascinating question! Both terms are basically equivalents. The reason I opted for “forge” instead of “smithy” is because blacksmith and smithy imply working with iron, whereas smith and forge can apply to any metal. While 0 A.D. is situated in the Iron Age, bronze (i.e. copper + tin) was still very important, hence why I preferred the more generic term “forge”.
Were 0 A.D. situated in the Middle Ages, I might have had proposed “smithy” instead. (The word “forge” is etymologically derived from Latin fabrica, “smithy” from Old Norse smithja.)

Thanks for the clarification! To me this change seems good (although I like "smithy" more, for no specific reason).
I'll ping @Gallaecio in case they have some opinion on the matter and have some time to express it.
(Else I'll commit this within a few days.)

Sounds good to me.

And I’m basically off 0 A.D. contributions again, so don’t wait on my opinion :)