Skip to content
This repository has been archived by the owner on Apr 21, 2021. It is now read-only.

French translation #104

Closed
wants to merge 75 commits into from
Closed

French translation #104

wants to merge 75 commits into from

Conversation

lionel-m
Copy link
Contributor

No description provided.

@aschempp
Copy link
Member

What do you mean by "make a merge"? You should alway be able to retrieve it again from your GitHub fork?
https://github.com/lionel-m/docs/tree/french-translation

@lionel-m
Copy link
Contributor Author

It's ok, I do not really know why I lost the local "fr" folder but I solved the problem...

What do you mean by "make a merge"?

Merging the pull request. But it's ok now thx

@leofeyer
Copy link
Member

leofeyer commented Sep 2, 2014

cause we think it would be a shame only to have it in GitHub

@aschempp Isn't this the best argument to move the documentation to readthedocs.org ASAP?

@lionel-m I am currently experimenting with moving the Contao documentation to readthedocs.org, which supports versioning and translations. My proof of concept is here:

http://contao.readthedocs.org/en/3.3/

Read the docs will allow us to integrate your translation through a separate Git repository ( docs-fr), which you can manage yourself. It will then be available under the domain contao.readthedocs.org/fr/3.3/.

Only @aschempp is not yet convinced :)

@xchs
Copy link
Contributor

xchs commented Sep 2, 2014

Only @aschempp is not yet convinced :)

What are his concerns?

@lionel-m
Copy link
Contributor Author

lionel-m commented Sep 3, 2014

I think this solution is good. I would also like to know the opinion of @aschempp.

Read the docs will allow us to integrate your translation through a separate Git repository (docs-fr)

Also contao/docs-fr ? It would be nice to have the repository in the same organization.

@leofeyer
Copy link
Member

leofeyer commented Sep 3, 2014

Of course contao/docs-fr :)

@leofeyer
Copy link
Member

leofeyer commented Sep 3, 2014

What are his concerns?

Frankly, I don't really know. But I have created a discussion thread now so we can vote: contao/docs#174

@lionel-m
Copy link
Contributor Author

lionel-m commented Feb 9, 2015

@leofeyer, @aschempp : Could you merge this PR please. I would like to delete my fork and recreate a new one. Thx.

@aschempp
Copy link
Member

Would this be the manual for Contao 3.1? Or should it be merged into another version?

@lionel-m
Copy link
Contributor Author

3.2.
I forgot to specify the version. Thanks !

@aschempp
Copy link
Member

I have merged it into the 3.2 branch. It's obviously not yet published on the Contao website because I still need to find time to improve the documentation system. But I guess it will help you re-create your branches :-)

@aschempp aschempp closed this Feb 10, 2015
@lionel-m
Copy link
Contributor Author

@aschempp Thx.

PS: At the moment the version 2 of GitBook is under development. An occasion to re-evaluate this service considering the new improvements... (reference issue #174)

@lionel-m
Copy link
Contributor Author

This pull request is closed, but the lionel-m:french-translation branch has unmerged commits.

This means that some commits were ignored ?

@aschempp
Copy link
Member

I don't think so. I merged the branch into Contao 3.2 even though it was based on 3.1, so maybe that was the problem…

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

Successfully merging this pull request may close these issues.

4 participants