support for dynamic locale, #140

phetsims · Aug 30, 2022 · 211024e · 211024e
1 parent 98e1eb9
commit 211024e
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 44 deletions.
diff --git a/js/common/view/PartialChargesCheckbox.js b/js/common/view/PartialChargesCheckbox.js
@@ -28,11 +28,10 @@ class PartialChargesCheckbox extends Checkbox {
       tandem: Tandem.REQUIRED
     }, options );
 
-    const labelText = new Text( moleculePolarityStrings.partialCharges,
-      merge( {
-        tandem: options.tandem.createTandem( 'labelText' )
-      }, MPConstants.CONTROL_TEXT_OPTIONS )
-    );
+    const labelText = new Text( moleculePolarityStrings.partialChargesStringProperty, merge( {
+      tandem: options.tandem.createTandem( 'labelText' ),
+      phetioVisiblePropertyInstrumented: false
+    }, MPConstants.CONTROL_TEXT_OPTIONS ) );
 
     super( partialChargesVisibleProperty, labelText, options );
   }

diff --git a/js/common/view/SurfaceColorControl.js b/js/common/view/SurfaceColorControl.js
@@ -32,10 +32,11 @@ class SurfaceColorControl extends VBox {
       tandem: Tandem.REQUIRED
     }, options );
 
-    const titleText = new Text( moleculePolarityStrings.surfaceColorRealMolecules, {
+    const titleText = new Text( moleculePolarityStrings.surfaceColorRealMoleculesStringProperty, {
       font: new PhetFont( 14 ),
       maxWidth: 400,
-      tandem: options.tandem.createTandem( 'titleText' )
+      tandem: options.tandem.createTandem( 'titleText' ),
+      phetioVisiblePropertyInstrumented: false
     } );
 
     const radioButtonGroup = new SurfaceColorRadioButtonGroup( surfaceColorProperty, {

diff --git a/js/common/view/SurfaceControl.js b/js/common/view/SurfaceControl.js
@@ -32,11 +32,10 @@ class SurfaceControl extends VBox {
     }, options );
 
     // title
-    const titleText = new Text( moleculePolarityStrings.surface,
-      merge( {
-        tandem: options.tandem.createTandem( 'titleText' )
-      }, MPConstants.CONTROL_PANEL_TITLE_OPTIONS )
-    );
+    const titleText = new Text( moleculePolarityStrings.surfaceStringProperty, merge( {
+      tandem: options.tandem.createTandem( 'titleText' ),
+      phetioVisiblePropertyInstrumented: false
+    }, MPConstants.CONTROL_PANEL_TITLE_OPTIONS ) );
 
     // Radio button group
     const radioButtonGroup = new SurfaceRadioButtonGroup( surfaceTypeProperty, {

diff --git a/js/common/view/SurfaceRadioButtonGroup.js b/js/common/view/SurfaceRadioButtonGroup.js
@@ -32,23 +32,26 @@ class SurfaceRadioButtonGroup extends AquaRadioButtonGroup {
 
     const radioButtonGroupItems = [
       {
-        node: new Text( moleculePolarityStrings.none, merge( {
-          tandem: options.tandem.createTandem( 'noneText' )
+        node: new Text( moleculePolarityStrings.noneStringProperty, merge( {
+          tandem: options.tandem.createTandem( 'noneText' ),
+          phetioVisiblePropertyInstrumented: false
         }, MPConstants.CONTROL_TEXT_OPTIONS ) ),
         value: SurfaceType.NONE,
         tandemName: 'noneRadioButton'
       },
       {
         value: SurfaceType.ELECTROSTATIC_POTENTIAL,
-        node: new Text( moleculePolarityStrings.electrostaticPotential, merge( {
-          tandem: options.tandem.createTandem( 'electrostaticPotentialText' )
+        node: new Text( moleculePolarityStrings.electrostaticPotentialStringProperty, merge( {
+          tandem: options.tandem.createTandem( 'electrostaticPotentialText' ),
+          phetioVisiblePropertyInstrumented: false
         }, MPConstants.CONTROL_TEXT_OPTIONS ) ),
         tandemName: 'electrostaticPotentialRadioButton'
       },
       {
         value: SurfaceType.ELECTRON_DENSITY,
-        node: new Text( moleculePolarityStrings.electronDensity, merge( {
-          tandem: options.tandem.createTandem( 'electronDensityText' )
+        node: new Text( moleculePolarityStrings.electronDensityStringProperty, merge( {
+          tandem: options.tandem.createTandem( 'electronDensityText' ),
+          phetioVisiblePropertyInstrumented: false
         }, MPConstants.CONTROL_TEXT_OPTIONS ) ),
         tandemName: 'electronDensityRadioButton'
       }

diff --git a/js/molecule-polarity-phet-io-overrides.js b/js/molecule-polarity-phet-io-overrides.js
@@ -70,9 +70,6 @@ window.phet.preloads.phetio.phetioElementsOverrides =
     "moleculePolarity.threeAtomsScreen.view.controlPanel.separator1.visibleProperty": {
       "phetioFeatured": true
     },
-    "moleculePolarity.threeAtomsScreen.view.controlPanel.viewControls.partialChargesCheckbox.labelText.textProperty": {
-      "phetioFeatured": true
-    },
     "moleculePolarity.threeAtomsScreen.view.controlPanel.viewControls.titleText.textProperty": {
       "phetioFeatured": true
     },
@@ -160,30 +157,15 @@ window.phet.preloads.phetio.phetioElementsOverrides =
     "moleculePolarity.twoAtomsScreen.view.controlPanel.separator2.visibleProperty": {
       "phetioFeatured": true
     },
-    "moleculePolarity.twoAtomsScreen.view.controlPanel.surfaceControl.radioButtonGroup.electronDensityText.textProperty": {
-      "phetioFeatured": true
-    },
-    "moleculePolarity.twoAtomsScreen.view.controlPanel.surfaceControl.radioButtonGroup.electrostaticPotentialText.textProperty": {
-      "phetioFeatured": true
-    },
-    "moleculePolarity.twoAtomsScreen.view.controlPanel.surfaceControl.radioButtonGroup.noneText.textProperty": {
-      "phetioFeatured": true
-    },
     "moleculePolarity.twoAtomsScreen.view.controlPanel.surfaceControl.radioButtonGroup.visibleProperty": {
       "phetioFeatured": false
     },
-    "moleculePolarity.twoAtomsScreen.view.controlPanel.surfaceControl.titleText.textProperty": {
-      "phetioFeatured": true
-    },
     "moleculePolarity.twoAtomsScreen.view.controlPanel.surfaceControl.visibleProperty": {
       "phetioFeatured": true
     },
     "moleculePolarity.twoAtomsScreen.view.controlPanel.viewControls.bondCharacterCheckbox.labelText.textProperty": {
       "phetioFeatured": true
     },
-    "moleculePolarity.twoAtomsScreen.view.controlPanel.viewControls.partialChargesCheckbox.labelText.textProperty": {
-      "phetioFeatured": true
-    },
     "moleculePolarity.twoAtomsScreen.view.controlPanel.viewControls.titleText.textProperty": {
       "phetioFeatured": true
     },

diff --git a/js/realmolecules/RealMoleculesScreen.js b/js/realmolecules/RealMoleculesScreen.js
@@ -28,7 +28,7 @@ class RealMoleculesScreen extends Screen {
   constructor( options ) {
 
     options = merge( {
-      name: moleculePolarityStrings.screen.realMolecules,
+      name: moleculePolarityStrings.screen.realMoleculesStringProperty,
       backgroundColorProperty: new Property( MPColors.SCREEN_BACKGROUND ),
       homeScreenIcon: createScreenIcon(),
       tandem: Tandem.REQUIRED

diff --git a/js/threeatoms/ThreeAtomsScreen.js b/js/threeatoms/ThreeAtomsScreen.js
@@ -28,7 +28,7 @@ class ThreeAtomsScreen extends Screen {
   constructor( options ) {
 
     options = merge( {
-      name: moleculePolarityStrings.screen.threeAtoms,
+      name: moleculePolarityStrings.screen.threeAtomsStringProperty,
       backgroundColorProperty: new Property( MPColors.SCREEN_BACKGROUND ),
       homeScreenIcon: createScreenIcon(),
       tandem: Tandem.REQUIRED
@@ -92,19 +92,19 @@ function createScreenIcon() {
     centerY: bondBC.bottom
   } );
 
-  const textA = new Text( moleculePolarityStrings.atomA, {
+  const textA = new Text( moleculePolarityStrings.atomAStringProperty, {
     font: font,
     maxWidth: 0.75 * atomDiameter,
     center: atomA.center
   } );
 
-  const textB = new Text( moleculePolarityStrings.atomB, {
+  const textB = new Text( moleculePolarityStrings.atomBStringProperty, {
     font: font,
     maxWidth: 0.75 * atomDiameter,
     center: atomB.center
   } );
 
-  const textC = new Text( moleculePolarityStrings.atomC, {
+  const textC = new Text( moleculePolarityStrings.atomCStringProperty, {
     font: font,
     maxWidth: 0.75 * atomDiameter,
     center: atomC.center

diff --git a/js/twoatoms/TwoAtomsScreen.js b/js/twoatoms/TwoAtomsScreen.js
@@ -28,7 +28,7 @@ class TwoAtomsScreen extends Screen {
   constructor( options ) {
 
     options = merge( {
-      name: moleculePolarityStrings.screen.twoAtoms,
+      name: moleculePolarityStrings.screen.twoAtomsStringProperty,
       backgroundColorProperty: new Property( MPColors.SCREEN_BACKGROUND ),
       homeScreenIcon: createScreenIcon(),
       tandem: Tandem.REQUIRED
@@ -75,13 +75,13 @@ function createScreenIcon() {
     y: bond.centerY
   } );
 
-  const textA = new Text( moleculePolarityStrings.atomA, {
+  const textA = new Text( moleculePolarityStrings.atomAStringProperty, {
     font: font,
     maxWidth: 0.75 * atomDiameter,
     center: atomA.center
   } );
 
-  const textB = new Text( moleculePolarityStrings.atomB, {
+  const textB = new Text( moleculePolarityStrings.atomBStringProperty, {
     font: font,
     maxWidth: 0.75 * atomDiameter,
     center: atomB.center