From 1e362276e24e06dd256670a2781beeb322ff83fc Mon Sep 17 00:00:00 2001 From: zepumph Date: Mon, 11 Nov 2019 13:27:10 -0900 Subject: [PATCH] lowercase "force vector" in min/max mass alert, https://github.com/phetsims/gravity-force-lab/issues/155 --- js/ISLCA11yStrings.js | 3 +++ js/view/describers/ForceDescriber.js | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/js/ISLCA11yStrings.js b/js/ISLCA11yStrings.js index b7180b0..49863f4 100644 --- a/js/ISLCA11yStrings.js +++ b/js/ISLCA11yStrings.js @@ -73,6 +73,9 @@ define( require => { value: '{{forceVectorSize}}, and points directly at {{otherObjectLabel}}.' }, forceVector: { + value: 'force vector' + }, + forceVectorCapitalized: { value: 'Force vector' }, objectLabelPositionPattern: { diff --git a/js/view/describers/ForceDescriber.js b/js/view/describers/ForceDescriber.js index 30ece53..12513bb 100644 --- a/js/view/describers/ForceDescriber.js +++ b/js/view/describers/ForceDescriber.js @@ -35,6 +35,7 @@ define( require => { const forcesValueUnitsClausePatternString = ISLCA11yStrings.forcesValueUnitsClausePattern.value; const forceMagnitudeString = ISLCA11yStrings.forceMagnitude.value; const forceVectorString = ISLCA11yStrings.forceVector.value; + const forceVectorCapitalizedString = ISLCA11yStrings.forceVectorCapitalized.value; const valuesInUnitsPatternString = ISLCA11yStrings.valuesInUnitsPattern.value; const forcesInScientificNotationString = ISLCA11yStrings.forcesInScientificNotation.value; @@ -123,6 +124,7 @@ define( require => { vectorsString: vectorsString, vectorsCapitalizedString: vectorsCapitalizedString, forceVectorString: forceVectorString, + forceVectorCapitalizedString: forceVectorCapitalizedString, forceMagnitudeString: forceMagnitudeString }, options ); @@ -134,10 +136,12 @@ define( require => { this.forceValueToString = options.forceValueToString; this.convertForce = options.convertForce; - // @private {number} - // 1 -> growing, 0 -> no change, -1 -> shrinking - this.vectorChangeDirection = 0; - this.forceVectorsString = options.forceVectorsString; - this.vectorsCapitalizedString = options.vectorsCapitalizedString; + // @private + this.vectorChangeDirection = 0; // {number} - // 1 -> growing, 0 -> no change, -1 -> shrinking + this.forceVectorsString = options.forceVectorsString; // {string} + this.vectorsCapitalizedString = options.vectorsCapitalizedString; // {string} + this.forceVectorString = options.forceVectorString; // {string} + this.forceVectorCapitalizedString = options.forceVectorCapitalizedString; // {string} // @protected this.scientificNotationProperty = model.scientificNotationProperty; @@ -167,9 +171,6 @@ define( require => { this.forceVectorMagnitudeUnitsPatternString = StringUtils.fillIn( forceVectorMagnitudeUnitsPatternString, { forceMagnitude: options.forceMagnitudeString } ); - this.forceVectorSizePatternString = StringUtils.fillIn( forceVectorSizePatternString, { - forceVector: options.forceVectorString - } ); model.forceProperty.link( ( force, oldForce ) => { const forceDelta = force - oldForce; @@ -234,9 +235,10 @@ define( require => { * @public * @returns {string} */ - getForceVectorSize() { - return StringUtils.fillIn( this.forceVectorSizePatternString, { - size: this.getVectorSize() + getForceVectorSize( capitalized ) { + return StringUtils.fillIn( forceVectorSizePatternString, { + size: this.getVectorSize(), + forceVector: capitalized ? this.forceVectorCapitalizedString : this.forceVectorString } ); } @@ -250,7 +252,7 @@ define( require => { return StringUtils.fillIn( forceAndVectorPatternString, { thisObjectLabel: thisObjectLabel, otherObjectLabel: otherObjectLabel, - forceVectorSize: this.getForceVectorSize() + forceVectorSize: this.getForceVectorSize( true ) } ); }