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

Setup translations #69

Merged
merged 7 commits into from
Apr 17, 2019
Merged

Setup translations #69

merged 7 commits into from
Apr 17, 2019

Conversation

lucienbl
Copy link
Contributor

@lucienbl lucienbl commented Apr 17, 2019 •
edited
Loading

This should setup the translations in order to translate the app! There might be some missing strings I forgot to add but most of them are done.

@lucienbl
Copy link
Contributor Author

Seems to be some indentation issues, will run lint and update the pull request!

@amaury1093
Copy link
Member

Thanks, that was fast! I'll have a look tonight.

You can run yarn lint --fix to fix most of them

@lucienbl
Copy link
Contributor Author

Thanks! Has been done 👍

@lucienbl lucienbl changed the title Setup translations Setup translations & Fix dark video background Apr 17, 2019
amaury1093
amaury1093 reviewed Apr 17, 2019
View reviewed changes
Copy link
Member

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

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

Very nice, works well! I have just a couple of small comments, and then we can merge.

App/localization/languages/en.json Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
App/localization/languages/en.json Outdated Show resolved Hide resolved
@amaury1093
Copy link
Member

@lucienbl Could you actually create another new PR with commit 5d2f0a0? Each PR should have only one purpose

@lucienbl
Copy link
Contributor Author

Sure, github actually added them automatically how can I remove them from the pr? 🤔

@amaury1093
Copy link
Member

how can I remove them from the pr?

Have a look at git rebase -i HEAD~10, drop the commit, and git push --force again. Be sure to backup the dropped commit first.

@lucienbl
Copy link
Contributor Author

lucienbl commented Apr 17, 2019 •
edited
Loading

Okay got it to create a separate pull request (#70) but to create a "clean" pull request for translations, do I have to rebase a new on and delete this pull request (#69) ? Thanks :)

Edit: #69 & #70 should be clean now 👍

amaury1093 and others added 3 commits April 17, 2019 21:58
@lucienbl lucienbl changed the title Setup translations & Fix dark video background Setup translations Apr 17, 2019
amaury1093
amaury1093 approved these changes Apr 17, 2019
View reviewed changes
Copy link
Member

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

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

lgtm!

@amaury1093 amaury1093 merged commit 86919a9 into shootismoke:master Apr 17, 2019
@amaury1093 amaury1093 mentioned this pull request Apr 17, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amaury1093 amaury1093 amaury1093 approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@lucienbl @amaury1093