diff --git a/allink_core/apps/locations/locale/de/LC_MESSAGES/django.mo b/allink_core/apps/locations/locale/de/LC_MESSAGES/django.mo index 721a22a3..7898bde1 100644 Binary files a/allink_core/apps/locations/locale/de/LC_MESSAGES/django.mo and b/allink_core/apps/locations/locale/de/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/locations/locale/de/LC_MESSAGES/django.po b/allink_core/apps/locations/locale/de/LC_MESSAGES/django.po index ee7a0931..d1051807 100644 --- a/allink_core/apps/locations/locale/de/LC_MESSAGES/django.po +++ b/allink_core/apps/locations/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-15 16:23+0200\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,175 +18,128 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: allink_core/apps/locations/abstract_models.py:61 -msgid "Preview Image" -msgstr "Vorschaubild" - -#: allink_core/apps/locations/abstract_models.py:68 -msgid "Latitude" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:73 -msgid "Longitude" +#: allink_core/apps/locations/abstract_models.py:287 +msgid "Monday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:78 -msgid "Map Link" +#: allink_core/apps/locations/abstract_models.py:288 +msgid "Tuesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:79 -msgid "" -"This could be a Google Places or Directions link." -msgstr "" -"Das könnte ein Link zu Google Places oder einem " -"Routenplaner sein." - -#: allink_core/apps/locations/abstract_models.py:84 -msgid "Monday morning or whole day" -msgstr "Montagmorgen oder ganzer Montag" - -#: allink_core/apps/locations/abstract_models.py:87 -msgid "Tuesday morning or whole day" -msgstr "Dienstagmorgen oder ganzer Dienstag" - -#: allink_core/apps/locations/abstract_models.py:90 -msgid "Wednesday morning or whole day" -msgstr "Mittwochmorgen oder ganzer Mittwoch" - -#: allink_core/apps/locations/abstract_models.py:93 -msgid "Thursday morning or whole day" -msgstr "Donnerstagmorgen oder ganzer Donnerstag" - -#: allink_core/apps/locations/abstract_models.py:96 -msgid "Friday morning or whole day" -msgstr "Freitagmorgen oder ganzer Freitag" +#: allink_core/apps/locations/abstract_models.py:289 +#, fuzzy +#| msgid "Wednesday afternoon" +msgid "Wednesday" +msgstr "Mittwochnachmittag" -#: allink_core/apps/locations/abstract_models.py:99 -msgid "Saturday morning or whole day" -msgstr "Samstagmorgen oder ganzer Samstag" +#: allink_core/apps/locations/abstract_models.py:290 +#, fuzzy +#| msgid "Thursday afternoon" +msgid "Thursday" +msgstr "Donnerstagnachmittag" -#: allink_core/apps/locations/abstract_models.py:102 -msgid "Sunday morning or whole day" -msgstr "Sonntagmorgen oder ganzer Sonntag" +#: allink_core/apps/locations/abstract_models.py:291 +msgid "Friday" +msgstr "" -#: allink_core/apps/locations/abstract_models.py:105 -msgid "Monday afternoon" -msgstr "Montagnachmittag" +#: allink_core/apps/locations/abstract_models.py:292 +#, fuzzy +#| msgid "Saturday afternoon" +msgid "Saturday" +msgstr "Samstagnachmittag" -#: allink_core/apps/locations/abstract_models.py:110 -msgid "Tuesday afternoon" -msgstr "Dienstagnachmittag" +#: allink_core/apps/locations/abstract_models.py:293 +msgid "Sunday" +msgstr "" -#: allink_core/apps/locations/abstract_models.py:115 -msgid "Wednesday afternoon" -msgstr "Mittwochnachmittag" +#~ msgid "Preview Image" +#~ msgstr "Vorschaubild" -#: allink_core/apps/locations/abstract_models.py:120 -msgid "Thursday afternoon" -msgstr "Donnerstagnachmittag" +#~ msgid "" +#~ "This could be a Google Places or Directions link." +#~ msgstr "" +#~ "Das könnte ein Link zu Google Places oder einem " +#~ "Routenplaner sein." -#: allink_core/apps/locations/abstract_models.py:125 -msgid "Friday afternoon" -msgstr "Freitagnachmittag" +#~ msgid "Monday morning or whole day" +#~ msgstr "Montagmorgen oder ganzer Montag" -#: allink_core/apps/locations/abstract_models.py:130 -msgid "Saturday afternoon" -msgstr "Samstagnachmittag" +#~ msgid "Tuesday morning or whole day" +#~ msgstr "Dienstagmorgen oder ganzer Dienstag" -#: allink_core/apps/locations/abstract_models.py:135 -msgid "Sunday afternoon" -msgstr "Sonntagnachmittag" +#~ msgid "Wednesday morning or whole day" +#~ msgstr "Mittwochmorgen oder ganzer Mittwoch" -#: allink_core/apps/locations/abstract_models.py:159 -msgid "Location" -msgstr "Standort" +#~ msgid "Thursday morning or whole day" +#~ msgstr "Donnerstagmorgen oder ganzer Donnerstag" -#: allink_core/apps/locations/abstract_models.py:160 -msgid "Locations" -msgstr "Standorte" +#~ msgid "Friday morning or whole day" +#~ msgstr "Freitagmorgen oder ganzer Freitag" -#: allink_core/apps/locations/abstract_models.py:206 -msgid "Now open" -msgstr "Jetzt geöffnet" +#~ msgid "Saturday morning or whole day" +#~ msgstr "Samstagmorgen oder ganzer Samstag" -#: allink_core/apps/locations/abstract_models.py:297 -msgid "Slug" -msgstr "" +#~ msgid "Sunday morning or whole day" +#~ msgstr "Sonntagmorgen oder ganzer Sonntag" -#: allink_core/apps/locations/abstract_models.py:301 -msgid "Leave blank to auto-generate a unique slug." -msgstr "Leer lassen, um den Slug automatisch zu generieren." +#~ msgid "Monday afternoon" +#~ msgstr "Montagnachmittag" -#: allink_core/apps/locations/abstract_models.py:304 -msgid "Subtitle" -msgstr "Untertitel" +#~ msgid "Tuesday afternoon" +#~ msgstr "Dienstagnachmittag" -#: allink_core/apps/locations/abstract_models.py:310 -msgid "Lead Text" -msgstr "" +#~ msgid "Friday afternoon" +#~ msgstr "Freitagnachmittag" -#: allink_core/apps/locations/abstract_models.py:311 -msgid "" -"Teaser text that in some cases is used in the list view and/or in the detail " -"view." -msgstr "" -"Teaser text, welcher in der Listenansicht und/oder in der Detailansicht " -"verwendet wird." +#~ msgid "Sunday afternoon" +#~ msgstr "Sonntagnachmittag" -#: allink_core/apps/locations/abstract_models.py:316 -msgid "Opening hours" -msgstr "Öffnungszeiten" +#~ msgid "Location" +#~ msgstr "Standort" -#: allink_core/apps/locations/abstract_models.py:318 -msgid "" -"This Text will be used to show the Opening hours on the location detail " -"page. If provided, the detailed opening hours will be overriden." -msgstr "" -"Dieser Text wird benötigt, um die Öffnungszeiten in der Detailansicht " -"darzustellen. Überschreibt die Öffnungszeiten (detailliert)." +#~ msgid "Locations" +#~ msgstr "Standorte" -#: allink_core/apps/locations/abstract_models.py:355 -msgid "" -"Select and arrange specific entries, or, leave blank to select all. (If " -"manual entries are selected the category filtering will be ignored.)" -msgstr "" -"Wählen und ordnen Sie spezifische Einträge oder leer lassen, um alle zu " -"wählen. (Kategorienfilterung wird bei manuellen Einträgen nicht angewandt.)" +#~ msgid "Now open" +#~ msgstr "Jetzt geöffnet" -#: allink_core/apps/locations/abstract_models.py:359 -msgid "Apphook Page" -msgstr "" +#~ msgid "Leave blank to auto-generate a unique slug." +#~ msgstr "Leer lassen, um den Slug automatisch zu generieren." -#: allink_core/apps/locations/abstract_models.py:363 -msgid "" -"If provided, this Apphook-Page will be used to generate the detail link." -msgstr "" +#~ msgid "Subtitle" +#~ msgstr "Untertitel" -#: allink_core/apps/locations/abstract_models.py:366 -msgid "Zoom Level" -msgstr "" +#~ msgid "" +#~ "Teaser text that in some cases is used in the list view and/or in the " +#~ "detail view." +#~ msgstr "" +#~ "Teaser text, welcher in der Listenansicht und/oder in der Detailansicht " +#~ "verwendet wird." -#: allink_core/apps/locations/abstract_models.py:367 -msgid "The higher the number, the more we zoom in." -msgstr "Je höher die Zahl, desto stärker ist die Vergrösserung." +#~ msgid "Opening hours" +#~ msgstr "Öffnungszeiten" -#: allink_core/apps/locations/admin.py:40 -msgid "Opening hours (Detailed)" -msgstr "Öffnungszeiten (detailliert)" +#~ msgid "" +#~ "This Text will be used to show the Opening hours on the location detail " +#~ "page. If provided, the detailed opening hours will be overriden." +#~ msgstr "" +#~ "Dieser Text wird benötigt, um die Öffnungszeiten in der Detailansicht " +#~ "darzustellen. Überschreibt die Öffnungszeiten (detailliert)." -#: allink_core/apps/locations/admin.py:59 -msgid "Format: \"9:00-12:00 13:00-20:00\"" -msgstr "" +#~ msgid "" +#~ "Select and arrange specific entries, or, leave blank to select all. (If " +#~ "manual entries are selected the category filtering will be ignored.)" +#~ msgstr "" +#~ "Wählen und ordnen Sie spezifische Einträge oder leer lassen, um alle zu " +#~ "wählen. (Kategorienfilterung wird bei manuellen Einträgen nicht " +#~ "angewandt.)" -#: allink_core/apps/locations/cms_apps.py:8 -msgid "Locations Apphook" -msgstr "" +#~ msgid "The higher the number, the more we zoom in." +#~ msgstr "Je höher die Zahl, desto stärker ist die Vergrösserung." -#: allink_core/apps/locations/cms_menus.py:15 -msgid "Locations menu" -msgstr "" +#~ msgid "Opening hours (Detailed)" +#~ msgstr "Öffnungszeiten (detailliert)" -#: allink_core/apps/locations/cms_plugins.py:26 -msgid "Map Options" -msgstr "Karten-Optionen" +#~ msgid "Map Options" +#~ msgstr "Karten-Optionen" diff --git a/allink_core/apps/locations/locale/es/LC_MESSAGES/django.mo b/allink_core/apps/locations/locale/es/LC_MESSAGES/django.mo index 3bfbe84d..7898bde1 100644 Binary files a/allink_core/apps/locations/locale/es/LC_MESSAGES/django.mo and b/allink_core/apps/locations/locale/es/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/locations/locale/es/LC_MESSAGES/django.po b/allink_core/apps/locations/locale/es/LC_MESSAGES/django.po index b123f9ca..85653b98 100644 --- a/allink_core/apps/locations/locale/es/LC_MESSAGES/django.po +++ b/allink_core/apps/locations/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-15 16:26+0200\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,167 +18,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: allink_core/apps/locations/abstract_models.py:61 -msgid "Preview Image" +#: allink_core/apps/locations/abstract_models.py:287 +msgid "Monday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:68 -msgid "Latitude" +#: allink_core/apps/locations/abstract_models.py:288 +msgid "Tuesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:73 -msgid "Longitude" +#: allink_core/apps/locations/abstract_models.py:289 +msgid "Wednesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:78 -msgid "Map Link" +#: allink_core/apps/locations/abstract_models.py:290 +msgid "Thursday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:79 -msgid "" -"This could be a Google Places or Directions link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:84 -msgid "Monday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:87 -msgid "Tuesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:90 -msgid "Wednesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:93 -msgid "Thursday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:96 -msgid "Friday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:99 -msgid "Saturday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:102 -msgid "Sunday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:105 -msgid "Monday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:110 -msgid "Tuesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:115 -msgid "Wednesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:120 -msgid "Thursday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:125 -msgid "Friday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:130 -msgid "Saturday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:135 -msgid "Sunday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:159 -msgid "Location" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:160 -msgid "Locations" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:206 -msgid "Now open" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:297 -msgid "Slug" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:301 -msgid "Leave blank to auto-generate a unique slug." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:304 -msgid "Subtitle" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:310 -msgid "Lead Text" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:311 -msgid "" -"Teaser text that in some cases is used in the list view and/or in the detail " -"view." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:316 -msgid "Opening hours" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:318 -msgid "" -"This Text will be used to show the Opening hours on the location detail " -"page. If provided, the detailed opening hours will be overriden." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:355 -msgid "" -"Select and arrange specific entries, or, leave blank to select all. (If " -"manual entries are selected the category filtering will be ignored.)" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:359 -msgid "Apphook Page" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:363 -msgid "" -"If provided, this Apphook-Page will be used to generate the detail link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:366 -msgid "Zoom Level" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:367 -msgid "The higher the number, the more we zoom in." -msgstr "" - -#: allink_core/apps/locations/admin.py:40 -msgid "Opening hours (Detailed)" -msgstr "" - -#: allink_core/apps/locations/admin.py:59 -msgid "Format: \"9:00-12:00 13:00-20:00\"" -msgstr "" - -#: allink_core/apps/locations/cms_apps.py:8 -msgid "Locations Apphook" +#: allink_core/apps/locations/abstract_models.py:291 +msgid "Friday" msgstr "" -#: allink_core/apps/locations/cms_menus.py:15 -msgid "Locations menu" +#: allink_core/apps/locations/abstract_models.py:292 +msgid "Saturday" msgstr "" -#: allink_core/apps/locations/cms_plugins.py:26 -msgid "Map Options" +#: allink_core/apps/locations/abstract_models.py:293 +msgid "Sunday" msgstr "" diff --git a/allink_core/apps/locations/locale/fr/LC_MESSAGES/django.mo b/allink_core/apps/locations/locale/fr/LC_MESSAGES/django.mo index e6b52a17..a1a2100e 100644 Binary files a/allink_core/apps/locations/locale/fr/LC_MESSAGES/django.mo and b/allink_core/apps/locations/locale/fr/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/locations/locale/fr/LC_MESSAGES/django.po b/allink_core/apps/locations/locale/fr/LC_MESSAGES/django.po index 9f516262..fe7cfd5e 100644 --- a/allink_core/apps/locations/locale/fr/LC_MESSAGES/django.po +++ b/allink_core/apps/locations/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-15 16:26+0200\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,167 +18,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: allink_core/apps/locations/abstract_models.py:61 -msgid "Preview Image" +#: allink_core/apps/locations/abstract_models.py:287 +msgid "Monday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:68 -msgid "Latitude" +#: allink_core/apps/locations/abstract_models.py:288 +msgid "Tuesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:73 -msgid "Longitude" +#: allink_core/apps/locations/abstract_models.py:289 +msgid "Wednesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:78 -msgid "Map Link" +#: allink_core/apps/locations/abstract_models.py:290 +msgid "Thursday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:79 -msgid "" -"This could be a Google Places or Directions link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:84 -msgid "Monday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:87 -msgid "Tuesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:90 -msgid "Wednesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:93 -msgid "Thursday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:96 -msgid "Friday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:99 -msgid "Saturday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:102 -msgid "Sunday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:105 -msgid "Monday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:110 -msgid "Tuesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:115 -msgid "Wednesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:120 -msgid "Thursday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:125 -msgid "Friday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:130 -msgid "Saturday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:135 -msgid "Sunday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:159 -msgid "Location" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:160 -msgid "Locations" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:206 -msgid "Now open" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:297 -msgid "Slug" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:301 -msgid "Leave blank to auto-generate a unique slug." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:304 -msgid "Subtitle" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:310 -msgid "Lead Text" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:311 -msgid "" -"Teaser text that in some cases is used in the list view and/or in the detail " -"view." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:316 -msgid "Opening hours" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:318 -msgid "" -"This Text will be used to show the Opening hours on the location detail " -"page. If provided, the detailed opening hours will be overriden." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:355 -msgid "" -"Select and arrange specific entries, or, leave blank to select all. (If " -"manual entries are selected the category filtering will be ignored.)" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:359 -msgid "Apphook Page" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:363 -msgid "" -"If provided, this Apphook-Page will be used to generate the detail link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:366 -msgid "Zoom Level" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:367 -msgid "The higher the number, the more we zoom in." -msgstr "" - -#: allink_core/apps/locations/admin.py:40 -msgid "Opening hours (Detailed)" -msgstr "" - -#: allink_core/apps/locations/admin.py:59 -msgid "Format: \"9:00-12:00 13:00-20:00\"" -msgstr "" - -#: allink_core/apps/locations/cms_apps.py:8 -msgid "Locations Apphook" +#: allink_core/apps/locations/abstract_models.py:291 +msgid "Friday" msgstr "" -#: allink_core/apps/locations/cms_menus.py:15 -msgid "Locations menu" +#: allink_core/apps/locations/abstract_models.py:292 +msgid "Saturday" msgstr "" -#: allink_core/apps/locations/cms_plugins.py:26 -msgid "Map Options" +#: allink_core/apps/locations/abstract_models.py:293 +msgid "Sunday" msgstr "" diff --git a/allink_core/apps/locations/locale/it/LC_MESSAGES/django.mo b/allink_core/apps/locations/locale/it/LC_MESSAGES/django.mo index 3bfbe84d..7898bde1 100644 Binary files a/allink_core/apps/locations/locale/it/LC_MESSAGES/django.mo and b/allink_core/apps/locations/locale/it/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/locations/locale/it/LC_MESSAGES/django.po b/allink_core/apps/locations/locale/it/LC_MESSAGES/django.po index b123f9ca..85653b98 100644 --- a/allink_core/apps/locations/locale/it/LC_MESSAGES/django.po +++ b/allink_core/apps/locations/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-15 16:26+0200\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,167 +18,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: allink_core/apps/locations/abstract_models.py:61 -msgid "Preview Image" +#: allink_core/apps/locations/abstract_models.py:287 +msgid "Monday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:68 -msgid "Latitude" +#: allink_core/apps/locations/abstract_models.py:288 +msgid "Tuesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:73 -msgid "Longitude" +#: allink_core/apps/locations/abstract_models.py:289 +msgid "Wednesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:78 -msgid "Map Link" +#: allink_core/apps/locations/abstract_models.py:290 +msgid "Thursday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:79 -msgid "" -"This could be a Google Places or Directions link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:84 -msgid "Monday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:87 -msgid "Tuesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:90 -msgid "Wednesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:93 -msgid "Thursday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:96 -msgid "Friday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:99 -msgid "Saturday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:102 -msgid "Sunday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:105 -msgid "Monday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:110 -msgid "Tuesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:115 -msgid "Wednesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:120 -msgid "Thursday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:125 -msgid "Friday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:130 -msgid "Saturday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:135 -msgid "Sunday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:159 -msgid "Location" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:160 -msgid "Locations" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:206 -msgid "Now open" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:297 -msgid "Slug" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:301 -msgid "Leave blank to auto-generate a unique slug." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:304 -msgid "Subtitle" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:310 -msgid "Lead Text" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:311 -msgid "" -"Teaser text that in some cases is used in the list view and/or in the detail " -"view." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:316 -msgid "Opening hours" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:318 -msgid "" -"This Text will be used to show the Opening hours on the location detail " -"page. If provided, the detailed opening hours will be overriden." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:355 -msgid "" -"Select and arrange specific entries, or, leave blank to select all. (If " -"manual entries are selected the category filtering will be ignored.)" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:359 -msgid "Apphook Page" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:363 -msgid "" -"If provided, this Apphook-Page will be used to generate the detail link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:366 -msgid "Zoom Level" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:367 -msgid "The higher the number, the more we zoom in." -msgstr "" - -#: allink_core/apps/locations/admin.py:40 -msgid "Opening hours (Detailed)" -msgstr "" - -#: allink_core/apps/locations/admin.py:59 -msgid "Format: \"9:00-12:00 13:00-20:00\"" -msgstr "" - -#: allink_core/apps/locations/cms_apps.py:8 -msgid "Locations Apphook" +#: allink_core/apps/locations/abstract_models.py:291 +msgid "Friday" msgstr "" -#: allink_core/apps/locations/cms_menus.py:15 -msgid "Locations menu" +#: allink_core/apps/locations/abstract_models.py:292 +msgid "Saturday" msgstr "" -#: allink_core/apps/locations/cms_plugins.py:26 -msgid "Map Options" +#: allink_core/apps/locations/abstract_models.py:293 +msgid "Sunday" msgstr "" diff --git a/allink_core/apps/locations/locale/nl/LC_MESSAGES/django.mo b/allink_core/apps/locations/locale/nl/LC_MESSAGES/django.mo index b8b6bd2e..7898bde1 100644 Binary files a/allink_core/apps/locations/locale/nl/LC_MESSAGES/django.mo and b/allink_core/apps/locations/locale/nl/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/locations/locale/nl/LC_MESSAGES/django.po b/allink_core/apps/locations/locale/nl/LC_MESSAGES/django.po index 5c94b292..85653b98 100644 --- a/allink_core/apps/locations/locale/nl/LC_MESSAGES/django.po +++ b/allink_core/apps/locations/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-15 16:27+0200\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,167 +18,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: allink_core/apps/locations/abstract_models.py:61 -msgid "Preview Image" +#: allink_core/apps/locations/abstract_models.py:287 +msgid "Monday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:68 -msgid "Latitude" +#: allink_core/apps/locations/abstract_models.py:288 +msgid "Tuesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:73 -msgid "Longitude" +#: allink_core/apps/locations/abstract_models.py:289 +msgid "Wednesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:78 -msgid "Map Link" +#: allink_core/apps/locations/abstract_models.py:290 +msgid "Thursday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:79 -msgid "" -"This could be a Google Places or Directions link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:84 -msgid "Monday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:87 -msgid "Tuesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:90 -msgid "Wednesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:93 -msgid "Thursday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:96 -msgid "Friday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:99 -msgid "Saturday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:102 -msgid "Sunday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:105 -msgid "Monday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:110 -msgid "Tuesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:115 -msgid "Wednesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:120 -msgid "Thursday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:125 -msgid "Friday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:130 -msgid "Saturday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:135 -msgid "Sunday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:159 -msgid "Location" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:160 -msgid "Locations" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:206 -msgid "Now open" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:297 -msgid "Slug" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:301 -msgid "Leave blank to auto-generate a unique slug." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:304 -msgid "Subtitle" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:310 -msgid "Lead Text" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:311 -msgid "" -"Teaser text that in some cases is used in the list view and/or in the detail " -"view." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:316 -msgid "Opening hours" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:318 -msgid "" -"This Text will be used to show the Opening hours on the location detail " -"page. If provided, the detailed opening hours will be overriden." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:355 -msgid "" -"Select and arrange specific entries, or, leave blank to select all. (If " -"manual entries are selected the category filtering will be ignored.)" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:359 -msgid "Apphook Page" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:363 -msgid "" -"If provided, this Apphook-Page will be used to generate the detail link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:366 -msgid "Zoom Level" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:367 -msgid "The higher the number, the more we zoom in." -msgstr "" - -#: allink_core/apps/locations/admin.py:40 -msgid "Opening hours (Detailed)" -msgstr "" - -#: allink_core/apps/locations/admin.py:59 -msgid "Format: \"9:00-12:00 13:00-20:00\"" -msgstr "" - -#: allink_core/apps/locations/cms_apps.py:8 -msgid "Locations Apphook" +#: allink_core/apps/locations/abstract_models.py:291 +msgid "Friday" msgstr "" -#: allink_core/apps/locations/cms_menus.py:15 -msgid "Locations menu" +#: allink_core/apps/locations/abstract_models.py:292 +msgid "Saturday" msgstr "" -#: allink_core/apps/locations/cms_plugins.py:26 -msgid "Map Options" +#: allink_core/apps/locations/abstract_models.py:293 +msgid "Sunday" msgstr "" diff --git a/allink_core/apps/locations/locale/ru/LC_MESSAGES/django.mo b/allink_core/apps/locations/locale/ru/LC_MESSAGES/django.mo index ef4e9edf..9d7908d7 100644 Binary files a/allink_core/apps/locations/locale/ru/LC_MESSAGES/django.mo and b/allink_core/apps/locations/locale/ru/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/locations/locale/ru/LC_MESSAGES/django.po b/allink_core/apps/locations/locale/ru/LC_MESSAGES/django.po index 19f1adfe..a6741909 100644 --- a/allink_core/apps/locations/locale/ru/LC_MESSAGES/django.po +++ b/allink_core/apps/locations/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-15 16:27+0200\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,167 +20,30 @@ msgstr "" "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" "%100>=11 && n%100<=14)? 2 : 3);\n" -#: allink_core/apps/locations/abstract_models.py:61 -msgid "Preview Image" +#: allink_core/apps/locations/abstract_models.py:287 +msgid "Monday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:68 -msgid "Latitude" +#: allink_core/apps/locations/abstract_models.py:288 +msgid "Tuesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:73 -msgid "Longitude" +#: allink_core/apps/locations/abstract_models.py:289 +msgid "Wednesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:78 -msgid "Map Link" +#: allink_core/apps/locations/abstract_models.py:290 +msgid "Thursday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:79 -msgid "" -"This could be a Google Places or Directions link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:84 -msgid "Monday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:87 -msgid "Tuesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:90 -msgid "Wednesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:93 -msgid "Thursday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:96 -msgid "Friday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:99 -msgid "Saturday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:102 -msgid "Sunday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:105 -msgid "Monday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:110 -msgid "Tuesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:115 -msgid "Wednesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:120 -msgid "Thursday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:125 -msgid "Friday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:130 -msgid "Saturday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:135 -msgid "Sunday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:159 -msgid "Location" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:160 -msgid "Locations" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:206 -msgid "Now open" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:297 -msgid "Slug" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:301 -msgid "Leave blank to auto-generate a unique slug." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:304 -msgid "Subtitle" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:310 -msgid "Lead Text" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:311 -msgid "" -"Teaser text that in some cases is used in the list view and/or in the detail " -"view." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:316 -msgid "Opening hours" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:318 -msgid "" -"This Text will be used to show the Opening hours on the location detail " -"page. If provided, the detailed opening hours will be overriden." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:355 -msgid "" -"Select and arrange specific entries, or, leave blank to select all. (If " -"manual entries are selected the category filtering will be ignored.)" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:359 -msgid "Apphook Page" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:363 -msgid "" -"If provided, this Apphook-Page will be used to generate the detail link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:366 -msgid "Zoom Level" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:367 -msgid "The higher the number, the more we zoom in." -msgstr "" - -#: allink_core/apps/locations/admin.py:40 -msgid "Opening hours (Detailed)" -msgstr "" - -#: allink_core/apps/locations/admin.py:59 -msgid "Format: \"9:00-12:00 13:00-20:00\"" -msgstr "" - -#: allink_core/apps/locations/cms_apps.py:8 -msgid "Locations Apphook" +#: allink_core/apps/locations/abstract_models.py:291 +msgid "Friday" msgstr "" -#: allink_core/apps/locations/cms_menus.py:15 -msgid "Locations menu" +#: allink_core/apps/locations/abstract_models.py:292 +msgid "Saturday" msgstr "" -#: allink_core/apps/locations/cms_plugins.py:26 -msgid "Map Options" +#: allink_core/apps/locations/abstract_models.py:293 +msgid "Sunday" msgstr "" diff --git a/allink_core/apps/locations/locale/zh_Hans/LC_MESSAGES/django.mo b/allink_core/apps/locations/locale/zh_Hans/LC_MESSAGES/django.mo index 84c646ed..c5191ec6 100644 Binary files a/allink_core/apps/locations/locale/zh_Hans/LC_MESSAGES/django.mo and b/allink_core/apps/locations/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/locations/locale/zh_Hans/LC_MESSAGES/django.po b/allink_core/apps/locations/locale/zh_Hans/LC_MESSAGES/django.po index c0b37713..8b9d64e9 100644 --- a/allink_core/apps/locations/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allink_core/apps/locations/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-15 16:28+0200\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,167 +17,30 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: allink_core/apps/locations/abstract_models.py:61 -msgid "Preview Image" +#: allink_core/apps/locations/abstract_models.py:287 +msgid "Monday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:68 -msgid "Latitude" +#: allink_core/apps/locations/abstract_models.py:288 +msgid "Tuesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:73 -msgid "Longitude" +#: allink_core/apps/locations/abstract_models.py:289 +msgid "Wednesday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:78 -msgid "Map Link" +#: allink_core/apps/locations/abstract_models.py:290 +msgid "Thursday" msgstr "" -#: allink_core/apps/locations/abstract_models.py:79 -msgid "" -"This could be a Google Places or Directions link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:84 -msgid "Monday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:87 -msgid "Tuesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:90 -msgid "Wednesday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:93 -msgid "Thursday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:96 -msgid "Friday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:99 -msgid "Saturday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:102 -msgid "Sunday morning or whole day" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:105 -msgid "Monday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:110 -msgid "Tuesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:115 -msgid "Wednesday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:120 -msgid "Thursday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:125 -msgid "Friday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:130 -msgid "Saturday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:135 -msgid "Sunday afternoon" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:159 -msgid "Location" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:160 -msgid "Locations" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:206 -msgid "Now open" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:297 -msgid "Slug" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:301 -msgid "Leave blank to auto-generate a unique slug." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:304 -msgid "Subtitle" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:310 -msgid "Lead Text" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:311 -msgid "" -"Teaser text that in some cases is used in the list view and/or in the detail " -"view." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:316 -msgid "Opening hours" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:318 -msgid "" -"This Text will be used to show the Opening hours on the location detail " -"page. If provided, the detailed opening hours will be overriden." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:355 -msgid "" -"Select and arrange specific entries, or, leave blank to select all. (If " -"manual entries are selected the category filtering will be ignored.)" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:359 -msgid "Apphook Page" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:363 -msgid "" -"If provided, this Apphook-Page will be used to generate the detail link." -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:366 -msgid "Zoom Level" -msgstr "" - -#: allink_core/apps/locations/abstract_models.py:367 -msgid "The higher the number, the more we zoom in." -msgstr "" - -#: allink_core/apps/locations/admin.py:40 -msgid "Opening hours (Detailed)" -msgstr "" - -#: allink_core/apps/locations/admin.py:59 -msgid "Format: \"9:00-12:00 13:00-20:00\"" -msgstr "" - -#: allink_core/apps/locations/cms_apps.py:8 -msgid "Locations Apphook" +#: allink_core/apps/locations/abstract_models.py:291 +msgid "Friday" msgstr "" -#: allink_core/apps/locations/cms_menus.py:15 -msgid "Locations menu" +#: allink_core/apps/locations/abstract_models.py:292 +msgid "Saturday" msgstr "" -#: allink_core/apps/locations/cms_plugins.py:26 -msgid "Map Options" +#: allink_core/apps/locations/abstract_models.py:293 +msgid "Sunday" msgstr "" diff --git a/allink_core/apps/people/locale/de/LC_MESSAGES/django.mo b/allink_core/apps/people/locale/de/LC_MESSAGES/django.mo index 84361a13..24f46e19 100644 Binary files a/allink_core/apps/people/locale/de/LC_MESSAGES/django.mo and b/allink_core/apps/people/locale/de/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/people/locale/de/LC_MESSAGES/django.po b/allink_core/apps/people/locale/de/LC_MESSAGES/django.po index 057eadb6..f083a287 100644 --- a/allink_core/apps/people/locale/de/LC_MESSAGES/django.po +++ b/allink_core/apps/people/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/apps/people/locale/es/LC_MESSAGES/django.mo b/allink_core/apps/people/locale/es/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/apps/people/locale/es/LC_MESSAGES/django.mo and b/allink_core/apps/people/locale/es/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/people/locale/es/LC_MESSAGES/django.po b/allink_core/apps/people/locale/es/LC_MESSAGES/django.po index ae3b67bb..6a3b20c8 100644 --- a/allink_core/apps/people/locale/es/LC_MESSAGES/django.po +++ b/allink_core/apps/people/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/apps/people/locale/fr/LC_MESSAGES/django.mo b/allink_core/apps/people/locale/fr/LC_MESSAGES/django.mo index 150ac45a..e8e0f185 100644 Binary files a/allink_core/apps/people/locale/fr/LC_MESSAGES/django.mo and b/allink_core/apps/people/locale/fr/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/people/locale/fr/LC_MESSAGES/django.po b/allink_core/apps/people/locale/fr/LC_MESSAGES/django.po index 427ab416..08bab68b 100644 --- a/allink_core/apps/people/locale/fr/LC_MESSAGES/django.po +++ b/allink_core/apps/people/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/apps/people/locale/it/LC_MESSAGES/django.mo b/allink_core/apps/people/locale/it/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/apps/people/locale/it/LC_MESSAGES/django.mo and b/allink_core/apps/people/locale/it/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/people/locale/it/LC_MESSAGES/django.po b/allink_core/apps/people/locale/it/LC_MESSAGES/django.po index ae3b67bb..6a3b20c8 100644 --- a/allink_core/apps/people/locale/it/LC_MESSAGES/django.po +++ b/allink_core/apps/people/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/apps/people/locale/nl/LC_MESSAGES/django.mo b/allink_core/apps/people/locale/nl/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/apps/people/locale/nl/LC_MESSAGES/django.mo and b/allink_core/apps/people/locale/nl/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/people/locale/nl/LC_MESSAGES/django.po b/allink_core/apps/people/locale/nl/LC_MESSAGES/django.po index ae3b67bb..6a3b20c8 100644 --- a/allink_core/apps/people/locale/nl/LC_MESSAGES/django.po +++ b/allink_core/apps/people/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/apps/people/locale/ru/LC_MESSAGES/django.mo b/allink_core/apps/people/locale/ru/LC_MESSAGES/django.mo index 84831073..9d7908d7 100644 Binary files a/allink_core/apps/people/locale/ru/LC_MESSAGES/django.mo and b/allink_core/apps/people/locale/ru/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/people/locale/ru/LC_MESSAGES/django.po b/allink_core/apps/people/locale/ru/LC_MESSAGES/django.po index b9da0e5a..46be8cd6 100644 --- a/allink_core/apps/people/locale/ru/LC_MESSAGES/django.po +++ b/allink_core/apps/people/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/apps/people/locale/zh_Hans/LC_MESSAGES/django.mo b/allink_core/apps/people/locale/zh_Hans/LC_MESSAGES/django.mo index 78b7e6d4..c5191ec6 100644 Binary files a/allink_core/apps/people/locale/zh_Hans/LC_MESSAGES/django.mo and b/allink_core/apps/people/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/allink_core/apps/people/locale/zh_Hans/LC_MESSAGES/django.po b/allink_core/apps/people/locale/zh_Hans/LC_MESSAGES/django.po index d4c1c65d..669fd8a9 100644 --- a/allink_core/apps/people/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allink_core/apps/people/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core/allink_settings.py b/allink_core/core/allink_settings.py index 5e81e296..7ffc9219 100644 --- a/allink_core/core/allink_settings.py +++ b/allink_core/core/allink_settings.py @@ -41,6 +41,7 @@ 'allink_core.core_apps.allink_categories', 'allink_core.core_apps.allink_styleguide', 'allink_core.core_apps.allink_legacy_redirect', + 'allink_core.core_apps.allink_newsletter', 'allink_core.core_apps.allink_quote', 'allink_core.core_apps.allink_content', @@ -103,6 +104,8 @@ 'CMSAllinkLanguageChooserPlugin', 'CMSAllinkSEOAccordionContainerPlugin', 'CMSAllinkQuotePlugin', + 'CMSAllinkNewsletterSignupPlugin', + ] #################################################################################### @@ -125,6 +128,7 @@ '/app/allink_core/core_apps/allink_legacy_redirect/locale', '/app/allink_core/core_apps/allink_mandrill/locale', '/app/allink_core/core_apps/allink_styleguide/locale', + '/app/allink_core/core_apps/allink_newsletter/locale', '/app/allink_core/core_apps/allink_button_link/locale', '/app/allink_core/core_apps/allink_content/locale', '/app/allink_core/core_apps/allink_gallery/locale', diff --git a/allink_core/core/locale/de/LC_MESSAGES/django.mo b/allink_core/core/locale/de/LC_MESSAGES/django.mo index bdf27b1e..b34567db 100644 Binary files a/allink_core/core/locale/de/LC_MESSAGES/django.mo and b/allink_core/core/locale/de/LC_MESSAGES/django.mo differ diff --git a/allink_core/core/locale/de/LC_MESSAGES/django.po b/allink_core/core/locale/de/LC_MESSAGES/django.po index 1e7d0a02..b6ef8641 100644 --- a/allink_core/core/locale/de/LC_MESSAGES/django.po +++ b/allink_core/core/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -99,14 +99,18 @@ msgid "Website" msgstr "" #: allink_core/core/models/fields_model.py:600 +#: allink_core/core_apps/allink_newsletter/forms.py:10 +#: allink_core/core_apps/allink_newsletter/models.py:15 msgid "Salutation" msgstr "Anrede" #: allink_core/core/models/fields_model.py:606 +#: allink_core/core_apps/allink_newsletter/models.py:23 msgid "First Name" msgstr "Vorname" #: allink_core/core/models/fields_model.py:612 +#: allink_core/core_apps/allink_newsletter/models.py:28 msgid "Last Name" msgstr "Nachname" @@ -185,23 +189,23 @@ msgstr "" msgid "Save and continue editing" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:82 +#: allink_core/core/templates/allink_core/base_root.html:79 msgid "Go to homepage" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:83 +#: allink_core/core/templates/allink_core/base_root.html:80 msgid "Jump to navigation" msgstr "Zur Navigation springen" -#: allink_core/core/templates/allink_core/base_root.html:84 +#: allink_core/core/templates/allink_core/base_root.html:81 msgid "Jump to content" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:85 +#: allink_core/core/templates/allink_core/base_root.html:82 msgid "Jump to footer" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:130 +#: allink_core/core/templates/allink_core/base_root.html:127 #: allink_core/core/templates/allink_core/modals/modal-header-markup.html:19 #: allink_core/core/templates/partials/forms/form_base.html:48 msgid "Close" @@ -285,15 +289,15 @@ msgstr "" msgid "No files were found in the specified folder." msgstr "Keine Einträge für die gewählten Filter verfügbar." -#: allink_core/core/templates/allink_core/includes/browser-check.html:6 +#: allink_core/core/templates/allink_core/includes/browser-check.html:14 msgid "Browser Info" msgstr "Browser-Hinweis" -#: allink_core/core/templates/allink_core/includes/browser-check.html:7 +#: allink_core/core/templates/allink_core/includes/browser-check.html:15 msgid "no optimal representation possible" msgstr "Keine Optimale Darstellung möglich" -#: allink_core/core/templates/allink_core/includes/browser-check.html:8 +#: allink_core/core/templates/allink_core/includes/browser-check.html:16 msgid "" "Your web browser does not provide an optimal representation of our website. " "This means that some functions may not work or the view may be incorrect. We " @@ -304,7 +308,7 @@ msgstr "" "die Ansicht ist fehlerhaft. Wir empfehlen Ihnen, einen aktuellen Browser wie " "Google Chrome zu verwenden." -#: allink_core/core/templates/allink_core/includes/browser-check.html:12 +#: allink_core/core/templates/allink_core/includes/browser-check.html:20 msgid "Visit Anyways" msgstr "Trotzdem besuchen" @@ -386,6 +390,9 @@ msgid "No people found with the applied filters." msgstr "Keine Personen für die gewählten Filter gefunden." #: allink_core/core/templates/allink_core/people/plugins/contact_details/content.html:33 +#: allink_core/core_apps/allink_newsletter/forms.py:16 +#: allink_core/core_apps/allink_newsletter/forms.py:20 +#: allink_core/core_apps/allink_newsletter/models.py:33 msgid "E-Mail" msgstr "" @@ -417,37 +424,49 @@ msgstr "Mehr" msgid "The form has been submitted successfully." msgstr "Das Formular wurde erfolgreich versendet." -#: allink_core/core/templates/partials/forms/form_field.html:16 -msgid "required" -msgstr "Pflichtfeld" - -#: allink_core/core/templates/partials/forms/form_field.html:19 -#: allink_core/core/templates/partials/forms/form_field.html:105 -msgid "Optional" -msgstr "Grid Optionen" - +#: allink_core/core/templates/partials/forms/fields/date.html:28 #: allink_core/core/templates/partials/forms/form_field.html:47 msgid "Open Calendar" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:33 #: allink_core/core/templates/partials/forms/form_field.html:52 msgid "Open Time Picker" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:40 #: allink_core/core/templates/partials/forms/form_field.html:59 msgid "Clear Field" msgstr "Filter-Felder" +#: allink_core/core/templates/partials/forms/fields/file.html:14 +#: allink_core/core/templates/partials/forms/fields/file.html:16 #: allink_core/core/templates/partials/forms/form_field.html:69 #: allink_core/core/templates/partials/forms/form_field.html:70 msgid "Select file..." msgstr "File auswählen" +#: allink_core/core/templates/partials/forms/form_field.html:16 +#: allink_core/core/templates/partials/forms/label.html:16 +msgid "required" +msgstr "Pflichtfeld" + +#: allink_core/core/templates/partials/forms/form_field.html:19 +#: allink_core/core/templates/partials/forms/form_field.html:105 +msgid "Optional" +msgstr "Grid Optionen" + +#: allink_core/core/templates/partials/forms/label.html:18 +#, fuzzy +#| msgid "Optional" +msgid "optional" +msgstr "Grid Optionen" + #: allink_core/core/templates/templatetags/allink_plugin_ajax.html:22 msgid "Add plugin to" msgstr "Plugin hinzufügen zu" -#: allink_core/core/views.py:135 +#: allink_core/core/views.py:133 msgid "The requested content is not published." msgstr "Die angeforderte Seite ist nicht vorhanden." @@ -478,6 +497,97 @@ msgstr "" msgid "Show info box" msgstr "" +#: allink_core/core_apps/allink_newsletter/cms_plugins.py:13 +msgid "Newsletter Signup Plugin" +msgstr "Newsletter Anmeldungs Plugin" + +#: allink_core/core_apps/allink_newsletter/config.py:10 +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:3 +msgid "Newsletter Signup" +msgstr "Newsletter Anmeldung" + +#: allink_core/core_apps/allink_newsletter/forms.py:25 +msgid "Direct mailings" +msgstr "Direktversand" + +#: allink_core/core_apps/allink_newsletter/forms.py:31 +msgid "Personalised Marketing" +msgstr "Personalisiertes Marketing" + +#: allink_core/core_apps/allink_newsletter/models.py:37 +msgid "consent for email dispatch" +msgstr "Einverständnis für Email Versand" + +#: allink_core/core_apps/allink_newsletter/models.py:41 +msgid "consent for direct mailings" +msgstr "Einverständnis für Direktversand" + +#: allink_core/core_apps/allink_newsletter/models.py:46 +msgid "consent for personalised marketing" +msgstr "Einverständnis für personalisiertes Marketing" + +#: allink_core/core_apps/allink_newsletter/models.py:56 +msgid "audience id" +msgstr "Audience Id" + +#: allink_core/core_apps/allink_newsletter/models.py:58 +msgid "This is the id of the Mailchimp Audience the user wil be subscribed to" +msgstr "" +"Dies ist die Id der Mailchimp Audience zu welcher der User hizugefügt wird" + +#: allink_core/core_apps/allink_newsletter/models.py:62 +msgid "consent text" +msgstr "Einverständniserklärung" + +#: allink_core/core_apps/allink_newsletter/models.py:67 +msgid "Double-Opt-In" +msgstr "Double-Opt-In" + +#: allink_core/core_apps/allink_newsletter/models.py:70 +msgid "" +"If selected an email wil be sent where the user will have to confirm his " +"subscribtion to the mailing list" +msgstr "" +"Wenn ausgewählt wird ein Email an den User geschickt in welchem die " +"Anmeldung an diesen Mailverteiler bestätigt werden muss" + +#: allink_core/core_apps/allink_newsletter/models.py:74 +msgid "Mailchimp Email ID" +msgstr "Mailchim ID für den Email Versand" + +#: allink_core/core_apps/allink_newsletter/models.py:77 +#: allink_core/core_apps/allink_newsletter/models.py:84 +#: allink_core/core_apps/allink_newsletter/models.py:91 +msgid "" +"Get this id via Postman and only change it if you know what you are doing" +msgstr "" +"Besorgen Sie sich diese ID via Postman und ändern Sie sie nur, wenn Sie " +"wissen, was Sie tun" + +#: allink_core/core_apps/allink_newsletter/models.py:81 +msgid "Mailchimp Personalised Marketing ID" +msgstr "Mailchimp ID für personalisiertes Marketing" + +#: allink_core/core_apps/allink_newsletter/models.py:88 +msgid "Mailchimp Direct Mailing ID" +msgstr "Mailchimp ID für Direktversand" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:54 +msgid "Subscribe" +msgstr "Anmelden" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "by clicking send you accept our" +msgstr "Mit dem Abschicken akzeptieren Sie unsere" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "general terms and conditions" +msgstr "Allgemeinen Geschäftsbedingungen" + +#: allink_core/core_apps/allink_newsletter/views.py:37 +msgid "Something went wrong on our end we are sorry for that" +msgstr "Es tut uns Leid. Etwas ist schiefgelaufen." + #: allink_core/core_apps/allink_quote/cms_plugins.py:10 msgid "Quote" msgstr "" diff --git a/allink_core/core/locale/es/LC_MESSAGES/django.mo b/allink_core/core/locale/es/LC_MESSAGES/django.mo index d10b3b66..23acfc09 100644 Binary files a/allink_core/core/locale/es/LC_MESSAGES/django.mo and b/allink_core/core/locale/es/LC_MESSAGES/django.mo differ diff --git a/allink_core/core/locale/es/LC_MESSAGES/django.po b/allink_core/core/locale/es/LC_MESSAGES/django.po index 03fbf5c1..fb6ad9ab 100644 --- a/allink_core/core/locale/es/LC_MESSAGES/django.po +++ b/allink_core/core/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -99,14 +99,18 @@ msgid "Website" msgstr "" #: allink_core/core/models/fields_model.py:600 +#: allink_core/core_apps/allink_newsletter/forms.py:10 +#: allink_core/core_apps/allink_newsletter/models.py:15 msgid "Salutation" msgstr "" #: allink_core/core/models/fields_model.py:606 +#: allink_core/core_apps/allink_newsletter/models.py:23 msgid "First Name" msgstr "Nombre" #: allink_core/core/models/fields_model.py:612 +#: allink_core/core_apps/allink_newsletter/models.py:28 msgid "Last Name" msgstr "Apellidos" @@ -185,23 +189,23 @@ msgstr "" msgid "Save and continue editing" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:82 +#: allink_core/core/templates/allink_core/base_root.html:79 msgid "Go to homepage" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:83 +#: allink_core/core/templates/allink_core/base_root.html:80 msgid "Jump to navigation" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:84 +#: allink_core/core/templates/allink_core/base_root.html:81 msgid "Jump to content" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:85 +#: allink_core/core/templates/allink_core/base_root.html:82 msgid "Jump to footer" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:130 +#: allink_core/core/templates/allink_core/base_root.html:127 #: allink_core/core/templates/allink_core/modals/modal-header-markup.html:19 #: allink_core/core/templates/partials/forms/form_base.html:48 msgid "Close" @@ -285,22 +289,22 @@ msgstr "" msgid "No files were found in the specified folder." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:6 +#: allink_core/core/templates/allink_core/includes/browser-check.html:14 msgid "Browser Info" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:7 +#: allink_core/core/templates/allink_core/includes/browser-check.html:15 msgid "no optimal representation possible" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:8 +#: allink_core/core/templates/allink_core/includes/browser-check.html:16 msgid "" "Your web browser does not provide an optimal representation of our website. " "This means that some functions may not work or the view may be incorrect. We " "recommend that you use a current browser." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:12 +#: allink_core/core/templates/allink_core/includes/browser-check.html:20 msgid "Visit Anyways" msgstr "" @@ -382,6 +386,9 @@ msgid "No people found with the applied filters." msgstr "" #: allink_core/core/templates/allink_core/people/plugins/contact_details/content.html:33 +#: allink_core/core_apps/allink_newsletter/forms.py:16 +#: allink_core/core_apps/allink_newsletter/forms.py:20 +#: allink_core/core_apps/allink_newsletter/models.py:33 msgid "E-Mail" msgstr "" @@ -413,37 +420,47 @@ msgstr "CARGAR" msgid "The form has been submitted successfully." msgstr "" -#: allink_core/core/templates/partials/forms/form_field.html:16 -msgid "required" -msgstr "" - -#: allink_core/core/templates/partials/forms/form_field.html:19 -#: allink_core/core/templates/partials/forms/form_field.html:105 -msgid "Optional" -msgstr "" - +#: allink_core/core/templates/partials/forms/fields/date.html:28 #: allink_core/core/templates/partials/forms/form_field.html:47 msgid "Open Calendar" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:33 #: allink_core/core/templates/partials/forms/form_field.html:52 msgid "Open Time Picker" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:40 #: allink_core/core/templates/partials/forms/form_field.html:59 msgid "Clear Field" msgstr "" +#: allink_core/core/templates/partials/forms/fields/file.html:14 +#: allink_core/core/templates/partials/forms/fields/file.html:16 #: allink_core/core/templates/partials/forms/form_field.html:69 #: allink_core/core/templates/partials/forms/form_field.html:70 msgid "Select file..." msgstr "" +#: allink_core/core/templates/partials/forms/form_field.html:16 +#: allink_core/core/templates/partials/forms/label.html:16 +msgid "required" +msgstr "" + +#: allink_core/core/templates/partials/forms/form_field.html:19 +#: allink_core/core/templates/partials/forms/form_field.html:105 +msgid "Optional" +msgstr "" + +#: allink_core/core/templates/partials/forms/label.html:18 +msgid "optional" +msgstr "" + #: allink_core/core/templates/templatetags/allink_plugin_ajax.html:22 msgid "Add plugin to" msgstr "" -#: allink_core/core/views.py:135 +#: allink_core/core/views.py:133 msgid "The requested content is not published." msgstr "" @@ -474,6 +491,92 @@ msgstr "" msgid "Show info box" msgstr "" +#: allink_core/core_apps/allink_newsletter/cms_plugins.py:13 +msgid "Newsletter Signup Plugin" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/config.py:10 +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:3 +msgid "Newsletter Signup" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:25 +msgid "Direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:31 +msgid "Personalised Marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:37 +msgid "consent for email dispatch" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:41 +msgid "consent for direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:46 +msgid "consent for personalised marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:56 +msgid "audience id" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:58 +msgid "This is the id of the Mailchimp Audience the user wil be subscribed to" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:62 +msgid "consent text" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:67 +msgid "Double-Opt-In" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:70 +msgid "" +"If selected an email wil be sent where the user will have to confirm his " +"subscribtion to the mailing list" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:74 +msgid "Mailchimp Email ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:77 +#: allink_core/core_apps/allink_newsletter/models.py:84 +#: allink_core/core_apps/allink_newsletter/models.py:91 +msgid "" +"Get this id via Postman and only change it if you know what you are doing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:81 +msgid "Mailchimp Personalised Marketing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:88 +msgid "Mailchimp Direct Mailing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:54 +msgid "Subscribe" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "by clicking send you accept our" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "general terms and conditions" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/views.py:37 +msgid "Something went wrong on our end we are sorry for that" +msgstr "" + #: allink_core/core_apps/allink_quote/cms_plugins.py:10 msgid "Quote" msgstr "" diff --git a/allink_core/core/locale/fr/LC_MESSAGES/django.mo b/allink_core/core/locale/fr/LC_MESSAGES/django.mo index cdf70477..c80fb87d 100644 Binary files a/allink_core/core/locale/fr/LC_MESSAGES/django.mo and b/allink_core/core/locale/fr/LC_MESSAGES/django.mo differ diff --git a/allink_core/core/locale/fr/LC_MESSAGES/django.po b/allink_core/core/locale/fr/LC_MESSAGES/django.po index fa3ffe05..6c9bb932 100644 --- a/allink_core/core/locale/fr/LC_MESSAGES/django.po +++ b/allink_core/core/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -99,14 +99,18 @@ msgid "Website" msgstr "" #: allink_core/core/models/fields_model.py:600 +#: allink_core/core_apps/allink_newsletter/forms.py:10 +#: allink_core/core_apps/allink_newsletter/models.py:15 msgid "Salutation" msgstr "" #: allink_core/core/models/fields_model.py:606 +#: allink_core/core_apps/allink_newsletter/models.py:23 msgid "First Name" msgstr "Prénom" #: allink_core/core/models/fields_model.py:612 +#: allink_core/core_apps/allink_newsletter/models.py:28 msgid "Last Name" msgstr "Nom" @@ -185,23 +189,23 @@ msgstr "" msgid "Save and continue editing" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:82 +#: allink_core/core/templates/allink_core/base_root.html:79 msgid "Go to homepage" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:83 +#: allink_core/core/templates/allink_core/base_root.html:80 msgid "Jump to navigation" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:84 +#: allink_core/core/templates/allink_core/base_root.html:81 msgid "Jump to content" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:85 +#: allink_core/core/templates/allink_core/base_root.html:82 msgid "Jump to footer" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:130 +#: allink_core/core/templates/allink_core/base_root.html:127 #: allink_core/core/templates/allink_core/modals/modal-header-markup.html:19 #: allink_core/core/templates/partials/forms/form_base.html:48 msgid "Close" @@ -285,22 +289,22 @@ msgstr "" msgid "No files were found in the specified folder." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:6 +#: allink_core/core/templates/allink_core/includes/browser-check.html:14 msgid "Browser Info" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:7 +#: allink_core/core/templates/allink_core/includes/browser-check.html:15 msgid "no optimal representation possible" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:8 +#: allink_core/core/templates/allink_core/includes/browser-check.html:16 msgid "" "Your web browser does not provide an optimal representation of our website. " "This means that some functions may not work or the view may be incorrect. We " "recommend that you use a current browser." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:12 +#: allink_core/core/templates/allink_core/includes/browser-check.html:20 msgid "Visit Anyways" msgstr "" @@ -382,6 +386,9 @@ msgid "No people found with the applied filters." msgstr "" #: allink_core/core/templates/allink_core/people/plugins/contact_details/content.html:33 +#: allink_core/core_apps/allink_newsletter/forms.py:16 +#: allink_core/core_apps/allink_newsletter/forms.py:20 +#: allink_core/core_apps/allink_newsletter/models.py:33 msgid "E-Mail" msgstr "" @@ -413,37 +420,47 @@ msgstr "Mehr" msgid "The form has been submitted successfully." msgstr "" -#: allink_core/core/templates/partials/forms/form_field.html:16 -msgid "required" -msgstr "" - -#: allink_core/core/templates/partials/forms/form_field.html:19 -#: allink_core/core/templates/partials/forms/form_field.html:105 -msgid "Optional" -msgstr "" - +#: allink_core/core/templates/partials/forms/fields/date.html:28 #: allink_core/core/templates/partials/forms/form_field.html:47 msgid "Open Calendar" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:33 #: allink_core/core/templates/partials/forms/form_field.html:52 msgid "Open Time Picker" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:40 #: allink_core/core/templates/partials/forms/form_field.html:59 msgid "Clear Field" msgstr "" +#: allink_core/core/templates/partials/forms/fields/file.html:14 +#: allink_core/core/templates/partials/forms/fields/file.html:16 #: allink_core/core/templates/partials/forms/form_field.html:69 #: allink_core/core/templates/partials/forms/form_field.html:70 msgid "Select file..." msgstr "" +#: allink_core/core/templates/partials/forms/form_field.html:16 +#: allink_core/core/templates/partials/forms/label.html:16 +msgid "required" +msgstr "" + +#: allink_core/core/templates/partials/forms/form_field.html:19 +#: allink_core/core/templates/partials/forms/form_field.html:105 +msgid "Optional" +msgstr "" + +#: allink_core/core/templates/partials/forms/label.html:18 +msgid "optional" +msgstr "" + #: allink_core/core/templates/templatetags/allink_plugin_ajax.html:22 msgid "Add plugin to" msgstr "" -#: allink_core/core/views.py:135 +#: allink_core/core/views.py:133 msgid "The requested content is not published." msgstr "La page recherchée n'existe pas." @@ -474,6 +491,92 @@ msgstr "" msgid "Show info box" msgstr "" +#: allink_core/core_apps/allink_newsletter/cms_plugins.py:13 +msgid "Newsletter Signup Plugin" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/config.py:10 +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:3 +msgid "Newsletter Signup" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:25 +msgid "Direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:31 +msgid "Personalised Marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:37 +msgid "consent for email dispatch" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:41 +msgid "consent for direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:46 +msgid "consent for personalised marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:56 +msgid "audience id" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:58 +msgid "This is the id of the Mailchimp Audience the user wil be subscribed to" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:62 +msgid "consent text" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:67 +msgid "Double-Opt-In" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:70 +msgid "" +"If selected an email wil be sent where the user will have to confirm his " +"subscribtion to the mailing list" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:74 +msgid "Mailchimp Email ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:77 +#: allink_core/core_apps/allink_newsletter/models.py:84 +#: allink_core/core_apps/allink_newsletter/models.py:91 +msgid "" +"Get this id via Postman and only change it if you know what you are doing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:81 +msgid "Mailchimp Personalised Marketing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:88 +msgid "Mailchimp Direct Mailing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:54 +msgid "Subscribe" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "by clicking send you accept our" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "general terms and conditions" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/views.py:37 +msgid "Something went wrong on our end we are sorry for that" +msgstr "" + #: allink_core/core_apps/allink_quote/cms_plugins.py:10 msgid "Quote" msgstr "" diff --git a/allink_core/core/locale/it/LC_MESSAGES/django.mo b/allink_core/core/locale/it/LC_MESSAGES/django.mo index ac9b055a..dc87f837 100644 Binary files a/allink_core/core/locale/it/LC_MESSAGES/django.mo and b/allink_core/core/locale/it/LC_MESSAGES/django.mo differ diff --git a/allink_core/core/locale/it/LC_MESSAGES/django.po b/allink_core/core/locale/it/LC_MESSAGES/django.po index 8b7152a7..ee3b65b2 100644 --- a/allink_core/core/locale/it/LC_MESSAGES/django.po +++ b/allink_core/core/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -99,14 +99,18 @@ msgid "Website" msgstr "" #: allink_core/core/models/fields_model.py:600 +#: allink_core/core_apps/allink_newsletter/forms.py:10 +#: allink_core/core_apps/allink_newsletter/models.py:15 msgid "Salutation" msgstr "" #: allink_core/core/models/fields_model.py:606 +#: allink_core/core_apps/allink_newsletter/models.py:23 msgid "First Name" msgstr "" #: allink_core/core/models/fields_model.py:612 +#: allink_core/core_apps/allink_newsletter/models.py:28 msgid "Last Name" msgstr "" @@ -185,23 +189,23 @@ msgstr "" msgid "Save and continue editing" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:82 +#: allink_core/core/templates/allink_core/base_root.html:79 msgid "Go to homepage" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:83 +#: allink_core/core/templates/allink_core/base_root.html:80 msgid "Jump to navigation" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:84 +#: allink_core/core/templates/allink_core/base_root.html:81 msgid "Jump to content" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:85 +#: allink_core/core/templates/allink_core/base_root.html:82 msgid "Jump to footer" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:130 +#: allink_core/core/templates/allink_core/base_root.html:127 #: allink_core/core/templates/allink_core/modals/modal-header-markup.html:19 #: allink_core/core/templates/partials/forms/form_base.html:48 msgid "Close" @@ -285,22 +289,22 @@ msgstr "" msgid "No files were found in the specified folder." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:6 +#: allink_core/core/templates/allink_core/includes/browser-check.html:14 msgid "Browser Info" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:7 +#: allink_core/core/templates/allink_core/includes/browser-check.html:15 msgid "no optimal representation possible" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:8 +#: allink_core/core/templates/allink_core/includes/browser-check.html:16 msgid "" "Your web browser does not provide an optimal representation of our website. " "This means that some functions may not work or the view may be incorrect. We " "recommend that you use a current browser." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:12 +#: allink_core/core/templates/allink_core/includes/browser-check.html:20 msgid "Visit Anyways" msgstr "" @@ -382,6 +386,9 @@ msgid "No people found with the applied filters." msgstr "Es wurden keine Personen zum gewählten Filter gefunden." #: allink_core/core/templates/allink_core/people/plugins/contact_details/content.html:33 +#: allink_core/core_apps/allink_newsletter/forms.py:16 +#: allink_core/core_apps/allink_newsletter/forms.py:20 +#: allink_core/core_apps/allink_newsletter/models.py:33 msgid "E-Mail" msgstr "" @@ -413,37 +420,47 @@ msgstr "" msgid "The form has been submitted successfully." msgstr "" -#: allink_core/core/templates/partials/forms/form_field.html:16 -msgid "required" -msgstr "" - -#: allink_core/core/templates/partials/forms/form_field.html:19 -#: allink_core/core/templates/partials/forms/form_field.html:105 -msgid "Optional" -msgstr "" - +#: allink_core/core/templates/partials/forms/fields/date.html:28 #: allink_core/core/templates/partials/forms/form_field.html:47 msgid "Open Calendar" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:33 #: allink_core/core/templates/partials/forms/form_field.html:52 msgid "Open Time Picker" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:40 #: allink_core/core/templates/partials/forms/form_field.html:59 msgid "Clear Field" msgstr "" +#: allink_core/core/templates/partials/forms/fields/file.html:14 +#: allink_core/core/templates/partials/forms/fields/file.html:16 #: allink_core/core/templates/partials/forms/form_field.html:69 #: allink_core/core/templates/partials/forms/form_field.html:70 msgid "Select file..." msgstr "" +#: allink_core/core/templates/partials/forms/form_field.html:16 +#: allink_core/core/templates/partials/forms/label.html:16 +msgid "required" +msgstr "" + +#: allink_core/core/templates/partials/forms/form_field.html:19 +#: allink_core/core/templates/partials/forms/form_field.html:105 +msgid "Optional" +msgstr "" + +#: allink_core/core/templates/partials/forms/label.html:18 +msgid "optional" +msgstr "" + #: allink_core/core/templates/templatetags/allink_plugin_ajax.html:22 msgid "Add plugin to" msgstr "" -#: allink_core/core/views.py:135 +#: allink_core/core/views.py:133 msgid "The requested content is not published." msgstr "" @@ -474,6 +491,92 @@ msgstr "" msgid "Show info box" msgstr "" +#: allink_core/core_apps/allink_newsletter/cms_plugins.py:13 +msgid "Newsletter Signup Plugin" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/config.py:10 +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:3 +msgid "Newsletter Signup" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:25 +msgid "Direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:31 +msgid "Personalised Marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:37 +msgid "consent for email dispatch" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:41 +msgid "consent for direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:46 +msgid "consent for personalised marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:56 +msgid "audience id" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:58 +msgid "This is the id of the Mailchimp Audience the user wil be subscribed to" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:62 +msgid "consent text" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:67 +msgid "Double-Opt-In" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:70 +msgid "" +"If selected an email wil be sent where the user will have to confirm his " +"subscribtion to the mailing list" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:74 +msgid "Mailchimp Email ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:77 +#: allink_core/core_apps/allink_newsletter/models.py:84 +#: allink_core/core_apps/allink_newsletter/models.py:91 +msgid "" +"Get this id via Postman and only change it if you know what you are doing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:81 +msgid "Mailchimp Personalised Marketing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:88 +msgid "Mailchimp Direct Mailing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:54 +msgid "Subscribe" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "by clicking send you accept our" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "general terms and conditions" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/views.py:37 +msgid "Something went wrong on our end we are sorry for that" +msgstr "" + #: allink_core/core_apps/allink_quote/cms_plugins.py:10 msgid "Quote" msgstr "" diff --git a/allink_core/core/locale/nl/LC_MESSAGES/django.mo b/allink_core/core/locale/nl/LC_MESSAGES/django.mo index 9cdbeef4..afa0eea6 100644 Binary files a/allink_core/core/locale/nl/LC_MESSAGES/django.mo and b/allink_core/core/locale/nl/LC_MESSAGES/django.mo differ diff --git a/allink_core/core/locale/nl/LC_MESSAGES/django.po b/allink_core/core/locale/nl/LC_MESSAGES/django.po index aa08ee50..bdf5a710 100644 --- a/allink_core/core/locale/nl/LC_MESSAGES/django.po +++ b/allink_core/core/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -99,14 +99,18 @@ msgid "Website" msgstr "" #: allink_core/core/models/fields_model.py:600 +#: allink_core/core_apps/allink_newsletter/forms.py:10 +#: allink_core/core_apps/allink_newsletter/models.py:15 msgid "Salutation" msgstr "" #: allink_core/core/models/fields_model.py:606 +#: allink_core/core_apps/allink_newsletter/models.py:23 msgid "First Name" msgstr "Voornaam" #: allink_core/core/models/fields_model.py:612 +#: allink_core/core_apps/allink_newsletter/models.py:28 msgid "Last Name" msgstr "Naam" @@ -185,23 +189,23 @@ msgstr "" msgid "Save and continue editing" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:82 +#: allink_core/core/templates/allink_core/base_root.html:79 msgid "Go to homepage" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:83 +#: allink_core/core/templates/allink_core/base_root.html:80 msgid "Jump to navigation" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:84 +#: allink_core/core/templates/allink_core/base_root.html:81 msgid "Jump to content" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:85 +#: allink_core/core/templates/allink_core/base_root.html:82 msgid "Jump to footer" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:130 +#: allink_core/core/templates/allink_core/base_root.html:127 #: allink_core/core/templates/allink_core/modals/modal-header-markup.html:19 #: allink_core/core/templates/partials/forms/form_base.html:48 msgid "Close" @@ -285,22 +289,22 @@ msgstr "" msgid "No files were found in the specified folder." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:6 +#: allink_core/core/templates/allink_core/includes/browser-check.html:14 msgid "Browser Info" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:7 +#: allink_core/core/templates/allink_core/includes/browser-check.html:15 msgid "no optimal representation possible" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:8 +#: allink_core/core/templates/allink_core/includes/browser-check.html:16 msgid "" "Your web browser does not provide an optimal representation of our website. " "This means that some functions may not work or the view may be incorrect. We " "recommend that you use a current browser." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:12 +#: allink_core/core/templates/allink_core/includes/browser-check.html:20 msgid "Visit Anyways" msgstr "" @@ -382,6 +386,9 @@ msgid "No people found with the applied filters." msgstr "" #: allink_core/core/templates/allink_core/people/plugins/contact_details/content.html:33 +#: allink_core/core_apps/allink_newsletter/forms.py:16 +#: allink_core/core_apps/allink_newsletter/forms.py:20 +#: allink_core/core_apps/allink_newsletter/models.py:33 msgid "E-Mail" msgstr "" @@ -413,37 +420,47 @@ msgstr "" msgid "The form has been submitted successfully." msgstr "" -#: allink_core/core/templates/partials/forms/form_field.html:16 -msgid "required" -msgstr "" - -#: allink_core/core/templates/partials/forms/form_field.html:19 -#: allink_core/core/templates/partials/forms/form_field.html:105 -msgid "Optional" -msgstr "" - +#: allink_core/core/templates/partials/forms/fields/date.html:28 #: allink_core/core/templates/partials/forms/form_field.html:47 msgid "Open Calendar" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:33 #: allink_core/core/templates/partials/forms/form_field.html:52 msgid "Open Time Picker" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:40 #: allink_core/core/templates/partials/forms/form_field.html:59 msgid "Clear Field" msgstr "" +#: allink_core/core/templates/partials/forms/fields/file.html:14 +#: allink_core/core/templates/partials/forms/fields/file.html:16 #: allink_core/core/templates/partials/forms/form_field.html:69 #: allink_core/core/templates/partials/forms/form_field.html:70 msgid "Select file..." msgstr "" +#: allink_core/core/templates/partials/forms/form_field.html:16 +#: allink_core/core/templates/partials/forms/label.html:16 +msgid "required" +msgstr "" + +#: allink_core/core/templates/partials/forms/form_field.html:19 +#: allink_core/core/templates/partials/forms/form_field.html:105 +msgid "Optional" +msgstr "" + +#: allink_core/core/templates/partials/forms/label.html:18 +msgid "optional" +msgstr "" + #: allink_core/core/templates/templatetags/allink_plugin_ajax.html:22 msgid "Add plugin to" msgstr "" -#: allink_core/core/views.py:135 +#: allink_core/core/views.py:133 msgid "The requested content is not published." msgstr "" @@ -474,6 +491,92 @@ msgstr "" msgid "Show info box" msgstr "" +#: allink_core/core_apps/allink_newsletter/cms_plugins.py:13 +msgid "Newsletter Signup Plugin" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/config.py:10 +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:3 +msgid "Newsletter Signup" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:25 +msgid "Direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:31 +msgid "Personalised Marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:37 +msgid "consent for email dispatch" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:41 +msgid "consent for direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:46 +msgid "consent for personalised marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:56 +msgid "audience id" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:58 +msgid "This is the id of the Mailchimp Audience the user wil be subscribed to" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:62 +msgid "consent text" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:67 +msgid "Double-Opt-In" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:70 +msgid "" +"If selected an email wil be sent where the user will have to confirm his " +"subscribtion to the mailing list" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:74 +msgid "Mailchimp Email ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:77 +#: allink_core/core_apps/allink_newsletter/models.py:84 +#: allink_core/core_apps/allink_newsletter/models.py:91 +msgid "" +"Get this id via Postman and only change it if you know what you are doing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:81 +msgid "Mailchimp Personalised Marketing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:88 +msgid "Mailchimp Direct Mailing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:54 +msgid "Subscribe" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "by clicking send you accept our" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "general terms and conditions" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/views.py:37 +msgid "Something went wrong on our end we are sorry for that" +msgstr "" + #: allink_core/core_apps/allink_quote/cms_plugins.py:10 msgid "Quote" msgstr "" diff --git a/allink_core/core/locale/ru/LC_MESSAGES/django.mo b/allink_core/core/locale/ru/LC_MESSAGES/django.mo index 84831073..9d7908d7 100644 Binary files a/allink_core/core/locale/ru/LC_MESSAGES/django.mo and b/allink_core/core/locale/ru/LC_MESSAGES/django.mo differ diff --git a/allink_core/core/locale/ru/LC_MESSAGES/django.po b/allink_core/core/locale/ru/LC_MESSAGES/django.po index a5b31239..0e333850 100644 --- a/allink_core/core/locale/ru/LC_MESSAGES/django.po +++ b/allink_core/core/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -101,14 +101,18 @@ msgid "Website" msgstr "" #: allink_core/core/models/fields_model.py:600 +#: allink_core/core_apps/allink_newsletter/forms.py:10 +#: allink_core/core_apps/allink_newsletter/models.py:15 msgid "Salutation" msgstr "" #: allink_core/core/models/fields_model.py:606 +#: allink_core/core_apps/allink_newsletter/models.py:23 msgid "First Name" msgstr "" #: allink_core/core/models/fields_model.py:612 +#: allink_core/core_apps/allink_newsletter/models.py:28 msgid "Last Name" msgstr "" @@ -187,23 +191,23 @@ msgstr "" msgid "Save and continue editing" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:82 +#: allink_core/core/templates/allink_core/base_root.html:79 msgid "Go to homepage" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:83 +#: allink_core/core/templates/allink_core/base_root.html:80 msgid "Jump to navigation" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:84 +#: allink_core/core/templates/allink_core/base_root.html:81 msgid "Jump to content" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:85 +#: allink_core/core/templates/allink_core/base_root.html:82 msgid "Jump to footer" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:130 +#: allink_core/core/templates/allink_core/base_root.html:127 #: allink_core/core/templates/allink_core/modals/modal-header-markup.html:19 #: allink_core/core/templates/partials/forms/form_base.html:48 msgid "Close" @@ -287,22 +291,22 @@ msgstr "" msgid "No files were found in the specified folder." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:6 +#: allink_core/core/templates/allink_core/includes/browser-check.html:14 msgid "Browser Info" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:7 +#: allink_core/core/templates/allink_core/includes/browser-check.html:15 msgid "no optimal representation possible" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:8 +#: allink_core/core/templates/allink_core/includes/browser-check.html:16 msgid "" "Your web browser does not provide an optimal representation of our website. " "This means that some functions may not work or the view may be incorrect. We " "recommend that you use a current browser." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:12 +#: allink_core/core/templates/allink_core/includes/browser-check.html:20 msgid "Visit Anyways" msgstr "" @@ -384,6 +388,9 @@ msgid "No people found with the applied filters." msgstr "" #: allink_core/core/templates/allink_core/people/plugins/contact_details/content.html:33 +#: allink_core/core_apps/allink_newsletter/forms.py:16 +#: allink_core/core_apps/allink_newsletter/forms.py:20 +#: allink_core/core_apps/allink_newsletter/models.py:33 msgid "E-Mail" msgstr "" @@ -415,37 +422,47 @@ msgstr "" msgid "The form has been submitted successfully." msgstr "" -#: allink_core/core/templates/partials/forms/form_field.html:16 -msgid "required" -msgstr "" - -#: allink_core/core/templates/partials/forms/form_field.html:19 -#: allink_core/core/templates/partials/forms/form_field.html:105 -msgid "Optional" -msgstr "" - +#: allink_core/core/templates/partials/forms/fields/date.html:28 #: allink_core/core/templates/partials/forms/form_field.html:47 msgid "Open Calendar" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:33 #: allink_core/core/templates/partials/forms/form_field.html:52 msgid "Open Time Picker" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:40 #: allink_core/core/templates/partials/forms/form_field.html:59 msgid "Clear Field" msgstr "" +#: allink_core/core/templates/partials/forms/fields/file.html:14 +#: allink_core/core/templates/partials/forms/fields/file.html:16 #: allink_core/core/templates/partials/forms/form_field.html:69 #: allink_core/core/templates/partials/forms/form_field.html:70 msgid "Select file..." msgstr "" +#: allink_core/core/templates/partials/forms/form_field.html:16 +#: allink_core/core/templates/partials/forms/label.html:16 +msgid "required" +msgstr "" + +#: allink_core/core/templates/partials/forms/form_field.html:19 +#: allink_core/core/templates/partials/forms/form_field.html:105 +msgid "Optional" +msgstr "" + +#: allink_core/core/templates/partials/forms/label.html:18 +msgid "optional" +msgstr "" + #: allink_core/core/templates/templatetags/allink_plugin_ajax.html:22 msgid "Add plugin to" msgstr "" -#: allink_core/core/views.py:135 +#: allink_core/core/views.py:133 msgid "The requested content is not published." msgstr "" @@ -476,6 +493,92 @@ msgstr "" msgid "Show info box" msgstr "" +#: allink_core/core_apps/allink_newsletter/cms_plugins.py:13 +msgid "Newsletter Signup Plugin" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/config.py:10 +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:3 +msgid "Newsletter Signup" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:25 +msgid "Direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:31 +msgid "Personalised Marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:37 +msgid "consent for email dispatch" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:41 +msgid "consent for direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:46 +msgid "consent for personalised marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:56 +msgid "audience id" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:58 +msgid "This is the id of the Mailchimp Audience the user wil be subscribed to" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:62 +msgid "consent text" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:67 +msgid "Double-Opt-In" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:70 +msgid "" +"If selected an email wil be sent where the user will have to confirm his " +"subscribtion to the mailing list" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:74 +msgid "Mailchimp Email ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:77 +#: allink_core/core_apps/allink_newsletter/models.py:84 +#: allink_core/core_apps/allink_newsletter/models.py:91 +msgid "" +"Get this id via Postman and only change it if you know what you are doing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:81 +msgid "Mailchimp Personalised Marketing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:88 +msgid "Mailchimp Direct Mailing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:54 +msgid "Subscribe" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "by clicking send you accept our" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "general terms and conditions" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/views.py:37 +msgid "Something went wrong on our end we are sorry for that" +msgstr "" + #: allink_core/core_apps/allink_quote/cms_plugins.py:10 msgid "Quote" msgstr "" diff --git a/allink_core/core/locale/zh_Hans/LC_MESSAGES/django.mo b/allink_core/core/locale/zh_Hans/LC_MESSAGES/django.mo index 94d8c97a..3e770ff8 100644 Binary files a/allink_core/core/locale/zh_Hans/LC_MESSAGES/django.mo and b/allink_core/core/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/allink_core/core/locale/zh_Hans/LC_MESSAGES/django.po b/allink_core/core/locale/zh_Hans/LC_MESSAGES/django.po index 253c5cb1..e2212f0d 100644 --- a/allink_core/core/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allink_core/core/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -99,14 +99,18 @@ msgid "Website" msgstr "" #: allink_core/core/models/fields_model.py:600 +#: allink_core/core_apps/allink_newsletter/forms.py:10 +#: allink_core/core_apps/allink_newsletter/models.py:15 msgid "Salutation" msgstr "" #: allink_core/core/models/fields_model.py:606 +#: allink_core/core_apps/allink_newsletter/models.py:23 msgid "First Name" msgstr "名稱" #: allink_core/core/models/fields_model.py:612 +#: allink_core/core_apps/allink_newsletter/models.py:28 msgid "Last Name" msgstr "姓氏" @@ -185,23 +189,23 @@ msgstr "" msgid "Save and continue editing" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:82 +#: allink_core/core/templates/allink_core/base_root.html:79 msgid "Go to homepage" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:83 +#: allink_core/core/templates/allink_core/base_root.html:80 msgid "Jump to navigation" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:84 +#: allink_core/core/templates/allink_core/base_root.html:81 msgid "Jump to content" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:85 +#: allink_core/core/templates/allink_core/base_root.html:82 msgid "Jump to footer" msgstr "" -#: allink_core/core/templates/allink_core/base_root.html:130 +#: allink_core/core/templates/allink_core/base_root.html:127 #: allink_core/core/templates/allink_core/modals/modal-header-markup.html:19 #: allink_core/core/templates/partials/forms/form_base.html:48 msgid "Close" @@ -285,22 +289,22 @@ msgstr "" msgid "No files were found in the specified folder." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:6 +#: allink_core/core/templates/allink_core/includes/browser-check.html:14 msgid "Browser Info" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:7 +#: allink_core/core/templates/allink_core/includes/browser-check.html:15 msgid "no optimal representation possible" msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:8 +#: allink_core/core/templates/allink_core/includes/browser-check.html:16 msgid "" "Your web browser does not provide an optimal representation of our website. " "This means that some functions may not work or the view may be incorrect. We " "recommend that you use a current browser." msgstr "" -#: allink_core/core/templates/allink_core/includes/browser-check.html:12 +#: allink_core/core/templates/allink_core/includes/browser-check.html:20 msgid "Visit Anyways" msgstr "" @@ -382,6 +386,9 @@ msgid "No people found with the applied filters." msgstr "" #: allink_core/core/templates/allink_core/people/plugins/contact_details/content.html:33 +#: allink_core/core_apps/allink_newsletter/forms.py:16 +#: allink_core/core_apps/allink_newsletter/forms.py:20 +#: allink_core/core_apps/allink_newsletter/models.py:33 msgid "E-Mail" msgstr "" @@ -413,37 +420,47 @@ msgstr "閱讀更多" msgid "The form has been submitted successfully." msgstr "" -#: allink_core/core/templates/partials/forms/form_field.html:16 -msgid "required" -msgstr "" - -#: allink_core/core/templates/partials/forms/form_field.html:19 -#: allink_core/core/templates/partials/forms/form_field.html:105 -msgid "Optional" -msgstr "" - +#: allink_core/core/templates/partials/forms/fields/date.html:28 #: allink_core/core/templates/partials/forms/form_field.html:47 msgid "Open Calendar" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:33 #: allink_core/core/templates/partials/forms/form_field.html:52 msgid "Open Time Picker" msgstr "" +#: allink_core/core/templates/partials/forms/fields/date.html:40 #: allink_core/core/templates/partials/forms/form_field.html:59 msgid "Clear Field" msgstr "" +#: allink_core/core/templates/partials/forms/fields/file.html:14 +#: allink_core/core/templates/partials/forms/fields/file.html:16 #: allink_core/core/templates/partials/forms/form_field.html:69 #: allink_core/core/templates/partials/forms/form_field.html:70 msgid "Select file..." msgstr "" +#: allink_core/core/templates/partials/forms/form_field.html:16 +#: allink_core/core/templates/partials/forms/label.html:16 +msgid "required" +msgstr "" + +#: allink_core/core/templates/partials/forms/form_field.html:19 +#: allink_core/core/templates/partials/forms/form_field.html:105 +msgid "Optional" +msgstr "" + +#: allink_core/core/templates/partials/forms/label.html:18 +msgid "optional" +msgstr "" + #: allink_core/core/templates/templatetags/allink_plugin_ajax.html:22 msgid "Add plugin to" msgstr "" -#: allink_core/core/views.py:135 +#: allink_core/core/views.py:133 msgid "The requested content is not published." msgstr "" @@ -474,6 +491,92 @@ msgstr "" msgid "Show info box" msgstr "" +#: allink_core/core_apps/allink_newsletter/cms_plugins.py:13 +msgid "Newsletter Signup Plugin" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/config.py:10 +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:3 +msgid "Newsletter Signup" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:25 +msgid "Direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/forms.py:31 +msgid "Personalised Marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:37 +msgid "consent for email dispatch" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:41 +msgid "consent for direct mailings" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:46 +msgid "consent for personalised marketing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:56 +msgid "audience id" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:58 +msgid "This is the id of the Mailchimp Audience the user wil be subscribed to" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:62 +msgid "consent text" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:67 +msgid "Double-Opt-In" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:70 +msgid "" +"If selected an email wil be sent where the user will have to confirm his " +"subscribtion to the mailing list" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:74 +msgid "Mailchimp Email ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:77 +#: allink_core/core_apps/allink_newsletter/models.py:84 +#: allink_core/core_apps/allink_newsletter/models.py:91 +msgid "" +"Get this id via Postman and only change it if you know what you are doing" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:81 +msgid "Mailchimp Personalised Marketing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/models.py:88 +msgid "Mailchimp Direct Mailing ID" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:54 +msgid "Subscribe" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "by clicking send you accept our" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html:56 +msgid "general terms and conditions" +msgstr "" + +#: allink_core/core_apps/allink_newsletter/views.py:37 +msgid "Something went wrong on our end we are sorry for that" +msgstr "" + #: allink_core/core_apps/allink_quote/cms_plugins.py:10 msgid "Quote" msgstr "" diff --git a/allink_core/core/templates/allink_core/includes/browser-check.html b/allink_core/core/templates/allink_core/includes/browser-check.html index af5b8de6..a0347bab 100644 --- a/allink_core/core/templates/allink_core/includes/browser-check.html +++ b/allink_core/core/templates/allink_core/includes/browser-check.html @@ -4,7 +4,7 @@
diff --git a/allink_core/core/templates/allink_core/includes/header/header.html b/allink_core/core/templates/allink_core/includes/header/header.html index 47e987d8..03f4512a 100644 --- a/allink_core/core/templates/allink_core/includes/header/header.html +++ b/allink_core/core/templates/allink_core/includes/header/header.html @@ -6,7 +6,7 @@ diff --git a/allink_core/core/templates/partials/forms/error.html b/allink_core/core/templates/partials/forms/error.html new file mode 100644 index 00000000..fbfbf465 --- /dev/null +++ b/allink_core/core/templates/partials/forms/error.html @@ -0,0 +1,11 @@ +{% block errors %} + {% if not noerror %} + {% if field.errors %} +
    + {% for error in field.errors %} +
  • {{ error }}
    • + {% endfor %} +
+ {% endif %} + {% endif %} +{% endblock %} diff --git a/allink_core/core/templates/partials/forms/fields/checkbox.html b/allink_core/core/templates/partials/forms/fields/checkbox.html new file mode 100644 index 00000000..add2176a --- /dev/null +++ b/allink_core/core/templates/partials/forms/fields/checkbox.html @@ -0,0 +1,28 @@ +{% load widget_tweaks i18n %} + +{% if field.is_hidden %} + {{ field }} +{% else %} + {% block control_group %} +
+ {% include 'partials/forms/label.html' %} + + {% block controls %} +
+ {% block widget %} +
+ +
+ {% endblock %} + + {% include 'partials/forms/error.html' %} + {% include 'partials/forms/help.html' %} +
+ {% endblock %} +
+ {% endblock %} +{% endif %} diff --git a/allink_core/core/templates/partials/forms/fields/date.html b/allink_core/core/templates/partials/forms/fields/date.html new file mode 100644 index 00000000..05fad479 --- /dev/null +++ b/allink_core/core/templates/partials/forms/fields/date.html @@ -0,0 +1,51 @@ +{% load widget_tweaks i18n allink_form_tags %} + +{% if field.is_hidden %} + {{ field }} +{% else %} + {% block control_group %} +
+ {% include 'partials/forms/label.html' %} + + {% block controls %} +
+ {% block widget %} +
+ {% comment %} + Need a specific widget attribute? Here's how to get it: + {{field.field.widget.attrs.enableTime}} + {% endcomment %} + {% if field.field.required %} + {% render_field field class+="datepicker form-control" required="required" %} + {% else %} + {% render_field field class+="datepicker form-control" %} + {% endif %} + + {# If a date has to be selected, show the calendar button #} + {% if field|widget_type == 'datetimeinput' or field|widget_type == 'dateinput' %} + + {% trans "Open Calendar" %} + + {# if it's time only, we want a time button #} + {% else %} + + {% trans "Open Time Picker" %} + + {% endif %} + + {# If the field is OPTIONAL, we have to be able to clear it #} + {% if not field.field.required %} + + {% trans "Clear Field" %} + + {% endif %} +
+ {% endblock %} + + {% include 'partials/forms/error.html' %} + {% include 'partials/forms/help.html' %} +
+ {% endblock %} +
+ {% endblock %} +{% endif %} diff --git a/allink_core/core/templates/partials/forms/fields/file.html b/allink_core/core/templates/partials/forms/fields/file.html new file mode 100644 index 00000000..a4b606ec --- /dev/null +++ b/allink_core/core/templates/partials/forms/fields/file.html @@ -0,0 +1,27 @@ +{% load widget_tweaks i18n %} + +{% if field.is_hidden %} + {{ field }} +{% else %} + {% block control_group %} +
+ {% include 'partials/forms/label.html' %} + + {% block controls %} +
+ {% block widget %} +
+ + +
+ {% endblock %} + + {% include 'partials/forms/error.html' %} + {% include 'partials/forms/help.html' %} +
+ {% endblock %} +
+ {% endblock %} +{% endif %} diff --git a/allink_core/core/templates/partials/forms/fields/input.html b/allink_core/core/templates/partials/forms/fields/input.html new file mode 100644 index 00000000..4763d97d --- /dev/null +++ b/allink_core/core/templates/partials/forms/fields/input.html @@ -0,0 +1,48 @@ +{% load widget_tweaks i18n %} + +{% if field.is_hidden %} + {{ field }} +{% else %} + {% block control_group %} +
+ {% include 'partials/forms/label.html' %} + + {% block controls %} +
+ {% block widget %} + {% if instance.label_layout == 'placeholder' or placeholder_enabled == True %} + {% if field.field.required %} + {% if placeholder_text %} + {% render_field field class+="form-control" required="required" placeholder=placeholder_text %} + {% else %} + {% render_field field class+="form-control" required="required" placeholder=field.label %} + {% endif %} + {% else %} + {% if placeholder_text %} + {% render_field field class+="form-control" placeholder=placeholder_text %} + {% else %} + {% render_field field class+="form-control" placeholder=field.label %} + {% endif %} + {% endif %} + + {% comment %} + Default (withOUT placeholder): + + Forcefully set placeholder='', to make sure they are NOT being displayed + {% endcomment %} + {% else %} + {% if field.field.required %} + {% render_field field class+="form-control" required="required" placeholder='' %} + {% else %} + {% render_field field class+="form-control" placeholder='' %} + {% endif %} + {% endif %} + {% endblock %} + + {% include 'partials/forms/error.html' %} + {% include 'partials/forms/help.html' %} +
+ {% endblock %} +
+ {% endblock %} +{% endif %} diff --git a/allink_core/core/templates/partials/forms/fields/radio.html b/allink_core/core/templates/partials/forms/fields/radio.html new file mode 100644 index 00000000..a8e7ec4d --- /dev/null +++ b/allink_core/core/templates/partials/forms/fields/radio.html @@ -0,0 +1,30 @@ +{% load widget_tweaks i18n %} + +{% if field.is_hidden %} + {{ field }} +{% else %} + {% block control_group %} +
+ {% include 'partials/forms/label.html' %} + + {% block controls %} +
+ {% block widget %} + {% for choice in field %} +
+ +
+ {% endfor %} + {% endblock %} + + {% include 'partials/forms/error.html' %} + {% include 'partials/forms/help.html' %} +
+ {% endblock %} +
+ {% endblock %} +{% endif %} diff --git a/allink_core/core/templates/partials/forms/fields/select.html b/allink_core/core/templates/partials/forms/fields/select.html new file mode 100644 index 00000000..e1b7b421 --- /dev/null +++ b/allink_core/core/templates/partials/forms/fields/select.html @@ -0,0 +1,26 @@ +{% load widget_tweaks i18n %} + +{% if field.is_hidden %} + {{ field }} +{% else %} + {% block control_group %} +
+ {% include 'partials/forms/label.html' %} + + {% block controls %} +
+ {% block widget %} + {% if field.field.required %} + {% render_field field class+="selectpicker form-control" required="required" %} + {% else %} + {% render_field field class+="selectpicker form-control" %} + {% endif %} + {% endblock %} + + {% include 'partials/forms/error.html' %} + {% include 'partials/forms/help.html' %} +
+ {% endblock %} +
+ {% endblock %} +{% endif %} diff --git a/allink_core/core/templates/partials/forms/help.html b/allink_core/core/templates/partials/forms/help.html new file mode 100644 index 00000000..0e334b5a --- /dev/null +++ b/allink_core/core/templates/partials/forms/help.html @@ -0,0 +1,8 @@ +{% block help_text %} + {% if field.help_text %} + + {# We allow HTML within form help fields #} + {{ field.help_text|safe }} + + {% endif %} +{% endblock %} diff --git a/allink_core/core/templates/partials/forms/label.html b/allink_core/core/templates/partials/forms/label.html new file mode 100644 index 00000000..bae8f156 --- /dev/null +++ b/allink_core/core/templates/partials/forms/label.html @@ -0,0 +1,23 @@ +{% load i18n %} + +{% block label %} + {% if not nolabel %} + + {% endif %} +{% endblock %} diff --git a/allink_core/core_apps/allink_gallery/locale/de/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_gallery/locale/de/LC_MESSAGES/django.mo index d5728edd..ff533732 100644 Binary files a/allink_core/core_apps/allink_gallery/locale/de/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_gallery/locale/de/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_gallery/locale/de/LC_MESSAGES/django.po b/allink_core/core_apps/allink_gallery/locale/de/LC_MESSAGES/django.po index d3e401ac..0bb2611b 100644 --- a/allink_core/core_apps/allink_gallery/locale/de/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_gallery/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_gallery/locale/es/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_gallery/locale/es/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_gallery/locale/es/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_gallery/locale/es/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_gallery/locale/es/LC_MESSAGES/django.po b/allink_core/core_apps/allink_gallery/locale/es/LC_MESSAGES/django.po index 3f6484ad..d046a65d 100644 --- a/allink_core/core_apps/allink_gallery/locale/es/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_gallery/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_gallery/locale/fr/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_gallery/locale/fr/LC_MESSAGES/django.mo index f3b248fb..a1a2100e 100644 Binary files a/allink_core/core_apps/allink_gallery/locale/fr/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_gallery/locale/fr/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_gallery/locale/fr/LC_MESSAGES/django.po b/allink_core/core_apps/allink_gallery/locale/fr/LC_MESSAGES/django.po index e5a3e916..34ee7bcd 100644 --- a/allink_core/core_apps/allink_gallery/locale/fr/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_gallery/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_gallery/locale/it/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_gallery/locale/it/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_gallery/locale/it/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_gallery/locale/it/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_gallery/locale/it/LC_MESSAGES/django.po b/allink_core/core_apps/allink_gallery/locale/it/LC_MESSAGES/django.po index 3f6484ad..d046a65d 100644 --- a/allink_core/core_apps/allink_gallery/locale/it/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_gallery/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_gallery/locale/nl/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_gallery/locale/nl/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_gallery/locale/nl/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_gallery/locale/nl/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_gallery/locale/nl/LC_MESSAGES/django.po b/allink_core/core_apps/allink_gallery/locale/nl/LC_MESSAGES/django.po index 3f6484ad..d046a65d 100644 --- a/allink_core/core_apps/allink_gallery/locale/nl/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_gallery/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_gallery/locale/ru/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_gallery/locale/ru/LC_MESSAGES/django.mo index 84831073..9d7908d7 100644 Binary files a/allink_core/core_apps/allink_gallery/locale/ru/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_gallery/locale/ru/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_gallery/locale/ru/LC_MESSAGES/django.po b/allink_core/core_apps/allink_gallery/locale/ru/LC_MESSAGES/django.po index f3f0aec9..b957dd96 100644 --- a/allink_core/core_apps/allink_gallery/locale/ru/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_gallery/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_gallery/locale/zh_Hans/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_gallery/locale/zh_Hans/LC_MESSAGES/django.mo index f487d0ff..6c014471 100644 Binary files a/allink_core/core_apps/allink_gallery/locale/zh_Hans/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_gallery/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_gallery/locale/zh_Hans/LC_MESSAGES/django.po b/allink_core/core_apps/allink_gallery/locale/zh_Hans/LC_MESSAGES/django.po index 229af9e2..67229deb 100644 --- a/allink_core/core_apps/allink_gallery/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_gallery/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_image/locale/de/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_image/locale/de/LC_MESSAGES/django.mo index a9d10530..87128496 100644 Binary files a/allink_core/core_apps/allink_image/locale/de/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_image/locale/de/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_image/locale/de/LC_MESSAGES/django.po b/allink_core/core_apps/allink_image/locale/de/LC_MESSAGES/django.po index f4f3717d..98ef84e1 100644 --- a/allink_core/core_apps/allink_image/locale/de/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_image/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_image/locale/es/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_image/locale/es/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_image/locale/es/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_image/locale/es/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_image/locale/es/LC_MESSAGES/django.po b/allink_core/core_apps/allink_image/locale/es/LC_MESSAGES/django.po index 4c154aa4..0d239749 100644 --- a/allink_core/core_apps/allink_image/locale/es/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_image/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_image/locale/fr/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_image/locale/fr/LC_MESSAGES/django.mo index f3b248fb..a1a2100e 100644 Binary files a/allink_core/core_apps/allink_image/locale/fr/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_image/locale/fr/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_image/locale/fr/LC_MESSAGES/django.po b/allink_core/core_apps/allink_image/locale/fr/LC_MESSAGES/django.po index 802de3c3..d967811b 100644 --- a/allink_core/core_apps/allink_image/locale/fr/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_image/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_image/locale/it/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_image/locale/it/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_image/locale/it/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_image/locale/it/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_image/locale/it/LC_MESSAGES/django.po b/allink_core/core_apps/allink_image/locale/it/LC_MESSAGES/django.po index 4c154aa4..0d239749 100644 --- a/allink_core/core_apps/allink_image/locale/it/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_image/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_image/locale/nl/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_image/locale/nl/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_image/locale/nl/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_image/locale/nl/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_image/locale/nl/LC_MESSAGES/django.po b/allink_core/core_apps/allink_image/locale/nl/LC_MESSAGES/django.po index 4c154aa4..0d239749 100644 --- a/allink_core/core_apps/allink_image/locale/nl/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_image/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_image/locale/ru/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_image/locale/ru/LC_MESSAGES/django.mo index 84831073..9d7908d7 100644 Binary files a/allink_core/core_apps/allink_image/locale/ru/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_image/locale/ru/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_image/locale/ru/LC_MESSAGES/django.po b/allink_core/core_apps/allink_image/locale/ru/LC_MESSAGES/django.po index 54029738..302f4804 100644 --- a/allink_core/core_apps/allink_image/locale/ru/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_image/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_image/locale/zh_Hans/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_image/locale/zh_Hans/LC_MESSAGES/django.mo index f487d0ff..6c014471 100644 Binary files a/allink_core/core_apps/allink_image/locale/zh_Hans/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_image/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_image/locale/zh_Hans/LC_MESSAGES/django.po b/allink_core/core_apps/allink_image/locale/zh_Hans/LC_MESSAGES/django.po index 30b8c9c3..929dc889 100644 --- a/allink_core/core_apps/allink_image/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_image/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_mandrill/locale/de/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_mandrill/locale/de/LC_MESSAGES/django.mo index 5f0da6ed..1ba8b7f8 100644 Binary files a/allink_core/core_apps/allink_mandrill/locale/de/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_mandrill/locale/de/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_mandrill/locale/de/LC_MESSAGES/django.po b/allink_core/core_apps/allink_mandrill/locale/de/LC_MESSAGES/django.po index dae9eac9..bbd185ad 100644 --- a/allink_core/core_apps/allink_mandrill/locale/de/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_mandrill/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_mandrill/locale/es/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_mandrill/locale/es/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_mandrill/locale/es/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_mandrill/locale/es/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_mandrill/locale/es/LC_MESSAGES/django.po b/allink_core/core_apps/allink_mandrill/locale/es/LC_MESSAGES/django.po index c1622b19..8c523c6d 100644 --- a/allink_core/core_apps/allink_mandrill/locale/es/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_mandrill/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_mandrill/locale/fr/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_mandrill/locale/fr/LC_MESSAGES/django.mo index f3b248fb..a1a2100e 100644 Binary files a/allink_core/core_apps/allink_mandrill/locale/fr/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_mandrill/locale/fr/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_mandrill/locale/fr/LC_MESSAGES/django.po b/allink_core/core_apps/allink_mandrill/locale/fr/LC_MESSAGES/django.po index 9e9de6c4..869e9e04 100644 --- a/allink_core/core_apps/allink_mandrill/locale/fr/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_mandrill/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_mandrill/locale/it/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_mandrill/locale/it/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_mandrill/locale/it/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_mandrill/locale/it/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_mandrill/locale/it/LC_MESSAGES/django.po b/allink_core/core_apps/allink_mandrill/locale/it/LC_MESSAGES/django.po index c1622b19..8c523c6d 100644 --- a/allink_core/core_apps/allink_mandrill/locale/it/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_mandrill/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_mandrill/locale/nl/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_mandrill/locale/nl/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_mandrill/locale/nl/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_mandrill/locale/nl/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_mandrill/locale/nl/LC_MESSAGES/django.po b/allink_core/core_apps/allink_mandrill/locale/nl/LC_MESSAGES/django.po index c1622b19..8c523c6d 100644 --- a/allink_core/core_apps/allink_mandrill/locale/nl/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_mandrill/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_mandrill/locale/ru/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_mandrill/locale/ru/LC_MESSAGES/django.mo index 84831073..9d7908d7 100644 Binary files a/allink_core/core_apps/allink_mandrill/locale/ru/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_mandrill/locale/ru/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_mandrill/locale/ru/LC_MESSAGES/django.po b/allink_core/core_apps/allink_mandrill/locale/ru/LC_MESSAGES/django.po index 43af484c..69b19688 100644 --- a/allink_core/core_apps/allink_mandrill/locale/ru/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_mandrill/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_mandrill/locale/zh_Hans/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_mandrill/locale/zh_Hans/LC_MESSAGES/django.mo index f487d0ff..6c014471 100644 Binary files a/allink_core/core_apps/allink_mandrill/locale/zh_Hans/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_mandrill/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_mandrill/locale/zh_Hans/LC_MESSAGES/django.po b/allink_core/core_apps/allink_mandrill/locale/zh_Hans/LC_MESSAGES/django.po index 995da716..7d73d1b0 100644 --- a/allink_core/core_apps/allink_mandrill/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_mandrill/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_newsletter/__init__.py b/allink_core/core_apps/allink_newsletter/__init__.py new file mode 100644 index 00000000..a4b64504 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/__init__.py @@ -0,0 +1 @@ +default_app_config = 'allink_core.core_apps.allink_newsletter.config.NewsletterSignupConfig' \ No newline at end of file diff --git a/allink_core/core_apps/allink_newsletter/admin.py b/allink_core/core_apps/allink_newsletter/admin.py new file mode 100644 index 00000000..4fbf178b --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/admin.py @@ -0,0 +1,8 @@ +from django.contrib import admin + +from allink_core.core_apps.allink_newsletter.models import NewsletterSignupLog + + +@admin.register(NewsletterSignupLog) #Registering the Admin to the corresponding model +class NewsletterSignupAdmin(admin.ModelAdmin): + list_display = ('salutation', 'first_name', 'last_name', 'email',) #which fields should be shown in the list view \ No newline at end of file diff --git a/allink_core/core_apps/allink_newsletter/apps.py b/allink_core/core_apps/allink_newsletter/apps.py new file mode 100644 index 00000000..29dad008 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/apps.py @@ -0,0 +1,8 @@ +from django.apps import AppConfig + + +class AllinkNewsletterConfig(AppConfig): + """ + Defining the base name of this app + """ + name = 'allink_newsletter' diff --git a/allink_core/core_apps/allink_newsletter/base.py b/allink_core/core_apps/allink_newsletter/base.py new file mode 100644 index 00000000..f6803d17 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/base.py @@ -0,0 +1,148 @@ +import json + +import requests +import hashlib +from http import HTTPStatus + + +class MailchimpException(Exception): + """ + This is our Exception for all thins Mailchimp. + it is in the responsibility of the person using this class to handle this Exception + """ + pass + + +class AllinkMailchimp(object): + """ + This is our connection to the Mailchimp API 3.0 + We have an endpoint to subscribe users to a given mailchimp audience + For now the subscribe_to_audience() method is the only thing you should use from outside this class. + + """ + + def __init__(self): + pass + + API_VERSION = '3.0' + + def subscribe_to_audience(self, salutation, first_name, last_name, email, allows_gdpr_email, + allows_gdpr_personalised_marketing, allows_gdpr_direct_mailing, audience_id, + mailchimp_api_key, double_opt_in_status, marketing_permission_email_id, + marketing_permission_personalised_marketing_id, marketing_permission_direct_mailing_id, + mailchimp_datacenter): + """ + If given all parameters this method adds a user to an audience + :param salutation: String + :param first_name: String + :param last_name: String + :param email: String + :param allows_gdpr_email: Boolean + :param allows_gdpr_personalised_marketing: Boolean + :param allows_gdpr_direct_mailing: Boolean + :param audience_id: string + :param mailchimp_api_key: String + :param double_opt_in_status: string (subscribed or pending) + :param marketing_permission_email_id: String (find this by connecting to your audience with postman) + :param marketing_permission_personalised_marketing_id: String (find this by connecting to your audience with + postman) + :param marketing_permission_direct_mailing_id: String (find this by connecting to your audience with postman) + :param mailchimp_datacenter: string (you find this at the end of your API-Key) + :return: The Response object of the Mailchimp API if the request was successful, in case of an error a + MailchimpException is raised but not handeld + """ + hashed_email = self._generate_subscriber_hash(email) + response = requests.put( + 'https://{}.api.mailchimp.com/3.0/lists/{}/members/{}/'.format(mailchimp_datacenter, audience_id, + hashed_email), + auth=('apikey', mailchimp_api_key), + data=self._get_data(email, salutation, first_name, last_name, double_opt_in_status) + ) + self._check_mailchimp_response(response) + + self._put_marketing_permissions(hashed_email, allows_gdpr_email, allows_gdpr_personalised_marketing, + allows_gdpr_direct_mailing, audience_id, mailchimp_api_key, + marketing_permission_email_id, + marketing_permission_personalised_marketing_id, + marketing_permission_direct_mailing_id, mailchimp_datacenter) + return response + + def _generate_subscriber_hash(self, email): + """ + This method hashes the lowercase encoded version of a given string and returns it in hexadecimals + :param email: String + :return: hexadecimal md5 hash of param email + """ + cleaned_email = email.lower().encode() + hashed_email = hashlib.md5(cleaned_email) + return hashed_email.hexdigest() + + def _put_marketing_permissions(self, hashed_email, allows_gdpr_email, allows_gdpr_personalised_marketing, + allows_gdpr_direct_mailing, audience_id, mailchimp_api_key, + marketing_permission_email_id, marketing_permission_personalised_marketing_id, + marketing_permission_direct_mailing_id, mailchimp_datacenter): + """ + Here we update the marketing permission fields for a given user on a given audience. + For this to work you have to provide all following parameters and GDPR Field have to be active on the audience + If the Mailchimp API responds with an error response a MailchimpException is raised. + :param hashed_email: md5 hash of an email + :param allows_gdpr_email: Boolean + :param allows_gdpr_personalised_marketing:Boolean + :param allows_gdpr_direct_mailing: Boolean + :param audience_id: String + :param mailchimp_api_key: + :param marketing_permission_email_id: String (find this by connecting to your audience with postman) + :param marketing_permission_personalised_marketing_id:String (find this by connecting to your audience with + postman) + :param marketing_permission_direct_mailing_id: String (find this by connecting to your audience with postman) + :param mailchimp_datacenter: String (you find this at the end of your API-Key) + :return: The Response object of the Mailchimp API if the request was successful, in case of an error a + MailchimpException is raised but not handeld + """ + data = { + "marketing_permissions": [ + {"marketing_permission_id": marketing_permission_email_id, "enabled": allows_gdpr_email}, + {"marketing_permission_id": marketing_permission_personalised_marketing_id, + "enabled": allows_gdpr_personalised_marketing}, + {"marketing_permission_id": marketing_permission_direct_mailing_id, + "enabled": allows_gdpr_direct_mailing} + ] + } + data = json.dumps(data) + + response = requests.put( + 'https://{}.api.mailchimp.com/{}/lists/{}/members/{}'.format(mailchimp_datacenter, self.API_VERSION, + audience_id, hashed_email), + auth=('apikey', mailchimp_api_key), data=data + ) + self._check_mailchimp_response(response) + return response + + def _get_data(self, email, salutation, first_name, last_name, double_opt_in_status): + """ + In this method we populate a dict with the given parameters + :param email: String + :param salutation: String + :param first_name: String + :param last_name: String + :param double_opt_in_status: string (subscribed or pending) + :return: the json of the populated dict. + """ + data = { + "email_address": email, + "status": double_opt_in_status, + "merge_fields": { + "GENDER": salutation, + "FNAME": first_name, + "LNAME": last_name, + } + } + return json.dumps(data) + + def _check_mailchimp_response(self, response): + """ + Here we check whether the reponse od the Mailchimp API was valid. If not we raise a MailchimpException + :param response: response object with a property status_code + """ + if response.status_code != HTTPStatus.OK: + raise MailchimpException(response.json()) diff --git a/allink_core/core_apps/allink_newsletter/cms_apps.py b/allink_core/core_apps/allink_newsletter/cms_apps.py new file mode 100644 index 00000000..e47541a8 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/cms_apps.py @@ -0,0 +1,16 @@ +from cms.app_base import CMSApp +from cms.apphook_pool import apphook_pool + + +class NewsletterSignupApphook(CMSApp): + """ + This is the Apphook for the allink_newsletter app + """ + name = 'Newsletter Signup Apphook' + app_name = 'allink_newsletter' + + def get_urls(self, page=None, language=None, **kwargs): + return ['allink_core.core_apps.allink_newsletter.urls'] + + +apphook_pool.register(NewsletterSignupApphook) diff --git a/allink_core/core_apps/allink_newsletter/cms_plugins.py b/allink_core/core_apps/allink_newsletter/cms_plugins.py new file mode 100644 index 00000000..3b8170b0 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/cms_plugins.py @@ -0,0 +1,28 @@ +from cms.plugin_pool import plugin_pool +from allink_core.core.cms_plugins import CMSAllinkBaseFormPlugin +from allink_core.core_apps.allink_newsletter.forms import NewsletterSignupForm +from allink_core.core_apps.allink_newsletter.models import NewsletterSignupPlugin +from django.utils.translation import ugettext_lazy as _ + + +@plugin_pool.register_plugin +class CMSAllinkNewsletterSignupPlugin(CMSAllinkBaseFormPlugin): + """ + Here we register the CMS Plugin + """ + name = _('Newsletter Signup Plugin') + model = NewsletterSignupPlugin + render_template = 'allink_newsletter/content.html' + cache = False + + form_class = NewsletterSignupForm + url_name = 'signup' + + def render(self, context, instance, placeholder): + context = super().render(context, instance, placeholder) + + context.update({ + 'form': self.form_class(), + 'action': self.get_form_action(instance), + }) + return context diff --git a/allink_core/core_apps/allink_newsletter/config.py b/allink_core/core_apps/allink_newsletter/config.py new file mode 100644 index 00000000..8010606a --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/config.py @@ -0,0 +1,10 @@ +from django.apps import AppConfig +from django.utils.translation import ugettext_lazy as _ + + +class NewsletterSignupConfig(AppConfig): + """ + We define the Verbose name in this config + """ + name = 'allink_core.core_apps.allink_newsletter' + verbose_name = _("Newsletter Signup") diff --git a/allink_core/core_apps/allink_newsletter/forms.py b/allink_core/core_apps/allink_newsletter/forms.py new file mode 100644 index 00000000..15be2a9c --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/forms.py @@ -0,0 +1,37 @@ +from django import forms +from django.utils.translation import ugettext_lazy as _ + +from allink_core.core.models.choices import SALUTATION_CHOICES +from allink_core.core_apps.allink_newsletter.models import NewsletterSignupLog + +#this is the form for the NewsletterSignupLog Soem fields are specified but all are added to the form +class NewsletterSignupForm(forms.ModelForm): + salutation = forms.ChoiceField( + label=_('Salutation'), + widget=forms.RadioSelect(), + choices=SALUTATION_CHOICES + ) + + email = forms.EmailField( + label=_('E-Mail') + ) + + allows_gdpr_email = forms.BooleanField( + label=_('E-Mail'), + required=True + ) + + allows_gdpr_direct_mailing = forms.BooleanField( + label=_('Direct mailings'), + required=False + ) + + + allows_gdpr_personalised_marketing = forms.BooleanField( + label=_('Personalised Marketing'), + required=False + ) + + class Meta: + model = NewsletterSignupLog + fields = '__all__' \ No newline at end of file diff --git a/allink_core/core_apps/allink_newsletter/migrations/0001_initial.py b/allink_core/core_apps/allink_newsletter/migrations/0001_initial.py new file mode 100644 index 00000000..f64bc202 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/migrations/0001_initial.py @@ -0,0 +1,59 @@ +# Generated by Django 2.2.7 on 2020-05-12 13:29 + +import django.contrib.postgres.fields +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone +import djangocms_text_ckeditor.fields +import model_utils.fields + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('cms', '0022_auto_20180620_1551'), + ] + + operations = [ + migrations.CreateModel( + name='NewsletterSignupLog', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), + ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), + ('salutation', models.IntegerField(choices=[(1, 'Mr.'), (2, 'Mrs.')], verbose_name='Salutation')), + ('first_name', models.CharField(max_length=255, verbose_name='First Name')), + ('last_name', models.CharField(max_length=255, verbose_name='Last Name')), + ('email', models.EmailField(max_length=254, verbose_name='E-Mail')), + ('allows_gdpr_email', models.BooleanField(verbose_name='consent for email dispatch')), + ('allows_gdpr_direct_mailing', models.BooleanField(blank=True, verbose_name='consent for direct mailings')), + ('allows_gdpr_personalised_marketing', models.BooleanField(blank=True, verbose_name='consent for personalised marketing')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='NewsletterSignupPlugin', + fields=[ + ('form_text', djangocms_text_ckeditor.fields.HTMLField(blank=True, help_text='This text will be shown, before the actual form fields and later replaced with the success message.', verbose_name='Form text')), + ('email_subject', models.CharField(blank=True, max_length=255, verbose_name='External email subject')), + ('from_email_address', models.EmailField(default=None, max_length=254, verbose_name='From e-mail address')), + ('internal_recipients', django.contrib.postgres.fields.ArrayField(base_field=models.EmailField(blank=True, max_length=254), blank=True, null=True, size=None, verbose_name='Internal e-mail recipients')), + ('success_message', djangocms_text_ckeditor.fields.HTMLField(blank=True, help_text='This text will be shown, after form completion.', verbose_name='Success message')), + ('cmsplugin_ptr', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='allink_newsletter_newslettersignupplugin', serialize=False, to='cms.CMSPlugin')), + ('audience_id', models.CharField(help_text='This is the id of the Mailchimp Audience the user wil be subscribed to', max_length=255, verbose_name='audience id')), + ('consent_text', djangocms_text_ckeditor.fields.HTMLField(blank=True, verbose_name='consent text')), + ('double_opt_in_enabled', models.BooleanField(blank=True, default=False, help_text='If selected an email wil be sent where the user will have to confirm his subscribtion to the mailing list', verbose_name='Double-Opt-In')), + ('marketing_permission_email_id', models.CharField(blank=True, help_text='Get this id via Postman and only change it if you know what you are doing', max_length=64, verbose_name='Mailchimp Email ID')), + ('marketing_permission_personalised_marketing_id', models.CharField(blank=True, help_text='Get this id via Postman and only change it if you know what you are doing', max_length=64, verbose_name='Mailchimp Personalised Marketing ID')), + ('marketing_permission_direct_mailing_id', models.CharField(blank=True, help_text='Get this id via Postman and only change it if you know what you are doing', max_length=64, verbose_name='Mailchimp Direct Mailing ID')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/allink_core/core_apps/allink_newsletter/migrations/__init__.py b/allink_core/core_apps/allink_newsletter/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/allink_core/core_apps/allink_newsletter/models.py b/allink_core/core_apps/allink_newsletter/models.py new file mode 100644 index 00000000..1c3b0d39 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/models.py @@ -0,0 +1,93 @@ +from django.db import models +from django.utils.translation import ugettext_lazy as _ +from model_utils.models import TimeStampedModel +from djangocms_text_ckeditor.fields import HTMLField + +from allink_core.core.models import AllinkBaseFormPlugin +from allink_core.core.models.choices import SALUTATION_CHOICES + + +class NewsletterSignupLog(TimeStampedModel): + """ + In this models all entries of the NewsletterSignupForm are Stored + """ + salutation = models.IntegerField( + _('Salutation'), + choices=SALUTATION_CHOICES, + blank=False, + null=False + + ) + + first_name = models.CharField( + _('First Name'), + max_length=255, + ) + + last_name = models.CharField( + _('Last Name'), + max_length=255, + ) + + email = models.EmailField( + _('E-Mail'), + ) + + allows_gdpr_email = models.BooleanField( + _('consent for email dispatch') + ) + + allows_gdpr_direct_mailing = models.BooleanField( + _('consent for direct mailings'), + blank=True, + ) + + allows_gdpr_personalised_marketing = models.BooleanField( + _('consent for personalised marketing'), + blank=True, + ) + + +class NewsletterSignupPlugin(AllinkBaseFormPlugin): + """ + In This model all instances of the CMSNewsletterSignupPlugin are stored. + """ + audience_id = models.CharField( + _('audience id'), + max_length=255, + help_text=_('This is the id of the Mailchimp Audience the user wil be subscribed to') + ) + + consent_text = HTMLField( + _('consent text'), + blank=True, + ) + + double_opt_in_enabled = models.BooleanField( + _('Double-Opt-In'), + blank=True, + default=False, + help_text=_( + 'If selected an email wil be sent where the user will have to confirm his subscribtion to the mailing list') + ) + + marketing_permission_email_id = models.CharField( + _('Mailchimp Email ID'), + max_length=64, + blank=True, + help_text=_('Get this id via Postman and only change it if you know what you are doing') + ) + + marketing_permission_personalised_marketing_id = models.CharField( + _('Mailchimp Personalised Marketing ID'), + max_length=64, + blank=True, + help_text=_('Get this id via Postman and only change it if you know what you are doing') + ) + + marketing_permission_direct_mailing_id = models.CharField( + _('Mailchimp Direct Mailing ID'), + max_length=64, + blank=True, + help_text=_('Get this id via Postman and only change it if you know what you are doing') + ) diff --git a/allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html b/allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html new file mode 100644 index 00000000..85442252 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/templates/allink_newsletter/content.html @@ -0,0 +1,61 @@ +{% load i18n static %} + +{% trans "Newsletter Signup" as label %} +{% include "modals/modal-header-markup.html" with title=label modal_type="softpage" %} + + diff --git a/allink_core/core_apps/allink_newsletter/templates/allink_newsletter/success.html b/allink_core/core_apps/allink_newsletter/templates/allink_newsletter/success.html new file mode 100644 index 00000000..b2b0893a --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/templates/allink_newsletter/success.html @@ -0,0 +1,5 @@ +{% load i18n %} + +
+

{{ instance.success_message }}

+
\ No newline at end of file diff --git a/allink_core/core_apps/allink_newsletter/tests.py b/allink_core/core_apps/allink_newsletter/tests.py new file mode 100644 index 00000000..ad932640 --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/tests.py @@ -0,0 +1,166 @@ +import json +from http import HTTPStatus +from unittest.mock import Mock, patch + +from django.test import TestCase, override_settings +from django.conf import settings +from .base import AllinkMailchimp, MailchimpException + + +class AllinkMailchimpTestCase(TestCase): + @override_settings(MAILCHIMP_DATACENTER='usXX') + @override_settings(MAILCHIMP_API_KEY='API_KEY') + def setUp(self): + super().setUp() + self.obj = AllinkMailchimp() + + # All the possible Failure codes the Mailchimp API can respond with. + self.mailchimp_failure_codes = [400, 401, 403, 404, 405, 414, 422, 429, 500, 503] + + self.audience_id = 'ec9c7f47e1' + self.email = 'test@allink.ch' + self.hashed_email = '337bc5c62a21c06f556a2fe949e38bae' + self.first_name = 'Vorname' + self.last_name = 'Nachname' + self.allows_gdpr_email = True + self.allows_gdpr_personalised_marketing = True + self.allows_gdpr_direct_mailing = False + self.salutation = 'Mr.' + self.double_opt_in_status = 'subscribed' + self.mailchimp_api_key = settings.MAILCHIMP_API_KEY + self.marketing_permission_email_id = 'dec570c690' + self.marketing_permission_personalised_marketing_id = '7858abfe9e' + self.marketing_permission_direct_mailing_id = '40ca9b0f52' + self.mailchimp_datacenter = settings.MAILCHIMP_DATACENTER + + def subscribe_to_mailchimp_params(self): + return self.salutation, \ + self.first_name, \ + self.last_name, \ + self.email, \ + self.allows_gdpr_email, \ + self.allows_gdpr_personalised_marketing, \ + self.allows_gdpr_direct_mailing, \ + self.audience_id, \ + self.mailchimp_api_key, \ + self.double_opt_in_status, \ + self.marketing_permission_email_id, \ + self.marketing_permission_personalised_marketing_id, \ + self.marketing_permission_direct_mailing_id, \ + self.mailchimp_datacenter + + def put_marketing_permission_params(self): + return self.hashed_email, \ + self.allows_gdpr_email, \ + self.allows_gdpr_personalised_marketing, \ + self.allows_gdpr_direct_mailing, \ + self.audience_id, \ + self.mailchimp_api_key, \ + self.marketing_permission_email_id, \ + self.marketing_permission_personalised_marketing_id, \ + self.marketing_permission_direct_mailing_id, \ + self.mailchimp_datacenter + + def test_generation_of_hash(self): + """ + We test whether or not our hash function, _get_subscriber_hash() returns the expected md5 hash of a + given emailaddress + + """ + self.assertEqual(self.obj._generate_subscriber_hash(email=self.email), '337bc5c62a21c06f556a2fe949e38bae') + + def test_get_data(self): + """ + We Test whether or not the _get_data method returns the expected object. + """ + obj = AllinkMailchimp() + data = { + "email_address": self.email, + "status": self.double_opt_in_status, + "merge_fields": { + "GENDER": self.salutation, + "FNAME": self.first_name, + "LNAME": self.last_name, + } + } + data = json.dumps(data) + self.assertEqual( + obj._get_data(self.email, self.salutation, self.first_name, self.last_name, self.double_opt_in_status), + data) + + @patch('requests.put') + def test_subscribe_to_audience_api_error(self, mock_put): + """ + we test the subscrive_to_audience() methods response when it is confronted with a failure code from the + Mailchimp API + It is expected to raise a MailchimpException + + """ + for failure_code in self.mailchimp_failure_codes: + mock = Mock() + mock.status_code = failure_code + mock_put.return_value = mock + with self.assertRaises(MailchimpException): + self.obj.subscribe_to_audience(*self.subscribe_to_mailchimp_params()) + + @patch('requests.put') + def test_subscribe_to_audience_ok(self, mock_put): + """ + We test if the subscribe_to_audience() method returns the correct value when handed with a correct response + by the Mailchimp API + """ + mock = Mock() + mock.status_code = HTTPStatus.OK + mock_put.return_value = mock + self.assertEqual(HTTPStatus.OK, + self.obj.subscribe_to_audience(*self.subscribe_to_mailchimp_params()).status_code) + + @patch('requests.put') + def test_put_marketing_permissions_api_error(self, mock_put): + """ + we test the _put_marketing_permissions() methods response when it is confronted with a failure code from the + Mailchimp API + It is expected to raise a MailchimpException + + """ + for failure_code in self.mailchimp_failure_codes: + mock = Mock() + mock.status_code = failure_code + mock_put.return_value = mock + with self.assertRaises(MailchimpException): + self.obj._put_marketing_permissions(*self.put_marketing_permission_params()) + + @patch('requests.put') + def test_put_marketing_permissions_ok(self, mock_put): + """ + We test if the _put_marketing_permissions() method returns the correct value when handed with a correct response + by the Mailchimp API + """ + mock = Mock() + mock.status_code = HTTPStatus.OK + mock_put.return_value = mock + self.assertEqual(HTTPStatus.OK, + self.obj._put_marketing_permissions(*self.put_marketing_permission_params()).status_code) + + def test_check_mailchimp_reponse_error(self): + """ + In this test we test whether or not our check_mailchimp_response + method raises a MailchimpException when it should. + """ + for failure_code in self.mailchimp_failure_codes: + mock = Mock() + mock.status_code = failure_code + with self.assertRaises(MailchimpException): + self.obj._check_mailchimp_response(mock) + + def test_check_mailchimp_reponse_ok(self): + """ + In this test we test whether or not our check_mailchimp_response + method raises a MailchimpException when it shouldn't. + """ + mock = Mock() + mock.status_code = HTTPStatus.OK + try: + self.obj._check_mailchimp_response(mock) + except MailchimpException: + self.fail() diff --git a/allink_core/core_apps/allink_newsletter/urls.py b/allink_core/core_apps/allink_newsletter/urls.py new file mode 100644 index 00000000..933e460a --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/urls.py @@ -0,0 +1,10 @@ +from django.urls import path + +from allink_core.core.loading import get_class + +NewsletterSignupView = get_class('allink_newsletter.views', 'NewsletterSignupView') + +app_name = 'allink_newsletter' +urlpatterns = [ + path('signup//', NewsletterSignupView.as_view(), name='signup'), +] diff --git a/allink_core/core_apps/allink_newsletter/views.py b/allink_core/core_apps/allink_newsletter/views.py new file mode 100644 index 00000000..7d05475f --- /dev/null +++ b/allink_core/core_apps/allink_newsletter/views.py @@ -0,0 +1,71 @@ +from raven import Client + +from django.conf import settings +from django.utils.translation import ugettext_lazy as _ + +from allink_core.core.views import AllinkBasePluginAjaxCreateView +from allink_core.core_apps.allink_newsletter.forms import NewsletterSignupForm +from allink_core.core_apps.allink_newsletter.models import NewsletterSignupLog, NewsletterSignupPlugin +from allink_core.core_apps.allink_newsletter.base import AllinkMailchimp, MailchimpException + + +class NewsletterSignupView(AllinkBasePluginAjaxCreateView): + model = NewsletterSignupLog + form_class = NewsletterSignupForm + template_name = 'allink_newsletter/content.html' + + plugin_model = NewsletterSignupPlugin + success_template_name = 'allink_newsletter/success.html' + + def form_valid(self, form): + response = super(NewsletterSignupView, self).form_valid(form) + obj = AllinkMailchimp() + try: + obj.subscribe_to_audience(*self.get_fields_from_form(form), + audience_id=self.get_audience_id(), + mailchimp_api_key=settings.MAILCHIMP_API_KEY, + double_opt_in_status=self.get_double_opt_in_status(), + marketing_permission_email_id=self.get_marketing_permission_email_id(), + marketing_permission_personalised_marketing_id=self.get_marketing_permission_personalised_marketing_id(), + marketing_permission_direct_mailing_id=self.get_marketing_permission_direct_mailing_id(), + mailchimp_datacenter=self.get_mailchimp_datacenter() + ) + except MailchimpException: + client = Client(settings.RAVEN_CONFIG.get('dsn')) + client.captureException() + + form.add_error(None, _('Something went wrong on our end we are sorry for that')) + response = self.form_invalid(form) + + return response + + def get_fields_from_form(self, form): + salutation = form.instance.get_salutation_display() + first_name = form.cleaned_data['first_name'] + last_name = form.cleaned_data['last_name'] + email = form.cleaned_data['email'] + allows_gdpr_email = form.cleaned_data['allows_gdpr_email'] + allows_gdpr_personalised_marketing = form.cleaned_data['allows_gdpr_personalised_marketing'] + allows_gdpr_direct_mailing = form.cleaned_data['allows_gdpr_direct_mailing'] + return salutation, first_name, last_name, email, allows_gdpr_email, allows_gdpr_personalised_marketing, \ + allows_gdpr_direct_mailing + + def get_double_opt_in_status(self): + double_opt_in_status = 'pending' if self.plugin_instance.double_opt_in_enabled else 'subscribed' + return double_opt_in_status + + def get_audience_id(self): + audience_id = self.plugin_instance.audience_id + return audience_id + + def get_marketing_permission_email_id(self): + return self.plugin_instance.marketing_permission_email_id + + def get_marketing_permission_personalised_marketing_id(self): + return self.plugin_instance.marketing_permission_personalised_marketing_id + + def get_marketing_permission_direct_mailing_id(self): + return self.plugin_instance.marketing_permission_direct_mailing_id + + def get_mailchimp_datacenter(self): + return settings.MAILCHIMP_DATACENTER diff --git a/allink_core/core_apps/allink_styleguide/locale/de/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_styleguide/locale/de/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_styleguide/locale/de/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_styleguide/locale/de/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_styleguide/locale/de/LC_MESSAGES/django.po b/allink_core/core_apps/allink_styleguide/locale/de/LC_MESSAGES/django.po index e17da891..a5f1c3a3 100644 --- a/allink_core/core_apps/allink_styleguide/locale/de/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_styleguide/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_styleguide/locale/es/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_styleguide/locale/es/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_styleguide/locale/es/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_styleguide/locale/es/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_styleguide/locale/es/LC_MESSAGES/django.po b/allink_core/core_apps/allink_styleguide/locale/es/LC_MESSAGES/django.po index e17da891..a5f1c3a3 100644 --- a/allink_core/core_apps/allink_styleguide/locale/es/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_styleguide/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_styleguide/locale/fr/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_styleguide/locale/fr/LC_MESSAGES/django.mo index f3b248fb..a1a2100e 100644 Binary files a/allink_core/core_apps/allink_styleguide/locale/fr/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_styleguide/locale/fr/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_styleguide/locale/fr/LC_MESSAGES/django.po b/allink_core/core_apps/allink_styleguide/locale/fr/LC_MESSAGES/django.po index b4a18bd4..c5598470 100644 --- a/allink_core/core_apps/allink_styleguide/locale/fr/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_styleguide/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_styleguide/locale/it/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_styleguide/locale/it/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_styleguide/locale/it/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_styleguide/locale/it/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_styleguide/locale/it/LC_MESSAGES/django.po b/allink_core/core_apps/allink_styleguide/locale/it/LC_MESSAGES/django.po index e17da891..a5f1c3a3 100644 --- a/allink_core/core_apps/allink_styleguide/locale/it/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_styleguide/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_styleguide/locale/nl/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_styleguide/locale/nl/LC_MESSAGES/django.mo index c8633d44..7898bde1 100644 Binary files a/allink_core/core_apps/allink_styleguide/locale/nl/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_styleguide/locale/nl/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_styleguide/locale/nl/LC_MESSAGES/django.po b/allink_core/core_apps/allink_styleguide/locale/nl/LC_MESSAGES/django.po index e17da891..a5f1c3a3 100644 --- a/allink_core/core_apps/allink_styleguide/locale/nl/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_styleguide/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_styleguide/locale/ru/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_styleguide/locale/ru/LC_MESSAGES/django.mo index 84831073..9d7908d7 100644 Binary files a/allink_core/core_apps/allink_styleguide/locale/ru/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_styleguide/locale/ru/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_styleguide/locale/ru/LC_MESSAGES/django.po b/allink_core/core_apps/allink_styleguide/locale/ru/LC_MESSAGES/django.po index 77283fe0..33e892b3 100644 --- a/allink_core/core_apps/allink_styleguide/locale/ru/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_styleguide/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/allink_core/core_apps/allink_styleguide/locale/zh_Hans/LC_MESSAGES/django.mo b/allink_core/core_apps/allink_styleguide/locale/zh_Hans/LC_MESSAGES/django.mo index f487d0ff..6c014471 100644 Binary files a/allink_core/core_apps/allink_styleguide/locale/zh_Hans/LC_MESSAGES/django.mo and b/allink_core/core_apps/allink_styleguide/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/allink_core/core_apps/allink_styleguide/locale/zh_Hans/LC_MESSAGES/django.po b/allink_core/core_apps/allink_styleguide/locale/zh_Hans/LC_MESSAGES/django.po index 337ca642..31c895c6 100644 --- a/allink_core/core_apps/allink_styleguide/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allink_core/core_apps/allink_styleguide/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-19 18:29+0100\n" +"POT-Creation-Date: 2020-05-15 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/test/settings.py b/test/settings.py index aa2a29d4..721ab27f 100644 --- a/test/settings.py +++ b/test/settings.py @@ -188,6 +188,7 @@ 'allink_core.apps.config', # 'allink_core.apps.locations', 'allink_core.apps.news', + 'allink_core.apps.newsletter', # 'allink_core.apps.people', # 'allink_core.apps.testimonials', ]