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: chart tool can't display chinese #9686

Merged
merged 6 commits into from
Oct 24, 2024
Merged

Conversation

hjlarry
Copy link
Contributor

@hjlarry hjlarry commented Oct 23, 2024

Checklist:

Important

Please review the checklist below before submitting your pull request.

  • Please open an issue before creating a PR or link to an existing issue
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

Description

Fixes #9657

the font file comes from here https://github.com/adobe-fonts/source-han-sans?tab=License-1-ov-file , please makesure the copyright is OK

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update, included: Dify Document
  • Improvement, including but not limited to code refactoring, performance optimization, and UI/UX improvement
  • Dependency upgrade

Testing Instructions

test locally

  • Test A
  • Test B

@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. 🐞 bug Something isn't working labels Oct 23, 2024
@laipz8200
Copy link
Member

I hope to avoid uploading the font file directly to the code base. It is too large and will slow down the speed of users pulling the code.

Do we have a better way to fix this? For example, download fonts when building Docker Image?

@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. and removed size:S This PR changes 10-29 lines, ignoring generated files. labels Oct 23, 2024
@hjlarry
Copy link
Contributor Author

hjlarry commented Oct 23, 2024

I hope to avoid uploading the font file directly to the code base. It is too large and will slow down the speed of users pulling the code.

Do we have a better way to fix this? For example, download fonts when building Docker Image?

now I changed the implement detail:

  • define a common used chinese font list of mac/linux/windows
  • install the Noto CJK font for the docker environment
  • try to find any installed font of current envrionment
  • remove the old init_font() method, it seems useless

local test with windows and docker

@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Oct 23, 2024
@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. and removed size:L This PR changes 100-499 lines, ignoring generated files. labels Oct 23, 2024
Copy link
Member

@laipz8200 laipz8200 left a comment

Choose a reason for hiding this comment

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

LGTM

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Oct 24, 2024
@laipz8200 laipz8200 merged commit e271016 into langgenius:main Oct 24, 2024
6 checks passed
idonotknow pushed a commit to AceDataCloud/Dify that referenced this pull request Nov 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Generate bar chart with Chinese xAxis displaying garbled characters
2 participants