From 14d43d576f25ae6cac8c54a0382b9dd40c89744d Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 19 May 2015 09:31:51 +0200 Subject: [PATCH] Issue 2685: Bad translation in spanish for "Add new XXX" in Admin -> attributes --- app/coffee/modules/admin/project-values.coffee | 12 ++++++++++-- app/locales/locale-en.json | 8 +++++--- app/partials/admin/admin-project-values-points.jade | 1 + .../admin/admin-project-values-priorities.jade | 3 ++- .../admin/admin-project-values-severities.jade | 3 ++- app/partials/admin/admin-project-values-status.jade | 9 ++++++--- app/partials/admin/admin-project-values-types.jade | 3 ++- .../includes/modules/admin/project-types.jade | 4 ++-- 8 files changed, 30 insertions(+), 13 deletions(-) diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee index 400cac3f..c86c762d 100644 --- a/app/coffee/modules/admin/project-values.coffee +++ b/app/coffee/modules/admin/project-values.coffee @@ -126,7 +126,7 @@ module.controller("ProjectValuesController", ProjectValuesController) ## Project values directive ############################################################################# -ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) -> +ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame, @translate, $rootscope) -> ## Drag & Drop Link linkDragAndDrop = ($scope, $el, $attrs) -> @@ -157,6 +157,7 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) -> linkValue = ($scope, $el, $attrs) -> $ctrl = $el.controller() valueType = $attrs.type + objName = $attrs.objname initializeNewValue = -> $scope.newValue = { @@ -165,7 +166,14 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) -> "is_archived": false } + initializeTextTranslations = -> + $scope.addNewElementText = @translate.instant("ADMIN.PROJECT_VALUES_#{objName.toUpperCase()}.ACTION_ADD") + initializeNewValue() + initializeTextTranslations() + + $rootscope.$on "$translateChangeEnd", -> + $scope.$evalAsync(initializeTextTranslations) goToBottomList = (focus = false) => table = $el.find(".table-main") @@ -305,7 +313,7 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) -> return {link:link} -module.directive("tgProjectValues", ["$log", "$tgRepo", "$tgConfirm", "$tgLocation", "animationFrame", ProjectValuesDirective]) +module.directive("tgProjectValues", ["$log", "$tgRepo", "$tgConfirm", "$tgLocation", "animationFrame", "$translate", "$rootScope", ProjectValuesDirective]) ############################################################################# diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index 94e6a0c1..c1ec86e1 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -362,11 +362,13 @@ }, "PROJECT_VALUES_PRIORITIES": { "TITLE": "Issue priorities", - "SUBTITLE": "Specify the priorities your issues will have" + "SUBTITLE": "Specify the priorities your issues will have", + "ACTION_ADD": "Add new priority" }, "PROJECT_VALUES_SEVERITIES": { "TITLE": "Issue severities", - "SUBTITLE": "Specify the severities your issues will have" + "SUBTITLE": "Specify the severities your issues will have", + "ACTION_ADD": "Add new severity" }, "PROJECT_VALUES_STATUS": { "TITLE": "Status", @@ -379,7 +381,7 @@ "TITLE": "Types", "SUBTITLE": "Specify the types your issues could be", "ISSUE_TITLE": "Issues types", - "ACTION_ADD": "Add new {{objName}}" + "ACTION_ADD": "Add new type" }, "ROLES": { "SECTION_NAME": "Roles - {{projectName}}", diff --git a/app/partials/admin/admin-project-values-points.jade b/app/partials/admin/admin-project-values-points.jade index c36426e5..b47bd8ef 100644 --- a/app/partials/admin/admin-project-values-points.jade +++ b/app/partials/admin/admin-project-values-points.jade @@ -13,5 +13,6 @@ div.wrapper(ng-controller="ProjectValuesSectionController") div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", ng-init="section='admin'; resource='userstories'; type='points'; sectionName='ADMIN.PROJECT_VALUES_POINTS.TITLE'", + objName="points", type="points") include ../includes/modules/admin/project-points diff --git a/app/partials/admin/admin-project-values-priorities.jade b/app/partials/admin/admin-project-values-priorities.jade index e2179393..0658f0d1 100644 --- a/app/partials/admin/admin-project-values-priorities.jade +++ b/app/partials/admin/admin-project-values-priorities.jade @@ -12,6 +12,7 @@ div.wrapper(ng-controller="ProjectValuesSectionController") p.admin-subtitle(translate="ADMIN.PROJECT_VALUES_PRIORITIES.SUBTITLE") div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='issues'; type='priorities'; sectionName='ADMIN.PROJECT_VALUES_PRIORITIES.TITLE'; objName='priority'", + ng-init="section='admin'; resource='issues'; type='priorities'; sectionName='ADMIN.PROJECT_VALUES_PRIORITIES.TITLE';", + objName="priorities", type="priorities") include ../includes/modules/admin/project-types diff --git a/app/partials/admin/admin-project-values-severities.jade b/app/partials/admin/admin-project-values-severities.jade index 5b295441..93101293 100644 --- a/app/partials/admin/admin-project-values-severities.jade +++ b/app/partials/admin/admin-project-values-severities.jade @@ -12,6 +12,7 @@ div.wrapper(ng-controller="ProjectValuesSectionController") p.admin-subtitle(translate="ADMIN.PROJECT_VALUES_SEVERITIES.SUBTITLE") div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='issues'; type='severities'; sectionName='ADMIN.PROJECT_VALUES_SEVERITIES.TITLE'; objName='severity'", + ng-init="section='admin'; resource='issues'; type='severities'; sectionName='ADMIN.PROJECT_VALUES_SEVERITIES.TITLE';", + objName="severities", type="severities") include ../includes/modules/admin/project-types diff --git a/app/partials/admin/admin-project-values-status.jade b/app/partials/admin/admin-project-values-status.jade index a2488dfa..5d7e6343 100644 --- a/app/partials/admin/admin-project-values-status.jade +++ b/app/partials/admin/admin-project-values-status.jade @@ -14,15 +14,18 @@ div.wrapper(ng-controller="ProjectValuesSectionController", div.admin-attributes-section(tg-project-values, type="userstory-statuses", ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='userstories'; type='userstory-statuses'; sectionName='ADMIN.PROJECT_VALUES_STATUS.US_TITLE'") + ng-init="section='admin'; resource='userstories'; type='userstory-statuses'; sectionName='ADMIN.PROJECT_VALUES_STATUS.US_TITLE'", + objName="status") include ../includes/modules/admin/project-us-status div.admin-attributes-section(tg-project-values, type="task-statuses", ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='tasks'; type='task-statuses'; sectionName='ADMIN.PROJECT_VALUES_STATUS.TASK_TITLE'") + ng-init="section='admin'; resource='tasks'; type='task-statuses'; sectionName='ADMIN.PROJECT_VALUES_STATUS.TASK_TITLE'" + objName="status") include ../includes/modules/admin/project-status div.admin-attributes-section(tg-project-values, type="issue-statuses", ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='issues'; type='issue-statuses'; sectionName='ADMIN.PROJECT_VALUES_STATUS.ISSUE_TITLE'") + ng-init="section='admin'; resource='issues'; type='issue-statuses'; sectionName='ADMIN.PROJECT_VALUES_STATUS.ISSUE_TITLE'", + objName="status") include ../includes/modules/admin/project-status diff --git a/app/partials/admin/admin-project-values-types.jade b/app/partials/admin/admin-project-values-types.jade index 7b96c24c..8cb5092f 100644 --- a/app/partials/admin/admin-project-values-types.jade +++ b/app/partials/admin/admin-project-values-types.jade @@ -13,6 +13,7 @@ div.wrapper(ng-controller="ProjectValuesSectionController" p.admin-subtitle(translate="ADMIN.PROJECT_VALUES_TYPES.SUBTITLE") div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='issues'; sectionName='ADMIN.PROJECT_VALUES_TYPES.ISSUE_TITLE'; type='issue-types'; objName='type'", + ng-init="section='admin'; resource='issues'; sectionName='ADMIN.PROJECT_VALUES_TYPES.ISSUE_TITLE'; type='issue-types';", + objName="types", type="issue-types") include ../includes/modules/admin/project-types diff --git a/app/partials/includes/modules/admin/project-types.jade b/app/partials/includes/modules/admin/project-types.jade index ff7a083b..5cf626fd 100644 --- a/app/partials/includes/modules/admin/project-types.jade +++ b/app/partials/includes/modules/admin/project-types.jade @@ -2,8 +2,8 @@ section.colors-table div.project-values-title h2 {{ sectionName | translate }} - a.button.button-gray.show-add-new(href="") - span(translate="ADMIN.PROJECT_VALUES_TYPES.ACTION_ADD", translate-values="{ objName: objName }") + a.button.button-gray.show-add-new(href="", title="{{ addNewElementText }}") + span(ng-bind="addNewElementText") div.table-header div.row