From e94b323e6c94cc391178bbb2fcd3cef2d964b8db Mon Sep 17 00:00:00 2001 From: Yeuoly <45712896+Yeuoly@users.noreply.github.com> Date: Sun, 3 Mar 2024 12:35:28 +0800 Subject: [PATCH] fix: use English as the default i18n language (#2663) --- .../model-provider-page/model-icon/index.tsx | 2 +- .../model-provider-page/model-modal/Form.tsx | 12 ++++++------ .../model-provider-page/model-modal/index.tsx | 4 ++-- .../model-provider-page/model-name/index.tsx | 5 ++--- .../model-parameter-modal/parameter-item.tsx | 6 +++--- .../model-selector/popup-item.tsx | 2 +- .../model-selector/popup.tsx | 17 ++++++++++++++++- .../model-provider-page/provider-card/index.tsx | 2 +- .../model-provider-page/provider-icon/index.tsx | 2 +- 9 files changed, 33 insertions(+), 19 deletions(-) diff --git a/web/app/components/header/account-setting/model-provider-page/model-icon/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-icon/index.tsx index e9e9bcccac..347572c755 100644 --- a/web/app/components/header/account-setting/model-provider-page/model-icon/index.tsx +++ b/web/app/components/header/account-setting/model-provider-page/model-icon/index.tsx @@ -26,7 +26,7 @@ const ModelIcon: FC = ({ return ( model-icon ) diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx index db436a1547..69f50f374e 100644 --- a/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx +++ b/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx @@ -69,7 +69,7 @@ const Form: FC = ({ - {tooltip[language]} + {tooltip[language] || tooltip.en_US} } > @@ -91,7 +91,7 @@ const Form: FC = ({ return (
- {label[language]} + {label[language] || label.en_US} { required && ( * @@ -104,7 +104,7 @@ const Form: FC = ({ value={(isShowDefaultValue && ((value[variable] as string) === '' || value[variable] === undefined || value[variable] === null)) ? formSchema.default : value[variable]} onChange={val => handleFormChange(variable, val)} validated={validatedSuccess} - placeholder={placeholder?.[language]} + placeholder={placeholder?.[language] || placeholder?.en_US} disabled={disabed} type={formSchema.type === FormTypeEnum.textNumber ? 'number' : 'text'} {...(formSchema.type === FormTypeEnum.textNumber ? { min: (formSchema as CredentialFormSchemaNumberInput).min, max: (formSchema as CredentialFormSchemaNumberInput).max } : {})} @@ -132,7 +132,7 @@ const Form: FC = ({ return (
- {label[language]} + {label[language] || label.en_US} { required && ( * @@ -188,7 +188,7 @@ const Form: FC = ({ return (
- {label[language]} + {label[language] || label.en_US} { required && ( @@ -230,7 +230,7 @@ const Form: FC = ({
- {label[language]} + {label[language] || label.en_US} {tooltipContent}
= ({ (provider.help && (provider.help.title || provider.help.url)) ? ( !provider.help.url && e.preventDefault()} > - {provider.help.title?.[language] || provider.help.url[language]} + {provider.help.title?.[language] || provider.help.url[language] || provider.help.title?.en_US || provider.help.url.en_US} ) diff --git a/web/app/components/header/account-setting/model-provider-page/model-name/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-name/index.tsx index 87f34c08f2..d828c703db 100644 --- a/web/app/components/header/account-setting/model-provider-page/model-name/index.tsx +++ b/web/app/components/header/account-setting/model-provider-page/model-name/index.tsx @@ -34,7 +34,6 @@ const ModelName: FC = ({ if (!modelItem) return null - return (
= ({ >
- {modelItem.label[language]} + {modelItem.label[language] || modelItem.label.en_US}
{ showModelType && modelItem.model_type && ( diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item.tsx index 80bfd7dbab..f62c1687dc 100644 --- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item.tsx +++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item.tsx @@ -218,16 +218,16 @@ const ParameterItem: FC = ({
- {parameterRule.label[language]} + {parameterRule.label[language] || parameterRule.label.en_US}
{ parameterRule.help && ( {parameterRule.help[language]}
+
{parameterRule.help[language] || parameterRule.help.en_US}
)} > diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx index e46f94b21f..cdc8bbd7ae 100644 --- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx +++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx @@ -65,7 +65,7 @@ const PopupItem: FC = ({ return (
- {model.label[language]} + {model.label[language] || model.label.en_US}
{ model.models.map(modelItem => ( diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx index 3cb420c478..5f768962f3 100644 --- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx +++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx @@ -23,7 +23,22 @@ const Popup: FC = ({ const language = useLanguage() const [searchText, setSearchText] = useState('') - const filteredModelList = modelList.filter(model => model.models.filter(modelItem => modelItem.label[language].includes(searchText)).length) + const filteredModelList = modelList.filter( + model => model.models.filter( + (modelItem) => { + if (modelItem.label[language] !== undefined) + return modelItem.label[language].includes(searchText) + + let found = false + Object.keys(modelItem.label).forEach((key) => { + if (modelItem.label[key].includes(searchText)) + found = true + }) + + return found + }, + ).length, + ) return (
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-card/index.tsx b/web/app/components/header/account-setting/model-provider-page/provider-card/index.tsx index 82a7b9f5ab..8918c69d9c 100644 --- a/web/app/components/header/account-setting/model-provider-page/provider-card/index.tsx +++ b/web/app/components/header/account-setting/model-provider-page/provider-card/index.tsx @@ -69,7 +69,7 @@ const ProviderCard: FC = ({
{ provider.description && ( -
{provider.description[language]}
+
{provider.description[language] || provider.description.en_US}
) }
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-icon/index.tsx b/web/app/components/header/account-setting/model-provider-page/provider-icon/index.tsx index 6b423ce75c..27e6e40490 100644 --- a/web/app/components/header/account-setting/model-provider-page/provider-icon/index.tsx +++ b/web/app/components/header/account-setting/model-provider-page/provider-icon/index.tsx @@ -16,7 +16,7 @@ const ProviderIcon: FC = ({ return ( provider-icon )