imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases4 Wiki Activity

Removed the context from the translatable text messages in the accounting application, because it is not needed now.

Browse Source
This commit is contained in:
依瑪貓
2020-08-06 00:41:29 +08:00
parent 518b49ee65
commit 86dfe993a4
24 changed files with 575 additions and 771 deletions

37
accounting/templates/accounting/cash-summary.html

@ -27,7 +27,7 @@ First written: 2020/7/15
{% load accounting %}
{% block settings %}
{% blocktrans asvar title with account=account.title context "Accounting|" %}Cash Summary for {{ account }}{% endblocktrans %}
{% blocktrans asvar title with account=account.title %}Cash Summary for {{ account }}{% endblocktrans %}
{% setvar "title" title %}
{% static "accounting/css/report.css" as file %}{% add_css file %}
{% endblock %}
@ -38,41 +38,36 @@ First written: 2020/7/15
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<i class="fas fa-edit"></i>
{% trans "New" context "Accounting|" as text %}
{{ text|force_escape }}
{{ _("New")|force_escape }}
</button>
<div class="dropdown-menu">
<a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
{% trans "Cash Expense" context "Accounting|" as text %}
{{ text|force_escape }}
{{ _("Cash Expense")|force_escape }}
</a>
<a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
{% trans "Cash Income" context "Accounting|" as text %}
{{ text|force_escape }}
{{ _("Cash Income")|force_escape }}
</a>
<a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
{% trans "Transfer" context "Accounting|" as text %}
{{ text|force_escape }}
{{ _("Transfer")|force_escape }}
</a>
</div>
</div>
{% with current_report_icon="fas fa-money-bill-wave" %}
{% trans "Cash Summary" context "Accounting|" as current_report_title %}
{% with current_report_icon="fas fa-money-bill-wave" current_report_title=_("Cash Summary") %}
{% include "accounting/include/report-chooser.html" %}
{% endwith %}
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="d-none d-md-inline">{{ account.title|title_case }}</span>
<span class="d-md-none">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</span>
<span class="d-md-none">{{ _("Account") }}</span>
</button>
<div class="dropdown-menu account-picker">
<div class="dropdown-header">{% trans "Shortcuts" context "Accounting|Account|" as text %}{{ text|force_escape }}</div>
<div class="dropdown-header">{{ _("Shortcuts") }}</div>
{% for x in shortcut_accounts %}
<a class="dropdown-item {% if x.code == account.code %} active {% endif %}>" href="{% url "accounting:cash-summary" x %}">
{{ x.title|title_case }}
</a>
{% endfor %}
<div class="dropdown-header">{% trans "All" context "Accounting|Account|" as text %}{{ text|force_escape }}</div>
<div class="dropdown-header">{{ _("All") }}</div>
{% for x in all_accounts %}
<a class="dropdown-item {% if x.code == account.code %} active {% endif %}>" href="{% url "accounting:cash-summary" x %}">
{{ x.code }} {{ x.title|title_case }}
@ -89,12 +84,12 @@ First written: 2020/7/15
<table class="table table-striped table-hover d-none d-sm-table general-journal-table">
<thead>
<tr>
<th scope="col">{% trans "Month" context "Accounting|" as text %}{{ text|force_escape }}</th>
<th class="amount" scope="col">{% trans "Income" context "Accounting|" as text %}{{ text|force_escape }}</th>
<th class="amount" scope="col">{% trans "Expense" context "Accounting|" as text %}{{ text|force_escape }}</th>
<th class="amount" scope="col">{% trans "Balance" context "Accounting|" as text %}{{ text|force_escape }}</th>
<th class="amount" scope="col">{% trans "Cumulative Balance" context "Accounting|" as text %}{{ text|force_escape }}</th>
<th class="actions" scope="col">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</th>
<th scope="col">{{ _("Month") }}</th>
<th class="amount" scope="col">{{ _("Income") }}</th>
<th class="amount" scope="col">{{ _("Expense") }}</th>
<th class="amount" scope="col">{{ _("Balance") }}</th>
<th class="amount" scope="col">{{ _("Cumulative Balance") }}</th>
<th class="actions" scope="col">{{ _("View") }}</th>
</tr>
</thead>
<tbody>
@ -109,7 +104,7 @@ First written: 2020/7/15
{% if item.month is not None %}
<a class="btn btn-info" role="button" href="{% url "accounting:cash" account item.month|date:"Y-m" %}">
<i class="fas fa-eye"></i>
<span class="d-none d-lg-inline">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</span>
<span class="d-none d-lg-inline">{{ _("View") }}</span>
</a>
{% endif %}
</td>