Fix some translations and add some title attrs to links

stable
David Barragán Merino 2016-01-25 18:33:32 +01:00
parent d1065c6543
commit 748b9f6800
7 changed files with 29 additions and 12 deletions

View File

@ -305,6 +305,7 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
changesText: renderChangesHelperText(comment) changesText: renderChangesHelperText(comment)
changes: renderChangeEntries(comment) changes: renderChangeEntries(comment)
mode: "comment" mode: "comment"
deleteCommentActionTitle: $translate.instant("COMMENTS.DELETE")
deleteCommentDate: moment(comment.delete_comment_date).format(getPrettyDateFormat()) if comment.delete_comment_date deleteCommentDate: moment(comment.delete_comment_date).format(getPrettyDateFormat()) if comment.delete_comment_date
deleteCommentUser: comment.delete_comment_user.name if comment.delete_comment_user?.name deleteCommentUser: comment.delete_comment_user.name if comment.delete_comment_user?.name
activityId: comment.id activityId: comment.id

View File

@ -18,16 +18,16 @@
"TAG_LINE": "Your agile, free, and open source project management tool", "TAG_LINE": "Your agile, free, and open source project management tool",
"TAG_LINE_2": "LOVE YOUR PROJECT", "TAG_LINE_2": "LOVE YOUR PROJECT",
"BLOCK": "Block", "BLOCK": "Block",
"UNBLOCK": "Unblock", "BLOCK_TITLE": "Block this item for example if it has a dependency that can not be satisfied",
"BLOCKED": "Blocked", "BLOCKED": "Blocked",
"UNBLOCK": "Unblock",
"UNBLOCK_TITLE": "Unblock this item",
"BLOCKED_NOTE": "Why is this blocked?",
"BLOCKED_REASON": "Please explain the reason",
"CREATED_BY": "Created by {{fullDisplayName}}", "CREATED_BY": "Created by {{fullDisplayName}}",
"FROM": "from", "FROM": "from",
"TO": "to", "TO": "to",
"CLOSE": "close", "CLOSE": "close",
"BLOCK": "Block this User Story if it has a dependency that can not be satisfied",
"UNBLOCK": "Unblock this User Story",
"BLOCKED_NOTE": "Why is this user story blocked?",
"BLOCKED_REASON": "Please explain the reason",
"GO_HOME": "Take me home", "GO_HOME": "Take me home",
"PLUGINS": "Plugins", "PLUGINS": "Plugins",
"BETA": "We are on beta!", "BETA": "We are on beta!",
@ -365,6 +365,8 @@
"ATTACHMENT": { "ATTACHMENT": {
"SECTION_NAME": "attachments", "SECTION_NAME": "attachments",
"TITLE": "{{ fileName }} uploaded on {{ date }}", "TITLE": "{{ fileName }} uploaded on {{ date }}",
"LIST_VIEW_MODE": "List view mode",
"GALLERY_VIEW_MODE": "Gallery view mode",
"DESCRIPTION": "Type a short description", "DESCRIPTION": "Type a short description",
"DEPRECATED": "(deprecated)", "DEPRECATED": "(deprecated)",
"DEPRECATED_FILE": "Deprecated?", "DEPRECATED_FILE": "Deprecated?",
@ -913,6 +915,7 @@
"TYPE_NEW_COMMENT": "Type a new comment here", "TYPE_NEW_COMMENT": "Type a new comment here",
"SHOW_DELETED": "Show deleted comment", "SHOW_DELETED": "Show deleted comment",
"HIDE_DELETED": "Hide deleted comment", "HIDE_DELETED": "Hide deleted comment",
"DELETE": "Delete comment",
"RESTORE": "Restore comment" "RESTORE": "Restore comment"
}, },
"ACTIVITY": { "ACTIVITY": {

View File

@ -4,14 +4,16 @@ section.attachments(tg-attachments-drop="vm.addAttachments(files, false)")
.options .options
button.view-gallery( button.view-gallery(
ng-class="{'is-active': vm.mode == 'gallery'}" ng-class="{'is-active': vm.mode == 'gallery'}"
ng-if="vm.attachments.size", ng-if="vm.attachments.size"
ng-click="vm.setMode('gallery')" ng-click="vm.setMode('gallery')"
title="{{ 'ATTACHMENT.GALLERY_VIEW_MODE' | translate }}"
) )
include ../../../svg/gallery.svg include ../../../svg/gallery.svg
button.view-list( button.view-list(
ng-class="{'is-active': vm.mode == 'list'}" ng-class="{'is-active': vm.mode == 'list'}"
ng-if="vm.attachments.size", ng-if="vm.attachments.size"
ng-click="vm.setMode('list')" ng-click="vm.setMode('list')"
title="{{ 'ATTACHMENT.LIST_VIEW_MODE' | translate }}"
) )
include ../../../svg/list.svg include ../../../svg/list.svg
.add-attach( .add-attach(

View File

@ -1,10 +1,10 @@
a.button-gray.item-block( a.button-gray.item-block(
href="" href=""
title="{{ 'COMMON.BLOCK' | translate }}" title="{{ 'COMMON.BLOCK_TITLE' | translate }}"
) )
include ../../../svg/lock.svg include ../../../svg/lock.svg
a.button-red.item-unblock( a.button-red.item-unblock(
href="" href=""
title="{{ 'COMMON.UNBLOCK' | translate }}" title="{{ 'COMMON.UNBLOCK_TITLE' | translate }}"
) )
include ../../../svg/unlock.svg include ../../../svg/unlock.svg

View File

@ -18,7 +18,11 @@ div(class!="activity-single <%- mode %>")
.comment.wysiwyg(ng-non-bindable) .comment.wysiwyg(ng-non-bindable)
| <%= comment %> | <%= comment %>
<% if (!deleteCommentDate && mode !== "activity" && canDeleteComment) { %> <% if (!deleteCommentDate && mode !== "activity" && canDeleteComment) { %>
a(href="", class="icon icon-delete comment-delete", data-activity-id!="<%- activityId %>") a.icon.icon-delete.comment-delete(
href=""
data-activity-id!="<%- activityId %>"
title!="<%- deleteCommentActionTitle %>"
)
<% } %> <% } %>
<% } %> <% } %>

View File

@ -8,7 +8,11 @@
class="hide-deleted-comment hidden", translate="COMMENTS.HIDE_DELETED") class="hide-deleted-comment hidden", translate="COMMENTS.HIDE_DELETED")
.comment-body.wysiwyg <%= deleteComment %> .comment-body.wysiwyg <%= deleteComment %>
<% if (canRestoreComment) { %> <% if (canRestoreComment) { %>
a(href="", class="comment-restore", data-activity-id!="<%- activityId %>") a.comment-restore(
href=""
data-activity-id!="<%- activityId %>"
title="{{ 'COMMENTS.RESTORE' | translate }}"
)
span.icon.icon-reload span.icon.icon-reload
span(translate="COMMENTS.RESTORE") span(translate="COMMENTS.RESTORE")
<% } %> <% } %>

View File

@ -1,2 +1,5 @@
a.promote-button.editable(tg-check-permission="add_us") a.promote-button.editable(
tg-check-permission="add_us"
title="{{ 'ISSUES.ACTION_PROMOTE_TO_US' | translate }}"
)
include ../../svg/promote.svg include ../../svg/promote.svg