Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/translations/messages.js

@@ -481,7 +481,7 @@ define(function () {
         '# CryptPad\'s Zero Knowledge collaborative code editor\n',
         '\n',
         '* What you type here is encrypted so only people who have the link can access it.\n',
-        '*  You can choose the programming language to highlight and the UI color scheme in the upper right.'
+        '* You can choose the programming language to highlight and the UI color scheme in the upper right.'
     ].join('');
 
     out.slideInitialState = [

rpc.js

@@ -376,6 +376,11 @@ var updateLimits = function (config, publicKey, cb) {
     var defaultLimit = typeof(config.defaultStorageLimit) === 'number'?
         config.defaultStorageLimit: DEFAULT_LIMIT;
 
+    var userId;
+    if (publicKey) {
+        userId = unescapeKeyCharacters(publicKey);
+    }
+
     var body = JSON.stringify({
         domain: config.domain,
         subdomain: config.subdomain
@@ -404,8 +409,8 @@ var updateLimits = function (config, publicKey, cb) {
                 var json = JSON.parse(str);
                 limits = json;
                 var l;
-                if (publicKey) {
+                if (userId) {
-                    var limit = limits[publicKey];
+                    var limit = limits[userId];
                     l = limit && typeof limit.limit === "number" ?
                             [limit.limit, limit.plan, limit.note] : [defaultLimit, '', ''];
                 }