stop empty plcaeholders from being added to every message. Stricter c…

…heck to prevent regression.
GoogleChrome · Jul 22, 2019 · 125cb1d · 125cb1d
1 parent be426b8
commit 125cb1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lighthouse-core/scripts/i18n/collect-strings.js b/lighthouse-core/scripts/i18n/collect-strings.js
@@ -414,7 +414,8 @@ function collectAllStringsInDir(dir, strings = {}) {
               description,
             };
 
-            if (converted.placeholders.constructor === Object) {
+            // Stop empty placeholders from being added to every message
+            if (Object.entries(converted.placeholders).length > 0) {
               icuDefn.placeholders = converted.placeholders;
             }
 

diff --git a/lighthouse-core/test/scripts/i18n/collect-strings-test.js b/lighthouse-core/test/scripts/i18n/collect-strings-test.js
@@ -172,14 +172,14 @@ describe('Convert Message to Placeholder', () => {
   it('passthroughs a basic message unchanged', () => {
     const message = 'Hello World.';
     const res = collect.convertMessageToPlaceholders(message, undefined);
-    expect(res).toEqual({message, placeholders: {}});
+    expect(res).toEqual({message, placeholders: undefined});
   });
 
   it('passthroughs an ICU plural unchanged', () => {
     const message = '{var, select, male{Hello Mr. Programmer.} ' +
       'female{Hello Ms. Programmer} other{Hello Programmer.}}';
     const res = collect.convertMessageToPlaceholders(message, undefined);
-    expect(res).toEqual({message, placeholders: {}});
+    expect(res).toEqual({message, placeholders: undefined});
   });
 
   // TODO(exterkamp): more strict parsing for this case