Navigation Menu

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

internationalization #22

Closed
wants to merge 4 commits into from
Closed

internationalization #22

wants to merge 4 commits into from

Conversation

bierdok
Copy link
Contributor

@bierdok bierdok commented Oct 21, 2013

add internationalization support and french translation

how to

  • include js/locales/bootstrap-markdown.fr.js
  • setup {locale: 'fr'} option when instance

@bierdok
Copy link
Contributor Author

bierdok commented Oct 21, 2013

sorry for the indentation

@bierdok bierdok mentioned this pull request Oct 21, 2013
@toopay
Copy link
Member

toopay commented Oct 27, 2013

@bierdok Why you also include unrelated changes (less fixes?) within these pull?

Ref #16

This reverts commit 8597816.
@bierdok
Copy link
Contributor Author

bierdok commented Oct 27, 2013

@toopay Sorry, I do not think I could change the pull after validation. I will work on a different branch next time.

@toopay
Copy link
Member

toopay commented Oct 27, 2013

@bierdok Thanks. If you want to add some feature, focus on that.

@noirbizarre
Copy link

Any plan to merge this ?

@toopay
Copy link
Member

toopay commented Dec 7, 2013

I do not think I could change the pull after validation. I will work on a different branch next time

@bierdok are you done?

@noirbizarre
Copy link

I do not think I could change the pull after validation. I will work on a different branch next time

@toopay Yes you could!

If you are on master, here the process to update your pull-request, rebased on master:

$ git add toopay https://github.com/toopay/bootstrap-markdown.git
$ git fetch fetch toopay
$ git rebase -i toopay/master
# Do what you need (delete the 2 less review commit)
$ git push -f

You're github master branch will be overwritten and the pull request will be updated.

But you are right: when you plan to submit a pull request, always work in a branch with an explicit name.
It allows to update the pull-request easily and let you work on the master without conflicts.

@stol
Copy link

stol commented Jan 27, 2014

+1 for this feature !

@emagnier emagnier mentioned this pull request Mar 8, 2014
@toopay
Copy link
Member

toopay commented Mar 12, 2014

I'll close this. Lets disscuss furthermore at #46

@toopay toopay closed this Mar 12, 2014
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