Page MenuHomeWildfire Games

Remove quotes made unnecessary by capitalization
ClosedPublic

Authored by Gallaecio on May 27 2018, 7:54 PM.

Details

Reviewers
bb
Stan
Nescio
Summary

Made obvious by a report on Transifex by kingu, asking to add the quotes to other, similar terms in related strings. I opted for removing the quotes instead from those capitalized terms using them, as the capitalization already allows you to tell these items apart from the rest of their sentence.

Test Plan

It only affects user-visible strings.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Lint Skipped
Unit
Unit Tests Skipped
Build Status
Buildable 7005
Build 11458: Vulcan BuildJenkins

Event Timeline

Gallaecio created this revision.May 27 2018, 7:54 PM
Vulcan added a subscriber: Vulcan.May 27 2018, 7:56 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/587/display/redirect

bb added a subscriber: bb.Jun 25 2018, 1:28 PM

Checking for completeness is equal to going through all strings manually, so only checked for the Town Phase, I and II cases:

/binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js: has a 'II' case

Gallaecio updated this revision to Diff 6823.Jul 26 2018, 7:29 PM

Add an additional change reported by @bb.

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

complete as in all quotes around I and II are gone => accept

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

Needs to be rebased

This revision now requires changes to proceed.Dec 29 2018, 10:27 PM
Gallaecio updated this revision to Diff 7579.Sun, Mar 17, 5:49 PM

Rebased against the latest commit from trunk.

Nescio accepted this revision.Sun, Mar 17, 5:52 PM
Stan accepted this revision.Sun, Mar 17, 5:53 PM
This revision is now accepted and ready to land.Sun, Mar 17, 5:53 PM

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

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js
| 381| 381| 	let position = Engine.QueryInterface(target, IID_Position).GetPosition2D();
| 382| 382| 
| 383| 383| 	this.attackers = cmpRangeManager.GetEntitiesByPlayer(this.enemyID).filter(e =>
| 384|    |-			Engine.QueryInterface(e, IID_Identity) && Engine.QueryInterface(e, IID_UnitAI) &&
|    | 384|+		Engine.QueryInterface(e, IID_Identity) && Engine.QueryInterface(e, IID_UnitAI) &&
| 385| 385| 			Engine.QueryInterface(e, IID_Identity).HasClass("CitizenSoldier")
| 386| 386| 		);
| 387| 387| 	this.attackers.forEach(e => { Engine.QueryInterface(e, IID_UnitAI).WalkAndFight(position.x, position.y, { "attack": ["Unit"] }, false); });
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js
| 383| 383| 	this.attackers = cmpRangeManager.GetEntitiesByPlayer(this.enemyID).filter(e =>
| 384| 384| 			Engine.QueryInterface(e, IID_Identity) && Engine.QueryInterface(e, IID_UnitAI) &&
| 385| 385| 			Engine.QueryInterface(e, IID_Identity).HasClass("CitizenSoldier")
| 386|    |-		);
|    | 386|+	);
| 387| 387| 	this.attackers.forEach(e => { Engine.QueryInterface(e, IID_UnitAI).WalkAndFight(position.x, position.y, { "attack": ["Unit"] }, false); });
| 388| 388| };
| 389| 389| 
|    | [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/1114/display/redirect