mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Set base_url to default to "" in emails 

This makes it "less obviously wrong" than outputting None...
pull/9055/head
Matt Westcott 2022-06-13 23:17:11 +01:00 zatwierdzone przez LB Johnston
rodzic eab32164fd
commit efeb3ebbad
19 zmienionych plików z 20 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
wagtail/admin/templates/wagtailadmin/notifications/base.html
Wyświetl plik

@ -1,5 +1,5 @@
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% get_current_language as LANGUAGE_CODE %}
{% get_current_language_bidi as LANGUAGE_BIDI %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

2
wagtail/admin/templates/wagtailadmin/notifications/base.txt
Wyświetl plik

@ -1,5 +1,5 @@
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block greeting %}
{% blocktrans trimmed with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/rejected.html
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
<p>{% blocktrans trimmed with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}</p>

2
wagtail/admin/templates/wagtailadmin/notifications/rejected.txt
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% blocktrans trimmed with title=revision.page.get_admin_display_title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/submitted.html
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
<p>{% blocktrans trimmed with page=revision.page|safe editor=revision.user|user_display_name %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %}</p>

2
wagtail/admin/templates/wagtailadmin/notifications/submitted.txt
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% blocktrans trimmed with page=revision.page|safe editor=revision.user|user_display_name %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.html
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
<p>{% blocktrans trimmed with title=page.get_admin_display_title task=task.name %}The page "{{ title }}" has been approved in moderation stage "{{ task }}".{% endblocktrans %}</p>

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.txt
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% blocktrans trimmed with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been approved in moderation stage "{{ task }}".{% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.html
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
<p>{% blocktrans trimmed with title=page.get_admin_display_title task=task.name %}The page "{{ title }}" has been rejected in moderation stage "{{ task }}".{% endblocktrans %}</p>

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.txt
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% blocktrans trimmed with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been rejected in moderation stage "{{ task }}".{% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.html
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
<p>{% blocktrans trimmed with task=task.name title=page.get_admin_display_title %}The page "{{ title }}" has been submitted for approval in moderation stage "{{ task }}".{% endblocktrans %}</p>

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.txt
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% blocktrans trimmed with task=task.name|safe title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for approval to moderation stage "{{ task }}".{% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/updated_comments.html
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% load i18n wagtailadmin_tags %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
<p>

2
wagtail/admin/templates/wagtailadmin/notifications/updated_comments.txt
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load i18n wagtailadmin_tags %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}{% blocktrans trimmed with title=page.get_admin_display_title|safe editor=editor|user_display_name|safe %}{{ editor }} has updated comments on "{{ title }}".{% endblocktrans %}
{% spaceless %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.html
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% if task_state.finished_by %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.txt
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% if task_state.finished_by %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.html
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% if requested_by %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.txt
Wyświetl plik

@ -1,6 +1,6 @@
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load wagtailadmin_tags i18n %}
{% base_url_setting as base_url %}
{% base_url_setting default="" as base_url %}
{% block content %}
{% if requested_by %}{% blocktrans trimmed with workflow=workflow.name|safe title=page.get_admin_display_title|safe requester=requested_by|user_display_name|safe %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}" by {{ requester }}.{% endblocktrans %}

4
wagtail/admin/templatetags/wagtailadmin_tags.py
Wyświetl plik

@ -229,8 +229,8 @@ def usage_count_enabled():
@register.simple_tag
def base_url_setting():
return get_admin_base_url()
def base_url_setting(default=None):
return get_admin_base_url() or default
@register.simple_tag