Commit 4cdcda8d authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1758153: Translating aria-label values where we can"

parents f181fa84 7e54caf9
......@@ -40,7 +40,7 @@ jQuery(function($) {
var warningClass = data.message.messagestatus === 'ok' ? 'success' : 'warning';
var warnmessage = $('<div id="changestatusline" class="alert alert-dismissible alert-' + warningClass + '" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button><p>' + data.message.message + '</p></div>');
var warnmessage = $('<div id="changestatusline" class="alert alert-dismissible alert-' + warningClass + '" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="' + get_string('Close') + '"><span aria-hidden="true">&times;</span></button><p>' + data.message.message + '</p></div>');
$('#messages').empty().append(warnmessage);
}
......
......@@ -32,7 +32,9 @@ $string['element.calendar.format.help.minute2digits'] = 'MM';
$string['element.calendar.format.help.second2digits'] = 'SS';
$string['element.calendar.format.help.ampmlowercase'] = 'am';
$string['element.calendar.format.help.ampmuppercase'] = 'AM';
$string['element.calendar.format.arialabel'] = 'Edit the field using the following format: YYYY / MM / DD, hours : minutes.';
$string['element.calendar.datefrom'] = 'Date from';
$string['element.calendar.dateto'] = 'Date to';
$string['element.date.monthnames'] = 'January,February,March,April,May,June,July,August,September,October,November,December';
$string['element.date.specify'] = 'Set date';
......
......@@ -60,7 +60,7 @@ function pieform_element_calendar(Pieform $form, $element) {
$result = '<span class="hasDatepickerwrapper"><input type="text"'
. $form->element_attributes($element)
. ' value="' . $value . '"
aria-label="Edit the field using the following format YYYY / MM / DD, HH colon MM, a m or p m"
aria-label="' . get_string('element.calendar.format.arialabel', 'pieforms') . '"
></span>';
$result .= '
<script type="application/javascript">
......
......@@ -1452,6 +1452,7 @@ function jsstrings() {
'youhavenottaggedanythingyet',
'wanttoleavewithoutsaving?',
'Help',
'Close',
'closehelp',
'tabs',
'toggletoolbarson',
......
......@@ -82,7 +82,7 @@ echo $form_tag;
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button class="deletebutton close" name="action_removeblockinstance_id_80" data-dismiss="modal-docked" aria-label="Close">
<button class="deletebutton close" name="action_removeblockinstance_id_80" data-dismiss="modal-docked" aria-label="<?php echo get_string('Close'); ?>">
<span class="times">&times;</span>
<span class="sr-only">Close</span>
</button>
......
......@@ -67,7 +67,7 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-dismiss="modal" aria-label="{str tag=Close}">
<span aria-hidden="true">&times;</span>
</button>
<h4 id="suspenddeletemodaltitle" class="modal-title">{str tag=suspendordeletethisuser section=admin}</h4>
......
......@@ -101,7 +101,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<button type="button" class="close" data-dismiss="modal" aria-label="{str tag=Close}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=reportobjectionablematerial}
......
......@@ -89,12 +89,12 @@
</td>
<td class="text-center js-date short" data-name='from'>
<div class="date-picker js-date-picker js-hide-empty {% if (o.presets.empty) { %}hidden{% } %}">
<div class="hasDatepickerwrapperacl"><input type="text" name="accesslist[{%=o.id%}][startdate]" class="form-control pull-left" data-setmin="true" setdatatarget="to" value="{%=o.presets.startdate%}" aria-label="Date from (Edit the field using the following format, YYYY / MM / DD, hours colon minutes, a m or p m.)" {% if (o.presets.locked) { %}disabled{% } %}></div>
<div class="hasDatepickerwrapperacl"><input type="text" name="accesslist[{%=o.id%}][startdate]" class="form-control pull-left" data-setmin="true" setdatatarget="to" value="{%=o.presets.startdate%}" aria-label="{{str tag=element.calendar.datefrom section=pieforms}} ({{str tag='element.calendar.format.arialabel' section='pieforms'}})" {% if (o.presets.locked) { %}disabled{% } %}></div>
</div>
</td>
<td class="text-center js-date short" data-name='to'>
<div class="date-picker js-date-picker js-hide-empty {% if (o.presets.empty) { %}hidden{% } %}">
<div class="hasDatepickerwrapperacl"><input type="text" name="accesslist[{%=o.id%}][stopdate]" class="form-control pull-left " data-setmax="true" setdatatarget="from" value="{%=o.presets.stopdate%}" aria-label="Date to (Edit the field using the following format, YYYY / MM / DD, hours colon minutes, a m or p m.)" value="{%=o.presets.stopdate%}" {% if (o.presets.locked) { %}disabled{% } %}></div>
<div class="hasDatepickerwrapperacl"><input type="text" name="accesslist[{%=o.id%}][stopdate]" class="form-control pull-left" data-setmax="true" setdatatarget="from" value="{%=o.presets.stopdate%}" aria-label="{{str tag=element.calendar.dateto section=pieforms}} ({{str tag='element.calendar.format.arialabel' section='pieforms'}})" value="{%=o.presets.stopdate%}" {% if (o.presets.locked) { %}disabled{% } %}></div>
</div>
</td>
{% if (o.viewtype !== "profile") { %}
......
......@@ -2,7 +2,7 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-dismiss="modal" aria-label="{str tag=Close}">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title">{str tag=editmembershipforuser section=group arg1=display_name($userid)}</h4>
......
......@@ -3,7 +3,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="btn close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<button type="button" class="btn close" data-dismiss="modal" aria-label="{str tag=Close}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">
{str tag=refuseprivacy section=admin}
</h4>
......
......@@ -98,7 +98,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-dismiss="modal" aria-label="{str tag=Close}">
<span aria-hidden="true">&times;</span>
</button>
......
......@@ -157,7 +157,7 @@ Switchboxes are used for Yes/No, On/Off or other true/false type fields. They ar
```
<div class="form-switch ">
<div class="switch " style="width:61px">
<input type="checkbox" class="switchbox" name="dropdownmenu" tabindex="0" aria-describedby="siteoptions_dropdownmenu_description " aria-label="Drop-down navigation">
<input type="checkbox" class="switchbox" name="dropdownmenu" tabindex="0">
<label class="switch-label" for="siteoptions_dropdownmenu" aria-hidden="true">
<span class="switch-inner"></span>
<span class="switch-indicator"></span>
......@@ -1037,7 +1037,7 @@ A fold down modal. This is typially used to report objectionable content.
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-dismiss="modal" aria-label="{str tag=Close}">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title">
......
......@@ -37,7 +37,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="btn close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<button type="button" class="btn close" data-dismiss="modal" aria-label="{str tag=Close}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">
<span class="icon icon-lg icon-plus prs"></span>
{str tag=confirmaddtitle section=view}
......
......@@ -151,7 +151,7 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal-docked" aria-label="Close">
<button class="close" data-dismiss="modal-docked" aria-label="{str tag=Close}">
<span class="times">&times;</span>
<span class="sr-only">{str tag=Close}</span>
</button>
......@@ -173,7 +173,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<button type="button" class="close" data-dismiss="modal" aria-label="{str tag=Close}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=reportobjectionablematerial}
......@@ -190,7 +190,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<button type="button" class="close" data-dismiss="modal" aria-label="{str tag=Close}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=confirmcopytitle section=view}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment