From cbf3d7ccebd027a26fd1d73d5dc632c1d104ba4b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Apr 2015 19:19:10 -0300 Subject: [PATCH] Update translations for controllers and services --- Gruntfile.js | 9 +- po/es.po | 328 ++++++++++++++++------ po/template.pot | 231 ++++++++++++++- public/views/copayers.html | 2 +- public/views/includes/transaction.html | 2 +- public/views/modals/confirmation.html | 4 +- public/views/preferences.html | 2 +- public/views/preferencesAbout.html | 5 +- public/views/preferencesDeleteWallet.html | 4 +- public/views/preferencesLanguage.html | 2 +- src/js/controllers/backup.js | 4 +- src/js/controllers/copayers.js | 8 +- src/js/controllers/create.js | 8 +- src/js/controllers/import.js | 8 +- src/js/controllers/importLegacy.js | 6 +- src/js/controllers/index.js | 18 +- src/js/controllers/join.js | 6 +- src/js/controllers/password.js | 4 +- src/js/controllers/preferencesDelete.js | 8 +- src/js/controllers/walletHome.js | 38 +-- src/js/routes.js | 52 ++-- src/js/services/txStatus.js | 10 +- 22 files changed, 564 insertions(+), 195 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 14a621b13..3a72574f9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -156,7 +156,14 @@ module.exports = function(grunt) { nggettext_extract: { pot: { files: { - 'po/template.pot': ['public/index.html', 'public/views/*.html', 'public/views/**/*.html'] + 'po/template.pot': [ + 'public/index.html', + 'public/views/*.html', + 'public/views/**/*.html', + 'src/js/routes.js', + 'src/js/services/*.js', + 'src/js/controllers/*.js' + ] } }, }, diff --git a/po/es.po b/po/es.po index d52113829..98e1796ba 100644 --- a/po/es.po +++ b/po/es.po @@ -36,7 +36,15 @@ msgstr "" "* Usted puede instalar la copia de seguridad en otro dispositivo y usar el " "monedero al mismo tiempo en varios dispositivos." -#: public/views/includes/sidebar.html +#: src/js/routes.js +msgid "About" +msgstr "Acerca de" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "Acerca de Copay" + +#: public/views/includes/sidebar.html src/js/routes.js msgid "Add wallet" msgstr "Agregar monedero" @@ -44,7 +52,7 @@ msgstr "Agregar monedero" msgid "Address" msgstr "Dirección" -#: public/views/preferences.html +#: public/views/preferences.html src/js/routes.js msgid "Alternative Currency" msgstr "Moneda Alternativa" @@ -61,6 +69,10 @@ msgstr "Importe en" msgid "Applying changes" msgstr "Aplicando los cambios" +#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "¿Estas seguro de borrar este monedero?" + #: public/views/walletHome.html msgid "Available Balance" msgstr "Balance disponible" @@ -69,10 +81,14 @@ msgstr "Balance disponible" msgid "Back" msgstr "Volver" -#: public/views/preferences.html +#: public/views/preferences.html src/js/routes.js msgid "Backup" msgstr "Copia de seguridad" +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "Copia de Seguridad creada" + #: public/views/walletHome.html msgid "Backup now" msgstr "Copia de seguridad" @@ -100,6 +116,10 @@ msgstr "Dirección bitcoin" msgid "Broadcast Transaction" msgstr "Emitir Transacción" +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Emitiendo la transacción" + #: public/views/unsupported.html msgid "Browser unsupported" msgstr "Navegador no soportado" @@ -113,7 +133,6 @@ msgid "CANCEL" msgstr "CANCELAR" #: public/views/copayers.html public/views/walletHome.html -#: public/views/modals/confirmation.html msgid "Cancel" msgstr "Cancelar" @@ -131,10 +150,14 @@ msgstr "Seleccione el archivo backup de su computadora" msgid "Close" msgstr "Cerrar" -#: public/views/preferences.html +#: public/views/preferences.html src/js/routes.js msgid "Color" msgstr "Color" +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "Commit hash" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "Confirmaciones" @@ -156,10 +179,26 @@ msgstr "" msgid "Copy to clipboard" msgstr "Copiar al portapapeles" +#: src/js/controllers/create.js +msgid "Could not create wallet:" +msgstr "No se puede crear el monedero" + +#: src/js/controllers/import.js +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 fetch payment information" +msgstr "No se pudo obtener información del pago" + #: public/views/walletHome.html msgid "Could not fetch transaction history" msgstr "No se pudo obtener el historial de transacciones" +#: src/js/controllers/join.js +msgid "Could not join wallet:" +msgstr "No se pudo unir al monedero:" + #: public/views/walletHome.html msgid "Could not update Wallet" msgstr "No se puede actualizar el monedero" @@ -168,7 +207,7 @@ msgstr "No se puede actualizar el monedero" msgid "Create" msgstr "Crear" -#: public/views/add.html +#: public/views/add.html src/js/routes.js msgid "Create new wallet" msgstr "Crear nuevo monedero" @@ -184,14 +223,30 @@ msgstr "Creado por" msgid "Creating Wallet..." msgstr "Creando Monedero..." +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Creando transacción" + #: public/views/modals/tx-details.html msgid "Date" msgstr "Fecha" -#: public/views/preferences.html +#: public/views/preferences.html src/js/routes.js msgid "Delete" msgstr "Eliminar" +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "Borrarlo y crear uno nuevo" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "Eliminar monedero" + +#: src/js/controllers/walletHome.js +msgid "Deleting transaction" +msgstr "Eliminando transacción" + #: public/views/backup.html msgid "Download backup" msgstr "Descargar copia de seguridad" @@ -204,6 +259,14 @@ msgstr "ENTRAR" msgid "Encrypt Private Key" msgstr "Encriptar Clave Privada" +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "Archivo de copia de seguridad encriptado guardado" + +#: src/js/controllers/index.js +msgid "English" +msgstr "Inglés" + #: public/views/includes/password.html msgid "Enter your password" msgstr "Escribe tu contraseña" @@ -212,10 +275,22 @@ msgstr "Escribe tu contraseña" msgid "Expires" msgstr "Expira" +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "Falló al importar monederos" + #: public/views/create.html msgid "Family vacation funds" msgstr "Fondos para vacaciones en familia" +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Informantion" +msgstr "Buscando información del pago" + +#: src/js/controllers/index.js +msgid "French" +msgstr "Francés" + #: public/views/walletHome.html msgid "Generate new address" msgstr "Generar nueva dirección" @@ -228,6 +303,14 @@ msgstr "Opciones globales" msgid "Hide" msgstr "Ocultar" +#: src/js/controllers/index.js +msgid "History" +msgstr "Historial" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "Inicio" + #: public/views/create.html msgid "If not given, a random key will be generated" msgstr "Si no se ingresa, una clave aleatoria será generada" @@ -252,7 +335,11 @@ msgstr "Importar de Copay Beta 0.9" msgid "Import from the Cloud?" msgstr "¿Importar de la Nube?" -#: public/views/add.html +#: src/js/routes.js +msgid "Import legacy wallet" +msgstr "Importar monedero obsoleto" + +#: public/views/add.html src/js/routes.js msgid "Import wallet" msgstr "Importar monedero" @@ -264,6 +351,10 @@ msgstr "Importando monedero..." msgid "Information" msgstr "Información" +#: src/js/controllers/index.js +msgid "Japanese" +msgstr "Japonés" + #: public/views/create.html public/views/join.html msgid "John" msgstr "Juan" @@ -272,7 +363,7 @@ msgstr "Juan" msgid "Join" msgstr "Unirse" -#: public/views/add.html +#: public/views/add.html src/js/routes.js msgid "Join shared wallet" msgstr "Unirse a un monedero" @@ -280,7 +371,7 @@ msgstr "Unirse a un monedero" msgid "Joining Wallet..." msgstr "Uniéndose al Monedero..." -#: public/views/preferences.html +#: public/views/preferences.html src/js/routes.js msgid "Language" msgstr "Idioma" @@ -288,9 +379,9 @@ msgstr "Idioma" msgid "Learn more about Wallet Migration" msgstr "Más detalles para migrar Monedero" -#: public/views/walletHome.html -msgid "Loading..." -msgstr "Cargando..." +#: src/js/routes.js +msgid "Logs" +msgstr "Registros" #: public/views/paymentUri.html msgid "Make a payment to" @@ -332,9 +423,9 @@ msgstr "Mi dirección Bitcoin" msgid "Network" msgstr "Red" -#: public/views/walletHome.html -msgid "No pending spend proposals at the moment." -msgstr "No hay gastos pendientes en este momento." +#: public/views/modals/confirmation.html +msgid "No" +msgstr "No" #: public/views/walletHome.html msgid "No transactions yet" @@ -349,10 +440,6 @@ msgstr "No válido" msgid "Note" msgstr "Nota" -#: public/views/modals/confirmation.html -msgid "OK" -msgstr "LISTO" - #: public/views/modals/tx-status.html msgid "OKAY" msgstr "LISTO" @@ -367,6 +454,10 @@ msgstr "" "La contraseña no se puede recuperar. Asegúrese de escribirla en un lugar " "seguro" +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "Las contraseñas no coinciden" + #: public/views/import.html msgid "Paste backup plain text code" msgstr "Pegar copia de seguridad en texto plano" @@ -375,6 +466,10 @@ msgstr "Pegar copia de seguridad en texto plano" msgid "Paste invitation here" msgstr "Pegar invitación aquí" +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "El protocolo de pagos no está soportado en Chrome" + #: public/views/modals/tx-status.html msgid "Payment Sent" msgstr "Pago Enviado" @@ -402,10 +497,22 @@ msgstr "" msgid "Personal Wallet" msgstr "Monedero Personal" +#: src/js/controllers/create.js src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Por favor ingrese los campos requeridos" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Por favor, selecciona el archivo de copia de seguridad" + #: public/views/walletHome.html msgid "Preferences" msgstr "Preferencias" +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Recibir" + #: public/views/walletHome.html msgid "Received" msgstr "Recibido" @@ -426,6 +533,14 @@ msgstr "Recreando Monedero..." msgid "Reject" msgstr "Rechazar" +#: src/js/controllers/walletHome.js +msgid "Rejecting transaction" +msgstr "Rechazando transacción" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Información de la versión" + #: public/views/modals/txp-details.html msgid "Remove transaction" msgstr "Elimine la transacción" @@ -482,11 +597,12 @@ msgstr "Seleccione las firmas requeridas" msgid "Select total number of copayers" msgstr "Seleccione el total de copayers" -#: public/views/walletHome.html +#: public/views/walletHome.html public/views/includes/transaction.html +#: src/js/controllers/index.js msgid "Send" msgstr "Enviar" -#: public/views/backup.html +#: public/views/backup.html public/views/preferencesLogs.html msgid "Send by email" msgstr "Enviar por correo electrónico" @@ -516,7 +632,7 @@ msgstr "Compartir invitación" #: public/views/copayers.html msgid "Share this invitation with your copayers" -msgstr "Compartir esta invitación con tus compañeros" +msgstr "Comparta esta invitación con sus copayers" #: public/views/walletHome.html msgid "" @@ -538,10 +654,23 @@ msgstr "Firmar" msgid "Signatures" msgstr "Firmas" +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Firmando transacción" + +#: src/js/controllers/index.js +msgid "Spanish" +msgstr "Español" + #: public/views/walletHome.html msgid "Spend proposals" msgstr "Propuestas de gastos" +#: src/js/controllers/copayers.js src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "Listo" + #: public/views/walletHome.html msgid "Tap to retry" msgstr "Toque para reintentar" @@ -550,6 +679,14 @@ msgstr "Toque para reintentar" msgid "The transaction was removed by creator" msgstr "La transacción fue eliminada por el creado" +#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "El monedero \"{{walletName}}\" fue eliminado" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "Hubo un error en el formulario" + #: public/views/backup.html msgid "" "This wallet have its private key encrypted. Exporting a backup will keep the " @@ -588,23 +725,63 @@ msgstr "Transacción" msgid "Transaction accepted..." msgstr "Transacción aceptada..." +#: src/js/services/txStatus.js +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" +#: src/js/controllers/walletHome.js +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" +#: src/js/services/txStatus.js +msgid "Transaction proposal created" +msgstr "Propuesta de transacción creada" + +#: src/js/services/txStatus.js +msgid "Transaction proposal signed" +msgstr "Propuesta de transacción firmada" + #: public/views/modals/txp-details.html msgid "Transaction sent!" msgstr "¡Transacción enviada!" +#: src/js/services/txStatus.js +msgid "Transaction was rejected" +msgstr "Transacción rechazada" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "No se puede enviar propuesta de transacción" + #: public/views/walletHome.html public/views/modals/tx-details.html msgid "Unconfirmed" msgstr "Sin confirmar" -#: public/views/preferences.html +#: public/views/preferences.html src/js/routes.js msgid "Unit" msgstr "Unidad" @@ -624,10 +801,18 @@ msgstr "Actualizando Monedero..." msgid "Use test network" msgstr "Red de prueba" +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "Versión" + #: public/views/backup.html 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" @@ -642,7 +827,7 @@ msgstr "BIENVENIDO A" #: public/views/copayers.html msgid "Waiting for copayers" -msgstr "Esperando a mis copayers" +msgstr "Esperando copayers" #: public/views/copayers.html msgid "Waiting..." @@ -668,6 +853,10 @@ msgstr "Nombre del monedero" msgid "Warning!" msgstr "¡Advertencia!" +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Si" + #: public/views/walletHome.html msgid "You do not have any wallet" msgstr "No tienes ningún monedero" @@ -688,6 +877,10 @@ msgstr "Tu contraseña" msgid "Your profile password" msgstr "Contraseña de tu perfil" +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "Su monedero se ha importado correctamente" + #: public/views/create.html public/views/join.html msgid "advanced options" msgstr "opciones avanzadas" @@ -717,11 +910,28 @@ msgstr "monedero" msgid "{{index.walletName}} settings" msgstr "Opciones de {{index.walletName}}" -#~ msgid "Fetching Payment Information..." -#~ msgstr "Buscando información del pago" +#: src/js/controllers/importLegacy.js +msgid "" +"{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " +"balance" +msgstr "" +"{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el " +"balance actualizado" -#~ msgid "Getting transactions..." -#~ msgstr "Cargando transacciones..." +#~ msgid "OK" +#~ msgstr "LISTO" + +#~ msgid "Copied to clipboard" +#~ msgstr "Copiado al portapapeles" + +#~ msgid "Preparing backup..." +#~ msgstr "Preparando copia de seguridad..." + +#~ msgid "Loading..." +#~ msgstr "Cargando..." + +#~ msgid "No pending spend proposals at the moment." +#~ msgstr "No hay gastos pendientes en este momento." #~ msgid "Joining shared wallet..." #~ msgstr "Unirse a un monedero..." @@ -839,12 +1049,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Are you sure you want to delete this profile?" #~ msgstr "¿Estas seguro de borrar este perfil?" -#~ msgid "Are you sure you want to delete this wallet?" -#~ msgstr "¿Estas seguro de borrar este monedero?" - -#~ msgid "Backup created" -#~ msgstr "Copia de Seguridad creada" - #~ msgid "Backups managed by the server" #~ msgstr "Copias de seguridad gestionada por el servidor" @@ -867,9 +1071,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Copay now needs a profile to access wallets." #~ msgstr "Copay ahora requiere un perfil para acceder a los monederos" -#~ msgid "Copied to clipboard" -#~ msgstr "Copiado al portapapeles" - #~ msgid "" #~ "Could not connect to the Insight server. Check your settings and network " #~ "configuration" @@ -913,9 +1114,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Email not confirmed" #~ msgstr "Correo sin confirmar" -#~ msgid "Encrypted backup file saved" -#~ msgstr "Archivo de copia de seguridad encriptado guardado" - #~ msgid "Enter PIN" #~ msgstr "Ingresar PIN" @@ -940,12 +1138,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Hide them" #~ msgstr "Ocultar" -#~ msgid "History" -#~ msgstr "Historial" - -#~ msgid "Home" -#~ msgstr "Inicio" - #~ msgid "I read and agree with these terms" #~ msgstr "He leído y aceptado estos términos" @@ -1036,9 +1228,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Next" #~ msgstr "Siguiente" -#~ msgid "No" -#~ msgstr "No" - #~ msgid "No email required" #~ msgstr "Correo electrónico no es requerido" @@ -1055,9 +1244,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Page not found" #~ msgstr "Página no encontrada" -#~ msgid "Passwords must match" -#~ msgstr "Las contraseñas deben coincidir" - #~ msgid "Paste wallet secret here" #~ msgstr "Pegar código secreto del monedero aquí" @@ -1086,9 +1272,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgstr "" #~ "Por favor confirma tu correo electrónico usando el enlace de este mensaje" -#~ msgid "Please enter the required fields" -#~ msgstr "Por favor ingrese los campos requeridos" - #~ msgid "" #~ "Please follow the link on it to confirm it. Unconfirmed profiles could be " #~ "deleted from server." @@ -1115,9 +1298,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Please update your wallet at https://copay.io" #~ msgstr "Por favor actualiza tu monedero de https://copay.io" -#~ msgid "Please, select your backup file" -#~ msgstr "Por favor, selecciona el archivo de copia de seguridad" - #~ msgid "Profile" #~ msgstr "Perfil" @@ -1160,9 +1340,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Scaning for transactions" #~ msgstr "Explorando transacciones" -#~ msgid "Session closed" -#~ msgstr "Sesión cerrada" - #~ msgid "Session closed because a long time of inactivity" #~ msgstr "La sesión fue cerrada por mucho tiempo de inactividad" @@ -1199,9 +1376,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Storage" #~ msgstr "Almacenamiento" -#~ msgid "Success" -#~ msgstr "Listo" - #~ msgid "Testnet" #~ msgstr "Testnet" @@ -1288,9 +1462,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "The transaction proposal has been created" #~ msgstr "La propuesta de transacción fue creada" -#~ msgid "The wallet is full" -#~ msgstr "El monedero esta completo" - #~ msgid "There was an error sending the transaction" #~ msgstr "Hubo un error al enviar la transacción" @@ -1328,21 +1499,12 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Transaction Error" #~ msgstr "Error en Transacción" -#~ msgid "Transaction Update" -#~ msgstr "Actualización de una Transacción" - -#~ msgid "Transaction broadcasted" -#~ msgstr "Transacción transmitida" - #~ msgid "Transactions Proposals Purged" #~ msgstr "Propuestas de Transacciones Purgadas" #~ msgid "Type:" #~ msgstr "Tipo:" -#~ msgid "Unable to send transaction proposal" -#~ msgstr "No se puede enviar propuesta de transacción" - #~ msgid "Username" #~ msgstr "Nombre de usuario" @@ -1373,9 +1535,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Wrong password" #~ msgstr "Contraseña incorrecta" -#~ msgid "Yes" -#~ msgstr "Si" - #~ msgid "You can import your current wallets after" #~ msgstr "Puedes importar tus monederos después" @@ -1440,9 +1599,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "seconds" #~ msgstr "segundos" -#~ msgid "transaction proposal purged" -#~ msgstr "propuestas de transacciones purgadas" - #~ msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" #~ msgstr "Crea monedero {{requiredCopayers}}-de-{{totalCopayers}}" @@ -1513,9 +1669,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Open in external application" #~ msgstr "Abrir en una aplicación externa" -#~ msgid "Preparing payment..." -#~ msgstr "Preparando pago..." - #~ msgid "Proposal ID" #~ msgstr "ID de Propuesta" @@ -1589,9 +1742,6 @@ msgstr "Opciones de {{index.walletName}}" #~ msgid "Private Key (Hex)" #~ msgstr "Clave Privada (Hex)" -#~ msgid "There is an error in the form." -#~ msgstr "Hubo un error en el formulario." - #, fuzzy #~ msgid "Wrong password que parece" #~ msgstr "Contraseña incorrecta" diff --git a/po/template.pot b/po/template.pot index fe0c5c91b..65ffc743b 100644 --- a/po/template.pot +++ b/po/template.pot @@ -16,7 +16,16 @@ msgstr "" msgid "* You can safely install your backup on other device and use your wallet from many devices at the same time." msgstr "" +#: src/js/routes.js +msgid "About" +msgstr "" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "" + #: public/views/includes/sidebar.html +#: src/js/routes.js msgid "Add wallet" msgstr "" @@ -25,6 +34,7 @@ msgid "Address" msgstr "" #: public/views/preferences.html +#: src/js/routes.js msgid "Alternative Currency" msgstr "" @@ -42,6 +52,11 @@ msgstr "" msgid "Applying changes" msgstr "" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "" + #: public/views/walletHome.html msgid "Available Balance" msgstr "" @@ -51,9 +66,14 @@ msgid "Back" msgstr "" #: public/views/preferences.html +#: src/js/routes.js msgid "Backup" msgstr "" +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "" + #: public/views/walletHome.html msgid "Backup now" msgstr "" @@ -78,6 +98,10 @@ msgstr "" msgid "Broadcast Transaction" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "" + #: public/views/unsupported.html msgid "Browser unsupported" msgstr "" @@ -92,7 +116,6 @@ msgstr "" #: public/views/copayers.html #: public/views/walletHome.html -#: public/views/modals/confirmation.html msgid "Cancel" msgstr "" @@ -114,9 +137,14 @@ msgid "Close" msgstr "" #: public/views/preferences.html +#: src/js/routes.js msgid "Color" msgstr "" +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "" @@ -137,10 +165,26 @@ msgstr "" msgid "Copy to clipboard" msgstr "" +#: src/js/controllers/create.js +msgid "Could not create wallet:" +msgstr "" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "" + #: public/views/walletHome.html msgid "Could not fetch transaction history" msgstr "" +#: src/js/controllers/join.js +msgid "Could not join wallet:" +msgstr "" + #: public/views/walletHome.html msgid "Could not update Wallet" msgstr "" @@ -151,6 +195,7 @@ msgid "Create" msgstr "" #: public/views/add.html +#: src/js/routes.js msgid "Create new wallet" msgstr "" @@ -167,14 +212,31 @@ msgstr "" msgid "Creating Wallet..." msgstr "" +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "" + #: public/views/modals/tx-details.html msgid "Date" msgstr "" #: public/views/preferences.html +#: src/js/routes.js msgid "Delete" msgstr "" +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Deleting transaction" +msgstr "" + #: public/views/backup.html msgid "Download backup" msgstr "" @@ -187,6 +249,14 @@ msgstr "" msgid "Encrypt Private Key" msgstr "" +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "" + +#: src/js/controllers/index.js +msgid "English" +msgstr "" + #: public/views/includes/password.html msgid "Enter your password" msgstr "" @@ -196,10 +266,22 @@ msgstr "" msgid "Expires" msgstr "" +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "" + #: public/views/create.html msgid "Family vacation funds" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Informantion" +msgstr "" + +#: src/js/controllers/index.js +msgid "French" +msgstr "" + #: public/views/walletHome.html msgid "Generate new address" msgstr "" @@ -213,6 +295,14 @@ msgstr "" msgid "Hide" msgstr "" +#: src/js/controllers/index.js +msgid "History" +msgstr "" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "" + #: public/views/create.html msgid "If not given, a random key will be generated" msgstr "" @@ -237,7 +327,12 @@ msgstr "" msgid "Import from the Cloud?" msgstr "" +#: src/js/routes.js +msgid "Import legacy wallet" +msgstr "" + #: public/views/add.html +#: src/js/routes.js msgid "Import wallet" msgstr "" @@ -250,6 +345,10 @@ msgstr "" msgid "Information" msgstr "" +#: src/js/controllers/index.js +msgid "Japanese" +msgstr "" + #: public/views/create.html #: public/views/join.html msgid "John" @@ -260,6 +359,7 @@ msgid "Join" msgstr "" #: public/views/add.html +#: src/js/routes.js msgid "Join shared wallet" msgstr "" @@ -268,6 +368,7 @@ msgid "Joining Wallet..." msgstr "" #: public/views/preferences.html +#: src/js/routes.js msgid "Language" msgstr "" @@ -275,8 +376,8 @@ msgstr "" msgid "Learn more about Wallet Migration" msgstr "" -#: public/views/walletHome.html -msgid "Loading..." +#: src/js/routes.js +msgid "Logs" msgstr "" #: public/views/paymentUri.html @@ -321,8 +422,8 @@ msgstr "" msgid "Network" msgstr "" -#: public/views/walletHome.html -msgid "No pending spend proposals at the moment." +#: public/views/modals/confirmation.html +msgid "No" msgstr "" #: public/views/walletHome.html @@ -339,10 +440,6 @@ msgstr "" msgid "Note" msgstr "" -#: public/views/modals/confirmation.html -msgid "OK" -msgstr "" - #: public/views/modals/tx-status.html msgid "OKAY" msgstr "" @@ -356,6 +453,10 @@ msgstr "" msgid "Password cannot be recovered. Be sure to write it down" msgstr "" +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "" + #: public/views/import.html msgid "Paste backup plain text code" msgstr "" @@ -364,6 +465,10 @@ msgstr "" msgid "Paste invitation here" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "" + #: public/views/modals/tx-status.html msgid "Payment Sent" msgstr "" @@ -388,10 +493,23 @@ msgstr "" msgid "Personal Wallet" msgstr "" +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "" + #: public/views/walletHome.html msgid "Preferences" msgstr "" +#: src/js/controllers/index.js +msgid "Receive" +msgstr "" + #: public/views/walletHome.html msgid "Received" msgstr "" @@ -412,6 +530,14 @@ msgstr "" msgid "Reject" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Rejecting transaction" +msgstr "" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "" + #: public/views/modals/txp-details.html msgid "Remove transaction" msgstr "" @@ -471,10 +597,13 @@ msgid "Select total number of copayers" msgstr "" #: public/views/walletHome.html +#: public/views/includes/transaction.html +#: src/js/controllers/index.js msgid "Send" msgstr "" #: public/views/backup.html +#: public/views/preferencesLogs.html msgid "Send by email" msgstr "" @@ -524,10 +653,24 @@ msgstr "" msgid "Signatures" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "" + +#: src/js/controllers/index.js +msgid "Spanish" +msgstr "" + #: public/views/walletHome.html msgid "Spend proposals" msgstr "" +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "" + #: public/views/walletHome.html msgid "Tap to retry" msgstr "" @@ -536,6 +679,15 @@ msgstr "" msgid "The transaction was removed by creator" msgstr "" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "" + #: public/views/backup.html msgid "This wallet have its private key encrypted. Exporting a backup will keep the private key encrypted on the backup." msgstr "" @@ -568,24 +720,65 @@ msgstr "" msgid "Transaction accepted..." msgstr "" +#: src/js/services/txStatus.js +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 "" +#: src/js/controllers/walletHome.js +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 "" +#: src/js/services/txStatus.js +msgid "Transaction proposal created" +msgstr "" + +#: src/js/services/txStatus.js +msgid "Transaction proposal signed" +msgstr "" + #: public/views/modals/txp-details.html msgid "Transaction sent!" msgstr "" +#: src/js/services/txStatus.js +msgid "Transaction was rejected" +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "" + #: public/views/walletHome.html #: public/views/modals/tx-details.html msgid "Unconfirmed" msgstr "" #: public/views/preferences.html +#: src/js/routes.js msgid "Unit" msgstr "" @@ -605,10 +798,18 @@ msgstr "" msgid "Use test network" msgstr "" +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "" + #: public/views/backup.html msgid "View backup" msgstr "" +#: public/views/preferencesAbout.html +msgid "View session logs" +msgstr "" + #: public/views/walletHome.html msgid "WARNING: Backup needed" msgstr "" @@ -649,6 +850,10 @@ msgstr "" msgid "Warning!" msgstr "" +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "" + #: public/views/walletHome.html msgid "You do not have any wallet" msgstr "" @@ -671,6 +876,10 @@ msgstr "" msgid "Your profile password" msgstr "" +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "" + #: public/views/create.html #: public/views/join.html msgid "advanced options" @@ -702,3 +911,7 @@ msgstr "" #: public/views/preferences.html msgid "{{index.walletName}} settings" msgstr "" + +#: src/js/controllers/importLegacy.js +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "" diff --git a/public/views/copayers.html b/public/views/copayers.html index 71b421fcf..b713e9930 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -40,7 +40,7 @@

Wallet incomplete and broken

-

Delete it and create a new one

+

Delete it and create a new one

- Send {{tx.amountStr}} + Send {{tx.amountStr}}
diff --git a/public/views/modals/confirmation.html b/public/views/modals/confirmation.html index 717c965d6..a057c7a4e 100644 --- a/public/views/modals/confirmation.html +++ b/public/views/modals/confirmation.html @@ -4,12 +4,12 @@
diff --git a/public/views/preferences.html b/public/views/preferences.html index c027c9531..de96fec3d 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -32,7 +32,7 @@ Language - {{index.defaultLanguageName}} + {{index.defaultLanguageName|translate}} diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 2c525862e..660c8d5cf 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -1,6 +1,6 @@
    -
    +
    Copay

    Release Information

    @@ -16,12 +16,11 @@ Commit hash #{{v.commitHash}} -
    -

     

    +

     

  • View session logs diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index 4a915228c..ead92fad3 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -1,5 +1,5 @@
    -

    Warning!

    +

    Warning!

    {{preferences.error|translate}} @@ -7,7 +7,7 @@

    Permanently delete this wallet. WARNING: this action cannot be reversed.

    -
    diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index 34bf47942..17f5ef7ab 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -3,7 +3,7 @@
    - {{lang.name}} + {{lang.name|translate}}
    diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 5b362f35a..6959b7144 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -2,7 +2,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('backupController', - function($rootScope, $scope, $timeout, backupService, profileService, isMobile, isCordova, notification, go) { + function($rootScope, $scope, $timeout, backupService, profileService, isMobile, isCordova, notification, go, gettext) { this.isSafari = isMobile.Safari(); this.isCordova = isCordova; this.error = null; @@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('backupController', this.downloadWalletBackup = function() { backupService.walletDownload(this.password, function() { $rootScope.$emit('Local/BackupDone'); - notification.success('Backup created', 'Encrypted backup file saved'); + notification.success(gettext('Backup created'), gettext('Encrypted backup file saved')); go.walletHome(); }); }; diff --git a/src/js/controllers/copayers.js b/src/js/controllers/copayers.js index e045453c8..2e2b6296b 100644 --- a/src/js/controllers/copayers.js +++ b/src/js/controllers/copayers.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('copayersController', - function($scope, $rootScope, $timeout, $log, $modal, profileService, go, notification, isCordova) { + function($scope, $rootScope, $timeout, $log, $modal, profileService, go, notification, isCordova, gettext, gettextCatalog) { var self = this; @@ -17,8 +17,8 @@ angular.module('copayApp.controllers').controller('copayersController', }; var _modalDeleteWallet = function() { - var ModalInstanceCtrl = function($scope, $modalInstance) { - $scope.title = 'Are you sure you want to delete this wallet?'; + var ModalInstanceCtrl = function($scope, $modalInstance, gettext) { + $scope.title = gettext('Are you sure you want to delete this wallet?'); $scope.loading = false; $scope.ok = function() { @@ -59,7 +59,7 @@ angular.module('copayApp.controllers').controller('copayersController', } else { go.walletHome(); $timeout(function() { - notification.success('Success', 'The wallet "' + walletName + '" was deleted'); + notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})); }); } }); diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 81b8573b7..35a37d52f 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('createController', - function($scope, $rootScope, $location, $timeout, $log, lodash, go, profileService, configService, isMobile, isCordova) { + function($scope, $rootScope, $location, $timeout, $log, lodash, go, profileService, configService, isMobile, isCordova, gettext) { var self = this; var defaults = configService.getDefaults(); @@ -43,7 +43,7 @@ angular.module('copayApp.controllers').controller('createController', this.create = function(form) { if (form && form.$invalid) { - this.error = 'Please enter the required fields'; + this.error = gettext('Please enter the required fields'); return; } var opts = { @@ -61,7 +61,7 @@ angular.module('copayApp.controllers').controller('createController', self.loading = false; if (err) { $log.debug(err); - self.error = 'Could not create wallet: ' + err; + self.error = gettext('Could not create wallet: ') + err; } else { go.walletHome(); @@ -77,7 +77,7 @@ angular.module('copayApp.controllers').controller('createController', this.hideWalletName = true; } else { - this.hideWalletName = false; + this.hideWalletName = false; } $timeout(function() { $rootScope.$digest(); diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 90ca4d072..05611744d 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -21,7 +21,7 @@ angular.module('copayApp.controllers').controller('importController', try { str2 = sjcl.decrypt(self.password, str); } catch (e) { - self.error = 'Could not decrypt file, check your password'; + self.error = gettext('Could not decrypt file, check your password'); $log.warn(e); return; }; @@ -40,7 +40,7 @@ angular.module('copayApp.controllers').controller('importController', else { $rootScope.$emit('Local/WalletImported', walletId); go.walletHome(); - notification.success('Success', 'Your wallet has been imported correctly'); + notification.success(gettext('Success'), gettext('Your wallet has been imported correctly')); } }); }, 100); @@ -57,7 +57,7 @@ angular.module('copayApp.controllers').controller('importController', this.import = function(form) { if (form.$invalid) { - this.error = 'There is an error in the form'; + this.error = gettext('There is an error in the form'); $scope.$apply(); return; } @@ -67,7 +67,7 @@ angular.module('copayApp.controllers').controller('importController', var password = form.password.$modelValue; if (!backupFile && !backupText) { - this.error = 'Please, select your backup file'; + this.error = gettext('Please, select your backup file'); $scope.$apply(); return; } diff --git a/src/js/controllers/importLegacy.js b/src/js/controllers/importLegacy.js index ebb5c65db..e943000d9 100644 --- a/src/js/controllers/importLegacy.js +++ b/src/js/controllers/importLegacy.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('importLegacyController', - function($rootScope, $scope, $log, $timeout, notification, legacyImportService, profileService, go, lodash, bitcore) { + function($rootScope, $scope, $log, $timeout, notification, legacyImportService, profileService, go, lodash, bitcore, gettext, gettextCatalog) { var self = this; self.messages = []; @@ -50,11 +50,11 @@ angular.module('copayApp.controllers').controller('importLegacyController', legacyImportService.import(username, password, serverURL, fromCloud, function(err, ids, toScanIds) { if (err || !ids || !ids.length) { self.importing = false; - self.error = err || 'Failed to import wallets'; + self.error = err || gettext('Failed to import wallets'); return; } - notification.success( ids.length + ' wallets imported. Funds scanning in progress. Hold on to see updated balance.'); + notification.success( gettextCatalog.getString('{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance', {len: ids.length})); self.scan(toScanIds); }); }, 100); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 944f82cfd..c88afc1bb 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, gettextCatalog, amMoment) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, gettextCatalog, gettext, amMoment) { var self = this; self.isCordova = isCordova; @@ -12,19 +12,19 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; self.menu = [{ - 'title': 'Home', + 'title': gettext('Home'), 'icon': 'icon-home', 'link': 'walletHome' }, { - 'title': 'Receive', + 'title': gettext('Receive'), 'icon': 'icon-receive', 'link': 'receive' }, { - 'title': 'Send', + 'title': gettext('Send'), 'icon': 'icon-paperplane', 'link': 'send' }, { - 'title': 'History', + 'title': gettext('History'), 'icon': 'icon-history', 'link': 'history' }]; @@ -32,16 +32,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.tab = 'walletHome'; self.availableLanguages = [{ - name: 'English', + name: gettext('English'), isoCode: 'en', }, { - name: 'Spanish', + name: gettext('Spanish'), isoCode: 'es', }, { - name: 'Français', + name: gettext('French'), isoCode: 'fr', }, { - name: '日本人', + name: gettext('Japanese'), isoCode: 'ja', }]; diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 9f0b1f9e7..948cfe176 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('joinController', - function($scope, $rootScope, $timeout, go, isMobile, notification, profileService, isCordova, $modal) { + function($scope, $rootScope, $timeout, go, isMobile, notification, profileService, isCordova, $modal, gettext) { var self = this; @@ -140,7 +140,7 @@ angular.module('copayApp.controllers').controller('joinController', this.join = function(form) { if (form && form.$invalid) { - self.error = 'Please enter the required fields'; + self.error = gettext('Please enter the required fields'); return; } self.loading = true; @@ -153,7 +153,7 @@ angular.module('copayApp.controllers').controller('joinController', }, function(err) { if (err) { self.loading = false; - self.error = 'Could not join wallet: ' + (err.message ? err.message : err); + self.error = gettext('Could not join wallet: ') + (err.message ? err.message : err); $rootScope.$apply(); return } diff --git a/src/js/controllers/password.js b/src/js/controllers/password.js index 3f26cab8d..36f4771ca 100644 --- a/src/js/controllers/password.js +++ b/src/js/controllers/password.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('passwordController', - function($rootScope, $scope, $timeout, profileService, notification, go) { + function($rootScope, $scope, $timeout, profileService, notification, go, gettext) { var self = this; @@ -27,7 +27,7 @@ angular.module('copayApp.controllers').controller('passwordController', } if (isSetup) { if (pass1 != self.password) { - self.error = 'Passwords do not match'; + self.error = gettext('Passwords do not match'); self.isVerification = false; self.password = null; pass1 =null; diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 4d25c6f94..b25d966bf 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -1,13 +1,13 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesDeleteWalletController', - function($scope, $rootScope, $filter, $timeout, $modal, notification, profileService, isCordova, go) { + function($scope, $rootScope, $filter, $timeout, $modal, notification, profileService, isCordova, go, gettext) { this.isCordova = isCordova; this.error = null; var _modalDeleteWallet = function() { - var ModalInstanceCtrl = function($scope, $modalInstance) { - $scope.title = 'Are you sure you want to delete this wallet?'; + var ModalInstanceCtrl = function($scope, $modalInstance, gettext) { + $scope.title = gettext('Are you sure you want to delete this wallet?'); $scope.loading = false; $scope.ok = function() { @@ -47,7 +47,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro } else { go.walletHome(); $timeout(function() { - notification.success('Success', 'The wallet "' + walletName + '" was deleted'); + notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})); }); } }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index fce0a4332..d3e3aae4c 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog) { var self = this; $rootScope.hideMenuBar = false; @@ -176,7 +176,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return; }; - self.setOngoingProcess('Signing transaction'); + self.setOngoingProcess(gettext('Signing transaction')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -185,19 +185,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); if (err) { $scope.loading = false; - $scope.error = err.message || 'Transaction not signed. Please try again.'; + $scope.error = err.message || gettext('Transaction not signed. Please try again.'); $scope.$digest(); } else { //if txp has required signatures then broadcast it var txpHasRequiredSignatures = txpsi.status == 'accepted'; if (txpHasRequiredSignatures) { - self.setOngoingProcess('Broadcasting transaction'); + self.setOngoingProcess(gettext('Broadcasting transaction')); $scope.loading = true; fc.broadcastTxProposal(txpsi, function(err, txpsb) { self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = 'Transaction not broadcasted. Please try again.'; + $scope.error = gettext('Transaction not broadcasted. Please try again.'); $scope.$digest(); } else { $modalInstance.close(txpsb); @@ -213,7 +213,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; $scope.reject = function(txp) { - self.setOngoingProcess('Rejecting transaction'); + self.setOngoingProcess(gettext('Rejecting transaction')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -221,7 +221,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = err.message || 'Transaction not rejected. Please try again.'; + $scope.error = err.message || gettext('Transaction not rejected. Please try again.'); $scope.$digest(); } else { $modalInstance.close(txpr); @@ -232,7 +232,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.remove = function(txp) { - self.setOngoingProcess('Deleting transaction'); + self.setOngoingProcess(gettext('Deleting transaction')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -242,7 +242,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi // Hacky: request tries to parse an empty response if (err && !(err.message && err.message.match(/Unexpected/))) { - $scope.error = err.message || 'Transaction could not be deleted. Please try again.'; + $scope.error = err.message || gettext('Transaction could not be deleted. Please try again.'); $scope.$digest(); return; } @@ -252,7 +252,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; $scope.broadcast = function(txp) { - self.setOngoingProcess('Broadcasting transaction'); + self.setOngoingProcess(gettext('Broadcasting transaction')); $scope.loading = true; $scope.error = null; $timeout(function() { @@ -260,7 +260,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = err.message || 'Transaction not sent. Please try again.'; + $scope.error = err.message || gettext('Transaction not sent. Please try again.'); $scope.$digest(); } else { $modalInstance.close(txpb); @@ -515,7 +515,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var form = $scope.sendForm; if (form.$invalid) { - this.error = 'Unable to send transaction proposal'; + this.error = gettext('Unable to send transaction proposal'); return; } @@ -527,7 +527,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return; }; - self.setOngoingProcess('Creating transaction'); + self.setOngoingProcess(gettext('Creating transaction')); $timeout(function() { var comment = form.comment.$modelValue; var paypro = self._paypro; @@ -563,7 +563,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.signAndBroadcast = function(txp, cb) { var fc = profileService.focusedClient; - self.setOngoingProcess('Signing transaction'); + self.setOngoingProcess(gettext('Signing transaction')); fc.signTxProposal(txp, function(err, signedTx) { profileService.lockFC(); @@ -573,11 +573,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } if (signedTx.status == 'accepted') { - self.setOngoingProcess('Broadcasting transaction'); + self.setOngoingProcess(gettext('Broadcasting transaction')); fc.broadcastTxProposal(signedTx, function(err, btx) { self.setOngoingProcess(); if (err) { - $scope.error = 'Transaction not broadcasted. Please try again.'; + $scope.error = gettext('Transaction not broadcasted. Please try again.'); $scope.$digest(); return cb(err); } @@ -677,13 +677,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.setFromPayPro = function(uri) { var fc = profileService.focusedClient; if (isChromeApp) { - this.error = 'Payment Protocol not supported on Chrome App'; + this.error = gettext('Payment Protocol not supported on Chrome App'); return; } var satToUnit = 1 / this.unitToSatoshi; var self = this; - self.setOngoingProcess('Fetching Payment Informantion'); + self.setOngoingProcess(gettext('Fetching Payment Informantion')); $log.debug('Fetch PayPro Request...', uri); $timeout(function() { @@ -697,7 +697,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.resetForm(); var msg = err.toString(); if (msg.match('HTTP')) { - msg = 'Could not fetch payment information'; + msg = gettext('Could not fetch payment information'); } self.error = msg; } else { diff --git a/src/js/routes.js b/src/js/routes.js index 42d2a19e1..c3e0ecc53 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -145,8 +145,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Join shared wallet'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Join shared wallet'); $scope.goBackToState = 'add'; $scope.noColor = true; } @@ -162,8 +162,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Import wallet'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Import wallet'); $scope.goBackToState = 'add'; $scope.noColor = true; } @@ -184,8 +184,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Import legacy wallet'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Import legacy wallet'); $scope.goBackToState = 'add'; $scope.noColor = true; } @@ -203,8 +203,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Create new wallet'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Create new wallet'); $scope.goBackToState = 'add'; $scope.noColor = true; } @@ -251,8 +251,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Language'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Language'); $scope.goBackToState = 'preferences'; $scope.noColor = true; } @@ -270,8 +270,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Unit'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Unit'); $scope.goBackToState = 'preferences'; $scope.noColor = true; } @@ -289,8 +289,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Color'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Color'); $scope.goBackToState = 'preferences'; } } @@ -308,8 +308,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Alternative Currency'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Alternative Currency'); $scope.goBackToState = 'preferences'; $scope.noColor = true; } @@ -346,8 +346,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Delete'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Delete'); $scope.goBackToState = 'preferences'; } } @@ -364,8 +364,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'About'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('About'); $scope.goBackToState = 'preferences'; $scope.noColor = true; } @@ -383,8 +383,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Logs'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Logs'); $scope.goBackToState = 'about'; $scope.noColor = true; } @@ -402,8 +402,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Backup'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Backup'); $scope.goBackToState = 'preferences'; } } @@ -431,8 +431,8 @@ angular }, 'topbar': { templateUrl: 'views/includes/topbar.html', - controller: function($scope) { - $scope.titleSection = 'Add wallet'; + controller: function($scope, gettext) { + $scope.titleSection = gettext('Add wallet'); $scope.closeToHome = true; $scope.noColor = true; } diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js index 3e76a8933..b062b0c97 100644 --- a/src/js/services/txStatus.js +++ b/src/js/services/txStatus.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout) { +angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout, gettext) { var root = {}; root.notify = function(txp, cb) { @@ -10,17 +10,17 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, var status = txp.status; if (status == 'broadcasted') { - msg = 'Transaction broadcasted'; + msg = gettext('Transaction broadcasted'); } else { var action = lodash.find(txp.actions, { copayerId: fc.credentials.copayerId }); if (!action) { - msg = 'Transaction proposal created'; + msg = gettext('Transaction proposal created'); } else if (action.type == 'accept') { - msg = 'Transaction proposal signed'; + msg = gettext('Transaction proposal signed'); } else if (action.type == 'reject') { - msg = 'Transaction was rejected'; + msg = gettext('Transaction was rejected'); } }