From c24cee303de6ab26fe1ca4a929468efcb585ce88 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 13 May 2015 10:56:08 -0300 Subject: [PATCH 1/2] Fix modals, copayer list --- public/views/modals/tx-details.html | 4 ++-- public/views/modals/txp-details.html | 2 +- public/views/preferencesAbout.html | 2 +- public/views/preferencesLogs.html | 2 +- public/views/walletHome.html | 24 ++++++++++++++++-------- src/js/controllers/walletHome.js | 3 +++ 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 059896384..6b578f101 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -67,7 +67,7 @@ -
+

Signatures

  • @@ -75,7 +75,7 @@ - {{c.copayerName}} + {{c.copayerName}} ({{'Me'|translate}})
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 45e19263c..774e8834c 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -70,7 +70,7 @@
-
-

- {{index.m}} of {{index.n}} -

-
- Multisignature wallet - Personal Wallet - - Testnet +
+
+

+ {{index.m}} of {{index.n}} +

+
+ Multisignature wallet - Testnet +
+
+
+

+ {{index.m}} of {{index.n}} +

+
+ Personal Wallet - Testnet +
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index cf35c0bb3..c6508da75 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -131,6 +131,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.amountStr = tx.amountStr; $scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.copayers = copayers + $scope.copayerId = fc.credentials.copayerId; $scope.loading = null; $scope.color = fc.backgroundColor; @@ -840,6 +841,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.btx = btx; $scope.settings = config; $scope.color = fc.backgroundColor; + $scope.copayerId = fc.credentials.copayerId; + $scope.isShared = fc.credentials.n > 1; $scope.getAmount = function(amount) { return self.getAmount(amount); From b24ca234157ed5fa0c499c96ea65e69814633c27 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 13 May 2015 11:04:26 -0300 Subject: [PATCH 2/2] Update template.POT and spanish translation --- po/es.po | 87 +++++++++++++++++++----------- po/template.pot | 63 +++++++++++++--------- public/views/preferencesAbout.html | 2 +- public/views/preferencesLogs.html | 2 +- 4 files changed, 96 insertions(+), 58 deletions(-) diff --git a/po/es.po b/po/es.po index 13c32fb40..38867ddc4 100644 --- a/po/es.po +++ b/po/es.po @@ -44,7 +44,7 @@ msgstr "Acerca de Copay" msgid "Add wallet" msgstr "Agregar monedero" -#: public/views/paymentUri.html +#: public/views/paymentUri.html public/views/modals/paypro.html msgid "Address" msgstr "Dirección" @@ -77,7 +77,8 @@ msgstr "¿Estas seguro de borrar este monedero?" msgid "Available Balance" msgstr "Balance disponible" -#: public/views/includes/topbar.html +#: public/views/includes/topbar.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Back" msgstr "Volver" @@ -146,7 +147,6 @@ msgstr "Seleccione el archivo backup de su computadora" #: public/views/includes/topbar.html public/views/modals/copayers.html #: public/views/modals/paypro.html public/views/modals/scanner.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html msgid "Close" msgstr "Cerrar" @@ -179,6 +179,18 @@ msgstr "" msgid "Copy to clipboard" msgstr "Copiar al portapapeles" +#: src/js/controllers/walletHome.js +msgid "Could not broadcast transaction. Please try again." +msgstr "No se pudo emitir la transacción. Por favor, intente nuevamente." + +#: src/js/controllers/walletHome.js +msgid "" +"Could not connect wallet service. Check your Internet connexion and your " +"wallet service configuration." +msgstr "" +"No se pudo conectar con Wallet Service. Verifique la conexión a internet y " +"la configuración a Wallet Service." + #: src/js/services/profileService.js msgid "Could not create using the specified extended private key" msgstr "No se pudo crear el monedero usando la clave privada ingresada" @@ -187,6 +199,10 @@ msgstr "No se pudo crear el monedero usando la clave privada ingresada" msgid "Could not decrypt file, check your password" msgstr "No se pudo desencriptar el archivo, verifique su contraseña" +#: src/js/controllers/walletHome.js +msgid "Could not delete transaction. Please try again." +msgstr "No se pudo borrar la transacción. Por favor, intente nuevamente." + #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" msgstr "No se pudo obtener información del pago" @@ -207,6 +223,18 @@ msgstr "No se pudo unir al monedero usando la clave privada ingresada" msgid "Could not join wallet:" msgstr "No se pudo unir al monedero:" +#: src/js/controllers/walletHome.js +msgid "Could not reject transaction. Please try again." +msgstr "No se pudo rechazar la transacción. Por favor, intente nuevamente." + +#: src/js/controllers/walletHome.js +msgid "Could not send transaction. Please try again." +msgstr "No se pudo enviar la transacción. Por favor, intente nuevamente." + +#: src/js/controllers/walletHome.js +msgid "Could not sign transaction. Please try again." +msgstr "No se pudo firmar la transacción. Por favor, intente nuevamente." + #: public/views/walletHome.html msgid "Could not update Wallet" msgstr "No se puede actualizar el monedero" @@ -227,7 +255,7 @@ msgstr "Crear, unirse o importar" msgid "Created by" msgstr "Creado por" -#: public/views/create.html public/views/createProfile.html +#: public/views/create.html public/views/splash/1.html msgid "Creating Wallet..." msgstr "Creando Monedero..." @@ -417,6 +445,7 @@ msgid "Master extended private key" msgstr "Master extended private key" #: public/views/includes/copayers.html public/views/modals/copayers.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html msgid "Me" msgstr "Yo" @@ -584,7 +613,7 @@ msgstr "Repite la contraseña" msgid "Required" msgstr "Requerido" -#: public/views/createProfile.html +#: public/views/splash/1.html msgid "Retrying..." msgstr "Reintentando..." @@ -653,6 +682,10 @@ msgstr "Enviado" msgid "Server" msgstr "Servidor" +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "Registro de sesión" + #: public/views/backup.html msgid "Set up a Password for your backup" msgstr "Establecer contraseña para tu copia de seguridad" @@ -780,10 +813,6 @@ msgstr "Transacción aceptada..." msgid "Transaction broadcasted" msgstr "Transacción enviada" -#: src/js/controllers/walletHome.js -msgid "Transaction could not be deleted. Please try again." -msgstr "La transacción no se pudo eliminar. Por favor, intente nuevamente." - #: public/views/modals/txp-details.html msgid "Transaction finally rejected" msgstr "Transacción finalmente rechazada" @@ -792,18 +821,6 @@ msgstr "Transacción finalmente rechazada" msgid "Transaction not broadcasted. Please try again." msgstr "Transacción no emitida. Por favor, intente nuevamente." -#: src/js/controllers/walletHome.js -msgid "Transaction not rejected. Please try again." -msgstr "Transacción no rechazada. Por favor, intente nuevamente." - -#: src/js/controllers/walletHome.js -msgid "Transaction not sent. Please try again." -msgstr "Transacción no enviada. Por favor, intente nuevamente." - -#: src/js/controllers/walletHome.js -msgid "Transaction not signed. Please try again." -msgstr "Transacción no firmada. Por favor, intente nuevamente." - #: public/views/modals/txp-details.html msgid "Transaction proposal" msgstr "Propuestas de transacción" @@ -860,10 +877,6 @@ msgstr "Versión" msgid "View backup" msgstr "Ver Copia de Seguridad" -#: public/views/preferencesAbout.html -msgid "View session logs" -msgstr "Ver registro de sesión" - #: public/views/walletHome.html msgid "WARNING: Backup needed" msgstr "ADVERTENCIA: Se requiere hacer copia de seguridad" @@ -908,6 +921,14 @@ msgstr "Monedero incompleto y roto" msgid "Wallet name" msgstr "Nombre del monedero" +#: src/js/controllers/walletHome.js +msgid "" +"Wallet service timed out. Check your Internet connexion and your wallet " +"service configuration." +msgstr "" +"Tiempo de espera agotado. Verifique la conexión a internet y la " +"configuración a Wallet Service." + #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "¡Advertencia!" @@ -981,6 +1002,15 @@ msgstr "" "{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el " "balance actualizado" +#~ msgid "Transaction could not be deleted. Please try again." +#~ msgstr "La transacción no se pudo eliminar. Por favor, intente nuevamente." + +#~ msgid "Transaction not rejected. Please try again." +#~ msgstr "Transacción no rechazada. Por favor, intente nuevamente." + +#~ msgid "Transaction not signed. Please try again." +#~ msgstr "Transacción no firmada. Por favor, intente nuevamente." + #~ msgid "" #~ "* In case you need to import wallets from previous Copay versions go to " #~ "Menu" @@ -1162,13 +1192,6 @@ msgstr "" #~ msgid "Copay now needs a profile to access wallets." #~ msgstr "Copay ahora requiere un perfil para acceder a los monederos" -#~ msgid "" -#~ "Could not connect to the Insight server. Check your settings and network " -#~ "configuration" -#~ msgstr "" -#~ "No se pudo conectar con el servidor Insight. Verifica la configuración de " -#~ "red" - #~ msgid "Create Profile" #~ msgstr "Crear Perfil" diff --git a/po/template.pot b/po/template.pot index 67470991f..1b6caacc6 100644 --- a/po/template.pot +++ b/po/template.pot @@ -29,6 +29,7 @@ msgid "Add wallet" msgstr "" #: public/views/paymentUri.html +#: public/views/modals/paypro.html msgid "Address" msgstr "" @@ -64,6 +65,8 @@ msgid "Available Balance" msgstr "" #: public/views/includes/topbar.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Back" msgstr "" @@ -132,8 +135,6 @@ msgstr "" #: public/views/modals/copayers.html #: public/views/modals/paypro.html #: public/views/modals/scanner.html -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html msgid "Close" msgstr "" @@ -165,6 +166,14 @@ msgstr "" msgid "Copy to clipboard" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Could not broadcast transaction. Please try again." +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Could not connect wallet service. Check your Internet connexion and your wallet service configuration." +msgstr "" + #: src/js/services/profileService.js msgid "Could not create using the specified extended private key" msgstr "" @@ -173,6 +182,10 @@ msgstr "" msgid "Could not decrypt file, check your password" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Could not delete transaction. Please try again." +msgstr "" + #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" msgstr "" @@ -193,6 +206,18 @@ msgstr "" msgid "Could not join wallet:" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Could not reject transaction. Please try again." +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Could not send transaction. Please try again." +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Could not sign transaction. Please try again." +msgstr "" + #: public/views/walletHome.html msgid "Could not update Wallet" msgstr "" @@ -215,7 +240,7 @@ msgid "Created by" msgstr "" #: public/views/create.html -#: public/views/createProfile.html +#: public/views/splash/1.html msgid "Creating Wallet..." msgstr "" @@ -410,6 +435,8 @@ msgstr "" #: public/views/includes/copayers.html #: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Me" msgstr "" @@ -580,7 +607,7 @@ msgstr "" msgid "Required" msgstr "" -#: public/views/createProfile.html +#: public/views/splash/1.html msgid "Retrying..." msgstr "" @@ -651,6 +678,10 @@ msgstr "" msgid "Server" msgstr "" +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "" + #: public/views/backup.html msgid "Set up a Password for your backup" msgstr "" @@ -772,10 +803,6 @@ msgstr "" msgid "Transaction broadcasted" msgstr "" -#: src/js/controllers/walletHome.js -msgid "Transaction could not be deleted. Please try again." -msgstr "" - #: public/views/modals/txp-details.html msgid "Transaction finally rejected" msgstr "" @@ -784,18 +811,6 @@ msgstr "" msgid "Transaction not broadcasted. Please try again." msgstr "" -#: src/js/controllers/walletHome.js -msgid "Transaction not rejected. Please try again." -msgstr "" - -#: src/js/controllers/walletHome.js -msgid "Transaction not sent. Please try again." -msgstr "" - -#: src/js/controllers/walletHome.js -msgid "Transaction not signed. Please try again." -msgstr "" - #: public/views/modals/txp-details.html msgid "Transaction proposal" msgstr "" @@ -853,10 +868,6 @@ msgstr "" msgid "View backup" msgstr "" -#: public/views/preferencesAbout.html -msgid "View session logs" -msgstr "" - #: public/views/walletHome.html msgid "WARNING: Backup needed" msgstr "" @@ -901,6 +912,10 @@ msgstr "" msgid "Wallet name" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Wallet service timed out. Check your Internet connexion and your wallet service configuration." +msgstr "" + #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "" diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 5df5745d0..f0b96d411 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -28,7 +28,7 @@

 

  • - Session logs + Session log diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html index f1e49249d..dbe0d6a53 100644 --- a/public/views/preferencesLogs.html +++ b/public/views/preferencesLogs.html @@ -1,7 +1,7 @@
    + ng-init="titleSection='Session log'; goBackToState = 'about'">