Auto register and unregister LocalizedString instances, see #1302

phetsims · Aug 21, 2022 · 47b6c79 · 47b6c79
1 parent 510f753
commit 47b6c79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/js/LocalizedString.ts b/js/LocalizedString.ts
@@ -15,6 +15,8 @@ import Tandem from '../../tandem/js/Tandem.js';
 import StringIO from '../../tandem/js/types/StringIO.js';
 import chipper from './chipper.js';
 import TProperty from '../../axon/js/TProperty.js';
+import { localizedStrings } from './getStringModule.js';
+import arrayRemove from '../../phet-core/js/arrayRemove.js';
 
 // constants
 const FALLBACK_LOCALE = 'en';
@@ -56,6 +58,8 @@ class LocalizedString {
       phetioState: false,
       tandem: tandem
     } );
+
+    localizedStrings.push( this );
   }
 
   /**
@@ -197,6 +201,7 @@ class LocalizedString {
     localeOrderProperty.unlink( this.localeOrderListener );
 
     this.property.dispose();
+    arrayRemove( localizedStrings, this );
   }
 }
 

diff --git a/js/getStringModule.ts b/js/getStringModule.ts
@@ -182,7 +182,6 @@ const getStringModule = ( requirejsNamespace: string ): object => {
 
       const localizedString = new LocalizedString( phet.chipper.strings[ FALLBACK_LOCALE ][ stringKey ], tandem );
       localizedStringMap[ stringKey ] = localizedString;
-      localizedStrings.push( localizedString );
 
       // Push up the translated values
       Object.keys( phet.chipper.strings ).forEach( locale => {