diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 30d1c6b4..18885326 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -1,6 +1,11 @@ Release notes ============= +0.29.0 +------ + +* ``doc-tools-check-languages``: Handle common-rst directory. + 0.28 ---- diff --git a/bin/doc-tools-check-languages b/bin/doc-tools-check-languages index 87da77e9..2d4958bb 100755 --- a/bin/doc-tools-check-languages +++ b/bin/doc-tools-check-languages @@ -49,6 +49,14 @@ function build_rst { TAG="-t libcloud -t fog" fi tox -evenv "sphinx-build -W -b gettext $TAG ${DOC_DIR}${book}/source/ ${DOC_DIR}${book}/source/locale/" + # Merge the common-rst po file in + 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 \ + ${DOC_DIR}common-rst/source/locale/${language}/LC_MESSAGES/common-rst.po \ + ${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po + mv -f ${DOC_DIR}${book}/source/locale/${language}/${book}.po \ + ${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po + fi # Now run msgmerge on all files for f in ${DOC_DIR}${book}/source/locale/*.pot ; do # Skip the master file