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.

Sign up for GitHub

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

Jump to bottom

fix(i18n): enhance default language fallback #19107

Merged
merged 1 commit into from
Sep 12, 2023
Merged

fix(i18n): enhance default language fallback #19107

merged 1 commit into from
Sep 12, 2023

Conversation

ultravires
Copy link
Contributor

@ultravires ultravires commented Sep 11, 2023 •
edited
Loading

Brief Information

This pull request is in the type of:

  • bug fixing
  • new feature
  • others

What does this PR do?

Fixed t is undefined. when (document.documentElement.lang || navigator.language || (navigator as any).browserLanguage) return undefined.

Fixed issues

#19106

Details

Before: What was the problem?

After: How does it behave after the fixing?

Document Info

One of the following should be checked.

  • This PR doesn't relate to document changes
  • The document should be updated later
  • The document changes have been made in apache/echarts-doc#xxx

Misc

ZRender Changes

  • This PR depends on ZRender changes (ecomfe/zrender#xxx).

Related test cases or examples to use the new APIs

N.A.

Others

Merging options

  • Please squash the commits into a single one when merging.

Other information

@echarts-bot
Copy link

echarts-bot bot commented Sep 11, 2023

Thanks for your contribution!
The community will review it ASAP. In the meanwhile, please checkout the coding standard and Wiki about How to make a pull request.

⚠️ MISSING DOCUMENT INFO: Please make sure one of the document options are checked in this PR's description. Search "Document Info" in the description of this PR. This should be done either by the author or the reviewers of the PR.

plainheart
plainheart reviewed Sep 11, 2023
View reviewed changes
src/core/locale.ts
@@ -37,7 +37,7 @@ const localeModels: Dictionary<Model> = {};
export const SYSTEM_LANG = !env.domSupported ? DEFAULT_LOCALE : (function () {
const langStr = (
/* eslint-disable-next-line */
document.documentElement.lang || navigator.language || (navigator as any).browserLanguage
document.documentElement.lang || navigator.language || (navigator as any).browserLanguage || DEFAULT_LOCALE
Copy link
Member

Choose a reason for hiding this comment

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

Can you explain when and which item will be undefined?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Browser: Firefox ESR 52.5.2_x86

image

Copy link
Member

Choose a reason for hiding this comment

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

Though I tested it in Firefox ESR 52.5.2 (Win64) and found the language is not undefined, adding a fallback to prevent potential errors is always good.

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, It can meet some customized terminals (customized browser).

plainheart
plainheart approved these changes Sep 12, 2023
View reviewed changes
src/core/locale.ts
@@ -37,7 +37,7 @@ const localeModels: Dictionary<Model> = {};
export const SYSTEM_LANG = !env.domSupported ? DEFAULT_LOCALE : (function () {
const langStr = (
/* eslint-disable-next-line */
document.documentElement.lang || navigator.language || (navigator as any).browserLanguage
document.documentElement.lang || navigator.language || (navigator as any).browserLanguage || DEFAULT_LOCALE
Copy link
Member

Choose a reason for hiding this comment

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

Though I tested it in Firefox ESR 52.5.2 (Win64) and found the language is not undefined, adding a fallback to prevent potential errors is always good.

image

@plainheart plainheart changed the title #19106 fix(i18n): enhance default language fallback Sep 12, 2023
@plainheart plainheart added this to the 5.5.0 milestone Sep 12, 2023
@plainheart plainheart linked an issue Sep 12, 2023 that may be closed by this pull request
[Feature] Robustness #19106
Closed
@github-actions
Copy link
Contributor

The changes brought by this PR can be previewed at: https://echarts.apache.org/examples/editor?version=PR-19107@8400db4

@plainheart plainheart merged commit fbee94d into apache:master Sep 12, 2023
2 checks passed
@echarts-bot
Copy link

echarts-bot bot commented Sep 12, 2023

Congratulations! Your PR has been merged. Thanks for your contribution! 👍

@ultravires ultravires deleted the fix-19106 branch September 13, 2023 02:31
@X-oss-byte X-oss-byte mentioned this pull request May 25, 2024
Open
@chandraguptsharma1 chandraguptsharma1 mentioned this pull request Jul 17, 2024
Open
@Elenore23 Elenore23 mentioned this pull request Jul 20, 2024
Open
@junior junior mentioned this pull request Jul 26, 2024
Closed
@X-oss-byte X-oss-byte mentioned this pull request Aug 7, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@plainheart plainheart plainheart approved these changes

Assignees
No one assigned
Labels
PR: doc unchanged PR: first-time contributor size/XS
Projects
None yet
Milestone
5.5.0
Development

Successfully merging this pull request may close these issues.

[Feature] Robustness
2 participants
@ultravires @plainheart