Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug of FO translations with multiple resources and tpl inclusions #14507

Merged
merged 2 commits into from Jul 8, 2019

Conversation

@202-ecommerce
Copy link
Contributor

commented Jul 5, 2019

Questions Answers
Branch? develop
Description? If you have several inclusions of templates the name returned by smarty is not correct. In this case, strings are not translated. For more information please find more details on #14470
Type? bug fix
Category? FO
BC breaks? no
Deprecations? no
Fixed ticket? Fixes #14470
How to test? You'll found a zip with testing issue module. issue.zip

This change is Reviewable

@202-ecommerce 202-ecommerce requested a review from PrestaShop/prestashop-core-developers as a code owner Jul 5, 2019

@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Jul 5, 2019

Need more feedback from @PrestaShop/prestashop-core-developers

@PierreRambaud PierreRambaud added this to the 1.7.7.0 milestone Jul 8, 2019

@202-ecommerce

This comment has been minimized.

Copy link
Contributor Author

commented Jul 8, 2019

We just found an other tricky case. I'll add a new controller on the issue "proof module".
The fix propose by @PierreRambaud looks OK but our PR not.

Please do not merge this PR for now.

@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Jul 8, 2019

@202-ecommerce Let's update your pull request with what we found together :)
Maybe add a little comment (something I didn't do 🙄)

fix inheritance template filename in case of includes from different …
…cross sources between theme, modules, ...

@202-ecommerce 202-ecommerce dismissed stale reviews from Progi1984 and PierreRambaud via 1be3810 Jul 8, 2019

@202-ecommerce

This comment has been minimized.

Copy link
Contributor Author

commented Jul 8, 2019

New commit to fix sample controller "custom2" of this "proof module"
issue-14470.zip

Thanks @PierreRambaud for your strong help !

@matks

This comment has been minimized.

Copy link
Contributor

commented Jul 8, 2019

Thanks @202-ecommerce !

@matks matks merged commit d23af19 into PrestaShop:develop Jul 8, 2019

2 checks passed

PrettyCI Code formatting
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.