Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try implementing Django's JavaScript translation catalog again #1434

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Try implementing Django's JavaScript translation catalog again #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
acce460
Merge branch 'develop' into issue/1409
courtneycb Sep 7, 2020
13b761e
makemessages
courtneycb Sep 8, 2020
a8c5007
Restore changes.
courtneycb Sep 8, 2020
43928aa
makemessages.
courtneycb Sep 8, 2020
6e142a9
Merge branch 'develop' into issue/1409
courtneycb Sep 9, 2020
db559b2
Merge branch 'develop' into issue/1409
eAlasdair Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions LICENCE-THIRD-PARTY
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ Licensed under BSD 3-clause "New" or "Revised" License.
third-party-licenses/django-modeltranslation.txt
==============================================================================

==============================================================================
django-statici18n
------------------------------------------------------------------------------
https://github.com/zyegfryed/django-statici18n
Copyright 2012 Sebastien Fievet
licensed under BSD licence.
third-party-licences/django-statici18n.txt
==============================================================================

==============================================================================
flake8
------------------------------------------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion csu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ cmd_restart() {
}
defhelp restart 'Stop and then restart development environment.'

# Run Django migrate and updatedata commands
# Completely update system
cmd_update() {
cmd_static

Expand Down Expand Up @@ -163,13 +163,15 @@ defhelp makeresourcethumbnails 'Run Django makeresourcethumbnails command.'
cmd_makemessages() {
echo "Creating message files..."
docker-compose exec django /docker_venv/bin/python3 ./manage.py makemessages -l en
docker-compose exec django /docker_venv/bin/python3 ./manage.py makemessages --ignore=build/* -d djangojs
}
defhelp makemessages 'Run Django makemessages command.'

# Run Django compilemessages command
cmd_compilemessages() {
echo "Compiling message files..."
docker-compose exec django /docker_venv/bin/python3 ./manage.py compilemessages
docker-compose exec django /docker_venv/bin/python3 ./manage.py compilejsi18n
}
defhelp compilemessages 'Run Django compilemessages command.'

Expand Down Expand Up @@ -205,6 +207,7 @@ defhelp build 'Build or rebuild Docker images.'
cmd_static() {
echo "Building static files..."
docker-compose exec nginx gulp build
cmd_compilemessages
}
defhelp static 'Build static files.'

Expand Down
2 changes: 2 additions & 0 deletions csunplugged/config/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"widget_tweaks",
"modeltranslation",
"bidiutils",
"statici18n",
]

# Apps specific for this project go here.
Expand Down Expand Up @@ -346,3 +347,4 @@
GENERAL_PAGES_CONTENT_BASE_PATH = os.path.join(str(ROOT_DIR.path("general")), "content")
ACTIVITIES_CONTENT_BASE_PATH = os.path.join(str(ROOT_DIR.path("at_home")), "content")
BREADCRUMBS_TEMPLATE = "django_bootstrap_breadcrumbs/bootstrap4.html"
STATICI18N_ROOT = BUILD_ROOT
Loading