Skip to content

Add french localisation for NumberToWords#189

Closed
Tradioyes wants to merge 1 commit into
Humanizr:masterfrom
Tradioyes:FrenchNumberToWords
Closed

Add french localisation for NumberToWords#189
Tradioyes wants to merge 1 commit into
Humanizr:masterfrom
Tradioyes:FrenchNumberToWords

Conversation

@Tradioyes

Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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

MehdiK commented Apr 12, 2014

Copy link
Copy Markdown
Collaborator

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
Copy Markdown
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