anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1401 from cmgustavo/bug/01-typos-translate

Browse source 
Translation support for alerts/confirms/prompts
This commit is contained in:
Matias Alejo Garcia 2014-09-22 09:33:04 -03:00
commit 133369dd18
21 changed files with 397 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

8
views/create.html
View file

@ -24,8 +24,8 @@
<input id="Name" type="text" placeholder="{{'Name'|translate}}" class="form-control" ng-model="$parent.myNickname">
</div>
<div>
<label for="walletPassword">
<span translate>Your Password</span>
<label translate for="walletPassword">
Your password
</label>
<input id="walletPassword" type="password" placeholder="{{'Choose a password'|translate}}" class="form-control" ng-model="$parent.walletPassword" name="walletPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength:
<i>{{passwordStrength}}</i><br/><span
@ -42,7 +42,7 @@
<div class="text-left line-sidebar-t">
<input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-click="changeNetwork()" ng-checked="networkName == 'testnet' ? true : false">
<label for="network-name">Use test network</label>
<label for="network-name" translate>Use test network</label>
</div>
</div>
@ -53,7 +53,7 @@
</a>
<div ng-hide="hideAdv">
<p>
<input type="text" placeholder="{{'Private Key (Hex)'|translate}}" name="private" ng-model="private">
<input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="private">
</div>
</div>

63
views/dummy-translations.html
View file

@ -1,3 +1,60 @@
<span translate>Receive</span>
<span translate>History</span>
{{'Receive'|translate}}
{{'History'|translate}}
{{'Wrong password'|translate}}
{{'Copied to clipboard'|translate}}
{{'Please enter the required fields'|translate}}
{{'Import a backup'|translate}}
{{'Importing wallet - Reading backup...'|translate}}
{{'Importing wallet - Setting things up...'|translate}}
{{'Importing wallet - We are almost there...'|translate}}
{{'Error updating indexes:'|translate}}
{{'Please, select your backup file'|translate}}
{{'Please enter the required fields'|translate}}
{{'Fatal error connecting to Insight server'|translate}}
{{'The wallet is full'|translate}}
{{'Wallet network configuration missmatch'|translate}}
{{'The secret string you entered is invalid'|translate}}
{{'Transactions Proposals Purged'|translate}}
{{'transaction proposal purged'|translate}}
{{'Updating balance'|translate}}
{{'Scaning for transactions'|translate}}
{{'Using derived addresses from your wallet'|translate}}
{{'Finished'|translate}}
{{'The balance is updated using the derived addresses'|translate}}
{{'Login Required'|translate}}
{{'Please open wallet to complete payment'|translate}}
{{'Send'|translate}}
{{'Unable to send transaction proposal'|translate}}
{{'The transaction proposal has been created'|translate}}
{{'Form Error'|translate}}
{{'Please complete required fields'|translate}}
{{'Success'|translate}}
{{'New entry has been created'|translate}}
{{'There was an error sending the transaction'|translate}}
{{'Transaction rejected'|translate}}
{{'You rejected the transaction successfully'|translate}}
{{'There was an error signing the transaction'|translate}}
{{'Session will be closed'|translate}}
{{'Your session is about to expire due to inactivity in'|translate}}
{{'seconds'|translate}}
{{'Session closed'|translate}}
{{'Session closed because a long time of inactivity'|translate}}
{{'available.'|translate}}
{{'It\'s important that you update your wallet at https://copay.io'|translate}}
{{'Please update your wallet at https://copay.io'|translate}}
{{'Backup created'|translate}}
{{'Encrypted backup file saved'|translate}}
{{'Networking Error'|translate}}
{{'Could not connect to the Insight server. Check your settings and network configuration'|translate}}
{{'Received corrupt message from '|translate}}
{{'Transaction Update'|translate}}
{{'A transaction was signed by'|translate}}
{{'A transaction was rejected by'|translate}}
{{'Transaction Error'|translate}}
{{'Received corrupt transaction from'|translate}}
{{'New Transaction'|translate}}
{{'You have a pending transaction proposal'|translate}}
{{'You have'|translate}}
{{'pending transaction proposals'|translate}}
{{'Funds received!'|translate}}
{{'Transaction broadcasted'|translate}}

2
views/import.html
View file

@ -1,7 +1,7 @@
<div class="import" ng-controller="ImportController">
<div data-alert class="loading-screen" ng-show="loading">
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
{{ importStatus }}
{{ importStatus|translate }}
</div>
<div class="row" ng-init="choosefile=0; pastetext=0" ng-show="!loading">

7
views/includes/copayer.html
View file

@ -10,12 +10,11 @@
class="ellipsis"
tooltip="ID: {{copayer.peerId}}"
tooltip-placement="bottom">
<small class="text-gray" ng-show="copayer.index == 0"><i class="fi-check m5r"></i><span translate>Me</span></small>
<small class="text-gray" ng-show="copayer.index == 0">
<i class="fi-check m5r"></i>{{'Me'|translate}}</small>
<small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
</div>
<div translate class="success label m10t" ng-show="isBackupReady(copayer)">
Ready
</div>
<div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
</div>
</div>

4
views/includes/peer-list.html
View file

@ -15,9 +15,7 @@
width="30">
<div class="ellipsis" tooltip-placement="top" tooltip="{{copayer.nick}}">
<small class="text-gray" ng-show="copayer.index == 0">
<span translate>Me</span>
</small>
<small class="text-gray" ng-show="copayer.index == 0">{{'Me'|translate}}</small>
<small class="text-gray" ng-show="copayer.index > 0">{{copayer.nick}}</small>
</div>
</div>

6
views/includes/sidebar-mobile.html
View file

@ -15,7 +15,7 @@
<span class="size-12 right">{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}</span>
</p>
<div class="line-sidebar-t">
<span translate>Balance</span>
{{'Balance'|translate}}
<span class="gray small side-bar right" title="Manual Refresh"><i class="size-16 fi-refresh"></i></span>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
@ -25,7 +25,7 @@
</span>
</div>
<div class="m10t" ng-show="lockedBalance">
<span translate>Locked</span>
{{'Locked'|translate}}
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
@ -43,7 +43,7 @@
</li>
<li>
<a href="#" class="db p20h" title="Close"
ng-click="signout()"><i class="size-24 m20r fi-power"></i> <span translate>Close</span></a>
ng-click="signout()"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</a>
</li>
</ul>

8
views/includes/sidebar.html
View file

@ -11,12 +11,12 @@
<a href="#!/receive" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
<span>{{$root.wallet.getName()}}</span>
</a>
<a class="button gray small side-bar right" title="Manual Refresh"
<a class="button gray small side-bar right" title="{{'Manual Update'|translate}}"
ng-disabled="$root.loading"
ng-click="refresh()"><i class="size-16 fi-refresh"></i></a>
</div>
<div class="founds size-14 m10v">
<span translate>Balance</span>
{{'Balance'|translate}}
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
@ -29,7 +29,7 @@
tooltip-placement="bottom">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}
</span>
<div class="m10t" ng-show="lockedBalance">
<span translate>Locked</span> &nbsp;
{{'Locked'|translate}} &nbsp;
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
@ -56,7 +56,7 @@
</li>
<li>
<a href="#!/" class="db p20h" title="Close"
ng-click="signout()"><i class="size-21 m20r fi-power"></i> <span translate>Close</span></a>
ng-click="signout()"><i class="size-21 m20r fi-power"></i> {{'Close'|translate}}</a>
</li>
</ul>

2
views/includes/version.html
View file

@ -1,5 +1,5 @@
<div ng-controller="VersionController">
<small>v{{version}} ({{defaultLanguage}})</small>
<small>v{{version}}</small>
<small>#{{commitHash}}</small>
<small ng-if="networkName ==='testnet' || networkName ==='livenet'">[ {{networkName}} ]</small>
</div>

11
views/modals/address-book.html
View file

@ -1,22 +1,21 @@
<h2 translate>Add Address Book Entry</h2>
<h2 translate>Address Book</h2>
<form name="addressBookForm" ng-submit="submitAddressBook(addressBookForm)" novalidate>
<label for="newaddress"><span translate>Address</span>
<small translate ng-hide="!addressBookForm.newaddress.$pristine || newaddress">required</small>
<small translate ng-hide="!addressBookForm.newaddress.$pristine || newaddress">Required</small>
<small translate class="is-valid" ng-show="!addressBookForm.newaddress.$invalid && newaddress">Valid</small>
<small translate class="has-error" ng-show="addressBookForm.newaddress.$invalid && newaddress">
Not valid</small>
<small translate class="has-error" ng-show="addressBookForm.newaddress.$invalid && newaddress">Not valid</small>
<input type="text" id="newaddress" name="newaddress" ng-disabled="loading"
placeholder="{{'Address'|translate}}" ng-model="newaddress" valid-address required>
</label>
<label for="newlabel"><span translate>Label</span>
<small translate ng-hide="!addressBookForm.newlabel.$pristine || newlabel">required</small>
<small translate ng-hide="!addressBookForm.newlabel.$pristine || newlabel">Required</small>
<input type="text" id="newlabel" name="newlabel" ng-disabled="loading"
placeholder="{{'Label'|translate}}" ng-model="newlabel" required>
</label>
<a translate class="button warning small default" ng-click="cancel()">Cancel</a>
<input type="submit" class="button small primary right"
ng-disabled="addressBookForm.$invalid || loading"
value="{{'Add Address'|translate}}">
value="{{'Add'|translate}}">
</form>
<a class="close-reveal-modal" ng-click="cancel()">&#215;</a>

6
views/more.html
View file

@ -33,7 +33,7 @@
<h3><i class="fi-minus-circle m10r"></i> <span translate> Delete Wallet </span></h3>
<p translate class="large-8 columns text-gray">If all funds have been removed from your wallet and you do not wish to have the wallet data stored on your computer anymore, you can delete your wallet.</p>
<div class="large-4 columns">
<a translate class="button warning expand" ng-really-message="'Are you sure to delete this wallet from this computer?'|translate" ng-really-click="deleteWallet()"> Delete</a>
<a translate class="button warning expand" ng-really-message="{{'Are you sure to delete this wallet from this computer?'|translate}}" ng-really-click="deleteWallet()"> Delete</a>
</div>
</div>
<p>
@ -73,7 +73,7 @@
<div class="oh large-12 columns panel">
<h3><i class="fi-minus-circle m10r"></i> <span translate>Purge Pending Transaction Proposals</span> </h3>
<p translate class="large-8 columns text-gray">
Pending Transactions Proposals will be discarted. This needs to be done on <b>ALL<b> peers of a wallet, to prevent the old proposals to be resynced again.
Pending Transactions Proposals will be discarted. This needs to be done on <b>ALL</b> peers of a wallet, to prevent the old proposals to be resynced again.
</p>
<div class="large-4 columns">
<a translate class="button warning expand" ng-click="purge()">
@ -84,7 +84,7 @@
<div class="oh large-12 columns panel">
<h3><i class="fi-minus-circle m10r"></i> <span translate>Purge ALL Transaction Proposals</span> </h3>
<p translate class="large-8 columns text-gray">
ALL Transactions Proposals will be discarted. This needs to be done on <b>ALL<b> peers of a wallet, to prevent the old proposals to be resynced again.
ALL Transactions Proposals will be discarted. This needs to be done on <b>ALL</b> peers of a wallet, to prevent the old proposals to be resynced again.
</p>
<div class="large-4 columns">
<a translate class="button warning expand" ng-click="purge(true)">

8
views/send.html
View file

@ -14,7 +14,7 @@
<div class="row collapse">
<div class="large-12 columns">
<div class="row collapse">
<label for="address"><span translate>To:</span>
<label for="address"><span translate>To</span>
<small translate ng-hide="!sendForm.address.$pristine || address">required</small>
<small translate class="is-valid" ng-show="!sendForm.address.$invalid && address">valid!</small>
<small translate class="has-error" ng-show="sendForm.address.$invalid && address">not valid</small>
@ -181,7 +181,7 @@
<tr>
<th translate>Label</th>
<th translate>Address</th>
<th class="hide-for-small-only" translate>Creator</th>
<th ng-class="{'hide-for-small-only' : $root.wallet.isShared()}" ng-show="$root.wallet.isShared()" translate>Creator</th>
<th class="hide-for-small-only" translate>Date</th>
<th class="hide-for-small-only">&nbsp;</th>
</tr>
@ -192,14 +192,14 @@
ng-class="{'addressbook-disabled': info.hidden}">
<td><a ng-click="copyAddress(addr)" title="Copy address">{{info.label}}</a></td>
<td class="size-12">{{addr}} <span class="btn-copy" clip-copy="addr"></span></td>
<td class="hide-for-small-only">{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
<td ng-show="$root.wallet.isShared()" ng-class="{'hide-for-small-only' : $root.wallet.isShared()}">{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
<td class="hide-for-small-only"><time>{{info.createdTs | amCalendar}}</time></td>
<td class="hide-for-small-only" width="5"><a ng-click="toggleAddressBookEntry(addr)">{{info.hidden ?
'Enable' : 'Disable'}}</a></td>
</tr>
</tbody>
</table>
<button translate class="button tiny primary text-center" ng-click="openAddressBookModal()">Add New Entry</button>
<button translate class="button tiny primary text-center" ng-click="openAddressBookModal()">Add</button>
</div>
</div>
</div>

2
views/settings.html
View file

@ -14,7 +14,7 @@
</select>
</fieldset>
<fieldset>
<legend translate>Insight API servers</legend>
<legend translate>Insight API server</legend>
<label for="insight-livenet">Livenet</label>
<input type="text" ng-model="insightLivenet" class="form-control" name="insight-livenet">
<label for="insight-testnet">Testnet</label>