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 french localisation for NumberToWords #189

Closed
wants to merge 1 commit into from
Closed

Add french localisation for NumberToWords #189

wants to merge 1 commit into from

Conversation

Tradioyes
Copy link
Contributor

  • Added french (fr-FR) localisation & tests for NumberToWords
  • Localized NumberToOrdinalWordsExtension, NumberToOrdinalWordsTests and
    DateTimeHumanizePrecisionStrategyTests

Added french (fr-FR) localisation & tests for NumberToWords
Localized NumberToOrdinalWordsExtension, NumberToOrdinalWordsTests and
DateTimeHumanizePrecisionStrategyTests
@Tradioyes
Copy link
Contributor Author

Nevermind, I'm a newbie here, I close this PR to create another one properly merged with recent commits

@Tradioyes Tradioyes closed this Apr 11, 2014
@Tradioyes Tradioyes deleted the FrenchNumberToWords branch April 11, 2014 21:50
@thunsaker
Copy link
Contributor

I was about to say, the easiest way would be to pull the relevant strings out and apply to a new updated branch. This project has been moving very fast the last few days. 😃

@MehdiK
Copy link
Member

MehdiK commented Apr 12, 2014

Thanks for the contribution. No need to close. You should be able to fetch the latest and rebase:

git checkout master
git pull upstream master
git rebase master FrenchNumberToWords

If rebase fails with merge conflicts:

// to fix the merge conflicts
git mergetool

// to continue with the rebase
git rebase --continue

@Tradioyes
Copy link
Contributor Author

I already created PR #190 last night after closing this one. Thanks for the howto though 😃

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.

3 participants