Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/components/AppNavigation/AppNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,13 @@ export default {
msg: '',
}
if (this.isCalendarNameUsed(name, id)) {
check.msg = this.$t('tasks', 'The name "{calendar}" is already used.', { calendar: name })
check.msg = this.$t(
'tasks',
'The name "{calendar}" is already used.',
{ calendar: name },
undefined,
{ sanitize: false, escape: false }
)
} else if (!name) {
check.msg = this.$t('tasks', 'An empty name is not allowed.')
} else {
Expand Down
32 changes: 28 additions & 4 deletions src/components/AppNavigation/ListItemCalendar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,37 @@ export default {

deleteMessage() {
return !this.calendar.isSharedWithMe
? this.$t('tasks', 'This will delete the calendar "{calendar}" and all corresponding events and tasks.', { calendar: this.calendar.displayName })
: this.$t('tasks', 'This will unshare the calendar "{calendar}".', { calendar: this.calendar.displayName })
? this.$t(
'tasks',
'This will delete the calendar "{calendar}" and all corresponding events and tasks.',
{ calendar: this.calendar.displayName },
undefined,
{ sanitize: false, escape: false }
)
: this.$t(
'tasks',
'This will unshare the calendar "{calendar}".',
{ calendar: this.calendar.displayName },
undefined,
{ sanitize: false, escape: false }
)
},
undoDeleteMessage() {
return !this.calendar.isSharedWithMe
? this.$n('tasks', 'Deleting the calendar in {countdown} second', 'Deleting the calendar in {countdown} seconds', this.countdown, { countdown: this.countdown })
: this.$n('tasks', 'Unsharing the calendar in {countdown} second', 'Unsharing the calendar in {countdown} seconds', this.countdown, { countdown: this.countdown })
? this.$n(
'tasks',
'Deleting the calendar in {countdown} second',
'Deleting the calendar in {countdown} seconds',
this.countdown,
{ countdown: this.countdown }
)
: this.$n(
'tasks',
'Unsharing the calendar in {countdown} second',
'Unsharing the calendar in {countdown} seconds',
this.countdown,
{ countdown: this.countdown }
)
},
sharingIconClass() {
if (this.calendar.shares.length) {
Expand Down
10 changes: 8 additions & 2 deletions src/components/DeleteCompletedModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
{
taskCount: initialCompletedRootTasksCount,
calendar: calendar.displayName
}
},
{ sanitize: false, escape: false }
) }}
</h3>
<button class="delete-completed__button icon-delete"
Expand All @@ -49,7 +50,12 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</div>
<div v-else>
<h3 class="delete-completed__header">
{{ $t('tasks', 'Deleted all completed tasks from calendar "{calendar}".', { calendar: calendar.displayName }) }}
{{ $t('tasks',
'Deleted all completed tasks from calendar "{calendar}".',
{ calendar: calendar.displayName },
undefined,
{ sanitize: false, escape: false }
) }}
</h3>
</div>
<div>
Expand Down
8 changes: 7 additions & 1 deletion src/components/TaskBody.vue
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,13 @@ export default {
* @returns {String} the placeholder string to show
*/
subtasksCreationPlaceholder() {
return this.$t('tasks', 'Add a subtask to "{task}"…', { task: this.task.summary })
return this.$t(
'tasks',
'Add a subtask to "{task}"…',
{ task: this.task.summary },
undefined,
{ sanitize: false, escape: false }
)
},

/**
Expand Down
8 changes: 7 additions & 1 deletion src/components/TheCollections/Calendar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,13 @@ export default {
},

inputString() {
return this.$t('tasks', 'Add a task to "{task}"…', { task: this.calendar.displayName })
return this.$t(
'tasks',
'Add a task to "{task}"…',
{ task: this.calendar.displayName },
undefined,
{ sanitize: false, escape: false }
)
},

/**
Expand Down
32 changes: 28 additions & 4 deletions src/components/TheCollections/General.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,37 @@ export default {
inputString() {
switch (this.collectionId) {
case 'starred':
return this.$t('tasks', 'Add an important task to "{calendar}"…', { calendar: this.calendar.displayName })
return this.$t(
'tasks',
'Add an important task to "{calendar}"…',
{ calendar: this.calendar.displayName },
undefined,
{ sanitize: false, escape: false }
)
case 'today':
return this.$t('tasks', 'Add a task due today to "{calendar}"…', { calendar: this.calendar.displayName })
return this.$t(
'tasks',
'Add a task due today to "{calendar}"…',
{ calendar: this.calendar.displayName },
undefined,
{ sanitize: false, escape: false }
)
case 'current':
return this.$t('tasks', 'Add a current task to "{calendar}"…', { calendar: this.calendar.displayName })
return this.$t(
'tasks',
'Add a current task to "{calendar}"…',
{ calendar: this.calendar.displayName },
undefined,
{ sanitize: false, escape: false }
)
default:
return this.$t('tasks', 'Add a task to "{calendar}"…', { calendar: this.calendar.displayName })
return this.$t(
'tasks',
'Add a task to "{calendar}"…',
{ calendar: this.calendar.displayName },
undefined,
{ sanitize: false, escape: false }
)
}
},
...mapGetters({
Expand Down
8 changes: 7 additions & 1 deletion src/components/TheCollections/Week.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,13 @@ export default {
},

inputString() {
return this.$t('tasks', 'Add a task due today to "{calendar}"…', { calendar: this.calendar.displayName })
return this.$t(
'tasks',
'Add a task due today to "{calendar}"…',
{ calendar: this.calendar.displayName },
undefined,
{ sanitize: false, escape: false }
)
},
},
methods: {
Expand Down