diff --git a/src/account_manager/main_views.py b/src/account_manager/main_views.py index a4c8da4..dfa306f 100644 --- a/src/account_manager/main_views.py +++ b/src/account_manager/main_views.py @@ -15,6 +15,7 @@ from account_manager.utils.mail_utils import realm_send_mail from .forms import RealmAddForm, RealmUpdateForm from .models import LdapGroup, LdapUser from ldap import LDAPError +from django.utils.translation import gettext logger = logging.getLogger(__name__) diff --git a/src/core/jinja2.py b/src/core/jinja2.py index ceef982..41a9693 100644 --- a/src/core/jinja2.py +++ b/src/core/jinja2.py @@ -1,4 +1,5 @@ from django.templatetags.static import static +from django.utils.translation import gettext, ngettext from django.urls import reverse from django.utils import translation @@ -6,8 +7,10 @@ from jinja2 import Environment def environment(**options): - env = Environment(extensions=['jinja2.ext.i18n'], **options) + options['extensions'] = ['jinja2.ext.i18n'] + env = Environment(**options) # env.install_gettext_translations(translation) + env.install_gettext_callables(gettext=gettext, ngettext=ngettext, newstyle=True) env.globals.update({ 'static': static, 'url': reverse, diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 531221b..594888c 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/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-05-16 13:48+0000\n" +"POT-Creation-Date: 2019-05-17 14:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,10 +32,58 @@ msgstr "" msgid "Deutsch" msgstr "" -#: templates/base.jinja2:34 -msgid "LAMa" +#. Translators: The Application Name: default LAMa +#: templates/base.jinja2:33 +msgid "AppName" +msgstr "LAMa" + +#. Translators: Logout button +#: templates/base.jinja2:40 +msgid "Logout" msgstr "" -#: templates/user/realm_user_detail.jinja2:23 +#. Translators: Login Button +#: templates/base.jinja2:43 +msgid "Login" +msgstr "" + +#. Translators: About link title +#: templates/base.jinja2:58 templates/base_admin.jinja2:50 +msgid "About" +msgstr "Über" + +#: templates/base_admin.jinja2:10 +msgid "DjangoAdminArea" +msgstr "Django Adminbereich" + +#: templates/base_admin.jinja2:14 +msgid "Realms" +msgstr "Bereiche" + +#: templates/base_admin.jinja2:24 +msgid "RealmOverview" +msgstr "Bereichsübersicht" + +#: templates/base_admin.jinja2:27 +msgid "Realm" +msgstr "Bereich" + +#: templates/base_admin.jinja2:31 +msgid "RealmInformation" +msgstr "Bereichsinformationen" + +#: templates/base_admin.jinja2:34 +msgid "User" +msgstr "Nutzer" + +#: templates/base_admin.jinja2:37 +msgid "Groups" +msgstr "Gruppen" + +#: templates/base_admin.jinja2:46 +msgid "RealmAdd" +msgstr "Bereich hinzufügen" + +#: templates/user/realm_user_detail.jinja2:22 msgid "Anzeigename:" msgstr "" diff --git a/src/templates/base.jinja2 b/src/templates/base.jinja2 index f100403..62c9d2d 100644 --- a/src/templates/base.jinja2 +++ b/src/templates/base.jinja2 @@ -1,5 +1,3 @@ -{#{% load static %}#} -{#{% load i18n %}#} {# ===== HTML ===== #} @@ -31,15 +29,18 @@ - {% trans "LAMa" %} + {# Translators: The Application Name: default LAMa #} + {{ _('AppName') }} {% if request.user.is_authenticated %} Hi {{ request.user.username }}! - Logout + {# Translators: Logout button #} + {{ _('Logout') }} {% else %} - Login + {# Translators: Login Button #} + {{ _('Login') }} {% endif %} @@ -48,12 +49,13 @@ {% block content %}{% endblock %} {% endblock %} -{% if not realms and not realm and not request.user.is_superuser%} +{% if not realms and not realm and not request.user.is_superuser %} diff --git a/src/templates/base_admin.jinja2 b/src/templates/base_admin.jinja2 index 564dadc..2f9405c 100644 --- a/src/templates/base_admin.jinja2 +++ b/src/templates/base_admin.jinja2 @@ -1,5 +1,4 @@ {% extends 'base.jinja2' %} -{#{% load i18n %}#} {% block body %}
@@ -8,11 +7,11 @@ {% if request.user.is_superuser %}
Django Adminbereich + href="{{ url('django-additional-admin-list') }}"> {{ _('DjangoAdminArea') }}
{% endif %} {% if realms %} -

Bereiche

+

{{ _('Realms') }}

{% for realm_item in realms %} - Bereichsübersicht + {{ _('RealmOverview') }}
{% if realm %} -

Bereich {{ realm.name }}

+

{{ _('Realm') }} {{ realm.name }}

- Bereichsinformationen + {{ _('RealmInformation') }} - Nutzer + {{ _('User') }} - Gruppen + {{ _('Groups') }}
{% endif %} {% endif %} @@ -44,11 +43,11 @@
- Bereich hinufügen + {{ _('RealmAdd') }}
{% endif %}
- Über + {{ _('About') }}
diff --git a/src/templates/realm/realm_detailed.jinja2 b/src/templates/realm/realm_detailed.jinja2 index dd42177..3e88bb8 100644 --- a/src/templates/realm/realm_detailed.jinja2 +++ b/src/templates/realm/realm_detailed.jinja2 @@ -1,5 +1,4 @@ {% extends 'base_admin.jinja2' %} -{% load i18n %} {% block admin_content %}
diff --git a/src/templates/user/realm_user_detail.jinja2 b/src/templates/user/realm_user_detail.jinja2 index f234fa1..287cfea 100644 --- a/src/templates/user/realm_user_detail.jinja2 +++ b/src/templates/user/realm_user_detail.jinja2 @@ -1,5 +1,4 @@ {% extends 'realm/realm_detailed.jinja2' %} -{#{% load i18n %}#} {% import 'macros/form_macros.jinja2' as mform %} {% block detail_content %}