Set the page language for the preference center page if the lead's preferred locale is not set lead preferred locale #14370

shinde-rahul · 2024-12-12T05:21:08Z

Q	A
Bug fix? (use the a.b branch)	🔴
New feature/enhancement? (use the a.x branch)	🟢
Deprecations?	🔴
BC breaks? (use the c.x branch)	🔴
Automated tests included?	🟢
Related user documentation PR URL	mautic/user-documentation#...
Related developer documentation PR URL	mautic/developer-documentation-new#...
Issue(s) addressed	Fixes #...

Description

This PR offers to use the page language as a language of the preference center page.

The following process is used to set a language for the preference center page: preferred contact locale --> user locale -> system locale.
This PR offers the correct/new: preferred contact locale --> page language -> user locale -> system locale.

📋 Steps to test this PR:

Open this PR on Gitpod or pull down for testing locally (see docs on testing PRs here)
Create a contact and don't set the Preferred Locale field
Create a Landing Page as a preference center. Add the {preferredchannel}, {saveprefsbutton} variables to the Landing Page.
Create a segment email configured with the preference center and use the unsubscribe link.
Choose the created landing page as the Preference Center Page.
Send the email
Open the email
Click the unsubscribe link
Check if the selected page language is used
Set the Preferred Locale field for the contact
Reload the preference center page
Check if the preferred contact language is used

codecov · 2024-12-12T07:14:57Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.25%. Comparing base (86d541b) to head (1f077f2).
Report is 1 commits behind head on 6.x.

Additional details and impacted files

@@            Coverage Diff            @@
##                6.x   #14370   +/-   ##
=========================================
  Coverage     64.24%   64.25%           
- Complexity    34573    34576    +3     
=========================================
  Files          2268     2268           
  Lines        103290   103294    +4     
=========================================
+ Hits          66360    66367    +7     
+ Misses        36930    36927    -3

Files with missing lines	Coverage Δ
...undles/EmailBundle/Controller/PublicController.php	`58.89% <100.00%> (+0.53%)`	⬆️
...undles/PageBundle/EventListener/PageSubscriber.php	`83.67% <100.00%> (+0.69%)`	⬆️

... and 2 files with indirect coverage changes

…ead preferred locale

escopecz

Can you also test that the landing page locale will be used? That's the point of this PR.

app/bundles/EmailBundle/Tests/Controller/PublicControllerFunctionalTest.php

andersonjeccel · 2025-01-21T13:13:43Z

Oh, I raised an issue for a similar situation, but in Forms: #14458

Would you like to have a look?

Co-authored-by: John Linhart <jan@linhart.email>

shinde-rahul · 2025-01-23T05:24:15Z

Can you also test that the landing page locale will be used? That's the point of this PR.

@escopecz, I have included a test with more scenarios. Please review.

abhisekmazumdar · 2025-02-13T12:06:28Z

@shinde-rahul, let me know if you are open to making these changes part of this PR. I am also open to collaborating on this PR and adding these changes to it.

shinde-rahul · 2025-02-17T09:22:16Z

@abhisekmazumdar, I can add you as a collaborator if you have made any progress with the solutions. You can take this ahead, or you can submit a PR against this branch, and I'll merge it.

abhisekmazumdar · 2025-02-17T16:23:13Z

Thank you, @shinde-rahul, for providing collaboration access. I have added extractLanguagePackage method for the landing page. I believe this is now ready for review.

RCheesley · 2025-02-18T16:45:18Z

Given there's been substantial changes I've removed the RTC label and set it that we need a re-review on the code side and another user test. Hope that's ok!

matbcvo · 2025-02-22T12:24:52Z

app/bundles/EmailBundle/Tests/Controller/PublicControllerFunctionalTest.php

+        ];
+
+        yield 'Invalid contact locale, fallback to page locale' => [
+            'contactLocale'  => 'fr', // Assume 'yy' is not a valid locale


Why is fr an invalid contact locale? According to the line comment, shouldn't it be yy?

This is now updated to correct data. Thanks for caching this.

…b.com:shinde-rahul/mautic into use-page-language-for-preferrence-center-page

abhisekmazumdar · 2025-02-24T07:57:43Z

I understand that my approval may not count much since I have also made changes to this PR. However, I have reviewed the other changes, and they look good to me.

mautibot · 2025-03-06T17:05:00Z

This pull request has been mentioned on Mautic Forums. There might be relevant details there:

https://forum.mautic.org/t/announcing-mautic-6-beta-now-available-for-testing/35196/1

shinde-rahul added the feature A new feature for inclusion in minor or major releases label Dec 12, 2024

shinde-rahul marked this pull request as ready for review December 12, 2024 08:10

shinde-rahul added ready-to-test PR's that are ready to test code-review-needed PR's that require a code review before merging landing-pages Anything related to landing pages labels Dec 12, 2024

shinde-rahul mentioned this pull request Dec 12, 2024

Set the page language for the preference center page if the lead's preferred locale is not set #11460

Closed

volha-pivavarchyk and others added 6 commits December 14, 2024 19:14

Set the page language for the preference center page if there is no l…

e4d5d22

…ead preferred locale

Test if the user preferred local applies to the preference center page

89e9ef9

Fix PHPStan issues

c084df9

Fix tests

970e1f7

remove test influenced by the previous one that sets a static variable

6007cc5

Added coverage

9710c39

shinde-rahul force-pushed the use-page-language-for-preferrence-center-page branch from 4f92c4f to 9710c39 Compare December 14, 2024 13:44

shinde-rahul added 2 commits December 20, 2024 08:28

Merge branch '6.x' into use-page-language-for-preferrence-center-page

6d6b4af

Merge branch '6.x' into use-page-language-for-preferrence-center-page

c5cf50a

shinde-rahul requested review from kuzmany, escopecz, abhisekmazumdar and andersonjeccel January 17, 2025 04:30

abhisekmazumdar approved these changes Jan 17, 2025

View reviewed changes

escopecz reviewed Jan 20, 2025

View reviewed changes

escopecz added the pending-feedback PR's and issues that are awaiting feedback from the author label Jan 20, 2025

shinde-rahul and others added 4 commits January 22, 2025 21:22

Apply suggestions from code review

d44e0ab

Co-authored-by: John Linhart <jan@linhart.email>

Merge branch '6.x' into use-page-language-for-preferrence-center-page

aebedcd

Corrected typo

aa1fabb

Updated test case to cover multiple use cases

8447522

shinde-rahul requested a review from escopecz January 23, 2025 05:23

shinde-rahul and others added 5 commits February 17, 2025 14:52

Merge branch '6.x' into use-page-language-for-preferrence-center-page

cb64d3d

Landing page now extract language package.

02ef5a2

Cs fixes

b3e4ed8

Update the test case.

9efea69

Fix phpcs.

0afd562

matbcvo reviewed Feb 22, 2025

View reviewed changes

shinde-rahul added the mautic-6 label Feb 24, 2025

shinde-rahul added 3 commits February 24, 2025 08:48

Updated the test

05e3417

Merge branch 'use-page-language-for-preferrence-center-page' of githu…

8467588

…b.com:shinde-rahul/mautic into use-page-language-for-preferrence-center-page

Merge branch '6.x' into use-page-language-for-preferrence-center-page

1f077f2

abhisekmazumdar approved these changes Feb 24, 2025

View reviewed changes

shinde-rahul requested a review from matbcvo February 24, 2025 08:13

matbcvo approved these changes Feb 24, 2025

View reviewed changes

RCheesley merged commit 6c9247c into mautic:6.x Feb 24, 2025
17 checks passed

RCheesley modified the milestones: 6.0.0-beta, 6.0.0-beta2 Mar 5, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Set the page language for the preference center page if the lead's preferred locale is not set lead preferred locale #14370

Set the page language for the preference center page if the lead's preferred locale is not set lead preferred locale #14370

shinde-rahul commented Dec 12, 2024

Uh oh!

codecov bot commented Dec 12, 2024 •

edited

Loading

Uh oh!

escopecz left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

andersonjeccel commented Jan 21, 2025

Uh oh!

shinde-rahul commented Jan 23, 2025

Uh oh!

abhisekmazumdar commented Feb 13, 2025

Uh oh!

shinde-rahul commented Feb 17, 2025

Uh oh!

abhisekmazumdar commented Feb 17, 2025

Uh oh!

RCheesley commented Feb 18, 2025

Uh oh!

matbcvo Feb 22, 2025

Uh oh!

shinde-rahul Feb 24, 2025

Uh oh!

abhisekmazumdar commented Feb 24, 2025

Uh oh!

Uh oh!

mautibot commented Mar 6, 2025

Uh oh!

Uh oh!

Uh oh!

Set the page language for the preference center page if the lead's preferred locale is not set lead preferred locale #14370

Set the page language for the preference center page if the lead's preferred locale is not set lead preferred locale #14370

Conversation

shinde-rahul commented Dec 12, 2024

Description

📋 Steps to test this PR:

Uh oh!

codecov bot commented Dec 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

escopecz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

andersonjeccel commented Jan 21, 2025

Uh oh!

shinde-rahul commented Jan 23, 2025

Uh oh!

abhisekmazumdar commented Feb 13, 2025

Uh oh!

shinde-rahul commented Feb 17, 2025

Uh oh!

abhisekmazumdar commented Feb 17, 2025

Uh oh!

RCheesley commented Feb 18, 2025

Uh oh!

matbcvo Feb 22, 2025

Choose a reason for hiding this comment

Uh oh!

shinde-rahul Feb 24, 2025

Choose a reason for hiding this comment

Uh oh!

abhisekmazumdar commented Feb 24, 2025

Uh oh!

Uh oh!

mautibot commented Mar 6, 2025

Uh oh!

Uh oh!

codecov bot commented Dec 12, 2024 •

edited

Loading