Skip to content

Commit 08122cc

Browse files
authored
Remove wip concept for languages (#51022)
1 parent b6a4d2d commit 08122cc

File tree

7 files changed

+5
-20
lines changed

7 files changed

+5
-20
lines changed

src/frame/pages/app.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ MyApp.getInitialProps = async (appContext: AppContext) => {
118118
for (const [langCode, langObj] of Object.entries(
119119
req.context.languages as Record<string, LanguageItem>,
120120
)) {
121-
if (langObj.wip) continue
122121
// Only pick out the keys we actually need
123122
languagesContext.languages[langCode] = {
124123
name: langObj.name,

src/languages/components/LanguagePicker.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const LanguagePicker = ({ xs, mediumOrLower }: Props) => {
2020

2121
const { t } = useTranslation('picker')
2222
// Remember, in this context `languages` is only the active ones
23-
// that are available. I.e. no wip ones.
23+
// that are available.
2424
// Also, if the current context has a page and that page has own ideas
2525
// about which languages it's available in (e.g. early-access)
2626
// it would already have been paired down.

src/languages/components/LanguagesContext.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { createContext, useContext } from 'react'
22

33
export type LanguageItem = {
4-
wip?: boolean
54
name: string
65
nativeName?: string
76
code: string

src/languages/lib/languages.js

-10
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,12 @@ function getRoot(languageCode) {
4444
}
4545

4646
// Languages in order of accept-language header frequency
47-
// 92BD1212-61B8-4E7A: Remove `wip: Boolean` for the public ship of ko, fr, de, ru
4847
const allLanguages = {
4948
en: {
5049
name: 'English',
5150
code: 'en',
5251
hreflang: 'en',
5352
dir: getRoot('en'),
54-
wip: false,
5553
},
5654
zh: {
5755
name: 'Simplified Chinese',
@@ -60,15 +58,13 @@ const allLanguages = {
6058
hreflang: 'zh-Hans',
6159
redirectPatterns: [/^\/cn/, /^\/zh-\w{2}/],
6260
dir: getRoot('zh-cn'),
63-
wip: false,
6461
},
6562
es: {
6663
name: 'Spanish',
6764
nativeName: 'Español',
6865
code: 'es',
6966
hreflang: 'es',
7067
dir: getRoot('es-es'),
71-
wip: false,
7268
},
7369
pt: {
7470
name: 'Portuguese',
@@ -77,15 +73,13 @@ const allLanguages = {
7773
hreflang: 'pt',
7874
redirectPatterns: [/^\/br/],
7975
dir: getRoot('pt-br'),
80-
wip: false,
8176
},
8277
ru: {
8378
name: 'Russian',
8479
nativeName: 'Русский',
8580
code: 'ru',
8681
hreflang: 'ru',
8782
dir: getRoot('ru-ru'),
88-
wip: false,
8983
},
9084
ja: {
9185
name: 'Japanese',
@@ -94,23 +88,20 @@ const allLanguages = {
9488
hreflang: 'ja',
9589
redirectPatterns: [/^\/jp/],
9690
dir: getRoot('ja-jp'),
97-
wip: false,
9891
},
9992
fr: {
10093
name: 'French',
10194
nativeName: 'Français',
10295
code: 'fr',
10396
hreflang: 'fr',
10497
dir: getRoot('fr-fr'),
105-
wip: false,
10698
},
10799
de: {
108100
name: 'German',
109101
nativeName: 'Deutsch',
110102
code: 'de',
111103
hreflang: 'de',
112104
dir: getRoot('de-de'),
113-
wip: false,
114105
},
115106
ko: {
116107
name: 'Korean',
@@ -119,7 +110,6 @@ const allLanguages = {
119110
hreflang: 'ko',
120111
redirectPatterns: [/^\/kr/],
121112
dir: getRoot('ko-kr'),
122-
wip: false,
123113
},
124114
}
125115
// Some markdownlint tests depend on having access to all

src/languages/middleware/detect-language.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ function translationExists(language: parserLanguage) {
1717
if (language.code === 'zh') {
1818
return language.region && chineseRegions.includes(language.region)
1919
}
20-
// 92BD1212-61B8-4E7A: Remove ` && !languages[language.code].wip` for the public ship of ko, fr, de, ru
21-
return languageKeys.includes(language.code) && !(languages as Languages)[language.code].wip
20+
21+
return languageKeys.includes(language.code)
2222
}
2323

2424
function getLanguageCode(language: parserLanguage) {
@@ -47,8 +47,7 @@ function getUserLanguage(browserLanguages: parserLanguage[]) {
4747
function getUserLanguageFromCookie(req: Request) {
4848
const value: undefined | string = req.cookies[USER_LANGUAGE_COOKIE_NAME]
4949

50-
// 92BD1212-61B8-4E7A: Remove ` && !languages[value].wip` for the public ship of ko, fr, de, ru
51-
if (value && (languages as Languages)[value] && !(languages as Languages)[value].wip) {
50+
if (value && (languages as Languages)[value]) {
5251
return value
5352
}
5453
}

src/redirects/middleware/handle-redirects.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ export default function handleRedirects(req, res, next) {
129129

130130
function getLanguage(req, default_ = 'en') {
131131
// req.context.userLanguage, if it truthy, is always a valid supported
132-
// language. It's whatever was in the user's request but filtered
133-
// based on non-WIP languages in lib/languages.js
132+
// language. It's whatever was in the user's request in lib/languages.js
134133
return req.context.userLanguage || default_
135134
}
136135

src/types.ts

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ type Language = {
2828
code: string
2929
hreflang: string
3030
dir: string
31-
wip: boolean
3231
}
3332

3433
export type Languages = {

0 commit comments

Comments
 (0)