Merge pull request #5930 from solidusio/backport/v4.4/pr-5927

[v4.4] Fix component translation scopes
solidusio · Nov 15, 2024 · 5ce0c99 · 5ce0c99
2 parents 287b995 + 6579041
commit 5ce0c99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/admin/app/components/solidus_admin/base_component.rb b/admin/app/components/solidus_admin/base_component.rb
@@ -25,6 +25,10 @@ def missing_translation(key, options)
       end
     end
 
+    def self.i18n_scope
+      @i18n_scope ||= name.underscore.tr("/", ".")
+    end
+
     def self.stimulus_id
       @stimulus_id ||= name.underscore
         .sub(/^solidus_admin\/(.*)\/component$/, '\1')

diff --git a/legacy_promotions/lib/components/admin/solidus_legacy_promotions/orders/index/component.yml b/legacy_promotions/lib/components/admin/solidus_legacy_promotions/orders/index/component.yml
@@ -1,20 +1,5 @@
 en:
-  columns:
-    items:
-      one: 1 Item
-      other: '%{count} Items'
   filters:
-    status: Status
-    shipment_state: Shipment State
-    payment_state: Payment State
     promotions: Promotions
-  date:
-    formats:
-      short: '%d %b %y'
   scopes:
-    all_orders: All
-    canceled: Canceled
-    complete: Complete
-    returned: Returned
-    in_progress: In Progress
     promotions: Promotions
diff --git a/promotions/lib/components/admin/solidus_promotions/orders/index/component.yml b/promotions/lib/components/admin/solidus_promotions/orders/index/component.yml
@@ -1,3 +1,5 @@
 en:
   filters:
     promotions: Promotions
+  scopes:
+    promotions: Promotions