diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-01-22 17:33:27 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-01-22 17:33:27 +0200 |
commit | 46a468b06dd5d4ca2338140bb2fd32958ccef85f (patch) | |
tree | 9a7656c0fa92c0895c25d958764f090c74d0c129 /client/components/rules/triggers/cardTriggers.js | |
parent | 8d4eef66493f464035616fec7ac8b2f14720ce57 (diff) | |
parent | 1b445ad789a41d97b7cf4e16af35f52ae0be694b (diff) | |
download | wekan-46a468b06dd5d4ca2338140bb2fd32958ccef85f.tar.gz wekan-46a468b06dd5d4ca2338140bb2fd32958ccef85f.tar.bz2 wekan-46a468b06dd5d4ca2338140bb2fd32958ccef85f.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components/rules/triggers/cardTriggers.js')
-rw-r--r-- | client/components/rules/triggers/cardTriggers.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/components/rules/triggers/cardTriggers.js b/client/components/rules/triggers/cardTriggers.js index 2303a85b..82b21d61 100644 --- a/client/components/rules/triggers/cardTriggers.js +++ b/client/components/rules/triggers/cardTriggers.js @@ -6,7 +6,10 @@ BlazeComponent.extendComponent({ const labels = Boards.findOne(Session.get('currentBoard')).labels; for (let i = 0; i < labels.length; i++) { 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}`)}`; + } else { + labels[i].translatedname = labels[i].name; } } return labels; |