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

This commit is contained in:
Eloy Lafuente (stronk7) 2020-02-20 00:41:19 +01:00
commit a21ba663fd
2 changed files with 2 additions and 0 deletions

View File

@ -2061,6 +2061,7 @@ $string['tocontent'] = 'To item "{$a}"';
$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.';

View File

@ -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}}