Merge remote branch 'ether/develop'

6 files changed, 8 insertions, 8 deletions

diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js
index eb3f6188..1900a86a 100644
--- a/src/node/hooks/express.js
+++ b/src/node/hooks/express.js
@@ -26,7 +26,7 @@ exports.createServer = function () {
   {
     console.warn("Can't get git version for server header\n" + e.message)
   }
-  console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues")
+  console.log("Report bugs at https://github.com/ether/etherpad-lite/issues")
 
   serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
 
diff --git a/src/package.json b/src/package.json
index 9fd180ab..8f762077 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,7 +1,7 @@
 {
   "name"           : "ep_etherpad-lite",
   "description"    : "A Etherpad based on node.js",
-  "homepage"       : "https://github.com/Pita/etherpad-lite",
+  "homepage"       : "https://github.com/ether/etherpad-lite",
   "keywords"       : ["etherpad", "realtime", "collaborative", "editor"],
   "author"         : "Peter 'Pita' Martischka <petermartischka@googlemail.com> - Primary Technology Ltd",
   "contributors"   : [
@@ -46,5 +46,5 @@
   "engines"        : { "node" : ">=0.6.0",
                        "npm"  : ">=1.0"
                      }, 
-  "version"        : "1.2.0"
+  "version"        : "1.2.1"
 }
diff --git a/src/static/js/AttributePool.js b/src/static/js/AttributePool.js
index f5990c07..96ea9b0d 100644
--- a/src/static/js/AttributePool.js
+++ b/src/static/js/AttributePool.js
@@ -3,7 +3,7 @@
  * 90% of the code is still like in the original Etherpad
  * Look at https://github.com/ether/pad/blob/master/infrastructure/ace/www/easysync2.js
  * You can find a explanation what a attribute pool is here:
- * https://github.com/Pita/etherpad-lite/blob/master/doc/easysync/easysync-notes.txt
+ * https://github.com/ether/etherpad-lite/blob/master/doc/easysync/easysync-notes.txt
  */
 
 /*
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 2e56b950..661ea011 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3266,7 +3266,7 @@ function Ace2Inner(){
       }
     }
     //hide the dropdownso
-    if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent..  See Issue 327 https://github.com/Pita/etherpad-lite/issues/327
+    if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent..  See Issue 327 https://github.com/ether/etherpad-lite/issues/327
       window.parent.parent.padeditbar.toggleDropDown("none");
     }
   }
diff --git a/src/static/js/l10n.js b/src/static/js/l10n.js
index 1d232908..ef8218d3 100644
--- a/src/static/js/l10n.js
+++ b/src/static/js/l10n.js
@@ -902,7 +902,7 @@ document.webL10n = (function(window, document, undefined) {
   // browser-specific startup
   if (document.addEventListener) { // modern browsers and IE9+
     document.addEventListener('DOMContentLoaded', function() {
-      var lang = document.documentElement.lang || navigator.language;
+      var lang = document.documentElement.lang || navigator.language || navigator.userLanguage || 'en';
       loadLocale(lang, translateFragment);
     }, false);
   } else if (window.attachEvent) { // IE8 and before (= oldIE)
@@ -977,7 +977,7 @@ document.webL10n = (function(window, document, undefined) {
     // startup for IE<9
     window.attachEvent('onload', function() {
       gTextProp = document.body.textContent ? 'textContent' : 'innerText';
-      var lang = document.documentElement.lang || window.navigator.userLanguage;
+      var lang = document.documentElement.lang || navigator.language || navigator.userLanguage || 'en';
       loadLocale(lang, translateFragment);
     });
   }
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index b665c2fb..34f2a287 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -310,7 +310,7 @@ function handshake()
       }
       else if(obj.accessStatus == "wrongPassword")
       {
-        $("#editorloadingbox").html("<b>You're password was wrong</b><br>" +
+        $("#editorloadingbox").html("<b>Your password was wrong</b><br>" +
                                     "<input id='passwordinput' type='password' name='password'>"+
                                     "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword()") + "\">ok</button>");
       }