From de5b05deda19680ceb4de1bc1042a29405f6bbe1 Mon Sep 17 00:00:00 2001
From: Davide Iadeluca <davide.iadeluca@glowingblue.com>
Date: Mon, 10 Feb 2025 15:10:09 +0100
Subject: [PATCH 1/2] fix(core, tags): resolve a11y warnings in Admin Frontend

---
 extensions/tags/js/src/admin/components/TagsPage.js       | 7 ++++++-
 extensions/tags/locale/en.yml                             | 1 +
 framework/core/js/src/admin/components/PermissionGrid.tsx | 7 ++++++-
 framework/core/locale/core.yml                            | 1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/extensions/tags/js/src/admin/components/TagsPage.js b/extensions/tags/js/src/admin/components/TagsPage.js
index c414976a68..aef956b676 100644
--- a/extensions/tags/js/src/admin/components/TagsPage.js
+++ b/extensions/tags/js/src/admin/components/TagsPage.js
@@ -19,7 +19,12 @@ function tagItem(tag) {
       <div className="TagListItem-info">
         {tagIcon(tag)}
         <span className="TagListItem-name">{tag.name()}</span>
-        <Button className="Button Button--link" icon="fas fa-pencil-alt" onclick={() => app.modal.show(EditTagModal, { model: tag })} />
+        <Button
+          className="Button Button--link"
+          icon="fas fa-pencil-alt"
+          aria-label={app.translator.trans('flarum-tags.admin.tags.edit_tag_label', { tag: tag.name() })}
+          onclick={() => app.modal.show(EditTagModal, { model: tag })}
+        />
       </div>
       {!tag.isChild() && tag.position() !== null && (
         <ol className="TagListItem-children TagList">
diff --git a/extensions/tags/locale/en.yml b/extensions/tags/locale/en.yml
index f07144a1e2..d650dac440 100644
--- a/extensions/tags/locale/en.yml
+++ b/extensions/tags/locale/en.yml
@@ -56,6 +56,7 @@ flarum-tags:
       about_tags_text: "Tags are used to categorize discussions. Primary tags are like traditional forum categories: they can be arranged in a two-level hierarchy. Secondary tags do not have hierarchy or order, and are useful for micro-categorization."
       create_primary_tag_button: Create Primary Tag
       create_secondary_tag_button: Create Secondary Tag
+      edit_tag_label: Edit Tag {tag}
       primary_heading: Primary Tags
       secondary_heading: Secondary Tags
       settings_heading: Settings
diff --git a/framework/core/js/src/admin/components/PermissionGrid.tsx b/framework/core/js/src/admin/components/PermissionGrid.tsx
index 71999551a8..7dcdfee0ac 100644
--- a/framework/core/js/src/admin/components/PermissionGrid.tsx
+++ b/framework/core/js/src/admin/components/PermissionGrid.tsx
@@ -59,7 +59,12 @@ export default class PermissionGrid<CustomAttrs extends IPermissionGridAttrs = I
               <th>
                 {scope.label}{' '}
                 {!!scope.onremove && (
-                  <Button icon="fas fa-times" className="Button Button--text PermissionGrid-removeScope" onclick={scope.onremove} />
+                  <Button
+                    icon="fas fa-times"
+                    className="Button Button--text PermissionGrid-removeScope"
+                    aria-label={app.translator.trans('core.admin.permissions.remove_scope_label', { scope: scope.label })}
+                    onclick={scope.onremove}
+                  />
                 )}
               </th>
             ))}
diff --git a/framework/core/locale/core.yml b/framework/core/locale/core.yml
index 3286204230..534166e489 100644
--- a/framework/core/locale/core.yml
+++ b/framework/core/locale/core.yml
@@ -310,6 +310,7 @@ core:
       participate_heading: Participate
       post_without_throttle_label: Reply multiple times without waiting
       read_heading: Read
+      remove_scope_label: Remove scope of {scope}
       rename_discussions_label: Rename discussions
       reply_to_discussions_label: Reply to discussions
       search_users_label: => core.ref.search_users

From d1d887e6fdc2393c4e3f771a0679387ff6ae0883 Mon Sep 17 00:00:00 2001
From: Davide Iadeluca <davide.iadeluca@glowingblue.com>
Date: Tue, 11 Feb 2025 09:26:41 +0100
Subject: [PATCH 2/2] fix: add aria label to `Pagination` Buttons

---
 framework/core/js/src/common/components/Pagination.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/framework/core/js/src/common/components/Pagination.tsx b/framework/core/js/src/common/components/Pagination.tsx
index 5a21d439a8..233f2e9f07 100644
--- a/framework/core/js/src/common/components/Pagination.tsx
+++ b/framework/core/js/src/common/components/Pagination.tsx
@@ -23,6 +23,7 @@ export default class Pagination<CustomAttrs extends IPaginationInterface = IPagi
         <Button
           disabled={currentPage === 1}
           title={app.translator.trans('core.lib.pagination.first_button')}
+          aria-label={app.translator.trans('core.lib.pagination.first_button')}
           onclick={() => onChange(1)}
           icon="fas fa-step-backward"
           className="Button Button--icon Pagination-first"
@@ -30,6 +31,7 @@ export default class Pagination<CustomAttrs extends IPaginationInterface = IPagi
         <Button
           disabled={currentPage === 1}
           title={app.translator.trans('core.lib.pagination.back_button')}
+          aria-label={app.translator.trans('core.lib.pagination.back_button')}
           onclick={() => onChange(currentPage - 1)}
           icon="fas fa-chevron-left"
           className="Button Button--icon Pagination-back"
@@ -77,6 +79,7 @@ export default class Pagination<CustomAttrs extends IPaginationInterface = IPagi
         <Button
           disabled={!moreData}
           title={app.translator.trans('core.lib.pagination.next_button')}
+          aria-label={app.translator.trans('core.lib.pagination.next_button')}
           onclick={() => onChange(currentPage + 1)}
           icon="fas fa-chevron-right"
           className="Button Button--icon Pagination-next"
@@ -84,6 +87,7 @@ export default class Pagination<CustomAttrs extends IPaginationInterface = IPagi
         <Button
           disabled={!moreData}
           title={app.translator.trans('core.lib.pagination.last_button')}
+          aria-label={app.translator.trans('core.lib.pagination.last_button')}
           onclick={() => onChange(totalPageCount)}
           icon="fas fa-step-forward"
           className="Button Button--icon Pagination-last"