From a1063fe298840e922348252cd6400d679d9bbd7c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 30 Jan 2016 11:33:05 +0100
Subject: [PATCH] Re-enable oslo translations

All changes for olso.* have been merged and the translations renamed
on our translation server, we can now handle translations the "new" way.
Remove temporary disabling of them and use the new functions.

This also adds a missing invocation of setup_log_level_vars to the setup
of python projects. Without it, extract_messages_log_level will fail.

Change-Id: I66311726c93b54099ad149e6d06a01ec2f9b2edc
Story: 2000452
---
 jenkins/scripts/propose_translation_update.sh  | 7 ++-----
 jenkins/scripts/upstream_translation_update.sh | 6 +-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/jenkins/scripts/propose_translation_update.sh b/jenkins/scripts/propose_translation_update.sh
index 5d50cc9a51..eca2f3ebaf 100755
--- a/jenkins/scripts/propose_translation_update.sh
+++ b/jenkins/scripts/propose_translation_update.sh
@@ -210,7 +210,7 @@ case "$PROJECT" in
         propose_horizon
         ;;
     # New setup: all dashboard plugin repositories plus others
-    *-dashboard|*-ui|*-horizon|python-neutronclient|python-novaclient)
+    *-dashboard|*-ui|*-horizon|python-neutronclient|python-novaclient|oslo*)
         # ---- Python projects ----
         # NOTE: At now POT file == $modulename/locale/$modulename.pot
         #       so this script works.
@@ -221,6 +221,7 @@ case "$PROJECT" in
         MODULENAME=$(get_modulename $PROJECT python)
         if [ -n "$MODULENAME" ]; then
             setup_django "$PROJECT" "$MODULENAME" "$ZANATA_VERSION"
+            setup_loglevel_vars
             propose_python_new "$PROJECT" "$MODULENAME"
         fi
 
@@ -235,10 +236,6 @@ case "$PROJECT" in
         echo "project temporarily disabled"
         exit 0
         ;;
-    oslo.*)
-        echo "project temporarily disabled"
-        exit 0
-        ;;
     ironic-inspector|networking-*|neutron-*|vmware-nsx)
         echo "project temporarily disabled"
         exit 0
diff --git a/jenkins/scripts/upstream_translation_update.sh b/jenkins/scripts/upstream_translation_update.sh
index 27cf85565e..28eeb9a2a7 100755
--- a/jenkins/scripts/upstream_translation_update.sh
+++ b/jenkins/scripts/upstream_translation_update.sh
@@ -55,7 +55,7 @@ case "$PROJECT" in
         ./run_tests.sh --makemessages -V
         ;;
     # New setup: all dashboard plugin repositories plus others
-    *-dashboard|*-ui|*-horizon|python-neutronclient|python-novaclient)
+    *-dashboard|*-ui|*-horizon|python-neutronclient|python-novaclient|oslo*)
         # ---- Python projects ----
         # NOTE: At now POT file == $modulename/locale/$modulename.pot
         #       so this script works.
@@ -82,10 +82,6 @@ case "$PROJECT" in
         echo "project temporarily disabled"
         exit 0
         ;;
-    oslo.*)
-        echo "project temporarily disabled"
-        exit 0
-        ;;
     ironic-inspector|networking-*|neutron-*|vmware-nsx)
         echo "project temporarily disabled"
         exit 0