Skip to content

[Forwardport] Added translation function for Magento_Braintree module's template file. #16771

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.

Sign up for GitHub

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

Merged
merged 13 commits into from
Aug 9, 2018
Merged

[Forwardport] Added translation function for Magento_Braintree module's template file. #16771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
db2ff9a
Merge pull request #11 from sanganinamrata/2.3-develop-PR-port-16557
sanganinamrata Jul 9, 2018
2456027
Merge pull request #12 from sanganinamrata/2.3-develop-PR-port-16549
sanganinamrata Jul 9, 2018
77acbc9
Merge pull request #9 from sanganinamrata/2.3-develop-PR-port-16581
sanganinamrata Jul 9, 2018
08ad531
Merge pull request #13 from sanganinamrata/2.3-develop-PR-port-16549
sanganinamrata Jul 10, 2018
7a30913
Merge pull request #16 from sanganinamrata/2.3-develop-PR-port-16691
sanganinamrata Jul 13, 2018
1f54168
Added translation function for Magento_Braintree module's template file.
sanganinamrata Jul 10, 2018
00923c1
Merge pull request #18 from sanganinamrata/2.3-develop-PR-port-16690
sanganinamrata Jul 13, 2018
9416d30
Merge pull request #19 from sanganinamrata/2.3-develop-PR-port-16721
sanganinamrata Jul 16, 2018
2318a88
Added 'title' attribute to 'a' link.
sanganinamrata Jul 10, 2018
9a5fb7a
Added 'title' attribute to 'img' tag.
sanganinamrata Jul 10, 2018
e144b30
Added 'title' attribute to 'img' tag.
sanganinamrata Jul 10, 2018
ab22f6c
Merge pull request #20 from sanganinamrata/2.3-develop-PR-port-16689
sanganinamrata Jul 16, 2018
f3411b6
Merge branch '2.3-develop' into 2.3-develop
sanganinamrata Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ $config = [
class="action-braintree-paypal-logo" disabled>
<img class="braintree-paypal-button-hidden"
src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
alt="Pay with PayPal"/>
alt="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"
title="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"/>
</button>
</div>
2 changes: 1 addition & 1 deletion app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ public function testGetAccessTokenVerifierInvalid($verifier, $verifierFromToken)
public function dataProviderForGetAccessTokenVerifierInvalidTest()
{
// Verifier is not a string
return [[3, 3], ['wrong_length', 'wrong_length'], ['verifier', 'doesnt match']];
return [[3, 3], ['wrong_length', 'wrong_length'], ['verifier', 'doesn\'t match']];
}

public function testGetAccessToken()
Expand Down
4 changes: 2 additions & 2 deletions lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function force($entityType, $identifier)

if (!isset($sequenceInfo['sequenceTable'])) {
throw new \Exception(
'TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesnt exists'
'TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesn\'t exists'
);
}

Expand Down Expand Up @@ -101,7 +101,7 @@ public function delete($entityType, $identifier)
$metadata = $this->metadataPool->getMetadata($entityType);
$sequenceInfo = $this->sequenceRegistry->retrieve($entityType);
if (!isset($sequenceInfo['sequenceTable'])) {
throw new \Exception('TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesnt exists');
throw new \Exception('TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesn\'t exists');
}
try {
$connection = $this->appResource->getConnectionByName($metadata->getEntityConnectionName());
Expand Down