diff --git a/app/locales/taiga/locale-ca.json b/app/locales/taiga/locale-ca.json index edd30223..a1c16671 100644 --- a/app/locales/taiga/locale-ca.json +++ b/app/locales/taiga/locale-ca.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Plegar fila", "TITLE_ACTION_UNFOLD_ROW": "Desplegar fila", "FIELD_POINTS": "punts", - "ROW_UNASSIGED_TASKS_TITLE": "Tasques sense assignar", + "ROW_STORYLESS_TASKS_TITLE": "Tasques sense assignar", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-de.json b/app/locales/taiga/locale-de.json index db47eb69..4aebc07b 100644 --- a/app/locales/taiga/locale-de.json +++ b/app/locales/taiga/locale-de.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Reihe einklappen", "TITLE_ACTION_UNFOLD_ROW": "Reihe aufklappen", "FIELD_POINTS": "Punkte", - "ROW_UNASSIGED_TASKS_TITLE": "Nicht zugeordnete Aufgaben", + "ROW_STORYLESS_TASKS_TITLE": "Nicht zugeordnete Aufgaben", "ROW_ISSUES_TITLE": "Sprint Tickets" }, "CHARTS": { diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index 5dbb8808..0323c29c 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -1387,7 +1387,7 @@ "TITLE_ACTION_FOLD_ROW": "Fold Row", "TITLE_ACTION_UNFOLD_ROW": "Unfold Row", "FIELD_POINTS": "points", - "ROW_UNASSIGED_TASKS_TITLE": "Unassigned tasks", + "ROW_STORYLESS_TASKS_TITLE": "Storyless tasks", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { @@ -1404,12 +1404,12 @@ "NO_OPEN_SPRINTS": "There are no other open sprints. Please create one first.", "SELECT_DESTINATION_PLACEHOLDER": "Select destination", "UNFINISHED_USER_STORIES_COUNT": "{total, plural, one{# unfinished user story} other{# unfinished user stories}}", - "UNFINISHED_UNASSIGNED_TASKS_COUNT": "{total, plural, one{# unfinished unnasigned task} other{# unfinished unnasigned tasks}}", - "UNFINISHED_ISSUES_COUNT": "{total, plural, one{# unfinished issue} other{# unfinished unnasigned issue}}", + "UNFINISHED_STORYLESS_TASKS_COUNT": "{total, plural, one{# unfinished storyless task} other{# unfinished storyless tasks}}", + "UNFINISHED_ISSUES_COUNT": "{total, plural, one{# unfinished issue} other{# unfinished issue}}", "WARNING_ISSUES_NOT_MOVED_TITLE": "You just moved all user stories and taks, and the sprint'll be closed", "WARNING_ISSUES_NOT_MOVED": "The issues'll remain in the sprint and don't be removed", "WARNING_SPRINT_STILL_OPEN_TITLE": "{total, plural, one{You just moved # item!} other{You just moved # items!}}", - "WARNING_SPRINT_STILL_OPEN": "Please note that the sprint {{sprintName}} appears as open as long as still contains open items." + "WARNING_SPRINT_STILL_OPEN": "Please note that the sprint {{sprintName}} will remain open as long as it contains unfinished items." } }, "TASK": { diff --git a/app/locales/taiga/locale-es.json b/app/locales/taiga/locale-es.json index 781c557f..7bb56435 100644 --- a/app/locales/taiga/locale-es.json +++ b/app/locales/taiga/locale-es.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Plegar Fila", "TITLE_ACTION_UNFOLD_ROW": "Desplegar Fila", "FIELD_POINTS": "puntos", - "ROW_UNASSIGED_TASKS_TITLE": "Tareas no asignadas", + "ROW_STORYLESS_TASKS_TITLE": "Tareas no asignadas", "ROW_ISSUES_TITLE": "Peticiones de Sprint" }, "CHARTS": { diff --git a/app/locales/taiga/locale-fa.json b/app/locales/taiga/locale-fa.json index 7c6a2d11..f68fbd1c 100644 --- a/app/locales/taiga/locale-fa.json +++ b/app/locales/taiga/locale-fa.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "جمع کردن ردیف", "TITLE_ACTION_UNFOLD_ROW": "گسترده کردن ردیف", "FIELD_POINTS": "امتیاز", - "ROW_UNASSIGED_TASKS_TITLE": "وظایف آزاد", + "ROW_STORYLESS_TASKS_TITLE": "وظایف آزاد", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-fi.json b/app/locales/taiga/locale-fi.json index d060b1b6..b91468b5 100644 --- a/app/locales/taiga/locale-fi.json +++ b/app/locales/taiga/locale-fi.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Kavenna rivi", "TITLE_ACTION_UNFOLD_ROW": "Laajenna rivi", "FIELD_POINTS": "pisteet", - "ROW_UNASSIGED_TASKS_TITLE": "Poista tekijä", + "ROW_STORYLESS_TASKS_TITLE": "Poista tekijä", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-fr.json b/app/locales/taiga/locale-fr.json index 39b3dd82..14e77e9f 100644 --- a/app/locales/taiga/locale-fr.json +++ b/app/locales/taiga/locale-fr.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Replier la ligne", "TITLE_ACTION_UNFOLD_ROW": "Déplier la ligne", "FIELD_POINTS": "points", - "ROW_UNASSIGED_TASKS_TITLE": "Tâches non assignées", + "ROW_STORYLESS_TASKS_TITLE": "Tâches non assignées", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-it.json b/app/locales/taiga/locale-it.json index 1beac52b..8159369a 100644 --- a/app/locales/taiga/locale-it.json +++ b/app/locales/taiga/locale-it.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Ripiega la riga", "TITLE_ACTION_UNFOLD_ROW": "Rivela la riga", "FIELD_POINTS": "punti", - "ROW_UNASSIGED_TASKS_TITLE": "Compito non assegnato", + "ROW_STORYLESS_TASKS_TITLE": "Compito non assegnato", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-ja.json b/app/locales/taiga/locale-ja.json index 68d10801..6dcd501d 100644 --- a/app/locales/taiga/locale-ja.json +++ b/app/locales/taiga/locale-ja.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "行をたたむ", "TITLE_ACTION_UNFOLD_ROW": "行をひろげる", "FIELD_POINTS": "ポイント", - "ROW_UNASSIGED_TASKS_TITLE": "未割当タスク", + "ROW_STORYLESS_TASKS_TITLE": "未割当タスク", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-ko.json b/app/locales/taiga/locale-ko.json index fce3c892..8e1f0549 100644 --- a/app/locales/taiga/locale-ko.json +++ b/app/locales/taiga/locale-ko.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "행 접기", "TITLE_ACTION_UNFOLD_ROW": "행 접기", "FIELD_POINTS": "포인트", - "ROW_UNASSIGED_TASKS_TITLE": "할당되지 않은 태스크", + "ROW_STORYLESS_TASKS_TITLE": "할당되지 않은 태스크", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-nb.json b/app/locales/taiga/locale-nb.json index dbf2e07b..2d402690 100644 --- a/app/locales/taiga/locale-nb.json +++ b/app/locales/taiga/locale-nb.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Brett Rad", "TITLE_ACTION_UNFOLD_ROW": "Brett ut Rad", "FIELD_POINTS": "poeng", - "ROW_UNASSIGED_TASKS_TITLE": "\nIkke tildelte oppgaver", + "ROW_STORYLESS_TASKS_TITLE": "\nIkke tildelte oppgaver", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-nl.json b/app/locales/taiga/locale-nl.json index c8d433ad..fb2e8485 100644 --- a/app/locales/taiga/locale-nl.json +++ b/app/locales/taiga/locale-nl.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Regel inklappen", "TITLE_ACTION_UNFOLD_ROW": "Regel uitklappen", "FIELD_POINTS": "punten", - "ROW_UNASSIGED_TASKS_TITLE": "Niet toegewezen taken", + "ROW_STORYLESS_TASKS_TITLE": "Niet toegewezen taken", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-pl.json b/app/locales/taiga/locale-pl.json index 2c26308a..6a12a811 100644 --- a/app/locales/taiga/locale-pl.json +++ b/app/locales/taiga/locale-pl.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Zwiń wiersz", "TITLE_ACTION_UNFOLD_ROW": "Rozwiń wiersz", "FIELD_POINTS": "punkty", - "ROW_UNASSIGED_TASKS_TITLE": "Nieprzypisane zadania", + "ROW_STORYLESS_TASKS_TITLE": "Nieprzypisane zadania", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-pt-br.json b/app/locales/taiga/locale-pt-br.json index c9a83c32..68dd048a 100644 --- a/app/locales/taiga/locale-pt-br.json +++ b/app/locales/taiga/locale-pt-br.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Guardar Linha", "TITLE_ACTION_UNFOLD_ROW": "Abrir linha", "FIELD_POINTS": "pontos", - "ROW_UNASSIGED_TASKS_TITLE": "Tarefas não atribuídas", + "ROW_STORYLESS_TASKS_TITLE": "Tarefas não atribuídas", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-ru.json b/app/locales/taiga/locale-ru.json index 08ad75d1..5e607657 100644 --- a/app/locales/taiga/locale-ru.json +++ b/app/locales/taiga/locale-ru.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Свернуть ряд", "TITLE_ACTION_UNFOLD_ROW": "Развернуть ряд", "FIELD_POINTS": "очков", - "ROW_UNASSIGED_TASKS_TITLE": "Не назначенные задачи", + "ROW_STORYLESS_TASKS_TITLE": "Не назначенные задачи", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-sv.json b/app/locales/taiga/locale-sv.json index e96d6e1f..b1506eac 100644 --- a/app/locales/taiga/locale-sv.json +++ b/app/locales/taiga/locale-sv.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Vika i hop raden", "TITLE_ACTION_UNFOLD_ROW": "Veckla ut rad", "FIELD_POINTS": "poäng", - "ROW_UNASSIGED_TASKS_TITLE": "Ej tilldelade uppgifter", + "ROW_STORYLESS_TASKS_TITLE": "Ej tilldelade uppgifter", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-tr.json b/app/locales/taiga/locale-tr.json index f390bc61..b67447b7 100644 --- a/app/locales/taiga/locale-tr.json +++ b/app/locales/taiga/locale-tr.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "Satın Katla", "TITLE_ACTION_UNFOLD_ROW": "Satır katını aç", "FIELD_POINTS": "puanlar", - "ROW_UNASSIGED_TASKS_TITLE": "Atanmamış görevler", + "ROW_STORYLESS_TASKS_TITLE": "Atanmamış görevler", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-zh-hans.json b/app/locales/taiga/locale-zh-hans.json index ababdf34..d366beac 100644 --- a/app/locales/taiga/locale-zh-hans.json +++ b/app/locales/taiga/locale-zh-hans.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "隐藏列数", "TITLE_ACTION_UNFOLD_ROW": "未隐藏列数", "FIELD_POINTS": "点数", - "ROW_UNASSIGED_TASKS_TITLE": "未指派的任务", + "ROW_STORYLESS_TASKS_TITLE": "未指派的任务", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/locales/taiga/locale-zh-hant.json b/app/locales/taiga/locale-zh-hant.json index 4ab7e3f9..7ef77216 100644 --- a/app/locales/taiga/locale-zh-hant.json +++ b/app/locales/taiga/locale-zh-hant.json @@ -1382,7 +1382,7 @@ "TITLE_ACTION_FOLD_ROW": "隱藏列數", "TITLE_ACTION_UNFOLD_ROW": "未隱藏列數", "FIELD_POINTS": "點數", - "ROW_UNASSIGED_TASKS_TITLE": "未指派的任務", + "ROW_STORYLESS_TASKS_TITLE": "未指派的任務", "ROW_ISSUES_TITLE": "Sprint Issues" }, "CHARTS": { diff --git a/app/modules/components/move-to-sprint/move-to-sprint-lb/move-to-sprint-lb.jade b/app/modules/components/move-to-sprint/move-to-sprint-lb/move-to-sprint-lb.jade index a3a18fb9..3080281d 100644 --- a/app/modules/components/move-to-sprint/move-to-sprint-lb/move-to-sprint-lb.jade +++ b/app/modules/components/move-to-sprint/move-to-sprint-lb/move-to-sprint-lb.jade @@ -20,7 +20,7 @@ tg-lightbox-close span.check-text.check-no(translate="COMMON.NO") li.choice(ng-if="vm.tasksCount") - span(ng-bind-html="'TASKBOARD.MOVE_TO_SPRINT.UNFINISHED_UNASSIGNED_TASKS_COUNT'|translate:{ total: vm.tasksCount || 0 }:'messageformat'") + span(ng-bind-html="'TASKBOARD.MOVE_TO_SPRINT.UNFINISHED_STORYLESS_TASKS_COUNT'|translate:{ total: vm.tasksCount || 0 }:'messageformat'") .check.js-check(ng-if="vm.hasManyItemTypes") input( type="checkbox" diff --git a/app/modules/components/move-to-sprint/move-to-sprint.controller.coffee b/app/modules/components/move-to-sprint/move-to-sprint.controller.coffee index 85cd4605..444bc3a5 100644 --- a/app/modules/components/move-to-sprint/move-to-sprint.controller.coffee +++ b/app/modules/components/move-to-sprint/move-to-sprint.controller.coffee @@ -41,7 +41,7 @@ class MoveToSprintController } @scope.$watch "vm.uss", () => @getOpenUss() - @scope.$watch "vm.unnasignedTasks", () => @getOpenUnassignedTasks() + @scope.$watch "vm.unnasignedTasks", () => @getOpenStorylessTasks() @scope.$watch "vm.issues", () => @getOpenIssues() checkOpenItems: () -> @@ -74,7 +74,7 @@ class MoveToSprintController }) @.hasOpenItems = @checkOpenItems() - getOpenUnassignedTasks: () -> + getOpenStorylessTasks: () -> return if !@.unnasignedTasks or @.permissions.indexOf("modify_task") == -1 @.openItems.tasks = [] @.unnasignedTasks.map (column) => column.map (task) => diff --git a/app/modules/components/move-to-sprint/move-to-sprint.controller.spec.coffee b/app/modules/components/move-to-sprint/move-to-sprint.controller.spec.coffee index 7ce68f30..f3ac146f 100644 --- a/app/modules/components/move-to-sprint/move-to-sprint.controller.spec.coffee +++ b/app/modules/components/move-to-sprint/move-to-sprint.controller.spec.coffee @@ -73,7 +73,7 @@ describe "MoveToSprint", -> it "is disabled by default", () -> expect(ctrl.hasOpenItems).to.be.false - it "is enabled when milestone has open user stories", () -> + it "is enabled when there are unfinished user stories", () -> ctrl.uss = [ { id: 1, is_closed: true, sprint_order: 5 } { id: 2, is_closed: false, sprint_order: 6 } @@ -86,7 +86,7 @@ describe "MoveToSprint", -> { us_id: 3, order: 7 } ]) - it "is enabled when milestone has open unassigned tasks", () -> + it "is enabled when there are unfinished storyless tasks", () -> ctrl.unnasignedTasks = Immutable.fromJS([ [ { model: { id: 1, is_closed: true, taskboard_order: 5 } } @@ -94,14 +94,14 @@ describe "MoveToSprint", -> ], [{ model: { id: 3, is_closed: false, taskboard_order: 7 } }] ]) - ctrl.getOpenUnassignedTasks() + ctrl.getOpenStorylessTasks() expect(ctrl.hasOpenItems).to.be.true expect(ctrl.openItems.tasks).to.be.eql([ { task_id: 2, order: 6 } { task_id: 3, order: 7 } ]) - it "is enabled when milestone has open issues", () -> + it "is enabled when there are unfinished issues", () -> ctrl.issues = Immutable.fromJS([ { id: 1, status: { is_closed: true } } { id: 2, status: { is_closed: false } } @@ -111,7 +111,7 @@ describe "MoveToSprint", -> expect(ctrl.openItems.issues).to.be.eql([{ issue_id: 2 }]) describe "lightbox", -> - it "is opened on button click if has open items", () -> + it "is opened on button click if there are unfinished items", () -> ctrl.issues = Immutable.fromJS([ { id: 1, status: { is_closed: false } } ]) @@ -119,6 +119,6 @@ describe "MoveToSprint", -> ctrl.openLightbox() expect(mocks.tgLightboxFactory.create).have.been.called - it "is not opened on button click if has no open items", () -> + it "is not opened on button click if there are no unfinished items", () -> ctrl.openLightbox() expect(mocks.tgLightboxFactory.create).not.have.been.called diff --git a/app/partials/includes/modules/taskboard-table.jade b/app/partials/includes/modules/taskboard-table.jade index a06dfd1a..cb158026 100644 --- a/app/partials/includes/modules/taskboard-table.jade +++ b/app/partials/includes/modules/taskboard-table.jade @@ -117,7 +117,7 @@ div.taskboard-table( ) tg-svg.fold-action(svg-icon="icon-unfold-row") h3.us-title - span(translate="TASKBOARD.TABLE.ROW_UNASSIGED_TASKS_TITLE") + span(translate="TASKBOARD.TABLE.ROW_STORYLESS_TASKS_TITLE") include ../components/addnewtask.jade div.taskboard-cards-box.taskboard-column(