Merge pull request #531 from TheElf/devel

Plural of Emoji

2 files changed, 3 insertions, 3 deletions

diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index bf92e9a0..da66bb74 100644..100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -4,7 +4,7 @@ Template.editor.onRendered(() => {
   autosize($textarea);
 
   $textarea.escapeableTextComplete([
-    // Emojies
+    // Emoji
     {
       match: /\B:([\-+\w]*)$/,
       search(term, callback) {
@@ -45,7 +45,7 @@ Template.editor.onRendered(() => {
 });
 
 // XXX I believe we should compute a HTML rendered field on the server that
-// would handle markdown, emojies and user mentions. We can simply have two
+// would handle markdown, emoji and user mentions. We can simply have two
 // fields, one source, and one compiled version (in HTML) and send only the
 // compiled version to most users -- who don't need to edit.
 // In the meantime, all the transformation are done on the client using the
diff --git a/client/lib/keyboard.js b/client/lib/keyboard.js
index f8212c9b..ff18738b 100644..100755
--- a/client/lib/keyboard.js
+++ b/client/lib/keyboard.js
@@ -88,7 +88,7 @@ Template.keyboardShortcuts.helpers({
     action: 'shortcut-autocomplete-members',
   }, {
     keys: [':'],
-    action: 'shortcut-autocomplete-emojies',
+    action: 'shortcut-autocomplete-emoji',
   }, {
     keys: ['SPACE'],
     action: 'shortcut-assign-self',