Merge pull request #1119 from aasimsyed/task/issue-1100-additional-i1…

…8n-migration fix: standardize i18n string references
activist-org · Feb 6, 2025 · b0d8665 · b0d8665
2 parents 1c15be9 + ba5793a
commit b0d8665
Show file tree

Hide file tree

Showing 70 changed files with 359 additions and 295 deletions.
diff --git a/frontend/components/EmptyState.vue b/frontend/components/EmptyState.vue
@@ -44,10 +44,10 @@
             ><BtnRouteInternal
               class="w-full"
               :cta="false"
-              label="_global.return_home"
+              :label="i18nMap._global.return_home"
               linkTo="/home"
               fontSize="lg"
-              ariaLabel="_global.return_home_aria_label"
+              :ariaLabel="i18nMap._global.return_home_aria_label"
           /></PageCommunityFooter>
         </div>
         <div v-else class="flex flex-col space-y-6 py-6">

diff --git 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
@@ -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"
     />
   </div>
 </template>

diff --git 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"
       />
       <BtnAction
         @click="$emit('down-vote')"
@@ -46,7 +46,10 @@
         :leftIcon="IconMap.ARROW_DOWN"
         iconSize="1.25em"
         :disabled="isVotingDisabled"
-        ariaLabel="components.card_org_application_vote.downvote_application_aria_label"
+        :ariaLabel="
+          i18nMap.components.card_org_application_vote
+            .downvote_application_aria_label
+        "
       />
     </div>
   </div>

diff --git 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
+      "
     />
     <div class="flex-col space-y-3 md:grow md:space-y-4 md:pl-4 lg:pl-6">
       <div class="flex flex-col justify-between md:flex-row">
@@ -40,15 +42,21 @@
               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
+              "
             />
             <BtnAction
               class="mt-1 flex"
               :cta="true"
               :label="discussion.category"
               fontSize="sm"
               iconSize="1.25em"
-              ariaLabel="components.card_discussion.filter_discussion_category_aria_label"
+              :ariaLabel="
+                i18nMap.components.card_discussion
+                  .filter_discussion_category_aria_label
+              "
             />
           </div>
         </div>

diff --git 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
+      "
     />
   </div>
 </template>

diff --git 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
+              "
             />
           </div>
           <div class="w-min md:w-min">
@@ -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
+              "
             />
           </div>
         </div>
@@ -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
+            "
           />
         </div>
       </div>

diff --git 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"
         />
       </div>
     </div>

diff --git 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"
         />
       </div>
     </div>

diff --git a/frontend/components/card/search-result/CardSearchResult.vue b/frontend/components/card/search-result/CardSearchResult.vue
@@ -163,7 +163,7 @@
             <MetaTagVideo
               v-else-if="onlineLocation"
               :link="onlineLocation"
-              label="components.card_search_result.view_video"
+              :label="i18nMap.components.card_search_result.view_video"
             />
             <MetaTagDate v-if="event && event.id != ''" :date="date" />
           </div>
@@ -177,7 +177,7 @@
             <MetaTagVideo
               v-if="onlineLocation"
               :link="onlineLocation"
-              label="components.card_search_result.view_video"
+              :label="i18nMap.components.card_search_result.view_video"
             />
             <MetaTagDate v-if="event && event.id != ''" :date="date" />
           </div>
@@ -193,15 +193,15 @@
             />
             <!-- <MetaTagMembers
               :members="members"
-              label="components.card_search_result.members"
+              :label="i18nMap.components.card_search_result.members"
             />
             <MetaTagSupporters
               :supporters="supporters"
-              label="components.card_search_result.supporters_lower"
+              :label="i18nMap.components.card_search_result.supporters_lower"
             />
             <MetaTagStars
               :stars="stars"
-              label="components.card_search_result.label"
+              :label="i18nMap.components.card_search_result.label"
             /> -->
           </div>
         </div>

diff --git 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
@@ -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"
   >
     <DropdownItemsLayout :location="location" :options="createOptions" />
   </DropdownBase>
@@ -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
@@ -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"
   >
     <DropdownItemsLayout :location="location" :options="infoOptions" />
   </DropdownBase>
@@ -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
@@ -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
+    "
   >
     <ul class="px-2 py-2">
       <NuxtLink
@@ -30,6 +32,7 @@
 <script setup lang="ts">
 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
@@ -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,
   },
 ];