Merge pull request #31 from gabrielbazan7/fix/translations

translations

public/views/confirm.html

@@ -42,7 +42,7 @@
       <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
 
       <div class="item item-icon-left item-icon-right" ng-click="showDescriptionPopup()">
-        <span ng-show="!description">Add Description</span>
+        <span ng-show="!description" translate>Add Description</span>
         <span ng-show="description">{{description}}</span>
         <i class="icon ion-ios-chatbubble-outline size-21"></i>
         <i class="icon ion-ios-plus-empty size-21"></i>

public/views/copayers.html

@@ -4,17 +4,11 @@
     <ion-nav-title>{{wallet.name}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button" href ui-sref="tabs.home">
-        <i class="ion-arrow-left-c"></i> Back
+        <i class="ion-arrow-left-c"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
 
-  <ion-nav-buttons side="primary">
-    <button class="button" href ui-sref="tabs.home">
-      <i class="ion-arrow-left-c"></i> Back
-    </button>
-  </ion-nav-buttons>
-
   <ion-content delegate-handle="my-handle" overflow-scroll="true">
     <div ng-show="!wallet.notAuthorized">
       <h1 class="text-center" translate>Share this invitation with your copayers</h1>

public/views/includes/walletActivity.html

@@ -9,7 +9,7 @@
   </div>
 
   <div ng-if="x.types.indexOf('NewOutgoingTx')>=0">
-      <span>Payment Sent </span>
+      <span translate>Payment Sent </span>
       <div class="wallet-activity-amount">
       {{x.amountStr}}
       </div>
@@ -18,7 +18,7 @@
 
 
   <div ng-if="x.types.indexOf('NewIncomingTx')>=0">
-      <span>Payment Received</span>
+      <span translate>Payment Received</span>
       <div class="wallet-activity-amount">
       {{x.amountStr}}
       </div>
@@ -26,12 +26,12 @@
 
   <div ng-if="x.types.indexOf('TxProposalRemoved')>=0">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
-    Proposal Deleted
+    <span translate>Proposal Deleted</span>
   </div>
 
   <div ng-if="x.types.indexOf('TxProposalRejected')>=0">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
-    Proposal Rejected
+    <span translate>Proposal Rejected</span>
   </div>
 
   <div ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
@@ -43,7 +43,7 @@
     </span>
     <span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1  && x.types.indexOf('NewOutgoingTx')==-1">
       <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
-      Proposal Accepted
+      <span translate>Proposal Accepted</span>
     </span>
   </div>
 

public/views/join.html

@@ -2,10 +2,10 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.add">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
-    <ion-nav-title>Join shared wallet</ion-nav-title>
+    <ion-nav-title>{{'Join shared wallet' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
 

public/views/modals/addressbook.html

@@ -1,7 +1,7 @@
 <ion-modal-view ng-controller="addressbookModalController" ng-init="initAddressbook()">
   <ion-header-bar align-title="center" class="bar-stable">
     <button class="button button-clear button-positive"
-            ng-click="closeAddressbookModal()">
+            ng-click="closeAddressbookModal()" translate>
       Close
     </button>
     <div class="h1 title">
@@ -11,7 +11,7 @@
     <button class="button button-clear button-positive"
             ng-click="toggleAddAddressbookEntry()">
       <i ng-show="!addAddressbookEntry" class="icon ion-ios-plus-empty"></i>
-      <span ng-show="addAddressbookEntry">Cancel</span>
+      <span ng-show="addAddressbookEntry" translate>Cancel</span>
     </button>
   </ion-header-bar>
 
@@ -56,7 +56,7 @@
       <div class="list">
 
         <label class="item item-input item-stacked-label">
-          <span class="input-label">Address</span>
+          <span class="input-label" translate>Address</span>
           <div class="input-notification">
             <i class="icon ion-checkmark-circled balanced"
                ng-show="!addressbookForm.address.$invalid"></i>
@@ -74,7 +74,7 @@
         </label>
 
         <label class="item item-input item-stacked-label">
-          <span class="input-label">Label</span>
+          <span class="input-label" translate>Label</span>
           <input type="text"
                  id="label"
                  name="label"

public/views/modals/search.html

@@ -68,7 +68,7 @@
           <p>
             <time ng-if="btx.time">{{btx.time * 1000 | amTimeAgo}}</time>
             <span translate class="text-warning"
-              ng-show="!btx.time && (!btx.confirmations || btx.confirmations == 0)">
+              ng-show="!btx.time && (!btx.confirmations || btx.confirmations == 0)" translate>
               Unconfirmed
             </span>
           </p>

public/views/modals/txp-details.html

@@ -138,7 +138,7 @@
             </span>
           </li>
           <li class="line-b p10">
-            <span class="text-gray">Merchant Message</span>
+            <span class="text-gray" translate>Merchant Message</span>
             <span class="db">{{tx.paypro.pr.pd.memo}}</span>
           </li>
         </ul>

public/views/modals/wallets.html

@@ -2,12 +2,12 @@
   <ion-header-bar align-title="center" class="tab-bar">
     <div class="left-small">
       <a ng-click="cancel()" class="p10">
-        <span class="text-close">Close</span>
+        <span class="text-close" translate>Close</span>
       </a>
     </div>
     <h1 class="title ellipsis">
-      <span ng-show="type == 'BUY' || type == 'RECEIVE'">Choose your destination wallet</span>
+      <span ng-show="type == 'BUY' || type == 'RECEIVE'" translate>Choose your destination wallet</span>
-      <span ng-show="type == 'SELL' || type == 'SEND'">Choose your source wallet</span>
+      <span ng-show="type == 'SELL' || type == 'SEND'" translate>Choose your source wallet</span>
     </h1>
   </ion-header-bar>
 
@@ -22,7 +22,7 @@
           <div class="left">
             <i class="fi-info size-18 m10r"></i>
           </div>
-          <div class="size-10 m5t">
+          <div class="size-10 m5t" translate>
             Notice: only 1-1 (single signature) wallets can be used for sell bitcoin
           </div>
         </h4>

public/views/preferences.html

@@ -44,7 +44,7 @@
         </span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
-      <div class="item item-divider">
+      <div class="item item-divider" translate>
         Security
       </div>
       <div class="item item-icon-right" href ui-sref="tabs.preferences.backup" ng-hide="wallet.isPrivKeyExternal()">
@@ -65,7 +65,7 @@
         <span translate>Delete recovery phrase</span>
         <i class="icon ion-ios-arrow-right"></i>
       </div>
-      <div class="item item-divider">
+      <div class="item item-divider" translate>
         Advanced
       </div>
       <div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAdvanced">

public/views/preferencesAbout.html

@@ -7,7 +7,7 @@
     </ion-nav-buttons>
   </ion-nav-bar>
   <ion-content ng-controller="preferencesAbout">
-    <div class="item item-divider">
+    <div class="item item-divider" translate>
       Release information
     </div>
     <div class="item item-icon-left">

public/views/sellGlidera.html

@@ -125,4 +125,3 @@
     </div>
   </ion-content>
 </ion-view>
-

public/views/tab-create-personal.html

@@ -2,10 +2,10 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.add">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
-    <ion-nav-title>Create new wallet</ion-nav-title>
+    <ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">

public/views/tab-create-shared.html

@@ -2,10 +2,10 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.add">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
-    <ion-nav-title>Create new wallet</ion-nav-title>
+    <ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content ng-controller="createController as create" ng-init="create.setTotalCopayers(3)">

public/views/tab-export-file.html

@@ -1,9 +1,9 @@
 <ion-view>
   <ion-nav-bar class="bar-stable">
-    <ion-nav-title>Export Wallet</ion-nav-title>
+    <ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>

public/views/tab-export-qrCode.html

@@ -1,9 +1,9 @@
 <ion-view>
   <ion-nav-bar class="bar-stable">
-    <ion-nav-title>Export Wallet</ion-nav-title>
+    <ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
       <button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>

public/views/tab-home.html

@@ -1,12 +1,12 @@
 <ion-view id="tab-home">
   <ion-nav-bar class="bar-stable">
-    <ion-nav-title>Home</ion-nav-title>
+    <ion-nav-title>{{'Home' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content class="padding" ng-controller="tabHomeController" ng-init="updateAllWallets(); nextStep()">
 
     <div class="card">
-      <div class="item item-divider  item-icon-right">
+      <div class="item item-divider  item-icon-right" translate>
         Recent Activity
         <i class="icon ion-ios-arrow-right" ui-sref="activity"></i>
       </div>
@@ -25,7 +25,7 @@
     </div>
 
     <div class="list card" ng-hide="!wallets[0]">
-      <div class="item item-icon-right item-heading">
+      <div class="item item-icon-right item-heading" translate>
         Wallets
         <a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
       </div>
@@ -61,7 +61,7 @@
     </div>
 
     <div class="list card" ng-show="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
-      <div class="item item-heading">
+      <div class="item item-heading" translate>
         Buy & Sell Bitcoin
       </div>
       <a ng-show="glideraEnabled" ui-sref="glidera.main" class="item item-icon-right">
@@ -76,35 +76,35 @@
 
     <div class="list card"
          ng-show="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[1]">
-      <div class="item item-heading">
+      <div class="item item-heading" translate>
         Next steps
       </div>
       <a ng-show="!wallets[1]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right">
        <i class="icon big-icon-svg">
          <img class="icon-create-wallet"/>
        </i>
-        <span>Create a bitcoin wallet</span>
+        <span translate>Create a bitcoin wallet</span>
         <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
       </a>
       <a ng-show="!externalServices.BuyAndSell" ui-sref="buyandsell" class="item item-icon-left item-big-icon-left item-icon-right">
        <i class="icon big-icon-svg">
          <img class="icon-buy-bitcoin"/>
        </i>
-        <span>Buy Bitcoin</span>
+        <span translate>Buy Bitcoin</span>
         <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
       </a>
       <a ui-sref="bitpayCard.main" ng-show="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right">
        <i class="icon big-icon-svg">
          <img class="icon-bitpay-card"/>
        </i>
-        <span>Add BitPay Card</span>
+        <span translate>Add BitPay Card</span>
         <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
       </a>
       <a ui-sref="amazon.main" ng-show="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right">
         <i class="icon big-icon-svg">
           <img class="icon-gift"/>
         </i>
-        <span>Add Amazon Gift Card</span>
+        <span translate>Add Amazon Gift Card</span>
         <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
       </a>
     </div>

public/views/tab-import-file.html

@@ -2,10 +2,10 @@
   <ion-nav-bar class="bar-stable" ng-controller="backController">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ng-click="importGoBack()">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
-    <ion-nav-title>Import wallet</ion-nav-title>
+    <ion-nav-title>{{'Import wallet' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content ng-controller="importController" ng-init="type='file'">

public/views/tab-import-hardware.html

@@ -2,10 +2,10 @@
   <ion-nav-bar class="bar-stable" ng-controller="backController">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ng-click="importGoBack()">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
-    <ion-nav-title>Import wallet</ion-nav-title>
+    <ion-nav-title>{{'Import wallet' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content ng-controller="importController" ng-init="type='hwWallet'">

public/views/tab-import-phrase.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable" ng-controller="backController">
     <ion-nav-buttons side="primary">
       <button class="button no-border" ng-click="importGoBack()">
-        <i class="icon ion-chevron-left"></i> Back
+        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
       </button>
     </ion-nav-buttons>
     <ion-nav-title>Import wallet</ion-nav-title>

public/views/tab-scan.html

@@ -1,6 +1,6 @@
 <ion-view>
   <ion-nav-bar class="bar-stable">
-    <ion-nav-title>Scan</ion-nav-title>
+    <ion-nav-title>{{'Scan' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content class="padding" ng-controller="tabScanController" ng-init="init()">

public/views/tab-settings.html

@@ -1,6 +1,6 @@
 <ion-view>
   <ion-nav-bar class="bar-stable">
-    <ion-nav-title>Global Settings</ion-nav-title>
+    <ion-nav-title>{{'Global Settings' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content ng-controller="tabSettingsController" ng-init="init()">
@@ -12,7 +12,7 @@
         <span translate>Address Book</span>
       </div>
 
-      <div class="item item-divider">Preferences</div>
+      <div class="item item-divider" translate>Preferences</div>
 
       <div class="item item-icon-left" href ui-sref="tabs.language">
         <i class="icon ion-ios-chatbubble-outline"></i>
@@ -47,7 +47,7 @@
       </div>
 
       <div ng-show="usePushNotifications && PNEnabledByUser">
-        <div class="item item-divider">Notifications</div>
+        <div class="item item-divider" translate>Notifications</div>
 
         <ion-toggle ng-model="pushNotifications" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
           <span class="toggle-label" translate>Enable push notifications</span>
@@ -61,7 +61,7 @@
         </div>
       </div>
 
-      <div class="item item-divider">Exchanges</div>
+      <div class="item item-divider" translate>Exchanges</div>
 
       <ion-toggle ng-show="!isWP" ng-model="glideraEnabled" toggle-class="toggle-balanced" ng-change="glideraChange()">
         <span class="toggle-label" translate>Enable Glidera Service</span>
@@ -74,13 +74,13 @@
       </ion-toggle>
       -->
 
-      <div class="item item-divider">Others</div>
+      <div class="item item-divider" translate>Others</div>
 
       <ion-toggle ng-model="spendUnconfirmed" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
         <span class="toggle-label" translate>Use Unconfirmed Funds</span>
       </ion-toggle>
 
-      <div class="item item-divider">Wallets Settings</div>
+      <div class="item item-divider" translate>Wallets Settings</div>
       <div class="item item-icon-left" href
            ui-sref="tabs.preferences.main({'walletId': item.id})"
            ng-repeat="item in wallets track by $index">

public/views/walletDetails.html

@@ -7,16 +7,16 @@
   </ion-nav-bar>
 
   <ion-content ng-controller="walletDetailsController" ng-init="init()" delegate-handle="my-handle">
-    <div ng-show="!wallet">
+    <div ng-show="!wallet" translate>
       No Wallet
-      <a href ui-sref="tabs.home" class="button">
+      <a href ui-sref="tabs.home" class="button" translate>
         Go home
       </a>
     </div>
 
 
     <div ng-show="!wallet.isComplete()">
-      <a class="button button-block button-assertive"  href ui-sref="wallet.copayers" class="button">
+      <a class="button button-block button-assertive"  href ui-sref="wallet.copayers" class="button" translate>
         Wallet Incomplete
       </a>
     </div>