Skip to content
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

fix: designer i18n locale is not correct #1552

Merged
merged 1 commit into from
Feb 20, 2023

Conversation

Jandiasnow
Copy link
Contributor

No description provided.

@CLAassistant
Copy link

CLAassistant commented Feb 9, 2023

CLA assistant check
All committers have signed the CLA.

@JackLian JackLian removed their request for review February 10, 2023 02:08
@JackLian
Copy link
Collaborator

CLA麻烦签一下

@Jandiasnow
Copy link
Contributor Author

@JackLian 请问下 1.0.18 版本的 fix 提交哪个分支呢

@JackLian
Copy link
Collaborator

@JackLian 请问下 1.0.18 版本的 fix 提交哪个分支呢
已发的版本无法提交,所有pr都提到develop即可,会跟随下个版本发布

@Jandiasnow
Copy link
Contributor Author

哦,好的

@liujuping
Copy link
Collaborator

this.getLocale 可能不是一个 function,需要做一下判断并处理。

@@ -830,7 +830,7 @@ export default function baseRendererFactory(): IBaseRenderComponent {
}
}

const handleI18nData = (innerProps: any) => innerProps[innerProps.use || 'zh-CN'];
const handleI18nData = (innerProps: any) => innerProps[innerProps.use || this.getLocale && this.getLocale() || 'zh-CN'];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this.getLocale && this.getLocale()用括号括起来吧, 像这样
innerProps[innerProps.use || (this.getLocale && this.getLocale()) || 'zh-CN'];

@JackLian JackLian merged commit 6753bf6 into alibaba:develop Feb 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants