Fix multilanguage

polyclinic_scheduling/apps/RUG_template/apps.py

@@ -4,5 +4,5 @@ from django.utils.translation import ugettext_lazy as _
 class RugTemplateConfig(AppConfig):
     name = 'apps.RUG_template'
     label = 'RUG_template'
-    verbose_name = _('RUG_template')
+    verbose_name = _('RUG Template')
-    verbose_name_plural = _('RUG_template')
+    verbose_name_plural = _('RUG Template')

polyclinic_scheduling/apps/RUG_template/locale/en/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-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: apps/RUG_template/apps.py:7 apps/RUG_template/apps.py:8
-msgid "RUG_template"
+msgid "RUG Template"
 msgstr ""
 
-#: apps/RUG_template/templates/admin/base_site.html:21
+#: apps/RUG_template/templates/admin/base_site.html:27
 msgid "Language"
 msgstr ""
 
-#: apps/RUG_template/templates/admin/base_site.html:28
+#: apps/RUG_template/templates/admin/base_site.html:35
 msgid "Documentation"
 msgstr ""
 
-#: apps/RUG_template/templates/admin/base_site.html:32
+#: apps/RUG_template/templates/admin/base_site.html:39
 msgid "Change password"
 msgstr ""
 
-#: apps/RUG_template/templates/admin/base_site.html:34
+#: apps/RUG_template/templates/admin/base_site.html:41
 msgid "Log out"
 msgstr ""
 
@@ -137,7 +137,7 @@ msgid ""
 "the email shortly!"
 msgstr ""
 
-#: apps/RUG_template/templates/registration/password_reset_email.html:6
+#: apps/RUG_template/templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
 "You're receiving this email because you requested a password reset for your "

polyclinic_scheduling/apps/RUG_template/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
-"PO-Revision-Date: 2020-05-15 10:20+0200\n"
+"PO-Revision-Date: 2020-05-15 12:52+0200\n"
 "Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: Poedit 2.0.6\n"
 
 #: apps/RUG_template/apps.py:7 apps/RUG_template/apps.py:8
-msgid "RUG_template"
+msgid "RUG Template"
-msgstr "RUG_template"
+msgstr "RUG Template"
 
-#: apps/RUG_template/templates/admin/base_site.html:21
+#: apps/RUG_template/templates/admin/base_site.html:27
 msgid "Language"
 msgstr "Taal"
 
-#: apps/RUG_template/templates/admin/base_site.html:28
+#: apps/RUG_template/templates/admin/base_site.html:35
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: apps/RUG_template/templates/admin/base_site.html:32
+#: apps/RUG_template/templates/admin/base_site.html:39
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
-#: apps/RUG_template/templates/admin/base_site.html:34
+#: apps/RUG_template/templates/admin/base_site.html:41
 msgid "Log out"
 msgstr "Logouit"
 
@@ -145,7 +145,7 @@ msgstr ""
 "We hebben u een e-mail gestuurd met instructies voor het instellen van uw "
 "wachtwoord. U ontvangt de e-mail binnenkort!"
 
-#: apps/RUG_template/templates/registration/password_reset_email.html:6
+#: apps/RUG_template/templates/registration/password_reset_email.html:2
 #, python-format
 msgid ""
 "You're receiving this email because you requested a password reset for your "

polyclinic_scheduling/apps/RUG_template/static/RUG_template/css/custom_admin.css

@@ -1,4 +1,8 @@
 img.i18n_flag {
     width: 16px;
     vertical-align: text-top;
+}
+
+form#language_form {
+    display: inline;
 }

polyclinic_scheduling/apps/RUG_template/templates/admin/base_site.html

@@ -3,25 +3,28 @@
 {% load static %}
 {% load i18n %}
 
-<!-- custom filter module -->
-{% load i18n_switcher %}
-
 {% block extrahead %}
     <link rel="shortcut icon" href="{% static 'RUG_template/images/favicon.ico' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'RUG_template/css/custom_admin.css' %}"/>
 {% endblock %}
 
 {% block userlinks %}
+  {% comment %} Language choice. Should be put somewhere else when finale designs are done. {% endcomment %}
+  <form action="{% url 'set_language' %}" method="post" id="language_form" name="language_form">
+    {% csrf_token %}
     {% get_current_language as LANGUAGE_CODE %}
     {% get_available_languages as LANGUAGES %}
     {% get_language_info_list for LANGUAGES as languages %}
-    {% for language in languages %}
+    <input name="next" type="hidden" value="{% if redirect_to %}{{ redirect_to }}{% endif %}">
-        <a href="{{ request|switch_i18n:language.code}}">
+    <input type="hidden" name="language" id="language" value="{{LANGUAGE_CODE}}">
-            {% with 'RUG_template/images/flag-'|add:language.code|add:'.png' as image_static %}
+      {% for language in languages %}
-            <img class="i18n_flag" src="{% static image_static %}" title="{% trans 'Language' %} {{ language.name_translated }}"/>
+      <a onclick="document.getElementById('language').value='{{ language.code }}'; document.forms['language_form'].submit(); return false;" href="#">
-            {% endwith %}
+       {% with 'RUG_template/images/flag-'|add:language.code|add:'.png' as image_static %}
+        <img class="i18n_flag" src="{% static image_static %}" title="{% trans 'Language' %} {{ language.name_translated }}"/>
+        {% endwith %}
         </a> /
-    {% endfor %}
+      {% endfor %}
+  </form>
     {% if user.is_active and user.is_staff %}
         {% url 'django-admindocs-docroot' as docsroot %}
         {% if docsroot %}

polyclinic_scheduling/apps/RUG_template/templates/registration/password_reset_email.html

@@ -1,7 +1,5 @@
-{% load i18n %}
+{% load i18n %}{% url 'password_reset_confirm' uidb64=uid token=token as reset_url%}
-{% url 'password_reset_confirm' uidb64=uid token=token as reset_url%}
+{% autoescape off %}{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.
-{% autoescape off %}
-{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.
 
 Please go to the following page and choose a new password:
 

polyclinic_scheduling/apps/RUG_template/templatetags/i18n_switcher.py

@@ -1,41 +0,0 @@
-from django import template
-from django.template.defaultfilters import stringfilter
-from django.conf import settings
-
-def switch_lang_code(path, language):
-
-    # Get the supported language codes
-    lang_codes = [c for (c, name) in settings.LANGUAGES]
-
-    # Validate the inputs
-    if path == '':
-        raise Exception('URL path for language switch is empty')
-    elif path[0] != '/':
-        raise Exception('URL path for language switch does not start with "/"')
-    elif language not in lang_codes:
-        raise Exception('%s is not a supported language code' % language)
-
-    # Split the parts of the path
-    parts = path.split('/')
-
-    # Add or substitute the new language prefix
-    if parts[1] in lang_codes:
-        parts[1] = language
-    else:
-        parts[0] = "/" + language
-
-    # Return the full new path
-    return '/'.join(parts)
-
-register = template.Library()
-
-@register.filter
-@stringfilter
-def switch_i18n_prefix(path, language):
-    """takes in a string path"""
-    return switch_lang_code(path, language)
-
-@register.filter
-def switch_i18n(request, language):
-    """takes in a request object and gets the path from it"""
-    return switch_lang_code(request.get_full_path(), language)

polyclinic_scheduling/apps/employee/locale/en/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-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,14 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps/employee/apps.py:7 apps/employee/models.py:13
+#: apps/employee/apps.py:7
 msgid "Employee"
 msgstr ""
 
-#: apps/employee/apps.py:8 apps/employee/models.py:14
+#: apps/employee/apps.py:8
 msgid "Employees"
 msgstr ""
 
+#: apps/employee/models.py:13
+msgid "employee"
+msgstr ""
+
+#: apps/employee/models.py:14
+msgid "employees"
+msgstr ""
+
 #: apps/employee/models.py:16
 msgid "Django user"
 msgstr ""

polyclinic_scheduling/apps/employee/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
-"PO-Revision-Date: 2020-05-14 19:48+0200\n"
+"PO-Revision-Date: 2020-05-15 12:46+0200\n"
 "Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -18,14 +18,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: apps/employee/apps.py:7 apps/employee/models.py:13
+#: apps/employee/apps.py:7
 msgid "Employee"
 msgstr "Medewerker"
 
-#: apps/employee/apps.py:8 apps/employee/models.py:14
+#: apps/employee/apps.py:8
 msgid "Employees"
 msgstr "Medewerkers"
 
+#: apps/employee/models.py:13
+msgid "employee"
+msgstr "medewerker"
+
+#: apps/employee/models.py:14
+msgid "employees"
+msgstr "medewerkers"
+
 #: apps/employee/models.py:16
 msgid "Django user"
 msgstr "Django gebruiker"

polyclinic_scheduling/apps/employee/models.py

@@ -10,8 +10,8 @@ from apps.polyclinic.models import Polyclinic
 class Employee(MetaDataModel):
 
     class Meta:
-        verbose_name = _('Employee')
+        verbose_name = _('employee')
-        verbose_name_plural = _('Employees')
+        verbose_name_plural = _('employees')
 
     user = models.OneToOneField(User, on_delete=models.CASCADE, help_text=_('Django user'))
 

polyclinic_scheduling/apps/hospital/locale/en/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-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,14 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps/hospital/apps.py:7 apps/hospital/models.py:10
+#: apps/hospital/apps.py:7
 msgid "Hospital"
 msgstr ""
 
-#: apps/hospital/apps.py:8 apps/hospital/models.py:11
+#: apps/hospital/apps.py:8
 msgid "Hospitals"
 msgstr ""
 
+#: apps/hospital/models.py:10
+msgid "hospital"
+msgstr ""
+
+#: apps/hospital/models.py:11
+msgid "hospitals"
+msgstr ""
+
 #: apps/hospital/models.py:13
 msgid "Name"
 msgstr ""

polyclinic_scheduling/apps/hospital/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
-"PO-Revision-Date: 2020-05-15 10:20+0200\n"
+"PO-Revision-Date: 2020-05-15 12:43+0200\n"
 "Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -18,14 +18,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: apps/hospital/apps.py:7 apps/hospital/models.py:10
+#: apps/hospital/apps.py:7
 msgid "Hospital"
 msgstr "Ziekenhuis"
 
-#: apps/hospital/apps.py:8 apps/hospital/models.py:11
+#: apps/hospital/apps.py:8
 msgid "Hospitals"
 msgstr "Ziekenhuizen"
 
+#: apps/hospital/models.py:10
+msgid "hospital"
+msgstr "ziekenhuis"
+
+#: apps/hospital/models.py:11
+msgid "hospitals"
+msgstr "ziekenhuizen"
+
 #: apps/hospital/models.py:13
 msgid "Name"
 msgstr "Naam"

polyclinic_scheduling/apps/hospital/models.py

@@ -7,8 +7,8 @@ from lib.models.base import MetaDataModel
 class Hospital(MetaDataModel):
 
     class Meta:
-        verbose_name = _('Hospital')
+        verbose_name = _('hospital')
-        verbose_name_plural = _('Hospitals')
+        verbose_name_plural = _('hospitals')
 
     name = models.CharField(_('Name'), max_length=200, help_text=_('The name of this hospital'))
     address = models.CharField(_('Address'), max_length=200, blank=True, help_text=_('The address of this hospital'))

polyclinic_scheduling/apps/polyclinic/locale/en/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-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,14 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps/polyclinic/apps.py:7 apps/polyclinic/models.py:11
+#: apps/polyclinic/apps.py:7
 msgid "Polyclinic"
 msgstr ""
 
-#: apps/polyclinic/apps.py:8 apps/polyclinic/models.py:12
+#: apps/polyclinic/apps.py:8
 msgid "Polyclinics"
 msgstr ""
 
+#: apps/polyclinic/models.py:11
+msgid "polyclinic"
+msgstr ""
+
+#: apps/polyclinic/models.py:12
+msgid "polyclinics"
+msgstr ""
+
 #: apps/polyclinic/models.py:14
 msgid "To which hospital belongs this polyclinic"
 msgstr ""

polyclinic_scheduling/apps/polyclinic/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
-"PO-Revision-Date: 2020-05-15 10:20+0200\n"
+"PO-Revision-Date: 2020-05-15 12:47+0200\n"
 "Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -18,14 +18,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: apps/polyclinic/apps.py:7 apps/polyclinic/models.py:11
+#: apps/polyclinic/apps.py:7
 msgid "Polyclinic"
 msgstr "Polikliniek"
 
-#: apps/polyclinic/apps.py:8 apps/polyclinic/models.py:12
+#: apps/polyclinic/apps.py:8
 msgid "Polyclinics"
 msgstr "Poliklinieken"
 
+#: apps/polyclinic/models.py:11
+msgid "polyclinic"
+msgstr "polikliniek"
+
+#: apps/polyclinic/models.py:12
+msgid "polyclinics"
+msgstr "poliklinieken"
+
 #: apps/polyclinic/models.py:14
 msgid "To which hospital belongs this polyclinic"
 msgstr "Bij welke ziekenhuis hoort deze polikliniek"

polyclinic_scheduling/apps/polyclinic/models.py

@@ -8,8 +8,8 @@ from apps.hospital.models import Hospital
 class Polyclinic(MetaDataModel):
 
     class Meta:
-        verbose_name = _('Polyclinic')
+        verbose_name = _('polyclinic')
-        verbose_name_plural = _('Polyclinics')
+        verbose_name_plural = _('polyclinics')
 
     hospital = models.ForeignKey(Hospital, on_delete=models.CASCADE, help_text=_('To which hospital belongs this polyclinic'))
     name = models.CharField(_('Name'), max_length=200, blank=True, help_text=_('The name of this polyclinic'))

polyclinic_scheduling/apps/schedule/locale/en/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-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: apps/schedule/apps.py:7 apps/schedule/models.py:14
+#: apps/schedule/apps.py:7
 msgid "Schedule"
 msgstr ""
 
-#: apps/schedule/apps.py:8 apps/schedule/models.py:15
+#: apps/schedule/apps.py:8
 msgid "Schedules"
 msgstr ""
 
@@ -42,6 +42,14 @@ msgstr ""
 msgid "When the job is done, the results will be sent to this email address"
 msgstr ""
 
+#: apps/schedule/models.py:14
+msgid "schedule"
+msgstr ""
+
+#: apps/schedule/models.py:15
+msgid "schedules"
+msgstr ""
+
 #: apps/schedule/models.py:18
 msgid "Select the employee that is responsible for this schedule request"
 msgstr ""

polyclinic_scheduling/apps/schedule/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
-"PO-Revision-Date: 2020-05-15 10:27+0200\n"
+"PO-Revision-Date: 2020-05-15 12:47+0200\n"
 "Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: apps/schedule/apps.py:7 apps/schedule/models.py:14
+#: apps/schedule/apps.py:7
 msgid "Schedule"
 msgstr "Rooster"
 
-#: apps/schedule/apps.py:8 apps/schedule/models.py:15
+#: apps/schedule/apps.py:8
 msgid "Schedules"
 msgstr "Roosters"
 
@@ -43,6 +43,14 @@ msgid "When the job is done, the results will be sent to this email address"
 msgstr ""
 "Als de klus geklaard is, worden de resultaten naar dit e-mailadres gestuurd"
 
+#: apps/schedule/models.py:14
+msgid "schedule"
+msgstr "rooster"
+
+#: apps/schedule/models.py:15
+msgid "schedules"
+msgstr "roosters"
+
 #: apps/schedule/models.py:18
 msgid "Select the employee that is responsible for this schedule request"
 msgstr ""

polyclinic_scheduling/apps/schedule/models.py

@@ -11,8 +11,8 @@ import collections
 class Schedule(MetaDataModel):
 
     class Meta:
-        verbose_name = _('Schedule')
+        verbose_name = _('schedule')
-        verbose_name_plural = _('Schedules')
+        verbose_name_plural = _('schedules')
 
 
     employee = models.ForeignKey(Employee, on_delete=models.CASCADE, help_text=_('Select the employee that is responsible for this schedule request'))

polyclinic_scheduling/locale/en/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-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,22 +34,6 @@ msgstr ""
 msgid "The date and time this model has been updated"
 msgstr ""
 
-#: polyclinic_scheduling/settings.py:129
-msgid "Dutch"
-msgstr ""
-
-#: polyclinic_scheduling/settings.py:130
-msgid "English"
-msgstr ""
-
-#: polyclinic_scheduling/urls.py:23 polyclinic_scheduling/urls.py:24
-msgid "University of Groningen Polyclinic planning tool"
-msgstr ""
-
-#: polyclinic_scheduling/urls.py:25
-msgid "Polyclinic planning tool"
-msgstr ""
-
 #: templates/menu.html:4
 msgid "Menu"
 msgstr ""

polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-15 08:29+0000\n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
 "PO-Revision-Date: 2020-05-15 10:22+0200\n"
 "Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
 "Language-Team: \n"
@@ -34,22 +34,6 @@ msgstr "Datum bijwerking"
 msgid "The date and time this model has been updated"
 msgstr "De datum en tijd waarop dit model is bijgewerkt"
 
-#: polyclinic_scheduling/settings.py:129
-msgid "Dutch"
-msgstr "Nederlands"
-
-#: polyclinic_scheduling/settings.py:130
-msgid "English"
-msgstr "Engels"
-
-#: polyclinic_scheduling/urls.py:23 polyclinic_scheduling/urls.py:24
-msgid "University of Groningen Polyclinic planning tool"
-msgstr "RUG Poliklinieken planning tool"
-
-#: polyclinic_scheduling/urls.py:25
-msgid "Polyclinic planning tool"
-msgstr "Poliklinieken planning tool"
-
 #: templates/menu.html:4
 msgid "Menu"
 msgstr "Menu"
@@ -73,3 +57,15 @@ msgstr "Aanmelden"
 #: templates/singup.html:10
 msgid "Please contact x@y.z"
 msgstr "Neem contact o met x@y.z"
+
+#~ msgid "Dutch"
+#~ msgstr "Nederlands"
+
+#~ msgid "English"
+#~ msgstr "Engels"
+
+#~ msgid "University of Groningen Polyclinic planning tool"
+#~ msgstr "RUG Poliklinieken planning tool"
+
+#~ msgid "Polyclinic planning tool"
+#~ msgstr "Poliklinieken planning tool"

polyclinic_scheduling/polyclinic_scheduling/locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: polyclinic_scheduling/settings.py:129
+msgid "Dutch"
+msgstr ""
+
+#: polyclinic_scheduling/settings.py:130
+msgid "English"
+msgstr ""
+
+#: polyclinic_scheduling/urls.py:22 polyclinic_scheduling/urls.py:23
+msgid "University of Groningen Polyclinic planning tool"
+msgstr ""
+
+#: polyclinic_scheduling/urls.py:24
+msgid "Polyclinic planning tool"
+msgstr ""

polyclinic_scheduling/polyclinic_scheduling/locale/nl/LC_MESSAGES/django.po

@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-05-15 10:51+0000\n"
+"PO-Revision-Date: 2020-05-15 12:49+0200\n"
+"Last-Translator: Joshua Rubingh <j.g.rubingh@rug.nl>\n"
+"Language-Team: \n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.6\n"
+
+#: polyclinic_scheduling/settings.py:129
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: polyclinic_scheduling/settings.py:130
+msgid "English"
+msgstr "Engels"
+
+#: polyclinic_scheduling/urls.py:22 polyclinic_scheduling/urls.py:23
+msgid "University of Groningen Polyclinic planning tool"
+msgstr "RUG Poliklinieken planning tool"
+
+#: polyclinic_scheduling/urls.py:24
+msgid "Polyclinic planning tool"
+msgstr "Poliklinieken planning tool"

polyclinic_scheduling/polyclinic_scheduling/urls.py

@@ -17,7 +17,6 @@ from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
 from django.conf.urls.static import static
-from django.conf.urls.i18n import i18n_patterns
 from django.utils.translation import gettext_lazy as _
 
 admin.site.index_title = _('University of Groningen Polyclinic planning tool')
@@ -27,17 +26,12 @@ admin.site.site_title  = _('Polyclinic planning tool')
 urlpatterns = [
     path('i18n/', include('django.conf.urls.i18n')),
     path('accounts/', include('django.contrib.auth.urls')),
+    path('admin/', admin.site.urls),
 
     path('', include('apps.RUG_template.urls')),
     path('schedule/', include('apps.schedule.urls')),
 ]
 
-# Use language prefix option for admin translations
-urlpatterns += i18n_patterns (
-        path('admin/', admin.site.urls),
-        prefix_default_language=False
-    )
-
 if settings.DEBUG:
     import debug_toolbar
     urlpatterns = [