Keep translations for the admin dashboard toggle in core

Backend should not depend on solidus_admin.
solidusio · Sep 29, 2023 · 1288f9c · 1288f9c
1 parent 9fd6307
commit 1288f9c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/admin/app/components/solidus_admin/sidebar/component.html.erb b/admin/app/components/solidus_admin/sidebar/component.html.erb
@@ -23,7 +23,7 @@
   <div class="mt-auto">
     <div class="group mb-3">
       <label class="flex gap-3 items-center py-0.5 px-3 pb-0.5 rounded hover:text-red-500 hover:bg-gray-50 body-small-bold text-black cursor-pointer">
-        <%= t('solidus_admin.main_nav.legacy_label') %>
+        <%= t('spree.navigation.switch_to_legacy') %>
         <div class="flex items-center">
           <%= render component("ui/forms/switch").new(size: :s, checked: false, 'data-action': "#{stimulus_id}#setCookie:prevent") %>
         </div>

diff --git a/admin/config/locales/main_nav.en.yml b/admin/config/locales/main_nav.en.yml
@@ -11,5 +11,3 @@ en:
       stock: Stock
       users: Users
       settings: Settings
-      legacy_label: Switch to legacy admin
-      admin_label: Switch to new admin
diff --git a/backend/app/views/spree/admin/shared/_navigation_solidus_admin.html.erb b/backend/app/views/spree/admin/shared/_navigation_solidus_admin.html.erb
@@ -30,8 +30,8 @@
               <span
                 id="solidus-admin-switch-label"
                 class="text"
-                data-legacy-label="<%= 'solidus_admin.main_nav.legacy_label'.then { t(_1, default: t(_1, locale: :en)) } %>"
-                data-admin-label="<%= 'solidus_admin.main_nav.admin_label'.then { t(_1, default: t(_1, locale: :en)) } %>"
+                data-legacy-label="<%= 'spree.navigation.switch_to_legacy'.then { t(_1, default: t(_1, locale: :en)) } %>"
+                data-admin-label="<%= 'spree.navigation.switch_to_solidus_admin'.then { t(_1, default: t(_1, locale: :en)) } %>"
               ></span>
               <span><input type="checkbox" id="solidus-admin-switch" class="solidus-admin--nav--switch"/></span>
             </label>

diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
@@ -1790,6 +1790,9 @@ en:
     name_contains: Name Contains
     name_on_card: Name on card
     name_or_sku: Name or SKU (enter at least first 4 characters of product name)
+    navigation:
+      switch_to_legacy: Switch to legacy admin
+      switch_to_solidus_admin: Switch to new admin
     negative_movement_absent_item: Cannot create negative movement for absent stock item.
     new: New
     new_adjustment: New Adjustment