Skip to content

Commit 7f93116

Browse files
committed
Fix translates. Fix ui
1 parent 5b73bb7 commit 7f93116

File tree

3 files changed

+99
-55
lines changed

3 files changed

+99
-55
lines changed

po/es.po

Lines changed: 51 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ msgstr "Importe en"
6868
msgid "Are you sure to delete this wallet from this computer?"
6969
msgstr "¿Estas seguro de borrar este monedero de tu computadora?"
7070

71-
#: views/join.html views/open.html
71+
#: views/join.html
7272
msgid "Authenticating and looking for peers..."
7373
msgstr "Autenticando y buscando compañeros..."
7474

@@ -109,6 +109,10 @@ msgstr "Navegador no soportado"
109109
msgid "Cancel"
110110
msgstr "Cancelar"
111111

112+
#: views/send.html
113+
msgid "Certificate:"
114+
msgstr "Certificado:"
115+
112116
#: views/import.html
113117
msgid "Choose backup file from your computer"
114118
msgstr "Seleccione el archivo backup de su computadora"
@@ -125,6 +129,10 @@ msgstr "Cerrar"
125129
msgid "Confirmations"
126130
msgstr "Confirmaciones"
127131

132+
#: views/open.html
133+
msgid "Connecting..."
134+
msgstr "Conectando..."
135+
128136
#: views/warning.html
129137
msgid "Continue anyways"
130138
msgstr "Continuar de todas maneras"
@@ -201,12 +209,12 @@ msgstr "Fondos para vacaciones en familia"
201209
msgid "Fee"
202210
msgstr "Tasa"
203211

204-
#: views/join.html
212+
#: views/join.html views/send.html
205213
msgid "Get QR code"
206214
msgstr "Obtener código QR"
207215

208-
#: views/create.html views/import.html views/join.html views/more.html
209-
#: views/transactions.html
216+
#: views/copayers.html views/create.html views/import.html views/join.html
217+
#: views/more.html views/transactions.html
210218
msgid "Hide"
211219
msgstr "Ocultar"
212220

@@ -296,10 +304,18 @@ msgstr "Master Private Key"
296304
msgid "Me"
297305
msgstr "Yo"
298306

307+
#: views/send.html
308+
msgid "Merchant Data:"
309+
msgstr "Negocio:"
310+
299311
#: views/create.html
300312
msgid "Name"
301313
msgstr "Nombre"
302314

315+
#: index.html
316+
msgid "Network Error. Attempting to reconnect..."
317+
msgstr "Error de Red. Intentando reconectar..."
318+
303319
#: views/settings.html
304320
msgid ""
305321
"Network has been fixed to <strong>{{networkName}}</strong> in this setup. "
@@ -326,13 +342,13 @@ msgstr "Sin propuestas de transacciones aún."
326342
msgid "No transactions yet."
327343
msgstr "Aún no hay transacciones."
328344

329-
#: views/send.html views/modals/address-book.html
345+
#: views/modals/address-book.html
330346
msgid "Not valid"
331347
msgstr "No válido"
332348

333349
#: views/send.html
334-
msgid "Notes"
335-
msgstr "Notas"
350+
msgid "Note"
351+
msgstr "Nota"
336352

337353
#: views/copayers.html
338354
msgid "One person has"
@@ -377,6 +393,10 @@ msgstr "Contraseña"
377393
msgid "Paste wallet secret here"
378394
msgstr "Pegar código secreto del monedero aquí"
379395

396+
#: views/send.html
397+
msgid "Payment Expiration:"
398+
msgstr "Vencimiento de Pago:"
399+
380400
#: views/more.html
381401
msgid ""
382402
"Pending Transactions Proposals will be discarted. This need to be done on "
@@ -465,10 +485,6 @@ msgstr "Seleccione las firmas requeridas (*)"
465485
msgid "Select total number of copayers (*)"
466486
msgstr "Seleccione el total de compañeros (*)"
467487

468-
#: views/send.html
469-
msgid "Send"
470-
msgstr "Enviar"
471-
472488
#: views/send.html
473489
msgid "Send Proposals"
474490
msgstr "Enviar Propuestas"
@@ -485,6 +501,10 @@ msgstr "Enviar a"
485501
msgid "Sent"
486502
msgstr "Enviado"
487503

504+
#: views/send.html
505+
msgid "Server Says:"
506+
msgstr "Mensaje del Servidor:"
507+
488508
#: views/home.html views/more.html
489509
msgid "Settings"
490510
msgstr "Configuración"
@@ -493,8 +513,8 @@ msgstr "Configuración"
493513
msgid "Share this secret with your other copayers"
494514
msgstr "Compartir el código secreto con tus otros compañeros"
495515

496-
#: views/create.html views/import.html views/join.html views/more.html
497-
#: views/transactions.html
516+
#: views/copayers.html views/create.html views/import.html views/join.html
517+
#: views/more.html views/transactions.html
498518
msgid "Show"
499519
msgstr "Mostrar"
500520

@@ -510,6 +530,14 @@ msgstr "Ver menos"
510530
msgid "Sign"
511531
msgstr "Firmar"
512532

533+
#: views/import.html
534+
msgid "Skip public keys from peers"
535+
msgstr "Ignorar claves pública de los compañeros"
536+
537+
#: views/import.html
538+
msgid "Skip transaction proposals from Backup"
539+
msgstr "Ignorar propuestas de transacciones desde la Copia de Seguridad"
540+
513541
#: views/import.html
514542
msgid "Skipping fields: {{skipFields}}"
515543
msgstr "Saltear campos: {{skipFields}}"
@@ -538,6 +566,10 @@ msgstr "Dirección"
538566
msgid "Total"
539567
msgstr "Total"
540568

569+
#: views/send.html
570+
msgid "Total amount for this transaction:"
571+
msgstr "Cantidad total de esta transacción:"
572+
541573
#: views/includes/transaction.html
542574
msgid "Transaction ID"
543575
msgstr "ID Transacción"
@@ -562,7 +594,7 @@ msgstr "Todos los fondos"
562594
msgid "User information"
563595
msgstr "Información de Usuario"
564596

565-
#: views/send.html views/modals/address-book.html
597+
#: views/modals/address-book.html
566598
msgid "Valid"
567599
msgstr "Válido"
568600

@@ -630,7 +662,8 @@ msgstr "Tu contraseña"
630662
msgid "Your wallet password"
631663
msgstr "Contraseña de tu monedero"
632664

633-
#: views/create.html views/import.html views/join.html views/more.html
665+
#: views/copayers.html views/create.html views/import.html views/join.html
666+
#: views/more.html
634667
msgid "advanced options"
635668
msgstr "opciones avanzadas"
636669

@@ -686,6 +719,9 @@ msgstr "deben unirse"
686719
msgid "{{tx.missingSignatures}} signatures missing"
687720
msgstr "Faltan {{tx.missingSignatures}} firmas"
688721

722+
#~ msgid "Send"
723+
#~ msgstr "Enviar"
724+
689725
#~ msgid ""
690726
#~ "{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet"
691727
#~ msgstr "Monedero {{requiredCopayers}}-de-{{totalCopayers}}"

views/import.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,15 @@ <h1 class="text-white line-sidebar-b">{{title|translate}}</h1>
3333

3434
<div ng-hide="hideAdv">
3535
<label>
36-
<input translate type="checkbox" class="form-control" name="skipPublicKeyRing" ng-model="skipPublicKeyRing">Skip public keys from peers
36+
<input type="checkbox" class="form-control"
37+
name="skipPublicKeyRing" ng-model="skipPublicKeyRing">
38+
<span translate>Skip public keys from peers</span>
3739
</label>
3840

3941
<label>
40-
<input translate type="checkbox" class="form-control" name="skipTxProposals" ng-model="skipTxProposals">Skip transaction proposals from Backup
42+
<input type="checkbox" class="form-control"
43+
name="skipTxProposals" ng-model="skipTxProposals">
44+
<span translate>Skip transaction proposals from Backup</span>
4145
</label>
4246
</div>
4347

views/send.html

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ <h1 translate ng-show="txs.length != 0">Send Proposals</h1>
88
<div ng-show="txs.length != 0" class="large-12 line-dashed" style="padding: 0;"></div>
99

1010
<h1>{{title|translate}}</h1>
11-
<div class="large-6 columns">
11+
<div class="row collapse m0">
12+
<div class="large-7 columns">
1213
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
13-
<div class="row">
14+
<div class="row collapse">
1415
<div class="large-12 columns">
1516
<div class="row collapse">
16-
<label for="address">To address
17-
<small ng-hide="!sendForm.address.$pristine || address">required</small>
18-
<small class="is-valid" ng-show="!sendForm.address.$invalid && address">valid!</small>
19-
<small class="has-error" ng-show="sendForm.address.$invalid && address">
20-
not valid</small>
17+
<label for="address"><span translate>To address</span>
18+
<small translate ng-hide="!sendForm.address.$pristine || address">required</small>
19+
<small translate class="is-valid" ng-show="!sendForm.address.$invalid && address">valid!</small>
20+
<small translate class="has-error" ng-show="sendForm.address.$invalid && address">not valid</small>
2121
</label>
2222
<div class="small-10 columns">
2323
<input type="text" id="address" name="address" ng-disabled="loading || !!$root.merchant"
24-
placeholder="Send to" ng-model="address" ng-change="onChanged()" valid-address required>
24+
placeholder="{{'Send to'|translate}}" ng-model="address" ng-change="onChanged()" valid-address required>
2525
<small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
2626
<small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small>
2727
</div>
28-
<div class="small-2 columns" ng-hide="showScanner">
28+
<div class="small-2 columns" ng-hide="showScanner || disableScanner">
2929
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera"></i></a>
3030
</div>
3131
<div class="small-2 columns" ng-show="showScanner">
32-
<a class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
32+
<a translate class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
3333
</div>
3434
</div>
3535
<div id="scanner" class="row" ng-if="showScanner">
@@ -39,7 +39,7 @@ <h1>{{title|translate}}</h1>
3939
<div id="file-input-wrapper" class="btn btn-primary">
4040
<span class="pull-left text-centered">
4141
<i class="glyphicon glyphicon-refresh icon-rotate"></i>
42-
Get QR code
42+
<span translate>Get QR code</span>
4343
</span>
4444
<input id="qrcode-camera" type="file" capture="camera" accept="image/*">
4545
</div>
@@ -52,30 +52,33 @@ <h1>{{title|translate}}</h1>
5252
</div>
5353
</div>
5454

55-
<div class="row">
56-
<div class="large-6 medium-6 columns">
55+
<div class="row collapse">
56+
<div class="large-5 medium-5 columns">
5757
<div class="row collapse">
58-
<label for="amount">Amount
59-
<small ng-hide="!sendForm.amount.$pristine">required</small>
60-
<small class="is-valid" ng-show="!sendForm.amount.$invalid && !sendForm.amount.$pristine">Valid</small>
61-
<small class="has-error" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount">
62-
Not valid
58+
<label for="amount"><span translate>Amount</span>
59+
<small translate ng-hide="!sendForm.amount.$pristine">required</small>
60+
<small translate class="is-valid"
61+
ng-show="!sendForm.amount.$invalid &&
62+
!sendForm.amount.$pristine">valid!</small>
63+
<small translate class="has-error"
64+
ng-show="sendForm.amount.$invalid &&
65+
!sendForm.amount.$pristine && !notEnoughAmount">not valid
6366
</small>
64-
<small ng-show="notEnoughAmount" class="has-error">Insufficient funds</small>
67+
<small translate ng-show="notEnoughAmount" class="has-error">Insufficient funds</small>
6568
</label>
6669
<div class="small-9 columns">
6770
<input type="number" id="amount"
6871
ng-disabled="loading || ($root.merchant && +$root.merchant.total > 0) || $root.merchantError"
69-
name="amount" placeholder="Amount" ng-model="amount"
72+
name="amount" placeholder="{{'Amount'|translate}}" ng-model="amount"
7073
min="{{minAmount}}" max="10000000000" enough-amount required
7174
autocomplete="off"
7275
>
7376
<small class="icon-input" ng-show="!sendForm.amount.$invalid && amount"><i class="fi-check"></i></small>
7477
<small class="icon-input" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount"><i class="fi-x"></i></small>
75-
<a class="small input-note" title="Send all funds"
78+
<a class="small input-note" title="{{'Send all funds'|translate}}"
7679
ng-show="$root.availableBalance > 0 && (!$root.merchant || +$root.merchant.total === 0)"
7780
ng-click="topAmount(sendForm)">
78-
Use all funds ({{getAvailableAmount()}} {{$root.unitName}})
81+
<span translate>Use all funds</span> ({{getAvailableAmount()}} {{$root.unitName}})
7982
</a>
8083
</div>
8184
<div class="small-3 columns">
@@ -85,11 +88,11 @@ <h1>{{title|translate}}</h1>
8588
</div>
8689
<div class="large-6 medium-6 columns">
8790
<div class="row collapse">
88-
<label for="alternative">Amount in {{ alternativeName }} </label>
91+
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }} </label>
8992
<div class="small-9 columns">
9093
<input type="number" id="alternative_amount"
9194
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0) || $root.merchantError"
92-
name="alternative" placeholder="Amount" ng-model="alternative"
95+
name="alternative" placeholder="{{'Amount'|translate}}" ng-model="alternative"
9396
required
9497
autocomplete="off"
9598
>
@@ -101,22 +104,22 @@ <h1>{{title|translate}}</h1>
101104
</div>
102105
</div>
103106

104-
<div class="row" ng-show="wallet.isShared()">
107+
<div class="row collapse" ng-show="wallet.isShared()">
105108
<div class="large-12 columns">
106109
<div class="row collapse">
107-
<label for="comment">Note
108-
<small ng-hide="!sendForm.comment.$pristine">optional</small>
109-
<small class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
110+
<label for="comment"><span translate>Note</span>
111+
<small translate ng-hide="!sendForm.comment.$pristine">optional</small>
112+
<small translate class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
110113
</label>
111114
<div class="large-12 columns">
112115
<textarea id="comment" ng-disabled="loading"
113-
name="comment" placeholder="Leave a private message to your copayers" ng-model="commentText" ng-maxlength="100"></textarea>
116+
name="comment" placeholder="{{'Leave a private message to your copayers'|translate}}" ng-model="commentText" ng-maxlength="100"></textarea>
114117
</div>
115118
</div>
116119
</div>
117120
</div>
118121

119-
<div class="row">
122+
<div class="row collapse">
120123
<div class="large-5 medium-3 small-4 columns">
121124
<button type="submit" class="button primary expand text-center" ng-disabled="sendForm.$invalid || loading">
122125
Send
@@ -125,15 +128,16 @@ <h1>{{title|translate}}</h1>
125128
</div>
126129
</form>
127130
</div>
131+
</div><!-- end of row -->
128132

129133
<div class="large-6 columns show-for-large-up" ng-show="!!$root.merchant">
130134
<div class="send-note">
131-
<h6>Send to</h6>
135+
<h6 translate>Send to</h6>
132136
<p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}"
133137
title="{{$root.merchant.request_url}}">
134138
{{$root.merchant.domain}}&nbsp;
135139
</p>
136-
<h6>Total amount for this transaction:</h6>
140+
<h6 translate>Total amount for this transaction:</h6>
137141
<p class="text-gray" ng-class="{'hidden': sendForm.amount.$invalid || !amount > 0}">
138142
<b>{{amount + defaultFee |noFractionNumber}}</b> {{$root.unitName}}
139143
<small ng-if="isRateAvailable">
@@ -145,24 +149,24 @@ <h6>Total amount for this transaction:</h6>
145149
</small>
146150
</p>
147151
<div ng-show="wallet.isShared()">
148-
<h6>Note</h6>
152+
<h6 translate>Note</h6>
149153
<p ng-class="{'hidden': !commentText}">{{commentText}}</p>
150154
</div>
151155
<div ng-show="!!$root.merchant">
152-
<h6>Merchant Data:</h6>
156+
<h6 translate>Merchant Data:</h6>
153157
<p class="text-gray">
154158
Note: This is a payment protocol transaction.
155159
</p>
156-
<h6>Server Says:</h6>
160+
<h6 translate>Server Says:</h6>
157161
<p class="text-gray">
158162
{{$root.merchant.pr.pd.memo}}
159163
</p>
160-
<h6>Certificate:</h6>
164+
<h6 translate>Certificate:</h6>
161165
<p class="text-gray">
162166
<span ng-show="!!$root.merchant.pr.ca">{{$root.merchant.pr.ca}}</span>
163167
<span ng-show="!$root.merchant.pr.ca" style="color:red;weight:bold;">Untrusted</span>
164168
</p>
165-
<h6>Payment Expiration:</h6>
169+
<h6 translate>Payment Expiration:</h6>
166170
<p class="text-gray">
167171
{{$root.merchant.expiration}}
168172
</p>
@@ -172,7 +176,7 @@ <h6>Payment Expiration:</h6>
172176

173177
<div class="large-12 columns line-dashed">
174178
<h2 translate>Address Book</h2>
175-
<p translate class="text-gray" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
179+
<p translate class="text-gray m15b" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
176180
<table class="large-12 medium-12 small-12" ng-show="showAddressBook()">
177181
<thead>
178182
<tr>

0 commit comments

Comments
 (0)