Skip to content

Conversation

AltamashShaikh
Copy link
Contributor

Description:

Merged multiple notifications under tracking code into one.
Fixes: #PG-2827

Review

* Merged multiple notifications under tracking code into one, #PG-2827

* Updated UI screenshot

* design changes for notification bar

* Updated UI screenshot

* Improvements around translatio for guides

* PR changes

* Updated UI tests

* Changes to incoprate consentManager connected

* UI tests updated

* Updated site_Type for test

* Updated UI screenshot

* Ampersand translated

* Notifications logic updated

* typo fixed

* Twig varibale not defined fixed

* UI tests fixed

* UI screenshot updated

* Started using createAndListing() instead of General_And

* PR changes
@AltamashShaikh AltamashShaikh added the Needs Review PRs that need a code review label Jun 9, 2023
@AltamashShaikh AltamashShaikh requested review from bx80 and sgiehl June 9, 2023 06:48
}

if (!empty($message)) {
$bannerMessage = implode(' ' . Piwik::translate('General_And') . ' ', $message);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@michalkleiner changed to use the translation in 4.x-dev

Copy link
Contributor

@bx80 bx80 left a comment

Choose a reason for hiding this comment

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

This all looks good to me and the relevant tests are all passing. This is a cherry pick of changes already merged to 5.x-dev so the code has already been through a previous round of reviews 👍

@bx80 bx80 merged commit 552d0b9 into 4.x-dev Jun 12, 2023
@bx80 bx80 deleted the cherrypick-PG-2827-merge-notifications branch June 12, 2023 01:58
@sgiehl sgiehl changed the title Merged multiple notifications under tracking code into one Improvements to notifications under tracking code on no data screen Jul 5, 2023
@sgiehl sgiehl added this to the 4.15.0 milestone Jul 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review
Development

Successfully merging this pull request may close these issues.

3 participants