From a599251b39ef2897ad9b4988c7d6996b9a71991e Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Sat, 13 Sep 2014 08:46:55 -0300
Subject: [PATCH] Fixed

---
 js/controllers/join.js | 9 ++++-----
 views/create.html      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/js/controllers/join.js b/js/controllers/join.js
index 2a9ee0c51..2de8fa49a 100644
--- a/js/controllers/join.js
+++ b/js/controllers/join.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('JoinController',
     $scope.loading = false;
     $scope.isMobile = !!window.cordova;
 
-   // QR code Scanner
+    // QR code Scanner
     var cameraInput;
     var video;
     var canvas;
@@ -15,14 +15,13 @@ angular.module('copayApp.controllers').controller('JoinController',
     var context;
     var localMediaStream;
 
-    $scope.hideAdv=true;
-
+    $scope.hideAdv = true;
 
 
     navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
 
-    if (!window.cordova && !navigator.getUserMedia) 
-      $scope.disableScanner =1;
+    if (!window.cordova && !navigator.getUserMedia)
+      $scope.disableScanner = 1;
 
     var _scan = function(evt) {
       if (localMediaStream) {
diff --git a/views/create.html b/views/create.html
index f1a2f5178..a22ba56b7 100644
--- a/views/create.html
+++ b/views/create.html
@@ -36,7 +36,7 @@
                   <small class="icon-input" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid"><i class="fi-x"></i></small>
                   <p translate class="m15b text-gray size-12" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">
                     <i class="fi-x m5r"></i>
-                    Passwords must match
+                   {{'Passwords must match'|translate}}
                   </p>
                 </div>