diff --git a/.tx/config b/.tx/config index 72623061fe..4857ad9556 100644 --- a/.tx/config +++ b/.tx/config @@ -13,6 +13,11 @@ source_lang = en source_file = mayan/apps/appearance/locale/en/LC_MESSAGES/django.po type = PO +[mayan-edms.apps-authentication] +file_filter = mayan/apps/authentication/locale//LC_MESSAGES/django.po +source_lang = en +source_file = mayan/apps/authentication/locale/en/LC_MESSAGES/django.po +type = PO [mayan-edms.apps-checkouts] file_filter = mayan/apps/checkouts/locale//LC_MESSAGES/django.po @@ -104,12 +109,6 @@ source_lang = en source_file = mayan/apps/mailer/locale/en/LC_MESSAGES/django.po type = PO -[mayan-edms.apps-main] -file_filter = mayan/apps/main/locale//LC_MESSAGES/django.po -source_lang = en -source_file = mayan/apps/main/locale/en/LC_MESSAGES/django.po -type = PO - [mayan-edms.apps-metadata] file_filter = mayan/apps/metadata/locale//LC_MESSAGES/django.po source_lang = en diff --git a/contrib/scripts/process_messages.py b/contrib/scripts/process_messages.py index 24703de369..f01020de8e 100755 --- a/contrib/scripts/process_messages.py +++ b/contrib/scripts/process_messages.py @@ -6,10 +6,10 @@ import optparse import sh APP_LIST = ( - 'acls', 'appearance', 'checkouts', 'common', 'converter', 'django_gpg', + 'acls', 'appearance', 'authentication', 'checkouts', 'common', 'converter', 'django_gpg', 'documents', 'document_comments', 'document_indexing', 'document_signatures', 'document_states', 'dynamic_search', 'events', - 'folders', 'installation', 'linking', 'mailer', 'main', 'metadata', + 'folders', 'installation', 'linking', 'mailer', 'metadata', 'navigation', 'ocr', 'permissions', 'project_setup', 'project_tools', 'rest_api', 'smart_settings', 'sources', 'statistics', 'tags', 'user_management' diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index 2ed5b48ab8..70ab156531 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -3,6 +3,7 @@ from __future__ import absolute_import, unicode_literals import logging from json import loads +from django.conf import settings from django.contrib import messages from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist, PermissionDenied @@ -130,8 +131,8 @@ def acl_detail_for(request, actor, obj): def acl_grant(request): items_property_list = loads(request.GET.get('items_property_list', [])) - next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('main:home')))) - previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home')))) + next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) + previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) items = {} title_suffix = [] @@ -221,8 +222,8 @@ def acl_grant(request): def acl_revoke(request): items_property_list = loads(request.GET.get('items_property_list', [])) - next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('main:home')))) - previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home')))) + next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) + previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) items = {} title_suffix = [] @@ -475,8 +476,8 @@ def acl_class_multiple_grant(request): Permission.objects.check_permissions(request.user, [ACLS_CLASS_EDIT_ACL]) items_property_list = loads(request.GET.get('items_property_list', [])) - next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('main:home')))) - previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home')))) + next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) + previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) items = {} title_suffix = [] @@ -552,8 +553,8 @@ def acl_class_multiple_revoke(request): Permission.objects.check_permissions(request.user, [ACLS_CLASS_EDIT_ACL]) items_property_list = loads(request.GET.get('items_property_list', [])) - next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('main:home')))) - previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home')))) + next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) + previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) items = {} title_suffix = [] diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html index 21e2d0cbfe..a0637a112a 100644 --- a/mayan/apps/appearance/templates/appearance/base.html +++ b/mayan/apps/appearance/templates/appearance/base.html @@ -96,7 +96,8 @@ - {% project_name %}{% if debug %} {% endif %} + {# TODO: don't use hardcoded main:home use settings.LOGIN_REDIRECT_URL #} + {% project_name %}{% if debug %} {% endif %}