Skip to content

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

Open
juggernautjp wants to merge 2 commits into
liuderchi:mainfrom
juggernautjp:fix/not-localized-package-menu
Open

🐛 [fix] Fix a bug of not-localized Packages-menu and View-menu#303
juggernautjp wants to merge 2 commits into
liuderchi:mainfrom
juggernautjp:fix/not-localized-package-menu

Conversation

@juggernautjp

Copy link
Copy Markdown
Contributor

I fixed a bug for the issue #299.

Comment thread def/ar/about.cson
andTheAwesome: "والرائع "
atomCommunity: "مجتمع أتوم"
About:
tabTitle: "عن"

Copy link
Copy Markdown
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
Copy Markdown
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?

@liuderchi liuderchi Jul 8, 2021

Copy link
Copy Markdown
Owner

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

@liuderchi liuderchi left a comment

Copy link
Copy Markdown
Owner

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.

2 participants