Explorar o código

- Translate and add colors to IFTTT Rules dropdown.

Thanks to xet7 !
Lauri Ojansivu %!s(int64=6) %!d(string=hai) anos
pai
achega
44e4df2492

+ 1 - 1
client/components/cards/cardDetails.js

@@ -3,7 +3,7 @@ const { calculateIndexData, enableClickOnTouch } = Utils;
 
 
 let cardColors;
 let cardColors;
 Meteor.startup(() => {
 Meteor.startup(() => {
-  cardColors = Cards.simpleSchema()._schema['color'].allowedValues;
+  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
 });
 });
 
 
 BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({

+ 16 - 16
client/components/rules/triggers/cardTriggers.jade

@@ -1,13 +1,13 @@
 template(name="cardTriggers")
 template(name="cardTriggers")
   div.trigger-item
   div.trigger-item
     div.trigger-content
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-a-label-is'}}
         | {{_'r-when-a-label-is'}}
       div.trigger-dropdown
       div.trigger-dropdown
         select(id="label-action")
         select(id="label-action")
           option(value="added") {{_'r-added-to'}}
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
         i.fa.fa-user
@@ -21,20 +21,20 @@ template(name="cardTriggers")
 
 
   div.trigger-item
   div.trigger-item
     div.trigger-content
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-the-label-is'}}
         | {{_'r-when-the-label-is'}}
       div.trigger-dropdown
       div.trigger-dropdown
         select(id="spec-label")
         select(id="spec-label")
           each labels
           each labels
-            option(value="#{_id}")
-              = name
-      div.trigger-text 
+            option(value="#{_id}" style="background-color: #{name}")
+              = translatedname
+      div.trigger-text
         | {{_'r-is'}}
         | {{_'r-is'}}
       div.trigger-dropdown
       div.trigger-dropdown
         select(id="spec-label-action")
         select(id="spec-label-action")
           option(value="added") {{_'r-added-to'}}
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
         i.fa.fa-user
@@ -48,13 +48,13 @@ template(name="cardTriggers")
 
 
   div.trigger-item
   div.trigger-item
     div.trigger-content
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-a-member'}}
         | {{_'r-when-a-member'}}
       div.trigger-dropdown
       div.trigger-dropdown
         select(id="gen-member-action")
         select(id="gen-member-action")
           option(value="added") {{_'r-added-to'}}
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
         i.fa.fa-user
@@ -69,17 +69,17 @@ template(name="cardTriggers")
 
 
   div.trigger-item
   div.trigger-item
     div.trigger-content
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-the-member'}}
         | {{_'r-when-the-member'}}
       div.trigger-dropdown
       div.trigger-dropdown
-        input(id="spec-member",type=text,placeholder="{{_'r-name'}}") 
-      div.trigger-text 
+        input(id="spec-member",type=text,placeholder="{{_'r-name'}}")
+      div.trigger-text
         | {{_'r-is'}}
         | {{_'r-is'}}
       div.trigger-dropdown
       div.trigger-dropdown
         select(id="spec-member-action")
         select(id="spec-member-action")
           option(value="added") {{_'r-added-to'}}
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
         i.fa.fa-user
@@ -93,15 +93,15 @@ template(name="cardTriggers")
 
 
   div.trigger-item
   div.trigger-item
     div.trigger-content
     div.trigger-content
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-when-a-attach'}}
         | {{_'r-when-a-attach'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-is'}}
         | {{_'r-is'}}
       div.trigger-dropdown
       div.trigger-dropdown
         select(id="attach-action")
         select(id="attach-action")
           option(value="added") {{_'r-added-to'}}
           option(value="added") {{_'r-added-to'}}
           option(value="removed") {{_'r-removed-from'}}
           option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
         | {{_'r-a-card'}}
         | {{_'r-a-card'}}
       div.trigger-button.trigger-button-person.js-show-user-field
       div.trigger-button.trigger-button-person.js-show-user-field
         i.fa.fa-user
         i.fa.fa-user

+ 2 - 1
client/components/rules/triggers/cardTriggers.js

@@ -6,7 +6,8 @@ BlazeComponent.extendComponent({
     const labels = Boards.findOne(Session.get('currentBoard')).labels;
     const labels = Boards.findOne(Session.get('currentBoard')).labels;
     for (let i = 0; i < labels.length; i++) {
     for (let i = 0; i < labels.length; i++) {
       if (labels[i].name === '' || labels[i].name === undefined) {
       if (labels[i].name === '' || labels[i].name === undefined) {
-        labels[i].name = labels[i].color.toUpperCase();
+        labels[i].name = labels[i].color;
+        labels[i].translatedname = `${TAPi18n.__(`color-${  labels[i].color}`)}`;
       }
       }
     }
     }
     return labels;
     return labels;