Merge pull request #135 from chenpengxiang/xliff_import_export

Xliff import and export Resolves #37 Resolves #38
digitalfabrik · Jun 6, 2019 · 0d59370 · 0d59370
2 parents f8d59c4 + 2d22cfd
commit 0d59370
Show file tree

Hide file tree

Showing 12 changed files with 1,162 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,6 @@ docs/_build/
 .idea
 .directory
 .directory
+
+# XLIFF files folder
+**/xliffs/
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ cd cms-django
 5. Create the initial superuser: `integreat-cms createsuperuser`
 6. Fire up the CMS: `integreat-cms runserver localhost:8000`
 7. Go to your browser and open the URL `http://localhost:8000`
+8. Run Django unittest: `integreat-cms test cms/`
 
 ### Run CMS in Docker container
 A docker-compose file is provided in the the repository. It will start one container with a PostgreSQL database and another one with the CMS.

diff --git a/backend/cms/locale/de/LC_MESSAGES/django.po b/backend/cms/locale/de/LC_MESSAGES/django.po
@@ -41,6 +41,7 @@ msgstr "Review abgeschlossen"
 msgid "Active"
 msgstr "Aktiv"
 
+
 #: models/site.py:20
 msgid "Hidden"
 msgstr "Versteckt"
@@ -424,6 +425,10 @@ msgstr "Archivierte Seiten"
 msgid "Create page"
 msgstr "Seite erstellen"
 
+#: models/site.py:19 templates/language_tree/tree.html:37
+msgid "Upload"
+msgstr "Hochladen"
+
 #: templates/pages/tree.html:53
 msgid "Options"
 msgstr "Optionen"