Rename NumberSentenceAccordionBox to NumberPhraseAccordionBox and upd…

…ate accessibleName/HelpText, see: #78

js/NumberPairsStrings.ts

@@ -22,12 +22,14 @@ type StringsType = {
     'sumStringProperty': LocalizedStringProperty;
     'gameStringProperty': LocalizedStringProperty;
   };
-  'numberSentenceStringProperty': LocalizedStringProperty;
+  'numberPhraseStringProperty': LocalizedStringProperty;
+  'numberPhraseHelpTextStringProperty': LocalizedStringProperty;
   'numberBondStringProperty': LocalizedStringProperty;
+  'barModelStringProperty': LocalizedStringProperty;
   'equationStringProperty': LocalizedStringProperty;
-  'decompositionNumberSentencePatternStringProperty': LocalizedStringProperty;
+  'decompositionNumberPhrasePatternStringProperty': LocalizedStringProperty;
   'decompositionNumberPhraseSpeechPatternStringProperty': LocalizedStringProperty;
-  'sumNumberSentencePatternStringProperty': LocalizedStringProperty;
+  'sumNumberPhrasePatternStringProperty': LocalizedStringProperty;
   'sumNumberPhraseSpeechPatternStringProperty': LocalizedStringProperty;
   'aNumberStringProperty': LocalizedStringProperty;
   'someNumberStringProperty': LocalizedStringProperty;
@@ -38,24 +40,29 @@ type StringsType = {
   'totalStringProperty': LocalizedStringProperty;
   'automaticallyHearPhraseStringProperty': LocalizedStringProperty;
   'automaticallyHearPhraseDescriptionStringProperty': LocalizedStringProperty;
-  'hearNumberSentenceStringProperty': LocalizedStringProperty;
-  'organizeObjectsStringProperty': LocalizedStringProperty;
-  'organizeObjectsHelpTextStringProperty': LocalizedStringProperty;
+  'hearNumberPhraseStringProperty': LocalizedStringProperty;
+  'organizeObjectsPatternStringProperty': LocalizedStringProperty;
+  'organizeObjectsHelpTextPatternStringProperty': LocalizedStringProperty;
   'swapAddendsStringProperty': LocalizedStringProperty;
-  'makesAreaVisibleStringProperty': LocalizedStringProperty;
-  'firstAddendNoJumpStringProperty': LocalizedStringProperty;
-  'firstAddendJumpStringProperty': LocalizedStringProperty;
-  'sceneSelectionRadioButtonGroupStringProperty': LocalizedStringProperty;
+  'showOrHideAddendStringProperty': LocalizedStringProperty;
+  'showOrHideAddendsStringProperty': LocalizedStringProperty;
+  'totalNumberPatternStringProperty': LocalizedStringProperty;
+  'chooseTotalHelpTextStringProperty': LocalizedStringProperty;
   'applesStringProperty': LocalizedStringProperty;
   'soccerBallsStringProperty': LocalizedStringProperty;
   'butterfliesStringProperty': LocalizedStringProperty;
-  'oneCardsStringProperty': LocalizedStringProperty;
+  'onesStringProperty': LocalizedStringProperty;
   'kittensStringProperty': LocalizedStringProperty;
   'beadsStringProperty': LocalizedStringProperty;
+  'beadsOnAWireStringProperty': LocalizedStringProperty;
   'numberLineStringProperty': LocalizedStringProperty;
   'representationTypeStringProperty': LocalizedStringProperty;
+  'representationTypeHelpTextStringProperty': LocalizedStringProperty;
   'locationCountingObjectsStringProperty': LocalizedStringProperty;
   'numberLineSliderStringProperty': LocalizedStringProperty;
+  'countOnStringProperty': LocalizedStringProperty;
+  'countFromZeroStringProperty': LocalizedStringProperty;
+  'totalCheckboxHelpTextStringProperty': LocalizedStringProperty;
 };
 
 const NumberPairsStrings = getStringModule( 'NUMBER_PAIRS' ) as StringsType;

js/common/model/RepresentationType.ts

@@ -58,7 +58,7 @@ export default class RepresentationType extends EnumerationValue {
   );
   public static readonly ONE_CARDS = new RepresentationType(
     'oneCards',
-    NumberPairsStrings.oneCardsStringProperty,
+    NumberPairsStrings.onesStringProperty,
     NumberPairsColors.locationSumColorProperty,
     NumberPairsColors.locationLeftAddendColorProperty,
     NumberPairsColors.locationRightAddendColorProperty,

js/common/view/BeadsOnWireNode.ts

@@ -35,6 +35,7 @@ import Vector2Property from '../../../../dot/js/Vector2Property.js';
 import BeadManager from '../model/BeadManager.js';
 import isResettingAllProperty from '../../../../scenery-phet/js/isResettingAllProperty.js';
 import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js';
+import NumberPairsStrings from '../../NumberPairsStrings.js';
 
 const BEAD_WIDTH = BeadManager.BEAD_WIDTH;
 const WIRE_HEIGHT = 4;
@@ -96,7 +97,7 @@ export default class BeadsOnWireNode extends Node {
     const options = optionize<BeadsOnWireNodeOptions, SelfOptions, NodeOptions>()( {
       children: [ wire, beadSeparator ],
       excludeInvisibleChildrenFromBounds: true,
-      accessibleName: 'Beads On a Wire'
+      accessibleName: NumberPairsStrings.beadsOnAWireStringProperty
     }, providedOptions );
 
     super( options );

js/common/view/CountingAreaNode.ts

@@ -28,6 +28,7 @@ import Animation from '../../../../twixt/js/Animation.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import Dimension2 from '../../../../dot/js/Dimension2.js';
 import NumberPairsModel from '../model/NumberPairsModel.js';
+import NumberPairsStrings from '../../NumberPairsStrings.js';
 
 type SelfOptions = {
   backgroundColorProperty: TReadOnlyProperty<TColor>;
@@ -83,6 +84,7 @@ export default class CountingAreaNode extends Node {
     } );
 
     const showHideBothAddendsButton = new ShowHideAddendButton( leftAddendVisibleProperty, {
+      accessibleName: NumberPairsStrings.showOrHideAddendsStringProperty,
       left: COUNTING_AREA_BOUNDS.minX + COUNTING_AREA_MARGIN,
       bottom: COUNTING_AREA_BOUNDS.maxY - COUNTING_AREA_MARGIN,
       secondAddendVisibleProperty: rightAddendVisibleProperty,

js/common/view/EquationAccordionBox.ts

@@ -18,7 +18,7 @@ import NumberPairsConstants from '../NumberPairsConstants.js';
 import NumberRectangle from './NumberRectangle.js';
 import TotalRepresentationAccordionBox, { TotalRepresentationAccordionBoxOptions } from './TotalRepresentationAccordionBox.js';
 import Dimension2 from '../../../../dot/js/Dimension2.js';
-import NumberSentenceAccordionBox from './NumberSentenceAccordionBox.js';
+import NumberPhraseAccordionBox from './NumberPhraseAccordionBox.js';
 
 type SelfOptions = {
   addendsOnRight?: boolean;
@@ -38,7 +38,7 @@ export default class EquationAccordionBox extends TotalRepresentationAccordionBo
       addendsOnRight: true,
       titleNode: titleNode,
       contentYMargin: 18,
-      minWidth: NumberSentenceAccordionBox.MIN_WIDTH, // Match the minWidth of the NumberSentenceAccordionBox
+      minWidth: NumberPhraseAccordionBox.MIN_WIDTH, // Match the minWidth of the NumberPhraseAccordionBox
       expandedDefaultValue: false
     }, providedOptions );
 

js/common/view/NumberBondAccordionBox.ts

@@ -9,7 +9,7 @@
 
 import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js';
 import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js';
-import { Text, Node } from '../../../../scenery/js/imports.js';
+import { Node, Text } from '../../../../scenery/js/imports.js';
 import numberPairs from '../../numberPairs.js';
 import NumberPairsStrings from '../../NumberPairsStrings.js';
 import NumberPairsModel from '../model/NumberPairsModel.js';
@@ -30,7 +30,11 @@ type NumberBondAccordionBoxOptions = SelfOptions & StrictOmit<TotalRepresentatio
 export default class NumberBondAccordionBox extends TotalRepresentationAccordionBox {
 
   public constructor( model: NumberPairsModel, providedOptions: NumberBondAccordionBoxOptions ) {
-    const titleNode = new Text( NumberPairsStrings.numberBondStringProperty, NumberPairsConstants.ACCORDION_BOX_TITLE_OPTIONS );
+    const accordionBoxTitleStringProperty = new DerivedProperty( [ NumberPairsConstants.NUMBER_MODEL_TYPE_PROPERTY, NumberPairsStrings.numberBondStringProperty, NumberPairsStrings.barModelStringProperty ],
+      ( numberModelType, numberBondString, barModelString ) => {
+        return numberModelType === NumberModelType.NUMBER_BOND_MODEL ? numberBondString : barModelString;
+      } );
+    const titleNode = new Text( accordionBoxTitleStringProperty, NumberPairsConstants.ACCORDION_BOX_TITLE_OPTIONS );
     const options = optionize<NumberBondAccordionBoxOptions, SelfOptions, TotalRepresentationAccordionBoxOptions>()( {
       numberBondNodeOptions: {},
       titleNode: titleNode,

js/common/view/NumberPairsScreenView.ts

@@ -39,9 +39,10 @@ import LocaleSwitch from '../../../../number-suite-common/js/common/view/LocaleS
 import NumberPairsPreferences from '../model/NumberPairsPreferences.js';
 import { NumberPairsUtils } from '../model/NumberPairsUtils.js';
 import NumberPairsStrings from '../../NumberPairsStrings.js';
+import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js';
 
 type SelfOptions = {
-  numberSentenceContent: Node;
+  numberPhraseContent: Node;
   numberBondContent: Node;
   equationContent?: Node | null;
   sceneRange?: Range | null;
@@ -82,12 +83,12 @@ export default class NumberPairsScreenView extends ScreenView {
     /**
      * Set the layout of the accordion boxes along the top of each screen.
      */
-    const numberSentenceVBox = new VBox( {
-      children: [ options.numberSentenceContent ],
+    const numberPhraseVBox = new VBox( {
+      children: [ options.numberPhraseContent ],
       spacing: 5,
       align: 'left'
     } );
-    const numberSentenceAlignBox = new AlignBox( numberSentenceVBox, {
+    const numberPhraseAlignBox = new AlignBox( numberPhraseVBox, {
       alignBounds: this.layoutBounds,
       yMargin: NumberPairsConstants.SCREEN_VIEW_Y_MARGIN,
       xMargin: NumberPairsConstants.COUNTING_AREA_X_MARGIN,
@@ -101,7 +102,7 @@ export default class NumberPairsScreenView extends ScreenView {
       yAlign: 'top',
       xAlign: 'center'
     } );
-    this.addChild( numberSentenceAlignBox );
+    this.addChild( numberPhraseAlignBox );
     this.addChild( numberBondAlignBox );
 
     if ( options.equationContent ) {
@@ -132,7 +133,8 @@ export default class NumberPairsScreenView extends ScreenView {
      */
     const speechSynthesisControl = new SpeechSynthesisControl( numberPairsSpeechSynthesisAnnouncer, numberPairsUtteranceQueue, {
       speechSynthesisButtonOptions: {
-        accessibleName: NumberPairsStrings.hearNumberSentenceStringProperty
+        accessibleName: NumberPairsStrings.hearNumberPhraseStringProperty,
+        helpText: NumberPairsStrings.numberPhraseHelpTextStringProperty
       },
       x: this.layoutBounds.minX + NumberPairsConstants.SCREEN_VIEW_X_MARGIN,
       y: this.layoutBounds.minY + NumberPairsConstants.SCREEN_VIEW_Y_MARGIN,
@@ -142,7 +144,7 @@ export default class NumberPairsScreenView extends ScreenView {
     const localeSwitch = new LocaleSwitch( NumberPairsPreferences, numberPairsUtteranceQueue, 300, {
       tandem: options.tandem.createTandem( 'localeSwitch' )
     } );
-    numberSentenceVBox.addChild( localeSwitch );
+    numberPhraseVBox.addChild( localeSwitch );
 
     const tenFrameButtonVisibleProperty = new DerivedProperty( [ model.representationTypeProperty ],
       countingRepresentation => countingRepresentation === RepresentationType.APPLES ||
@@ -156,9 +158,15 @@ export default class NumberPairsScreenView extends ScreenView {
     // we have access to the countingAreaBounds which are defined during construction.
     const sumTenFrameBounds = COUNTING_AREA_BOUNDS.erodedX( COUNTING_AREA_BOUNDS.width / 3.5 );
     const tenFrameBounds = options.sumScreen ? [ sumTenFrameBounds ] : NumberPairsUtils.splitBoundsInHalf( COUNTING_AREA_BOUNDS );
+    const organizeObjectsPatternStringProperty = new PatternStringProperty( NumberPairsStrings.organizeObjectsPatternStringProperty, {
+      representation: model.representationTypeProperty.value.accessibleName
+    } );
+    const organizeObjectsHelpTextPatternStringProperty = new PatternStringProperty( NumberPairsStrings.organizeObjectsHelpTextPatternStringProperty, {
+      representation: model.representationTypeProperty.value.accessibleName
+    } );
     const tenFrameButton = new TenFrameButton( {
-      accessibleName: NumberPairsStrings.organizeObjectsStringProperty,
-      helpText: NumberPairsStrings.organizeObjectsHelpTextStringProperty,
+      accessibleName: organizeObjectsPatternStringProperty,
+      helpText: organizeObjectsHelpTextPatternStringProperty,
       tandem: options.tandem.createTandem( 'tenFrameButton' ),
       listener: () => {
         this.interruptSubtreeInput();
@@ -301,8 +309,8 @@ export default class NumberPairsScreenView extends ScreenView {
           top: COUNTING_AREA_BOUNDS.bottom + COUNTING_AREA_Y_MARGIN,
           left: COUNTING_AREA_BOUNDS.left,
           visibleProperty: numberLineVisibleProperty,
-          valueAAccessibleName: NumberPairsStrings.firstAddendNoJumpStringProperty,
-          valueBAccessibleName: NumberPairsStrings.firstAddendJumpStringProperty,
+          valueAAccessibleName: NumberPairsStrings.countOnStringProperty,
+          valueBAccessibleName: NumberPairsStrings.countFromZeroStringProperty,
           toggleSwitchOptions: {
             size: new Dimension2( 36, 18 )
           },
@@ -338,7 +346,7 @@ export default class NumberPairsScreenView extends ScreenView {
      * Add in the rest of the nodes as part of the control area
      */
     this.controlNodes.push( speechSynthesisControl );
-    this.controlNodes.push( numberSentenceVBox );
+    this.controlNodes.push( numberPhraseVBox );
     this.controlNodes.push( options.numberBondContent );
     options.equationContent && this.controlNodes.push( options.equationContent );
 

js/common/view/NumberSentenceAccordionBox.ts → js/common/view/NumberPhraseAccordionBox.ts

@@ -53,27 +53,27 @@ NUMBER_TO_WORD_MAP.set( 'someNumber', NumberPairsStrings.someNumberStringPropert
 NUMBER_TO_WORD_MAP.set( 'anotherNumber', NumberPairsStrings.anotherNumberStringProperty );
 
 type SelfOptions = {
-  numberSentenceStringProperty: LocalizedStringProperty;
+  numberPhraseStringProperty: LocalizedStringProperty;
   numberPhraseSpeechStringProperty: LocalizedStringProperty;
   speechDataProperty: TProperty<string>;
 };
-type NumberSentenceAccordionBoxOptions = SelfOptions & StrictOmit<TotalRepresentationAccordionBoxOptions, 'titleNode'>;
+type NumberPhraseAccordionBoxOptions = SelfOptions & StrictOmit<TotalRepresentationAccordionBoxOptions, 'titleNode'>;
 
 const LINE_WRAP = 240;
-export default class NumberSentenceAccordionBox extends TotalRepresentationAccordionBox {
+export default class NumberPhraseAccordionBox extends TotalRepresentationAccordionBox {
 
   // We want the accordion box to resize in the Y direction to accommodate the RichText line wrap, however the
   // width should stay the same. In order to do this we must define and control all options that contribute
   // to the width of the accordion box.
   public static readonly MIN_WIDTH = LINE_WRAP + 2 * TotalRepresentationAccordionBox.CONTENT_X_MARGIN + TotalRepresentationAccordionBox.EXPAND_COLLAPSE_SIDE_LENGTH + TotalRepresentationAccordionBox.BUTTON_X_MARGIN;
 
-  public constructor( model: NumberPairsModel, providedOptions: NumberSentenceAccordionBoxOptions ) {
+  public constructor( model: NumberPairsModel, providedOptions: NumberPhraseAccordionBoxOptions ) {
 
-    const options = optionize<NumberSentenceAccordionBoxOptions, SelfOptions, WithOptional<TotalRepresentationAccordionBoxOptions, 'titleNode'>>()( {
+    const options = optionize<NumberPhraseAccordionBoxOptions, SelfOptions, WithOptional<TotalRepresentationAccordionBoxOptions, 'titleNode'>>()( {
       contentXMargin: 20,
       contentYMargin: 20,
       contentAlign: 'left',
-      minWidth: NumberSentenceAccordionBox.MIN_WIDTH,
+      minWidth: NumberPhraseAccordionBox.MIN_WIDTH,
       expandedDefaultValue: false
     }, providedOptions );
 
@@ -128,17 +128,17 @@ export default class NumberSentenceAccordionBox extends TotalRepresentationAccor
     const rightAddendDynamicProperty = new DynamicProperty( rightAddendStringProperty );
 
     // Create the PatternStringProperties for primary and secondary locales.
-    const primaryLocalePatternStringProperty = new PatternStringProperty( options.numberSentenceStringProperty, {
+    const primaryLocalePatternStringProperty = new PatternStringProperty( options.numberPhraseStringProperty, {
       total: totalDynamicProperty,
       leftAddend: leftAddendDynamicProperty,
       rightAddend: rightAddendDynamicProperty
     } );
-    const secondaryLocaleStringProperty = new DerivedProperty( [ secondLocaleStringsProperty, options.numberSentenceStringProperty ],
-      ( secondLocaleStrings, numberSentenceString ) => {
+    const secondaryLocaleStringProperty = new DerivedProperty( [ secondLocaleStringsProperty, options.numberPhraseStringProperty ],
+      ( secondLocaleStrings, numberPhraseString ) => {
         const secondLocaleString = secondLocaleStrings[ options.numberPhraseSpeechStringProperty.localizedString.stringKey ];
 
         // If the secondLocaleString is not defined, default to the primary locale string.
-        return secondLocaleString ? secondLocaleString : numberSentenceString;
+        return secondLocaleString ? secondLocaleString : numberPhraseString;
       } );
     const secondaryLocalePatternStringProperty = new PatternStringProperty( secondaryLocaleStringProperty, {
       total: totalDynamicProperty,
@@ -148,7 +148,7 @@ export default class NumberSentenceAccordionBox extends TotalRepresentationAccor
 
     // This is the final Property that the RichText will listen to. At this point all decisions about what locale
     // to display based on translation have been filtered down.
-    const numberSentenceStringProperty = new DerivedProperty( [
+    const numberPhraseStringProperty = new DerivedProperty( [
       isPrimaryLocaleProperty,
       primaryLocalePatternStringProperty,
       secondaryLocalePatternStringProperty
@@ -159,7 +159,7 @@ export default class NumberSentenceAccordionBox extends TotalRepresentationAccor
     let totalHighlight: Rectangle;
     let leftAddendHighlight: Rectangle;
     let rightAddendHighlight: Rectangle;
-    const richText = new RichText( numberSentenceStringProperty, {
+    const richText = new RichText( numberPhraseStringProperty, {
       lineWrap: LINE_WRAP,
       leading: 10,
       tags: {
@@ -240,10 +240,10 @@ export default class NumberSentenceAccordionBox extends TotalRepresentationAccor
       rightAddendHighlight.fill = color;
     } );
 
-    options.titleNode = new Text( NumberPairsStrings.numberSentenceStringProperty, NumberPairsConstants.ACCORDION_BOX_TITLE_OPTIONS );
+    options.titleNode = new Text( NumberPairsStrings.numberPhraseStringProperty, NumberPairsConstants.ACCORDION_BOX_TITLE_OPTIONS );
 
     super( richText, options );
   }
 }
 
-numberPairs.register( 'NumberSentenceAccordionBox', NumberSentenceAccordionBox );
+numberPairs.register( 'NumberPhraseAccordionBox', NumberPhraseAccordionBox );

js/common/view/RepresentationRadioButtonGroup.ts

@@ -40,6 +40,7 @@ export default class RepresentationRadioButtonGroup extends RectangularRadioButt
     const buttonMargin = 3;
     const options = optionize<CountingRepresentationRadioButtonGroupOptions, SelfOptions, RectangularRadioButtonGroupOptions>()( {
       accessibleName: NumberPairsStrings.representationTypeStringProperty,
+      helpText: NumberPairsStrings.representationTypeHelpTextStringProperty,
       orientation: 'horizontal',
       radioButtonOptions: {
         baseColor: Color.WHITE,

js/common/view/SceneSelectionRadioButtonGroup.ts

@@ -17,6 +17,7 @@ import RectangularRadioButtonGroup, { RectangularRadioButtonGroupOptions } from
 import numberPairs from '../../numberPairs.js';
 import NumberPairsScene from '../model/NumberPairsScene.js';
 import NumberPairsStrings from '../../NumberPairsStrings.js';
+import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js';
 
 type SelfOptions = {
   sceneRange: Range;
@@ -26,8 +27,12 @@ type SceneSelectionRadioButtonGroupOptions = SelfOptions & RectangularRadioButto
 export default class SceneSelectionRadioButtonGroup extends RectangularRadioButtonGroup<NumberPairsScene> {
 
   public constructor( selectedSceneModelProperty: PhetioProperty<NumberPairsScene>, sceneModels: NumberPairsScene[], providedOptions: SceneSelectionRadioButtonGroupOptions ) {
+    const totalNumberPatternStringProperty = new PatternStringProperty( NumberPairsStrings.totalNumberPatternStringProperty, {
+      value: selectedSceneModelProperty.value.total
+    } );
     const options = optionize<SceneSelectionRadioButtonGroupOptions, SelfOptions, RectangularRadioButtonGroupOptions>()( {
-      accessibleName: NumberPairsStrings.sceneSelectionRadioButtonGroupStringProperty,
+      accessibleName: totalNumberPatternStringProperty,
+      helpText: NumberPairsStrings.chooseTotalHelpTextStringProperty,
       radioButtonOptions: {
         size: new Dimension2( 40, 40 )
       }