diff --git a/accounting/locale/zh_Hant/LC_MESSAGES/django.po b/accounting/locale/zh_Hant/LC_MESSAGES/django.po index 765d321..b4c2980 100644 --- a/accounting/locale/zh_Hant/LC_MESSAGES/django.po +++ b/accounting/locale/zh_Hant/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: mia-js 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-06 23:47+0800\n" -"PO-Revision-Date: 2020-08-06 23:48+0800\n" +"POT-Creation-Date: 2020-08-06 23:59+0800\n" +"PO-Revision-Date: 2020-08-07 00:01+0800\n" "Last-Translator: imacat \n" "Language-Team: Traditional Chinese \n" "Language: Traditional Chinese\n" @@ -148,7 +148,6 @@ msgstr "資產負債表" #: accounting/templates/accounting/journal.html:62 #: accounting/templates/accounting/ledger.html:75 #: accounting/templates/accounting/trial-balance.html:62 -msgctxt "Period|" msgid "Period" msgstr "期間" @@ -522,7 +521,6 @@ msgstr "現金支出傳票" #: accounting/templates/accounting/transactions/sort.html:43 #: accounting/templates/accounting/transactions/transfer/form.html:44 #: accounting/templates/accounting/transactions/transfer/view.html:72 -msgctxt "Navigation|" msgid "Back" msgstr "回上頁" @@ -576,7 +574,6 @@ msgstr "您真的要刪掉這張現金支出傳票嗎?" #: accounting/templates/accounting/transactions/expense/view.html:76 #: accounting/templates/accounting/transactions/income/view.html:76 #: accounting/templates/accounting/transactions/transfer/view.html:76 -msgctxt "Navigation|" msgid "Edit" msgstr "編輯" @@ -601,7 +598,6 @@ msgstr "當天沒有其他會計傳票。" #: accounting/templates/accounting/transactions/transfer/view.html:86 #: accounting/templates/accounting/transactions/transfer/view.html:97 #: accounting/templates/accounting/transactions/transfer/view.html:102 -msgctxt "Navigation|" msgid "Sort" msgstr "排序" @@ -609,14 +605,12 @@ msgstr "排序" #: accounting/templates/accounting/transactions/expense/view.html:111 #: accounting/templates/accounting/transactions/income/view.html:91 #: accounting/templates/accounting/transactions/income/view.html:111 -msgctxt "Navigation|" msgid "To Transfer" msgstr "改轉帳" #: accounting/templates/accounting/transactions/expense/view.html:117 #: accounting/templates/accounting/transactions/income/view.html:117 #: accounting/templates/accounting/transactions/transfer/view.html:109 -msgctxt "Navigation|" msgid "Delete" msgstr "刪除" diff --git a/accounting/templates/accounting/balance-sheet.html b/accounting/templates/accounting/balance-sheet.html index b818db6..a98d6bb 100644 --- a/accounting/templates/accounting/balance-sheet.html +++ b/accounting/templates/accounting/balance-sheet.html @@ -59,7 +59,7 @@ First written: 2020/7/20 diff --git a/accounting/templates/accounting/cash.html b/accounting/templates/accounting/cash.html index e6075b5..5befbf5 100644 --- a/accounting/templates/accounting/cash.html +++ b/accounting/templates/accounting/cash.html @@ -79,7 +79,7 @@ First written: 2020/7/1 diff --git a/accounting/templates/accounting/income-statement.html b/accounting/templates/accounting/income-statement.html index a2cb738..a4fefa9 100644 --- a/accounting/templates/accounting/income-statement.html +++ b/accounting/templates/accounting/income-statement.html @@ -59,7 +59,7 @@ First written: 2020/7/19 diff --git a/accounting/templates/accounting/journal.html b/accounting/templates/accounting/journal.html index 5243ac9..6bda40c 100644 --- a/accounting/templates/accounting/journal.html +++ b/accounting/templates/accounting/journal.html @@ -59,7 +59,7 @@ First written: 2020/7/17 diff --git a/accounting/templates/accounting/ledger.html b/accounting/templates/accounting/ledger.html index db5dff0..31fd812 100644 --- a/accounting/templates/accounting/ledger.html +++ b/accounting/templates/accounting/ledger.html @@ -72,7 +72,7 @@ First written: 2020/7/16 diff --git a/accounting/templates/accounting/transactions/expense/form.html b/accounting/templates/accounting/transactions/expense/form.html index 86bf473..0ff54f5 100644 --- a/accounting/templates/accounting/transactions/expense/form.html +++ b/accounting/templates/accounting/transactions/expense/form.html @@ -41,7 +41,7 @@ First written: 2020/7/23 diff --git a/accounting/templates/accounting/transactions/expense/view.html b/accounting/templates/accounting/transactions/expense/view.html index badf916..7c9a357 100644 --- a/accounting/templates/accounting/transactions/expense/view.html +++ b/accounting/templates/accounting/transactions/expense/view.html @@ -69,26 +69,26 @@ First written: 2020/7/23 diff --git a/accounting/templates/accounting/transactions/income/form.html b/accounting/templates/accounting/transactions/income/form.html index 3574b1c..59a0ec0 100644 --- a/accounting/templates/accounting/transactions/income/form.html +++ b/accounting/templates/accounting/transactions/income/form.html @@ -41,7 +41,7 @@ First written: 2020/7/23 diff --git a/accounting/templates/accounting/transactions/income/view.html b/accounting/templates/accounting/transactions/income/view.html index c85bc07..1991c7d 100644 --- a/accounting/templates/accounting/transactions/income/view.html +++ b/accounting/templates/accounting/transactions/income/view.html @@ -69,26 +69,26 @@ First written: 2020/7/23 diff --git a/accounting/templates/accounting/transactions/sort.html b/accounting/templates/accounting/transactions/sort.html index 7b03a44..07afacf 100644 --- a/accounting/templates/accounting/transactions/sort.html +++ b/accounting/templates/accounting/transactions/sort.html @@ -40,7 +40,7 @@ First written: 2020/8/6 diff --git a/accounting/templates/accounting/transactions/transfer/form.html b/accounting/templates/accounting/transactions/transfer/form.html index fd25e73..a208c42 100644 --- a/accounting/templates/accounting/transactions/transfer/form.html +++ b/accounting/templates/accounting/transactions/transfer/form.html @@ -41,7 +41,7 @@ First written: 2020/7/23 diff --git a/accounting/templates/accounting/transactions/transfer/view.html b/accounting/templates/accounting/transactions/transfer/view.html index d31045c..f66d8e1 100644 --- a/accounting/templates/accounting/transactions/transfer/view.html +++ b/accounting/templates/accounting/transactions/transfer/view.html @@ -69,21 +69,21 @@ First written: 2020/7/23
- {% trans "Back" context "Navigation|" as text %}{{ text|force_escape }} + {{ _("Back")|force_escape }} - {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }} + {{ _("Edit")|force_escape }} {% if not item.has_many_same_day %} {% else %} - {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }} + {{ _("Sort")|force_escape }} {% endif %}
@@ -94,19 +94,19 @@ First written: 2020/7/23 {% if not item.has_many_same_day %} - {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }} + {{ _("Sort")|force_escape }} {% else %} - {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }} + {{ _("Sort")|force_escape }} {% endif %}
diff --git a/accounting/templates/accounting/trial-balance.html b/accounting/templates/accounting/trial-balance.html index 21b371a..dcfa889 100644 --- a/accounting/templates/accounting/trial-balance.html +++ b/accounting/templates/accounting/trial-balance.html @@ -59,7 +59,7 @@ First written: 2020/7/19 diff --git a/mia_core/locale/zh_Hant/LC_MESSAGES/django.po b/mia_core/locale/zh_Hant/LC_MESSAGES/django.po index 6c7aa71..e7e53d3 100644 --- a/mia_core/locale/zh_Hant/LC_MESSAGES/django.po +++ b/mia_core/locale/zh_Hant/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: mia 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-06 23:47+0800\n" -"PO-Revision-Date: 2020-08-06 01:46+0800\n" +"POT-Creation-Date: 2020-08-06 23:59+0800\n" +"PO-Revision-Date: 2020-08-07 00:01+0800\n" "Last-Translator: imacat \n" "Language-Team: Traditional Chinese \n" "Language: Traditional Chinese\n" @@ -37,112 +37,81 @@ msgid "All Time" msgstr "全部" #: mia_core/period.py:583 mia_core/period.py:616 +#: mia_core/templates/mia_core/include/period-chooser.html:60 #: mia_core/templatetags/mia_core.py:213 msgid "This Month" msgstr "這個月" -#: mia_core/period.py:624 mia_core/templatetags/mia_core.py:220 +#: mia_core/period.py:624 +#: mia_core/templates/mia_core/include/period-chooser.html:63 +#: mia_core/templatetags/mia_core.py:220 msgid "Last Month" msgstr "上個月" #: mia_core/period.py:639 +#: mia_core/templates/mia_core/include/period-chooser.html:76 msgid "This Year" msgstr "今年" #: mia_core/period.py:641 +#: mia_core/templates/mia_core/include/period-chooser.html:79 msgid "Last Year" msgstr "去年" -#: mia_core/period.py:656 mia_core/templatetags/mia_core.py:193 +#: mia_core/period.py:656 +#: mia_core/templates/mia_core/include/period-chooser.html:95 +#: mia_core/templatetags/mia_core.py:193 msgid "Today" msgstr "今天" -#: mia_core/period.py:658 mia_core/templatetags/mia_core.py:195 +#: mia_core/period.py:658 +#: mia_core/templates/mia_core/include/period-chooser.html:98 +#: mia_core/templatetags/mia_core.py:195 msgid "Yesterday" msgstr "昨天" #: mia_core/templates/mia_core/include/period-chooser.html:37 -msgctxt "Period|" msgid "Choosing Your Period" msgstr "選擇時間區間" -#: mia_core/templates/mia_core/include/period-chooser.html:46 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:45 msgid "Month" msgstr "月" -#: mia_core/templates/mia_core/include/period-chooser.html:49 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:48 msgid "Year" msgstr "年" -#: mia_core/templates/mia_core/include/period-chooser.html:52 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:51 msgid "Day" msgstr "日" -#: mia_core/templates/mia_core/include/period-chooser.html:55 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:54 msgid "Custom" msgstr "自訂" -#: mia_core/templates/mia_core/include/period-chooser.html:61 -msgctxt "Period|" -msgid "This Month" -msgstr "這個月" - -#: mia_core/templates/mia_core/include/period-chooser.html:64 -msgctxt "Period|" -msgid "Last Month" -msgstr "上個月" - -#: mia_core/templates/mia_core/include/period-chooser.html:67 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:66 msgid "Since Last Month" msgstr "上個月至今" -#: mia_core/templates/mia_core/include/period-chooser.html:77 -msgctxt "Period|" -msgid "This Year" -msgstr "今年" - -#: mia_core/templates/mia_core/include/period-chooser.html:80 -msgctxt "Period|" -msgid "Last Year" -msgstr "去年" - -#: mia_core/templates/mia_core/include/period-chooser.html:96 -msgctxt "Period|" -msgid "Today" -msgstr "今天" - -#: mia_core/templates/mia_core/include/period-chooser.html:99 -msgctxt "Period|" -msgid "Yesterday" -msgstr "昨天" - -#: mia_core/templates/mia_core/include/period-chooser.html:104 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:103 msgid "Date:" msgstr "日期:" -#: mia_core/templates/mia_core/include/period-chooser.html:108 -#: mia_core/templates/mia_core/include/period-chooser.html:126 +#: mia_core/templates/mia_core/include/period-chooser.html:107 +#: mia_core/templates/mia_core/include/period-chooser.html:125 msgid "Confirm" msgstr "確定" -#: mia_core/templates/mia_core/include/period-chooser.html:114 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:113 msgid "All" msgstr "全部" -#: mia_core/templates/mia_core/include/period-chooser.html:118 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:117 msgid "From:" msgstr "從:" -#: mia_core/templates/mia_core/include/period-chooser.html:122 -msgctxt "Period|" +#: mia_core/templates/mia_core/include/period-chooser.html:121 msgid "To:" msgstr "到:" diff --git a/mia_core/templates/mia_core/include/period-chooser.html b/mia_core/templates/mia_core/include/period-chooser.html index 782dcc7..9b90368 100644 --- a/mia_core/templates/mia_core/include/period-chooser.html +++ b/mia_core/templates/mia_core/include/period-chooser.html @@ -34,8 +34,7 @@ First written: 2020/7/10 @@ -43,28 +42,28 @@ First written: 2020/7/10