From f69c489346fb0174b651122795bd8ca6937ce751 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Wed, 13 May 2015 22:07:38 +0200
Subject: [PATCH] User Guides: Enable translations

openstack-doc-tools 0.28 contains a fix for translation of RST guides
and the User Guides. Require that version and enable the User Guides for
translation.

Add building of glossary for translation environments to tox.ini.

Change-Id: I645bf98b68603811a9a978e508d1f492e44da738
---
 doc-tools-check-languages.conf | 16 ++++------------
 test-requirements.txt          |  2 +-
 tox.ini                        | 11 ++++++++---
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/doc-tools-check-languages.conf b/doc-tools-check-languages.conf
index 3886938ee4..9027a27e06 100644
--- a/doc-tools-check-languages.conf
+++ b/doc-tools-check-languages.conf
@@ -9,10 +9,7 @@ declare -A DIRECTORIES=(
 # books to be built
 declare -A BOOKS=(
     ["fr"]="image-guide"
-    # TODO(ajaeger) Temporary disabled user-guide and user-guide-admin.
-    # This needs openstack-doc-tools 0.28 release first.
-    # ["ja"]="image-guide install-guide user-guide user-guide-admin"
-    ["ja"]="image-guide install-guide"
+    ["ja"]="image-guide install-guide user-guide user-guide-admin"
     ["pt_BR"]="install-guide"
     ["zh_CN"]="arch-design image-guide install-guide"
 )
@@ -20,10 +17,7 @@ declare -A BOOKS=(
 # draft books
 declare -A DRAFTS=(
     ["fr"]="image-guide"
-    # TODO(ajaeger) Temporary disabled user-guide and user-guide-admin.
-    # This needs openstack-doc-tools 0.28 release first.
-    # ["ja"]="install-guide user-guide user-guide-admin"
-    ["ja"]="install-guide"
+    ["ja"]="install-guide user-guide user-guide-admin"
     ["pt_BR"]="install-guide"
     ["zh_CN"]="install-guide"
 )
@@ -38,9 +32,7 @@ DOC_DIR="doc/"
 # Books with special handling
 # Values need to match content in project-config/jenkins/scripts/common_translation_update.sh
 declare -A SPECIAL_BOOKS=(
-    # TODO(ajaeger) Temporary disabled user-guide and user-guide-admin.
-    # This needs openstack-doc-tools 0.28 release first.
-    ["user-guide"]="skip"
-    ["user-guide-admin"]="skip"
+    ["user-guide"]="RST"
+    ["user-guide-admin"]="RST"
     ["networking-guide"]="RST"
 )
diff --git a/test-requirements.txt b/test-requirements.txt
index 6284019db4..6529decf62 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ hacking>=0.10.0,<0.11
 
 beautifulsoup4
 Jinja2>=2.6  # BSD License (3 clause)
-openstack-doc-tools>=0.27
+openstack-doc-tools>=0.28
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 openstackdocstheme>=1.0.7
 doc8  # Apache-2.0
diff --git a/tox.ini b/tox.ini
index b6110cb972..164509411f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,7 +63,9 @@ commands =
 # use sitepackages.
 sitepackages=True
 whitelist_externals = doc-tools-check-languages
-commands = doc-tools-check-languages doc-tools-check-languages.conf test all
+commands =
+  {toxinidir}/tools/glossary2rst.py doc/common-rst/glossary.rst
+  doc-tools-check-languages doc-tools-check-languages.conf test all
 
 [testenv:buildlang]
 # Run as "tox -e buildlang -- $LANG"
@@ -72,7 +74,9 @@ commands = doc-tools-check-languages doc-tools-check-languages.conf test all
 # use sitepackages.
 sitepackages=True
 whitelist_externals = doc-tools-check-languages
-commands = doc-tools-check-languages doc-tools-check-languages.conf test {posargs}
+commands =
+  {toxinidir}/tools/glossary2rst.py doc/common-rst/glossary.rst
+  doc-tools-check-languages doc-tools-check-languages.conf test {posargs}
 
 [testenv:publishlang]
 # Generatedocbook needs xml2po which cannot be installed
@@ -81,7 +85,8 @@ commands = doc-tools-check-languages doc-tools-check-languages.conf test {posarg
 sitepackages=True
 whitelist_externals = doc-tools-check-languages
 commands =
-   doc-tools-check-languages doc-tools-check-languages.conf publish all
+  {toxinidir}/tools/glossary2rst.py doc/common-rst/glossary.rst
+  doc-tools-check-languages doc-tools-check-languages.conf publish all
 
 [testenv:generatepot-rst]
 # Generate POT files for translation, needs {posargs} like: