Update template.pot. Enables auto-detect languages

po/template.pot

@@ -59,11 +59,6 @@ msgstr ""
 msgid "Available Balance"
 msgstr ""
 
-#: public/views/create.html
-#: public/views/join.html
-msgid "BIP32 master extended private key"
-msgstr ""
-
 #: public/views/includes/topbar.html
 msgid "Back"
 msgstr ""
@@ -92,18 +87,6 @@ msgstr ""
 msgid "Bitcoin address"
 msgstr ""
 
-#: public/views/preferences.html
-msgid "Bitcore Wallet Service"
-msgstr ""
-
-#: public/views/preferencesBwsUrl.html
-msgid "Bitcore Wallet Service URL"
-msgstr ""
-
-#: public/views/modals/tx-details.html
-msgid "Blockchain"
-msgstr ""
-
 #: public/views/modals/txp-details.html
 msgid "Broadcast Transaction"
 msgstr ""
@@ -175,6 +158,14 @@ msgstr ""
 msgid "Could not connect to Wallet Service"
 msgstr ""
 
+#: public/views/history.html
+msgid "Could not fetch transaction history"
+msgstr ""
+
+#: public/views/walletHome.html
+msgid "Could not update Wallet"
+msgstr ""
+
 #: public/views/create.html
 #: public/views/walletHome.html
 msgid "Create"
@@ -249,10 +240,6 @@ msgstr ""
 msgid "Generate new address"
 msgstr ""
 
-#: public/views/receive.html
-msgid "Generating a new address..."
-msgstr ""
-
 #: public/views/history.html
 msgid "Getting transactions..."
 msgstr ""
@@ -266,6 +253,14 @@ msgstr ""
 msgid "Hide"
 msgstr ""
 
+#: public/views/create.html
+msgid "If not given, a random key will be generated"
+msgstr ""
+
+#: public/views/join.html
+msgid "If not given, a secure key will be generated"
+msgstr ""
+
 #: public/views/importLegacy.html
 msgid "Import"
 msgstr ""
@@ -350,18 +345,26 @@ msgstr ""
 msgid "More"
 msgstr ""
 
+#: public/views/history.html
+msgid "Moved"
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "Multisignature wallet"
 msgstr ""
 
 #: public/views/receive.html
-msgid "My Bitcoin address:"
+msgid "My Bitcoin address"
 msgstr ""
 
 #: public/views/walletHome.html
 msgid "No pending spend proposals at the moment."
 msgstr ""
 
+#: public/views/history.html
+msgid "No transactions yet"
+msgstr ""
+
 #: public/views/send.html
 #: public/views/modals/address-book.html
 msgid "Not valid"
@@ -401,7 +404,7 @@ msgid "Paste backup plain text code"
 msgstr ""
 
 #: public/views/join.html
-msgid "Paste wallet secret here"
+msgid "Paste invitation here"
 msgstr ""
 
 #: public/views/modals/tx-status.html
@@ -432,6 +435,10 @@ msgstr ""
 msgid "QR-Scanner"
 msgstr ""
 
+#: public/views/history.html
+msgid "Received"
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "Recreate"
 msgstr ""
@@ -445,15 +452,11 @@ msgid "Reject"
 msgstr ""
 
 #: public/views/modals/txp-details.html
-msgid "Remove"
+msgid "Remove transaction"
 msgstr ""
 
 #: public/views/backup.html
 #: public/views/includes/password.html
-msgid "Repeat Password"
-msgstr ""
-
-#: public/views/backup.html
 msgid "Repeat password"
 msgstr ""
 
@@ -479,6 +482,10 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: public/views/walletHome.html
+msgid "Scan status finished with error"
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "Scanning Wallet funds..."
 msgstr ""
@@ -515,28 +522,32 @@ msgstr ""
 msgid "Send by email"
 msgstr ""
 
+#: public/views/history.html
+msgid "Sent"
+msgstr ""
+
 #: public/views/importLegacy.html
 msgid "Server"
 msgstr ""
 
-#: public/views/includes/password.html
-msgid "Set up a Password"
-msgstr ""
-
 #: public/views/backup.html
 msgid "Set up a Password for your backup"
 msgstr ""
 
+#: public/views/includes/password.html
+msgid "Set up a password"
+msgstr ""
+
 #: public/views/receive.html
 msgid "Share address"
 msgstr ""
 
 #: public/views/copayers.html
-msgid "Share secret"
+msgid "Share invitation"
 msgstr ""
 
 #: public/views/copayers.html
-msgid "Share this secret with your copayers"
+msgid "Share this invitation with your copayers"
 msgstr ""
 
 #: public/views/receive.html
@@ -564,6 +575,15 @@ msgstr ""
 msgid "Spend proposals"
 msgstr ""
 
+#: public/views/history.html
+#: public/views/walletHome.html
+msgid "Tap to retry"
+msgstr ""
+
+#: public/views/modals/txp-details.html
+msgid "The transaction was removed by creator"
+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 ""
@@ -672,11 +692,11 @@ msgid "Waiting..."
 msgstr ""
 
 #: public/views/join.html
-msgid "Wallet Secret"
+msgid "Wallet Invitation"
 msgstr ""
 
 #: public/views/join.html
-msgid "Wallet Secret is not valid!"
+msgid "Wallet Invitation is not valid!"
 msgstr ""
 
 #: public/views/copayers.html

public/views/backup.html

@@ -15,7 +15,7 @@
         name="password" ng-model="backup.password">
       </div>
 
-      <label for="password" translate>Repeat Password</label>
+      <label for="password" translate>Repeat password</label>
       <div class="input">
         <input type="password" class="form-control" 
         placeholder="{{'Repeat password'|translate}}"

public/views/create.html

@@ -61,7 +61,7 @@
               <small translate>If not given, a random key will be generated</small>
               <input id="ext-master" 
               type="text" 
-              placeholder="{{'BIP32 master extended private key'|translate}}" 
+              placeholder="BIP32 master extended private key" 
               name="privateKey" ng-model="privateKey">
           </div>
         </div>

public/views/history.html

@@ -5,11 +5,11 @@
         <span ng-if="index.updatingTxHistory" class="text-gray animated flash infinite" translate>Getting transactions...</span>
         <span ng-if="!index.updatingTxHistory">
           <span ng-show="index.txHistoryError && !index.notAuthorized" ng-click='index.openWallet()'> 
-              Could not fetch transaction history
+            <span translate>Could not fetch transaction history</span>
-              <br> [Tap to retry]
+            <br> [<span translate>Tap to retry</span>]
           </span>
-          <span ng-if="!index.txHistoryError">
+          <span ng-if="!index.txHistoryError" translate>
-              No transactions yet
+            No transactions yet
           </span>
         </span>
       </div>
@@ -21,9 +21,9 @@
       class="row collapse last-transactions-content">
       <div class="large-3 medium-3 small-3 columns">
         <span class="label tu radius" ng-show="btx.action == 'received'" 
-          ng-style="{'background-color':index.backgroundColor}">Received</span>
+          ng-style="{'background-color':index.backgroundColor}" translate>Received</span>
-        <span class="label tu gray radius" ng-show="btx.action == 'sent'">Sent</span>
+        <span class="label tu gray radius" ng-show="btx.action == 'sent'" translate>Sent</span>
-        <span class="label tu gray radius" ng-show="btx.action == 'moved'">Moved</span>
+        <span class="label tu gray radius" ng-show="btx.action == 'moved'" translate>Moved</span>
       </div>
 
       <div class="large-5 medium-5 small-5 columns">

public/views/includes/password.html

@@ -7,8 +7,8 @@
 >
   <div class="columns m20t">
     <label class="size-14 text-center" for="password" ng-if="index.askPassword.isSetup">
-      <span ng-show="!pass.isVerification" translate>Set up a Password</span>
+      <span ng-show="!pass.isVerification" translate>Set up a password</span>
-      <span ng-show="pass.isVerification" translate>Repeat Password</span>
+      <span ng-show="pass.isVerification" translate>Repeat password</span>
     </label>
     <label class="size-14 text-center" for="password" ng-if="!index.askPassword.isSetup">
       <span translate>Enter your password</span>

public/views/join.html

@@ -52,7 +52,7 @@
               <small translate>If not given, a secure key will be generated</small>
                 <input id="ext-master" 
                 type="text" 
-                placeholder="{{'BIP32 master extended private key'|translate}}" 
+                placeholder="BIP32 master extended private key" 
                 name="privateKey" ng-model="privateKey">
               </label>
             </div>

public/views/preferences.html

@@ -43,7 +43,7 @@
     </li>
     
     <li class="line-b p20" ng-click="$root.go('preferencesBwsUrl')">
-      <span translate>Bitcore Wallet Service</span>
+      <span>Bitcore Wallet Service</span>
       <span class="text-gray db">
           <i class="icon-arrow-right3 size-24 right"></i>
           {{preferences.bwsurl}}

public/views/preferencesBwsUrl.html

@@ -1,6 +1,6 @@
 <div class="preferences m20t columns" ng-controller="preferencesBwsUrlController as prefBwsUrl">
   <form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="m20t">
-    <label translate>Bitcore Wallet Service URL</label>
+    <label>Bitcore Wallet Service URL</label>
     <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">
     <input type="submit" class="button expand black radius" value="{{'Save'|translate}}" 
     ng-style="{'background-color':index.backgroundColor}">

src/js/routes.js

@@ -418,19 +418,19 @@ angular
   .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService) {
 
     // Auto-detect browser language
-    // Commented for now (default: English)
+    // (default: English)
-    //var userLang, androidLang;
+    var userLang, androidLang;
-    //
-    //if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) {
-    //  userLang = androidLang[1];
-    //} else {
-    //  // works for iOS and Android 4.x
-    //  userLang = navigator.userLanguage || navigator.language;
-    //}
     
-    //userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
+    if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) {
-    //gettextCatalog.setCurrentLanguage(userLang);
+      userLang = androidLang[1];
-    //amMoment.changeLocale(userLang);
+    } else {
+      // works for iOS and Android 4.x
+      userLang = navigator.userLanguage || navigator.language;
+    }
+
+    userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
+    gettextCatalog.setCurrentLanguage(userLang);
+    amMoment.changeLocale(userLang);
 
     // Register URI handler, not for mobileApp
     if (!isCordova) {