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 translation catalog #10933

Merged
merged 23 commits into from Oct 17, 2018

Conversation

Projects
None yet
5 participants
@eternoendless
Member

eternoendless commented Oct 9, 2018

Questions Answers
Branch? 1.7.5.x
Description? Fix use of wrong translation domain
Type? bug fix
Category? CO
BC breaks? no
Deprecations? no
Fixed ticket? n/a
How to test? No test needed

This change is Reviewable

@eternoendless eternoendless changed the title from Fix wrong translation domain to [WIP] Fix wrong translation domain Oct 10, 2018

@eternoendless eternoendless changed the title from [WIP] Fix wrong translation domain to Fix wrong translation domain Oct 10, 2018

@eternoendless

This comment has been minimized.

Member

eternoendless commented Oct 10, 2018

What about now @LouiseBonnard ?

Show resolved Hide resolved app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf Outdated
Show resolved Hide resolved app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf Outdated
Show resolved Hide resolved app/Resources/translations/default/ModulesFaviconnotificationboAdmin.xlf Outdated
@@ -76,7 +76,7 @@
<thead>
<tr>
<th class="fixed-width-xs"><span class="title_box">{{ 'ID'|trans({}, 'Admin.Global') }}</span></th>
<th><span class="title_box">{{ 'IP address'|trans({}, 'messages') }}</span></th>
<th><span class="title_box">{{ 'IP address'|trans }}</span></th>

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Oct 10, 2018

Contributor

IP Address instead. :-(

Show resolved Hide resolved app/Resources/translations/default/ModulesFaviconnotificationboAdmin.xlf Outdated
Show resolved Hide resolved app/Resources/translations/default/ModulesBuybuttonliteAdmin.xlf
@@ -435,6 +561,12 @@ File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:479
</file>
<file original="modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="618bfc1f9ba85d07157a388208fe3ff8">
<source>Settings file updated</source>

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Oct 15, 2018

Contributor

Why not a better wording from an existing translation string, like Settings updated in Admin.Global? Formulation is clearer.

This comment has been minimized.

@eternoendless

eternoendless Oct 15, 2018

Member

I think that we are specifically talking about a settings file, and not settings in general.
Wdyt @Quetzacoalt91 ?

This comment has been minimized.

@Quetzacoalt91

Quetzacoalt91 Oct 15, 2018

Member

Exactly. We are talking about the file config/settings.inc.php available on PS 1.6

File: modules/autoupgrade/classes/UpgradePage.php:333</note>
</trans-unit>
<trans-unit id="c12803674a35ccc28e5da00a50a84591">
<source><![CDATA[Product images do not appear in the front-office? Try regenerating the thumbnails in Preferences > Images]]></source>

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Oct 15, 2018

Contributor

What I get on Crowdin is that: Product images do not appear in the front-office? Try regenerating the thumbnails in Preferences > Images, should we change?

This comment has been minimized.

@eternoendless

eternoendless Oct 15, 2018

Member

The wording looks the same to me. Am I missing something? The <![CDATA[]]> around is syntactic sugar to prevent the literal > inside the wording from breaking the XML file. You can disregard that, it won't appear in Crowdin.

File: modules/autoupgrade/classes/UpgradePage.php:340</note>
</trans-unit>
<trans-unit id="a8192fd08a431bf547ebf9a3eaa9b6bb">
<source>Javascript error (parseJSON) detected for action </source>

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Oct 15, 2018

Contributor

Watch the space at the end. ;-)

This comment has been minimized.

@eternoendless

eternoendless Oct 15, 2018

Member

@Quetzacoalt91 was it left there on purpose?

This comment has been minimized.

@Quetzacoalt91

Quetzacoalt91 Oct 15, 2018

Member

Yes, the action name is concatenated. Note I did not change this string with the latest versions of the module.

This comment has been minimized.

@eternoendless

eternoendless Oct 15, 2018

Member

Ok we'll leave it as is then 👍

Show resolved Hide resolved app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf Outdated
File: modules/autoupgrade/views/templates/block/channelInfo.twig:5</note>
</trans-unit>
<trans-unit id="4e140ba723a03baa6948340bf90e2ef6">
<source>Name:</source>

This comment has been minimized.

@LouiseBonnard

LouiseBonnard Oct 15, 2018

Contributor

Already in Admin.Global.

This comment has been minimized.

@eternoendless
Show resolved Hide resolved app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf Outdated

@eternoendless eternoendless referenced this pull request Oct 15, 2018

Merged

Fix wordings #179

@eternoendless

This comment has been minimized.

Member

eternoendless commented Oct 16, 2018

@LouiseBonnard do you approve?

@eternoendless eternoendless changed the title from Fix wrong translation domain to Fix translation catalog Oct 17, 2018

@eternoendless

This comment has been minimized.

Member

eternoendless commented Oct 17, 2018

@eternoendless

This comment has been minimized.

Member

eternoendless commented Oct 17, 2018

Approved by @LouiseBonnard

@eternoendless eternoendless merged commit 849f367 into PrestaShop:1.7.5.x Oct 17, 2018

1 of 2 checks passed

Codacy/PR Quality Review Hang in there, Codacy is reviewing your Pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@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