diff --git a/frontend/components/EmptyState.vue b/frontend/components/EmptyState.vue index ea252b33c..2b0798f42 100644 --- a/frontend/components/EmptyState.vue +++ b/frontend/components/EmptyState.vue @@ -44,10 +44,10 @@ >
diff --git a/frontend/components/btn/BtnShareIcon.vue b/frontend/components/btn/BtnShareIcon.vue index 0f9c782c9..0fb8e162e 100644 --- a/frontend/components/btn/BtnShareIcon.vue +++ b/frontend/components/btn/BtnShareIcon.vue @@ -110,9 +110,9 @@ const { t } = useI18n(); const contentCopied = ref(false); const getCurrentI18n: { [key: string]: string } = { - signal: "components.btn_share_icon.opening_signal", - matrix: "components.btn_share_icon.opening_matrix", - instagram: "components.btn_share_icon.opening_instagram", + signal: i18nMap.components.btn_share_icon.opening_signal, + matrix: i18nMap.components.btn_share_icon.opening_matrix, + instagram: i18nMap.components.btn_share_icon.opening_instagram, }; const copyToClipboardThenOpenUrl = async ( diff --git a/frontend/components/card/CardDonate.vue b/frontend/components/card/CardDonate.vue index 1ed1f5b93..09d94fe76 100644 --- a/frontend/components/card/CardDonate.vue +++ b/frontend/components/card/CardDonate.vue @@ -30,11 +30,11 @@ class="flex" :cta="true" linkTo="/" - label="components.card_donate.donate" + :label="i18nMap.components.card_donate.donate" fontSize="sm" :rightIcon="IconMap.EXTERNAL_LINK" iconSize="1.25em" - ariaLabel="components.card_donate.go_to_donation_page_aria_label" + :ariaLabel="i18nMap.components.card_donate.go_to_donation_page_aria_label" />
diff --git a/frontend/components/card/CardOrgApplicationVote.vue b/frontend/components/card/CardOrgApplicationVote.vue index c51fc6801..c286aff50 100644 --- a/frontend/components/card/CardOrgApplicationVote.vue +++ b/frontend/components/card/CardOrgApplicationVote.vue @@ -35,7 +35,7 @@ :leftIcon="IconMap.ARROW_UP" iconSize="1.25em" :disabled="isVotingDisabled" - ariaLabel="components._global.upvote_application_aria_label" + :ariaLabel="i18nMap.components._global.upvote_application_aria_label" /> diff --git a/frontend/components/card/discussion/CardDiscussion.vue b/frontend/components/card/discussion/CardDiscussion.vue index 0a3a9dcde..378c0b71d 100644 --- a/frontend/components/card/discussion/CardDiscussion.vue +++ b/frontend/components/card/discussion/CardDiscussion.vue @@ -11,7 +11,9 @@ fontSize="sm" :leftIcon="IconMap.ARROW_UP" iconSize="1.25em" - ariaLabel="components.card.discussion._global.upvote_discussion_aria_label" + :ariaLabel=" + i18nMap.components.card.discussion._global.upvote_discussion_aria_label + " />
@@ -40,7 +42,10 @@ fontSize="sm" :leftIcon="IconMap.ARROW_UP" iconSize="1.25em" - ariaLabel="components.card.discussion._global.upvote_discussion_aria_label" + :ariaLabel=" + i18nMap.components.card.discussion._global + .upvote_discussion_aria_label + " />
diff --git a/frontend/components/card/discussion/CardDiscussionEntry.vue b/frontend/components/card/discussion/CardDiscussionEntry.vue index a2e420b68..8ca15851d 100644 --- a/frontend/components/card/discussion/CardDiscussionEntry.vue +++ b/frontend/components/card/discussion/CardDiscussionEntry.vue @@ -24,7 +24,9 @@ :leftIcon="IconMap.ARROW_UP" iconSize="1.25em" :counter="discussionEntry.votes" - ariaLabel="components.card.discussion._global.upvote_discussion_aria_label" + :ariaLabel=" + i18nMap.components.card.discussion._global.upvote_discussion_aria_label + " /> diff --git a/frontend/components/card/discussion/CardDiscussionInput.vue b/frontend/components/card/discussion/CardDiscussionInput.vue index 85c71086d..7cba3b440 100644 --- a/frontend/components/card/discussion/CardDiscussionInput.vue +++ b/frontend/components/card/discussion/CardDiscussionInput.vue @@ -10,7 +10,9 @@ :cta="true" :label="$t(i18nMap.components.card_discussion_input.write)" fontSize="sm" - ariaLabel="components.card_discussion_input.write_aria_label" + :ariaLabel=" + i18nMap.components.card_discussion_input.write_aria_label + " />
@@ -19,7 +21,9 @@ :cta="false" :label="$t(i18nMap.components.card_discussion_input.preview)" fontSize="sm" - ariaLabel="components.card_discussion_input.preview_aria_label" + :ariaLabel=" + i18nMap.components.card_discussion_input.preview_aria_label + " />
@@ -136,7 +140,9 @@ :cta="true" :label="$t(i18nMap.components.card_discussion_input.comment)" fontSize="sm" - ariaLabel="components.card_discussion_input.comment_aria_label" + :ariaLabel=" + i18nMap.components.card_discussion_input.comment_aria_label + " /> diff --git a/frontend/components/card/get-involved/CardGetInvolvedEvent.vue b/frontend/components/card/get-involved/CardGetInvolvedEvent.vue index a8f127311..a0596fc86 100644 --- a/frontend/components/card/get-involved/CardGetInvolvedEvent.vue +++ b/frontend/components/card/get-involved/CardGetInvolvedEvent.vue @@ -25,11 +25,11 @@ class="w-full" :cta="true" linkTo="/" - label="_global.offer_to_help" + :label="i18nMap._global.offer_to_help" fontSize="sm" :rightIcon="IconMap.ARROW_RIGHT" iconSize="1.45em" - ariaLabel="_global.offer_to_help_aria_label" + :ariaLabel="i18nMap._global.offer_to_help_aria_label" /> diff --git a/frontend/components/card/get-involved/CardGetInvolvedGroup.vue b/frontend/components/card/get-involved/CardGetInvolvedGroup.vue index c98a1e604..cbc843e88 100644 --- a/frontend/components/card/get-involved/CardGetInvolvedGroup.vue +++ b/frontend/components/card/get-involved/CardGetInvolvedGroup.vue @@ -15,11 +15,11 @@ v-if="group.getInvolvedUrl" :cta="true" :linkTo="group.getInvolvedUrl" - label="_global.join_group" + :label="i18nMap._global.join_group" fontSize="sm" :rightIcon="IconMap.ARROW_RIGHT" iconSize="1.45em" - ariaLabel="_global.join_group_aria_label" + :ariaLabel="i18nMap._global.join_group_aria_label" /> diff --git a/frontend/components/card/search-result/CardSearchResult.vue b/frontend/components/card/search-result/CardSearchResult.vue index 8c2c67b78..ef98799bb 100644 --- a/frontend/components/card/search-result/CardSearchResult.vue +++ b/frontend/components/card/search-result/CardSearchResult.vue @@ -163,7 +163,7 @@ @@ -177,7 +177,7 @@ @@ -193,15 +193,15 @@ /> diff --git a/frontend/components/combobox/ComboboxTopics.vue b/frontend/components/combobox/ComboboxTopics.vue index 0eabacf1d..16ea547ca 100644 --- a/frontend/components/combobox/ComboboxTopics.vue +++ b/frontend/components/combobox/ComboboxTopics.vue @@ -92,7 +92,7 @@ import { GLOBAL_TOPICS } from "~/types/topics"; const i18n = useI18n(); -const topics = [{ id: 1, name: "components.combobox_topics.all_topics" }]; +const topics = [{ id: 1, name: i18nMap.components.combobox_topics.all_topics }]; let nextId = topics.length + 1; for (const t of GLOBAL_TOPICS) { diff --git a/frontend/components/dropdown/DropdownCreate.vue b/frontend/components/dropdown/DropdownCreate.vue index 8cf3abcab..92d473c72 100644 --- a/frontend/components/dropdown/DropdownCreate.vue +++ b/frontend/components/dropdown/DropdownCreate.vue @@ -5,7 +5,7 @@ :menuButtonIcon="IconMap.CIRCLE_PLUS" :menuButtonLabel="$t(i18nMap.components.dropdown_create.create)" :isMenuButtonUppercase="false" - menuButtonAriaLabel="components.dropdown_create.create_aria_label" + :menuButtonAriaLabel="i18nMap.components.dropdown_create.create_aria_label" > @@ -24,28 +24,28 @@ defineProps<{ const createOptions: MenuSelector[] = [ { id: 1, - label: "_global.new_event", + label: i18nMap._global.new_event, routeUrl: "/events/create", iconUrl: `${IconMap.EVENT}`, selected: false, }, { id: 2, - label: "components.dropdown_create.new_organization", + label: i18nMap.components.dropdown_create.new_organization, routeUrl: "/organizations/create", iconUrl: "IconOrganization", selected: false, }, { id: 3, - label: "_global.new_group", + label: i18nMap._global.new_group, routeUrl: "/groups/create", iconUrl: "IconGroup", selected: false, }, { id: 4, - label: "_global.new_resource", + label: i18nMap._global.new_resource, routeUrl: "/resources/create", iconUrl: "IconResource", selected: false, diff --git a/frontend/components/dropdown/DropdownInfo.vue b/frontend/components/dropdown/DropdownInfo.vue index 2100234b7..3b5067b4e 100644 --- a/frontend/components/dropdown/DropdownInfo.vue +++ b/frontend/components/dropdown/DropdownInfo.vue @@ -5,7 +5,7 @@ :menuButtonIcon="IconMap.CIRCLE_INFO" :menuButtonLabel="$t(i18nMap.components.dropdown_info.info)" :isMenuButtonUppercase="false" - menuButtonAriaLabel="components.dropdown_info.info_aria_label" + :menuButtonAriaLabel="i18nMap.components.dropdown_info.info_aria_label" > @@ -24,21 +24,21 @@ defineProps<{ const infoOptions: MenuSelector[] = [ { id: 1, - label: "components.dropdown_info.help", + label: i18nMap.components.dropdown_info.help, routeUrl: "/help", iconUrl: `${IconMap.CIRCLE_QUESTION}`, selected: false, }, { id: 2, - label: "components._global.documentation", + label: i18nMap.components._global.documentation, routeUrl: "/docs", iconUrl: `${IconMap.DOCS}`, selected: false, }, { id: 3, - label: "components.dropdown_info.legal", + label: i18nMap.components.dropdown_info.legal, routeUrl: "/legal", iconUrl: `${IconMap.LEGAL}`, selected: false, diff --git a/frontend/components/dropdown/DropdownLanguage.vue b/frontend/components/dropdown/DropdownLanguage.vue index 3dbc7a047..57d2a969e 100644 --- a/frontend/components/dropdown/DropdownLanguage.vue +++ b/frontend/components/dropdown/DropdownLanguage.vue @@ -6,7 +6,9 @@ :menuButtonIcon="IconMap.GLOBE" :menuButtonLabel="$i18n.locale" :isMenuButtonUppercase="true" - menuButtonAriaLabel="components.dropdown_language.open_dropdown_aria_label" + :menuButtonAriaLabel=" + i18nMap.components.dropdown_language.open_dropdown_aria_label + " >
    import { MenuItem } from "@headlessui/vue"; import type { LocaleObject } from "@nuxtjs/i18n"; +import { i18nMap } from "~/types/i18n-map"; import { IconMap } from "~/types/icon-map"; import type { DropdownLocation } from "~/types/location"; diff --git a/frontend/components/dropdown/DropdownTheme.vue b/frontend/components/dropdown/DropdownTheme.vue index dad28dc82..399d2343c 100644 --- a/frontend/components/dropdown/DropdownTheme.vue +++ b/frontend/components/dropdown/DropdownTheme.vue @@ -54,20 +54,20 @@ const labelsOpt = [ { optColorMode: "system", iconName: `${IconMap.COLOR_MODE_SYSTEM}`, - label: "components.dropdown_theme.system", - ariaLabel: "components.dropdown_theme.system_aria_label", + label: i18nMap.components.dropdown_theme.system, + ariaLabel: i18nMap.components.dropdown_theme.system_aria_label, }, { optColorMode: "light", iconName: `${IconMap.COLOR_MODE_LIGHT}`, - label: "components.dropdown_theme.light", - ariaLabel: "components.dropdown_theme.light_aria_label", + label: i18nMap.components.dropdown_theme.light, + ariaLabel: i18nMap.components.dropdown_theme.light_aria_label, }, { optColorMode: "dark", iconName: `${IconMap.COLOR_MODE_DARK}`, - label: "components.dropdown_theme.dark", - ariaLabel: "components.dropdown_theme.dark_aria_label", + label: i18nMap.components.dropdown_theme.dark, + ariaLabel: i18nMap.components.dropdown_theme.dark_aria_label, }, ]; diff --git a/frontend/components/dropdown/DropdownUserOptions.vue b/frontend/components/dropdown/DropdownUserOptions.vue index b09fe7db7..708973f84 100644 --- a/frontend/components/dropdown/DropdownUserOptions.vue +++ b/frontend/components/dropdown/DropdownUserOptions.vue @@ -10,7 +10,9 @@ " :isMenuButtonUppercase="false" :isMenuButtonBold="true" - menuButtonAriaLabel="components.dropdown_user_options.username_aria_label" + :menuButtonAriaLabel=" + i18nMap.components.dropdown_user_options.username_aria_label + " > diff --git a/frontend/components/sidebar/left/SidebarLeft.vue b/frontend/components/sidebar/left/SidebarLeft.vue index e99091ab3..9483f162b 100644 --- a/frontend/components/sidebar/left/SidebarLeft.vue +++ b/frontend/components/sidebar/left/SidebarLeft.vue @@ -63,6 +63,7 @@ diff --git a/frontend/components/tooltip/TooltipSignIn.vue b/frontend/components/tooltip/TooltipSignIn.vue index 5f4ab07aa..ab2e67301 100644 --- a/frontend/components/tooltip/TooltipSignIn.vue +++ b/frontend/components/tooltip/TooltipSignIn.vue @@ -7,7 +7,7 @@
    { @@ -27,41 +28,53 @@ const useMenuEntriesState = () => { let removeGuard = () => {}; const organizationEntries = ref([ - createMenuEntry("_global.about", "organizations", `${IconMap.ABOUT}`), - createMenuEntry("_global.events", "organizations", `${IconMap.EVENT}`), + createMenuEntry(i18nMap._global.about, "organizations", `${IconMap.ABOUT}`), createMenuEntry( - "composables.use_menu_entries_state.groups", + i18nMap._global.events, + "organizations", + `${IconMap.EVENT}` + ), + createMenuEntry( + i18nMap.composables.use_menu_entries_state.groups, "organizations", `${IconMap.GROUP}` ), createMenuEntry( - "_global.resources", + i18nMap._global.resources, "organizations", `${IconMap.RESOURCE}` ), - createMenuEntry("_global.faq", "organizations", `${IconMap.FAQ}`), - // createMenuEntry("_global.team", "organizations", `${IconMap.PEOPLE}`), + createMenuEntry(i18nMap._global.faq, "organizations", `${IconMap.FAQ}`), + // createMenuEntry(i18nMap._global.team, "organizations", `${IconMap.PEOPLE}`), createMenuEntry( - "composables.use_menu_entries_state.affiliates", + i18nMap.composables.use_menu_entries_state.affiliates, "organizations", `${IconMap.SUPPORT}` ), - createMenuEntry("_global.tasks", "organizations", `${IconMap.TASK}`), + createMenuEntry(i18nMap._global.tasks, "organizations", `${IconMap.TASK}`), createMenuEntry( - "_global.discussions", + i18nMap._global.discussions, "organizations", `${IconMap.DISCUSSION}` ), - createMenuEntry("_global.settings", "organizations", `${IconMap.SETTINGS}`), + createMenuEntry( + i18nMap._global.settings, + "organizations", + `${IconMap.SETTINGS}` + ), ]); const eventEntries = ref([ - createMenuEntry("_global.about", "events", `${IconMap.ABOUT}`), - createMenuEntry("_global.team", "events", `${IconMap.PEOPLE}`), - createMenuEntry("_global.resources", "events", `${IconMap.RESOURCE}`), - createMenuEntry("_global.tasks", "events", `${IconMap.TASK}`), - createMenuEntry("_global.discussion", "events", `${IconMap.DISCUSSION}`), - createMenuEntry("_global.settings", "events", `${IconMap.SETTINGS}`), + createMenuEntry(i18nMap._global.about, "events", `${IconMap.ABOUT}`), + createMenuEntry(i18nMap._global.team, "events", `${IconMap.PEOPLE}`), + createMenuEntry(i18nMap._global.resources, "events", `${IconMap.RESOURCE}`), + createMenuEntry(i18nMap._global.tasks, "events", `${IconMap.TASK}`), + createMenuEntry( + i18nMap._global.discussion, + "events", + `${IconMap.DISCUSSION}` + ), + createMenuEntry(i18nMap._global.settings, "events", `${IconMap.SETTINGS}`), ]); const updateCurrentPath = () => { @@ -77,7 +90,9 @@ const useMenuEntriesState = () => { for (const button of buttons.value) { if (currentPath.value.includes("/groups/")) { - if (button.label === "composables.use_menu_entries_state.groups") { + if ( + button.label === i18nMap.composables.use_menu_entries_state.groups + ) { button.selected = true; } else { button.selected = false; diff --git a/frontend/error.vue b/frontend/error.vue index d236b2464..c95fecc63 100644 --- a/frontend/error.vue +++ b/frontend/error.vue @@ -31,10 +31,10 @@
    diff --git a/frontend/i18n/de.json b/frontend/i18n/de.json index f1bb98115..afb735b6d 100644 --- a/frontend/i18n/de.json +++ b/frontend/i18n/de.json @@ -352,9 +352,9 @@ "error.message": "Ups, irgendetwas ist schiefgelaufen:", "error.title": "Fehler • Aktivist", "layouts.auth.auth": "Auth", - "layouts.auth.set_password_set_new_password": "Neues Passwort festlegen", + "layouts.auth.set_new_password": "Neues Passwort festlegen", "layouts.auth.sign_in_welcome_back": "Willkommen zurück!", - "layouts.auth.sign_up_first_time_welcome": "Lasst uns an die Arbeit gehen!", + "layouts.auth.sign_up_welcome": "Lasst uns an die Arbeit gehen!", "layouts.auth.welcome": "Willkommen!", "pages._global.create.description": "Beschreibung", "pages._global.create.information": "Information", diff --git a/frontend/i18n/en-US.json b/frontend/i18n/en-US.json index 0084680b7..2e23115ef 100644 --- a/frontend/i18n/en-US.json +++ b/frontend/i18n/en-US.json @@ -361,9 +361,9 @@ "error.message": "Oops, something went wrong:", "error.title": "Error \u2022 activist", "layouts.auth.auth": "Auth", - "layouts.auth.set_password_set_new_password": "Set new password", + "layouts.auth.set_new_password": "Set new password", "layouts.auth.sign_in_welcome_back": "Welcome back!", - "layouts.auth.sign_up_first_time_welcome": "Let's get to work!", + "layouts.auth.sign_up_welcome": "Let's get to work!", "layouts.auth.welcome": "Welcome!", "pages._global.create.description": "Description", "pages._global.create.information": "Information", diff --git a/frontend/i18n/es.json b/frontend/i18n/es.json index d1f56c91a..2b45d93a0 100644 --- a/frontend/i18n/es.json +++ b/frontend/i18n/es.json @@ -348,9 +348,9 @@ "error.message": "Ups, algo salió mal:", "error.title": "Error • activist", "layouts.auth.auth": "Autor", - "layouts.auth.set_password_set_new_password": "Establecer nueva contraseña", + "layouts.auth.set_new_password": "Establecer nueva contraseña", "layouts.auth.sign_in_welcome_back": "¡Bienvenido de nuevo!", - "layouts.auth.sign_up_first_time_welcome": "¡Vamos a trabajar!", + "layouts.auth.sign_up_welcome": "¡Vamos a trabajar!", "layouts.auth.welcome": "¡Bienvenido!", "pages._global.create.description": "Descripción", "pages._global.create.information": "Información", diff --git a/frontend/i18n/fr.json b/frontend/i18n/fr.json index 99ade9e3c..8a086253b 100644 --- a/frontend/i18n/fr.json +++ b/frontend/i18n/fr.json @@ -357,9 +357,9 @@ "error.message": "Oups, quelque chose a mal tourné :", "error.title": "Erreur • Activist", "layouts.auth.auth": "Authentication", - "layouts.auth.set_password_set_new_password": "Définir un nouveau mot de passe", + "layouts.auth.set_new_password": "Définir un nouveau mot de passe", "layouts.auth.sign_in_welcome_back": "Heureux de te revoir !", - "layouts.auth.sign_up_first_time_welcome": "Mettons-nous au travail !", + "layouts.auth.sign_up_welcome": "Mettons-nous au travail !", "layouts.auth.welcome": "Bienvenue !", "pages._global.create.description": "Description", "pages._global.create.information": "Information", diff --git a/frontend/layouts/Auth.vue b/frontend/layouts/Auth.vue index 7d7396b82..651f89450 100644 --- a/frontend/layouts/Auth.vue +++ b/frontend/layouts/Auth.vue @@ -42,6 +42,8 @@