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

Fix use of wordings without domain #31

Merged
merged 2 commits into from Oct 17, 2018

Conversation

Projects
None yet
3 participants
@eternoendless
Member

eternoendless commented Oct 10, 2018

No description provided.

@eternoendless eternoendless requested a review from LouiseBonnard Oct 10, 2018

@@ -1264,7 +1264,7 @@ public function hookActionDeleteGDPRCustomer($customer)
if (Db::getInstance()->execute($sql)) {
return json_encode(true);
}
return json_encode($this->l('Newsletter subscription: Unable to delete customer using email.'));
return json_encode($this->trans('Newsletter subscription: Unable to delete customer using email.', array(), 'Modules.Emailsubscription.Admin'));

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Oct 10, 2018

Can we take this opportunity to explicit the wording also? I don't understand if the deletion regards the customer or its email. Also, the uppercase is here useless after the colon. :-)

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Oct 10, 2018

Checked with Alex Darmon, please turn the current wording into Newsletter subscription: no email to delete, this customer has not registered.

@@ -1274,7 +1274,7 @@ public function hookActionExportGDPRData($customer)
if ($res = Db::getInstance()->ExecuteS($sql)) {
return json_encode($res);
}
return json_encode($this->l('Newsletter subscription: Unable to export customer using email.'));
return json_encode($this->trans('Newsletter subscription: Unable to export customer using email.', array(), 'Modules.Emailsubscription.Admin'));

This comment has been minimized.

@LouiseBonnard

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Oct 10, 2018

Checked with Alex Darmon, please turn the current wording into Newsletter subscription: no email to export, this customer has not registered.

@eternoendless

This comment has been minimized.

Member

eternoendless commented Oct 16, 2018

@LouiseBonnard do you approve?

@eternoendless eternoendless merged commit 7f0c6d4 into PrestaShop:dev Oct 17, 2018

@eternoendless eternoendless deleted the eternoendless:fix-wordings branch Oct 17, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment