From 88147bea66308550c770592d65a7523365120228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Mon, 6 Mar 2023 00:24:20 +0800
Subject: [PATCH] Revised the currency in the titles and options of the ledger,
 income and expenses, and trial balance.

---
 .../templates/accounting/report/income-expenses.html      | 6 +++---
 src/accounting/templates/accounting/report/ledger.html    | 6 +++---
 .../templates/accounting/report/trial-balance.html        | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/accounting/templates/accounting/report/income-expenses.html b/src/accounting/templates/accounting/report/income-expenses.html
index 2291778..8883195 100644
--- a/src/accounting/templates/accounting/report/income-expenses.html
+++ b/src/accounting/templates/accounting/report/income-expenses.html
@@ -27,7 +27,7 @@ First written: 2023/3/5
   <script src="{{ url_for("accounting.static", filename="js/table-row-link.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{{ _("Income and Expenses of %(account)s in %(currency)s %(period)s", currency=report.currency, account=report.account|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{{ _("Income and Expenses of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
 
 {% block content %}
 
@@ -69,7 +69,7 @@ First written: 2023/3/5
       {% for currency in report.currency_options %}
         <li>
           <a class="dropdown-item {% if currency.is_active %} active {% endif %}" href="{{ currency.url }}">
-            {{ currency.title|title }}
+            {{ currency.title }}
           </a>
         </li>
       {% endfor %}
@@ -116,7 +116,7 @@ First written: 2023/3/5
       {% for currency in report.currency_options %}
         <li>
           <a class="dropdown-item {% if currency.is_active %} active {% endif %}" href="{{ currency.url }}">
-            {{ currency.title|title }}
+            {{ currency.title }}
           </a>
         </li>
       {% endfor %}
diff --git a/src/accounting/templates/accounting/report/ledger.html b/src/accounting/templates/accounting/report/ledger.html
index 76948cf..1208431 100644
--- a/src/accounting/templates/accounting/report/ledger.html
+++ b/src/accounting/templates/accounting/report/ledger.html
@@ -27,7 +27,7 @@ First written: 2023/3/5
   <script src="{{ url_for("accounting.static", filename="js/table-row-link.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{{ _("Ledger of %(account)s in %(currency)s %(period)s", currency=report.currency, account=report.account|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{{ _("Ledger of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
 
 {% block content %}
 
@@ -69,7 +69,7 @@ First written: 2023/3/5
       {% for currency in report.currency_options %}
         <li>
           <a class="dropdown-item {% if currency.is_active %} active {% endif %}" href="{{ currency.url }}">
-            {{ currency.title|title }}
+            {{ currency.title }}
           </a>
         </li>
       {% endfor %}
@@ -116,7 +116,7 @@ First written: 2023/3/5
       {% for currency in report.currency_options %}
         <li>
           <a class="dropdown-item {% if currency.is_active %} active {% endif %}" href="{{ currency.url }}">
-            {{ currency.title|title }}
+            {{ currency.title }}
           </a>
         </li>
       {% endfor %}
diff --git a/src/accounting/templates/accounting/report/trial-balance.html b/src/accounting/templates/accounting/report/trial-balance.html
index 811773f..aae5e3a 100644
--- a/src/accounting/templates/accounting/report/trial-balance.html
+++ b/src/accounting/templates/accounting/report/trial-balance.html
@@ -26,7 +26,7 @@ First written: 2023/3/5
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{{ _("Trial Balance of %(currency)s %(period)s", currency=report.currency, period=report.period.desc|title) }}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{{ _("Trial Balance of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}{% endblock %}{% endblock %}
 
 {% block content %}
 
@@ -68,7 +68,7 @@ First written: 2023/3/5
       {% for currency in report.currency_options %}
         <li>
           <a class="dropdown-item {% if currency.is_active %} active {% endif %}" href="{{ currency.url }}">
-            {{ currency.title|title }}
+            {{ currency.title }}
           </a>
         </li>
       {% endfor %}
@@ -100,7 +100,7 @@ First written: 2023/3/5
       {% for currency in report.currency_options %}
         <li>
           <a class="dropdown-item {% if currency.is_active %} active {% endif %}" href="{{ currency.url }}">
-            {{ currency.title|title }}
+            {{ currency.title }}
           </a>
         </li>
       {% endfor %}
@@ -119,7 +119,7 @@ First written: 2023/3/5
 {% if list %}
   <div class="accounting-report-card">
     <div class="d-none d-sm-flex justify-content-center mb-3">
-      <h2 class="text-center">{{ _("Trial Balance of %(currency)s %(period)s", currency=report.currency, period=report.period.desc|title) }}</h2>
+      <h2 class="text-center">{{ _("Trial Balance of %(currency)s %(period)s", currency=report.currency.name|title, period=report.period.desc|title) }}</h2>
     </div>
 
     <div class="list-group accounting-list-group-stripped accounting-list-group-hover">