Merge branch 'MDL-67899-master' of git://github.com/rezaies/moodle

prateeksachan · Feb 19, 2020 · a21ba66 · a21ba66
2 parents 785271c + cd4c44b
commit a21ba66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -2061,6 +2061,7 @@
 $string['today'] = 'Today';
 $string['todaylogs'] = 'Today\'s logs';
 $string['toeveryone'] = 'to everyone';
+$string['toggleemojipicker'] = 'Toggle emoji picker';
 $string['toomanybounces'] = 'That email address has had too many bounces. You <b>must</b> change it to continue.';
 $string['toomanytags'] = 'This search included too many tags; some will have been ignored.';
 $string['toomanytoshow'] = 'There are too many users to show.';

diff --git a/message/templates/message_drawer_view_conversation_footer_content.mustache b/message/templates/message_drawer_view_conversation_footer_content.mustache
@@ -70,6 +70,7 @@
             </div>
             <button
                 class="btn btn-link btn-icon icon-size-3 ml-1"
+                aria-label="{{#str}} toggleemojipicker, core {{/str}}"
                 data-action="toggle-emoji-picker"
             >
                 {{#pix}} e/emoticons, core{{/pix}}