Removed the context from the translatable text messages, because that is not necessary anymore.

This commit is contained in:
2020-08-07 00:05:05 +08:00
parent f6c6ee7fe4
commit 75cc6b2d00
16 changed files with 78 additions and 116 deletions

View File

@ -59,7 +59,7 @@ First written: 2020/7/20
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
<i class="far fa-calendar-alt"></i>
<span class="d-none d-md-inline">{{ period.description }}</span>
<span class="d-md-none">{% trans "Period" context "Period|" as text %}{{ text|force_escape }}</span>
<span class="d-md-none">{{ _("Period")|force_escape }}</span>
</button>
</div>

View File

@ -79,7 +79,7 @@ First written: 2020/7/1
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
<i class="far fa-calendar-alt"></i>
<span class="d-none d-md-inline">{{ period.description }}</span>
<span class="d-md-none">{% trans "Period" context "Period|" as text %}{{ text|force_escape }}</span>
<span class="d-md-none">{{ _("Period")|force_escape }}</span>
</button>
</div>

View File

@ -59,7 +59,7 @@ First written: 2020/7/19
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
<i class="far fa-calendar-alt"></i>
<span class="d-none d-md-inline">{{ period.description }}</span>
<span class="d-md-none">{% trans "Period" context "Period|" as text %}{{ text|force_escape }}</span>
<span class="d-md-none">{{ _("Period")|force_escape }}</span>
</button>
</div>

View File

@ -59,7 +59,7 @@ First written: 2020/7/17
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
<i class="far fa-calendar-alt"></i>
<span class="d-none d-md-inline">{{ period.description }}</span>
<span class="d-md-none">{% trans "Period" context "Period|" as text %}{{ text|force_escape }}</span>
<span class="d-md-none">{{ _("Period")|force_escape }}</span>
</button>
</div>

View File

@ -72,7 +72,7 @@ First written: 2020/7/16
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
<i class="far fa-calendar-alt"></i>
<span class="d-none d-md-inline">{{ period.description }}</span>
<span class="d-md-none">{% trans "Period" context "Period|" as text %}{{ text|force_escape }}</span>
<span class="d-md-none">{{ _("Period")|force_escape }}</span>
</button>
</div>

View File

@ -41,7 +41,7 @@ First written: 2020/7/23
<div class="btn-group btn-actions">
<a class="btn btn-primary" role="button" href="{% if item.transaction %}{% url_keep_return "accounting:transactions.show" "expense" item.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
<i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Back")|force_escape }}
</a>
</div>

View File

@ -69,26 +69,26 @@ First written: 2020/7/23
<div class="btn-group btn-actions">
<a class="btn btn-primary" role="button" href="{% if "r" in request.GET %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
<i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Back")|force_escape }}
</a>
<a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" "expense" item %}">
<i class="fas fa-edit"></i>
{% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Edit")|force_escape }}
</a>
{% if not item.has_many_same_day %}
<button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{{ _("There is no other transaction at the same day.")|force_escape }}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</button>
{% else %}
<a class="btn btn-primary d-none d-sm-inline" role="button" href="{% url_with_return "accounting:transactions.sort" item.date %}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</a>
{% endif %}
<a class="btn btn-primary d-none d-sm-inline" href="{% url_keep_return "accounting:transactions.show" "transfer" item %}">
<i class="fas fa-exchange-alt"></i>
{% trans "To Transfer" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("To Transfer")|force_escape }}
</a>
<div class="btn-group d-sm-none">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
@ -98,23 +98,23 @@ First written: 2020/7/23
{% if not item.has_many_same_day %}
<span class="dropdown-item disabled" title="{{ _("There is no other transaction at the same day.")|force_escape }}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</span>
{% else %}
<a class="dropdown-item" href="{% url_with_return "accounting:transactions.sort" item.date %}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</a>
{% endif %}
<a class="dropdown-item" href="{% url_keep_return "accounting:transactions.show" "transfer" item %}">
<i class="fas fa-exchange-alt"></i>
{% trans "To Transfer" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("To Transfer")|force_escape }}
</a>
</div>
</div>
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#del-modal">
<i class="fas fa-trash"></i>
{% trans "Delete" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Delete")|force_escape }}
</button>
</div>

View File

@ -41,7 +41,7 @@ First written: 2020/7/23
<div class="btn-group btn-actions">
<a class="btn btn-primary" role="button" href="{% if item.transaction %}{% url_keep_return "accounting:transactions.show" "income" item.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
<i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Back")|force_escape }}
</a>
</div>

View File

@ -69,26 +69,26 @@ First written: 2020/7/23
<div class="btn-group btn-actions">
<a class="btn btn-primary" role="button" href="{% if "r" in request.GET %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
<i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Back")|force_escape }}
</a>
<a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" "income" item %}">
<i class="fas fa-edit"></i>
{% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Edit")|force_escape }}
</a>
{% if not item.has_many_same_day %}
<button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{{ _("There is no other transaction at the same day.")|force_escape }}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</button>
{% else %}
<a class="btn btn-primary d-none d-sm-inline" role="button" href="{% url_with_return "accounting:transactions.sort" item.date %}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</a>
{% endif %}
<a class="btn btn-primary d-none d-sm-inline" href="{% url_keep_return "accounting:transactions.show" "transfer" item %}">
<i class="fas fa-exchange-alt"></i>
{% trans "To Transfer" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("To Transfer")|force_escape }}
</a>
<div class="btn-group d-sm-none">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
@ -98,23 +98,23 @@ First written: 2020/7/23
{% if not item.has_many_same_day %}
<span class="dropdown-item disabled" title="{{ _("There is no other transaction at the same day.")|force_escape }}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</span>
{% else %}
<a class="dropdown-item" href="{% url_with_return "accounting:transactions.sort" item.date %}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</a>
{% endif %}
<a class="dropdown-item" href="{% url_keep_return "accounting:transactions.show" "transfer" item %}">
<i class="fas fa-exchange-alt"></i>
{% trans "To Transfer" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("To Transfer")|force_escape }}
</a>
</div>
</div>
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#del-modal">
<i class="fas fa-trash"></i>
{% trans "Delete" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Delete")|force_escape }}
</button>
</div>

View File

@ -40,7 +40,7 @@ First written: 2020/8/6
<div class="btn-group btn-actions">
<a class="btn btn-primary" role="button" href="{% if "r" in request.GET %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
<i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Back")|force_escape }}
</a>
</div>

View File

@ -41,7 +41,7 @@ First written: 2020/7/23
<div class="btn-group btn-actions">
<a class="btn btn-primary" role="button" href="{% if item.transaction %}{% url_keep_return "accounting:transactions.show" "transfer" item.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
<i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Back")|force_escape }}
</a>
</div>

View File

@ -69,21 +69,21 @@ First written: 2020/7/23
<div class="btn-group btn-actions">
<a class="btn btn-primary" role="button" href="{% if "r" in request.GET %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
<i class="fas fa-chevron-circle-left"></i>
{% trans "Back" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Back")|force_escape }}
</a>
<a class="btn btn-primary" role="button" href="{% url_keep_return "accounting:transactions.edit" "transfer" item %}">
<i class="fas fa-edit"></i>
{% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Edit")|force_escape }}
</a>
{% if not item.has_many_same_day %}
<button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{{ _("There is no other transaction at the same day.")|force_escape }}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</button>
{% else %}
<a class="btn btn-primary d-none d-sm-inline" role="button" href="{% url_with_return "accounting:transactions.sort" item.date %}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</a>
{% endif %}
<div class="btn-group d-sm-none">
@ -94,19 +94,19 @@ First written: 2020/7/23
{% if not item.has_many_same_day %}
<span class="dropdown-item disabled" title="{{ _("There is no other transaction at the same day.")|force_escape }}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</span>
{% else %}
<a class="dropdown-item" href="{% url_with_return "accounting:transactions.sort" item.date %}">
<i class="fas fa-sort"></i>
{% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Sort")|force_escape }}
</a>
{% endif %}
</div>
</div>
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#del-modal">
<i class="fas fa-trash"></i>
{% trans "Delete" context "Navigation|" as text %}{{ text|force_escape }}
{{ _("Delete")|force_escape }}
</button>
</div>

View File

@ -59,7 +59,7 @@ First written: 2020/7/19
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
<i class="far fa-calendar-alt"></i>
<span class="d-none d-md-inline">{{ period.description }}</span>
<span class="d-md-none">{% trans "Period" context "Period|" as text %}{{ text|force_escape }}</span>
<span class="d-md-none">{{ _("Period")|force_escape }}</span>
</button>
</div>