7
0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-06-07 08:30:48 +00:00

Merge remote-tracking branch 'origin/master' into nightly

This commit is contained in:
Overhang.IO 2022-09-08 10:03:17 +00:00
commit 435de0f21f
2 changed files with 4 additions and 6 deletions

View File

@ -18,9 +18,11 @@ Every user-facing change should have an entry in this changelog. Please respect
## Unreleased
- [Feature] Upgrade edx-platform i18n strings to nutmeg.2 (by @regisb).
## v14.0.5 (2022-08-29)
- [Bugfix] Fix MongoDB replica set connection error resulting from edx-platform's pymongo (3.10.1 -> 3.12.3) upgrade ([edx-platform#30569](https://github.com/openedx/edx-platform/pull/30569)). (by @ormsbee)
- [Bugfix] Fix MongoDB replica set connection error resulting from edx-platform's pymongo (3.10.1 -> 3.12.3) upgrade ([edx-platform#30569](https://github.com/openedx/edx-platform/pull/30569)) (by @ormsbee).
- [Feature] Upgrade all applications to open-release/nutmeg.2 (@BbrSofiane).
## v14.0.4 (2022-07-29)

View File

@ -54,11 +54,7 @@ RUN git config --global user.email "tutor@overhang.io" \
###### Download extra locales to /openedx/locale/contrib/locale
FROM minimal as locales
# TODO Due to a bug in the transifex generation process, we cannot pull the translation
# strings from nutmeg.1. We'll be able to pull them once they have been pushed to
# Transifex.
# ARG OPENEDX_I18N_VERSION={{ OPENEDX_COMMON_VERSION }}
ARG OPENEDX_I18N_VERSION=open-release/nutmeg.master
ARG OPENEDX_I18N_VERSION={{ OPENEDX_COMMON_VERSION }}
RUN cd /tmp \
&& curl -L -o openedx-i18n.tar.gz https://github.com/openedx/openedx-i18n/archive/$OPENEDX_I18N_VERSION.tar.gz \
&& tar xzf /tmp/openedx-i18n.tar.gz \