diff --git a/.changeset/neat-jokes-remember.md b/.changeset/neat-jokes-remember.md new file mode 100644 index 00000000000..32adad20b35 --- /dev/null +++ b/.changeset/neat-jokes-remember.md @@ -0,0 +1,7 @@ +--- +'@clerk/localizations': patch +'@clerk/clerk-js': patch +'@clerk/types': patch +--- + +Add `subtitleCombined` localizations to sign-in-or-up flow. diff --git a/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx b/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx index 3ad6c2c798f..88ceafd0341 100644 --- a/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx +++ b/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx @@ -429,14 +429,23 @@ export function _SignInStart(): JSX.Element { - {isCombinedFlow ? ( - - ) : ( - <> - - - - )} + + {card.error} {/*TODO: extract main in its own component */} diff --git a/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx b/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx index 54d90d127db..2697b98852a 100644 --- a/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx +++ b/packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx @@ -287,7 +287,13 @@ function _SignUpStart(): JSX.Element { isCombinedFlow ? localizationKeys('signUp.start.titleCombined') : localizationKeys('signUp.start.title') } /> - + {card.error} = {}; if (Object.prototype.hasOwnProperty.call(obj, 'locale')) { - // @ts-expect-error - TS7053 sortedObj['locale'] = obj['locale']; } Object.keys(obj) .sort() .forEach(key => { if (key !== 'locale') { - // @ts-expect-error - TS7053 sortedObj[key] = sortObject(obj[key]); } }); @@ -161,19 +164,24 @@ run(enUS, 'en-US'); run(elGR, 'el-GR'); run(arSA, 'ar-SA'); run(beBY, 'be-BY'); +run(caES, 'ca-ES'); run(csCZ, 'cs-CZ'); run(daDK, 'da-DK'); run(deDE, 'de-DE'); +run(enGB, 'en-GB'); run(esES, 'es-ES'); run(esMX, 'es-MX'); run(frFR, 'fr-FR'); run(fiFI, 'fi-FI'); run(heIL, 'he-IL'); +run(hrHR, 'hr-HR'); +run(idID, 'id-ID'); run(isIS, 'is-IS'); run(itIT, 'it-IT'); run(jaJP, 'ja-JP'); run(koKR, 'ko-KR'); run(mnMN, 'mn-MN'); +run(nlBE, 'nl-BE'); run(nbNO, 'nb-NO'); run(nlNL, 'nl-NL'); run(plPL, 'pl-PL'); diff --git a/packages/localizations/src/vi-VN.ts b/packages/localizations/src/vi-VN.ts index 97ecf183df3..89c1578966a 100644 --- a/packages/localizations/src/vi-VN.ts +++ b/packages/localizations/src/vi-VN.ts @@ -459,6 +459,7 @@ export const viVN: LocalizationResource = { actionText: 'Chưa có tài khoản?', actionText__join_waitlist: undefined, subtitle: 'để tiếp tục với {{applicationName}}', + subtitleCombined: undefined, title: 'Đăng nhập', titleCombined: undefined, }, @@ -538,6 +539,7 @@ export const viVN: LocalizationResource = { actionLink__use_phone: undefined, actionText: 'Đã có tài khoản?', subtitle: 'để tiếp tục với {{applicationName}}', + subtitleCombined: 'để tiếp tục với {{applicationName}}', title: 'Tạo tài khoản của bạn', titleCombined: 'Tạo tài khoản của bạn', }, diff --git a/packages/localizations/src/zh-CN.ts b/packages/localizations/src/zh-CN.ts index 22d1a5dfa75..0d206eb3cf4 100644 --- a/packages/localizations/src/zh-CN.ts +++ b/packages/localizations/src/zh-CN.ts @@ -450,6 +450,7 @@ export const zhCN: LocalizationResource = { actionText: '还没有账户?', actionText__join_waitlist: undefined, subtitle: '继续使用 {{applicationName}}', + subtitleCombined: undefined, title: '登录', titleCombined: undefined, }, @@ -529,6 +530,7 @@ export const zhCN: LocalizationResource = { actionLink__use_phone: undefined, actionText: '已经有账户了?', subtitle: '继续使用 {{applicationName}}', + subtitleCombined: '继续使用 {{applicationName}}', title: '创建您的账户', titleCombined: '创建您的账户', }, diff --git a/packages/localizations/src/zh-TW.ts b/packages/localizations/src/zh-TW.ts index f5e863cd324..6b5804f5461 100644 --- a/packages/localizations/src/zh-TW.ts +++ b/packages/localizations/src/zh-TW.ts @@ -456,6 +456,7 @@ export const zhTW: LocalizationResource = { actionText: '還沒有帳戶?', actionText__join_waitlist: undefined, subtitle: '繼續使用 {{applicationName}}', + subtitleCombined: undefined, title: '登錄', titleCombined: undefined, }, @@ -535,6 +536,7 @@ export const zhTW: LocalizationResource = { actionLink__use_phone: undefined, actionText: '已經有帳戶了?', subtitle: '繼續使用 {{applicationName}}', + subtitleCombined: '繼續使用 {{applicationName}}', title: '創建您的帳戶', titleCombined: '創建您的帳戶', }, diff --git a/packages/types/src/localization.ts b/packages/types/src/localization.ts index 9ce5711dde6..b873a93554f 100644 --- a/packages/types/src/localization.ts +++ b/packages/types/src/localization.ts @@ -102,6 +102,7 @@ type _LocalizationResource = { title: LocalizationValue; titleCombined: LocalizationValue; subtitle: LocalizationValue; + subtitleCombined: LocalizationValue; actionText: LocalizationValue; actionLink: LocalizationValue; actionLink__use_phone: LocalizationValue; @@ -175,6 +176,7 @@ type _LocalizationResource = { title: LocalizationValue; titleCombined: LocalizationValue; subtitle: LocalizationValue; + subtitleCombined: LocalizationValue; actionText: LocalizationValue; actionLink: LocalizationValue; actionLink__use_email: LocalizationValue;