summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-10-15 00:52:32 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-10-15 00:52:32 +0200
commit15ebfa63c61694e4aa60e0f9c5047f678d6cf0c4 (patch)
tree1e7a7245bb7a9f47548ec2c26e6d13d5010b8e4a
parent944a1065d372095e8a0898a4162ca6bb562bab69 (diff)
downloadwekan-15ebfa63c61694e4aa60e0f9c5047f678d6cf0c4.tar.gz
wekan-15ebfa63c61694e4aa60e0f9c5047f678d6cf0c4.tar.bz2
wekan-15ebfa63c61694e4aa60e0f9c5047f678d6cf0c4.zip
Translate the label colors
-rw-r--r--.meteor/versions4
-rw-r--r--client/components/sidebar/sidebarFilters.jade2
-rw-r--r--client/config/blazeHelpers.js4
-rw-r--r--i18n/en.i18n.json10
4 files changed, 17 insertions, 3 deletions
diff --git a/.meteor/versions b/.meteor/versions
index 5ced1e20..586c3297 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -87,8 +87,8 @@ mongo-livedata@1.0.9
mousetrap:mousetrap@1.4.6_1
mquandalle:autofocus@1.0.0
mquandalle:collection-mutations@0.1.0
-mquandalle:jade@0.4.3_1
-mquandalle:jade-compiler@0.4.3
+mquandalle:jade@0.4.4
+mquandalle:jade-compiler@0.4.4
mquandalle:jquery-textcomplete@0.8.0_1
mquandalle:jquery-ui-drag-drop-sort@0.1.0
mquandalle:moment@1.0.0
diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade
index d9275314..ef26ef76 100644
--- a/client/components/sidebar/sidebarFilters.jade
+++ b/client/components/sidebar/sidebarFilters.jade
@@ -13,7 +13,7 @@ template(name="filterSidebar")
if name
= name
else
- span.quiet {{_ "label-default" color}}
+ span.quiet {{_ "label-default" (_ (concat "color-" color))}}
if Filter.labelIds.isSelected _id
i.fa.fa-check
hr
diff --git a/client/config/blazeHelpers.js b/client/config/blazeHelpers.js
index 12990ed7..adf5ef6a 100644
--- a/client/config/blazeHelpers.js
+++ b/client/config/blazeHelpers.js
@@ -13,3 +13,7 @@ Blaze.registerHelper('currentCard', () => {
});
Blaze.registerHelper('getUser', (userId) => Users.findOne(userId));
+
+UI.registerHelper('concat', function (...args) {
+ return Array.prototype.slice.call(args, 0, -1).join('');
+});
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 9f383ae4..efc6128d 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -90,6 +90,16 @@
"close": "Close",
"close-board": "Close Board",
"close-board-pop": "You can re-open the board by clicking the “Boards” menu from the header, selecting “View Closed Boards”, finding the board and clicking “Re-open”.",
+ "color-green": "green",
+ "color-yellow": "yellow",
+ "color-orange": "orange",
+ "color-red": "red",
+ "color-purple": "purple",
+ "color-blue": "blue",
+ "color-sky": "sky",
+ "color-lime": "lime",
+ "color-pink": "pink",
+ "color-black": "black",
"comment": "Comment",
"comment-placeholder": "Write a comment",
"computer": "Computer",