From 476bd3c1d37fa9264d11d420b626392084025c2d Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sat, 12 Sep 2015 23:49:14 -0300 Subject: [PATCH] Removes translate for Glidera --- public/views/buyGlidera.html | 36 ++++---- public/views/glidera.html | 43 +++++----- public/views/glideraUri.html | 2 +- public/views/modals/glidera-confirmation.html | 8 +- public/views/modals/glidera-tx-details.html | 20 ++--- public/views/preferences.html | 4 +- public/views/preferencesGlidera.html | 86 +++++++++---------- public/views/sellGlidera.html | 36 ++++---- src/js/controllers/buyGlidera.js | 14 +-- src/js/controllers/sellGlidera.js | 22 ++--- 10 files changed, 135 insertions(+), 136 deletions(-) diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index ea6e15673..de0b80c2c 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -16,7 +16,7 @@
- {{buy.loading|translate}} + {{buy.loading}} @@ -26,11 +26,11 @@
- Daily buy limit: + Daily buy limit: {{index.glideraLimits.dailyBuy|currency:'':2}} {{index.glideraLimits.currency}} (remaining {{index.glideraLimits.dailyBuyRemaining|currency:'':2}} {{index.glideraLimits.currency}})
- Monthly buy limit: + Monthly buy limit: {{index.glideraLimits.monthlyBuy|currency:'':2}} {{index.glideraLimits.currency}} (remaining {{index.glideraLimits.monthlyBuyRemaining|currency:'':2}} {{index.glideraLimits.currency}})
@@ -41,7 +41,7 @@
- + This operation was disabled because you have a pending first transaction
@@ -54,10 +54,10 @@
- +
@@ -65,15 +65,15 @@
- +
{{buy.buyPrice.qty}} BTC at {{buy.buyPrice.price}} {{buy.buyPrice.currency}}/BTC
-
+
(Enter the amount to get the exchange rate)
@@ -97,16 +97,16 @@
-
+
{{buy.buyPrice.subtotal|currency:'':2}} {{buy.buyPrice.currency}} → {{buy.buyPrice.qty}} BTC -

+

A SMS containing a confirmation code was sent to your phone.
Please, enter the code below

@@ -115,21 +115,21 @@ + type="submit" value="{{'Buy'}}" ng-disabled="buyForm.$invalid || buy.loading"> -

+

Fiat will be immediately withdrawn from your bank account. The bitcoins will be purchased and deposited to your wallet ({{index.walletName}}) in 2-4 business days.

- {{buy.error|translate}} + {{buy.error}}
-

Purchase initiated

-

+

Purchase initiated

+

A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.

diff --git a/public/views/glidera.html b/public/views/glidera.html index e1a507132..326705695 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -17,8 +17,8 @@
- Connecting to Glidera... - {{index.glideraLoading|translate}} + Connecting to Glidera... + {{index.glideraLoading}}
@@ -42,7 +42,7 @@ Retry
- Preferences + Preferences
@@ -59,11 +59,11 @@
-

You can buy and sell Bitcoin with a US bank account directly in Copay.

-

Connect your Glidera account to get started

+

You can buy and sell Bitcoin with a US bank account directly in Copay.

+

Connect your Glidera account to get started

+ ng-click="$root.openExternalLink(glidera.getAuthenticateUrl(), '_system'); showOauthForm = true"> Connect to Glidera
@@ -79,16 +79,16 @@
+ ng-attr-placeholder="{{'Paste the authorization code here'}}" required>
-
- Go back -
+
@@ -100,7 +100,7 @@
-

Preferences

+

Preferences

@@ -124,13 +124,12 @@
-

Complete Setup

- Your Glidera account is not ready to transact. Please, verify it at Glidera.io +

Complete Setup

+ Your Glidera account is not ready to transact. Please, verify it at Glidera.io + ng-click="$root.openExternalLink(glideraUrl)"> Go to Glidera
@@ -142,7 +141,7 @@ (index.glideraStatus.userCanBuy || index.glideraStatus.userCanTransact)" class="line-b line-t p20 pointer" ng-click="$root.go('buyGlidera')"> - Buy Bitcoin + Buy Bitcoin @@ -152,7 +151,7 @@ (index.glideraStatus.userCanSell || index.glideraStatus.userCanTransact)" ng-click="$root.go('sellGlidera')"> - Sell Bitcoin + Sell Bitcoin @@ -160,9 +159,9 @@
-

Activity

+

Activity

+ class="size-12 p10 text-center text-gray"> No activity in your account
Bought - Sold + ng-style="{'background-color':index.backgroundColor}">Bought + Sold
diff --git a/public/views/glideraUri.html b/public/views/glideraUri.html index 5e5412b52..361c856e1 100644 --- a/public/views/glideraUri.html +++ b/public/views/glideraUri.html @@ -15,7 +15,7 @@
- Connecting to Glidera... + Connecting to Glidera...
diff --git a/public/views/modals/glidera-confirmation.html b/public/views/modals/glidera-confirmation.html index 641fc6142..30a3f7bb2 100644 --- a/public/views/modals/glidera-confirmation.html +++ b/public/views/modals/glidera-confirmation.html @@ -1,15 +1,15 @@
-

Are you sure you would like to log out of your Glidera account?

-

You will need to log back in to buy or sell bitcoin in Copay.

+

Are you sure you would like to log out of your Glidera account?

+

You will need to log back in to buy or sell bitcoin in Copay.

diff --git a/public/views/modals/glidera-tx-details.html b/public/views/modals/glidera-tx-details.html index 0725e2de6..f6bec9ef7 100644 --- a/public/views/modals/glidera-tx-details.html +++ b/public/views/modals/glidera-tx-details.html @@ -2,11 +2,11 @@
- Back + Back
-

+

Transaction

@@ -15,8 +15,8 @@
Bought - Sold + ng-style="{'background-color':color}">Bought + Sold
{{tx.subtotal|currency:'':2}} {{tx.currency}}
@@ -27,34 +27,34 @@
-

Details

+

Details

  • - Date + Date {{tx.transactionDate | amCalendar}}
  • - Exchange rate + Exchange rate {{tx.price|currency:'':2}} {{tx.currency}}/BTC

 

  • - Subtotal + Subtotal {{tx.subtotal|currency:'':2}} {{tx.currency}}
  • - Fees + Fees {{tx.fees|currency:'':2}} {{tx.currency}}
  • - Total + Total {{tx.total|currency:'':2}} {{tx.currency}}
diff --git a/public/views/preferences.html b/public/views/preferences.html index 56c1eaca9..6f46dba1f 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -96,11 +96,11 @@
  • - Enable Glidera Service + Enable Glidera Service
  • - Glidera Sandbox + Glidera Sandbox
  • diff --git a/public/views/preferencesGlidera.html b/public/views/preferencesGlidera.html index 0df247905..d998d3034 100644 --- a/public/views/preferencesGlidera.html +++ b/public/views/preferencesGlidera.html @@ -7,27 +7,27 @@
      -

      Permissions

      +

      Permissions

    • - Email + Email {{index.glideraPermissions.view_email_address}}
    • - Personal Information + Personal Information {{index.glideraPermissions.personal_info}}
    • - Buy/Sell + Buy/Sell {{index.glideraPermissions.transact}}
    • - Transaction History + Transaction History {{index.glideraPermissions.transaction_history}} @@ -37,15 +37,15 @@
        -

        Email

        +

        Email

      • - Email + Email {{glidera.email.email}}
      • - Active + Active {{glidera.email.userEmailIsSetup}} @@ -55,76 +55,76 @@
          -

          Personal Information

          +

          Personal Information

        • - First Name + First Name {{glidera.personalInfo.firstName}}
        • - Middle Name + Middle Name {{glidera.personalInfo.middleName}}
        • - Last Name + Last Name {{glidera.personalInfo.lastName}}
        • - Birth Date + Birth Date {{glidera.personalInfo.birthDate}}
        • - Address 1 + Address 1 {{glidera.personalInfo.address1}}
        • - Address 2 + Address 2 {{glidera.personalInfo.address2}}
        • - City + City {{glidera.personalInfo.city}}
        • - State + State {{glidera.personalInfo.state}}
        • - ZIP Code + ZIP Code {{glidera.personalInfo.zipCode}}
        • - Country + Country {{glidera.personalInfo.countryCode}}
        • - Occupation + Occupation {{glidera.personalInfo.occupation}}
        • - Basic Information State + Basic Information State {{glidera.personalInfo.basicInfoState}} @@ -133,59 +133,59 @@
            -

            Status

            +

            Status

          • - Buy/Sell + Buy/Sell {{glidera.status.userCanTransact}}
          • - Buy + Buy {{glidera.status.userCanBuy}}
          • - Sell + Sell {{glidera.status.userCanSell}}
          • - Email Is Setup + Email Is Setup {{glidera.status.userEmailIsSetup}}
          • - Phone Is Setup + Phone Is Setup {{glidera.status.userPhoneIsSetup}}
          • - Bank Account Is Setup + Bank Account Is Setup {{glidera.status.userBankAccountIsSetup}}
          • - Personal Information State + Personal Information State {{glidera.status.personalInfoState}}
          • - Bank Account State + Bank Account State {{glidera.status.bankAccountState}}
          • - Country + Country {{glidera.status.country}} @@ -194,58 +194,58 @@
              -

              Limits

              +

              Limits

            • - Daily Buy + Daily Buy {{glidera.limits.dailyBuy|currency:'':2}} {{glidera.limits.currency}}
            • - Daily Sell + Daily Sell {{glidera.limits.dailySell|currency:'':2}} {{glidera.limits.currency}}
            • - Monthly Buy + Monthly Buy {{glidera.limits.monthlyBuy|currency:'':2}} {{glidera.limits.currency}}
            • - Monthly Sell + Monthly Sell {{glidera.limits.monthlySell|currency:'':2}} {{glidera.limits.currency}}
            • - Daily Buy Remaining + Daily Buy Remaining {{glidera.limits.dailyBuyRemaining|currency:'':2}} {{glidera.limits.currency}}
            • - Daily Sell Remaining + Daily Sell Remaining {{glidera.limits.dailySellRemaining|currency:'':2}} {{glidera.limits.currency}}
            • - Monthly Buy Remaining + Monthly Buy Remaining {{glidera.limits.monthlyBuyRemaining|currency:'':2}} {{glidera.limits.currency}}
            • - Monthly Sell Remaining + Monthly Sell Remaining {{glidera.limits.monthlySellRemaining|currency:'':2}} {{glidera.limits.currency}}
            • - Buy/Sell Disabled (pending first transaction) + Buy/Sell Disabled (pending first transaction) {{glidera.limits.transactDisabledPendingFirstTransaction}} @@ -253,11 +253,11 @@
              -

              Account

              +

              Account

            • - Log out + Log out
            diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index 980f8ea27..2242a76a5 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -16,7 +16,7 @@
    - {{sell.loading|translate}} + {{sell.loading}}
    • @@ -26,11 +26,11 @@
    - Daily sell limit: + Daily sell limit: {{index.glideraLimits.dailySell|currency:'':2}} {{index.glideraLimits.currency}} (remaining {{index.glideraLimits.dailySellRemaining|currency:'':2}} {{index.glideraLimits.currency}})
    - Monthly sell limit: + Monthly sell limit: {{index.glideraLimits.monthlySell|currency:'':2}} {{index.glideraLimits.currency}} (remaining {{index.glideraLimits.monthlySellRemaining|currency:'':2}} {{index.glideraLimits.currency}})
    @@ -41,7 +41,7 @@
    - + This operation was disabled because you have a pending first transaction
    @@ -53,10 +53,10 @@
    - +
    @@ -64,15 +64,15 @@
    - +
    -
    +
    (Enter the amount to get the exchange rate)
    @@ -97,16 +97,16 @@
    -
    +
    {{sell.sellPrice.qty}} BTC → {{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} -

    +

    A SMS containing a confirmation code was sent to your phone.
    Please, enter the code below

    @@ -115,21 +115,21 @@ + type="submit" value="{{'Sell'}}" ng-disabled="sellForm.$invalid || sell.loading"> -

    +

    Bitcoins will be immediately sent from your wallet to Glidera. Fiat will be deposited in your bank account in 4-6 business days.

    - {{sell.error|translate}} + {{sell.error}}
    -

    Sale initiated

    -

    +

    Sale initiated

    +

    A transfer has been initiated to your bank account and should arrive in 4-6 business days.

    diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index c3ffbfbcf..f4c2df44b 100644 --- a/src/js/controllers/buyGlidera.js +++ b/src/js/controllers/buyGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('buyGlideraController', - function($scope, $timeout, $modal, profileService, addressService, glideraService, gettext, gettextCatalog, bwsError, lodash, isChromeApp) { + function($scope, $timeout, $modal, profileService, addressService, glideraService, bwsError, lodash, isChromeApp) { var self = this; this.show2faCodeInput = null; @@ -36,13 +36,13 @@ angular.module('copayApp.controllers').controller('buyGlideraController', $scope.selectWallet = function(walletId, walletName) { if (!profileService.getClient(walletId).isComplete()) { - self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, gettextCatalog.getString('Could not choose the wallet')); + self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, 'Could not choose the wallet'); $modalInstance.dismiss('cancel'); return; } addressService.getAddress(walletId, false, function(err, walletAddr) { if (err) { - self.error = bwsError.cb(err, gettext('Could not create address')); + self.error = bwsError.cb(err, 'Could not create address'); $modalInstance.dismiss('cancel'); return; } @@ -87,7 +87,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', glideraService.buyPrice(token, price, function(err, buyPrice) { self.gettingBuyPrice = false; if (err) { - self.error = gettext('Could not get exchange information. Please, try again.'); + self.error = 'Could not get exchange information. Please, try again.'; } else { self.buyPrice = buyPrice; @@ -97,12 +97,12 @@ angular.module('copayApp.controllers').controller('buyGlideraController', this.get2faCode = function(token) { var self = this; - this.loading = gettext('Sending 2FA code...'); + this.loading = 'Sending 2FA code...'; $timeout(function() { glideraService.get2faCode(token, function(err, sent) { self.loading = null; if (err) { - self.error = gettext('Could not send confirmation code to your phone'); + self.error = 'Could not send confirmation code to your phone'; } else { self.error = null; @@ -115,7 +115,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController', this.sendRequest = function(token, permissions, twoFaCode) { var self = this; self.error = null; - self.loading = gettext('Buying bitcoin...'); + self.loading = 'Buying bitcoin...'; var data = { destinationAddress: self.selectedWalletAddr, qty: self.buyPrice.qty, diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index e3f6c7e07..4bac5037f 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('sellGlideraController', - function($scope, $timeout, $log, $modal, gettext, gettextCatalog, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp) { + function($scope, $timeout, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp) { var self = this; var config = configService.getSync(); @@ -40,7 +40,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', $scope.selectWallet = function(walletId, walletName) { if (!profileService.getClient(walletId).isComplete()) { - self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, gettextCatalog.getString('Could not choose the wallet')); + self.error = bwsError.msg({'code': 'WALLET_NOT_COMPLETE'}, 'Could not choose the wallet'); $modalInstance.dismiss('cancel'); return; } @@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', glideraService.sellPrice(token, price, function(err, sellPrice) { self.gettingSellPrice = false; if (err) { - self.error = gettext('Could not get exchange information. Please, try again.'); + self.error = 'Could not get exchange information. Please, try again.'; } else { self.error = null; @@ -94,12 +94,12 @@ angular.module('copayApp.controllers').controller('sellGlideraController', this.get2faCode = function(token) { var self = this; - this.loading = gettext('Sending 2FA code...'); + this.loading = 'Sending 2FA code...'; $timeout(function() { glideraService.get2faCode(token, function(err, sent) { self.loading = null; if (err) { - self.error = gettext('Could not send confirmation code to your phone'); + self.error = 'Could not send confirmation code to your phone'; } else { self.show2faCodeInput = sent; @@ -112,18 +112,18 @@ angular.module('copayApp.controllers').controller('sellGlideraController', var self = this; self.error = null; - this.loading = gettext('Selling Bitcoin...'); + this.loading = 'Selling Bitcoin...'; $timeout(function() { addressService.getAddress(fc.credentials.walletId, null, function(err, refundAddress) { if (!refundAddress) { self.loading = null; - self.error = bwsError.msg(err, gettext('Could not create address')); + self.error = bwsError.msg(err, 'Could not create address'); return; } glideraService.getSellAddress(token, function(error, sellAddress) { if (!sellAddress) { self.loading = null; - self.error = gettext('Could not get the destination bitcoin address'); + self.error = 'Could not get the destination bitcoin address'; return; } var amount = parseInt((self.sellPrice.qty * 100000000).toFixed(0)); @@ -144,7 +144,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', $log.error(err); $timeout(function() { self.loading = null; - self.error = bwsError.msg(err, gettextCatalog.getString('Error')); + self.error = bwsError.msg(err, 'Error'); }, 1); return; } @@ -201,7 +201,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', fc.signTxProposal(txp, function(err, signedTx) { profileService.lockFC(); if (err) { - err = bwsError.msg(err, gettextCatalog.getString('Could not accept payment')); + err = bwsError.msg(err, 'Could not accept payment'); return cb(err); } else { @@ -209,7 +209,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', return cb(null, txp, signedTx.raw); } else { - return cb(gettext('The transaction could not be signed')); + return cb('The transaction could not be signed'); } } });