openstack
/
openstack-doc-tools
Code Issues Proposed changes

Add --use-first option to msgcat 

When msgcat command merge common-rst po files,
it uses only first msgstr so that Sphinx handles
properly the po file.

Change-Id: I0e744646bfe1fd398cffda316872128d563c893a
This commit is contained in:
KATO Tomoyuki 2015-06-21 18:35:35 +09:00 committed by Andreas Jaeger
parent 072fc1d619
commit f7895df40e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASE_NOTES.rst
View File

@ -1,6 +1,11 @@
Release notes Release notes
============= =============
0.29.1
------
* ``doc-tools-check-languages``: Fix building of translated RST guides.
0.29.0 0.29.0
------ ------

6
bin/doc-tools-check-languages
View File

@ -51,9 +51,9 @@ function build_rst {
tox -evenv "sphinx-build -W -b gettext $TAG ${DOC_DIR}${book}/source/ ${DOC_DIR}${book}/source/locale/" tox -evenv "sphinx-build -W -b gettext $TAG ${DOC_DIR}${book}/source/ ${DOC_DIR}${book}/source/locale/"
# Merge the common-rst po file in # Merge the common-rst po file in
if [[ -e ${DOC_DIR}common-rst/source/locale/${language}/LC_MESSAGES/common-rst.po ]] ; then if [[ -e ${DOC_DIR}common-rst/source/locale/${language}/LC_MESSAGES/common-rst.po ]] ; then
msgcat -o ${DOC_DIR}${book}/source/locale/${language}/${book}.po \ msgcat --use-first -o ${DOC_DIR}${book}/source/locale/${language}/${book}.po \
${DOC_DIR}common-rst/source/locale/${language}/LC_MESSAGES/common-rst.po \ ${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po \
${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po ${DOC_DIR}common-rst/source/locale/${language}/LC_MESSAGES/common-rst.po
mv -f ${DOC_DIR}${book}/source/locale/${language}/${book}.po \ mv -f ${DOC_DIR}${book}/source/locale/${language}/${book}.po \
${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po ${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po
fi fi