Merge branch 'rjevnikar-cardCoverTimeBadges' into devel

client/components/cards/cardDate.js

@@ -279,11 +279,14 @@ class CardDueDate extends CardDate {
 
   classes() {
     let classes = 'due-date' + ' ';
-    if (this.now.get().diff(this.date.get(), 'days') >= 2)
+    if ((this.now.get().diff(this.date.get(), 'days') >= 2) &&
+       (this.date.get().isBefore(this.data().endAt)))
       classes += 'long-overdue';
-    else if (this.now.get().diff(this.date.get(), 'minute') >= 0)
+    else if ((this.now.get().diff(this.date.get(), 'minute') >= 0) &&
+       (this.date.get().isBefore(this.data().endAt)))
       classes += 'due';
-    else if (this.now.get().diff(this.date.get(), 'days') >= -1)
+    else if ((this.now.get().diff(this.date.get(), 'days') >= -1) &&
+       (this.date.get().isBefore(this.data().endAt)))
       classes += 'almost-due';
     return classes;
   }

client/components/cards/minicard.jade

@@ -10,12 +10,22 @@ template(name="minicard")
       +viewer
         = title
     .dates
+      if receivedAt
+        unless startAt
+          unless dueAt
+            unless endAt
+              .date
+                +miniCardReceivedDate
       if startAt
         .date
           +minicardStartDate
       if dueAt
+        unless endAt
+          .date
+            +minicardDueDate
+      if endAt
         .date
-          +minicardDueDate
+          +minicardEndDate
       if spentTime
         .date
           +cardSpentTime

i18n/de.i18n.json

@@ -469,10 +469,10 @@
     "card-end-on": "Endet am",
     "editCardReceivedDatePopup-title": "Empfangsdatum ändern",
     "editCardEndDatePopup-title": "Enddatum ändern",
-    "assigned-by": "Zugeteilt von",
+    "assigned-by": "Zugewiesen von",
     "requested-by": "Angefordert von",
-    "board-delete-notice": "Löschen ist dauerhaft. Du verlierst alle Listen, Karten und Aktionen, welche mit diesem Board verbunden sind.",
-    "delete-board-confirm-popup": "Alle Listen, Karten, Beschriftungen und Akivitäten werden gelöscht, das Board kann nicht wiederhergestellt werden! Es gibt kein Rückgängig.",
+    "board-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Sie werden alle Listen, Karten und Aktionen, die mit diesem Board verbunden sind, verlieren.",
+    "delete-board-confirm-popup": "Alle Listen, Karten, Labels und Akivitäten werden gelöscht und Sie können die Inhalte des Boards nicht wiederherstellen! Die Aktion kann nicht rückgängig gemacht werden.",
     "boardDeletePopup-title": "Board löschen?",
     "delete-board": "Board löschen"
 }

i18n/zh-CN.i18n.json

@@ -7,7 +7,7 @@
     "act-addComment": "在 __card__ 发布评论: __comment__",
     "act-createBoard": "创建看板 __board__",
     "act-createCard": "添加卡片 __card__  至列表 __list__",
-    "act-createCustomField": "created custom field __customField__",
+    "act-createCustomField": "创建了自定义字段 __customField__",
     "act-createList": "添加列表 __list__  至看板 __board__",
     "act-addBoardMember": "添加成员 __member__  至看板 __board__",
     "act-archivedBoard": "__board__ 已被移入回收站 ",
@@ -31,7 +31,7 @@
     "activity-archived": "%s 已被移入回收站",
     "activity-attached": "添加附件 %s 至 %s",
     "activity-created": "创建 %s",
-    "activity-customfield-created": "created custom field %s",
+    "activity-customfield-created": "创建了自定义字段 %s",
     "activity-excluded": "排除 %s 从 %s",
     "activity-imported": "导入 %s 至 %s 从 %s 中",
     "activity-imported-board": "已导入 %s 从 %s 中",
@@ -113,7 +113,7 @@
     "card-due-on": "期限",
     "card-spent": "耗时",
     "card-edit-attachments": "编辑附件",
-    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-custom-fields": "编辑自定义字段",
     "card-edit-labels": "编辑标签",
     "card-edit-members": "编辑成员",
     "card-labels-title": "更改该卡片上的标签",
@@ -121,8 +121,8 @@
     "card-start": "开始",
     "card-start-on": "始于",
     "cardAttachmentsPopup-title": "附件来源",
-    "cardCustomField-datePopup-title": "Change date",
-    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardCustomField-datePopup-title": "修改日期",
+    "cardCustomFieldsPopup-title": "编辑自定义字段",
     "cardDeletePopup-title": "彻底删除卡片？",
     "cardDetailsActionsPopup-title": "卡片操作",
     "cardLabelsPopup-title": "标签",
@@ -172,25 +172,25 @@
     "createBoardPopup-title": "创建看板",
     "chooseBoardSourcePopup-title": "导入看板",
     "createLabelPopup-title": "创建标签",
-    "createCustomField": "Create Field",
-    "createCustomFieldPopup-title": "Create Field",
+    "createCustomField": "创建字段",
+    "createCustomFieldPopup-title": "创建字段",
     "current": "当前",
-    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
-    "custom-field-checkbox": "Checkbox",
+    "custom-field-delete-pop": "没有撤销，此动作将从所有卡片中移除自定义字段并销毁历史。",
+    "custom-field-checkbox": "选择框",
     "custom-field-date": "日期",
-    "custom-field-dropdown": "Dropdown List",
-    "custom-field-dropdown-none": "(none)",
-    "custom-field-dropdown-options": "List Options",
-    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
-    "custom-field-dropdown-unknown": "(unknown)",
-    "custom-field-number": "Number",
-    "custom-field-text": "Text",
-    "custom-fields": "Custom Fields",
+    "custom-field-dropdown": "下拉列表",
+    "custom-field-dropdown-none": "(无)",
+    "custom-field-dropdown-options": "列表选项",
+    "custom-field-dropdown-options-placeholder": "回车可以加入更多选项",
+    "custom-field-dropdown-unknown": "(未知)",
+    "custom-field-number": "数字",
+    "custom-field-text": "文本",
+    "custom-fields": "自定义字段",
     "date": "日期",
     "decline": "拒绝",
     "default-avatar": "默认头像",
     "delete": "删除",
-    "deleteCustomFieldPopup-title": "Delete Custom Field?",
+    "deleteCustomFieldPopup-title": "删除自定义字段？",
     "deleteLabelPopup-title": "删除标签？",
     "description": "描述",
     "disambiguateMultiLabelPopup-title": "标签消歧 [?]",
@@ -205,7 +205,7 @@
     "soft-wip-limit": "软在制品限制",
     "editCardStartDatePopup-title": "修改起始日期",
     "editCardDueDatePopup-title": "修改截止日期",
-    "editCustomFieldPopup-title": "Edit Field",
+    "editCustomFieldPopup-title": "编辑字段",
     "editCardSpentTimePopup-title": "修改耗时",
     "editLabelPopup-title": "更改标签",
     "editNotificationPopup-title": "编辑通知",
@@ -242,12 +242,12 @@
     "filter-clear": "清空过滤器",
     "filter-no-label": "无标签",
     "filter-no-member": "无成员",
-    "filter-no-custom-fields": "No Custom Fields",
+    "filter-no-custom-fields": "无自定义字段",
     "filter-on": "过滤器启用",
     "filter-on-desc": "你正在过滤该看板上的卡片，点此编辑过滤。",
     "filter-to-selection": "要选择的过滤器",
-    "advanced-filter-label": "Advanced Filter",
-    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. Also you can combine multiple conditions. For Example: F1 == V1 || F1 = V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 and ( F2 == V2 || F2 == V3 )",
+    "advanced-filter-label": "高级过滤器",
+    "advanced-filter-description": "高级过滤器可以使用包含如下操作符的字符串进行过滤：== != <= >= && || ( ) 。操作符之间用空格隔开。输入字段名和数值就可以过滤所有自定义字段。例如：Field1 == Value1. 注意如果字段名或数值包含空格，需要用单引号。例如: 'Field 1' == 'Value 1'。支持组合使用多个条件，例如: F1 == V1 || F1 = V2。通常以从左到右的顺序进行判断。可以通过括号修改顺序,例如：F1 == V1 and ( F2 == V2 || F2 == V3 )",
     "fullname": "全称",
     "header-logo-title": "返回您的看板页",
     "hide-system-messages": "隐藏系统消息",
@@ -389,7 +389,7 @@
     "title": "标题",
     "tracking": "跟踪",
     "tracking-info": "当任何包含您（作为创建者或成员）的卡片发生变更时，您将得到通知。",
-    "type": "Type",
+    "type": "类型",
     "unassign-member": "取消分配成员",
     "unsaved-description": "存在未保存的描述",
     "unwatch": "取消关注",
@@ -454,7 +454,7 @@
     "hours": "小时",
     "minutes": "分钟",
     "seconds": "秒",
-    "show-field-on-card": "Show this field on card",
+    "show-field-on-card": "在卡片上显示此字段",
     "yes": "是",
     "no": "否",
     "accounts": "账号",
@@ -469,10 +469,10 @@
     "card-end-on": "终止于",
     "editCardReceivedDatePopup-title": "修改接收日期",
     "editCardEndDatePopup-title": "修改终止日期",
-    "assigned-by": "Assigned By",
-    "requested-by": "Requested By",
-    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
-    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
-    "boardDeletePopup-title": "Delete Board?",
-    "delete-board": "Delete Board"
+    "assigned-by": "分配人",
+    "requested-by": "需求人",
+    "board-delete-notice": "删除时永久操作，将会丢失此看板上的所有列表、卡片和动作。",
+    "delete-board-confirm-popup": "所有列表、卡片、标签和活动都回被删除，将无法恢复看板内容。不支持撤销。",
+    "boardDeletePopup-title": "删除看板？",
+    "delete-board": "删除看板"
 }