From dc05b01ee1d36e7c7be4dff76c4a204ad86a237a Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 28 Feb 2016 21:51:05 -0600 Subject: Changing to the correct pluralization of emoji --- i18n/ca.i18n.json | 4 ++-- i18n/en.i18n.json | 2 +- i18n/es.i18n.json | 4 ++-- i18n/fr.i18n.json | 2 +- i18n/it.i18n.json | 4 ++-- i18n/ja.i18n.json | 4 ++-- i18n/ko.i18n.json | 4 ++-- i18n/pt-BR.i18n.json | 4 ++-- i18n/ru.i18n.json | 2 +- i18n/tr.i18n.json | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) mode change 100644 => 100755 i18n/ca.i18n.json mode change 100644 => 100755 i18n/en.i18n.json mode change 100644 => 100755 i18n/es.i18n.json mode change 100644 => 100755 i18n/fr.i18n.json mode change 100644 => 100755 i18n/it.i18n.json mode change 100644 => 100755 i18n/ja.i18n.json mode change 100644 => 100755 i18n/ko.i18n.json mode change 100644 => 100755 i18n/pt-BR.i18n.json mode change 100644 => 100755 i18n/ru.i18n.json mode change 100644 => 100755 i18n/tr.i18n.json diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json old mode 100644 new mode 100755 index 86ed4599..2593687d --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -234,7 +234,7 @@ "search": "Cerca", "select-color": "Selecciona un color", "shortcut-assign-self": "Assigna't la ftixa actual", - "shortcut-autocomplete-emojies": "Autocompleta emojies", + "shortcut-autocomplete-emojies": "Autocompleta emoji", "shortcut-autocomplete-members": "Autocompleta membres", "shortcut-clear-filters": "Elimina tots els filters", "shortcut-close-dialog": "Tanca el diàleg", @@ -260,4 +260,4 @@ "view-it": "Vist", "warn-list-archived": "Avís: aquesta fitxa està en una llista arxivada", "what-to-do": "Què vols fer?" -} \ No newline at end of file +} diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json old mode 100644 new mode 100755 index 0cfeeed2..022d5242 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -260,7 +260,7 @@ "search": "Search", "select-color": "Select a color", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emojies", + "shortcut-autocomplete-emojies": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json old mode 100644 new mode 100755 index 9980bf66..4cbd1f1d --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -234,7 +234,7 @@ "search": "Buscar", "select-color": "Selecciona un color", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emojies", + "shortcut-autocomplete-emojies": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", @@ -260,4 +260,4 @@ "view-it": "View it", "warn-list-archived": "warning: this card is in an archived list", "what-to-do": "What do you want to do?" -} \ No newline at end of file +} diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json old mode 100644 new mode 100755 index 0572c00d..882f9dcf --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -228,7 +228,7 @@ "search": "Chercher", "select-color": "Choisissez une couleur", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Auto-complétion des emojies", + "shortcut-autocomplete-emojies": "Auto-complétion des emoji", "shortcut-autocomplete-members": "Auto-complétion des membres", "shortcut-clear-filters": "Retirer tous les filtres", "shortcut-close-dialog": "Fermer le dialogue", diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json old mode 100644 new mode 100755 index 37452fae..7524ebdd --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -234,7 +234,7 @@ "search": "Search", "select-color": "Select a color", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emojies", + "shortcut-autocomplete-emojies": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", @@ -260,4 +260,4 @@ "view-it": "View it", "warn-list-archived": "warning: this card is in an archived list", "what-to-do": "What do you want to do?" -} \ No newline at end of file +} diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json old mode 100644 new mode 100755 index da1e89d3..08d30337 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -234,7 +234,7 @@ "search": "検索", "select-color": "色を選択", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emojies", + "shortcut-autocomplete-emojies": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", @@ -260,4 +260,4 @@ "view-it": "View it", "warn-list-archived": "warning: this card is in an archived list", "what-to-do": "What do you want to do?" -} \ No newline at end of file +} diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json old mode 100644 new mode 100755 index a6af2de7..f3194890 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -234,7 +234,7 @@ "search": "검색", "select-color": "색 선택", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emojies", + "shortcut-autocomplete-emojies": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", @@ -260,4 +260,4 @@ "view-it": "View it", "warn-list-archived": "warning: this card is in an archived list", "what-to-do": "What do you want to do?" -} \ No newline at end of file +} diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json old mode 100644 new mode 100755 index 417e4ede..381e0caf --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -234,7 +234,7 @@ "search": "Buscar", "select-color": "Selecione uma cor", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Preenchimento automático de emojies", + "shortcut-autocomplete-emojies": "Preenchimento automático de emoji", "shortcut-autocomplete-members": "Preenchimento automático de membros", "shortcut-clear-filters": "Limpar todos filtros", "shortcut-close-dialog": "Fechar dialogo", @@ -260,4 +260,4 @@ "view-it": "Visualizar", "warn-list-archived": "aviso: este cartão está em uma lista arquivada", "what-to-do": "O que você gostaria de fazer?" -} \ No newline at end of file +} diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json old mode 100644 new mode 100755 index 73c85175..bc7443f8 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -231,7 +231,7 @@ "search": "Поиск", "select-color": "Выбрать цвет", "shortcut-assign-self": "Связать себя с текущей карточкой", - "shortcut-autocomplete-emojies": "Автозаполнение emojies", + "shortcut-autocomplete-emojies": "Автозаполнение emoji", "shortcut-autocomplete-members": "Автозаполнение пользователей", "shortcut-clear-filters": "Сбросить все фильтры", "shortcut-close-dialog": "Закрыть диалог", diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json old mode 100644 new mode 100755 index bcec0834..47b4cd5f --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -234,7 +234,7 @@ "search": "Search", "select-color": "Bir renk seç", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emojies", + "shortcut-autocomplete-emojies": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", @@ -260,4 +260,4 @@ "view-it": "View it", "warn-list-archived": "warning: this card is in an archived list", "what-to-do": "What do you want to do?" -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From c05029d40312bdc57d99be1d792a1d592c17d029 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 28 Feb 2016 23:10:52 -0600 Subject: Changes in code to correct the spelling of emoji (plural) --- CHANGELOG.md | 4 ++-- client/components/main/editor.js | 4 ++-- client/lib/keyboard.js | 2 +- i18n/ar.i18n.json | 4 ++-- i18n/ca.i18n.json | 2 +- i18n/de.i18n.json | 4 ++-- i18n/en.i18n.json | 2 +- i18n/es.i18n.json | 2 +- i18n/fi.i18n.json | 4 ++-- i18n/fr.i18n.json | 2 +- i18n/it.i18n.json | 2 +- i18n/ja.i18n.json | 2 +- i18n/ko.i18n.json | 2 +- i18n/pt-BR.i18n.json | 2 +- i18n/ru.i18n.json | 2 +- i18n/tr.i18n.json | 2 +- i18n/zh-CN.i18n.json | 4 ++-- meta/t9n-changelog/fr.md | 4 ++-- 18 files changed, 25 insertions(+), 25 deletions(-) mode change 100644 => 100755 CHANGELOG.md mode change 100644 => 100755 client/components/main/editor.js mode change 100644 => 100755 client/lib/keyboard.js mode change 100644 => 100755 i18n/ar.i18n.json mode change 100644 => 100755 i18n/de.i18n.json mode change 100644 => 100755 i18n/fi.i18n.json mode change 100644 => 100755 i18n/zh-CN.i18n.json mode change 100644 => 100755 meta/t9n-changelog/fr.md diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100644 new mode 100755 index 0714a5f4..629b7fee --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -98,8 +98,8 @@ the popover was new). New features includes: * Assign and unassign members to cards; * Archive cards (though restoration is not yet possible); * Board stars; -* Markdown and emojies support in comments and card description; -* Emojies auto-completion in the text editor; +* Markdown and emoji support in comments and card description; +* Emoji auto-completion in the text editor; * Some keyboard shortcuts (eg `Ctrl`+`Enter` to submit a multi-line input). We also introduced basic support for the [Sandstorm](https://sandstorm.io) diff --git a/client/components/main/editor.js b/client/components/main/editor.js old mode 100644 new mode 100755 index a30a5e1d..709d22e2 --- 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 old mode 100644 new mode 100755 index f8212c9b..ff18738b --- 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', diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json old mode 100644 new mode 100755 index 109707fc..225b0975 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -234,7 +234,7 @@ "search": "بحث", "select-color": "اختيار لون", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "الإكمال التلقائي للرموز التعبيرية", + "shortcut-autocomplete-emoji": "الإكمال التلقائي للرموز التعبيرية", "shortcut-autocomplete-members": "الإكمال التلقائي لأسماء الأعضاء", "shortcut-clear-filters": "مسح التصفيات", "shortcut-close-dialog": "غلق النافذة", @@ -260,4 +260,4 @@ "view-it": "شاهدها", "warn-list-archived": "انتبه : هذه البطاقة في أرشيف القائمات", "what-to-do": "ماذا تريد أن تنجز?" -} \ No newline at end of file +} diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index 2593687d..fa223d02 100755 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -234,7 +234,7 @@ "search": "Cerca", "select-color": "Selecciona un color", "shortcut-assign-self": "Assigna't la ftixa actual", - "shortcut-autocomplete-emojies": "Autocompleta emoji", + "shortcut-autocomplete-emoji": "Autocompleta emoji", "shortcut-autocomplete-members": "Autocompleta membres", "shortcut-clear-filters": "Elimina tots els filters", "shortcut-close-dialog": "Tanca el diàleg", diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json old mode 100644 new mode 100755 index d0c57523..43e12d88 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -234,7 +234,7 @@ "search": "Suchen", "select-color": "Wähle eine Farbe aus", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autovervollständige Emojis", + "shortcut-autocomplete-emoji": "Autovervollständige Emojis", "shortcut-autocomplete-members": "Autovervollständige Nutzer", "shortcut-clear-filters": "Alle Filter entfernen", "shortcut-close-dialog": "Dialog schließen", @@ -260,4 +260,4 @@ "view-it": "Ansehen", "warn-list-archived": "Warnung: Diese Karte befindet sich in einer archivierten Liste", "what-to-do": "Was willst du tun?" -} \ No newline at end of file +} diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 022d5242..47d8c25c 100755 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -260,7 +260,7 @@ "search": "Search", "select-color": "Select a color", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emoji", + "shortcut-autocomplete-emoji": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 4cbd1f1d..b4af8f5a 100755 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -234,7 +234,7 @@ "search": "Buscar", "select-color": "Selecciona un color", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emoji", + "shortcut-autocomplete-emoji": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json old mode 100644 new mode 100755 index 10515ce2..caab4faf --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -234,7 +234,7 @@ "search": "Etsi", "select-color": "Valitse väri", "shortcut-assign-self": "Valitse itsesi nykyiselle kortille", - "shortcut-autocomplete-emojies": "Automaattinen täydennys emojille", + "shortcut-autocomplete-emoji": "Automaattinen täydennys emojille", "shortcut-autocomplete-members": "Automaattinen täydennys jäsenille", "shortcut-clear-filters": "Poista kaikki suodattimet", "shortcut-close-dialog": "Sulje valintaikkuna", @@ -260,4 +260,4 @@ "view-it": "Näytä se", "warn-list-archived": "varoitus: tämä kortti on arkistoitujen listalla", "what-to-do": "Mitä haluat tehdä?" -} \ No newline at end of file +} diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 882f9dcf..0642308c 100755 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -228,7 +228,7 @@ "search": "Chercher", "select-color": "Choisissez une couleur", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Auto-complétion des emoji", + "shortcut-autocomplete-emoji": "Auto-complétion des emoji", "shortcut-autocomplete-members": "Auto-complétion des membres", "shortcut-clear-filters": "Retirer tous les filtres", "shortcut-close-dialog": "Fermer le dialogue", diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 7524ebdd..07026fd4 100755 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -234,7 +234,7 @@ "search": "Search", "select-color": "Select a color", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emoji", + "shortcut-autocomplete-emoji": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 08d30337..6cde68c6 100755 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -234,7 +234,7 @@ "search": "検索", "select-color": "色を選択", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emoji", + "shortcut-autocomplete-emoji": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index f3194890..823a221d 100755 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -234,7 +234,7 @@ "search": "검색", "select-color": "색 선택", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emoji", + "shortcut-autocomplete-emoji": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 381e0caf..51c62f5b 100755 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -234,7 +234,7 @@ "search": "Buscar", "select-color": "Selecione uma cor", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Preenchimento automático de emoji", + "shortcut-autocomplete-emoji": "Preenchimento automático de emoji", "shortcut-autocomplete-members": "Preenchimento automático de membros", "shortcut-clear-filters": "Limpar todos filtros", "shortcut-close-dialog": "Fechar dialogo", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index bc7443f8..a2319a27 100755 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -231,7 +231,7 @@ "search": "Поиск", "select-color": "Выбрать цвет", "shortcut-assign-self": "Связать себя с текущей карточкой", - "shortcut-autocomplete-emojies": "Автозаполнение emoji", + "shortcut-autocomplete-emoji": "Автозаполнение emoji", "shortcut-autocomplete-members": "Автозаполнение пользователей", "shortcut-clear-filters": "Сбросить все фильтры", "shortcut-close-dialog": "Закрыть диалог", diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index 47b4cd5f..c05833bb 100755 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -234,7 +234,7 @@ "search": "Search", "select-color": "Bir renk seç", "shortcut-assign-self": "Assign yourself to current card", - "shortcut-autocomplete-emojies": "Autocomplete emoji", + "shortcut-autocomplete-emoji": "Autocomplete emoji", "shortcut-autocomplete-members": "Autocomplete members", "shortcut-clear-filters": "Clear all filters", "shortcut-close-dialog": "Close Dialog", diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json old mode 100644 new mode 100755 index d622cef5..32eb1516 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -234,7 +234,7 @@ "search": "搜索", "select-color": "选择颜色", "shortcut-assign-self": "分配当前卡片给自己", - "shortcut-autocomplete-emojies": "自动补全表情", + "shortcut-autocomplete-emoji": "自动补全表情", "shortcut-autocomplete-members": "自动补全成员", "shortcut-clear-filters": "清空全部过滤器", "shortcut-close-dialog": "关闭对话框", @@ -260,4 +260,4 @@ "view-it": "查看", "warn-list-archived": "警告: 该卡片位于已删除的清单中", "what-to-do": "要做什么？" -} \ No newline at end of file +} diff --git a/meta/t9n-changelog/fr.md b/meta/t9n-changelog/fr.md old mode 100644 new mode 100755 index dd966fbb..fed1fbe6 --- a/meta/t9n-changelog/fr.md +++ b/meta/t9n-changelog/fr.md @@ -39,9 +39,9 @@ Les nouvelles fonctionnalités incluent: * Assigner et retirer l’assignation de membres aux cartes; * Archiver des cartes (bien que la restauration ne soit pas encore possible); * Tableaux favoris -* Support du markdown et des emojies dans les commentaires et la description des +* Support du markdown et des emoji dans les commentaires et la description des cartes; -* Auto-complétion des emojies dans l'éditeur de texte; +* Auto-complétion des emoji dans l'éditeur de texte; * Quelques raccourcis clavier (ex `Ctrl`+`Enter` pour envoyer une entrée multi-lignes). -- cgit v1.2.3-1-g7c22