Skip to content

Commit a39498a

Browse files
authored
Merge branch 'main' into prevent-invalid-year-input
2 parents d0175d2 + b1e6aca commit a39498a

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

l10n/sw.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ OC.L10N.register(
187187
"Appearance" : "Mwonekano",
188188
"Show card ID badge" : "Onesha beji ya kitambulisho cha kadi",
189189
"Show boards in calendar/tasks" : "Onesha bodi katika kalenda/shughuli",
190+
"Admin settings" : "Mipangilio ya msimamizi",
190191
"Limit board creation to some groups" : "Zuia matengenezo ya bodi kwenye makundi kadhaa",
191192
"Users outside of those groups will not be able to create their own boards, but will still be able to work on boards that have been shared with them." : "Watumiaji nje ya makundi hayo hawataweza kutengeneza bodi zao wenyewe, lakini bado wataweza kufanya kazi juu ya bodi ambazo zimeshirikishwa na wao.",
192193
"Board actions" : "Matendo ya bodi",
@@ -332,7 +333,10 @@ OC.L10N.register(
332333
"An error occurred" : "Hitilafu imetokea",
333334
"Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Una uhakika unataka kufuta bodi {title}? Hii itafuta data zote za bodi ikijumuisha kadi zilizohifadhiwa",
334335
"Delete the board?" : "Futa bodi?",
336+
"Are you sure you want to leave the board {title}?" : "Je, una uhakika unataka kuondoka kwenye ubao wa {title}?",
337+
"Leave the board?" : "Ungependa kuondoka kwenye ubao?",
335338
"Leave" : "Ondoka",
339+
"Failed to leave the board" : "Imeshindwa kuondoka kwenye ubao",
336340
"Exporting board..." : "Safirisha bodi...",
337341
"Board details" : "Maelezo ya bodi",
338342
"Edit board" : "Hariri bodi",
@@ -346,6 +350,7 @@ OC.L10N.register(
346350
"Assigned cards" : "Kadi zilizokabidhiwa",
347351
"No notifications" : "Hakuna taarifa",
348352
"Delete board" : "Futa bodi",
353+
"Leave board" : "Ondoka kwenye ubao",
349354
"Importing board..." : "Inaingiza bodi....",
350355
"Board imported successfully" : "Bodi imeingizwa kikamilifu",
351356
"Import board" : "Ingiza bodi",

l10n/sw.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@
185185
"Appearance" : "Mwonekano",
186186
"Show card ID badge" : "Onesha beji ya kitambulisho cha kadi",
187187
"Show boards in calendar/tasks" : "Onesha bodi katika kalenda/shughuli",
188+
"Admin settings" : "Mipangilio ya msimamizi",
188189
"Limit board creation to some groups" : "Zuia matengenezo ya bodi kwenye makundi kadhaa",
189190
"Users outside of those groups will not be able to create their own boards, but will still be able to work on boards that have been shared with them." : "Watumiaji nje ya makundi hayo hawataweza kutengeneza bodi zao wenyewe, lakini bado wataweza kufanya kazi juu ya bodi ambazo zimeshirikishwa na wao.",
190191
"Board actions" : "Matendo ya bodi",
@@ -330,7 +331,10 @@
330331
"An error occurred" : "Hitilafu imetokea",
331332
"Are you sure you want to delete the board {title}? This will delete all the data of this board including archived cards." : "Una uhakika unataka kufuta bodi {title}? Hii itafuta data zote za bodi ikijumuisha kadi zilizohifadhiwa",
332333
"Delete the board?" : "Futa bodi?",
334+
"Are you sure you want to leave the board {title}?" : "Je, una uhakika unataka kuondoka kwenye ubao wa {title}?",
335+
"Leave the board?" : "Ungependa kuondoka kwenye ubao?",
333336
"Leave" : "Ondoka",
337+
"Failed to leave the board" : "Imeshindwa kuondoka kwenye ubao",
334338
"Exporting board..." : "Safirisha bodi...",
335339
"Board details" : "Maelezo ya bodi",
336340
"Edit board" : "Hariri bodi",
@@ -344,6 +348,7 @@
344348
"Assigned cards" : "Kadi zilizokabidhiwa",
345349
"No notifications" : "Hakuna taarifa",
346350
"Delete board" : "Futa bodi",
351+
"Leave board" : "Ondoka kwenye ubao",
347352
"Importing board..." : "Inaingiza bodi....",
348353
"Board imported successfully" : "Bodi imeingizwa kikamilifu",
349354
"Import board" : "Ingiza bodi",

src/components/navigation/AppNavigationBoard.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ export default {
334334
.then(() => {
335335
this.loading = false
336336
this.deleted = true
337+
this.redirectToOverviewIfCurrentBoard()
337338
this.undoTimeoutHandle = setTimeout(() => {
338339
this.$store.dispatch('removeBoard', this.board)
339340
}, 7000)
@@ -359,6 +360,7 @@ export default {
359360
this.boardApi.leaveBoard(this.board)
360361
.then(() => {
361362
this.loading = false
363+
this.redirectToOverviewIfCurrentBoard()
362364
this.$store.dispatch('removeBoard', this.board)
363365
})
364366
.catch(() => {
@@ -436,6 +438,12 @@ export default {
436438
}
437439
}
438440
},
441+
redirectToOverviewIfCurrentBoard() {
442+
const currentBoardId = Number.parseInt(this.$route?.params?.id, 10)
443+
if (!Number.isNaN(currentBoardId) && currentBoardId === this.board.id) {
444+
this.$router.push({ name: 'main' })
445+
}
446+
},
439447
},
440448
}
441449
</script>

0 commit comments

Comments
 (0)