Merge remote-tracking branch 'origin/master' into webserver.js-refactor

public/language/ar/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "كلمة السر الجديدة",
     "repeat_password": "تأكيد كلمة السر",
     "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
     "invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
 }

public/language/cs/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nové heslo",
     "repeat_password": "Potvrzení hesla",
     "enter_email": "Zadejte svou <strong>emailovou adresu</strong> a my Vám pošleme informace, jak můžete obnovit své heslo.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Obnova hesla odeslána",
     "invalid_email": "Špatný email / Email neexistuje!"
 }

public/language/de/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Neues Passwort",
     "repeat_password": "Wiederhole das Passwort",
     "enter_email": "Bitte gib Deine <strong>E-Mail Adresse</strong> ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Passwortzrücksetzung beantragt.",
     "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!"
 }

public/language/es/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nueva Contraseña",
     "repeat_password": "Confirmar Contraseña",
     "enter_email": "Por favor ingresa tu <strong>correo electrónico</strong> y te enviaremos un correo con indicaciones para inicializar tu cuenta.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Reinicio de contraseña enviado",
     "invalid_email": "Correo Electrónico no válido o inexistente!"
 }

public/language/fi/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Uusi salasana",
     "repeat_password": "Vahvista salasana",
     "enter_email": "Syötä <strong>sähköpostiosoitteesi</strong>, niin me lähetämme sinulle sähköpostilla ohjeet käyttäjätilisi palauttamiseksi.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Salasanan palautuskoodi lähetetty",
     "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!"
 }

public/language/fr/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nouveau Mot de passe",
     "repeat_password": "Confirmer le Mot de passe",
     "enter_email": "Veuillez entrer votre <strong>adresse email</strong> et vous recevrez un email avec les instruction pour réinitialiser votre compte.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Réinitialisation de Mot de Passe Envoyée",
     "invalid_email": "Email Invalide / L'Email n'existe pas!"
 }

public/language/he/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "סיסמה חדשה",
     "repeat_password": "אמת סיסמה",
     "enter_email": "אנא הקלד את <strong>כתובת האימייל שלך</strong> ואנו נשלח לך הוראות כיצד לאפס את חשבונך",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "קוד איפוס סיסמה נשלח",
     "invalid_email": "מייל שגוי / כתובת מייל לא נמצאה"
 }

public/language/hu/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Új jelszó",
     "repeat_password": "Jelszó megerősítése",
     "enter_email": "Kérlek add meg az <strong>e-mail címedet</strong>, ahová elküldjük a további teendőket a jelszavad visszaállításával kapcsolatban.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Jelszó-visszaállítás elküldve",
     "invalid_email": "Helytelen E-mail cím / Nem létező E-mail cím!"
 }

public/language/it/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nuova Password",
     "repeat_password": "Conferma la Password",
     "enter_email": "Inserisci il tuo <strong>indirizzo email</strong> e ti invieremo un'email con le istruzioni per resettare il tuo account.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Password Reset Inviata",
     "invalid_email": "Email invalida / L'email non esiste!"
 }

public/language/nb/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nytt passord",
     "repeat_password": "Bekreft passord",
     "enter_email": "Vennligst skriv din <strong>e-post-adresse</strong> og vi vil sende den en e-post med instruksjoner om hvordan du tilbakestiller din konto.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Passord-tilbakestilling sendt",
     "invalid_email": "Ugyldig e-post / e-post eksisterer ikke"
 }

public/language/nl/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nieuw Wachtwoord",
     "repeat_password": "Bevestig Wachtwoord",
     "enter_email": "Vul a.u.b. je <strong>email address</strong> in en we versturen je een email met de stappen hoe je je account reset.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Wachtwoord Reset Verzonden",
     "invalid_email": "Fout Email Adres / Email Adres bestaat niet!"
 }

public/language/pl/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nowe hasło",
     "repeat_password": "Powtórz hasło",
     "enter_email": "Podaj swój <strong>adres e-mail</strong> i wyślemy ci wiadomość z instrukcjami jak zresetować hasło.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Instrukcje zostały wysłane",
     "invalid_email": "Niepoprawny adres e-mail."
 }

public/language/pt_BR/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nova Senha",
     "repeat_password": "Confirmar Senha",
     "enter_email": "Por digite seu <strong>email</strong> nós enviaremos para você as instruções de como resetar sua senha.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Reset de Senha Enviado",
     "invalid_email": "Email inválido!"
 }

public/language/ru/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Новый Пароль",
     "repeat_password": "Подтвердите Пароль",
     "enter_email": "Пожалуйста введите ваш <strong>email адрес</strong> и мы отправим Вам письмо с инструкцией восстановления пароля.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Пароль Отправлен",
     "invalid_email": "Неверный Email / Email не существует!"
 }

public/language/sk/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nové heslo",
     "repeat_password": "Potvrdenie hesla",
     "enter_email": "Zadajte svoju <strong>emailovú adresu</strong> a my Vám pošleme informácie, ako môžete obnoviť svoje heslo.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Obnova hesla odoslaná",
     "invalid_email": "Zlý email / Email neexistuje!"
 }

public/language/sv/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Nytt lösenord",
     "repeat_password": "Bekräfta lösenord",
     "enter_email": "Var god fyll i din <strong>epost-adress</strong> så får du snart en epost med instruktioner hur du återsätller ditt konto.",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Lösenordsåterställning skickad",
     "invalid_email": "Felaktig epost / Epost finns inte!"
 }

public/language/tr/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "Yeni Şifre",
     "repeat_password": "Şifreyi Onayla",
     "enter_email": "Lütfen <strong>e-posta adresinizi</strong> girin , size hesabınızı nasıl sıfırlayacağınızı anlatan bir e-posta gönderelim",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Şifre Yenilemesi Gönderildi",
     "invalid_email": "Geçersiz E-posta / E-posta mevcut değil!"
 }

public/language/zh_CN/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "新的密码",
     "repeat_password": "确认密码",
     "enter_email": "请输入您的<strong>Email地址</strong>，我们会发送邮件告诉您如何重置密码。",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "密码重置邮件已发送。",
     "invalid_email": "非法的邮箱地址/邮箱不存在！"
 }

public/language/zh_TW/reset_password.json

@@ -8,6 +8,7 @@
     "new_password": "新的密碼",
     "repeat_password": "確認密碼",
     "enter_email": "請輸入您的<strong>Email地址</strong>，我們會發送郵件告訴您如何重置密碼。",
+    "enter_email_address": "Enter Email Address",
     "password_reset_sent": "密碼重置郵件已發送。",
     "invalid_email": "非法的郵箱地址/郵箱不存在！"
 }

public/src/app.js

@@ -231,8 +231,10 @@ var socket,
 			}
 
 			if (typeof params.clickfn === 'function') {
-				alert.on('click', function () {
+				alert.on('click', function (e) {
-					params.clickfn();
+					if(!$(e.target).is('.close')) {
+						params.clickfn();
+					}
 					fadeOut();
 				});
 			}

src/socket.io/index.js

@@ -116,7 +116,7 @@ Sockets.init = function(server) {
 
 		socket.on('disconnect', function() {
 
-			if (uid && !Sockets.getUserSockets(uid).length <= 1) {
+			if (uid && Sockets.getUserSockets(uid).length <= 1) {
 				db.sortedSetRemove('users:online', uid, function(err) {
 					socketUser.isOnline(socket, uid, function(err, data) {
 						socket.broadcast.emit('user.isOnline', err, data);