Merge branch 'feature/pwa-settings-constance' into 'master'

Make PWA settings customizable via constance

See merge request AlekSIS!175

aleksis/core/settings.py

@@ -369,6 +369,7 @@ CONSTANCE_ADDITIONAL_FIELDS = {
 }
 CONSTANCE_CONFIG = {
     "SITE_TITLE": ("AlekSIS", _("Site title"), "char_field"),
+    "SITE_DESCRIPTION": (_("AlekSIS is a web-based school information system (SIS) which can be used to manage and/or publish organisational data of educational institutions."), _("Site description")),
     "COLOUR_PRIMARY": ("#0d5eaf", _("Primary colour"), "colour_field"),
     "COLOUR_SECONDARY": ("#0d5eaf", _("Secondary colour"), "colour_field"),
     "MAIL_OUT_NAME": ("AlekSIS", _("Mail out name")),
@@ -439,8 +440,8 @@ if _settings.get("celery.enabled", False):
         INSTALLED_APPS += ("djcelery_email",)
         EMAIL_BACKEND = "djcelery_email.backends.CeleryEmailBackend"
 
-PWA_APP_NAME = "AlekSIS"  # dbsettings
-PWA_APP_DESCRIPTION = "AlekSIS – The free school information system"  # dbsettings
+PWA_APP_NAME = lazy_config("SITE_TITLE")
+PWA_APP_DESCRIPTION = lazy_config("SITE_DESCRIPTION")
 PWA_APP_THEME_COLOR = lazy_config("COLOUR_PRIMARY")
 PWA_APP_BACKGROUND_COLOR = "#ffffff"
 PWA_APP_DISPLAY = "standalone"

aleksis/core/templates/core/meta.html

@@ -4,8 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
-<meta name="description"
-      content="{% blocktrans %}AlekSIS is a web-based school information system (SIS) which can be used to manage and/or publish organisational data of educational in titutions.{% endblocktrans %}">
+<meta name="description" content="{{ config.SITE_DESCRIPTION }}">
 
 {# Favicons #}
 <link href="{% static "icons/favicon_16.png" %}" rel="icon" type="image/png" sizes="16x16">