From e97d4adafaba4af73cde2485e74f38ba3c4cec68 Mon Sep 17 00:00:00 2001
From: Tien Nguyen Phuc <nguyenphuctien@gmail.com>
Date: Wed, 5 Feb 2020 08:04:35 +0700
Subject: [PATCH] MOBILE-3331 accessibility: Fix issues of Open in browser &
 PDF icons

---
 src/addon/mod/url/providers/module-handler.ts             | 2 +-
 src/assets/lang/en.json                                   | 1 +
 src/core/course/components/module/core-course-module.html | 6 +++---
 src/lang/en.json                                          | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/addon/mod/url/providers/module-handler.ts b/src/addon/mod/url/providers/module-handler.ts
index 151dd2a8c..7d15e61fc 100644
--- a/src/addon/mod/url/providers/module-handler.ts
+++ b/src/addon/mod/url/providers/module-handler.ts
@@ -118,7 +118,7 @@ export class AddonModUrlModuleHandler implements CoreCourseModuleHandler {
             buttons: [ {
                 hidden: true, // Hide it until we calculate if it should be displayed or not.
                 icon: 'link',
-                label: 'core.openinbrowser',
+                label: 'core.openmodinbrowser',
                 action: (event: Event, navCtrl: NavController, module: any, courseId: number): void => {
                     handler.openUrl(module, courseId);
                 }
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 080e14b1c..b25df240c 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1855,6 +1855,7 @@
     "core.online": "Online",
     "core.openfullimage": "Click here to display the full size image",
     "core.openinbrowser": "Open in browser",
+    "core.openmodinbrowser": "Open {{$a}} in browser",
     "core.othergroups": "Other groups",
     "core.pagea": "Page {{$a}}",
     "core.parentlanguage": "",
diff --git a/src/core/course/components/module/core-course-module.html b/src/core/course/components/module/core-course-module.html
index 39358083f..9494aed55 100644
--- a/src/core/course/components/module/core-course-module.html
+++ b/src/core/course/components/module/core-course-module.html
@@ -1,8 +1,8 @@
 <ion-item *ngIf="module && module.visibleoncoursepage !== 0 && !module.handlerData.loading" text-wrap id="core-course-module-{{module.id}}" class="core-course-module-handler {{module.handlerData.class}}" (click)="moduleClicked($event)" [ngClass]="{'item-media': module.handlerData.icon, 'core-not-clickable': !module.handlerData.action || module.uservisible === false, 'item-dimmed': module.visible === 0 || module.uservisible === false}" [title]="module.handlerData.a11yTitle" detail-none>
 
-    <img item-start *ngIf="module.handlerData.icon" [src]="module.handlerData.icon" [alt]="module.modnametranslated" class="core-module-icon">
+    <img item-start *ngIf="module.handlerData.icon" [src]="module.handlerData.icon" [alt]="module.modnametranslated" [attr.aria-hidden]="true" class="core-module-icon">
     <div class="core-module-title">
-        <core-format-text [text]="module.handlerData.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
+        <core-format-text [text]="module.handlerData.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId" [attr.aria-label]="module.handlerData.a11yTitle + ', ' + module.modnametranslated"></core-format-text>
 
         <!-- Buttons. -->
         <div item-end *ngIf="module.uservisible !== false" class="buttons core-module-buttons" [ngClass]="{'core-button-completion': module.completiondata}">
@@ -13,7 +13,7 @@
                 <core-download-refresh [status]="downloadStatus" [enabled]="downloadEnabled" [loading]="spinner || module.handlerData.spinner" [canTrustDownload]="canCheckUpdates" (action)="download($event)"></core-download-refresh>
 
                 <!-- Buttons defined by the module handler. -->
-                <button ion-button icon-only clear *ngFor="let button of module.handlerData.buttons" [hidden]="button.hidden || spinner || module.handlerData.spinner" (click)="buttonClicked($event, button)" color="dark" class="core-animate-show-hide" [attr.aria-label]="button.label | translate">
+                <button ion-button icon-only clear *ngFor="let button of module.handlerData.buttons" [hidden]="button.hidden || spinner || module.handlerData.spinner" (click)="buttonClicked($event, button)" color="dark" class="core-animate-show-hide" [attr.aria-label]="button.label | translate:{$a: module.handlerData.title}">
                     <core-icon [name]="button.icon" [ios]="button.iosIcon || ''" [md]="button.mdIcon || ''"></core-icon>
                 </button>
             </div>
diff --git a/src/lang/en.json b/src/lang/en.json
index 3b9ccff0f..83b98e37f 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -195,6 +195,7 @@
     "online": "Online",
     "openfullimage": "Click here to display the full size image",
     "openinbrowser": "Open in browser",
+    "openmodinbrowser": "Open {{$a}} in browser",
     "othergroups": "Other groups",
     "pagea": "Page {{$a}}",
     "parentlanguage": "",