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

New it_IT attempt #349

Closed
wants to merge 3 commits into from
Closed

New it_IT attempt #349

wants to merge 3 commits into from

Conversation

simonecorsi
Copy link

My first PR of it_IT locals + #289 issue followup, updated to current master branch, conflicts resolved.

grunt jscs jshint return no errors, but I see travis it's not going well, I never used it in my workflow so let me know if there is something I shoud check.

@andersevenrud
Copy link
Member

Looks good to me! :) The failing test is because of an utdated package referenced in package.json (I will fix that myself)

Could you please squash your commits to something like "Added it_IT locales" or something ?

https://github.com/os-js/OS.js/blob/master/CONTRIBUTING.md#making-and-submitting-changes

@andersevenrud
Copy link
Member

I can squash it myself, just checking if you know how :)

@simonecorsi
Copy link
Author

I didn't know, I'm checking how to for the time :)

@andersevenrud
Copy link
Member

I just tried it for myself, and it's not that easy since one of your commits are made in the past and conflicts occur while doing a git rebase.

I think the best option here is to make a backup of your translations, reset your repo, then copy changed files back and do a new commit and PR.

The npm-debug.log should not be in the commit btw :)

@simonecorsi
Copy link
Author

I was thinking of resetting a couple of hour ago because of it, let's close this pr then, I'll make the reset when I have some spare time in the next days :)

@andersevenrud
Copy link
Member

Allright :)

@andersevenrud
Copy link
Member

Just wondering about the status here. Not in a hurry or anything, just like to keep myself updated :)

@simonecorsi
Copy link
Author

Yea I know sorry, I've been really busy at work, I'm going to take sometimes tonight to do it or it'll take forever!

@andersevenrud
Copy link
Member

Yea I know sorry, I've been really busy at work, I'm going to take sometimes tonight to do it or it'll take forever!

Don't feel sorry, man. It's not like you even had to do this, but I really appreciate that you did :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants