From 40cfe094f9019c06d4d25be629ddf0eeaebc4c3d Mon Sep 17 00:00:00 2001
From: Mumbi Francis <kinya.francis.mumbi@gmail.com>
Date: Fri, 26 Jan 2024 12:53:17 +0300
Subject: [PATCH] Add theme translations on topbar

---
 client/web/admin/src/views/Layout.vue           |  2 ++
 client/web/compose/src/views/Layout.vue         |  2 ++
 client/web/discovery/src/views/Layout.vue       |  2 ++
 client/web/one/src/views/Layout.vue             |  2 ++
 client/web/privacy/src/views/Layout.vue         |  2 ++
 client/web/reporter/src/views/Layout.vue        |  2 ++
 client/web/workflow/src/views/Layout.vue        |  2 ++
 lib/vue/src/components/navigation/CTopbar.vue   | 13 ++++++-------
 locale/en/corteza-webapp-discovery/general.yaml |  6 +++++-
 locale/en/corteza-webapp-one/navigation.yaml    |  4 ++++
 locale/en/corteza-webapp-privacy/general.yaml   |  5 +++++
 locale/en/corteza-webapp-workflow/general.yaml  |  5 +++++
 12 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/client/web/admin/src/views/Layout.vue b/client/web/admin/src/views/Layout.vue
index a6d40682c..bcc9076da 100644
--- a/client/web/admin/src/views/Layout.vue
+++ b/client/web/admin/src/views/Layout.vue
@@ -13,6 +13,8 @@
           userSettingsProfile: $t('navigation.userSettings.profile'),
           userSettingsChangePassword: $t('navigation.userSettings.changePassword'),
           userSettingsLogout: $t('navigation.userSettings.logout'),
+          lightTheme: $t('general:themes.labels.light'),
+          darkTheme: $t('general:themes.labels.dark'),
         }"
       >
         <template #title>
diff --git a/client/web/compose/src/views/Layout.vue b/client/web/compose/src/views/Layout.vue
index 827a7d1fc..a53223686 100644
--- a/client/web/compose/src/views/Layout.vue
+++ b/client/web/compose/src/views/Layout.vue
@@ -16,6 +16,8 @@
           userSettingsProfile: $t('userSettings.profile'),
           userSettingsChangePassword: $t('userSettings.changePassword'),
           userSettingsLogout: $t('userSettings.logout'),
+          lightTheme: $t('general:themes.labels.light'),
+          darkTheme: $t('general:themes.labels.dark'),
         }"
       >
         <template #title>
diff --git a/client/web/discovery/src/views/Layout.vue b/client/web/discovery/src/views/Layout.vue
index 7deba8e97..5206b813d 100644
--- a/client/web/discovery/src/views/Layout.vue
+++ b/client/web/discovery/src/views/Layout.vue
@@ -13,6 +13,8 @@
           userSettingsProfile: $t('userSettings.profile'),
           userSettingsChangePassword: $t('userSettings.changePassword'),
           userSettingsLogout: $t('userSettings.logout'),
+          lightTheme: $t('general:themes.labels.light'),
+          darkTheme: $t('general:themes.labels.dark'),
         }"
       >
         <template #title>
diff --git a/client/web/one/src/views/Layout.vue b/client/web/one/src/views/Layout.vue
index 707f20210..b4179a547 100644
--- a/client/web/one/src/views/Layout.vue
+++ b/client/web/one/src/views/Layout.vue
@@ -16,6 +16,8 @@
           userSettingsProfile: $t('userSettings.profile'),
           userSettingsChangePassword: $t('userSettings.changePassword'),
           userSettingsLogout: $t('userSettings.logout'),
+          lightTheme: $t('themes.labels.light'),
+          darkTheme: $t('themes.labels.dark'),
         }"
       >
         <template #help-dropdown>
diff --git a/client/web/privacy/src/views/Layout.vue b/client/web/privacy/src/views/Layout.vue
index d7b2b12bb..8cb86c604 100644
--- a/client/web/privacy/src/views/Layout.vue
+++ b/client/web/privacy/src/views/Layout.vue
@@ -13,6 +13,8 @@
           userSettingsProfile: $t('navigation:userSettings.profile'),
           userSettingsChangePassword: $t('navigation:userSettings.changePassword'),
           userSettingsLogout: $t('navigation:userSettings.logout'),
+          lightTheme: $t('general:themes.labels.light'),
+          darkTheme: $t('general:themes.labels.dark'),
         }"
       >
         <template #title>
diff --git a/client/web/reporter/src/views/Layout.vue b/client/web/reporter/src/views/Layout.vue
index 87e50cfd9..e7f8d0fe5 100644
--- a/client/web/reporter/src/views/Layout.vue
+++ b/client/web/reporter/src/views/Layout.vue
@@ -13,6 +13,8 @@
           userSettingsProfile: $t('navigation:userSettings.profile'),
           userSettingsChangePassword: $t('navigation:userSettings.changePassword'),
           userSettingsLogout: $t('navigation:userSettings.logout'),
+          lightTheme: $t('general:themes.labels.light'),
+          darkTheme: $t('general:themes.labels.dark'),
         }"
       >
         <template #title>
diff --git a/client/web/workflow/src/views/Layout.vue b/client/web/workflow/src/views/Layout.vue
index 94ca999ac..b70d5531d 100644
--- a/client/web/workflow/src/views/Layout.vue
+++ b/client/web/workflow/src/views/Layout.vue
@@ -13,6 +13,8 @@
           userSettingsProfile: $t('navigation:userSettings.profile'),
           userSettingsChangePassword: $t('navigation:userSettings.changePassword'),
           userSettingsLogout: $t('navigation:userSettings.logout'),
+          lightTheme: $t('general:themes.labels.light'),
+          darkTheme: $t('general:themes.labels.dark'),
         }"
       >
         <template #title>
diff --git a/lib/vue/src/components/navigation/CTopbar.vue b/lib/vue/src/components/navigation/CTopbar.vue
index 2cd5f6707..7168d28ed 100644
--- a/lib/vue/src/components/navigation/CTopbar.vue
+++ b/lib/vue/src/components/navigation/CTopbar.vue
@@ -191,10 +191,11 @@
         >
           <b-dropdown-item
             v-for="theme in themes"
-            :disabled="currentTheme === theme.value"
-            @click="saveThemeMode(theme.value)"
+            :key="theme.id"
+            :disabled="currentTheme === theme.id"
+            @click="saveThemeMode(theme.id)"
           >
-            {{ theme.label }}
+          {{ theme.id === 'light' ? labels.lightTheme : labels.darkTheme }}
           </b-dropdown-item>
         </b-dropdown>
 
@@ -306,12 +307,10 @@ export default {
     themes () {
       return [
         {
-          label: 'Light',
-          value: 'light',
+          id: 'light',
         },
         {
-          label: 'Dark',
-          value: 'dark',
+          id: 'dark',
         },
       ]
     },
diff --git a/locale/en/corteza-webapp-discovery/general.yaml b/locale/en/corteza-webapp-discovery/general.yaml
index 921cf1a7f..5718b2761 100644
--- a/locale/en/corteza-webapp-discovery/general.yaml
+++ b/locale/en/corteza-webapp-discovery/general.yaml
@@ -4,4 +4,8 @@ label:
   all: All
 resourceList:
   pagination:
-    recordsPerPage: Records per page
\ No newline at end of file
+    recordsPerPage: Records per page
+themes:
+  labels:
+    light: Light
+    dark: Dark
\ No newline at end of file
diff --git a/locale/en/corteza-webapp-one/navigation.yaml b/locale/en/corteza-webapp-one/navigation.yaml
index 79fac18af..f8c9ae94b 100644
--- a/locale/en/corteza-webapp-one/navigation.yaml
+++ b/locale/en/corteza-webapp-one/navigation.yaml
@@ -18,3 +18,7 @@ userSettings:
   loggedInAs: Logged in as {{user}}
   logout: Logout
   profile: Profile
+themes:
+  labels:
+    light: Light
+    dark: Dark
diff --git a/locale/en/corteza-webapp-privacy/general.yaml b/locale/en/corteza-webapp-privacy/general.yaml
index 31c074864..f39f72d3f 100644
--- a/locale/en/corteza-webapp-privacy/general.yaml
+++ b/locale/en/corteza-webapp-privacy/general.yaml
@@ -21,3 +21,8 @@ resourceList:
     single: 'One {{data}}'
     single_plural: '{{count}} {{data}}'
     recordsPerPage: Records per page
+
+themes:
+  labels:
+    light: Light
+    dark: Dark
\ No newline at end of file
diff --git a/locale/en/corteza-webapp-workflow/general.yaml b/locale/en/corteza-webapp-workflow/general.yaml
index fc7517328..3721722c8 100644
--- a/locale/en/corteza-webapp-workflow/general.yaml
+++ b/locale/en/corteza-webapp-workflow/general.yaml
@@ -59,3 +59,8 @@ columns:
   enabled: Enabled
   steps: Steps
   changedAt: Last change
+
+themes:
+  labels:
+    light: Light
+    dark: Dark
\ No newline at end of file