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

Add Ukraininan language #414

Merged
merged 1 commit into from May 24, 2015
Merged

Conversation

dmytro-i
Copy link
Contributor

Hi everyone,

Continued PR from #411

I was didn't create a branch from the very beginning and was working in my master and therefore could not really rebase and make things clean. So I removed and re-created the repository.

Please review and let me know if it's OK.

@dmytro-i
Copy link
Contributor Author

/cc @mexx @hazzik

@dmytro-i
Copy link
Contributor Author

@hazzik Rebased commit should be on master or in add-ukrainian-language branch?

@@ -1,6 +1,7 @@
###In Development

[Commits](https://github.com/MehdiK/Humanizer/compare/v1.35.0...master)
- [#399](https://github.com/MehdiK/Humanizer/pull/414): Add Ukraininan language
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please change the PR number in link text to 414 from 399?

dmytro-i added a commit to dmytro-i/Humanizer that referenced this pull request May 19, 2015
dmytro-i added a commit to dmytro-i/Humanizer that referenced this pull request May 19, 2015
dmytro-i added a commit to dmytro-i/Humanizer that referenced this pull request May 19, 2015
dmytro-i added a commit to dmytro-i/Humanizer that referenced this pull request May 19, 2015
@dmytro-i
Copy link
Contributor Author

So I was finally able to rebase and squash commits into one.

What I don't understand is why is there an empty commit called 'Merge branch 'add-ukrainian-language' of...' I didn't create it and just appeared there after I synced commit after rebase.

@dmytro-i dmytro-i closed this May 19, 2015
@dmytro-i dmytro-i deleted the add-ukrainian-language branch May 19, 2015 09:35
@dmytro-i dmytro-i restored the add-ukrainian-language branch May 19, 2015 09:35
@dmytro-i dmytro-i reopened this May 19, 2015
@hazzik
Copy link
Member

hazzik commented May 19, 2015

you need to force push

@dmytro-i
Copy link
Contributor Author

Should I just run git push --force ?
It says 'Everything is up to date'

@hazzik
Copy link
Member

hazzik commented May 19, 2015

Yes, now everything "up to date", but it is complete mess.

@hazzik
Copy link
Member

hazzik commented May 19, 2015

You may want to do following

git remote add upstream https://github.com/MehdiK/Humanizer.git
git checkout add-ukrainian-language
git reset a6cfc0d -- hard
git rebase upstream/master -i

in the dialog squash wanted commits, edit the commit message

git push origin add-ukrainian-language:add-ukrainian-language -f

Or like this:

git remote add upstream https://github.com/MehdiK/Humanizer.git
git merge upstream/master
git reset upstream/master

Commit all files again. With appropriate commit message

git push origin add-ukrainian-language:add-ukrainian-language -f

@hazzik
Copy link
Member

hazzik commented May 19, 2015

You still merge with your master. Dont do this:) Try again.

Before you begin again:

git checkout master
git reset upstream/master --hard

@dmytro-i
Copy link
Contributor Author

My master and my branch are now restored to desired state.

So now I squash my commits into one commit, correct?

@hazzik
Copy link
Member

hazzik commented May 19, 2015

@dmytro-ielkin yes, please

@dmytro-i
Copy link
Contributor Author

Did I do it right this time?

dmytro-i added a commit to dmytro-i/Humanizer that referenced this pull request May 19, 2015
@dmytro-i dmytro-i force-pushed the add-ukrainian-language branch 2 times, most recently from 810c21a to e4409f1 Compare May 19, 2015 13:30
[InlineData(24, "через 24 секунди")]
[InlineData(25, "через 25 секунд")]
[InlineData(40, "через 40 секунд")]
public void SecondsFromNow(int seconds, string expected)
Copy link
Member

Choose a reason for hiding this comment

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

You have one complex language!! ;)

MehdiK added a commit that referenced this pull request May 24, 2015
@MehdiK MehdiK merged commit 309ccef into Humanizr:master May 24, 2015
@MehdiK
Copy link
Member

MehdiK commented May 25, 2015

Thanks for the contribution. This is now available on nuget as v1.36.0.

@dmytro-i
Copy link
Contributor Author

Awesome. Thank you too for the creating the project in the first place.

@dmytro-i dmytro-i deleted the add-ukrainian-language branch January 16, 2019 14:11
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.

None yet

4 participants