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

Update default catalog 8.1.x #35534

Merged
merged 6 commits into from Mar 6, 2024
Merged

Update default catalog 8.1.x #35534

merged 6 commits into from Mar 6, 2024

Conversation

ps-jarvis
Copy link

@ps-jarvis ps-jarvis commented Mar 1, 2024

Questions Answers
Branch? 8.1.x
Description? Automatic update of default catalog for 8.1.x
Type? improvement
Category? IN
BC breaks? no
Deprecations? no
How to test? ~
Fixed ticket? ~
UI tests https://github.com/Hlavtox/ga.tests.ui.pr/actions/runs/8157006942
Related PRs ~
Sponsor company ~

@ps-jarvis ps-jarvis requested a review from a team as a code owner March 1, 2024 10:19
@prestonBot
Copy link
Collaborator

Hello @ps-jarvis!

This is your first pull request on the PrestaShop project. Thank you, and welcome to this Open Source community!

@prestonBot prestonBot added 8.1.x Branch Improvement Type: Improvement labels Mar 1, 2024
@matthieu-rolland matthieu-rolland added the Waiting for wording Status: action required, waiting for wording label Mar 1, 2024
translations/default/AdminCatalogFeature.xlf Show resolved Hide resolved
translations/default/AdminCatalogFeature.xlf Show resolved Hide resolved
translations/default/AdminCatalogFeature.xlf Show resolved Hide resolved
translations/default/ModulesGoogleanalyticsAdmin.xlf Outdated Show resolved Hide resolved
translations/default/ModulesGoogleanalyticsAdmin.xlf Outdated Show resolved Hide resolved
translations/default/ModulesGoogleanalyticsAdmin.xlf Outdated Show resolved Hide resolved
translations/default/ModulesGoogleanalyticsAdmin.xlf Outdated Show resolved Hide resolved
matthieu-rolland and others added 5 commits March 5, 2024 10:12
Co-authored-by: Julie Varisellaz <70583503+Julievrz@users.noreply.github.com>
Co-authored-by: Julie Varisellaz <70583503+Julievrz@users.noreply.github.com>
Co-authored-by: Julie Varisellaz <70583503+Julievrz@users.noreply.github.com>
Co-authored-by: Julie Varisellaz <70583503+Julievrz@users.noreply.github.com>
Co-authored-by: Julie Varisellaz <70583503+Julievrz@users.noreply.github.com>
@Julievrz
Copy link
Contributor

Julievrz commented Mar 5, 2024

Is there a way to know when a string was "just moved" or maybe just highlight new wordings?

@matthieu-rolland
Copy link
Contributor

matthieu-rolland commented Mar 5, 2024

Is there a way to know when a string was "just moved" or maybe just highlight new wordings?

if a string was moved it appears twice in the PR: you'll see it as added (in green), but also as removed (in red), you can do a ctrl+f to look for a piece of a wording and see if exists two times.

But this is not so convenient on big PRs like this... 😓 you have to unfold everything

@Hlavtox
Copy link
Contributor

Hlavtox commented Mar 5, 2024

@Julievrz Not really, it sucks. I tried yesterday to compare 8.1.2 to current 8.1.x to ease it up for you, but it was a mess anyway, so gave up. :(

I think the easiest thing is just to check it directly in this PR in the "red section" if it was there or not.

You have billion million strings there, but actually just few sentences were added.

@Julievrz
Copy link
Contributor

Julievrz commented Mar 5, 2024

Ok because I unfolded and read everything that was in the green section on the right. 🥵 That's why I may have suggested changes on strings that were just moved. Let's just ignore them. Except for that one sentence that doesn't mean anything, please. 😅

@Hlavtox
Copy link
Contributor

Hlavtox commented Mar 5, 2024

@Julievrz Well, it's a module string, it doesn't really do anything with the core. That's one of the major issues with the translation system...

I clicked "resolved" on all of the moved strings, can you confirm the two remaining? :-)

@Hlavtox
Copy link
Contributor

Hlavtox commented Mar 5, 2024

@Hlavtox
Copy link
Contributor

Hlavtox commented Mar 5, 2024

@Julievrz Can you put Wording label? Nothing more to do on this PR. :-)

@matthieu-rolland
Copy link
Contributor

@Julievrz about this wording: Your customers go everywhere; shouldn't your analytics. it's true that it's not great

it can fixed on the module ps_googleanalytics, not on this PR (releasing the module again just for this very old morning would not be worth it... so the modification will be shipped in the next release of the module)

@Julievrz Julievrz added Wording ✔️ Status: check done, wording approved and removed Waiting for wording Status: action required, waiting for wording labels Mar 6, 2024
@ps-jarvis ps-jarvis added the Waiting for QA Status: action required, waiting for test feedback label Mar 6, 2024
@matthieu-rolland matthieu-rolland removed the Waiting for QA Status: action required, waiting for test feedback label Mar 6, 2024
@matthieu-rolland matthieu-rolland merged commit 3ae7643 into 8.1.x Mar 6, 2024
75 checks passed
@Hlavtox Hlavtox mentioned this pull request Mar 6, 2024
26 tasks
@matthieu-rolland matthieu-rolland added this to the 8.1.5 milestone Mar 7, 2024
@matks matks mentioned this pull request Apr 22, 2024
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.1.x Branch Improvement Type: Improvement Wording ✔️ Status: check done, wording approved
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

5 participants