Skip to content

Commit b20b051

Browse files
rename mail center (#1278)
Co-authored-by: Mario Behling <[email protected]>
1 parent 011090b commit b20b051

File tree

12 files changed

+34
-22
lines changed

12 files changed

+34
-22
lines changed

app/eventyay/orga/templates/orga/base.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
<a class="nav-link nav-link-inner" href="{{ request.event.orga_urls.outbox }}">
427427
<i class="fa fa-envelope"></i>
428428
<span class="sidebar-text">
429-
{% translate "Mails" %}
429+
{% translate "Message center" %}
430430
{% if request.event.pending_mails %}<span class="pending-mails">{{ request.event.pending_mails }}</span>{% endif %}
431431
</span>
432432
</a>
@@ -439,10 +439,10 @@
439439
<span>{% translate "Outbox" %}</span>
440440
</a>
441441
<a href="{% if can_change_teams %}{{ request.event.orga_urls.compose_mails }}{% else %}{{ request.event.orga_urls.compose_mails_sessions }}{% endif %}" class="nav-link nav-link-second-level{% if "mails.compose" in url_name %} active{% endif %}">
442-
<span>{% translate "Compose emails" %}</span>
442+
<span>{% translate "Compose" %}</span>
443443
</a>
444444
<a href="{{ request.event.orga_urls.sent_mails }}" class="nav-link nav-link-second-level{% if "mails.sent" in url_name %} active{% elif url_name == "mails.outbox.mail.view" and form.instance.sent %} active{% endif %}">
445-
<span>{% translate "Sent emails" %}</span>
445+
<span>{% translate "Sent" %}</span>
446446
</a>
447447
<a href="{{ request.event.orga_urls.mail_templates }}" class="nav-link nav-link-second-level{% if "mails.templates" in url_name %} active{% endif %}">
448448
<span>{% translate "Templates" %}</span>

app/eventyay/orga/templates/orga/mails/compose_choice.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
{% load i18n %}
44

5-
{% block extra_title %}{% translate "Send emails" %} :: {% endblock extra_title %}
5+
{% block extra_title %}{% translate "Compose" %} :: {% endblock extra_title %}
66

77
{% block content %}
88
<div class="d-md-flex justify-content-between">
9-
<h2>{% translate "Send emails" %}</h2>
9+
<h2>{% translate "Compose emails" %}</h2>
1010
{% include "orga/event/component_link.html" %}
1111
</div>
1212
<ul class="list-group">

app/eventyay/orga/templates/orga/mails/outbox_list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ <h2>
88
<span>
99
{{ page_obj.paginator.count }}
1010
{% blocktranslate trimmed count count=page_obj.paginator.count %}
11-
pending mail
11+
pending email
1212
{% plural %}
13-
pending mails
13+
pending emails
1414
{% endblocktranslate %}
1515
</span>
1616
</h2>

app/eventyay/orga/templates/orga/mails/sent_list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="d-md-flex justify-content-between">
77
<h2>
88
{{ page_obj.paginator.count }}
9-
{% translate "Sent Mails" %}
9+
{% translate "Sent emails" %}
1010
</h2>
1111
{% include "orga/event/component_link.html" %}
1212
</div>

app/eventyay/plugins/sendmail/signals.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def control_nav_import(sender, request=None, **kwargs):
1313
return []
1414
return [
1515
{
16-
'label': _('Mails'),
16+
'label': _('Message center'),
1717
'url': reverse(
1818
'plugins:sendmail:outbox',
1919
kwargs={
@@ -44,7 +44,7 @@ def control_nav_import(sender, request=None, **kwargs):
4444
),
4545
},
4646
{
47-
'label': _('Compose emails'),
47+
'label': _('Compose'),
4848
'url': reverse(
4949
'plugins:sendmail:compose_email_choice',
5050
kwargs={
@@ -62,7 +62,7 @@ def control_nav_import(sender, request=None, **kwargs):
6262
),
6363
},
6464
{
65-
'label': _('Sent emails'),
65+
'label': _('Sent'),
6666
'url': reverse(
6767
'plugins:sendmail:sent',
6868
kwargs={

app/eventyay/plugins/sendmail/templates/pretixplugins/sendmail/compose_choice.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% load i18n %}
33
{% load bootstrap3 %}
44

5-
{% block title %}{% translate "Compose emails" %}{% endblock %}
5+
{% block title %}{% translate "Compose" %}{% endblock %}
66

77
{% block content %}
88
<nav id="event-nav" class="header-nav">

app/eventyay/plugins/sendmail/templates/pretixplugins/sendmail/mail_templates.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
{% load i18n %}
33
{% load bootstrap3 %}
44
{% load static %}
5-
{% block title %}{% translate "Mails" %}{% endblock %}
5+
{% block title %}{% translate "Email templates" %}{% endblock %}
66
{% block content %}
77
<nav id="event-nav" class="header-nav">
88
<div class="navigation">
99
<div class="navigation-title">
10-
<h1>{% translate "Templates" %}</h1>
10+
<h1>{% translate "Email templates" %}</h1>
1111
</div>
1212
{% include "pretixcontrol/event/component_link.html" %}
1313
</div>

app/eventyay/plugins/sendmail/templates/pretixplugins/sendmail/outbox_list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<div class="navigation-title">
1010
<h1>
1111
{% blocktranslate count mail_count=mails|length %}
12-
Queued email
12+
Pending email
1313
{% plural %}
14-
{{ mail_count }} Queued emails
14+
{{ mail_count }} pending emails
1515
{% endblocktranslate %}
1616
</h1>
1717
</div>

app/eventyay/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{% extends "pretixcontrol/event/base.html" %}
22
{% load i18n %}
33
{% load bootstrap3 %}
4-
{% block title %}{% translate "Mails" %}{% endblock %}
4+
{% block title %}{% translate "Email editor" %}{% endblock %}
55
{% block content %}
66
<nav id="event-nav" class="header-nav">
77
<div class="navigation">
8-
<div class="navigation-title">
9-
<h1>{% translate "Compose emails" %}</h1>
8+
<div class="navigation-title nav-title-group">
9+
<h1>{% translate "Email editor" %}</h1>
10+
<p class='text-muted nav-subtitle'>{% translate "Attendees, orders, tickets" %}</p>
1011
</div>
1112
{% include "pretixcontrol/event/component_link.html" %}
1213
</div>

app/eventyay/plugins/sendmail/templates/pretixplugins/sendmail/send_team_form.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
{% load i18n %}
33
{% load bootstrap3 %}
44

5-
{% block title %}{% translate "Team Emails" %}{% endblock %}
5+
{% block title %}{% translate "Email editor" %}{% endblock %}
66

77
{% block content %}
88
<nav id="event-nav" class="header-nav">
99
<div class="navigation">
10-
<div class="navigation-title">
11-
<h1>{% translate "Compose team emails" %}</h1>
10+
<div class="navigation-title nav-title-group">
11+
<h1>{% translate "Email editor" %}</h1>
12+
<p class='text-muted nav-subtitle'>{% translate "Team members" %}</p>
1213
</div>
1314
{% include "pretixcontrol/event/component_link.html" %}
1415
</div>

0 commit comments

Comments
 (0)