Skip to content

Fix component translation scopes#5927

Merged
tvdeyen merged 1 commit intosolidusio:mainfrom
mamhoff:fix-component-translation-scope
Nov 15, 2024
Merged

Fix component translation scopes#5927
tvdeyen merged 1 commit intosolidusio:mainfrom
mamhoff:fix-component-translation-scope

Conversation

@mamhoff
Copy link
Copy Markdown
Contributor

@mamhoff mamhoff commented Nov 15, 2024

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.

Checklist

Check out our PR guidelines for more details.

The following are mandatory for all PRs:

@mamhoff mamhoff requested a review from a team as a code owner November 15, 2024 12:15
@mamhoff
Copy link
Copy Markdown
Contributor Author

mamhoff commented Nov 15, 2024

Build error is unrelated, I think. Can I have a new build?

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.
@mamhoff mamhoff force-pushed the fix-component-translation-scope branch from 14c4da5 to 46e8250 Compare November 15, 2024 12:35
@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.53%. Comparing base (e6e0243) to head (46e8250).
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5927   +/-   ##
=======================================
  Coverage   89.53%   89.53%           
=======================================
  Files         782      782           
  Lines       17980    17982    +2     
=======================================
+ Hits        16099    16101    +2     
  Misses       1881     1881           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Copy Markdown
Member

@kennyadsl kennyadsl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, thanks Martin!

@tvdeyen tvdeyen added backport-v4.4 Backport this pull-request to v4.4 changelog:solidus_legacy_promotions Changes to the solidus_legacy_promotions gem changelog:solidus_promotions Changes to the solidus_promotions gem labels Nov 15, 2024
@tvdeyen tvdeyen merged commit 900cb78 into solidusio:main Nov 15, 2024
@github-actions
Copy link
Copy Markdown

💚 All backports created successfully

Status Branch Result
v4.4

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-v4.4 Backport this pull-request to v4.4 changelog:solidus_admin changelog:solidus_legacy_promotions Changes to the solidus_legacy_promotions gem changelog:solidus_promotions Changes to the solidus_promotions gem

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants