openstack
/
horizon
Code Issues Proposed changes

pull_catalog: avoid internet access during module loading 

pull_catalog command accesses Zanata OpenStack site during loaded.
Python unit tests tries to load modules when starting tests.
This commit moves the logic to access to the Zanata OpenStack site
to inside the command class to avoid this.

Change-Id: Ibcb56f941003815340b2b7486ef0e1392c8ac540
Closes-Bug: #1733570
(cherry picked from commit 5cac0c4b34)
This commit is contained in:
Akihiro Motoki 2017-11-21 11:57:43 +00:00 committed by Ying Zuo
parent 997d756433
commit 05bac59726
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
horizon/management/commands/pull_catalog.py
View File

@ -18,9 +18,8 @@ from django.core.management.base import BaseCommand
from django.utils import translation
import requests
ZANATA_LOCALES = requests.get("https://translate.openstack.org/rest/project"
"/horizon/version/master/locales").json()
LANGUAGE_CODES = [x['localeId'] for x in ZANATA_LOCALES]
ZANATA_LOCALES_URL = ("https://translate.openstack.org/rest/project"
"/horizon/version/master/locales")
DOMAINS = ['django', 'djangojs']
MODULES = ['horizon', 'openstack_dashboard']
PROJECT = 'horizon'
@ -34,14 +33,20 @@ class Command(BaseCommand):
"(https://translate.openstack.org) for all languages or a "
"specified language")
def _get_language_codes(self):
zanata_locales = requests.get(ZANATA_LOCALES_URL).json()
return [x['localeId'] for x in zanata_locales]
def add_arguments(self, parser):
parser.add_argument('-l', '--language', choices=LANGUAGE_CODES,
language_codes = self._get_language_codes()
parser.add_argument('-l', '--language', choices=language_codes,
metavar='LANG',
default=LANGUAGE_CODES, nargs='+',
default=language_codes, nargs='+',
help=("The language code(s) to pull language "
"catalogs for. The default is all "
"languages. Available languages are: %s"
% ', '.join(sorted(LANGUAGE_CODES))))
% ', '.join(sorted(language_codes))))
parser.add_argument('-p', '--project', type=str, default=PROJECT,
help=("The name of the project to extract "
"strings from e.g. 'horizon'. The default "