From 9383f5484f7d5c8bddf7fe6bbecfb3f27d45534f 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, 27 Feb 2023 12:45:35 +0800
Subject: [PATCH] Revised aria-label in the templates, added necessary aria
 labels, removed excess aria labels, and added localization.

---
 src/accounting/templates/accounting/account/detail.html   | 2 +-
 .../templates/accounting/account/include/form.html        | 4 ++--
 src/accounting/templates/accounting/account/list.html     | 8 ++++----
 .../templates/accounting/base-account/list.html           | 4 ++--
 src/accounting/templates/accounting/currency/detail.html  | 2 +-
 src/accounting/templates/accounting/currency/list.html    | 8 ++++----
 .../templates/accounting/include/pagination.html          | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/accounting/templates/accounting/account/detail.html b/src/accounting/templates/accounting/account/detail.html
index b070a79..4ed48f9 100644
--- a/src/accounting/templates/accounting/account/detail.html
+++ b/src/accounting/templates/accounting/account/detail.html
@@ -67,7 +67,7 @@ First written: 2023/1/31
         <div class="modal-content">
           <div class="modal-header">
             <h1 class="modal-title fs-5" id="accounting-delete-modal-label">{{ A_("Delete Account Confirmation") }}</h1>
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ A_("Close") }}"></button>
           </div>
           <div class="modal-body">
             {{ A_("Do you really want to delete this account?") }}
diff --git a/src/accounting/templates/accounting/account/include/form.html b/src/accounting/templates/accounting/account/include/form.html
index 53c90d7..df6a9a3 100644
--- a/src/accounting/templates/accounting/account/include/form.html
+++ b/src/accounting/templates/accounting/account/include/form.html
@@ -88,11 +88,11 @@ First written: 2023/2/1
     <div class="modal-content">
       <div class="modal-header">
         <h1 class="modal-title fs-5" id="accounting-base-selector-modal-label">{{ A_("Select Base Account") }}</h1>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ A_("Close") }}"></button>
       </div>
       <div class="modal-body">
         <div class="input-group mb-2">
-          <input id="accounting-base-selector-query" class="form-control form-control-sm" type="search" placeholder=" " required="required" aria-label="Search">
+          <input id="accounting-base-selector-query" class="form-control form-control-sm" type="search" placeholder=" " required="required">
           <label class="input-group-text" for="accounting-base-selector-query">
             <i class="fa-solid fa-magnifying-glass"></i>
             {{ A_("Search") }}
diff --git a/src/accounting/templates/accounting/account/list.html b/src/accounting/templates/accounting/account/list.html
index 292d0f7..f895287 100644
--- a/src/accounting/templates/accounting/account/list.html
+++ b/src/accounting/templates/accounting/account/list.html
@@ -32,8 +32,8 @@ First written: 2023/1/30
       {{ A_("New") }}
     </a>
   {% endif %}
-  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.account.list") }}" method="get" role="search">
-    <input id="accounting-search-desktop" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required" aria-label="Search">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.account.list") }}" method="get" role="search" aria-label="{{ A_("Search for Desktop") }}">
+    <input id="accounting-search-desktop" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required">
     <label for="accounting-search-desktop" class="accounting-search-label">
       <button type="submit">
         <i class="fa-solid fa-magnifying-glass"></i>
@@ -44,8 +44,8 @@ First written: 2023/1/30
 </div>
 
 <div class="btn-group mb-2 d-md-none">
-  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.account.list") }}" method="get" role="search">
-    <input id="accounting-search-mobile" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required" aria-label="Search">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.account.list") }}" method="get" role="search" aria-label="{{ A_("Search for Mobile") }}">
+    <input id="accounting-search-mobile" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required">
     <label for="accounting-search-mobile" class="accounting-search-label">
       <button type="submit">
         <i class="fa-solid fa-magnifying-glass"></i>
diff --git a/src/accounting/templates/accounting/base-account/list.html b/src/accounting/templates/accounting/base-account/list.html
index 7879028..a67f437 100644
--- a/src/accounting/templates/accounting/base-account/list.html
+++ b/src/accounting/templates/accounting/base-account/list.html
@@ -26,8 +26,8 @@ First written: 2023/1/26
 {% block content %}
 
 <div class="btn-group mb-2">
-  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.base-account.list") }}" method="get" role="search">
-    <input id="accounting-search" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required" aria-label="Search">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.base-account.list") }}" method="get" role="search" aria-label="{{ A_("Search") }}">
+    <input id="accounting-search" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required">
     <label for="accounting-search" class="accounting-search-label">
       <button type="submit">
         <i class="fa-solid fa-magnifying-glass"></i>
diff --git a/src/accounting/templates/accounting/currency/detail.html b/src/accounting/templates/accounting/currency/detail.html
index 151837b..657199c 100644
--- a/src/accounting/templates/accounting/currency/detail.html
+++ b/src/accounting/templates/accounting/currency/detail.html
@@ -63,7 +63,7 @@ First written: 2023/2/6
         <div class="modal-content">
           <div class="modal-header">
             <h1 class="modal-title fs-5" id="accounting-delete-modal-label">{{ A_("Delete Currency Confirmation") }}</h1>
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ A_("Close") }}"></button>
           </div>
           <div class="modal-body">
             {{ A_("Do you really want to delete this currency?") }}
diff --git a/src/accounting/templates/accounting/currency/list.html b/src/accounting/templates/accounting/currency/list.html
index f4f0d22..560b832 100644
--- a/src/accounting/templates/accounting/currency/list.html
+++ b/src/accounting/templates/accounting/currency/list.html
@@ -32,8 +32,8 @@ First written: 2023/2/6
       {{ A_("New") }}
     </a>
   {% endif %}
-  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.currency.list") }}" method="get" role="search">
-    <input id="accounting-search-desktop" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required" aria-label="Search">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.currency.list") }}" method="get" role="search" aria-label="{{ A_("Search for Desktop") }}">
+    <input id="accounting-search-desktop" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required">
     <label for="accounting-search-desktop" class="accounting-search-label">
       <button type="submit">
         <i class="fa-solid fa-magnifying-glass"></i>
@@ -44,8 +44,8 @@ First written: 2023/2/6
 </div>
 
 <div class="btn-group mb-2 d-md-none">
-  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.currency.list") }}" method="get" role="search">
-    <input id="accounting-search-mobile" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required" aria-label="Search">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.currency.list") }}" method="get" role="search" aria-label="{{ A_("Search for Mobile") }}">
+    <input id="accounting-search-mobile" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args["q"] if "q" in request.args else "" }}" placeholder=" " required="required">
     <label for="accounting-search-mobile" class="accounting-search-label">
       <button type="submit">
         <i class="fa-solid fa-magnifying-glass"></i>
diff --git a/src/accounting/templates/accounting/include/pagination.html b/src/accounting/templates/accounting/include/pagination.html
index 877a6be..0569326 100644
--- a/src/accounting/templates/accounting/include/pagination.html
+++ b/src/accounting/templates/accounting/include/pagination.html
@@ -20,7 +20,7 @@ Author: imacat@mail.imacat.idv.tw (imacat)
 First written: 2023/1/26
 #}
 {% if pagination.is_paged %}
-  <nav aria-label="Page navigation">
+  <nav aria-label="{{ A_("Page navigation") }}">
     <ul class="pagination">
       {% for link in pagination.pages %}
         {% if link.uri is none %}