-
Notifications
You must be signed in to change notification settings - Fork 9.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
i18n: introduce script to swap in new locale to LHR #8755
Changes from 14 commits
a8ff2a0
81b0dc4
e12f714
30bb475
059bc0f
54c4833
bdd29b4
fdf96e8
5255aee
627f7be
3531318
5654af1
a225504
853bfd2
e3f2d3f
5efe7eb
cf0d3b7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
/** | ||
* @license Copyright 2019 Google Inc. All Rights Reserved. | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. | ||
*/ | ||
'use strict'; | ||
|
||
/* eslint-disable no-console, max-len */ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. probably shouldn't leave these on if this is for real now :) maybe we have a script version that does the |
||
|
||
const _set = require('lodash.set'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 😍 |
||
|
||
const i18n = require('./i18n.js'); | ||
|
||
/** | ||
* @fileoverview Use the lhr.i18n.icuMessagePaths object to change locales | ||
* | ||
* `icuMessagePaths` is an object keyed by `icuMessageId`s. Within each is either | ||
* 1) an array of strings, which are just object paths to where that message is used in the LHR | ||
* 2) an array of `LH.I18NMessageValuesEntry`s which include both a `path` and a `values` object | ||
* which will be used in the replacement within `i18n._formatIcuMessage()` | ||
* | ||
* An example: | ||
"icuMessagePaths": { | ||
"lighthouse-core/audits/metrics/first-contentful-paint.js | title": [ | ||
"audits[first-contentful-paint].title" | ||
], | ||
"lighthouse-core/audits/time-to-first-byte.js | displayValue": [ | ||
{ | ||
"values": { | ||
"timeInMs": 570.5630000000001 | ||
}, | ||
"path": "audits[time-to-first-byte].displayValue" | ||
} | ||
], | ||
"lighthouse-core/lib/i18n/i18n.js | columnTimeSpent": [ | ||
"audits[mainthread-work-breakdown].details.headings[1].text", | ||
"audits[network-rtt].details.headings[1].text", | ||
"audits[network-server-latency].details.headings[1].text" | ||
], | ||
... | ||
*/ | ||
|
||
/** | ||
* Returns a new LHR with all strings changed to the new `requestedLocale`. | ||
* @param {LH.Result} lhr | ||
* @param {LH.Locale} requestedLocale | ||
* @return {LH.Result} | ||
*/ | ||
function swapLocale(lhr, requestedLocale) { | ||
// Copy LHR to avoid mutating provided LHR. | ||
lhr = JSON.parse(JSON.stringify(lhr)); | ||
|
||
const locale = i18n.lookupLocale(requestedLocale); | ||
const {icuMessagePaths} = lhr.i18n; | ||
const missingIcuMessageIds = /** @type {string[]} */([]); | ||
|
||
Object.entries(icuMessagePaths).forEach(([icuMessageId, messageInstancesInLHR]) => { | ||
for (const instance of messageInstancesInLHR) { | ||
// The path that _formatPathAsString() generated | ||
let path; | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
let values; | ||
if (typeof instance === 'string') { | ||
path = instance; | ||
} else { | ||
path = instance.path; | ||
// `values` are the string template values to be used. eg. `values: {wastedBytes: 9028}` | ||
values = instance.values; | ||
} | ||
// If we couldn't find the new replacement message, keep things as is. | ||
try { | ||
// Get new formatted strings in revised locale | ||
const formattedStr = i18n.getFormattedFromIdAndValues(locale, icuMessageId, values); | ||
// Write string back into the LHR | ||
_set(lhr, path, formattedStr); | ||
} catch (err) { | ||
if (err.message === 'No ICU message string to format') { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this feels like it will get out of date and we won't notice :) any way you can think of to make this a little more foolproof? export the string in i18n maybe? a flag on the error? 🤷♂ |
||
missingIcuMessageIds.push(icuMessageId); | ||
} else { | ||
throw err; | ||
} | ||
} | ||
} | ||
}); | ||
|
||
if (missingIcuMessageIds.length) { | ||
console.error(`No message in locale (${locale}) found for:\n`, missingIcuMessageIds); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe these get returned as |
||
} | ||
|
||
lhr.i18n.rendererFormattedStrings = i18n.getRendererFormattedStrings(locale); | ||
// Tweak the config locale | ||
lhr.configSettings.locale = locale; | ||
return lhr; | ||
} | ||
|
||
module.exports = swapLocale; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/** | ||
* @license Copyright 2019 Google Inc. All Rights Reserved. | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. | ||
*/ | ||
'use strict'; | ||
|
||
const swapLocale = require('../../../lib/i18n/swap-locale.js'); | ||
|
||
const lhr = require('../../results/sample_v2.json'); | ||
|
||
/* eslint-env jest */ | ||
beforeEach(() => { | ||
// silence console.error spam about messages not found | ||
// eslint-disable-next-line no-console | ||
console.error = jest.fn(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. hopefully won't need this one :) |
||
}); | ||
|
||
describe('swap-locale', () => { | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
it('can change golden LHR english strings into spanish', () => { | ||
const lhrEn = /** @type {LH.Result} */ (JSON.parse(JSON.stringify(lhr))); | ||
const lhrEs = swapLocale(lhrEn, 'es'); | ||
|
||
// Basic replacement | ||
expect(lhrEn.audits.plugins.title).toEqual('Document avoids plugins'); | ||
expect(lhrEs.audits.plugins.title).toEqual('El documento no usa complementos'); | ||
|
||
// With ICU string argument values | ||
expect(lhrEn.audits['dom-size'].displayValue).toEqual('31 elements'); | ||
expect(lhrEs.audits['dom-size'].displayValue).toEqual('31 elementos'); | ||
|
||
// Renderer formatted strings | ||
expect(lhrEn.i18n.rendererFormattedStrings.labDataTitle).toEqual('Lab Data'); | ||
expect(lhrEs.i18n.rendererFormattedStrings.labDataTitle).toEqual('Datos de prueba'); | ||
}); | ||
|
||
it('can roundtrip back to english correctly', () => { | ||
const lhrEn = /** @type {LH.Result} */ (JSON.parse(JSON.stringify(lhr))); | ||
|
||
// via Spanish | ||
const lhrEnEsRT = swapLocale(swapLocale(lhrEn, 'es'), 'en-US'); | ||
expect(lhrEnEsRT).toMatchObject(lhrEn); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should |
||
|
||
// via Arabic | ||
const lhrEnArRT = swapLocale(swapLocale(lhrEn, 'ar'), 'en-US'); | ||
expect(lhrEnArRT).toMatchObject(lhrEn); | ||
}); | ||
This comment was marked as outdated.
Sorry, something went wrong. |
||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@patrickhulce note this change.. it was using the fallback message instead of the one pulled from the locales files. which seemed odd. right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is weird. As long as there isn't an old mismatched translation for the locale it shouldn't matter, but agreed that checking that the
values
will actually be able to go into the string we want them to (and preparing them to do so) is the right thing to do.Mismatched translations could become a problem at some point. If we've updated a string in
en-US.json
and it has differentvalues
than the not-yet-updated strings in all the other locales, I'm pretty sure that will either throw in_preprocessMessageValues
or below in the formatter.Maybe we should have a check in string collection that deletes strings in other locales if the expected
values
don't match anymore.