From fbab5e64c42c9104d3b02cab2cc20c6db7d4cbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Mon, 10 Aug 2020 02:44:38 +0800 Subject: [PATCH] Revised the text messages in the user list and user form in the Mia core application. --- .../locale/zh_Hant/LC_MESSAGES/django.po | 2 +- mia_core/locale/zh_Hant/LC_MESSAGES/django.po | 228 ++++++++---------- mia_core/templates/mia_core/user_form.html | 2 +- mia_core/templates/mia_core/user_list.html | 2 +- 4 files changed, 105 insertions(+), 129 deletions(-) diff --git a/accounting/locale/zh_Hant/LC_MESSAGES/django.po b/accounting/locale/zh_Hant/LC_MESSAGES/django.po index 63256fc..499ede7 100644 --- a/accounting/locale/zh_Hant/LC_MESSAGES/django.po +++ b/accounting/locale/zh_Hant/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mia-js 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-09 23:28+0800\n" +"POT-Creation-Date: 2020-08-10 02:42+0800\n" "PO-Revision-Date: 2020-08-09 22:05+0800\n" "Last-Translator: imacat \n" "Language-Team: Traditional Chinese \n" diff --git a/mia_core/locale/zh_Hant/LC_MESSAGES/django.po b/mia_core/locale/zh_Hant/LC_MESSAGES/django.po index 96c5cb1..98a775e 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-09 23:28+0800\n" -"PO-Revision-Date: 2020-08-09 23:29+0800\n" +"POT-Creation-Date: 2020-08-10 02:42+0800\n" +"PO-Revision-Date: 2020-08-10 02:44+0800\n" "Last-Translator: imacat \n" "Language-Team: Traditional Chinese \n" "Language: Traditional Chinese\n" @@ -52,7 +52,7 @@ msgstr "請再次確認密碼。" msgid "The two passwords do not match." msgstr "兩次密碼不符，請重新輸入。" -#: mia_core/forms.py:158 mia_core/templates/mia_core/user_form.html:84 +#: mia_core/forms.py:158 mia_core/templates/mia_core/user_form.html:85 msgid "You cannot disable your own account." msgstr "不能停用自己的帳號。" @@ -140,7 +140,7 @@ msgstr "日期：" #: mia_core/templates/mia_core/include/period-chooser.html:107 #: mia_core/templates/mia_core/include/period-chooser.html:125 -#: mia_core/templates/mia_core/user_detail.html:58 +#: mia_core/templates/mia_core/user_detail.html:69 msgid "Confirm" msgstr "確定" @@ -156,154 +156,130 @@ msgstr "從：" msgid "To:" msgstr "到：" -#: mia_core/templates/mia_core/my-account_detail.html:36 -#: mia_core/templates/mia_core/user_detail.html:73 +#: mia_core/templates/mia_core/user_detail.html:39 +#: mia_core/templates/mia_core/user_detail.html:84 msgid "Settings" msgstr "設定" -#: mia_core/templates/mia_core/my-account_detail.html:41 -#: mia_core/templates/mia_core/user_detail.html:99 -msgid "Log in ID.:" -msgstr "登入帳號：" +#: mia_core/templates/mia_core/user_detail.html:46 +msgid "The account is not in use." +msgstr "帳號未使用。" -#: mia_core/templates/mia_core/my-account_detail.html:46 -#: mia_core/templates/mia_core/my-account_form.html:71 -#: mia_core/templates/mia_core/user_detail.html:104 -#: mia_core/templates/mia_core/user_form.html:74 -msgid "Name:" -msgstr "姓名：" +#: mia_core/templates/mia_core/user_detail.html:60 +msgid "User Deletion Confirmation" +msgstr "帳號刪除確認" -#: mia_core/templates/mia_core/my-account_detail.html:52 -#: mia_core/templates/mia_core/user_detail.html:110 -#: mia_core/templates/mia_core/user_form.html:88 -msgid "This account is disabled." -msgstr "帳號停用。" +#: mia_core/templates/mia_core/user_detail.html:65 +msgid "Do you really want to delete this user?" +msgstr "您真的要刪掉這個帳號嗎？" -#: mia_core/templates/mia_core/my-account_detail.html:58 -#: mia_core/templates/mia_core/user_detail.html:116 -msgid "This account is deleted." -msgstr "帳號已刪。" +#: mia_core/templates/mia_core/user_detail.html:70 +msgid "Cancel" +msgstr "取消" -#: mia_core/templates/mia_core/my-account_detail.html:64 -#: mia_core/templates/mia_core/user_detail.html:122 -msgid "This user has not logged in yet." -msgstr "使用者還沒登入過。" - -#: mia_core/templates/mia_core/my-account_detail.html:68 -#: mia_core/templates/mia_core/user_detail.html:126 -msgid "# of visits:" -msgstr "登入次數：" - -#: mia_core/templates/mia_core/my-account_detail.html:73 -#: mia_core/templates/mia_core/user_detail.html:131 -msgid "Last visit at:" -msgstr "上次登入時間：" - -#: mia_core/templates/mia_core/my-account_detail.html:78 -#: mia_core/templates/mia_core/user_detail.html:136 -msgid "IP:" -msgstr "IP:" - -#: mia_core/templates/mia_core/my-account_detail.html:83 -#: mia_core/templates/mia_core/user_detail.html:141 -msgid "Host:" -msgstr "主機名稱：" - -#: mia_core/templates/mia_core/my-account_detail.html:88 -#: mia_core/templates/mia_core/user_detail.html:146 -msgid "Country:" -msgstr "國家：" - -#: mia_core/templates/mia_core/my-account_detail.html:89 -#: mia_core/templates/mia_core/user_detail.html:147 -msgid "(Not Available)" -msgstr "（不可考）" - -#: mia_core/templates/mia_core/my-account_detail.html:94 -#: mia_core/templates/mia_core/user_detail.html:152 -msgid "Created at:" -msgstr "建檔時間：" - -#: mia_core/templates/mia_core/my-account_detail.html:99 -#: mia_core/templates/mia_core/user_detail.html:157 -msgid "Created by:" -msgstr "建檔人：" - -#: mia_core/templates/mia_core/my-account_detail.html:104 -#: mia_core/templates/mia_core/user_detail.html:162 -msgid "Updated at:" -msgstr "更新時間：" - -#: mia_core/templates/mia_core/my-account_detail.html:109 -#: mia_core/templates/mia_core/user_detail.html:167 -msgid "Updated by:" -msgstr "更新人：" - -#: mia_core/templates/mia_core/my-account_form.html:38 -#: mia_core/templates/mia_core/user_detail.html:69 +#: mia_core/templates/mia_core/user_detail.html:80 #: mia_core/templates/mia_core/user_form.html:41 msgid "Back" msgstr "回上頁" -#: mia_core/templates/mia_core/my-account_form.html:47 -#: mia_core/templates/mia_core/user_form.html:50 -msgid "Log in ID:" -msgstr "登入帳號：" - -#: mia_core/templates/mia_core/my-account_form.html:55 -#: mia_core/templates/mia_core/user_form.html:58 -msgid "Password:" -msgstr "密碼：" - -#: mia_core/templates/mia_core/my-account_form.html:63 -#: mia_core/templates/mia_core/user_form.html:66 -msgid "Confirm password:" -msgstr "確認密碼：" - -#: mia_core/templates/mia_core/my-account_form.html:81 -#: mia_core/templates/mia_core/user_form.html:97 -msgid "Submit" -msgstr "傳送" - -#: mia_core/templates/mia_core/user_detail.html:35 -msgid "The account is not in use." -msgstr "帳號未使用。" - -#: mia_core/templates/mia_core/user_detail.html:49 -msgid "User Deletion Confirmation" -msgstr "帳號刪除確認" - -#: mia_core/templates/mia_core/user_detail.html:54 -msgid "Do you really want to delete this user?" -msgstr "您真的要刪掉這個帳號嗎？" - -#: mia_core/templates/mia_core/user_detail.html:59 -msgid "Cancel" -msgstr "取消" - -#: mia_core/templates/mia_core/user_detail.html:76 mia_core/views.py:163 +#: mia_core/templates/mia_core/user_detail.html:87 mia_core/views.py:163 msgid "You cannot delete your own account." msgstr "不能刪除自己的帳號。" -#: mia_core/templates/mia_core/user_detail.html:78 -#: mia_core/templates/mia_core/user_detail.html:83 -#: mia_core/templates/mia_core/user_detail.html:88 -#: mia_core/templates/mia_core/user_detail.html:93 +#: mia_core/templates/mia_core/user_detail.html:89 +#: mia_core/templates/mia_core/user_detail.html:94 +#: mia_core/templates/mia_core/user_detail.html:99 +#: mia_core/templates/mia_core/user_detail.html:104 msgid "Delete" msgstr "刪除" -#: mia_core/templates/mia_core/user_detail.html:81 mia_core/views.py:166 +#: mia_core/templates/mia_core/user_detail.html:92 mia_core/views.py:166 msgid "You cannot delete this account because it is in use." msgstr "帳號使用中，不可刪除。" -#: mia_core/templates/mia_core/user_detail.html:86 mia_core/views.py:168 +#: mia_core/templates/mia_core/user_detail.html:97 mia_core/views.py:168 msgid "This account is already deleted." msgstr "帳號已刪除。" +#: mia_core/templates/mia_core/user_detail.html:111 +#: mia_core/templates/mia_core/user_form.html:50 +msgid "Log in ID.:" +msgstr "登入帳號：" + +#: mia_core/templates/mia_core/user_detail.html:116 +#: mia_core/templates/mia_core/user_form.html:74 +msgid "Name:" +msgstr "姓名：" + +#: mia_core/templates/mia_core/user_detail.html:122 +#: mia_core/templates/mia_core/user_form.html:89 +msgid "This account is disabled." +msgstr "帳號停用。" + +#: mia_core/templates/mia_core/user_detail.html:128 +msgid "This account is deleted." +msgstr "帳號已刪。" + +#: mia_core/templates/mia_core/user_detail.html:134 +msgid "This user has not logged in yet." +msgstr "使用者還沒登入過。" + +#: mia_core/templates/mia_core/user_detail.html:138 +msgid "# of visits:" +msgstr "登入次數：" + +#: mia_core/templates/mia_core/user_detail.html:143 +msgid "Last visit at:" +msgstr "上次登入時間：" + +#: mia_core/templates/mia_core/user_detail.html:148 +msgid "IP:" +msgstr "IP:" + +#: mia_core/templates/mia_core/user_detail.html:153 +msgid "Host:" +msgstr "主機名稱：" + +#: mia_core/templates/mia_core/user_detail.html:158 +msgid "Country:" +msgstr "國家：" + +#: mia_core/templates/mia_core/user_detail.html:159 +msgid "(Not Available)" +msgstr "（不可考）" + +#: mia_core/templates/mia_core/user_detail.html:164 +msgid "Created at:" +msgstr "建檔時間：" + +#: mia_core/templates/mia_core/user_detail.html:169 +msgid "Created by:" +msgstr "建檔人：" + +#: mia_core/templates/mia_core/user_detail.html:174 +msgid "Updated at:" +msgstr "更新時間：" + +#: mia_core/templates/mia_core/user_detail.html:179 +msgid "Updated by:" +msgstr "更新人：" + #: mia_core/templates/mia_core/user_form.html:31 msgid "Add a New Account" msgstr "建立帳號" +#: mia_core/templates/mia_core/user_form.html:58 +msgid "Password:" +msgstr "密碼：" + +#: mia_core/templates/mia_core/user_form.html:66 +msgid "Confirm password:" +msgstr "確認密碼：" + +#: mia_core/templates/mia_core/user_form.html:99 +msgid "Submit" +msgstr "傳送" + #: mia_core/templates/mia_core/user_list.html:27 msgid "Account Management" msgstr "帳號管理" @@ -313,7 +289,7 @@ msgid "New" msgstr "新增" #: mia_core/templates/mia_core/user_list.html:43 -msgid "Log in ID" +msgid "Log in ID." msgstr "登入帳號" #: mia_core/templates/mia_core/user_list.html:44 diff --git a/mia_core/templates/mia_core/user_form.html b/mia_core/templates/mia_core/user_form.html index 35acaad..178ccee 100644 --- a/mia_core/templates/mia_core/user_form.html +++ b/mia_core/templates/mia_core/user_form.html @@ -47,7 +47,7 @@ First written: 2020/8/9
- +
{{ form.login_id.errors.0 }}
diff --git a/mia_core/templates/mia_core/user_list.html b/mia_core/templates/mia_core/user_list.html index 1863790..c45c773 100644 --- a/mia_core/templates/mia_core/user_list.html +++ b/mia_core/templates/mia_core/user_list.html @@ -40,7 +40,7 @@ First written: 2020/8/9 - +
{{ _("Log in ID")|force_escape }}{{ _("Log in ID.")|force_escape }} {{ _("Name")|force_escape }} {{ _("View")|force_escape }}