Add extra extension file to makemessage command line
specify the file extensions of the makemessage to *.html, *.txt, *.csv Closes-Bug: #1226910 (cherry picked from commit0b03a7fdea
) The above fix introduces an extra bug when updating POT files, so the commit below is also cherry-picked. ---- Fix warning in run_tests.sh --makemessages Specify --extension=html,txt,csv only for openstack_dashboard. For djangojs, --extension should be 'js'. This is the cause of the warning. Closes-Bug: #1243526 (cherry picked from commit79ae2139bb
) ---- This patch does not update POT files for stable/havana. They will be updated in a single patch. Change-Id: I115cd448249ac0b1b27a6b28fca3f16d6b2670a6
This commit is contained in:
parent
3b621e70bd
commit
06e78a8bd7
|
@ -330,16 +330,18 @@ function run_tests_all {
|
|||
}
|
||||
|
||||
function run_makemessages {
|
||||
OPTS="-l en --no-obsolete"
|
||||
DASHBOARD_OPTS="--extension=html,txt,csv --ignore=openstack/common/*"
|
||||
echo -n "horizon: "
|
||||
cd horizon
|
||||
${command_wrapper} $root/manage.py makemessages -l en --no-obsolete
|
||||
${command_wrapper} $root/manage.py makemessages $OPTS
|
||||
HORIZON_PY_RESULT=$?
|
||||
echo -n "horizon javascript: "
|
||||
${command_wrapper} $root/manage.py makemessages -d djangojs -l en --no-obsolete
|
||||
${command_wrapper} $root/manage.py makemessages -d djangojs $OPTS
|
||||
HORIZON_JS_RESULT=$?
|
||||
echo -n "openstack_dashboard: "
|
||||
cd ../openstack_dashboard
|
||||
${command_wrapper} $root/manage.py makemessages -l en --ignore=openstack/common/* --no-obsolete
|
||||
${command_wrapper} $root/manage.py makemessages $DASHBOARD_OPTS $OPTS
|
||||
DASHBOARD_RESULT=$?
|
||||
cd ..
|
||||
exit $(($HORIZON_PY_RESULT || $HORIZON_JS_RESULT || $DASHBOARD_RESULT))
|
||||
|
|
Loading…
Reference in New Issue