summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorshoetten <simon@hoetten.org>2016-02-10 15:51:55 +0100
committershoetten <simon@hoetten.org>2016-11-22 21:28:46 +0100
commitaa5ed6e48466b2ed3dc83696a6e18d7997b1c01e (patch)
treee728392ec196653b9690b596ecb7ae56a340da08 /client
parent5dd554b99960ebd3ac599fa5afc52838c8b7155f (diff)
downloadwekan-aa5ed6e48466b2ed3dc83696a6e18d7997b1c01e.tar.gz
wekan-aa5ed6e48466b2ed3dc83696a6e18d7997b1c01e.tar.bz2
wekan-aa5ed6e48466b2ed3dc83696a6e18d7997b1c01e.zip
Update translations and title of date badges.
Diffstat (limited to 'client')
-rw-r--r--client/components/cards/cardDate.js12
-rw-r--r--client/components/cards/cardDate.styl6
-rw-r--r--client/components/cards/cardDetails.jade4
3 files changed, 13 insertions, 9 deletions
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 6bdfaa1b..10bc54ff 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -148,10 +148,6 @@ const CardDate = BlazeComponent.extendComponent({
});
},
- showTitle() {
- return this.date.get().format('LLLL');
- },
-
showISODate() {
return this.date.get().toISOString();
},
@@ -173,6 +169,10 @@ class CardStartDate extends CardDate {
}
}
+ showTitle() {
+ return TAPi18n.__('card-start-on') + ' ' + this.date.get().format('LLLL');
+ }
+
events() {
return super.events().concat({
'click .js-edit-date': Popup.open('editCardStartDate'),
@@ -199,6 +199,10 @@ class CardDueDate extends CardDate {
return 'almost-due';
}
+ showTitle() {
+ return TAPi18n.__('card-due-on') + ' ' + this.date.get().format('LLLL');
+ }
+
events() {
return super.events().concat({
'click .js-edit-date': Popup.open('editCardDueDate'),
diff --git a/client/components/cards/cardDate.styl b/client/components/cards/cardDate.styl
index ab182207..51acdaab 100644
--- a/client/components/cards/cardDate.styl
+++ b/client/components/cards/cardDate.styl
@@ -30,9 +30,9 @@
color: #fff
&.current
- background-color: #42ca00
+ background-color: #5ba639
&:hover, &.is-active
- background-color: darken(#42ca00, 15)
+ background-color: darken(#5ba639, 10)
&.almost-due
background-color: #edc909
@@ -42,7 +42,7 @@
&.due
background-color: #fa3f00
&:hover, &.is-active
- background-color: darken(#fa3f00, 15)
+ background-color: darken(#fa3f00, 10)
&.long-overdue
background-color: #fd5d47
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 69725d76..f4212d83 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -37,12 +37,12 @@ template(name="cardDetails")
if startAt
.card-details-item.card-details-item-start
- h3.card-details-item-title {{_ 'start-at'}}
+ h3.card-details-item-title {{_ 'card-start'}}
+cardStartDate
if dueAt
.card-details-item.card-details-item-due
- h3.card-details-item-title {{_ 'due-at'}}
+ h3.card-details-item-title {{_ 'card-due'}}
+cardDueDate