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] Fix a bug of not-localized Packages-menu and View-menu #303

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

🐛 [fix] Fix a bug of not-localized Packages-menu and View-menu #303

wants to merge 2 commits into from

Conversation

juggernautjp
Copy link
Contributor

I fixed a bug for the issue #299.

andTheAwesome: "والرائع "
atomCommunity: "مجتمع أتوم"
About:
tabTitle: "عن"
Copy link
Owner

Choose a reason for hiding this comment

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

Looks like there are some whitespace changes, please help remove these, thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am sorry to reply so late. I do not understand the situation, because I have never pushed def/ar/about.cson yet.
And def/ar/about.cson in my local repository is the just the same as that of atom-i18n version 0.25.0, with WinMerge tools.
I noticed that some source code (*.js) and json files used LF as the line separator, and now, use CRLF as it.
So, the files that I pushed as Pull Request use CRLF. Should I push def/ar/about.cson with CRLF?

Copy link
Owner

@liuderchi liuderchi Jul 8, 2021

Choose a reason for hiding this comment

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

@juggernautjp You may just merge the latest main branch and push, to update this PR and resolve conflict.

# update your local main branch
git checkout main
git pull

# update your local PR branch (merge with main)
git checkout add/localize-welcome-views
git merge main --no-edit

# push PR branch
git push

Copy link
Owner

@liuderchi liuderchi left a comment

Choose a reason for hiding this comment

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

Please help resolve some whitespace changes, thanks!

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.

None yet

2 participants