diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index 86fe61b5..75bafc3e 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -1067,14 +1067,16 @@ module.directive("tgBurndownBacklogGraph", ["$translate", BurndownBacklogGraphDi ## Backlog progress bar directive ############################################################################# -TgBacklogProgressBarDirective = ($template) -> +TgBacklogProgressBarDirective = ($template, $compile) -> template = $template.get("backlog/progress-bar.html", true) - render = (el, projectPointsPercentaje, closedPointsPercentaje) -> - el.html(template({ + render = (scope, el, projectPointsPercentaje, closedPointsPercentaje) -> + html = template({ projectPointsPercentaje: projectPointsPercentaje, closedPointsPercentaje:closedPointsPercentaje - })) + }) + html = $compile(html)(scope) + el.html(html) adjustPercentaje = (percentage) -> adjusted = _.max([0 , percentage]) @@ -1098,11 +1100,11 @@ TgBacklogProgressBarDirective = ($template) -> projectPointsPercentaje = adjustPercentaje(projectPointsPercentaje - 3) closedPointsPercentaje = adjustPercentaje(closedPointsPercentaje - 3) - render($el, projectPointsPercentaje, closedPointsPercentaje) + render($scope, $el, projectPointsPercentaje, closedPointsPercentaje) $scope.$on "$destroy", -> $el.off() return {link: link} -module.directive("tgBacklogProgressBar", ["$tgTemplate", TgBacklogProgressBarDirective]) +module.directive("tgBacklogProgressBar", ["$tgTemplate", "$compile", TgBacklogProgressBarDirective]) diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index eef0352d..c8015f2f 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -343,7 +343,7 @@ "DESCRIPTION": "Type a short description", "DEPRECATED": "(deprecated)", "DEPRECATED_FILE": "Deprecated?", - "ADD": "Add new attachment. <%- maxFileSizeMsg %>", + "ADD": "Add new attachment. {{maxFileSizeMsg}}", "MAX_FILE_SIZE": "[Max. size: {{maxFileSize}}]", "SHOW_DEPRECATED": "+ show deprecated atachments", "HIDE_DEPRECATED": "- hide deprecated atachments", diff --git a/app/partials/us/us-detail.jade b/app/partials/us/us-detail.jade index ddfd9b4e..bb2de2ac 100644 --- a/app/partials/us/us-detail.jade +++ b/app/partials/us/us-detail.jade @@ -75,6 +75,6 @@ div.wrapper(ng-controller="UserStoryDetailController as ctrl", on-delete-go-to-url="onDeleteGoToUrl", ng-model="us") - div.lightbox.lightbox-block(tg-lb-block, title="US.LIGHTBOX_TITLE_BLOKING_US", ng-model="us") + div.lightbox.lightbox-block(tg-lb-block, title="{{ 'US.LIGHTBOX_TITLE_BLOKING_US' | translate }}", ng-model="us") div.lightbox.lightbox-select-user(tg-lb-assignedto) div.lightbox.lightbox-select-user(tg-lb-watchers)