diff --git a/js/common/view/NumberPairsScreenView.ts b/js/common/view/NumberPairsScreenView.ts index 243399a..6e0f642 100644 --- a/js/common/view/NumberPairsScreenView.ts +++ b/js/common/view/NumberPairsScreenView.ts @@ -161,11 +161,21 @@ 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 representationTypeAccessibleNameProperty = new DerivedProperty( [ model.representationTypeProperty ], + representationType => representationType.accessibleName ); const organizeObjectsPatternStringProperty = new PatternStringProperty( NumberPairsStrings.organizeObjectsPatternStringProperty, { - representation: model.representationTypeProperty.value.accessibleName + representation: representationTypeAccessibleNameProperty + }, { + maps: { + representation: stringProperty => stringProperty.value + } } ); const organizeObjectsHelpTextPatternStringProperty = new PatternStringProperty( NumberPairsStrings.organizeObjectsHelpTextPatternStringProperty, { - representation: model.representationTypeProperty.value.accessibleName + representation: representationTypeAccessibleNameProperty + }, { + maps: { + representation: stringProperty => stringProperty.value + } } ); const tenFrameButton = new TenFrameButton( { accessibleName: organizeObjectsPatternStringProperty, diff --git a/js/common/view/SceneSelectionRadioButtonGroup.ts b/js/common/view/SceneSelectionRadioButtonGroup.ts index 368fc41..6455b19 100644 --- a/js/common/view/SceneSelectionRadioButtonGroup.ts +++ b/js/common/view/SceneSelectionRadioButtonGroup.ts @@ -28,7 +28,11 @@ export default class SceneSelectionRadioButtonGroup extends RectangularRadioButt public constructor( selectedSceneModelProperty: PhetioProperty, sceneModels: NumberPairsScene[], providedOptions: SceneSelectionRadioButtonGroupOptions ) { const totalNumberPatternStringProperty = new PatternStringProperty( NumberPairsStrings.totalNumberPatternStringProperty, { - value: selectedSceneModelProperty.value.total + value: selectedSceneModelProperty + }, { + maps: { + value: sceneModel => sceneModel.total + } } ); const options = optionize()( { accessibleName: totalNumberPatternStringProperty, diff --git a/number-pairs-strings_en.json b/number-pairs-strings_en.json index b4784a2..39107c4 100644 --- a/number-pairs-strings_en.json +++ b/number-pairs-strings_en.json @@ -72,7 +72,7 @@ "value": "Hear the phrase update automatically as you interact." }, "hearNumberPhrase": { - "value": "Hear Number Sentence" + "value": "Hear Number Phrase" }, "organizeObjectsPattern": { "value": "Organize {{representation}}"