From 1a14db16b43301ab239d2fe678db6a4c2a13c388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Thu, 2 May 2019 13:53:34 +0200 Subject: [PATCH] Init translation --- src/account_manager/views/user_views.py | 8 +++++--- src/core/settings.py | 12 +++++++++++- src/locale/de_de/LC_MESSAGES/django.po | 24 ++++++++++++++++++++++++ src/locale/de_fr/LC_MESSAGES/django.po | 24 ++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 src/locale/de_de/LC_MESSAGES/django.po create mode 100644 src/locale/de_fr/LC_MESSAGES/django.po diff --git a/src/account_manager/views/user_views.py b/src/account_manager/views/user_views.py index 7846802..785fd84 100644 --- a/src/account_manager/views/user_views.py +++ b/src/account_manager/views/user_views.py @@ -5,6 +5,7 @@ from django.contrib.sites.shortcuts import get_current_site from django.core.exceptions import ObjectDoesNotExist from django.shortcuts import render, redirect from django.http import HttpResponse +from django.utils.translation import gettext as _ from ldap import ALREADY_EXISTS, OBJECT_CLASS_VIOLATION from account_helper.models import Realm from account_manager.forms import AddLDAPUserForm, UserDeleteListForm, UpdateLDAPUserForm, AdminUpdateLDAPUserForm, \ @@ -23,7 +24,10 @@ def protect_cross_realm_user_access(view_func): user_dn = kwargs.get('user_dn', None) if realm_id and user_dn and Realm.objects.get(id=realm_id).ldap_base_dn not in user_dn: - return HttpResponse("Ressource konnte nicht gefunden werden.", status=404) + return render(request, 'permission_denied.jinja2', + { + 'extra_errors': _('Der angefragte Nutzer gehört einem anderen Bereich an. Nutzer können nur von dem Bereich bearbeitet werden, in dem sie erstellt wurden.')}, + status=404) return view_func(request, *args, **kwargs) return decorator @@ -411,5 +415,3 @@ class LdapPasswordChangeView(PasswordChangeView): LdapUser.base_dn = LdapUser.ROOT_DN LdapUser.password_reset(user, password) return super().form_valid(form) - - diff --git a/src/core/settings.py b/src/core/settings.py index 6735421..612211b 100644 --- a/src/core/settings.py +++ b/src/core/settings.py @@ -47,6 +47,7 @@ INSTALLED_APPS = [ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', @@ -121,7 +122,12 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # https://docs.djangoproject.com/en/2.1/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = 'de_fr' +LANGUAGES = ( + ('en', _('English')), + ('de', _('German')), + ('de-fr', _('German (Frankish')), +) TIME_ZONE = 'UTC' @@ -131,6 +137,10 @@ USE_L10N = True USE_TZ = True +LOCALE_PATHS = ( + os.path.join(BASE_DIR, 'locale') +) + # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.1/howto/static-files/ diff --git a/src/locale/de_de/LC_MESSAGES/django.po b/src/locale/de_de/LC_MESSAGES/django.po new file mode 100644 index 0000000..c4bd6f9 --- /dev/null +++ b/src/locale/de_de/LC_MESSAGES/django.po @@ -0,0 +1,24 @@ +# 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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-05-02 11:34+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: account_manager/views/user_views.py:29 +msgid "" +"Der angefragte Nutzer gehört einem anderen Bereich an. Nutzer können nur von " +"dem Bereich bearbeitet werden, in dem sie erstellt wurden." +msgstr "" diff --git a/src/locale/de_fr/LC_MESSAGES/django.po b/src/locale/de_fr/LC_MESSAGES/django.po new file mode 100644 index 0000000..a6fa422 --- /dev/null +++ b/src/locale/de_fr/LC_MESSAGES/django.po @@ -0,0 +1,24 @@ +# 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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-05-02 11:35+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: account_manager/views/user_views.py:29 +msgid "" +"Der angefragte Nutzer gehört einem anderen Bereich an. Nutzer können nur von " +"dem Bereich bearbeitet werden, in dem sie erstellt wurden." +msgstr "Bla bla"