Page MenuHomeWildfire Games

Use armor instead of armour in some strings
ClosedPublic

Authored by fatherbushido on Apr 15 2017, 10:05 AM.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

fatherbushido created this revision.Apr 15 2017, 10:05 AM

Hm, the templates use "Armour", do we really want to change that?

In D335#13119, @wraitii wrote:

Hm, the templates use "Armour", do we really want to change that?

It was 'decided' to use US instead of UK for all strings. It's a really important thing :p
Indeed, in the code we still use Armour (and I guess it's ok to keep it like that).

wraitii accepted this revision.Apr 15 2017, 10:27 AM

Ok never mind then.

This revision is now accepted and ready to land.Apr 15 2017, 10:27 AM
Vulcan added a subscriber: Vulcan.Apr 15 2017, 10:50 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/768/ for more details.

elexis added a subscriber: elexis.Apr 15 2017, 5:06 PM

Thanks for finally addressing those string bugs. That AE / BE difference is annoying. The patch is correct and complete.

Notice the decision to use AE is visible in the options, the default language is "English (United States)" (en_US) and we also have an "English (United Kingdom)" (en_GB) option, which must be a translation thereof.
Afaik we use american english in the code too, i.e. z instead of s in a number of words and IMO it would be great to also rename the Armour component to Armor for consistency across the board and also to avoid people in the future thinking about introducing Armour strings. (Shouldn't be in the same diff anyway to keep this one more readable)

domdomegg accepted this revision.Apr 16 2017, 12:01 AM
This revision was automatically updated to reflect the committed changes.