diff --git a/mayan/apps/appearance/templates/appearance/base_plain.html b/mayan/apps/appearance/templates/appearance/base_plain.html index a2a9a8b82f..a03a30ab59 100644 --- a/mayan/apps/appearance/templates/appearance/base_plain.html +++ b/mayan/apps/appearance/templates/appearance/base_plain.html @@ -3,6 +3,7 @@ {% load common_tags %} {% load navigation_tags %} +{% load smart_settings_tags %} {% spaceless %} {% block base_title %} - {% block title %}{% endblock %} :: {% block project_name %}{% project_information '__title__' %}{% endblock %} + {% block title %}{% endblock %} :: {% block project_name %} {% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %}{% endblock %} {% endblock base_title %} diff --git a/mayan/apps/authentication/views.py b/mayan/apps/authentication/views.py index ab2bcadada..09d6db22d7 100644 --- a/mayan/apps/authentication/views.py +++ b/mayan/apps/authentication/views.py @@ -16,6 +16,7 @@ from django.utils.translation import ugettext_lazy as _ from stronghold.decorators import public +from common.settings import setting_project_title import mayan from .forms import EmailAuthenticationForm, UsernameAuthenticationForm @@ -152,7 +153,7 @@ def password_reset_view(request): request, extra_context=extra_context, email_template_name='authentication/password_reset_email.html', extra_email_context={ - 'project_title': mayan.__title__, + 'project_title': setting_project_title.value, 'project_website': mayan.__website__, 'project_copyright': mayan.__copyright__, 'project_license': mayan.__license__, diff --git a/mayan/apps/mailer/forms.py b/mayan/apps/mailer/forms.py index 550264e489..eed1bb51d5 100644 --- a/mayan/apps/mailer/forms.py +++ b/mayan/apps/mailer/forms.py @@ -7,6 +7,7 @@ from django.utils.translation import ugettext_lazy as _ from acls.models import AccessControlList from common.forms import DynamicModelForm +from common.settings import setting_project_title import mayan @@ -32,7 +33,7 @@ class DocumentMailForm(forms.Form): self.fields[ 'body' ].initial = setting_document_body_template.value % { - 'project_title': mayan.__title__, + 'project_title': setting_project_title.value, 'project_website': mayan.__website__ } else: @@ -40,7 +41,7 @@ class DocumentMailForm(forms.Form): 'subject' ].initial = setting_link_subject_template.value self.fields['body'].initial = setting_link_body_template.value % { - 'project_title': mayan.__title__, + 'project_title': setting_project_title.value, 'project_website': mayan.__website__ } diff --git a/mayan/apps/rest_api/schemas.py b/mayan/apps/rest_api/schemas.py index 8670ee6ea2..d0e8e5d963 100644 --- a/mayan/apps/rest_api/schemas.py +++ b/mayan/apps/rest_api/schemas.py @@ -4,10 +4,11 @@ from django.utils.translation import ugettext_lazy as _ from drf_yasg import openapi +from common.settings import setting_project_title import mayan openapi_info = openapi.Info( - title=_('%s API') % mayan.__title__, + title=_('%s API') % setting_project_title.value, default_version='v2', description=mayan.__description__, license=openapi.License(name=mayan.__license__),