From f2c9ba28d6e15c7a1181a88f977bf0e760b05084 Mon Sep 17 00:00:00 2001 From: jennethydyrova Date: Tue, 3 Sep 2024 11:43:51 +0100 Subject: [PATCH 1/4] rename and add missing key --- frontend/components/card/search-result/CardSearchResult.vue | 4 ++-- frontend/i18n/en-US.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/components/card/search-result/CardSearchResult.vue b/frontend/components/card/search-result/CardSearchResult.vue index df71e1268..3e7dc83cf 100644 --- a/frontend/components/card/search-result/CardSearchResult.vue +++ b/frontend/components/card/search-result/CardSearchResult.vue @@ -167,7 +167,7 @@ @@ -181,7 +181,7 @@ diff --git a/frontend/i18n/en-US.json b/frontend/i18n/en-US.json index 04ff2a545..5f22f0355 100644 --- a/frontend/i18n/en-US.json +++ b/frontend/i18n/en-US.json @@ -153,6 +153,7 @@ "components.card_search_result.navigate_to_user_aria_label": "Navigate to the page for this user", "components.card_search_result.organization_img_alt_text": "The organization logo of", "components.card_search_result.supporters_lower": "supporters", + "components.card_search_result.view_video": "View video", "components.card_topic_selection.header": "Topics", "components.card_topic_selection.hide_all_topics": "Hide all topics", "components.card_topic_selection.selector_placeholder": "Type to filter topics", From b4fa23b7f9b8f4ca49e1e2a58ad0b558eb3aba0d Mon Sep 17 00:00:00 2001 From: jennethydyrova Date: Tue, 3 Sep 2024 14:51:35 +0100 Subject: [PATCH 2/4] replace old style keys --- frontend/composables/useMenuEntriesState.ts | 6 +++--- frontend/i18n/de.json | 4 ++-- frontend/i18n/en-US.json | 4 ++-- frontend/i18n/es.json | 4 ++-- frontend/i18n/fr.json | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/composables/useMenuEntriesState.ts b/frontend/composables/useMenuEntriesState.ts index 07fea0d77..9cb862735 100644 --- a/frontend/composables/useMenuEntriesState.ts +++ b/frontend/composables/useMenuEntriesState.ts @@ -28,7 +28,7 @@ const useMenuEntriesState = () => { const organizationEntries = ref([ createMenuEntry("_global.about", "organizations", `${IconMap.ABOUT}`), createMenuEntry("_global.events", "organizations", `${IconMap.EVENT}`), - createMenuEntry("_global.groups", "organizations", `${IconMap.GROUP}`), + createMenuEntry("composables.use_menu_entries_state.groups", "organizations", `${IconMap.GROUP}`), createMenuEntry( "_global.resources", "organizations", @@ -37,7 +37,7 @@ const useMenuEntriesState = () => { createMenuEntry("_global.faq", "organizations", `${IconMap.FAQ}`), // createMenuEntry("_global.team", "organizations", `${IconMap.PEOPLE}`), createMenuEntry( - "_global.affiliates", + "composables.use_menu_entries_state.affiliates", "organizations", `${IconMap.SUPPORT}` ), @@ -72,7 +72,7 @@ const useMenuEntriesState = () => { for (const button of buttons.value) { if (currentPath.value.includes("/groups/")) { - if (button.label === "_global.groups") { + if (button.label === "composables.use_menu_entries_state.groups") { button.selected = true; } else { button.selected = false; diff --git a/frontend/i18n/de.json b/frontend/i18n/de.json index f1358232e..dc1438f3c 100644 --- a/frontend/i18n/de.json +++ b/frontend/i18n/de.json @@ -1,7 +1,7 @@ { "_global.about": "Über", "_global.activist_icon_img_alt_text": "Das activist-Symbol: ein Kleinbuchstabe a mit einem Halbkreis, der nach unten und links in der Mitte zeigt.", - "_global.affiliates": "Netzwerk", + "composables.use_menu_entries_state.affiliates": "Netzwerk", "_global.auth.reset_password": "Passwort zurücksetzen", "_global.auth.sign_in_aria_label": "Zur Anmeldeseite navigieren", "_global.auth.sign_up_aria_label": "Navigieren Sie zur Anmeldeseite", @@ -14,7 +14,7 @@ "_global.entity_logo": "{entity_name}-Logo", "_global.events": "Ereignisse", "_global.faq": "Häufig gestellte Fragen", - "_global.groups": "Gruppen", + "composables.use_menu_entries_state.groups": "Gruppen", "_global.help": "Hilfe", "_global.home": "Zurück", "_global.imprint": "Impression", diff --git a/frontend/i18n/en-US.json b/frontend/i18n/en-US.json index 5f22f0355..e2857fb27 100644 --- a/frontend/i18n/en-US.json +++ b/frontend/i18n/en-US.json @@ -1,7 +1,7 @@ { "_global.about": "About", "_global.activist_icon_img_alt_text": "The activist icon: a lower case letter a with a half circle pointing down and to the left in the center.", - "_global.affiliates": "Affiliates", + "composables.use_menu_entries_state.affiliates": "Affiliates", "_global.auth.reset_password": "Reset password", "_global.auth.sign_in_aria_label": "Navigate to the sign in page", "_global.auth.sign_up_aria_label": "Navigate to the sign up page", @@ -14,7 +14,7 @@ "_global.entity_logo": "{entity_name} logo", "_global.events": "Events", "_global.faq": "FAQ", - "_global.groups": "Groups", + "composables.use_menu_entries_state.groups": "Groups", "_global.help": "Help", "_global.home": "Home", "_global.imprint": "Imprint", diff --git a/frontend/i18n/es.json b/frontend/i18n/es.json index 71307aade..974ddca3c 100644 --- a/frontend/i18n/es.json +++ b/frontend/i18n/es.json @@ -1,7 +1,7 @@ { "_global.about": "Acerca de", "_global.activist_icon_img_alt_text": "El símbolo activista: una letra a minúscula con un semicírculo apuntando hacia abajo y a la izquierda del centro.", - "_global.affiliates": "Afiliados", + "composables.use_menu_entries_state.affiliates": "Afiliados", "_global.auth.reset_password": "Restablecer contraseña", "_global.auth.sign_in_aria_label": "Ir a la página de inicio de sesión", "_global.auth.sign_up_aria_label": "Ir a la página de registro", @@ -12,7 +12,7 @@ "_global.documentation": "Documentación", "_global.events": "Eventos", "_global.faq": "Preguntas frecuentes", - "_global.groups": "Grupos", + "composables.use_menu_entries_state.groups": "Grupos", "_global.help": "Ayuda", "_global.home": "Inicio", "_global.imprint": "Imprimir", diff --git a/frontend/i18n/fr.json b/frontend/i18n/fr.json index 7552d3509..7e6f32a3f 100644 --- a/frontend/i18n/fr.json +++ b/frontend/i18n/fr.json @@ -1,7 +1,7 @@ { "_global.about": "À propos", "_global.activist_icon_img_alt_text": "L’icône d'Activist : une lettre a minuscule avec un demi-cercle pointant vers le bas et à gauche au centre.", - "_global.affiliates": "Affiliés", + "composables.use_menu_entries_state.affiliates": "Affiliés", "_global.auth.reset_password": "Réinitialiser mot de passe", "_global.auth.sign_in_aria_label": "Vous connecter à votre compte", "_global.auth.sign_up_aria_label": "Créer un nouveau compte", @@ -14,7 +14,7 @@ "_global.entity_logo": "Logo {entity_name}", "_global.events": "Évènements", "_global.faq": "FAQ", - "_global.groups": "Groupes", + "composables.use_menu_entries_state.groups": "Groupes", "_global.help": "Aide", "_global.home": "Accueil", "_global.join_group": "Rejoindre groupe", From 88fea425223b1d030aafc628d4fbc30dd43e8c45 Mon Sep 17 00:00:00 2001 From: jennethydyrova Date: Tue, 3 Sep 2024 14:54:46 +0100 Subject: [PATCH 3/4] put keys in alphabetical order --- frontend/i18n/en-US.json | 4 ++-- frontend/i18n/es.json | 4 ++-- frontend/i18n/fr.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/i18n/en-US.json b/frontend/i18n/en-US.json index e2857fb27..098141e2e 100644 --- a/frontend/i18n/en-US.json +++ b/frontend/i18n/en-US.json @@ -1,7 +1,6 @@ { "_global.about": "About", "_global.activist_icon_img_alt_text": "The activist icon: a lower case letter a with a half circle pointing down and to the left in the center.", - "composables.use_menu_entries_state.affiliates": "Affiliates", "_global.auth.reset_password": "Reset password", "_global.auth.sign_in_aria_label": "Navigate to the sign in page", "_global.auth.sign_up_aria_label": "Navigate to the sign up page", @@ -14,7 +13,6 @@ "_global.entity_logo": "{entity_name} logo", "_global.events": "Events", "_global.faq": "FAQ", - "composables.use_menu_entries_state.groups": "Groups", "_global.help": "Help", "_global.home": "Home", "_global.imprint": "Imprint", @@ -343,6 +341,8 @@ "components.tooltip_password_requirements.number_of_chars": "At least 12 characters", "components.tooltip_password_requirements.password_rules_message": "For your security and that of the community, please choose a password that you've never used before. Thank you!", "components.tooltip_sign_in.text": "You need to be signed in to see this content.", + "composables.use_menu_entries_state.affiliates": "Affiliates", + "composables.use_menu_entries_state.groups": "Groups", "error.message": "Oops, something went wrong:", "error.title": "Error \u2022 activist", "layouts.auth.auth": "Auth", diff --git a/frontend/i18n/es.json b/frontend/i18n/es.json index 974ddca3c..ef9f77790 100644 --- a/frontend/i18n/es.json +++ b/frontend/i18n/es.json @@ -1,7 +1,6 @@ { "_global.about": "Acerca de", "_global.activist_icon_img_alt_text": "El símbolo activista: una letra a minúscula con un semicírculo apuntando hacia abajo y a la izquierda del centro.", - "composables.use_menu_entries_state.affiliates": "Afiliados", "_global.auth.reset_password": "Restablecer contraseña", "_global.auth.sign_in_aria_label": "Ir a la página de inicio de sesión", "_global.auth.sign_up_aria_label": "Ir a la página de registro", @@ -12,7 +11,6 @@ "_global.documentation": "Documentación", "_global.events": "Eventos", "_global.faq": "Preguntas frecuentes", - "composables.use_menu_entries_state.groups": "Grupos", "_global.help": "Ayuda", "_global.home": "Inicio", "_global.imprint": "Imprimir", @@ -39,6 +37,8 @@ "components.empty_state.create_organization": "Crear una organización", "components.modal_share_page.url_copied": "URL copiada", "components.modal_upload_images.drag_image": "Arrastra tu imagen o haz clic aquí para agregarla", + "composables.use_menu_entries_state.affiliates": "Afiliados", + "composables.use_menu_entries_state.groups": "Grupos", "pages._global.discussions_lower": "debates", "pages._global.get_active": "Mantente activo", "pages._global.get_organized": "Organízate", diff --git a/frontend/i18n/fr.json b/frontend/i18n/fr.json index 7e6f32a3f..06bd57af4 100644 --- a/frontend/i18n/fr.json +++ b/frontend/i18n/fr.json @@ -1,7 +1,6 @@ { "_global.about": "À propos", "_global.activist_icon_img_alt_text": "L’icône d'Activist : une lettre a minuscule avec un demi-cercle pointant vers le bas et à gauche au centre.", - "composables.use_menu_entries_state.affiliates": "Affiliés", "_global.auth.reset_password": "Réinitialiser mot de passe", "_global.auth.sign_in_aria_label": "Vous connecter à votre compte", "_global.auth.sign_up_aria_label": "Créer un nouveau compte", @@ -14,7 +13,6 @@ "_global.entity_logo": "Logo {entity_name}", "_global.events": "Évènements", "_global.faq": "FAQ", - "composables.use_menu_entries_state.groups": "Groupes", "_global.help": "Aide", "_global.home": "Accueil", "_global.join_group": "Rejoindre groupe", @@ -335,6 +333,8 @@ "components.tooltip_password_requirements.number_of_chars": "Au moins 12 caractères", "components.tooltip_password_requirements.password_rules_message": "Pour votre sécurité et celle de la communauté, choisissez un mot de passe que vous n’avez jamais utilisé auparavant. Merci !", "components.tooltip_sign_in.text": "Vous devez être connecté pour voir ce contenu.", + "composables.use_menu_entries_state.affiliates": "Affiliés", + "composables.use_menu_entries_state.groups": "Groupes", "error.message": "Oups, quelque chose a mal tourné :", "error.title": "Erreur • Activist", "layouts.auth.reset_password_forgot_password": "Mot de passe oublié ?", From e107c56bdd38696c11d6ba65066b81a3fc12c52c Mon Sep 17 00:00:00 2001 From: jennethydyrova Date: Tue, 3 Sep 2024 15:01:55 +0100 Subject: [PATCH 4/4] run prettier --- frontend/composables/useMenuEntriesState.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/composables/useMenuEntriesState.ts b/frontend/composables/useMenuEntriesState.ts index 9cb862735..7f5a16afd 100644 --- a/frontend/composables/useMenuEntriesState.ts +++ b/frontend/composables/useMenuEntriesState.ts @@ -28,7 +28,11 @@ const useMenuEntriesState = () => { const organizationEntries = ref([ createMenuEntry("_global.about", "organizations", `${IconMap.ABOUT}`), createMenuEntry("_global.events", "organizations", `${IconMap.EVENT}`), - createMenuEntry("composables.use_menu_entries_state.groups", "organizations", `${IconMap.GROUP}`), + createMenuEntry( + "composables.use_menu_entries_state.groups", + "organizations", + `${IconMap.GROUP}` + ), createMenuEntry( "_global.resources", "organizations",