Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve wording (#1168) 

* improve wording

* improve wording
This commit is contained in:
Son Nguyen Kim 2022-07-19 18:58:41 +02:00 committed by GitHub
parent f3d47a1eaa
commit 8773ed199a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/dashboard/refused_email.html
View File

@ -37,7 +37,10 @@
</li> </li>
</ul> </ul>
</div> </div>
{% if email_logs|length == 0 %}<div class="my-4 p-4 card">You don't have any emails in Quarantine.</div>{% endif %} {% if email_logs|length == 0 %}
<div class="my-4 p-4 card">You don't have any emails in Quarantine/Bounce.</div>
{% endif %}
{% for email_log in email_logs %} {% for email_log in email_logs %}
{% set refused_email = email_log.refused_email %} {% set refused_email = email_log.refused_email %}

24
templates/dashboard/setting.html
View File

@ -13,6 +13,9 @@
.highlighted{ .highlighted{
border: solid 2px #5675E2; border: solid 2px #5675E2;
} }
li {
margin-top: 8px;
}
</style> </style>
{% endblock %} {% endblock %}
@ -561,13 +564,18 @@
One-click unsubscribe One-click unsubscribe
</a> </a>
button, clicking on it will allow you to do one of these actions: button, clicking on it will allow you to do one of these actions:
<br /> <ul>
<b>Original action:</b> If a message sent to your alias has an unsubscribe header, that same action <li>
will be preserved in the email forwarded to your mailbox. <b>Original action:</b> Use the same unsubscribe policy set by your sender.
<br> SimpleLogin will make sure to hide your mailbox address.
<b>Disable alias:</b> The unsubscribe action will disable the alias that received the email and you will stop receiving emails. </li>
<br> <li>
<b>Block contact:</b> The sender of the email won't be allowed to send emails to this alias. <b>Disable alias:</b> The unsubscribe action will disable the alias that received the email.
</li>
<li>
<b>Block contact:</b> The sender of the email will be blocked: you won't receive emails from this sender to your alias anymore.
</li>
</ul>
</div> </div>
<form method="post" <form method="post"
action="#one-click-unsubscribe-section" action="#one-click-unsubscribe-section"
@ -576,7 +584,7 @@
<select class="form-control mr-sm-2" name="unsubscribe-behaviour"> <select class="form-control mr-sm-2" name="unsubscribe-behaviour">
<option value="{{ UnsubscribeBehaviourEnum.PreserveOriginal.name }}" {% if current_user.unsub_behaviour.value == UnsubscribeBehaviourEnum.PreserveOriginal.value %} <option value="{{ UnsubscribeBehaviourEnum.PreserveOriginal.name }}" {% if current_user.unsub_behaviour.value == UnsubscribeBehaviourEnum.PreserveOriginal.value %}
selected="selected" {% endif %}> selected="selected" {% endif %}>
Preserve the original unsubscribe request in the original email Preserve the original unsubscribe policy
</option> </option>
<option value="{{ UnsubscribeBehaviourEnum.DisableAlias.name }}" {% if current_user.unsub_behaviour.value == UnsubscribeBehaviourEnum.DisableAlias.value %} <option value="{{ UnsubscribeBehaviourEnum.DisableAlias.name }}" {% if current_user.unsub_behaviour.value == UnsubscribeBehaviourEnum.DisableAlias.value %}
selected="selected" {% endif %}> selected="selected" {% endif %}>