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

Match multiline translation expressions in modules #12903

Merged
merged 2 commits into from Jul 24, 2019

Conversation

@unlocomqx
Copy link
Contributor

commented Mar 13, 2019

When a module developers write a multiline translation expression, it's not displayed in the backoffice translation page.
This modification matches white spaces (if any) to allow for more flexible detection.
Example:

$this->l(
  'Are you sure you want to delete this customization?',
  $source
);

Or

$this->l(
  'Are you sure you want to delete this customization?'
);
Questions Answers
Branch? develop
Description? match multiline translation expressions
Type? bug fix
Category? BO
BC breaks? no
Deprecations? no

This change is Reviewable

@unlocomqx

This comment has been minimized.

Copy link
Contributor Author

commented Mar 13, 2019

This should fix #11573

@unlocomqx unlocomqx force-pushed the unlocomqx:translate branch from 33799bb to a33fdd2 Mar 13, 2019

@unlocomqx unlocomqx force-pushed the unlocomqx:translate branch from a33fdd2 to edc5c1a Mar 13, 2019

@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Jul 12, 2019

Hey sorry for the delay.
Are you able to provide us a module for our QA team to help us to reproduce?

@unlocomqx

This comment has been minimized.

Copy link
Contributor Author

commented Jul 12, 2019

No worries, here's a sample module to reproduce
trans.zip

Before fix
1

After fix
2

@sarahdib sarahdib self-assigned this Jul 15, 2019

@sarahdib sarahdib added QA ✔️ and removed waiting for QA labels Jul 15, 2019

@sarahdib sarahdib added this to the 1.7.7.0 milestone Jul 15, 2019

@PierreRambaud PierreRambaud force-pushed the unlocomqx:translate branch from a6e8796 to fce8673 Jul 24, 2019

@unlocomqx unlocomqx requested a review from PrestaShop/prestashop-core-developers as a code owner Jul 24, 2019

@PierreRambaud PierreRambaud merged commit ed0d2cc into PrestaShop:develop Jul 24, 2019

2 checks passed

PrettyCI Code formatting
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Jul 24, 2019

Thanks @unlocomqx

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.