Fixed translations and Blackbytes QR code #254
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tonyofbyteball
requested changes
Dec 27, 2017
| @@ -42,25 +44,8 @@ angular.module('copayApp.controllers').controller('inviteCorrespondentDeviceCont | |||
| correspondentListService.startWaitingForPairing(function(pairingInfo){ | |||
| console.log("beginAddCorrespondent " + pairingInfo.pairing_secret); | |||
| $scope.code = pairingInfo.device_pubkey + "@" + pairingInfo.hub + "#" + pairingInfo.pairing_secret; | |||
|
|
|||
| function determineQRcodeVersionFromString( inputtext ) { | |||
There was a problem hiding this comment.
what was the point of moving the function to the service?
There was a problem hiding this comment.
because the function is now used in both wallethome.js and invitecorrespondentDevice.js
There was a problem hiding this comment.
wallethome.js is not included in the diff
| @@ -16,10 +16,10 @@ <h1 class="title ellipsis" ng-style="{'color':color}" translate> | |||
| <h4 class="title m0" translate>QR Code</h4> | |||
| <ul class="no-bullet size-14 m0"> | |||
| <li class="line-b p10 oh text-center"> | |||
| <qrcode size="220" version="6" data="{{protocol}}:{{addr + '?amount=' + amountInSmallestUnits + asset_param}}"></qrcode> | |||
| <qrcode size="220" version="{{qr_version}}" data="{{protocol}}:{{code}}"></qrcode> | |||
There was a problem hiding this comment.
I din't find where code is set
There was a problem hiding this comment.
its in wallethome.js @ line 446
There was a problem hiding this comment.
wallethome.js is not even in the diff
| @@ -358,7 +358,7 @@ <h1 class="title ellipsis" ng-style="{'color': noColor ? '#4A90E2' : index.backg | |||
| </div> | |||
| <div class="large-4 medium-4 small-4 columns adaptive"> | |||
| <button type="button" | |||
| class="button expand round outline dark-gray tiny" | |||
| class="button expand translate round outline dark-gray tiny" | |||
There was a problem hiding this comment.
maybe outside the class?
| @@ -262,13 +262,13 @@ angular.module('copayApp.controllers').controller('correspondentDeviceController | |||
| if (contract.peerAsset === "base") | |||
| peer_amount *= walletSettings.unitValue; | |||
| if (contract.peerAsset === constants.BLACKBYTES_ASSET) | |||
| throw Error("peer asset cannot be blackbytes"); | |||
| throw Error(gettext("peer asset cannot be blackbytes")); | |||
There was a problem hiding this comment.
we don't need to translate exceptions
tonyofbyteball
requested changes
Dec 31, 2017
| @@ -16,10 +16,10 @@ <h1 class="title ellipsis" ng-style="{'color':color}" translate> | |||
| <h4 class="title m0" translate>QR Code</h4> | |||
| <ul class="no-bullet size-14 m0"> | |||
| <li class="line-b p10 oh text-center"> | |||
| <qrcode size="220" version="6" data="{{protocol}}:{{addr + '?amount=' + amountInSmallestUnits + asset_param}}"></qrcode> | |||
| <qrcode size="220" version="{{qr_version}}" data="{{protocol}}:{{code}}"></qrcode> | |||
There was a problem hiding this comment.
wallethome.js is not even in the diff
| @@ -42,25 +44,8 @@ angular.module('copayApp.controllers').controller('inviteCorrespondentDeviceCont | |||
| correspondentListService.startWaitingForPairing(function(pairingInfo){ | |||
| console.log("beginAddCorrespondent " + pairingInfo.pairing_secret); | |||
| $scope.code = pairingInfo.device_pubkey + "@" + pairingInfo.hub + "#" + pairingInfo.pairing_secret; | |||
|
|
|||
| function determineQRcodeVersionFromString( inputtext ) { | |||
There was a problem hiding this comment.
wallethome.js is not included in the diff
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some texts related to payments and contracts did not use translations. Also fixed that a payment request for Blackbytes did not show the QR code.