From 84d154b168f792bd6c95aa9c78df8ddc0d867805 Mon Sep 17 00:00:00 2001
From: root <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 11:35:06 +0000
Subject: [PATCH] Update strings, add UK strings, fix JS

---
 src/locales/en.ini     |  3 +++
 src/static/js/pad.js   | 12 +-----------
 src/templates/pad.html |  6 +++---
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/locales/en.ini b/src/locales/en.ini
index e542594d..225b16cf 100644
--- a/src/locales/en.ini
+++ b/src/locales/en.ini
@@ -21,6 +21,9 @@ pad.toolbar.showusers.title = Show the users on this pad
 pad.colorpicker.save = Save
 pad.colorpicker.cancel = Cancel
 pad.loading = Loading...
+pad.passwordRequired = You need a password to access this pad
+pad.permissionDenied = You do not have permission to access this pad
+pad.wrongPassword = Your password was wrong
 pad.settings.padSettings = Pad Settings
 pad.settings.myView = My View
 pad.settings.stickychat = Chat always on screen
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index bfe8bf8c..aef06eff 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -299,9 +299,7 @@ function handshake()
     if(!receivedClientVars && obj.accessStatus)
     {
       $('.passForm').submit(function(){
-        // THIS BIT DOESNT WORK
-        alert("I AM BROKEN");
-        padutils.escapeHtml('require('+JSON.stringify(module.id)).savePassword();
+        require(module.id).savePassword();
       });
 
       if(obj.accessStatus == "deny")
@@ -311,14 +309,6 @@ function handshake()
       }
       else if(obj.accessStatus == "needPassword")
       {
-/*        $("#editorloadingbox").html("<b>You need a password to access this pad</b><br>" +
-                                    "<form class='passForm'><input id='passwordinput' type='password' name='password'>"+
-                                    "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword();") + "\">ok</button></div>");
-        $("#passwordinput").focus();
-        $(".passForm").submit(function(){
-          $('.passForm button').click();
-        });
-*/
         $('#loading').hide();
         $('#passwordRequired').show();
         $("#passwordinput").focus();
diff --git a/src/templates/pad.html b/src/templates/pad.html
index e37163e1..d9c6be46 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -185,16 +185,16 @@
             <div id="editorcontainer"></div>
             <div id="editorloadingbox">
               <div id="passwordRequired">
-                <p data-l10n-id="pad.youneedpasword">You need a password to access this pad</p>
+                <p data-l10n-id="pad.passwordRequired">You need a password to access this pad</p>
                 <form class='passForm'>
                   <input id='passwordinput' type='password' name='password'><input type='submit' value='Submit'>
                 </form>
               </div>
               <div id="permissionDenied">
-                <p data-l10n-id="pad.youdonthavepermission">You do not have permission to access this pad</p>
+                <p data-l10n-id="pad.permissionDenied">You do not have permission to access this pad</p>
               </div>
               <div id="wrongPassword">
-                <p data-l10n-id="pad.wrongpassword">Your password was wrong</p>
+                <p data-l10n-id="pad.wrongPassword">Your password was wrong</p>
               </div>
               <p data-l10n-id="pad.loading" id="loading">Loading...</p>
               <noscript><strong>Sorry, you have to enable Javascript in order to use this.</strong></noscript>