diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade index b9a1351cb..1f351357a 100644 --- a/client/components/rules/ruleDetails.jade +++ b/client/components/rules/ruleDetails.jade @@ -14,5 +14,9 @@ template(name="ruleDetails") div.trigger-content div.trigger-text = action + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}} \ No newline at end of file diff --git a/client/components/rules/ruleDetails.js b/client/components/rules/ruleDetails.js index 386b2b48b..17c86dc3e 100644 --- a/client/components/rules/ruleDetails.js +++ b/client/components/rules/ruleDetails.js @@ -14,7 +14,9 @@ BlazeComponent.extendComponent({ const trigger = Triggers.findOne({ _id: rule.triggerId, }); - return trigger.description(); + const desc = trigger.description(); + const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1); + return upperdesc; }, action() { const ruleId = this.data().ruleId; @@ -24,7 +26,9 @@ BlazeComponent.extendComponent({ const action = Actions.findOne({ _id: rule.actionId, }); - return action.description(); + const desc = action.description(); + const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1); + return upperdesc; }, events() { diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl index 45ce4003a..b52f84a77 100644 --- a/client/components/rules/rules.styl +++ b/client/components/rules/rules.styl @@ -32,6 +32,17 @@ display: inline-block float: right margin: auto +.rules-back + display: block + overflow: auto + margin-top: 15px + margin-bottom: 5px + button + display: inline-block + float: right + margin: auto + margin-right:14px + .flex display: -webkit-box display: -moz-box diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade index 8dfceeebf..4bcff7691 100644 --- a/client/components/rules/rulesActions.jade +++ b/client/components/rules/rulesActions.jade @@ -22,4 +22,8 @@ template(name="rulesActions") else if ($eq currentActions.get 'checklist') +checklistActions(ruleName=data.ruleName triggerVar=data.triggerVar) else if ($eq currentActions.get 'mail') - +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar) \ No newline at end of file + +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar) + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}} \ No newline at end of file diff --git a/client/components/rules/rulesActions.js b/client/components/rules/rulesActions.js index ecba857b7..64a5c70ef 100644 --- a/client/components/rules/rulesActions.js +++ b/client/components/rules/rulesActions.js @@ -41,16 +41,16 @@ BlazeComponent.extendComponent({ }, events() { return [{ - 'click .js-set-board-actions' (event) { + 'click .js-set-board-actions'(){ this.setBoardActions(); }, - 'click .js-set-card-actions' (event) { + 'click .js-set-card-actions'() { this.setCardActions(); }, - 'click .js-set-mail-actions' (event) { + 'click .js-set-mail-actions'() { this.setMailActions(); }, - 'click .js-set-checklist-actions' (event) { + 'click .js-set-checklist-actions'() { this.setChecklistActions(); }, }]; diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 65cc3d98a..3e871c69b 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -24,7 +24,7 @@ BlazeComponent.extendComponent({ events() { return [{ - 'click .js-delete-rule' (event) { + 'click .js-delete-rule' () { const rule = this.currentData(); Rules.remove(rule._id); Actions.remove(rule.actionId); @@ -34,9 +34,11 @@ BlazeComponent.extendComponent({ 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; - this.find('#ruleTitle').value = ''; - this.ruleName.set(ruleTitle); - this.setTrigger(); + if(ruleTitle != undefined && ruleTitle != ''){ + this.find('#ruleTitle').value = ''; + this.ruleName.set(ruleTitle); + this.setTrigger(); + } }, 'click .js-goto-action' (event) { event.preventDefault(); @@ -46,6 +48,15 @@ BlazeComponent.extendComponent({ event.preventDefault(); this.setRulesList(); }, + 'click .js-goback' (event) { + event.preventDefault(); + if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){ + this.setRulesList(); + } + if(this.rulesCurrentTab.get() === 'action'){ + this.setTrigger(); + } + }, 'click .js-goto-details' (event) { event.preventDefault(); const rule = this.currentData(); diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade index 0ef5edfa1..01c0cad50 100644 --- a/client/components/rules/rulesTriggers.jade +++ b/client/components/rules/rulesTriggers.jade @@ -18,4 +18,8 @@ template(name="rulesTriggers") else if showCardTrigger.get +cardTriggers else if showChecklistTrigger.get - +checklistTriggers \ No newline at end of file + +checklistTriggers + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}} \ No newline at end of file diff --git a/client/components/rules/rulesTriggers.js b/client/components/rules/rulesTriggers.js index 506e63b2b..e3c16221a 100644 --- a/client/components/rules/rulesTriggers.js +++ b/client/components/rules/rulesTriggers.js @@ -39,13 +39,13 @@ BlazeComponent.extendComponent({ }, events() { return [{ - 'click .js-set-board-triggers' (event) { + 'click .js-set-board-triggers' () { this.setBoardTriggers(); }, - 'click .js-set-card-triggers' (event) { + 'click .js-set-card-triggers' () { this.setCardTriggers(); }, - 'click .js-set-checklist-triggers' (event) { + 'click .js-set-checklist-triggers' () { this.setChecklistTriggers(); }, }]; diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 62e886e57..79c2c4391 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "رجوع" } \ No newline at end of file diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index 9a8c8b652..9694e3629 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Назад" } \ No newline at end of file diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index 467c99d98..11b03b677 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index dd54348e2..d4f8a9e46 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Enrere" } \ No newline at end of file diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index e9bc74ab6..4ab246fff 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Přidat pravidlo", "r-view-rule": "Zobrazit pravidlo", "r-delete-rule": "Smazat pravidlo", - "r-new-rule-name": "Přidat nové pravidlo", + "r-new-rule-name": "New rule title", "r-no-rules": "Žádná pravidla", "r-when-a-card-is": "Pokud je karta", "r-added-to": "Přidáno do", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Přidat checklist", "r-d-remove-checklist": "Odstranit checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Zpět" } \ No newline at end of file diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 408224fd4..0061cd208 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Regel hinzufügen", "r-view-rule": "Regel anzeigen", "r-delete-rule": "Regel löschen", - "r-new-rule-name": "Neue Regel hinzufügen", + "r-new-rule-name": "New rule title", "r-no-rules": "Keine Regeln", "r-when-a-card-is": "Wenn eine Karte ist", "r-added-to": "Hinzugefügt zu", @@ -575,7 +575,7 @@ "r-checklist": "Checkliste", "r-check-all": "Alle markieren", "r-uncheck-all": "Alle demarkieren", - "r-item-check": "Elemente der Checkliste", + "r-items-check": "items of checklist", "r-check": "Markieren", "r-uncheck": "Demarkieren", "r-item": "Element", @@ -606,5 +606,6 @@ "r-d-check-of-list": "der Checkliste", "r-d-add-checklist": "Checkliste hinzufügen", "r-d-remove-checklist": "Checkliste entfernen", - "r-when-a-card-is-moved": "Wenn eine Karte in eine andere Liste verschoben wird" + "r-when-a-card-is-moved": "Wenn eine Karte in eine andere Liste verschoben wird", + "r-back": "Zurück" } \ No newline at end of file diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index 6f9c3a661..8eaf05472 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Πίσω" } \ No newline at end of file diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index bf2dbea3b..2bd95662d 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 896c10a3f..cec9b6e43 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -576,7 +576,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -607,5 +607,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index a61208b3b..a198a3ca0 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Reen" } \ No newline at end of file diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index a2d55ac2c..ed498502f 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Atrás" } \ No newline at end of file diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 1c11035b5..10e52b72b 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Atrás" } \ No newline at end of file diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 19e36b193..8175de0bc 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Atzera" } \ No newline at end of file diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index 9ebaee6a9..43b41309f 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "بازگشت" } \ No newline at end of file diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 753acfafa..913b0756b 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Lisää sääntö", "r-view-rule": "Näytä sääntö", "r-delete-rule": "Poista sääntö", - "r-new-rule-name": "Lisää uusi sääntö", + "r-new-rule-name": "Uuden säännön otsikko", "r-no-rules": "Ei sääntöjä", "r-when-a-card-is": "Kun kortti on", "r-added-to": "Lisätty kohteeseen", @@ -575,7 +575,7 @@ "r-checklist": "tarkistuslista", "r-check-all": "Ruksaa kaikki", "r-uncheck-all": "Poista ruksi kaikista", - "r-item-check": "Kohtaa tarkistuslistassa", + "r-items-check": "kohtaa tarkistuslistassa", "r-check": "Ruksaa", "r-uncheck": "Poista ruksi", "r-item": "kohta", @@ -606,5 +606,6 @@ "r-d-check-of-list": "tarkistuslistasta", "r-d-add-checklist": "Lisää tarkistuslista", "r-d-remove-checklist": "Poista tarkistuslista", - "r-when-a-card-is-moved": "Kun kortti on siirretty toiseen listaan" + "r-when-a-card-is-moved": "Kun kortti on siirretty toiseen listaan", + "r-back": "Takaisin" } \ No newline at end of file diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 47da1ee26..666afaa3d 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Ajouter une règle", "r-view-rule": "Voir la règle", "r-delete-rule": "Supprimer la règle", - "r-new-rule-name": "Ajouter une nouvelle règle", + "r-new-rule-name": "New rule title", "r-no-rules": "Pas de règles", "r-when-a-card-is": "Quand une carte est", "r-added-to": "Ajouté à", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Tout cocher", "r-uncheck-all": "Tout décocher", - "r-item-check": "Éléments de la checklist", + "r-items-check": "items of checklist", "r-check": "Cocher", "r-uncheck": "Décocher", "r-item": "élément", @@ -606,5 +606,6 @@ "r-d-check-of-list": "de la checklist", "r-d-add-checklist": "Ajouter une checklist", "r-d-remove-checklist": "Supprimer la checklist", - "r-when-a-card-is-moved": "Quand une carte est déplacée vers une autre liste" + "r-when-a-card-is-moved": "Quand une carte est déplacée vers une autre liste", + "r-back": "Retour" } \ No newline at end of file diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 759bd1cd2..02df41dfd 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index ff52b6991..34d6a0bdf 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "הוספת כלל", "r-view-rule": "הצגת כלל", "r-delete-rule": "מחיקת כל", - "r-new-rule-name": "הוספת כלל חדש", + "r-new-rule-name": "New rule title", "r-no-rules": "אין כללים", "r-when-a-card-is": "כאשר כרטיס", "r-added-to": "נוסף אל", @@ -575,7 +575,7 @@ "r-checklist": "רשימת משימות", "r-check-all": "לסמן הכול", "r-uncheck-all": "לבטל את הסימון", - "r-item-check": "פריטים לרשימת משימות", + "r-items-check": "items of checklist", "r-check": "סימון", "r-uncheck": "ביטול סימון", "r-item": "פריט", @@ -606,5 +606,6 @@ "r-d-check-of-list": "של רשימת משימות", "r-d-add-checklist": "הוספת רשימת משימות", "r-d-remove-checklist": "הסרת רשימת משימות", - "r-when-a-card-is-moved": "כאשר כרטיס מועבר לרשימה אחרת" + "r-when-a-card-is-moved": "כאשר כרטיס מועבר לרשימה אחרת", + "r-back": "חזרה" } \ No newline at end of file diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index 1ebe8bef8..989bc046c 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Vissza" } \ No newline at end of file diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index d37621bc2..e59f2b2ae 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index 11ce4d458..1124fc1b1 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Kembali" } \ No newline at end of file diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index 9ff7f64c8..7ca45a9f3 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 85c760c61..383c19a06 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Indietro" } \ No newline at end of file diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index c86845b7f..4d471c8ab 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "戻る" } \ No newline at end of file diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index 3012bb3e9..0c3804957 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "უკან" } \ No newline at end of file diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index 0e6c89344..a1f10b5f0 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 17d42a591..ef5cd2a89 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "뒤로" } \ No newline at end of file diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index 7baad114c..19a111486 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index e7698c576..c07943cc6 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 15d8a651a..7192b06e2 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Tilbake" } \ No newline at end of file diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 51332157b..74181664e 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Terug" } \ No newline at end of file diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 85c7dca48..e9638c5f2 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Dodaj regułę", "r-view-rule": "Zobacz regułę", "r-delete-rule": "Usuń regułę", - "r-new-rule-name": "Dodaj nową regułę", + "r-new-rule-name": "New rule title", "r-no-rules": "Brak regułę", "r-when-a-card-is": "Gdy karta jest", "r-added-to": "Dodano do", @@ -575,7 +575,7 @@ "r-checklist": "lista zadań", "r-check-all": "Zaznacz wszystkie", "r-uncheck-all": "Odznacz wszystkie", - "r-item-check": "Elementy listy zadań", + "r-items-check": "items of checklist", "r-check": "Zaznacz", "r-uncheck": "Odznacz", "r-item": "element", @@ -606,5 +606,6 @@ "r-d-check-of-list": "z listy zadań", "r-d-add-checklist": "Dodaj listę zadań", "r-d-remove-checklist": "Usuń listę zadań", - "r-when-a-card-is-moved": "Gdy karta jest przeniesiona do innej listy" + "r-when-a-card-is-moved": "Gdy karta jest przeniesiona do innej listy", + "r-back": "Wstecz" } \ No newline at end of file diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index c1038b2cb..fab66d39d 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Marcar todos", "r-uncheck-all": "Desmarcar todos", - "r-item-check": "itens do checklist", + "r-items-check": "items of checklist", "r-check": "Marcar", "r-uncheck": "Desmarcar", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "do checklist", "r-d-add-checklist": "Adicionar checklist", "r-d-remove-checklist": "Remover checklist", - "r-when-a-card-is-moved": "Quando um cartão é movido de outra lista" + "r-when-a-card-is-moved": "Quando um cartão é movido de outra lista", + "r-back": "Voltar" } \ No newline at end of file diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index 986efb39d..e4b17726f 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 6ece0bcc6..0ce0d83c0 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Înapoi" } \ No newline at end of file diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index d501d77eb..197957c5e 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Назад" } \ No newline at end of file diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 968b6a181..df740b3d5 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Nazad" } \ No newline at end of file diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 670f6844f..935f554b8 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Tillbaka" } \ No newline at end of file diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index 07686e885..770b7d662 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" } \ No newline at end of file diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index 3227dd34b..a07806a40 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "ย้อนกลับ" } \ No newline at end of file diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index e6b5e275f..ba7933449 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Geri" } \ No newline at end of file diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index 0fc8265e0..47422a572 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Назад" } \ No newline at end of file diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index be1a166ef..a71693b61 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Trở Lại" } \ No newline at end of file diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 7f49807f2..274c2a387 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "返回" } \ No newline at end of file diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 89ea22e51..4bc60d39d 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "返回" } \ No newline at end of file diff --git a/models/checklistItems.js b/models/checklistItems.js index 7132bc7cc..519630aee 100644 --- a/models/checklistItems.js +++ b/models/checklistItems.js @@ -118,7 +118,7 @@ function publishCheckActivity(userId, doc){ Activities.insert(act); } -function publishChekListCompleted(userId, doc, fieldNames, modifier){ +function publishChekListCompleted(userId, doc, fieldNames){ const card = Cards.findOne(doc.cardId); const boardId = card.boardId; const checklistId = doc.checklistId; @@ -136,7 +136,7 @@ function publishChekListCompleted(userId, doc, fieldNames, modifier){ } } -function publishChekListUncompleted(userId, doc, fieldNames, modifier){ +function publishChekListUncompleted(userId, doc, fieldNames){ const card = Cards.findOne(doc.cardId); const boardId = card.boardId; const checklistId = doc.checklistId; @@ -162,11 +162,11 @@ if (Meteor.isServer) { ChecklistItems.after.update((userId, doc, fieldNames, modifier) => { publishCheckActivity(userId, doc); - publishChekListCompleted(userId, doc, fieldNames, modifier); + publishChekListCompleted(userId, doc, fieldNames); }); ChecklistItems.before.update((userId, doc, fieldNames, modifier) => { - publishChekListUncompleted(userId, doc, fieldNames, modifier); + publishChekListUncompleted(userId, doc, fieldNames); }); diff --git a/models/wekanCreator.js b/models/wekanCreator.js index b018b06dd..59d0cfd56 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -510,7 +510,7 @@ export class WekanCreator { } createTriggers(wekanTriggers, boardId) { - wekanTriggers.forEach((trigger, ruleIndex) => { + wekanTriggers.forEach((trigger) => { if (trigger.hasOwnProperty('labelId')) { trigger.labelId = this.labels[trigger.labelId]; } @@ -525,7 +525,7 @@ export class WekanCreator { } createActions(wekanActions, boardId) { - wekanActions.forEach((action, ruleIndex) => { + wekanActions.forEach((action) => { if (action.hasOwnProperty('labelId')) { action.labelId = this.labels[action.labelId]; } @@ -540,7 +540,7 @@ export class WekanCreator { } createRules(wekanRules, boardId) { - wekanRules.forEach((rule, ruleIndex) => { + wekanRules.forEach((rule) => { // Create the rule rule.boardId = boardId; rule.triggerId = this.triggers[rule.triggerId]; diff --git a/server/rulesHelper.js b/server/rulesHelper.js index e9139933b..3630507a6 100644 --- a/server/rulesHelper.js +++ b/server/rulesHelper.js @@ -3,7 +3,9 @@ RulesHelper = { const matchingRules = this.findMatchingRules(activity); for(let i = 0; i< matchingRules.length; i++){ const action = matchingRules[i].getAction(); - this.performAction(activity, action); + if(action != undefined){ + this.performAction(activity, action); + } } }, findMatchingRules(activity){ @@ -16,7 +18,12 @@ RulesHelper = { const matchingTriggers = Triggers.find(matchingMap); const matchingRules = []; matchingTriggers.forEach(function(trigger){ - matchingRules.push(trigger.getRule()); + const rule = trigger.getRule(); + // Check that for some unknown reason there are some leftover triggers + // not connected to any rules + if(rule != undefined){ + matchingRules.push(trigger.getRule()); + } }); return matchingRules; }, @@ -65,10 +72,10 @@ RulesHelper = { const emailSubject = action.emailSubject; try { Email.send({ - to, + emailTo, from: Accounts.emailTemplates.from, - subject, - text, + emailSubject, + emailMsg, }); } catch (e) { return;