From aa5ed6e48466b2ed3dc83696a6e18d7997b1c01e Mon Sep 17 00:00:00 2001
From: shoetten <simon@hoetten.org>
Date: Wed, 10 Feb 2016 15:51:55 +0100
Subject: Update translations and title of date badges.

---
 client/components/cards/cardDate.js      | 12 ++++++++----
 client/components/cards/cardDate.styl    |  6 +++---
 client/components/cards/cardDetails.jade |  4 ++--
 i18n/en.i18n.json                        |  7 +++++--
 4 files changed, 18 insertions(+), 11 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
 
 
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index fc7ae24b..83ff2975 100755
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -88,11 +88,15 @@
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
     "card-delete-suggest-archive": "You can archive a card to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
     "card-edit-attachments": "Edit attachments",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
     "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
@@ -144,7 +148,6 @@
     "discard": "Discard",
     "done": "Done",
     "download": "Download",
-    "due-at": "Due",
     "edit": "Edit",
     "edit-avatar": "Change Avatar",
     "edit-profile": "Edit Profile",
@@ -201,6 +204,7 @@
     "importMapMembersAddPopup-title": "Select Wekan member",
     "info": "Infos",
     "initials": "Initials",
+    "invalid-date": "Invalid date",
     "joined": "joined",
     "just-invited": "You are just invited to this board",
     "keyboard-shortcuts": "Keyboard shortcuts",
@@ -286,7 +290,6 @@
     "star-board-title": "Click to star this board. It will show up at top of your boards list.",
     "starred-boards": "Starred Boards",
     "starred-boards-description": "Starred boards show up at the top of your boards list.",
-    "start-at": "Start",
     "subscribe": "Subscribe",
     "team": "Team",
     "this-board": "this board",
-- 
cgit v1.2.3-1-g7c22