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

More Japanese #4150

Merged
merged 7 commits into from
Jan 27, 2019
Merged

More Japanese #4150

merged 7 commits into from
Jan 27, 2019

Conversation

LuminaryXion
Copy link
Contributor

Trying to add an additional update. Having issues with the process. Hopefully I got it this time!

Trying to add an additional update. Having issues with the process. Hopefully I got it this time!
@PieterGit
Copy link
Contributor

@LuminaryXion do you want to be a maintainer for the Japanese language, if so please PR https://github.com/nightscout/cgm-remote-monitor/blob/dev/CONTRIBUTING.md#translators

@LuminaryXion
Copy link
Contributor Author

Hi! I've added myself as a Japanese contributor. Hopefully I got it right. :)

@LuminaryXion
Copy link
Contributor Author

resolved the conflicts. Should be good to go now!

@LuminaryXion
Copy link
Contributor Author

@PieterGit Hi Pieter! Is this mergable yet? Thank you!

@PieterGit
Copy link
Contributor

@LuminaryXion You changed some whitespacing, which does not look good on first sight. Please make sure https://github.com/nightscout/cgm-remote-monitor/pull/4150/files only lists japanse fixes and don't make changes to the whitespacing

@PieterGit
Copy link
Contributor

@LuminaryXion can you have a look at this in the coming days. I would like to work on #4209 and then all translations must be merged to dev first. Otherwise you need to convert the new translations to JSON instead of that I can do that with a script for you.

@LuminaryXion
Copy link
Contributor Author

LuminaryXion commented Jan 25, 2019

Hi @PieterGit I found what you were talking about. Fixed it- have a look now. :)

I see what you mean. Fixed it. :)
Used the wrong semiquote.. urg. sorry! All better now.
lib/language.js Outdated Show resolved Hide resolved
@PieterGit
Copy link
Contributor

@LuminaryXion You fixed a couple, but not all. Please check that your IDE or editor does not insert tab's.
E.g.
image

You can check that https://github.com/nightscout/cgm-remote-monitor/pull/4150/files only should show Japanese additions and not spacing changes to other lines. If you don't fix this, the Git history for those lines will be wrong and will tell people you changed those lines.

@LuminaryXion
Copy link
Contributor Author

Ok, I found an easy-ish way to manually put it back and did so. Looks all good to me now. Sorry for the trouble! My OCD kicked in and tried to help. xD

LMK if anything else. :)

@PieterGit PieterGit merged commit 4d38ef4 into nightscout:dev Jan 27, 2019
@PieterGit
Copy link
Contributor

LGTM. Merging to dev.

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