diff --git a/lib/languages.js b/lib/languages.js index 2289886d7eb7..6d9168ac2824 100644 --- a/lib/languages.js +++ b/lib/languages.js @@ -33,6 +33,8 @@ function getRoot(languageCode) { // Default return path.join(TRANSLATIONS_ROOT, languageCode) } + +// Languages in order of accept-language header frequency // 92BD1212-61B8-4E7A: Remove `wip: Boolean` for the public ship of ko, fr, de, ru const languages = { en: { @@ -51,15 +53,6 @@ const languages = { dir: getRoot('zh-cn'), wip: false, }, - ja: { - name: 'Japanese', - nativeName: '日本語', - code: 'ja', - hreflang: 'ja', - redirectPatterns: [/^\/jp/], - dir: getRoot('ja-jp'), - wip: false, - }, es: { name: 'Spanish', nativeName: 'Español', @@ -77,12 +70,21 @@ const languages = { dir: getRoot('pt-br'), wip: false, }, - de: { - name: 'German', - nativeName: 'Deutsch', - code: 'de', - hreflang: 'de', - dir: getRoot('de-de'), + ru: { + name: 'Russian', + nativeName: 'Русский', + code: 'ru', + hreflang: 'ru', + dir: getRoot('ru-ru'), + wip: false, + }, + ja: { + name: 'Japanese', + nativeName: '日本語', + code: 'ja', + hreflang: 'ja', + redirectPatterns: [/^\/jp/], + dir: getRoot('ja-jp'), wip: false, }, fr: { @@ -93,12 +95,12 @@ const languages = { dir: getRoot('fr-fr'), wip: false, }, - ru: { - name: 'Russian', - nativeName: 'Русский', - code: 'ru', - hreflang: 'ru', - dir: getRoot('ru-ru'), + de: { + name: 'German', + nativeName: 'Deutsch', + code: 'de', + hreflang: 'de', + dir: getRoot('de-de'), wip: false, }, ko: { diff --git a/lib/page.js b/lib/page.js index 5fc94efb216a..ceadcf0c3b3f 100644 --- a/lib/page.js +++ b/lib/page.js @@ -179,9 +179,6 @@ class Page { this.title = await renderContentWithFallback(this, 'rawTitle', context, { textOnly: true, }) - this.shortTitle = await renderContentWithFallback(this, 'shortTitle', context, { - textOnly: true, - }) const html = await renderContentWithFallback(this, 'markdown', context)