From db758db53311495fc945a54886409cb099ea3ecd Mon Sep 17 00:00:00 2001
From: Mihail Geshoski <mihail@moodle.com>
Date: Wed, 6 Jan 2021 12:04:34 +0800
Subject: [PATCH] MDL-70316 core: Update the emoji categories in the emoji
 picker

---
 lang/en/moodle.php                             |  3 ++-
 lib/classes/output/icon_system_fontawesome.php |  3 ++-
 lib/templates/emoji/picker.mustache            | 14 +++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index d58d87d4ad9..a488aebf123 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -748,8 +748,9 @@ $string['emojicategoryanimalsnature'] = 'Animals & nature';
 $string['emojicategoryflags'] = 'Flags';
 $string['emojicategoryfooddrink'] = 'Food & drink';
 $string['emojicategoryobjects'] = 'Objects';
+$string['emojicategorypeoplebody'] = 'People & body';
 $string['emojicategoryrecent'] = 'Recent';
-$string['emojicategorysmileyspeople'] = 'Smileys & people';
+$string['emojicategorysmileysemotion'] = 'Smileys & emotion';
 $string['emojicategorysymbols'] = 'Symbols';
 $string['emojicategorytravelplaces'] = 'Travel & places';
 $string['emptydragdropregion'] = 'empty region';
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index 38ad233b547..b35e5984e77 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -226,8 +226,9 @@ class icon_system_fontawesome extends icon_system_font {
             'core:i/emojicategoryflags' => 'fa-flag',
             'core:i/emojicategoryfooddrink' => 'fa-cutlery',
             'core:i/emojicategoryobjects' => 'fa-lightbulb-o',
+            'core:i/emojicategorypeoplebody' => 'fa-male',
             'core:i/emojicategoryrecent' => 'fa-clock-o',
-            'core:i/emojicategorysmileyspeople' => 'fa-smile-o',
+            'core:i/emojicategorysmileysemotion' => 'fa-smile-o',
             'core:i/emojicategorysymbols' => 'fa-heart',
             'core:i/emojicategorytravelplaces' => 'fa-plane',
             'core:i/edit' => 'fa-pencil',
diff --git a/lib/templates/emoji/picker.mustache b/lib/templates/emoji/picker.mustache
index e4177ae2991..aaaee4b6d86 100644
--- a/lib/templates/emoji/picker.mustache
+++ b/lib/templates/emoji/picker.mustache
@@ -49,10 +49,18 @@
         <button
             class="btn btn-outline-secondary icon-no-margin category-button"
             data-action="show-category"
-            data-category="Smileys & People"
-            title="{{#str}} emojicategorysmileyspeople, core {{/str}}"
+            data-category="Smileys & Emotion"
+            title="{{#str}} emojicategorysmileysemotion, core {{/str}}"
         >
-            {{#pix}} i/emojicategorysmileyspeople, core {{/pix}}
+            {{#pix}} i/emojicategorysmileysemotion, core {{/pix}}
+        </button>
+        <button
+            class="btn btn-outline-secondary icon-no-margin category-button"
+            data-action="show-category"
+            data-category="People & Body"
+            title="{{#str}} emojicategorypeoplebody, core {{/str}}"
+        >
+            {{#pix}} i/emojicategorypeoplebody, core {{/pix}}
         </button>
         <button
             class="btn btn-outline-secondary icon-no-margin category-button"