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 catalogs for 1.7.8 version #24449

Merged
merged 6 commits into from
May 28, 2021

Conversation

jolelievre
Copy link
Contributor

@jolelievre jolelievre commented May 11, 2021

Questions Answers
Branch? 1.7.8.x
Description? Update default catalogs for 1.7.8 version
Type? improvement
Category? LO
BC breaks? no
Deprecations? no
Fixed ticket? Fix #24633
How to test? CI tests green, maybe check that new wordings are now present in the translation interface
Possible impacts? ~

This change is Reviewable

@jolelievre jolelievre requested a review from a team as a code owner May 11, 2021 11:01
@prestonBot prestonBot added 1.7.8.x Branch Improvement Type: Improvement labels May 11, 2021
@@ -29,9 +29,9 @@

<div class="card js-grid-panel" id="{{ grid.id }}_grid_panel">
{% block grid_panel_header %}
{% if displayName is not sameas(false) or grid.actions.grid|length > 0 %}
{% if displayName is not same as(false) or grid.actions.grid|length > 0 %}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had to fix this one because the Twig parser detected this as a syntax error (doesn't seem to bother the execution though, maybe it was the old syntax)

@Julievrz Julievrz added this to the 1.7.7.5 milestone May 11, 2021
@Julievrz Julievrz added the Waiting for wording Status: action required, waiting for wording label May 12, 2021
Copy link
Contributor

@Julievrz Julievrz left a comment

Choose a reason for hiding this comment

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

Hi @jolelievre
I found a few mistakes that we had missed. :-)
Thank you in advance!

@matks matks added the Waiting for author Status: action required, waiting for author feedback label May 17, 2021
@prestonBot
Copy link
Collaborator

prestonBot commented May 20, 2021

This pull request seems to contain new translation strings. I have summarized them below to ease up review:

(Note: this is an automated message, but answering it will reach a real human)

PierreRambaud
PierreRambaud previously approved these changes May 20, 2021
@hibatallahAouadni hibatallahAouadni linked an issue May 24, 2021 that may be closed by this pull request
@Julievrz
Copy link
Contributor

@jolelievre
6

On the page "Add new order"

'Add a new address' => 'Add new address' (without article)
'Create the order' => 'Create order' (without article)

Thank you very much

@Julievrz Julievrz added Wording ✔️ Status: check done, wording approved and removed Waiting for wording Status: action required, waiting for wording labels May 28, 2021
@jolelievre jolelievre removed the Waiting for author Status: action required, waiting for author feedback label May 28, 2021
@sowbiba sowbiba added the Waiting for QA Status: action required, waiting for test feedback label May 28, 2021
@sowbiba sowbiba added the Waiting for dev Status: action required, waiting for tech feedback label May 28, 2021
@sowbiba sowbiba self-assigned this May 28, 2021
@sowbiba sowbiba added QA ✔️ Status: check done, code approved and removed Waiting for QA Status: action required, waiting for test feedback Waiting for dev Status: action required, waiting for tech feedback labels May 28, 2021
@sowbiba
Copy link
Contributor

sowbiba commented May 28, 2021

Thanks @jolelievre

@sowbiba sowbiba merged commit 74bd06c into PrestaShop:1.7.8.x May 28, 2021
@Progi1984 Progi1984 modified the milestones: 1.7.7.5, 1.7.8.0 May 31, 2021
@jolelievre jolelievre deleted the export-catalog-178 branch June 9, 2022 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.7.8.x Branch Improvement Type: Improvement QA ✔️ Status: check done, code approved Wording ✔️ Status: check done, wording approved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update default catalogs for 1.7.8 version
8 participants