Page MenuHomeWildfire Games

rally-point → rally point
ClosedPublic

Authored by Gallaecio on May 26 2018, 9:09 PM.

Details

Summary

pilino1234 reported a bad capitalization on Transifex (Rally-Points → Rally-points).

I took the chance to remove the unnecessary hyphen between the words.

Test Plan

Affects only user-visible strings.

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

Gallaecio created this revision.May 26 2018, 9:09 PM
Vulcan added a subscriber: Vulcan.May 26 2018, 10:16 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 (curly):
|    | Unnecessary { after 'if' condition.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js
| 430| 430| 		"OnPlayerCommand": function(msg)
| 431| 431| 		{
| 432| 432| 			if (msg.cmd.type == "gather" && msg.cmd.target)
| 433|    |-			{
|    | 433|+			
| 434| 434| 				if (TriggerHelper.GetResourceType(msg.cmd.target).generic == "stone")
| 435| 435| 					this.stone = true;
| 436| 436| 				else if (TriggerHelper.GetResourceType(msg.cmd.target).generic == "metal")
| 437| 437| 					this.metal = true;
| 438|    |-			}
|    | 438|+			
| 439| 439| 			if (this.IsDone())
| 440| 440| 				this.NextGoal();
| 441| 441| 		},

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

bb added a subscriber: bb.Jun 18 2018, 4:42 PM

binaries/data/mods/public/gui/session/unit_actions.js has one too

In D1527#63495, @bb wrote:

binaries/data/mods/public/gui/session/unit_actions.js has one too

I believe “Focus on Rally Point” is correct, as the whole sentence is in title case, it being the name of an action.

bb accepted this revision.Jul 26 2018, 9:41 PM

If that is so => accept

This revision is now accepted and ready to land.Jul 26 2018, 9:41 PM
Stan requested changes to this revision.Dec 29 2018, 10:26 PM
Stan added a subscriber: Stan.

Needs a rebase.

This revision now requires changes to proceed.Dec 29 2018, 10:26 PM
Gallaecio updated this revision to Diff 7580.Mar 17 2019, 5:51 PM

Rebased against the latest commit from trunk.

Stan accepted this revision.Mar 17 2019, 5:54 PM
This revision is now accepted and ready to land.Mar 17 2019, 5:54 PM

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

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (curly):
|    | Unnecessary { after 'if' condition.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js
| 430| 430| 		"OnPlayerCommand": function(msg)
| 431| 431| 		{
| 432| 432| 			if (msg.cmd.type == "gather" && msg.cmd.target)
| 433|    |-			{
|    | 433|+			
| 434| 434| 				if (TriggerHelper.GetResourceType(msg.cmd.target).generic == "stone")
| 435| 435| 					this.stone = true;
| 436| 436| 				else if (TriggerHelper.GetResourceType(msg.cmd.target).generic == "metal")
| 437| 437| 					this.metal = true;
| 438|    |-			}
|    | 438|+			
| 439| 439| 			if (this.IsDone())
| 440| 440| 				this.NextGoal();
| 441| 441| 		},
Executing section cli...

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

Nescio accepted this revision.Mar 17 2019, 5:56 PM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Mar 17 2019, 6:02 PM