-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
In the `view_component` gem, the `i18n_scope` for a component depends on the file name of the component, and removes `app_components` and everything before that in order to construct a scope. This fails to work with components that live in `lib/components/admin/`, as with our extensions, as there is no `app/components` in the path to these components. This change uses the class name instead, which should be easier on memory and correctly works with components from solidus extensions. This also fixes translations in inherited components, allowing to delete some redundant translations in the promotion gem's `order` component.
- Loading branch information
Showing
3 changed files
with
6 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
legacy_promotions/lib/components/admin/solidus_legacy_promotions/orders/index/component.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
promotions/lib/components/admin/solidus_promotions/orders/index/component.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
en: | ||
filters: | ||
promotions: Promotions | ||
scopes: | ||
promotions: Promotions |