diff --git a/app/coffee/modules/admin/third-parties.coffee b/app/coffee/modules/admin/third-parties.coffee index 8e56cec4..06bb946e 100644 --- a/app/coffee/modules/admin/third-parties.coffee +++ b/app/coffee/modules/admin/third-parties.coffee @@ -108,12 +108,16 @@ WebhookDirective = ($rs, $repo, $confirm, $loading, $translate) -> updateShowHideHistoryText = () -> textElement = $el.find(".toggle-history") historyElement = textElement.parents(".single-webhook-wrapper").find(".webhooks-history") + if historyElement.hasClass("open") text = $translate.instant("ADMIN.WEBHOOKS.ACTION_HIDE_HISTORY") - textElement.text(text) + title = $translate.instant("ADMIN.WEBHOOKS.ACTION_HIDE_HISTORY_TITLE") else text = $translate.instant("ADMIN.WEBHOOKS.ACTION_SHOW_HISTORY") - textElement.text(text) + title = $translate.instant("ADMIN.WEBHOOKS.ACTION_SHOW_HISTORY_TITLE") + + textElement.text(text) + textElement.prop("title", title) showVisualizationMode = () -> $el.find(".edition-mode").addClass("hidden") diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index 0406cea7..279cfbcf 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -267,7 +267,6 @@ "TYPE_SERVICE_SECRET": "Type the service secret key", "SAVE": "Save Webhook", "CANCEL": "Cancel Webhook", - "TOGGLE_HISTORY": "Toggle history", "SHOW_HISTORY": "(Show history)", "TEST": "Test Webhook", "EDIT": "Edit Webhook", @@ -279,7 +278,9 @@ "RESPONSE": "Response", "DATE": "DD MMM YYYY [at] hh:mm:ss", "ACTION_HIDE_HISTORY": "(Hide history)", + "ACTION_HIDE_HISTORY_TITLE": "Hide history details", "ACTION_SHOW_HISTORY": "(Show history)", + "ACTION_SHOW_HISTORY_TITLE": "Show history details", "WEBHOOK_NAME": "Webhook '{{name}}'" }, "CUSTOM_ATTRIBUTES": { @@ -482,7 +483,7 @@ "TOTAL_POINTS": "total", "ADD": "+ Add a new User Story", "ADD_BULK": "Add some new User Stories in bulk", - "PROMOTED": "This US has been promoted from Issue", + "PROMOTED": "This US has been promoted from Issue:", "TITLE_LINK_GO_TO_ISSUE": "Go to issue", "EXTERNAL_REFERENCE": "This US has been created from", "GO_TO_EXTERNAL_REFERENCE": "Go to origin", @@ -805,7 +806,7 @@ "ERROR_PASSWORD_MATCH": "The passwords doesn't match" }, "USER_SETTINGS": { - "AVATAR_MAX_SIZE": "[Max, size: {{maxFileSize}}}", + "AVATAR_MAX_SIZE": "[Max. size: {{maxFileSize}}]", "MENU": { "SECTION_TITLE": "User Settings", "USER_PROFILE": "User profile", @@ -828,7 +829,7 @@ } }, "USER_PROFILE": { - "IMAGE_HELP": "The image will be cropped to 80x80px.
", + "IMAGE_HELP": "The image will be cropped to 80x80px.
", "ACTION_CHANGE_IMAGE": "Change", "ACTION_USE_GRAVATAR": "Use gravatar image", "ACTION_DELETE_ACCOUNT": "Delete Taiga account", diff --git a/app/partials/admin/admin-third-parties-webhooks.jade b/app/partials/admin/admin-third-parties-webhooks.jade index 2c75563d..345ffd8a 100644 --- a/app/partials/admin/admin-third-parties-webhooks.jade +++ b/app/partials/admin/admin-third-parties-webhooks.jade @@ -42,7 +42,7 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl", span(ng-bind="webhook.name") div.webhook-url span(ng-bind="webhook.url") - a.show-history.toggle-history(href="", title="{{'ADMIN.WEBHOOKS.TOOGLE_HISTORY' | translate}}", ng-show="webhook.logs_counter", translate="ADMIN.WEBHOOKS.SHOW_HISTORY") + a.show-history.toggle-history(href="", title="{{'ADMIN.WEBHOOKS.SHOW_HISTORY_TITLE' | translate}}", ng-show="webhook.logs_counter", translate="ADMIN.WEBHOOKS.SHOW_HISTORY") div.webhook-options div.webhook-options-wrapper