Merge pull request #1719 from digitalfabrik/develop

Release `2022.9.4`

CHANGELOG.md

@@ -1,6 +1,10 @@
 UNRELEASED
 ----------
 
+* [ [#1653](https://github.com/digitalfabrik/integreat-cms/issues/1653) ] Create new versions even if content did not change to preserve translation
+* [ [#1450](https://github.com/digitalfabrik/integreat-cms/issues/1450) ] Add API from SUMM.AI to create easy-understable German
+* [ [#1532](https://github.com/digitalfabrik/integreat-cms/issues/1532) ] Fix PDF table of contents in cyrillic alphabets
+
 
 2022.9.3
 --------

dev-tools/generate_documentation.sh

@@ -72,7 +72,7 @@ find ${SPHINX_DIR}/${SPHINX_APIDOC_EXT_DIR} -type f -name "*.rst" -print0 | xarg
     -e 's/\( module\| package\)//' `# Remove module & package strings at the end of headings` \
     -e '/^[^ ]\+$/s/\(.*\.\)\?\([^\.]\+\)/\u\2/' `# Remove module path in headings (separated by dots) and make first letter uppercase` \
     -e '/^[^ ]\+$/s/\\_\([a-z]\)/ \u\1/g' `# Replace \_ with spaces in headings and make following letter uppercase` \
-    -e 's/Cms/CMS/g;s/Api/API/g;s/Poi/POI/g;s/Mfa/MFA/g;s/Pdf/PDF/g;s/Xliff1/XLIFF 1.2/g;s/Xliff2/XLIFF 2.0/g;s/Xliff/XLIFF/g' # Make specific keywords uppercase
+    -e 's/Cms/CMS/g;s/Api/API/g;s/Poi/POI/g;s/Mfa/MFA/g;s/Pdf/PDF/g;s/Xliff1/XLIFF 1.2/g;s/Xliff2/XLIFF 2.0/g;s/Xliff/XLIFF/g;s/Summ Ai/SUMM.AI/g' # Make specific keywords uppercase
 
 # Include _urls in sitemap automodule
 # shellcheck disable=SC2251

dev-tools/test.sh

@@ -12,6 +12,9 @@ rm -rf "${BASE_DIR:?}/htmlcov/"
 require_installed
 require_database
 
+# Set dummy key to enable SUMM.AI during testing
+export INTEGREAT_CMS_SUMM_AI_API_KEY="dummy"
+
 deescalate_privileges pipenv run pytest --disable-warnings --quiet --numprocesses=auto --cov=integreat_cms --cov-report html
 echo "✔ Tests successfully completed " | print_success
 

example-configs/integreat-cms.ini

@@ -112,6 +112,20 @@ EMAIL_USE_SSL = False
 # Whether link check should be disabled [optional, defaults to False]
 LINKCHECK_DISABLE_LISTENERS = False
 
+[summ-ai]
+# The URL to our SUMM.AI API [optional, defaults to "https://backend.summ-ai.com/translate/v1/"]
+SUMM_AI_API_URL = <your-summ-ai-api-endpoint>
+# If you want to use easy german via Summ.AI, set your API auth key here [optional, defaults to None]
+SUMM_AI_API_KEY = <your-summ-ai-key>
+# Whether real request are made to the SUMM.AI API [optional, defaults to the value of DEBUG]
+SUMM_AI_TEST_MODE = False
+# The language slug for German [optional, defaults to "de"]
+SUMM_AI_GERMAN_LANGUAGE_SLUG = "de"
+# The language slug for Easy German [optional, defaults to "de-si"]
+SUMM_AI_EASY_GERMAN_LANGUAGE_SLUG = "de-si"
+#: The separator which is used to split compound words [optional, defaults to "hyphen", must be one of ["hyphen", "interpunct"]
+SUMM_AI_SEPARATOR = "hyphen"
+
 [xliff]
 # Which XLIFF version to use for export [optional, defaults to "xliff-1.2"]
 XLIFF_EXPORT_VERSION = xliff-1.2

integreat_cms/cms/constants/custom_translations.py

@@ -0,0 +1,9 @@
+"""
+This module contains custom strings which are not picked up by the normal makemessages command
+"""
+from django.utils.translation import ugettext_lazy as _
+
+
+_("Easy German")
+_("German (easy)")
+_("Amharic")