Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Commit e5b4f29

Browse files
authored
feat: add atlas pull support (#4051)
Refs: FC-0012 OEP-58
1 parent 700cc13 commit e5b4f29

File tree

9 files changed

+23
-6
lines changed

9 files changed

+23
-6
lines changed

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ FROM ubuntu:focal as app
33
ENV DEBIAN_FRONTEND noninteractive
44
# System requirements.
55
RUN apt update && \
6-
apt-get install -qy \
6+
apt-get install -qy \
77
curl \
8+
gettext \
89
git \
910
language-pack-en \
1011
build-essential \

Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,13 @@ compile_translations: requirements.tox
126126
fake_translations: extract_translations dummy_translations compile_translations
127127

128128
pull_translations:
129+
ifeq ($(OPENEDX_ATLAS_PULL),)
129130
cd ecommerce && tx pull -a -f -t --mode reviewed
131+
else
132+
find ecommerce/conf/locale -mindepth 1 -maxdepth 1 -type d -exec rm -r {} \;
133+
atlas pull $(OPENEDX_ATLAS_ARGS) translations/ecommerce/ecommerce/conf/locale:ecommerce/conf/locale
134+
python manage.py compilemessages
135+
endif
130136

131137
push_translations:
132138
cd ecommerce && tx push -s

ecommerce/conf/locale/config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,6 @@ ignore_dirs:
9292
- i18n
9393
- assets
9494
- node_modules
95+
- tests
9596
- static/bower_components
9697
- static/build

requirements/base.in

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ markdown==2.6.9
4545
mysqlclient<1.5
4646
newrelic
4747
ndg-httpsclient
48+
openedx-atlas
4849
path.py==7.2
4950
paypalrestsdk
5051
premailer==2.9.2

requirements/base.txt

+2
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,8 @@ oauthlib==3.2.2
362362
# getsmarter-api-clients
363363
# requests-oauthlib
364364
# social-auth-core
365+
openedx-atlas==0.5.0
366+
# via -r requirements/base.in
365367
packaging==23.1
366368
# via drf-yasg
367369
paramiko==3.2.0

requirements/dev.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ edx-drf-extensions==9.0.0
333333
# edx-rbac
334334
edx-ecommerce-worker==3.3.4
335335
# via -r requirements/test.txt
336-
edx-i18n-tools==0.9.2
336+
edx-i18n-tools==1.3.0
337337
# via -r requirements/test.txt
338338
edx-opaque-keys==2.3.0
339339
# via
@@ -570,6 +570,8 @@ oauthlib==3.2.2
570570
# getsmarter-api-clients
571571
# requests-oauthlib
572572
# social-auth-core
573+
openedx-atlas==0.5.0
574+
# via -r requirements/base.in
573575
packaging==23.1
574576
# via
575577
# -r requirements/docs.txt

requirements/production.txt

+2
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,8 @@ oauthlib==3.2.2
372372
# getsmarter-api-clients
373373
# requests-oauthlib
374374
# social-auth-core
375+
openedx-atlas==0.5.0
376+
# via -r requirements/base.in
375377
packaging==23.1
376378
# via drf-yasg
377379
paramiko==3.2.0

requirements/test.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ edx-drf-extensions==9.0.0
324324
# edx-rbac
325325
edx-ecommerce-worker==3.3.4
326326
# via -r requirements/base.txt
327-
edx-i18n-tools==0.9.2
327+
edx-i18n-tools==1.3.0
328328
# via -r requirements/test.in
329329
edx-opaque-keys==2.3.0
330330
# via
@@ -549,6 +549,8 @@ oauthlib==3.2.2
549549
# getsmarter-api-clients
550550
# requests-oauthlib
551551
# social-auth-core
552+
openedx-atlas==0.5.0
553+
# via -r requirements/base.in
552554
packaging==23.1
553555
# via
554556
# -r requirements/base.txt

tox.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ setenv =
4141
tests: DJANGO_SETTINGS_MODULE = ecommerce.settings.test
4242
acceptance: DJANGO_SETTINGS_MODULE = ecommerce.settings.test
4343
check_keywords: DJANGO_SETTINGS_MODULE = ecommerce.settings.test
44+
extract_translations: DJANGO_SETTINGS_MODULE=
4445
BOKCHOY_HEADLESS = true
4546
NODE_BIN = ./node_modules/.bin
4647
PATH=$PATH:$NODE_BIN
@@ -51,7 +52,7 @@ deps =
5152
allowlist_externals =
5253
/bin/bash
5354
changedir =
54-
dummy_translations,compile_translations,detect_changed_translations,validate_translations: ecommerce
55+
extract_translations,dummy_translations,compile_translations,detect_changed_translations,validate_translations: ecommerce
5556
commands =
5657
static: python manage.py collectstatic --noinput --verbosity 0
5758
static: python manage.py compress --force
@@ -64,8 +65,7 @@ commands =
6465

6566
pylint: pylint -j 0 --rcfile=pylintrc ecommerce e2e
6667

67-
extract_translations: python manage.py makemessages -l en -v1 -d django --ignore="docs/*" --ignore="src/*" --ignore="i18n/*" --ignore="assets/*" --ignore="node_modules/*" --ignore="ecommerce/static/bower_components/*" --ignore="ecommerce/static/build/*"
68-
extract_translations: python manage.py makemessages -l en -v1 -d djangojs --ignore="docs/*" --ignore="src/*" --ignore="i18n/*" --ignore="assets/*" --ignore="node_modules/*" --ignore="ecommerce/static/bower_components/*" --ignore="ecommerce/static/build/*"
68+
extract_translations: i18n_tool extract --no-segment
6969

7070
dummy_translations: i18n_tool dummy
7171
compile_translations: python ../manage.py compilemessages

0 commit comments

Comments
 (0)