[mapserver-dev] Pull requests in documentation
Jeff McKenna
jmckenna at gatewaygeomatics.com
Mon Dec 9 12:14:38 PST 2013
Hi ThomasG,
I've upgraded Sphinx to 1.2b3 on the server.
Also, I checked out a separate clone of branch-6-4 on the server, and
the *.mo files are generated and all manual gettext commands work fine.
However, the server scripts have lots of logic it seems to check if any
changes...but I seem to be unable to manually execute (here is response
from build-all-docs.sh):
Your branch is ahead of 'origin/branch-6-4' by 31 commits.
From git://github.com/mapserver/docs
* branch branch-6-4 -> FETCH_HEAD
Already up-to-date.
repo not updated, no use building
Since I didn't create these scripts it's not easy for me. Still trying
to understand.
-jeff
On 2013-12-09 1:57 PM, Thomas Gratier wrote:
> Hi Jeff,
>
> The changes are in the repository and the branch 6.4 e.g
> https://github.com/mapserver/docs/commit/366f954b59bcc18ea6ae37b1bb60342f9c23cb5c
> so it's already updated.
> I suppose there is a problem with deployment.
> The first problem is I see the version of Sphinx is outdated on the
> server (1.1.2 instead of 1.2b3, the bottom page of mapserver.org
> <http://mapserver.org> says " Created using Sphinx
> <http://sphinx.pocoo.org/> 1.1.2. ")
> Can you also see if in the server, you have in the clone from git, in
> translated/fr/LC_MESSAGES/ a bunch of *.mo files indicating that gettext
> is working well using Sphinx?
>
> Cheers
>
> ThomasG
>
>
>
>
>
>
>
> 2013/12/9 Jeff McKenna <jmckenna at gatewaygeomatics.com
> <mailto:jmckenna at gatewaygeomatics.com>>
>
> Hello ThomasG,
>
> When you mention that you updated the build script
> (https://github.com/mapserver/docs/blob/branch-6-4/scripts/build_docs.sh)
> what
> changes need to be made? Or maybe you can commit your changes? I can
> then test on the server.
>
> -jeff
>
>
>
>
>
> On 2013-12-07 5:28 PM, Thomas Gratier wrote:
> > Hi,
> >
> > Thanks for merging my branch for internationalization.
> > It seems you already found an answer about the build on Windows in the
> > issues on Github.
> > I have another problem: the deployment is not working in production.
> > When I checkout the branch 6-4 of the docs
> > https://github.com/mapserver/docs/tree/branch-6-4 and do the
> >
> > make compile_messages
> > make html
> >
> > like in the script to deploy I updated
> >
> https://github.com/mapserver/docs/blob/branch-6-4/scripts/build_docs.sh
> > it works locally for example in the root of fr generated doc.
> >
> > When I go to the http://mapserver.org/fr/index.html, the content is
> > always in English.
> > I supposed it can come from two things: the outdated version of Sphinx
> > on the server or/and the missing gettext packages
> >
> > As I don't have access to the MapServer hosting machine, thanks
> for your
> > feedback about my concern
> >
> > Cheers
> >
> > Thomas Gratier
> >
> >
> >
> > 2013/12/4 Jeff McKenna <jmckenna at gatewaygeomatics.com
> <mailto:jmckenna at gatewaygeomatics.com>
> > <mailto:jmckenna at gatewaygeomatics.com
> <mailto:jmckenna at gatewaygeomatics.com>>>
> >
> > Hi ThomasG,
> >
> > The following command does work here for me:
> >
> > make compile_messages fr
> >
> > Not sure if we should change the documentation steps to that
> or not.
> >
> > Awaiting your advice.
> >
> > -jeff
> >
> >
> >
> > On 2013-12-04 3:49 PM, Jeff McKenna wrote:
> > > Hi ThomasG,
> > >
> > > Some more feedback for you on this issue:
> > >
> > > - calling the python script directly generates the .mo files
> correctly
> > > (python i18n_win.py --lang fr)
> > >
> > > - if I print out the current working dir in i18n_win.py before
> > > msgfmt.make I get:
> > >
> > > translated\-e
> > >
> > > So I think the options in "make compile_messages -e
> > TRANSLATIONI18N=fr"
> > > is having trouble on Windows.
> > >
> > > Thoughts?
> > >
> > > -jeff
> > >
> > >
> > >
> > > On 2013-12-04 2:14 PM, Jeff McKenna wrote:
> > >> Hi ThomasG,
> > >>
> > >> I'm testing/building your branch 'branch-6-4-i18n-with-po'
> now. I've
> > >> checked out your branch and am following your updates/steps in
> > >> documentation.txt
> > >>
> > >> I'm having trouble at the step where I believe the .mo files
> > should be
> > >> generated. On windows, I am getting the following messages:
> > >>
> > >> make compile_messages -e TRANSLATIONI18N=fr
> > >>
> > >> No such file or directory: 'LC_MESSAGES\\about.mo'
> > >> No such file or directory:
> 'LC_MESSAGES\\announcements_all.mo'
> > >> ...
> > >>
> > >> Indeed there are no .mo files in the folder
> > /translated/fr/LC_MESSAGES/
> > >>
> > >> (.po files do exist in /translated/fr/)
> > >>
> > >> Maybe I have missed a step? Let me know what you think.
> > >>
> > >> -jeff
> > >>
> > >>
> > >>
> > >> On 2013-10-12 2:24 PM, Thomas Gratier wrote:
> > >>> Hi,
> > >>>
> > >>> It's done. Before i submit another PR for the
> documentation, you
> > can go
> > >>> to my repository https://github.com/ThomasG77/docs.git and
> > checkout my
> > >>> branch branch-6-4-i18n-with-po
> > >>> After, do the usual build (you need the latest Sphinx version)
> > with make
> > >>> html to see the documentation content about documentation.
> > >>> Then, follow the instructions you have in the built html to
> > enable the
> > >>> i18n translation process.
> > >>>
> > >>> If you have any feedbacks, you can do it via a Github
> issue , a
> > PR or in
> > >>> this thread.
> > >>> At the end, when everything will be Ok, I will make a new
> PR from my
> > >>> branch, for the documentation on documentation process.
> > >>>
> > >>> Regards
> > >>>
> > >>> Thomas Gratier
> >
> _______________________________________________
> mapserver-dev mailing list
> mapserver-dev at lists.osgeo.org <mailto:mapserver-dev at lists.osgeo.org>
> http://lists.osgeo.org/mailman/listinfo/mapserver-dev
>
>
--
Jeff McKenna
MapServer Consulting and Training Services
http://www.gatewaygeomatics.com/
More information about the mapserver-dev
mailing list