-
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 8 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 | ||||
---|---|---|---|---|---|---|
|
@@ -168,20 +168,21 @@ const _icuMessageInstanceMap = new Map(); | |||||
* | ||||||
* @param {LH.Locale} locale | ||||||
* @param {string} icuMessageId | ||||||
* @param {string} icuMessage | ||||||
* @param {string=} fallbackMessage | ||||||
* @param {*} [values] | ||||||
* @return {{formattedString: string, icuMessage: string}} | ||||||
*/ | ||||||
function _formatIcuMessage(locale, icuMessageId, icuMessage, values) { | ||||||
function _formatIcuMessage(locale, icuMessageId, fallbackMessage, values) { | ||||||
const localeMessages = LOCALES[locale]; | ||||||
const localeMessage = localeMessages[icuMessageId] && localeMessages[icuMessageId].message; | ||||||
// fallback to the original english message if we couldn't find a message in the specified locale | ||||||
// better to have an english message than no message at all, in some number cases it won't even matter | ||||||
const messageForMessageFormat = localeMessage || icuMessage; | ||||||
const messageForMessageFormat = localeMessage || fallbackMessage; | ||||||
if (messageForMessageFormat === undefined) throw new Error('No ICU message string to format'); | ||||||
// when using accented english, force the use of a different locale for number formatting | ||||||
const localeForMessageFormat = locale === 'en-XA' ? 'de-DE' : locale; | ||||||
// pre-process values for the message format like KB and milliseconds | ||||||
const valuesForMessageFormat = _preprocessMessageValues(icuMessage, values); | ||||||
const valuesForMessageFormat = _preprocessMessageValues(messageForMessageFormat, values); | ||||||
|
||||||
const formatter = new MessageFormat(messageForMessageFormat, localeForMessageFormat, formats); | ||||||
const formattedString = formatter.format(valuesForMessageFormat); | ||||||
|
@@ -277,6 +278,20 @@ function getFormatted(icuMessageIdOrRawString, locale) { | |||||
return icuMessageIdOrRawString; | ||||||
} | ||||||
|
||||||
/** | ||||||
* @param {LH.Locale} locale | ||||||
* @param {string} icuMessageId | ||||||
* @param {*} [values] | ||||||
* @return {string} | ||||||
*/ | ||||||
function formatMessageFromIdWithValues(locale, icuMessageId, values) { | ||||||
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. what about
Suggested change
to match |
||||||
const icuMessageIdRegex = /(.* \| .*)$/; | ||||||
if (!icuMessageIdRegex.test(icuMessageId)) throw new Error('This is not an ICU message ID'); | ||||||
|
||||||
const {formattedString} = _formatIcuMessage(locale, icuMessageId, undefined, values); | ||||||
return formattedString; | ||||||
} | ||||||
|
||||||
/** | ||||||
* @param {string} icuMessageInstanceId | ||||||
* @param {LH.Locale} locale | ||||||
|
@@ -349,6 +364,7 @@ module.exports = { | |||||
getRendererFormattedStrings, | ||||||
createMessageInstanceIdFn, | ||||||
getFormatted, | ||||||
formatMessageFromIdWithValues, | ||||||
replaceIcuMessageInstanceIds, | ||||||
isIcuMessage, | ||||||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/** | ||
* @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": { | ||
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. nit: unindent this 2 spaces so it's easy to tell its nested? :) |
||
"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" | ||
], | ||
... | ||
*/ | ||
|
||
/** | ||
* Replaces all strings within an LHR with ones from a different locale | ||
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. I wonder if this might be worth being the place where we explain how the
paulirish marked this conversation as resolved.
Show resolved
Hide resolved
|
||
* @param {LH.Result} lhr | ||
* @param {LH.Locale} requestedLocale | ||
* @return {LH.Result} | ||
*/ | ||
function swapLocale(lhr, requestedLocale) { | ||
// copy LHR to avoid mutating provided LHR | ||
paulirish marked this conversation as resolved.
Show resolved
Hide resolved
|
||
lhr = JSON.parse(JSON.stringify(lhr)); | ||
|
||
const locale = i18n.lookupLocale(requestedLocale); | ||
const {icuMessagePaths} = lhr.i18n; | ||
|
||
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 = /** @type {LH.I18NMessageValuesEntry} */ (instance).path; | ||
// `values` are the string template values to be used. eg. `values: {wastedBytes: 9028}` | ||
values = /** @type {LH.I18NMessageValuesEntry} */ (instance).values; | ||
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. don't need these casts anymore |
||
} | ||
// If we couldn't find the new replacement message, keep things as is. | ||
try { | ||
// Get new formatted strings in revised locale | ||
const formattedStr = i18n.formatMessageFromIdWithValues(locale, icuMessageId, values); | ||
// Write string back into the LHR | ||
_set(lhr, path, formattedStr); | ||
} catch (e) {} | ||
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. unconditional catch here seems excessive since all problems would be silenced. Some wouldn't be interesting (e.g. string from removed audit isn't available in new locale), but some could be a real problem. Maybe at least log the issue? 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.
or log the ones that aren't |
||
} | ||
}); | ||
|
||
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,33 @@ | ||
/** | ||
* @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 */ | ||
|
||
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'); | ||
|
||
/* eslint-disable max-len */ | ||
// Renderer formatted strings | ||
expect(lhrEn.i18n.rendererFormattedStrings.notApplicableAuditsGroupTitle).toEqual('Not applicable'); | ||
expect(lhrEs.i18n.rendererFormattedStrings.notApplicableAuditsGroupTitle).toEqual('No aplicable'); | ||
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. I didn't even notice this was translated 😆 is there a better example? |
||
}); | ||
This comment was marked as outdated.
Sorry, something went wrong. |
||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,8 @@ import LHError = require('../lighthouse-core/lib/lh-error.js'); | |
|
||
declare global { | ||
module LH { | ||
export type I18NMessageEntry = string | {path: string, values: any}; | ||
export type I18NMessageValuesEntry = {path: string, values: any}; | ||
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 we should type values as |
||
export type I18NMessageEntry = string | I18NMessageValuesEntry; | ||
|
||
export interface I18NMessages { | ||
[icuMessageId: string]: I18NMessageEntry[]; | ||
|
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.