refactor duplicated "a11y." usage, phetsims/friction#182

phetsims · Sep 30, 2019 · b7aa053 · b7aa053
1 parent 13d7649
commit b7aa053
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/eslint/rules/string-require-statement-match.js b/eslint/rules/string-require-statement-match.js
@@ -12,6 +12,8 @@
 module.exports = function( context ) {
   'use strict';
 
+  const ChipperStringUtils = require( '../../js/common/ChipperStringUtils' );
+
   // Adapted from Stack Overflow, see http://stackoverflow.com/questions/25085306/javascript-space-separated-string-to-camelcase
   function toCamelCase( string ) {
     let out = '';
@@ -56,8 +58,8 @@ module.exports = function( context ) {
             let key = rhs.substring( lastSlash + 1 );
 
             // For a11y strings, no need to prefix vars with "a11y"
-            if ( key.indexOf( 'a11y.' ) === 0 ) {
-              key = key.replace( 'a11y.', '' );
+            if ( ChipperStringUtils.isA11yStringKey( key ) ) {
+              key = key.replace( ChipperStringUtils.A11Y_MARKER, '' );
             }
 
             // Convert various separators to whitespace

diff --git a/js/common/ChipperStringUtils.js b/js/common/ChipperStringUtils.js
@@ -186,7 +186,14 @@
      */
     forEachString( map, func ) {
       forEachStringImplementation( '', map, func );
-    }
+    },
+
+    /**
+     * The start of any a11y specific string key.
+     * @public
+     * @type {string}
+     */
+    A11Y_MARKER: A11Y_MARKER
   };
 
   /**