diff --git a/js/src/components/Home/MobilizonPresentation.vue b/js/src/components/Home/MobilizonPresentation.vue index a0e124266..47a8a114d 100644 --- a/js/src/components/Home/MobilizonPresentation.vue +++ b/js/src/components/Home/MobilizonPresentation.vue @@ -5,40 +5,43 @@ <h3 class="dark:text-white text-3xl font-bold"> {{ t("A practical tool") }} </h3> - <p + <i18n-t + tag="p" class="dark:text-white" - v-html=" - t( - 'Mobilizon is a tool that helps you <b>find, create and organise events</b>.' - ) - " - /> + keypath="Mobilizon is a tool that helps you {find_create_organize_events}." + > + <template #find_create_organize_events> + <b>{{ t("find, create and organise events") }}</b> + </template> + </i18n-t> </div> <div> <h3 class="dark:text-white text-3xl font-bold"> {{ t("An ethical alternative") }} </h3> - <p + <i18n-t + tag="p" class="dark:text-white" - v-html=" - t( - 'Ethical alternative to Facebook events, groups and pages, Mobilizon is a <b>tool designed to serve you</b>. Period.' - ) - " - /> + keypath="Ethical alternative to Facebook events, groups and pages, Mobilizon is a {tool_designed_to_serve_you}. Period." + > + <template #tool_designed_to_serve_you> + <b>{{ t("tool designed to serve you") }}</b> + </template> + </i18n-t> </div> <div> <h3 class="dark:text-white text-3xl font-bold"> {{ t("A federated software") }} </h3> - <p + <i18n-t + tag="p" class="dark:text-white" - v-html=" - t( - 'Mobilizon is not a giant platform, but a <b>multitude of interconnected Mobilizon websites</b>.' - ) - " - /> + keypath="Mobilizon is not a giant platform, but a {multitude_of_interconnected_mobilizon_websites}." + > + <template #multitude_of_interconnected_mobilizon_websites> + <b>{{ t("multitude of interconnected Mobilizon websites") }}</b> + </template> + </i18n-t> </div> </div> <div class="mt-4 text-center"> diff --git a/js/src/components/Resource/DraggableList.vue b/js/src/components/Resource/DraggableList.vue index d8ec0f26e..c35841d24 100644 --- a/js/src/components/Resource/DraggableList.vue +++ b/js/src/components/Resource/DraggableList.vue @@ -9,9 +9,13 @@ <div class="actions" v-if="validCheckedResources.length > 0"> <small> {{ - $tc("No resources selected", validCheckedResources.length, { - count: validCheckedResources.length, - }) + $t( + "No resources selected", + { + count: validCheckedResources.length, + }, + validCheckedResources.length + ) }} </small> <o-button diff --git a/js/src/views/Event/Edit.vue b/js/src/views/Event/Edit.vue index ec5dbd70e..586e2ae23 100644 --- a/js/src/views/Event/Edit.vue +++ b/js/src/views/Event/Edit.vue @@ -169,16 +169,17 @@ v-if="event.contacts && event.contacts.length" v-html=" ' ' + - $tc( + $t( '<b>{contact}</b> will be displayed as contact.', - event.contacts.length, + { contact: formatList( event.contacts.map((contact) => displayNameAndUsername(contact) ) ), - } + }, + event.contacts.length ) " /> diff --git a/js/src/views/HomeView.vue b/js/src/views/HomeView.vue index bd6b0200a..2e7507dd8 100644 --- a/js/src/views/HomeView.vue +++ b/js/src/views/HomeView.vue @@ -144,21 +144,33 @@ v-if="isInLessThanSevenDays(row[0])" > <span v-if="isToday(row[0])">{{ - $tc("You have one event today.", row[1].size, { - count: row[1].size, - }) + $t( + "You have one event today.", + { + count: row[1].size, + }, + row[1].size + ) }}</span> <span v-else-if="isTomorrow(row[0])">{{ - $tc("You have one event tomorrow.", row[1].size, { - count: row[1].size, - }) + $t( + "You have one event tomorrow.", + { + count: row[1].size, + }, + row[1].size + ) }}</span> <span v-else-if="isInLessThanSevenDays(row[0])"> {{ - $tc("You have one event in {days} days.", row[1].size, { - count: row[1].size, - days: calculateDiffDays(row[0]), - }) + $t( + "You have one event in {days} days.", + { + count: row[1].size, + days: calculateDiffDays(row[0]), + }, + row[1].size + ) }} </span> </p> @@ -223,10 +235,10 @@ </h2> <p> {{ - $tc("Within {number} kilometers of {place}", radius, { + $t("Within {number} kilometers of {place}", { radius, place: locationName, - }) + }, radius) }} <router-link :to="{ name: RouteName.PREFERENCES }" diff --git a/js/src/views/Todos/TodoLists.vue b/js/src/views/Todos/TodoLists.vue index eee049fb6..f12756c06 100644 --- a/js/src/views/Todos/TodoLists.vue +++ b/js/src/views/Todos/TodoLists.vue @@ -42,10 +42,14 @@ > <h3 class="is-size-3"> {{ - $tc("{title} ({count} todos)", todoList.todos.total, { - count: todoList.todos.total, - title: todoList.title, - }) + $t( + "{title} ({count} todos)", + { + count: todoList.todos.total, + title: todoList.title, + }, + todoList.todos.total + ) }} </h3> </router-link>