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

Add translation to missing items #1180

Merged
merged 9 commits into from
Nov 14, 2022
Merged

Add translation to missing items #1180

merged 9 commits into from
Nov 14, 2022

Conversation

kostyafarber
Copy link
Contributor

@kostyafarber kostyafarber commented Nov 5, 2022 •
edited
Loading

Summary

The purporse of this PR is to add translation to the missing items as identified in #1023, which looks to close out that issue.

NOTE: this is a start on the issue and I intend to clear off the rest of the items over time.

@welcome
Copy link

welcome bot commented Nov 5, 2022

Thanks for submitting your first pull request! You are awesome! 🤗

If you haven't done so already, check out Jupyter's Code of Conduct. Also, please make sure you followed the pull request template, as this will help us review your contribution more quickly.
welcome
You can meet the other Jovyans by joining our Discourse forum. There is also a intro thread there where you can stop by and say Hi! 👋

Welcome to the Jupyter community! 🎉

@github-actions
Copy link

github-actions bot commented Nov 5, 2022

Binder 👈 Launch a binder notebook on branch kostyafarber/jupyterlab-git/issue-1023

@kostyafarber kostyafarber changed the title Add translation to missing items. Add translation to missing items Nov 5, 2022
fcollonval
fcollonval reviewed Nov 7, 2022
View reviewed changes
Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

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

Thanks a lot @kostyafarber

Do you want me to merge this one or let it open to add additional elements?

@kostyafarber
Copy link
Contributor Author

kostyafarber commented Nov 7, 2022 •
edited
Loading

I think leave it open? Can merge once we've tackled everything.

Unless you think it could be useful for users to have the translations in ASAP? In this case happy to merge and I'll keep opening PRs to address the rest.

@fcollonval
Copy link
Member

Ok I let it open for now. Don't hesitate to ping me when it is ready.

@kostyafarber
Copy link
Contributor Author

Ok I let it open for now. Don't hesitate to ping me when it is ready.

Thanks!

@kostyafarber
Copy link
Contributor Author

@fcollonval Just finished up the translation for the merge addon. As discussed in #1023 we can't do anything atm about nbdime. I will leave it here for now, but as always let me know if I need to do anything else.

fcollonval
fcollonval requested changes Nov 14, 2022
View reviewed changes
Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

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

Thanks @kostyafarber

I left some small suggestions.

src/components/diff/PlainTextDiff.ts Outdated Show resolved Hide resolved
src/components/diff/PlainTextDiff.ts Outdated Show resolved Hide resolved
src/components/diff/PlainTextDiff.ts Outdated Show resolved Hide resolved
schema/plugin.json Outdated Show resolved Hide resolved
src/components/diff/mergeview.ts Outdated Show resolved Hide resolved
kostyafarber and others added 5 commits November 14, 2022 10:04
@kostyafarber @fcollonval
Update src/components/diff/PlainTextDiff.ts
3987cea 
Change to CodeMirror 5 translations.

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
@kostyafarber @fcollonval
Update src/components/diff/PlainTextDiff.ts
3046630 
Change translation to type Record.

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
@kostyafarber @fcollonval
Update src/components/diff/PlainTextDiff.ts
17db802 
Change translation to type Record.

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
@kostyafarber @fcollonval
Update schema/plugin.json
f0e3fe6 
Fix indentation

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
@kostyafarber @fcollonval
Update src/components/diff/mergeview.ts
dd2ce2a 
Make phrases optional

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
@kostyafarber
Copy link
Contributor Author

@fcollonval many thanks for the review!

@fcollonval
Copy link
Member

Thanks to you for this great work @kostyafarber

@fcollonval fcollonval merged commit 12ba1ed into jupyterlab:master Nov 14, 2022
@welcome
Copy link

welcome bot commented Nov 14, 2022

Congrats on your first merged pull request in this project! 🎉
congrats
Thank you for contributing, we are very proud of you! ❤️

@kostyafarber kostyafarber deleted the issue-1023 branch November 14, 2022 12:05
@kostyafarber
Copy link
Contributor Author

@all-contributors please add @kostyafarber for code

@allcontributors allcontributors bot mentioned this pull request Nov 28, 2022
Merged
@allcontributors
Copy link
Contributor

@kostyafarber

I've put up a pull request to add @kostyafarber! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fcollonval fcollonval fcollonval approved these changes

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kostyafarber @fcollonval