Explorar o código

Merge branch 'edge' into meteor-1.8

Lauri Ojansivu %!s(int64=6) %!d(string=hai) anos
pai
achega
0c352ab143
Modificáronse 7 ficheiros con 72 adicións e 61 borrados
  1. 9 0
      CHANGELOG.md
  2. 1 1
      Stackerfile.yml
  3. 2 0
      client/components/cards/attachments.js
  4. 11 11
      i18n/oc.i18n.json
  5. 46 46
      i18n/zh-TW.i18n.json
  6. 1 1
      package.json
  7. 2 2
      sandstorm-pkgdef.capnp

+ 9 - 0
CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.91 2019-06-27 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Attachment Outgoing Webhook missing list and swimlane name](https://github.com/wekan/wekan/commit/6a2f120d00b5ce9089ad2e12d01edb1ed9f94800).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.90 2019-06-21 Wekan release
 
 This release reverts the following Sandstorm changes:

+ 1 - 1
Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.90.0"
+appVersion: "v2.91.0"
 files:
   userUploads:
     - README.md

+ 2 - 0
client/components/cards/attachments.js

@@ -62,6 +62,8 @@ Template.cardAttachmentsPopup.events({
         file.cardId = card.linkedId;
       } else {
         file.boardId = card.boardId;
+        file.swimlaneId = card.swimlaneId;
+        file.listId = card.listId;
         file.cardId = card._id;
       }
       file.userId = Meteor.userId();

+ 11 - 11
i18n/oc.i18n.json

@@ -435,7 +435,7 @@
     "show-cards-minimum-count": "Show cards count if list contains more than",
     "sidebar-open": "Open Sidebar",
     "sidebar-close": "Close Sidebar",
-    "signupPopup-title": "Create an Account",
+    "signupPopup-title": "Crear un compte",
     "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.",
@@ -459,7 +459,7 @@
     "upload": "Telecargar",
     "upload-avatar": "Telecargar un avatar",
     "uploaded-avatar": "Avatar telecargat",
-    "username": "Username",
+    "username": "Nom d’utilizaire",
     "view-it": "View it",
     "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Seguit",
@@ -470,16 +470,16 @@
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
     "card-templates-swimlane": "Card Templates",
-    "list-templates-swimlane": "List Templates",
+    "list-templates-swimlane": "Lista dels modèls",
     "board-templates-swimlane": "Board Templates",
-    "what-to-do": "What do you want to do?",
+    "what-to-do": "Qué volètz far ?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
     "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
-    "admin-panel": "Admin Panel",
+    "admin-panel": "Interfàcia d’admin",
     "settings": "Paramètres",
     "people": "Personas",
-    "registration": "Registration",
+    "registration": "Inscripcion",
     "disable-self-registration": "Disable Self-Registration",
     "invite": "Convidar",
     "invite-people": "Convidat",
@@ -488,12 +488,12 @@
     "smtp-host-description": "The address of the SMTP server that handles your emails.",
     "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
     "smtp-tls-description": "Enable TLS support for SMTP server",
-    "smtp-host": "SMTP Host",
-    "smtp-port": "SMTP Port",
-    "smtp-username": "Username",
+    "smtp-host": "Òst SMTP",
+    "smtp-port": "Pòrt SMTP",
+    "smtp-username": "Nom d’utilizaire",
     "smtp-password": "Mot de Santa-Clara",
-    "smtp-tls": "TLS support",
-    "send-from": "From",
+    "smtp-tls": "Compatibilitat TLS",
+    "send-from": "De",
     "send-smtp-test": "Se mandar un corrièl d'ensag",
     "invitation-code": "Còde de convit",
     "email-invite-register-subject": "__inviter__ vos a mandat un convit",

+ 46 - 46
i18n/zh-TW.i18n.json

@@ -1,8 +1,8 @@
 {
     "accept": "接受",
     "act-activity-notify": "活動通知",
-    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addAttachment": "新增附件__attachment__到卡片__card__位於清單__list__ 泳道流程圖 __swimlane__看板__board__",
+    "act-deleteAttachment": "刪除附件__attachment__位於卡片__card__清單__list__ 泳道流程圖 __swimlane__看板__board__",
     "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -18,15 +18,15 @@
     "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-createBoard": "新增看板 __board__ ",
-    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createSwimlane": "新增泳道流程圖__swimlane__至看板__board__",
     "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
     "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-createList": "新增清單__list__至看板__board__",
-    "act-addBoardMember": "added member __member__ to board __board__",
-    "act-archivedBoard": "看板 __board__ 已被封存",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-addBoardMember": "已在看板 __board__ 中新增成員 __member__",
+    "act-archivedBoard": "看板 __board__ 已被移到封存",
+    "act-archivedCard": "卡片 __card__  位於清單 __list__ 泳道流程圖 __swimlane__ 看板 __board__ 已被移到封存",
+    "act-archivedList": "清單  __list__ 位於泳道流程圖 __swimlane__ 看板 __board__ 已被移到封存",
+    "act-archivedSwimlane": "看板__board__的泳道流程圖__swimlane__已被移到封存",
     "act-importBoard": "看板 __board__ 已匯入",
     "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
     "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
@@ -498,13 +498,13 @@
     "invitation-code": "邀請碼",
     "email-invite-register-subject": "__inviter__ 向您發出邀請",
     "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email",
-    "email-smtp-test-text": "You have successfully sent an email",
+    "email-smtp-test-subject": "SMTP 測試郵件",
+    "email-smtp-test-text": "您已成功寄送郵件",
     "error-invitation-code-not-exist": "邀請碼不存在",
     "error-notAuthorized": "沒有適合的權限觀看",
     "outgoing-webhooks": "設定 Webhooks",
     "outgoingWebhooksPopup-title": "設定 Webhooks",
-    "boardCardTitlePopup-title": "Card Title Filter",
+    "boardCardTitlePopup-title": "卡片標題過濾器",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
     "Node_version": "Node 版本",
@@ -517,40 +517,40 @@
     "OS_Totalmem": "系統總記憶體",
     "OS_Type": "系統類型",
     "OS_Uptime": "系統運行時間",
-    "days": "days",
+    "days": "",
     "hours": "小時",
     "minutes": "分鐘",
     "seconds": "秒",
-    "show-field-on-card": "Show this field on card",
-    "automatically-field-on-card": "Auto create field to all cards",
+    "show-field-on-card": "在卡片顯示這個欄位",
+    "automatically-field-on-card": "自動在所有卡片建立欄位",
     "showLabel-field-on-card": "Show field label on minicard",
     "yes": "是",
     "no": "否",
     "accounts": "帳號",
     "accounts-allowEmailChange": "准許變更電子信箱",
-    "accounts-allowUserNameChange": "Allow Username Change",
-    "createdAt": "Created at",
+    "accounts-allowUserNameChange": "允許修改使用者名稱",
+    "createdAt": "建立於",
     "verified": "Verified",
     "active": "Active",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date",
-    "setCardColorPopup-title": "Set color",
-    "setCardActionsColorPopup-title": "Choose a color",
-    "setSwimlaneColorPopup-title": "Choose a color",
-    "setListColorPopup-title": "Choose a color",
+    "card-received": "接收",
+    "card-received-on": "接收於",
+    "card-end": "結束",
+    "card-end-on": "結束於",
+    "editCardReceivedDatePopup-title": "更改接收日期",
+    "editCardEndDatePopup-title": "更改結束日期",
+    "setCardColorPopup-title": "設定顏色",
+    "setCardActionsColorPopup-title": "選擇顏色",
+    "setSwimlaneColorPopup-title": "選擇顏色",
+    "setListColorPopup-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",
+    "boardDeletePopup-title": "刪除看板?",
+    "delete-board": "刪除看板",
     "default-subtasks-board": "Subtasks for __board__ board",
-    "default": "Default",
-    "queue": "Queue",
+    "default": "預設值",
+    "queue": "列隊",
     "subtask-settings": "Subtasks Settings",
     "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
     "show-subtasks-field": "Cards can have subtasks",
@@ -563,17 +563,17 @@
     "subtext-with-parent": "Subtext with parent",
     "change-card-parent": "Change card's parent",
     "parent-card": "Parent card",
-    "source-board": "Source board",
+    "source-board": "來源看板",
     "no-parent": "Don't show parent",
-    "activity-added-label": "added label '%s' to %s",
-    "activity-removed-label": "removed label '%s' from %s",
-    "activity-delete-attach": "deleted an attachment from %s",
-    "activity-added-label-card": "added label '%s'",
-    "activity-removed-label-card": "removed label '%s'",
-    "activity-delete-attach-card": "deleted an attachment",
+    "activity-added-label": "增加標籤%s至%s",
+    "activity-removed-label": "刪除標籤%s位於%s",
+    "activity-delete-attach": "刪除%s的附件",
+    "activity-added-label-card": "新增標籤%s",
+    "activity-removed-label-card": "刪除標籤%s",
+    "activity-delete-attach-card": "刪除附件",
     "activity-set-customfield": "set custom field '%s' to '%s' in %s",
     "activity-unset-customfield": "unset custom field '%s' in %s",
-    "r-rule": "Rule",
+    "r-rule": "規則",
     "r-add-trigger": "Add trigger",
     "r-add-action": "Add action",
     "r-board-rules": "Board rules",
@@ -583,24 +583,24 @@
     "r-new-rule-name": "New rule title",
     "r-no-rules": "No rules",
     "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-is": "",
+    "r-is-moved": "被刪除",
+    "r-added-to": "增加到",
     "r-removed-from": "Removed from",
-    "r-the-board": "the board",
-    "r-list": "list",
+    "r-the-board": "看板",
+    "r-list": "清單",
     "set-filter": "Set Filter",
     "r-moved-to": "Moved to",
     "r-moved-from": "Moved from",
     "r-archived": "Moved to Archive",
     "r-unarchived": "Restored from Archive",
-    "r-a-card": "a card",
+    "r-a-card": "卡片",
     "r-when-a-label-is": "When a label is",
     "r-when-the-label": "When the label",
-    "r-list-name": "list name",
+    "r-list-name": "清單名稱",
     "r-when-a-member": "When a member is",
     "r-when-the-member": "When the member",
-    "r-name": "name",
+    "r-name": "名稱",
     "r-when-a-attach": "When an attachment",
     "r-when-a-checklist": "When a checklist is",
     "r-when-the-checklist": "When the checklist",

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.90.0",
+  "version": "v2.91.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

+ 2 - 2
sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 292,
+    appVersion = 293,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.90.0~2019-06-21"),
+    appMarketingVersion = (defaultText = "2.91.0~2019-06-27"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,