Add emotes and small fixes

src/assets/config/colors.yml

@@ -1,6 +1,9 @@
 error   : 0xff0000 # Red
 cooldown: 0x7289DA # Blurple
 
+core    :
+  locale: 0x7289DA # Blurple
+
 util   :
   ping :
     0  : 0xffa500 # Orange

src/assets/config/emotes.yml

@@ -2,17 +2,29 @@ cooldown  : <:sad:500719642403405824> # On cooldown
 owner_only: <:sad:500719642403405824> # Only owners
 guild_only: <:sad:500719642403405824> # Only guilds
 
+core    :
+  locale:
+    0   : <:wumpus_blob:541629681120837648> # Dupe locale (user)
+    1   : <:wumpus_blob:541629681120837648> # Dupe locale (guild)
+    2   : <:wumpus_love:506200781549076482> # Current locale (user)
+    3   : <:wumpus_love:506200781549076482> # Current locale (guild)
+    4   : <:wumpus_flag:495525134220787713> # Locale list
+    5   : <:ok_hand:497396122416054287>     # Updated (guild)
+    6   : <:ok_hand:497396122416054287>     # Updated (user)
+    7   : <:sad:500719642403405824>         # Invalid locale
+    8   :
+
 util   :
-  ping:
+  ping :
     0  : <:bored:500719642164199425>           # Pinging
     1  : <:thumbsup:501844577725054976>        # Heartbeat
     2  : <:blueberry:506201160382939141>       # Round-trip
     3  : <:WumpLove:506200781549076482>        # Health
-  math:
+  math :
     0  : <:blueberry:506201160382939141>       # Calculating
     1  : <a:ablobdevil:494927811451027458>     # Evaluation
     2  : <a:agoogleoctopus:494927680911704067> # Invalid equation
-  snipe   : <:snipe:508653323788877825>              # No snipes found
+  snipe: <:snipe:508653323788877825>           # No snipes found
 
 info:
   commands     :

src/assets/i18n/en_us/strings.yml

@@ -30,15 +30,15 @@ core        :
       - '$[emoji#2] **>** Your current locale is `$[uLocale:code]`'
       - '$[emoji#3] **>** The guild''s locale is `$[gLocale:code]`'
       - ''
-      - '$[emoji#3] **Available locales**:'
+      - '$[emoji#4] **Available locales**:'
       - '$[locale:map]'
       - ''
       - 'Type `$[locale:changeCmd]` to update your/the guild''s locale'
       - 'If you want to help translate wump, you can join my [Discord](https://discord.gg/SV7DAE9) and create a pull request on my [GitHub](https://github.com/PassTheWessel/wump/compare)'
-    gchanged: '$[emoji#4] The guild''s locale changed to `$[gLocale:code]`'
-    changed : '$[emoji#4] Your locale has changed to `$[uLocale:code]`'
-    invalid : '$[emoji#5] The locale you provided isn''t a valid locale'
-    gperms  : '$[emoji#6] You''re missing permissions in order to execute this command (`MANAGE_GUILD`)'
+    gchanged: '$[emoji#5] The guild''s locale changed to `$[gLocale:code]`'
+    changed : '$[emoji#6] Your locale has changed to `$[uLocale:code]`'
+    invalid : '$[emoji#7] The locale you provided isn''t a valid locale'
+    gperms  : '$[emoji#8] You''re missing permissions in order to execute this command (`MANAGE_GUILD`)'
 
 util       :
   ping     :

src/assets/i18n/nl/strings.yml

@@ -25,7 +25,7 @@ cooldown: '$[emoji#0] $[author:mention] **>** Dit commando is op cooldown voor *
 core        :
   locale    :
     dupe    : '$[emoji#0] Uw landinstelling is al ingesteld op `$[uLocale:code]`'
-    gdupe   : '$[emoji#1] The guild''s locale is already set to `$[gLocale:code]`'
+    gdupe   : '$[emoji#1] De landinstelling van de gilde is al ingesteld op `$[gLocale:code]`'
     list    :
       - '$[emoji#2] **>** Uw huidige landinstelling is `$[uLocale:code]`'
       - '$[emoji#3] **>** De landinstelling van de gilde is `$[gLocale:code]`'

src/commands/Discord/Core/locale.js

@@ -8,7 +8,7 @@ module.exports = class Locale extends DiscordCommand {
       name        : 'locale',
       syntax      : 'locale <locale:code> <-u|-g>',
       aliases     : [],
-      argument    : [ '-<u|g>', '<locale:code' ],
+      argument    : [ '<locale:code>', '-<u|g>' ],
       description : 'Change your locale',
 
       hidden      : false,
@@ -23,7 +23,7 @@ module.exports = class Locale extends DiscordCommand {
 
   async execute(msg, args, user, guild) {
     if (args.join(' ').includes('-u') || args.join(' ').includes('--user')) {
-      for (let i = 0; i < args.length; i++) !this.bot.locales.has(args[i]) ? args.splice(i, 1) : undefined;
+      for (let i = 0; i < args.length; i++) !this.bot.locales.has(args[i]) ? args.splice(i, -1) : undefined;
       if (!this.bot.locales.has(args[0])) return msg.channel.createMessage(this.localize(msg.author.locale['core']['locale']['invalid']));
       if (user.locale === args[0]) return msg.channel.createMessage(this.localize(msg.author.locale['core']['locale']['dupe'], { uLocale: user.locale }));
       
@@ -43,6 +43,7 @@ module.exports = class Locale extends DiscordCommand {
     } else {
       return msg.channel.createMessage({
         embed: {
+          color      : this.bot.col['core']['locale'],
           description: this.localize(msg.author.locale['core']['locale']['list'].join('\n'), { uLocale: user.locale || 'en_us', gLocale: guild.locale || 'en_us' })
         }
       });