Updated the translation.

src/accounting/base_account/commands.py

@@ -24,6 +24,7 @@ import sqlalchemy as sa
 from accounting import data_dir
 from accounting import db
 from accounting.models import BaseAccount, BaseAccountL10n
+from accounting.utils.title_case import title_case
 
 
 def init_base_accounts_command() -> None:
@@ -34,7 +35,7 @@ def init_base_accounts_command() -> None:
     with open(data_dir / "base_accounts.csv") as fp:
         data: list[dict[str, str]] = [x for x in csv.DictReader(fp)]
     account_data: list[dict[str, str]] = [{"code": x["code"],
-                                           "title_l10n": x["title"]}
+                                           "title_l10n": title_case(x["title"])}
                                           for x in data]
     locales: list[str] = [x[5:] for x in data[0] if x.startswith("l10n-")]
     l10n_data: list[dict[str, str]] = [{"account_code": x["code"],

src/accounting/models.py

@@ -54,7 +54,7 @@ class BaseAccount(db.Model):
 
         :return: The string representation of the base account.
         """
-        return f"{self.code} {self.title.title()}"
+        return f"{self.code} {self.title}"
 
     @property
     def title(self) -> str:
@@ -151,7 +151,7 @@ class Account(db.Model):
 
         :return: The string representation of this account.
         """
-        return f"{self.base_code}-{self.no:03d} {self.title.title()}"
+        return f"{self.base_code}-{self.no:03d} {self.title}"
 
     @property
     def code(self) -> str:

src/accounting/report/reports/balance_sheet.py

@@ -454,11 +454,11 @@ class BalanceSheet(BaseReport):
         :return: The CSV rows for the section.
         """
         rows: list[CSVHalfRow] \
-            = [CSVHalfRow(section.title.title.title(), None)]
+            = [CSVHalfRow(section.title.title, None)]
         for subsection in section.subsections:
-            rows.append(CSVHalfRow(f" {subsection.title.title.title()}", None))
+            rows.append(CSVHalfRow(f" {subsection.title.title}", None))
             for account in subsection.accounts:
-                rows.append(CSVHalfRow(f"  {str(account.account).title()}",
+                rows.append(CSVHalfRow(f"  {str(account.account)}",
                                        account.amount))
         return rows
 

src/accounting/report/reports/income_expenses.py

@@ -407,13 +407,13 @@ class IncomeExpenses(BaseReport):
                                      gettext("Note"))]
         if self.__brought_forward is not None:
             rows.append(CSVRow(self.__brought_forward.date,
-                               str(self.__brought_forward.account).title(),
+                               str(self.__brought_forward.account),
                                self.__brought_forward.description,
                                self.__brought_forward.income,
                                self.__brought_forward.expense,
                                self.__brought_forward.balance,
                                None))
-        rows.extend([CSVRow(x.date, str(x.account).title(), x.description,
+        rows.extend([CSVRow(x.date, str(x.account), x.description,
                             x.income, x.expense, x.balance, x.note)
                      for x in self.__line_items])
         if self.__total is not None:

src/accounting/report/reports/income_statement.py

@@ -226,12 +226,12 @@ class IncomeStatement(BaseReport):
                                           for x in balances})).all()
 
         total_titles: dict[str, str] \
-            = {"4": gettext("total operating revenue"),
+            = {"4": gettext("Total Operating Revenue"),
-               "5": gettext("gross income"),
+               "5": gettext("Gross Income"),
-               "6": gettext("operating income"),
+               "6": gettext("Operating Income"),
-               "7": gettext("before tax income"),
+               "7": gettext("Before Tax Income"),
-               "8": gettext("after tax income"),
+               "8": gettext("After Tax Income"),
-               "9": gettext("net income or loss for current period")}
+               "9": gettext("Net Income or Loss for Current Period")}
 
         sections: dict[str, Section] \
             = {x.code: Section(x, total_titles[x.code]) for x in titles}
@@ -301,14 +301,14 @@ class IncomeStatement(BaseReport):
         total_str: str = gettext("Total")
         rows: list[CSVRow] = [CSVRow(None, gettext("Amount"))]
         for section in self.__sections:
-            rows.append(CSVRow(str(section.title).title(), None))
+            rows.append(CSVRow(str(section.title), None))
             for subsection in section.subsections:
-                rows.append(CSVRow(f" {str(subsection.title).title()}", None))
+                rows.append(CSVRow(f" {str(subsection.title)}", None))
                 for account in subsection.accounts:
-                    rows.append(CSVRow(f"  {str(account.account).title()}",
+                    rows.append(CSVRow(f"  {str(account.account)}",
                                        account.amount))
                 rows.append(CSVRow(f" {total_str}", subsection.total))
-            rows.append(CSVRow(section.accumulated.title.title(),
+            rows.append(CSVRow(section.accumulated.title,
                                section.accumulated.amount))
             rows.append(CSVRow(None, None))
         rows = rows[:-1]

src/accounting/report/reports/journal.py

@@ -160,7 +160,7 @@ def get_csv_rows(line_items: list[JournalEntryLineItem]) -> list[CSVRow]:
                                  gettext("Debit"), gettext("Credit"),
                                  gettext("Note"))]
     rows.extend([CSVRow(x.journal_entry.date, x.currency.code,
-                        str(x.account).title(), x.description,
+                        str(x.account), x.description,
                         x.debit, x.credit, x.journal_entry.note)
                  for x in line_items])
     return rows

src/accounting/report/reports/trial_balance.py

@@ -224,7 +224,7 @@ class TrialBalance(BaseReport):
         """
         rows: list[CSVRow] = [CSVRow(gettext("Account"), gettext("Debit"),
                                      gettext("Credit"))]
-        rows.extend([CSVRow(str(x.account).title(), x.debit, x.credit)
+        rows.extend([CSVRow(str(x.account), x.debit, x.credit)
                      for x in self.__accounts])
         rows.append(CSVRow(gettext("Total"), self.__total.debit,
                            self.__total.credit))

src/accounting/report/reports/unapplied_accounts.py

@@ -120,8 +120,7 @@ def get_csv_rows(accounts: list[Account]) -> list[CSVRow]:
     :return: The CSV rows.
     """
     rows: list[CSVRow] = [CSVRow(gettext("Account"), gettext("Count"))]
-    rows.extend([CSVRow(str(x).title(), x.count)
+    rows.extend([CSVRow(str(x), x.count) for x in accounts])
-                 for x in accounts])
     return rows
 
 

src/accounting/report/reports/unmatched_accounts.py

@@ -120,8 +120,7 @@ def get_csv_rows(accounts: list[Account]) -> list[CSVRow]:
     :return: The CSV rows.
     """
     rows: list[CSVRow] = [CSVRow(gettext("Account"), gettext("Count"))]
-    rows.extend([CSVRow(str(x).title(), x.count)
+    rows.extend([CSVRow(str(x), x.count) for x in accounts])
-                 for x in accounts])
     return rows
 
 

src/accounting/templates/accounting/account/detail.html

@@ -90,7 +90,7 @@ First written: 2023/1/31
 {% endif %}
 
 <div class="accounting-card col-sm-6">
-  <div class="accounting-card-title">{{ obj.title|title }}</div>
+  <div class="accounting-card-title">{{ obj.title }}</div>
   <div class="accounting-card-code">{{ obj.code }}</div>
   {% if obj.is_need_offset %}
     <div>

src/accounting/templates/accounting/base-account/detail.html

@@ -33,7 +33,7 @@ First written: 2023/2/1
 </div>
 
 <div class="accounting-card col-sm-6">
-  <div class="accounting-card-title">{{ obj.title|title }}</div>
+  <div class="accounting-card-title">{{ obj.title }}</div>
   <div class="accounting-card-code">{{ obj.code }}</div>
   {% if obj.accounts %}
     <div>

src/accounting/templates/accounting/journal-entry/include/detail-line-items.html

@@ -26,7 +26,7 @@ First written: 2023/3/14
       <div>
         <div class="small">
           <span class="d-none d-md-inline">{{ line_item.account.code }}</span>
-          {{ line_item.account.title|title }}
+          {{ line_item.account.title }}
         </div>
         {% if line_item.description is not none %}
           <div>{{ line_item.description }}</div>

src/accounting/templates/accounting/journal-entry/include/original-line-item-selector-modal.html

@@ -42,7 +42,7 @@ First written: 2023/2/25
                 <div class="small">
                   {{ line_item.journal_entry.date|accounting_format_date }}
                   <span class="d-none d-md-inline">{{ line_item.account.code }}</span>
-                  {{ line_item.account.title|title }}
+                  {{ line_item.account.title }}
                 </div>
                 {{ line_item.description|accounting_default }}
               </div>

src/accounting/templates/accounting/report/include/balance-sheet-section.html

@@ -20,21 +20,21 @@ Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/3/8
 #}
 <div class="accounting-report-table-row accounting-balance-sheet-section">
-  <div>{{ section.title.title|title }}</div>
+  <div>{{ section.title.title }}</div>
 </div>
 <div class="accounting-report-table-body">
   {% for subsection in section.subsections %}
     <div class="accounting-report-table-row accounting-balance-sheet-subsection">
       <div>
         <span class="d-none d-md-inline">{{ subsection.title.code }}</span>
-        {{ subsection.title.title|title }}
+        {{ subsection.title.title }}
       </div>
     </div>
     {% for account in subsection.accounts %}
       <a class="d-flex justify-content-between accounting-report-table-row accounting-balance-sheet-account" href="{{ account.url }}">
         <div>
           <span class="d-none d-md-inline">{{ account.account.code }}</span>
-          {{ account.account.title|title }}
+          {{ account.account.title }}
         </div>
         <div class="accounting-amount {% if account.amount < 0 %} text-danger {% endif %}">{{ account.amount|accounting_report_format_amount }}</div>
       </a>

src/accounting/templates/accounting/report/include/income-expenses-row-desktop.html

@@ -20,7 +20,7 @@ Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/3/8
 #}
 <div>{{ line_item.date|accounting_format_date }}</div>
-<div>{{ line_item.account.title|title }}</div>
+<div>{{ line_item.account.title }}</div>
 <div>{{ line_item.description|accounting_default }}</div>
 <div class="accounting-amount">{{ line_item.income|accounting_format_amount|accounting_default }}</div>
 <div class="accounting-amount">{{ line_item.expense|accounting_format_amount|accounting_default }}</div>

src/accounting/templates/accounting/report/include/income-expenses-row-mobile.html

@@ -26,7 +26,7 @@ First written: 2023/3/5
         {{ line_item.date|accounting_format_date }}
       {% endif %}
       {% if line_item.account %}
-        {{ line_item.account.title|title }}
+        {{ line_item.account.title }}
       {% endif %}
     </div>
   {% endif %}

src/accounting/templates/accounting/report/include/toolbar-buttons.html

@@ -93,7 +93,7 @@ First written: 2023/3/8
       {% for account in report.account_options %}
         <li>
           <a class="dropdown-item {% if account.is_active %} active {% endif %}" href="{{ account.url }}">
-            {{ account.title|title }}
+            {{ account.title }}
           </a>
         </li>
       {% endfor %}

src/accounting/templates/accounting/report/income-expenses.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 %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Income and Expenses Log of %(account)s %(period)s", account=report.account.title|title, period=report.period.desc|title) }}{% else %}{{ A_("Income and Expenses Log of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account.title|title, period=report.period.desc|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Income and Expenses Log of %(account)s %(period)s", account=report.account.title, period=report.period.desc|title) }}{% else %}{{ A_("Income and Expenses Log of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account.title, period=report.period.desc|title) }}{% endif %}{% endblock %}{% endblock %}
 
 {% block content %}
 

src/accounting/templates/accounting/report/income-statement.html

@@ -66,21 +66,21 @@ First written: 2023/3/7
           <div class="accounting-report-table-row accounting-income-statement-section">
             <div>
               <span class="d-none d-md-inline">{{ section.title.code }}</span>
-              {{ section.title.title|title }}
+              {{ section.title.title }}
             </div>
           </div>
           {% for subsection in section.subsections %}
             <div class="accounting-report-table-row accounting-income-statement-subsection">
               <div>
                 <span class="d-none d-md-inline">{{ subsection.title.code }}</span>
-                {{ subsection.title.title|title }}
+                {{ subsection.title.title }}
               </div>
             </div>
             {% for account in subsection.accounts %}
               <a class="accounting-report-table-row accounting-income-statement-account" href="{{ account.url }}">
                 <div>
                   <span class="d-none d-md-inline">{{ account.account.code }}</span>
-                  {{ account.account.title|title }}
+                  {{ account.account.title }}
                 </div>
                 <div class="accounting-amount {% if account.amount < 0 %} text-danger {% endif %}">{{ account.amount|accounting_report_format_amount }}</div>
               </a>
@@ -91,7 +91,7 @@ First written: 2023/3/7
             </div>
           {% endfor %}
           <div class="accounting-report-table-row accounting-income-statement-total">
-            <div>{{ section.accumulated.title|title }}</div>
+            <div>{{ section.accumulated.title }}</div>
             <div class="accounting-amount {% if section.accumulated.amount < 0 %} text-danger {% endif %}">{{ section.accumulated.amount|accounting_report_format_amount }}</div>
           </div>
         {% endfor %}

src/accounting/templates/accounting/report/journal.html

@@ -65,7 +65,7 @@ First written: 2023/3/4
           <div>{{ line_item.currency.name }}</div>
           <div>
             <span class="d-none d-md-inline">{{ line_item.account.code }}</span>
-            {{ line_item.account.title|title }}
+            {{ line_item.account.title }}
           </div>
           <div>{{ line_item.description|accounting_default }}</div>
           <div class="accounting-amount">{{ line_item.debit|accounting_format_amount|accounting_default }}</div>
@@ -82,7 +82,7 @@ First written: 2023/3/4
         <div {% if not line_item.is_debit %} class="accounting-mobile-journal-credit" {% endif %}>
           <div class="text-muted small">
             {{ line_item.journal_entry.date|accounting_format_date }}
-            {{ line_item.account.title|title }}
+            {{ line_item.account.title }}
             {% if line_item.currency.code != accounting_default_currency_code() %}
               <span class="badge rounded-pill bg-info">{{ line_item.currency.code }}</span>
             {% endif %}

src/accounting/templates/accounting/report/ledger.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 %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Ledger of %(account)s %(period)s", account=report.account.title|title, period=report.period.desc|title) }}{% else %}{{ A_("Ledger of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account.title|title, period=report.period.desc|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Ledger of %(account)s %(period)s", account=report.account.title, period=report.period.desc|title) }}{% else %}{{ A_("Ledger of %(account)s in %(currency)s %(period)s", currency=report.currency.name|title, account=report.account.title, period=report.period.desc|title) }}{% endif %}{% endblock %}{% endblock %}
 
 {% block content %}
 

src/accounting/templates/accounting/report/search.html

@@ -62,7 +62,7 @@ First written: 2023/3/8
           <div>{{ line_item.currency.name }}</div>
           <div>
             <span class="d-none d-md-inline">{{ line_item.account.code }}</span>
-            {{ line_item.account.title|title }}
+            {{ line_item.account.title }}
           </div>
           <div>{{ line_item.description|accounting_default }}</div>
           <div class="accounting-amount">{{ line_item.debit|accounting_format_amount|accounting_default }}</div>
@@ -79,7 +79,7 @@ First written: 2023/3/8
         <div {% if not line_item.is_debit %} class="accounting-mobile-journal-credit" {% endif %}>
           <div class="text-muted small">
             {{ line_item.journal_entry.date|accounting_format_date }}
-            {{ line_item.account.title|title }}
+            {{ line_item.account.title }}
             {% if line_item.currency.code != accounting_default_currency_code() %}
               <span class="badge rounded-pill bg-info">{{ line_item.currency.code }}</span>
             {% endif %}

src/accounting/templates/accounting/report/trial-balance.html

@@ -68,7 +68,7 @@ First written: 2023/3/5
           <a class="accounting-report-table-row" href="{{ account.url }}">
             <div>
               <span class="d-none d-md-inline">{{ account.account.code }}</span>
-              {{ account.account.title|title }}
+              {{ account.account.title }}
             </div>
             <div class="accounting-amount">{{ account.debit|accounting_format_amount|accounting_default }}</div>
             <div class="accounting-amount">{{ account.credit|accounting_format_amount|accounting_default }}</div>

src/accounting/templates/accounting/report/unapplied-accounts.html

@@ -26,7 +26,7 @@ First written: 2023/4/8
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Accounts with Unapplied Items") }}{% else %}{{ A_("Accounts with Unapplied Items in %(currency)s", currency=report.currency.name|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Accounts With Unapplied Items") }}{% else %}{{ A_("Accounts With Unapplied Items in %(currency)s", currency=report.currency.name|title) }}{% endif %}{% endblock %}{% endblock %}
 
 {% block content %}
 
@@ -46,9 +46,9 @@ First written: 2023/4/8
     <div class="d-none d-sm-flex justify-content-center mb-3">
       <h2 class="text-center">
         {% if report.currency.code == accounting_default_currency_code() %}
-          {{ A_("Accounts with Unapplied Items") }}
+          {{ A_("Accounts With Unapplied Items") }}
         {% else %}
-          {{ A_("Accounts with Unapplied Items in %(currency)s", currency=report.currency.name|title) }}
+          {{ A_("Accounts With Unapplied Items in %(currency)s", currency=report.currency.name|title) }}
         {% endif %}
       </h2>
     </div>
@@ -64,7 +64,7 @@ First written: 2023/4/8
           <a class="accounting-report-table-row" href="{{ url_for("accounting-report.unapplied", currency=report.currency, account=account, period=report.period) }}">
             <div>
               <span class="d-none d-md-inline">{{ account.code }}</span>
-              {{ account.title|title }}
+              {{ account.title }}
             </div>
             <div class="accounting-amount">{{ account.count }}</div>
           </a>

src/accounting/templates/accounting/report/unapplied.html

@@ -26,7 +26,7 @@ First written: 2023/4/7
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Unapplied Items of %(account)s", account=report.account.title|title) }}{% else %}{{ A_("Unapplied Items of %(account)s in %(currency)s", currency=report.currency.name|title, account=report.account.title|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Unapplied Items of %(account)s", account=report.account.title) }}{% else %}{{ A_("Unapplied Items of %(account)s in %(currency)s", currency=report.currency.name|title, account=report.account.title) }}{% endif %}{% endblock %}{% endblock %}
 
 {% block content %}
 

src/accounting/templates/accounting/report/unmatched-accounts.html

@@ -26,7 +26,7 @@ First written: 2023/4/17
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Accounts with Unmatched Offsets") }}{% else %}{{ A_("Accounts with Unmatched Offsets in %(currency)s", currency=report.currency.name|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Accounts With Unmatched Offsets") }}{% else %}{{ A_("Accounts With Unmatched Offsets in %(currency)s", currency=report.currency.name|title) }}{% endif %}{% endblock %}{% endblock %}
 
 {% block content %}
 
@@ -46,9 +46,9 @@ First written: 2023/4/17
     <div class="d-none d-sm-flex justify-content-center mb-3">
       <h2 class="text-center">
         {% if report.currency.code == accounting_default_currency_code() %}
-          {{ A_("Accounts with Unmatched Offsets") }}
+          {{ A_("Accounts With Unmatched Offsets") }}
         {% else %}
-          {{ A_("Accounts with Unmatched Offsets in %(currency)s", currency=report.currency.name|title) }}
+          {{ A_("Accounts With Unmatched Offsets in %(currency)s", currency=report.currency.name|title) }}
         {% endif %}
       </h2>
     </div>
@@ -64,7 +64,7 @@ First written: 2023/4/17
           <a class="accounting-report-table-row" href="{{ url_for("accounting-report.unmatched", currency=report.currency, account=account, period=report.period) }}">
             <div>
               <span class="d-none d-md-inline">{{ account.code }}</span>
-              {{ account.title|title }}
+              {{ account.title }}
             </div>
             <div class="accounting-amount">{{ account.count }}</div>
           </a>

src/accounting/templates/accounting/report/unmatched.html

@@ -26,7 +26,7 @@ First written: 2023/4/17
   <script src="{{ url_for("accounting.static", filename="js/period-chooser.js") }}"></script>
 {% endblock %}
 
-{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Unmatched Offsets of %(account)s", account=report.account.title|title) }}{% else %}{{ A_("Unmatched Offsets of %(account)s in %(currency)s", currency=report.currency.name|title, account=report.account.title|title) }}{% endif %}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{% if report.currency.code == accounting_default_currency_code() %}{{ A_("Unmatched Offsets of %(account)s", account=report.account.title) }}{% else %}{{ A_("Unmatched Offsets of %(account)s in %(currency)s", currency=report.currency.name|title, account=report.account.title) }}{% endif %}{% endblock %}{% endblock %}
 
 {% block content %}
 

src/accounting/translations/zh_Hant/LC_MESSAGES/accounting.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mia-accounting 1.4.0\n"
 "Report-Msgid-Bugs-To: imacat@mail.imacat.idv.tw\n"
-"POT-Creation-Date: 2023-04-18 09:32+0800\n"
+"POT-Creation-Date: 2023-07-29 08:55+0800\n"
-"PO-Revision-Date: 2023-04-18 09:32+0800\n"
+"PO-Revision-Date: 2023-07-29 08:56+0800\n"
 "Last-Translator: imacat <imacat@mail.imacat.idv.tw>\n"
 "Language: zh_Hant\n"
 "Language-Team: zh_Hant <imacat@mail.imacat.idv.tw>\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: src/accounting/forms.py:33
 #: src/accounting/static/js/journal-entry-form.js:1080
-#: src/accounting/static/js/journal-entry-line-item-editor.js:411
+#: src/accounting/static/js/journal-entry-line-item-editor.js:415
 #: src/accounting/static/js/option-form.js:537
 #: src/accounting/static/js/option-form.js:803
 msgid "Please select the account."
@@ -35,22 +35,22 @@ msgstr "沒有這個貨幣。"
 msgid "The account does not exist."
 msgstr "沒有這個科目。"
 
-#: src/accounting/models.py:581
+#: src/accounting/models.py:578
 #, python-format
 msgid "Cash Disbursement Journal Entry#%(id)s"
 msgstr "現金支出傳票#%(id)s"
 
-#: src/accounting/models.py:584
+#: src/accounting/models.py:581
 #, python-format
 msgid "Cash Receipt Journal Entry#%(id)s"
 msgstr "現金收入傳票#%(id)s"
 
-#: src/accounting/models.py:585
+#: src/accounting/models.py:582
 #, python-format
 msgid "Transfer Journal Entry#%(id)s"
 msgstr "轉帳傳票#%(id)s"
 
-#: src/accounting/models.py:714
+#: src/accounting/models.py:706
 #, python-format
 msgid "%(date)s %(description)s %(amount)s"
 msgstr "%(date)s %(description)s %(amount)s"
@@ -101,7 +101,7 @@ msgid "Please fill in the title"
 msgstr "請填上標題。"
 
 #: src/accounting/account/queries.py:50
-#: src/accounting/report/reports/search.py:101
+#: src/accounting/report/reports/search.py:100
 #: src/accounting/templates/accounting/account/detail.html:97
 #: src/accounting/templates/accounting/account/list.html:62
 msgid "Needs Offset"
@@ -205,24 +205,24 @@ msgstr "傳票不可刪除。"
 msgid "The journal entry is deleted successfully."
 msgstr "傳票刪掉了"
 
-#: src/accounting/journal_entry/forms/currency.py:39
+#: src/accounting/journal_entry/forms/currency.py:38
 msgid "Please select the currency."
 msgstr "請選擇貨幣。"
 
-#: src/accounting/journal_entry/forms/currency.py:62
+#: src/accounting/journal_entry/forms/currency.py:61
 msgid "The currency must be the same as the original line item."
 msgstr "貨幣需和原始分錄相同。"
 
-#: src/accounting/journal_entry/forms/currency.py:89
+#: src/accounting/journal_entry/forms/currency.py:88
 msgid "The currency must not be changed when there is offset."
 msgstr "抵銷過不可變更貨幣。"
 
-#: src/accounting/journal_entry/forms/currency.py:98
+#: src/accounting/journal_entry/forms/currency.py:97
 #: src/accounting/static/js/journal-entry-form.js:773
 msgid "Please add some line items."
 msgstr "請加上分錄。"
 
-#: src/accounting/journal_entry/forms/currency.py:111
+#: src/accounting/journal_entry/forms/currency.py:110
 #: src/accounting/static/js/journal-entry-form.js:522
 msgid "The totals of the debit and credit amounts do not match."
 msgstr "借方貸方合計不符。 "
@@ -251,62 +251,62 @@ msgstr "請加上貨幣。"
 msgid "Line items with offset cannot be deleted."
 msgstr "無法刪除抵銷過的分錄。"
 
-#: src/accounting/journal_entry/forms/line_item.py:49
+#: src/accounting/journal_entry/forms/line_item.py:48
 msgid "The original line item does not exist."
 msgstr "沒有這筆原始分錄。"
 
-#: src/accounting/journal_entry/forms/line_item.py:70
+#: src/accounting/journal_entry/forms/line_item.py:69
 msgid "The original line item is on the same debit or credit."
 msgstr "原始分錄在借貸同一邊。"
 
-#: src/accounting/journal_entry/forms/line_item.py:85
+#: src/accounting/journal_entry/forms/line_item.py:84
 msgid "The original line item does not need offset."
 msgstr "這筆原始分錄不需抵銷。"
 
-#: src/accounting/journal_entry/forms/line_item.py:101
+#: src/accounting/journal_entry/forms/line_item.py:100
 msgid "The original line item cannot be an offset item."
 msgstr "原始分錄不可以是抵銷分錄。"
 
-#: src/accounting/journal_entry/forms/line_item.py:119
+#: src/accounting/journal_entry/forms/line_item.py:118
 msgid "The account must be the same as the original line item."
 msgstr "科目需和原始分錄相同。"
 
-#: src/accounting/journal_entry/forms/line_item.py:135
+#: src/accounting/journal_entry/forms/line_item.py:134
 msgid "The account must not be changed when there is offset."
 msgstr "抵銷過不可變更科目。"
 
-#: src/accounting/journal_entry/forms/line_item.py:151
+#: src/accounting/journal_entry/forms/line_item.py:150
 msgid "A payable line item cannot start from debit."
 msgstr "不可由借方新建應付款。"
 
-#: src/accounting/journal_entry/forms/line_item.py:167
+#: src/accounting/journal_entry/forms/line_item.py:166
 msgid "A receivable line item cannot start from credit."
 msgstr "不可由貸方新建應收款。"
 
-#: src/accounting/journal_entry/forms/line_item.py:178
+#: src/accounting/journal_entry/forms/line_item.py:177
-#: src/accounting/static/js/journal-entry-line-item-editor.js:436
+#: src/accounting/static/js/journal-entry-line-item-editor.js:440
 msgid "Please fill in a positive amount."
 msgstr "金額請填正數。"
 
-#: src/accounting/journal_entry/forms/line_item.py:220
+#: src/accounting/journal_entry/forms/line_item.py:219
-#: src/accounting/static/js/journal-entry-line-item-editor.js:442
+#: src/accounting/static/js/journal-entry-line-item-editor.js:446
 #, python-format
 msgid ""
 "The amount must not exceed the net balance %(balance)s of the original "
 "line item."
 msgstr "金額不可超過原始分錄凈額 %(balance)s 。"
 
-#: src/accounting/journal_entry/forms/line_item.py:241
+#: src/accounting/journal_entry/forms/line_item.py:239
-#: src/accounting/static/js/journal-entry-line-item-editor.js:450
+#: src/accounting/static/js/journal-entry-line-item-editor.js:454
 #, python-format
 msgid "The amount must not be less than the offset total %(total)s."
 msgstr "金額不可低於抵銷總額 %(total)s 。"
 
-#: src/accounting/journal_entry/forms/line_item.py:426
+#: src/accounting/journal_entry/forms/line_item.py:424
 msgid "This account is not for debit line items."
 msgstr "科目不是借方科目。"
 
-#: src/accounting/journal_entry/forms/line_item.py:478
+#: src/accounting/journal_entry/forms/line_item.py:476
 msgid "This account is not for credit line items."
 msgstr "科目不是貸方科目。"
 
@@ -417,15 +417,15 @@ msgstr "去年"
 msgid "All"
 msgstr "全部"
 
-#: src/accounting/report/reports/balance_sheet.py:423
+#: src/accounting/report/reports/balance_sheet.py:425
-#: src/accounting/report/reports/balance_sheet.py:427
+#: src/accounting/report/reports/balance_sheet.py:429
-#: src/accounting/report/reports/balance_sheet.py:439
 #: src/accounting/report/reports/balance_sheet.py:441
-#: src/accounting/report/reports/income_expenses.py:189
+#: src/accounting/report/reports/balance_sheet.py:443
-#: src/accounting/report/reports/income_expenses.py:423
+#: src/accounting/report/reports/income_expenses.py:187
-#: src/accounting/report/reports/income_statement.py:300
+#: src/accounting/report/reports/income_expenses.py:420
-#: src/accounting/report/reports/ledger.py:171
+#: src/accounting/report/reports/income_statement.py:301
-#: src/accounting/report/reports/ledger.py:380
+#: src/accounting/report/reports/ledger.py:168
+#: src/accounting/report/reports/ledger.py:376
 #: src/accounting/report/reports/trial_balance.py:229
 #: src/accounting/templates/accounting/journal-entry/disbursement/detail.html:43
 #: src/accounting/templates/accounting/journal-entry/include/form-debit-credit.html:38
@@ -445,14 +445,14 @@ msgstr "全部"
 msgid "Total"
 msgstr "合計"
 
-#: src/accounting/report/reports/income_expenses.py:136
+#: src/accounting/report/reports/income_expenses.py:134
-#: src/accounting/report/reports/ledger.py:132
+#: src/accounting/report/reports/ledger.py:129
 msgid "Brought forward"
 msgstr "前期轉入"
 
-#: src/accounting/report/reports/income_expenses.py:407
+#: src/accounting/report/reports/income_expenses.py:404
 #: src/accounting/report/reports/journal.py:158
-#: src/accounting/report/reports/ledger.py:366
+#: src/accounting/report/reports/ledger.py:362
 #: src/accounting/report/reports/unapplied.py:148
 #: src/accounting/report/reports/unmatched.py:158
 #: src/accounting/templates/accounting/journal-entry/include/form.html:50
@@ -466,13 +466,13 @@ msgstr "前期轉入"
 msgid "Date"
 msgstr "日期"
 
-#: src/accounting/report/reports/income_expenses.py:407
+#: src/accounting/report/reports/income_expenses.py:404
 #: src/accounting/report/reports/journal.py:159
 #: src/accounting/report/reports/trial_balance.py:225
 #: src/accounting/report/reports/unapplied_accounts.py:122
 #: src/accounting/report/reports/unmatched_accounts.py:122
-#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:57
+#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:58
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:39
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:40
 #: src/accounting/templates/accounting/report/include/toolbar-buttons.html:90
 #: src/accounting/templates/accounting/report/income-expenses.html:56
 #: src/accounting/templates/accounting/report/journal.html:55
@@ -481,13 +481,13 @@ msgstr "日期"
 msgid "Account"
 msgstr "科目"
 
-#: src/accounting/report/reports/income_expenses.py:408
+#: src/accounting/report/reports/income_expenses.py:405
 #: src/accounting/report/reports/journal.py:159
-#: src/accounting/report/reports/ledger.py:366
+#: src/accounting/report/reports/ledger.py:362
 #: src/accounting/report/reports/unapplied.py:149
 #: src/accounting/report/reports/unmatched.py:159
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:28
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:29
-#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:49
+#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:50
 #: src/accounting/templates/accounting/report/income-expenses.html:57
 #: src/accounting/templates/accounting/report/journal.html:56
 #: src/accounting/templates/accounting/report/ledger.html:56
@@ -497,18 +497,18 @@ msgstr "科目"
 msgid "Description"
 msgstr "摘要"
 
-#: src/accounting/report/reports/income_expenses.py:408
+#: src/accounting/report/reports/income_expenses.py:405
 #: src/accounting/templates/accounting/report/income-expenses.html:58
 msgid "Income"
 msgstr "收入"
 
-#: src/accounting/report/reports/income_expenses.py:409
+#: src/accounting/report/reports/income_expenses.py:406
 #: src/accounting/templates/accounting/report/income-expenses.html:59
 msgid "Expense"
 msgstr "支出"
 
-#: src/accounting/report/reports/income_expenses.py:409
+#: src/accounting/report/reports/income_expenses.py:406
-#: src/accounting/report/reports/ledger.py:368
+#: src/accounting/report/reports/ledger.py:364
 #: src/accounting/report/reports/unmatched.py:160
 #: src/accounting/templates/accounting/report/income-expenses.html:60
 #: src/accounting/templates/accounting/report/ledger.html:60
@@ -516,41 +516,41 @@ msgstr "支出"
 msgid "Balance"
 msgstr "餘額"
 
-#: src/accounting/report/reports/income_expenses.py:410
+#: src/accounting/report/reports/income_expenses.py:407
 #: src/accounting/report/reports/journal.py:161
-#: src/accounting/report/reports/ledger.py:368
+#: src/accounting/report/reports/ledger.py:364
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:178
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:179
 #: src/accounting/templates/accounting/journal-entry/include/form.html:73
 msgid "Note"
 msgstr "備註"
 
-#: src/accounting/report/reports/income_statement.py:228
+#: src/accounting/report/reports/income_statement.py:229
-msgid "total operating revenue"
+msgid "Total Operating Revenue"
 msgstr "營業收入總額"
 
-#: src/accounting/report/reports/income_statement.py:229
+#: src/accounting/report/reports/income_statement.py:230
-msgid "gross income"
+msgid "Gross Income"
 msgstr "營業毛利"
 
-#: src/accounting/report/reports/income_statement.py:230
+#: src/accounting/report/reports/income_statement.py:231
-msgid "operating income"
+msgid "Operating Income"
 msgstr "營業淨利"
 
-#: src/accounting/report/reports/income_statement.py:231
+#: src/accounting/report/reports/income_statement.py:232
-msgid "before tax income"
+msgid "Before Tax Income"
 msgstr "稅前淨利"
 
-#: src/accounting/report/reports/income_statement.py:232
+#: src/accounting/report/reports/income_statement.py:233
-msgid "after tax income"
+msgid "After Tax Income"
 msgstr "稅後淨利"
 
-#: src/accounting/report/reports/income_statement.py:233
+#: src/accounting/report/reports/income_statement.py:234
-msgid "net income or loss for current period"
+msgid "Net Income or Loss for Current Period"
 msgstr "本期損益"
 
-#: src/accounting/report/reports/income_statement.py:301
+#: src/accounting/report/reports/income_statement.py:302
 #: src/accounting/report/reports/unapplied.py:149
-#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:65
+#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:66
 #: src/accounting/templates/accounting/report/income-statement.html:61
 #: src/accounting/templates/accounting/report/unapplied.html:54
 msgid "Amount"
@@ -567,7 +567,7 @@ msgid "Currency"
 msgstr "貨幣"
 
 #: src/accounting/report/reports/journal.py:160
-#: src/accounting/report/reports/ledger.py:367
+#: src/accounting/report/reports/ledger.py:363
 #: src/accounting/report/reports/trial_balance.py:225
 #: src/accounting/report/reports/unmatched.py:159
 #: src/accounting/templates/accounting/journal-entry/transfer/detail.html:33
@@ -581,7 +581,7 @@ msgid "Debit"
 msgstr "借方"
 
 #: src/accounting/report/reports/journal.py:160
-#: src/accounting/report/reports/ledger.py:367
+#: src/accounting/report/reports/ledger.py:363
 #: src/accounting/report/reports/trial_balance.py:226
 #: src/accounting/report/reports/unmatched.py:160
 #: src/accounting/templates/accounting/journal-entry/transfer/detail.html:49
@@ -614,16 +614,16 @@ msgstr "淨額"
 msgid "Count"
 msgstr "數量"
 
-#: src/accounting/report/utils/offset_matcher.py:163
+#: src/accounting/report/utils/offset_matcher.py:161
 msgid "There is no unmatched offset."
 msgstr "沒有遺漏的抵銷分錄"
 
-#: src/accounting/report/utils/offset_matcher.py:167
+#: src/accounting/report/utils/offset_matcher.py:165
 #, python-format
 msgid "%(total)s unmatched offsets without original items."
 msgstr "%(total)s 筆遺漏的抵銷分錄無法自動抵銷。"
 
-#: src/accounting/report/utils/offset_matcher.py:172
+#: src/accounting/report/utils/offset_matcher.py:170
 #, python-format
 msgid ""
 "%(matches)s unmatched offsets out of %(total)s can match with their "
@@ -752,7 +752,7 @@ msgid "December"
 msgstr "十二月"
 
 #: src/accounting/static/js/journal-entry-form.js:1085
-#: src/accounting/static/js/journal-entry-line-item-editor.js:430
+#: src/accounting/static/js/journal-entry-line-item-editor.js:434
 msgid "Please fill in the amount."
 msgstr "請填上金額。"
 
@@ -833,12 +833,12 @@ msgstr "確認刪除科目"
 #: src/accounting/templates/accounting/account/include/form.html:91
 #: src/accounting/templates/accounting/currency/detail.html:73
 #: src/accounting/templates/accounting/journal-entry/include/account-selector-modal.html:27
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:30
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:31
 #: src/accounting/templates/accounting/journal-entry/include/detail.html:78
-#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:28
+#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:29
 #: src/accounting/templates/accounting/journal-entry/include/original-line-item-selector-modal.html:27
 #: src/accounting/templates/accounting/option/include/recurring-account-selector-modal.html:27
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:28
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:29
 #: src/accounting/templates/accounting/report/include/period-chooser.html:27
 #: src/accounting/templates/accounting/report/include/search-modal.html:28
 #: src/accounting/templates/accounting/report/unmatched.html:58
@@ -853,11 +853,11 @@ msgstr "你確定要刪掉這個科目嗎？"
 #: src/accounting/templates/accounting/account/include/form.html:112
 #: src/accounting/templates/accounting/currency/detail.html:79
 #: src/accounting/templates/accounting/journal-entry/include/account-selector-modal.html:49
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:194
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:195
 #: src/accounting/templates/accounting/journal-entry/include/detail.html:84
-#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:70
+#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:71
 #: src/accounting/templates/accounting/option/include/recurring-account-selector-modal.html:48
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:65
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:66
 #: src/accounting/templates/accounting/report/include/search-modal.html:37
 #: src/accounting/templates/accounting/report/unmatched.html:74
 msgid "Cancel"
@@ -942,12 +942,12 @@ msgstr "%(base)s下的科目"
 #: src/accounting/templates/accounting/account/include/form.html:75
 #: src/accounting/templates/accounting/account/order.html:62
 #: src/accounting/templates/accounting/currency/include/form.html:57
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:195
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:196
 #: src/accounting/templates/accounting/journal-entry/include/form.html:80
-#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:71
+#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:72
 #: src/accounting/templates/accounting/journal-entry/order.html:61
 #: src/accounting/templates/accounting/option/form.html:80
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:66
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:67
 msgid "Save"
 msgstr "儲存"
 
@@ -1008,7 +1008,7 @@ msgid "Code"
 msgstr "代碼"
 
 #: src/accounting/templates/accounting/currency/include/form.html:50
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:33
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:34
 msgid "Name"
 msgstr "名稱"
 
@@ -1077,53 +1077,53 @@ msgstr "選擇科目"
 msgid "More…"
 msgstr "更多…"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:36
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:37
 msgid "Offset..."
 msgstr "抵銷…"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:44
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:45
 msgid "General"
 msgstr "一般"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:49
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:50
 msgid "Travel"
 msgstr "差旅"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:54
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:55
 msgid "Bus"
 msgstr "公車"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:59
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:60
 msgid "Recurring"
 msgstr "常用"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:64
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:65
 msgid "Annotation"
 msgstr "註記"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:73
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:74
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:90
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:91
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:125
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:126
 msgid "Tag"
 msgstr "標籤"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:105
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:106
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:146
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:147
 #: src/accounting/templates/accounting/report/include/period-chooser.html:129
 msgid "From"
 msgstr "從"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:114
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:115
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:151
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:152
 #: src/accounting/templates/accounting/report/include/period-chooser.html:135
 msgid "To"
 msgstr "至"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:130
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:131
 msgid "Route"
 msgstr "路線"
 
-#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:172
+#: src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html:173
 msgid "The Number of Items"
 msgstr "數量"
 
@@ -1155,11 +1155,11 @@ msgstr "確認刪除傳票"
 msgid "Do you really want to delete this journal entry?"
 msgstr "你確定要刪掉這張傳票嗎？"
 
-#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:27
+#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:28
 msgid "Line Item Content"
 msgstr "分錄內容"
 
-#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:34
+#: src/accounting/templates/accounting/journal-entry/include/journal-entry-line-item-editor-modal.html:35
 msgid "Original Line Item"
 msgstr "原始分錄"
 
@@ -1215,43 +1215,43 @@ msgstr "常用支出"
 msgid "Recurring Income"
 msgstr "常用收入"
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:47
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:48
 msgid "Description Template"
 msgstr "摘要範本"
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:52
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:53
 msgid "Available template variables:"
 msgstr "範本變數說明："
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:54
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:55
 msgid "This month, as a number."
 msgstr "這個月的數字。"
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:55
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:56
 msgid "This month, in its name."
 msgstr "這個月的名稱。"
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:56
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:57
 msgid "Last month, as a number."
 msgstr "上個月的數字。"
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:57
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:58
 msgid "Last month, in its name."
 msgstr "上個月的名稱。"
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:58
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:59
 msgid "The previous bimonthly period, as numbers."
 msgstr "前個雙月期的數字。"
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:59
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:60
 msgid "The previous bimonthly period, as their names."
 msgstr "前個雙月期的名稱。"
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:61
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:62
 msgid "Example:"
 msgstr "範例："
 
-#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:61
+#: src/accounting/templates/accounting/option/include/recurring-item-editor-modal.html:62
 msgid "Water bill for {last_bimonthly_name}"
 msgstr "水費{last_bimonthly_number}月"
 
@@ -1318,13 +1318,13 @@ msgstr "%(period)s%(currency)s試算表"
 
 #: src/accounting/templates/accounting/report/unapplied-accounts.html:29
 #: src/accounting/templates/accounting/report/unapplied-accounts.html:49
-msgid "Accounts with Unapplied Items"
+msgid "Accounts With Unapplied Items"
 msgstr "含未抵銷項目的科目"
 
 #: src/accounting/templates/accounting/report/unapplied-accounts.html:29
 #: src/accounting/templates/accounting/report/unapplied-accounts.html:51
 #, python-format
-msgid "Accounts with Unapplied Items in %(currency)s"
+msgid "Accounts With Unapplied Items in %(currency)s"
 msgstr "%(currency)s含未抵銷項目的科目"
 
 #: src/accounting/templates/accounting/report/unapplied.html:29
@@ -1339,13 +1339,13 @@ msgstr "%(currency)s%(account)s未抵銷項目"
 
 #: src/accounting/templates/accounting/report/unmatched-accounts.html:29
 #: src/accounting/templates/accounting/report/unmatched-accounts.html:49
-msgid "Accounts with Unmatched Offsets"
+msgid "Accounts With Unmatched Offsets"
 msgstr "含遺漏抵銷項目的科目"
 
 #: src/accounting/templates/accounting/report/unmatched-accounts.html:29
 #: src/accounting/templates/accounting/report/unmatched-accounts.html:51
 #, python-format
-msgid "Accounts with Unmatched Offsets in %(currency)s"
+msgid "Accounts With Unmatched Offsets in %(currency)s"
 msgstr "%(currency)s含遺漏抵銷項目的科目"
 
 #: src/accounting/templates/accounting/report/unmatched.html:29
@@ -1415,12 +1415,12 @@ msgstr "下載"
 msgid "current assets and liabilities"
 msgstr "流動資產與負債"
 
-#: src/accounting/utils/pagination.py:206
+#: src/accounting/utils/pagination.py:207
 msgctxt "Pagination|"
 msgid "Previous"
 msgstr "上一頁"
 
-#: src/accounting/utils/pagination.py:255
+#: src/accounting/utils/pagination.py:256
 msgctxt "Pagination|"
 msgid "Next"
 msgstr "下一頁"

src/accounting/utils/title_case.py

@@ -0,0 +1,59 @@
+# The Mia! Accounting Project.
+# Author: imacat@mail.imacat.idv.tw (imacat), 2023/7/29
+
+#  Copyright (c) 2023 imacat.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""The title case capitalization for the base account titles.
+This follows the APA style title case capitalization.  See
+https://apastyle.apa.org/style-grammar-guidelines/capitalization/title-case .
+
+This module should not import any other module from the application.
+
+"""
+import re
+
+CONJUNCTIONS: set[str] = {"and", "as", "but", "for", "if", "nor", "or", "so",
+                          "yet"}
+"""Short conjunctions."""
+ARTICLES: set[str] = {"a", "an", "the"}
+"""Articles."""
+PREPOSITIONS: set[str] = {"as", "at", "by", "for", "in", "of", "on", "per",
+                          "to", "up", "via"}
+"""Short prepositions."""
+MINOR_WORDS: set[str] \
+    = CONJUNCTIONS.copy().union(ARTICLES).union(PREPOSITIONS)
+"""Minor words that should be in lowercase."""
+# Excludes "by" as in "1223 by-products"
+MINOR_WORDS.remove("by")
+
+
+def title_case(s: str) -> str:
+    """Capitalize a title string for the base account titles.  Do not use it
+    in other places.  This excludes "by" as in "1223 by-products".
+
+    :param s: The title string.
+    :return: The capitalized title string.
+    """
+    return re.sub(r"\w+", __cap_word, s)
+
+
+def __cap_word(m: re.Match) -> str:
+    """Capitalize a matched title word.
+
+    :param m: The matched title word.
+    :return: The capitalized title word.
+    """
+    if m.group(0).lower() in MINOR_WORDS:
+        return m.group(0)
+    return m.group(0).title()

tests/test_commands.py

@@ -18,6 +18,7 @@
 
 """
 import csv
+import re
 import unittest
 from typing import Any
 
@@ -27,6 +28,7 @@ from flask import Flask
 from flask.testing import FlaskCliRunner
 from sqlalchemy.sql.ddl import DropTable
 
+from accounting.utils.title_case import MINOR_WORDS
 from test_site import db
 from testlib import create_test_app
 
@@ -95,7 +97,9 @@ class ConsoleCommandTestCase(unittest.TestCase):
         self.assertEqual(len(accounts), len(data))
         for account in accounts:
             self.assertIn(account.code, data)
-            self.assertEqual(account.title_l10n, data[account.code]["title"])
+            self.assertEqual(account.title_l10n.lower(),
+                             data[account.code]["title"].lower())
+            self.__test_title_case(account.title_l10n)
             l10n: dict[str, str] = {x.locale: x.title for x in account.l10n}
             self.assertEqual(len(l10n), len(data[account.code]["l10n"]))
             for locale in l10n:
@@ -103,6 +107,21 @@ class ConsoleCommandTestCase(unittest.TestCase):
                 self.assertEqual(l10n[locale],
                                  data[account.code]["l10n"][locale])
 
+    def __test_title_case(self, s: str) -> None:
+        """Tests the case of a base account title.
+
+        :param s: The base account title.
+        :return: None.
+        """
+        self.assertTrue(s[0].isupper(), s)
+        for word in re.findall(r"\w+", s):
+            if len(word) >= 4:
+                self.assertTrue(word.istitle(), s)
+            elif word in MINOR_WORDS:
+                self.assertTrue(word.islower(), s)
+            else:
+                self.assertTrue(word.istitle(), s)
+
     def __test_account_data(self) -> None:
         """Tests the account data.