diff --git a/public/language/ar/reset_password.json b/public/language/ar/reset_password.json
index a4eadc9ea4..e1562f605d 100644
--- a/public/language/ar/reset_password.json
+++ b/public/language/ar/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "كلمة السر الجديدة",
"repeat_password": "تأكيد كلمة السر",
"enter_email": "يرجى إدخال عنوان البريد الإلكتروني الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
+ "enter_email_address": "Enter Email Address",
"password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
"invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
}
\ No newline at end of file
diff --git a/public/language/cs/reset_password.json b/public/language/cs/reset_password.json
index 1121c9ac98..82114efc95 100644
--- a/public/language/cs/reset_password.json
+++ b/public/language/cs/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Nové heslo",
"repeat_password": "Potvrzení hesla",
"enter_email": "Zadejte svou emailovou adresu 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!"
}
\ No newline at end of file
diff --git a/public/language/de/reset_password.json b/public/language/de/reset_password.json
index 0675d796b9..aaa98d402a 100644
--- a/public/language/de/reset_password.json
+++ b/public/language/de/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Neues Passwort",
"repeat_password": "Wiederhole das Passwort",
"enter_email": "Bitte gib Deine E-Mail Adresse 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!"
}
\ No newline at end of file
diff --git a/public/language/es/reset_password.json b/public/language/es/reset_password.json
index 99ca4a0f0c..7fdd6ab7bd 100644
--- a/public/language/es/reset_password.json
+++ b/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 correo electrónico 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!"
}
\ No newline at end of file
diff --git a/public/language/fi/reset_password.json b/public/language/fi/reset_password.json
index 864817f60d..eb767012bc 100644
--- a/public/language/fi/reset_password.json
+++ b/public/language/fi/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Uusi salasana",
"repeat_password": "Vahvista salasana",
"enter_email": "Syötä sähköpostiosoitteesi, 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!"
}
\ No newline at end of file
diff --git a/public/language/fr/reset_password.json b/public/language/fr/reset_password.json
index 8610f7c172..c44345a4e0 100644
--- a/public/language/fr/reset_password.json
+++ b/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 adresse email 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!"
}
\ No newline at end of file
diff --git a/public/language/he/reset_password.json b/public/language/he/reset_password.json
index 92dbb1757e..b44e5f4ddc 100644
--- a/public/language/he/reset_password.json
+++ b/public/language/he/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "סיסמה חדשה",
"repeat_password": "אמת סיסמה",
"enter_email": "אנא הקלד את כתובת האימייל שלך ואנו נשלח לך הוראות כיצד לאפס את חשבונך",
+ "enter_email_address": "Enter Email Address",
"password_reset_sent": "קוד איפוס סיסמה נשלח",
"invalid_email": "מייל שגוי / כתובת מייל לא נמצאה"
}
\ No newline at end of file
diff --git a/public/language/hu/reset_password.json b/public/language/hu/reset_password.json
index c3274238d6..e611a2688f 100644
--- a/public/language/hu/reset_password.json
+++ b/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 e-mail címedet, 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!"
}
\ No newline at end of file
diff --git a/public/language/it/reset_password.json b/public/language/it/reset_password.json
index a8dc6250f4..95e17b4d18 100644
--- a/public/language/it/reset_password.json
+++ b/public/language/it/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Nuova Password",
"repeat_password": "Conferma la Password",
"enter_email": "Inserisci il tuo indirizzo email 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!"
}
\ No newline at end of file
diff --git a/public/language/nb/reset_password.json b/public/language/nb/reset_password.json
index 5584ef61ab..5f442cefb0 100644
--- a/public/language/nb/reset_password.json
+++ b/public/language/nb/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Nytt passord",
"repeat_password": "Bekreft passord",
"enter_email": "Vennligst skriv din e-post-adresse 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"
}
\ No newline at end of file
diff --git a/public/language/nl/reset_password.json b/public/language/nl/reset_password.json
index 823816168c..fc49520840 100644
--- a/public/language/nl/reset_password.json
+++ b/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 email address 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!"
}
\ No newline at end of file
diff --git a/public/language/pl/reset_password.json b/public/language/pl/reset_password.json
index d701ef653e..a7a71f04fd 100644
--- a/public/language/pl/reset_password.json
+++ b/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 adres e-mail 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."
}
\ No newline at end of file
diff --git a/public/language/pt_BR/reset_password.json b/public/language/pt_BR/reset_password.json
index 203e0430d3..d692ec79b7 100644
--- a/public/language/pt_BR/reset_password.json
+++ b/public/language/pt_BR/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Nova Senha",
"repeat_password": "Confirmar Senha",
"enter_email": "Por digite seu email 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!"
}
\ No newline at end of file
diff --git a/public/language/ru/reset_password.json b/public/language/ru/reset_password.json
index 62cc1ab610..127a0951cd 100644
--- a/public/language/ru/reset_password.json
+++ b/public/language/ru/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Новый Пароль",
"repeat_password": "Подтвердите Пароль",
"enter_email": "Пожалуйста введите ваш email адрес и мы отправим Вам письмо с инструкцией восстановления пароля.",
+ "enter_email_address": "Enter Email Address",
"password_reset_sent": "Пароль Отправлен",
"invalid_email": "Неверный Email / Email не существует!"
}
\ No newline at end of file
diff --git a/public/language/sk/reset_password.json b/public/language/sk/reset_password.json
index 8ffd9eb4ca..b4123f8818 100644
--- a/public/language/sk/reset_password.json
+++ b/public/language/sk/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Nové heslo",
"repeat_password": "Potvrdenie hesla",
"enter_email": "Zadajte svoju emailovú adresu 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!"
}
\ No newline at end of file
diff --git a/public/language/sv/reset_password.json b/public/language/sv/reset_password.json
index f1a8b4d644..4b1b359450 100644
--- a/public/language/sv/reset_password.json
+++ b/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 epost-adress 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!"
}
\ No newline at end of file
diff --git a/public/language/tr/reset_password.json b/public/language/tr/reset_password.json
index d8aa05f826..3b7e92dba7 100644
--- a/public/language/tr/reset_password.json
+++ b/public/language/tr/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "Yeni Şifre",
"repeat_password": "Şifreyi Onayla",
"enter_email": "Lütfen e-posta adresinizi 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!"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/reset_password.json b/public/language/zh_CN/reset_password.json
index c8721eb686..ffd0ff528d 100644
--- a/public/language/zh_CN/reset_password.json
+++ b/public/language/zh_CN/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "新的密码",
"repeat_password": "确认密码",
"enter_email": "请输入您的Email地址，我们会发送邮件告诉您如何重置密码。",
+ "enter_email_address": "Enter Email Address",
"password_reset_sent": "密码重置邮件已发送。",
"invalid_email": "非法的邮箱地址/邮箱不存在！"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/reset_password.json b/public/language/zh_TW/reset_password.json
index 2192bda2c4..4ee1b9394c 100644
--- a/public/language/zh_TW/reset_password.json
+++ b/public/language/zh_TW/reset_password.json
@@ -8,6 +8,7 @@
"new_password": "新的密碼",
"repeat_password": "確認密碼",
"enter_email": "請輸入您的Email地址，我們會發送郵件告訴您如何重置密碼。",
+ "enter_email_address": "Enter Email Address",
"password_reset_sent": "密碼重置郵件已發送。",
"invalid_email": "非法的郵箱地址/郵箱不存在！"
}
\ No newline at end of file
diff --git a/public/src/app.js b/public/src/app.js
index 1fc143740c..63874f5559 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -231,8 +231,10 @@ var socket,
}
if (typeof params.clickfn === 'function') {
- alert.on('click', function () {
- params.clickfn();
+ alert.on('click', function (e) {
+ if(!$(e.target).is('.close')) {
+ params.clickfn();
+ }
fadeOut();
});
}
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index f135245009..c62fd2f9c6 100644
--- a/src/socket.io/index.js
+++ b/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);