diff --git a/app/coffee/modules/common/tags.coffee b/app/coffee/modules/common/tags.coffee index 5707c490..a4c68d41 100644 --- a/app/coffee/modules/common/tags.coffee +++ b/app/coffee/modules/common/tags.coffee @@ -99,7 +99,7 @@ module.directive("tgColorizeTags", ColorizeTagsDirective) ## TagLine Directive (for Lightboxes) ############################################################################# -LbTagLineDirective = ($rs, $template) -> +LbTagLineDirective = ($rs, $template, $compile) -> ENTER_KEY = 13 COMMA_KEY = 188 @@ -116,7 +116,7 @@ LbTagLineDirective = ($rs, $template) -> if tag.color tag.style = "border-left: 5px solid #{tag.color}" - html = templateTags(ctx) + html = $compile(templateTags(ctx))($scope) $el.find("div.tags-container").html(html) showSaveButton = -> $el.find(".save").removeClass("hidden") @@ -221,14 +221,14 @@ LbTagLineDirective = ($rs, $template) -> templateUrl: "common/tag/lb-tag-line.html" } -module.directive("tgLbTagLine", ["$tgResources", "$tgTemplate", LbTagLineDirective]) +module.directive("tgLbTagLine", ["$tgResources", "$tgTemplate", "$compile", LbTagLineDirective]) ############################################################################# ## TagLine Directive (for detail pages) ############################################################################# -TagLineDirective = ($rootScope, $repo, $rs, $confirm, $qqueue, $template) -> +TagLineDirective = ($rootScope, $repo, $rs, $confirm, $qqueue, $template, $compile) -> ENTER_KEY = 13 ESC_KEY = 27 COMMA_KEY = 188 @@ -245,7 +245,7 @@ TagLineDirective = ($rootScope, $repo, $rs, $confirm, $qqueue, $template) -> tags: _.map(tags, (t) -> {name: t, color: tagsColors[t]}) isEditable: isEditable() } - html = templateTags(ctx) + html = $compile(templateTags(ctx))($scope) $el.find("div.tags-container").html(html) renderInReadModeOnly = -> @@ -406,4 +406,5 @@ TagLineDirective = ($rootScope, $repo, $rs, $confirm, $qqueue, $template) -> templateUrl: "common/tag/tag-line.html" } -module.directive("tgTagLine", ["$rootScope", "$tgRepo", "$tgResources", "$tgConfirm", "$tgQqueue", "$tgTemplate", TagLineDirective]) +module.directive("tgTagLine", ["$rootScope", "$tgRepo", "$tgResources", "$tgConfirm", "$tgQqueue", + "$tgTemplate", "$compile", TagLineDirective]) diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index 8fbc09c9..927b8a3d 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -37,7 +37,7 @@ "IOCAINE_TEXT": "Feeling a bit overwhelmed by a task? Make sure others know about it by clicking on Iocaine when editing a task. It's possible to become immune to this (fictional) deadly poison by consuming small amounts over time just as it's possible to get better at what you do by occasionally taking on extra challenges!", "TAGS": { "PLACEHOLDER": "I'm it! Tag me...", - "DELETE": "delete tag", + "DELETE": "Delete tag", "ADD": "Add tag" }, "DESCRIPTION": { @@ -571,8 +571,8 @@ "INCREMENT_CLIENT": "Incremented points by client requirements for sprint {{xval}} is {{yval}}" }, "TAGS": { - "SHOW": "Show Tags", - "HIDE": "Hide Tags" + "SHOW": "Show tags", + "HIDE": "Hide tags" }, "TABLE": { "COLUMN_US": "User Stories", diff --git a/app/locales/locale-es.json b/app/locales/locale-es.json index 97626e00..41ee54ca 100644 --- a/app/locales/locale-es.json +++ b/app/locales/locale-es.json @@ -35,7 +35,7 @@ "IOCAINE_TEXT": "¿Te sientes fuera de tu zona de confort en una tarea? Asegúrate de que los demás están al tanto de ello, marca el check de la Iocaína al editar una tarea. Igual eu era posible llegar a ser inmune a este veneno mortal a base de consumir pequeñas dosis a lo largo del tiempo, es posible conseguir mejor en lo que estás haciendo si afrontas de vez en cuando esta clase de retos!", "TAGS": { "PLACEHOLDER": "¿Qué soy? Etiquétame...", - "DELETE": "Eliminar etiqueta", + "DELETE": "Borrar etiqueta", "ADD": "Añadir etiqueta" }, "DESCRIPTION": { @@ -568,8 +568,8 @@ "INCREMENT_CLIENT": "Puntos incrementados por requerimientos del cliente para el sprint {{xval}} es {{yval}}" }, "TAGS": { - "SHOW": "Ver Etiquetas", - "HIDE": "Ocultar Etiquetas" + "SHOW": "Mostrar etiquetas", + "HIDE": "Ocultar etiquetas" }, "TABLE": { "COLUMN_US": "Historias de Usuario", diff --git a/app/partials/common/tag/lb-tag-line-tags.jade b/app/partials/common/tag/lb-tag-line-tags.jade index 035c0335..fb6be1eb 100644 --- a/app/partials/common/tag/lb-tag-line-tags.jade +++ b/app/partials/common/tag/lb-tag-line-tags.jade @@ -1,5 +1,5 @@ <% _.each(tags, function(tag) { %> span(class="tag", style!="<%- tag.style %>") span.tag-name <%- tag.name %> - a(href="", title="{{'COMMON.TAGS.DELETE'}}", class="icon icon-delete") -<% }); %> \ No newline at end of file + a(href="", title="{{ 'COMMON.TAGS.DELETE' | translate }}", class="icon icon-delete") +<% }); %> diff --git a/app/partials/common/tag/tags-line-tags.jade b/app/partials/common/tag/tags-line-tags.jade index 5be6c1fa..c9b0dbd9 100644 --- a/app/partials/common/tag/tags-line-tags.jade +++ b/app/partials/common/tag/tags-line-tags.jade @@ -2,6 +2,6 @@ span(class="tag", style!="border-left: 5px solid <%- tag.color %>;") span.tag-name <%- tag.name %> <% if (isEditable) { %> - a(href="", title="delete tag", class="icon icon-delete") + a(href="", title="{{ 'COMMON.TAGS.DELETE' | translate }}", class="icon icon-delete") <% } %> -<% }); %> \ No newline at end of file +<% }); %>