From af09f4aca826416c88e0a9d1bb5a6f885d10ae2d Mon Sep 17 00:00:00 2001 From: tedr56 Date: Fri, 6 Dec 2013 21:04:57 +0100 Subject: [PATCH 01/60] added french language files --- public/language/fr/category.json | 14 +++++++++ public/language/fr/footer.json | 10 +++++++ public/language/fr/global.json | 31 ++++++++++++++++++++ public/language/fr/login.json | 10 +++++++ public/language/fr/notifications.json | 9 ++++++ public/language/fr/recent.json | 5 ++++ public/language/fr/register.json | 16 +++++++++++ public/language/fr/reset_password.json | 13 +++++++++ public/language/fr/topic.json | 39 ++++++++++++++++++++++++++ public/language/fr/unread.json | 5 ++++ public/language/fr/user.json | 36 ++++++++++++++++++++++++ public/language/fr/users.json | 9 ++++++ 12 files changed, 197 insertions(+) create mode 100644 public/language/fr/category.json create mode 100644 public/language/fr/footer.json create mode 100644 public/language/fr/global.json create mode 100644 public/language/fr/login.json create mode 100644 public/language/fr/notifications.json create mode 100644 public/language/fr/recent.json create mode 100644 public/language/fr/register.json create mode 100644 public/language/fr/reset_password.json create mode 100644 public/language/fr/topic.json create mode 100644 public/language/fr/unread.json create mode 100644 public/language/fr/user.json create mode 100644 public/language/fr/users.json diff --git a/public/language/fr/category.json b/public/language/fr/category.json new file mode 100644 index 0000000000..29c8c492b6 --- /dev/null +++ b/public/language/fr/category.json @@ -0,0 +1,14 @@ +{ + "new_topic_button": "Nouveau Sujet", + "no_topics": "Il n'y a aucun topic dans cette catégorie.
Pourquoi ne pas en créer un?", + "sidebar.recent_replies": "Réponses Récentes", + "sidebar.active_participants": "Participants Actifs", + "sidebar.moderators": "Modérateurs", + "posts": "messages", + "views": "vues", + "posted": "posté", + "browsing": "naviguer", + "no_replies": "Personne n'a répondu", + "replied": "répondu", + "last_edited_by": "dernière édition par" +} diff --git a/public/language/fr/footer.json b/public/language/fr/footer.json new file mode 100644 index 0000000000..27a4d0e1a9 --- /dev/null +++ b/public/language/fr/footer.json @@ -0,0 +1,10 @@ +{ + "chat.chatting_with": "Chat avec ", + "chat.placeholder": "taper le message ici, presser entrer pour envoyer", + "chat.send": "Envoyer", + "stats.online": "Online", + "stats.users": "Utilisateurs", + "stats.topics": "Sujets", + "stats.posts": "Message", + "success": "succès" +} diff --git a/public/language/fr/global.json b/public/language/fr/global.json new file mode 100644 index 0000000000..e454103779 --- /dev/null +++ b/public/language/fr/global.json @@ -0,0 +1,31 @@ +{ + "home": "Accueil", + "search": "Recherche", + "buttons.close": "Fermer", + "403.title": "Accès Refusé", + "403.message": "Il semble que vous vous soyez retrouvé sur une page dont vous n'avez pas accès. Peut-être devriez vous essayez de vous connecter?", + "404.title": "Introuvable", + "404.message": "Il semble que vous vous soyez retrouvé sur une page qui n'existe pas. Retourner à l'accueil.", + "500.title": "Erreur Interne.", + "500.message": "Oops! Il semblerait que quelque chose se soit mal passé!", + + "register": "S'inscrire", + "login": "Connecter", + + "logout": "Déconnection", + "logout.title": "Vous êtes maintenant déconnecté.", + "logout.message": "Vous vous êtes déconnecté de NodeBB avec succès", + + "save_changes": "Enregistrer les changements", + "close": "Fermer", + + "header.admin": "Admin", + "header.recent": "Récent", + "header.unread": "Non Lu", + "header.users": "Utilisateurs", + "header.search": "Recherche", + "header.profile": "Profile", + + "notifications.loading": "Chargement des Notifications", + "chats.loading": "Chargement des Chats" +} diff --git a/public/language/fr/login.json b/public/language/fr/login.json new file mode 100644 index 0000000000..d892409f69 --- /dev/null +++ b/public/language/fr/login.json @@ -0,0 +1,10 @@ +{ + "login": "Connexion", + "username": "Identifiant", + "password": "Mot de passe", + "remember_me": "Se souvenir de moi?", + "forgot_password": "Mot de passe oublié?", + "alternative_logins": "Connexion Alternative", + "failed_login_attempt": "Echèc d'authentification, veuillez réessayer.", + "login_successful": "Vous êtes maintenant connecté!" +} diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json new file mode 100644 index 0000000000..7a4ef3e3c3 --- /dev/null +++ b/public/language/fr/notifications.json @@ -0,0 +1,9 @@ +{ + "title": "Notifications", + "back_to_home": "retour à NodeBB", + "mark_all_as_read": "Tout marquer comme lu", + "outgoing_link": "Lien Sortant", + "outgoing_link_message": "Vous quitter NodeBB", + "continue_to": "Continuer vers", + "return_to": "Retour vers" +} diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json new file mode 100644 index 0000000000..4f7d7c96cc --- /dev/null +++ b/public/language/fr/recent.json @@ -0,0 +1,5 @@ +{ + "day": "Jour", + "week": "Semaine", + "month": "Mois" +} diff --git a/public/language/fr/register.json b/public/language/fr/register.json new file mode 100644 index 0000000000..bfb58f76e9 --- /dev/null +++ b/public/language/fr/register.json @@ -0,0 +1,16 @@ +{ + "register": "S'inscrire", + "help.email": "Par défault, votre email est masqué du public.", + "help.username_restrictions": "Un identifiant unique entre %1 et %2 charactères. Les autres utilisateurs peuvent vous citer avec @username.", + "help.minimum_password_length": "Votre mot de passe doit avoir au moins %1 charactères.", + "email_address": "Adresse Email", + "email_address_placeholder": "Entrer l'addresse Email", + "username": "Nom d'utilisateur", + "username_placeholder": "Entré le Nom d'utilisateur", + "password": "Mot de passe", + "password_placeholder": "Entrer le Mot de passe", + "confirm_password": "Confirmer le Mot de passe", + "confirm_password_placeholder": "Confirmer le Mot de passe", + "register_now_button": "S'enregistrer maintenant", + "alternative_registration": "Enregistrement Alternatif" +} diff --git a/public/language/fr/reset_password.json b/public/language/fr/reset_password.json new file mode 100644 index 0000000000..76b5724528 --- /dev/null +++ b/public/language/fr/reset_password.json @@ -0,0 +1,13 @@ +{ + "reset_password": "Réinitialiser le Mot de passe", + "update_password": "Mettre à jour le Mot de passe", + "password_changed.title": "Mot de passe modifié", + "password_changed.message": "

Mot de passe réinitialisé avec succès, veuillez vous reconnecter.", + "wrong_reset_code.title": "Code de Réinisialisation Incorrect", + "wrong_reset_code.message": "Le Code de Réinisialisation est Incorrect. Veillez réessayer, ou demander un nouveau Code de Réinisialisation.", + "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.", + "password_reset_sent": "Réinitialisation de Mot de Passe Envoyée", + "invalid_email": "Email Invalide / L'Email n'existe pas!" +} diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json new file mode 100644 index 0000000000..b3145818b9 --- /dev/null +++ b/public/language/fr/topic.json @@ -0,0 +1,39 @@ +{ + "topic": "Sujet", + "topics": "Sujets", + + "no_topics_found": "Aucun sujet trouvé!", + + "profile": "Profile", + "posted_by": "Envoyé by", + "chat": "Chat", + "notify_me": "Être notifié des réponses dans ce sujet", + "quote": "Citer", + "reply": "Répondre", + "edit": "Editer", + "delete": "Supprimer", + "banned": "bannir", + "link": "Lien", + + "thread_tools.title": "Outils du Fil", + "thread_tools.pin": "Epingler le fil", + "thread_tools.lock": "Verrouiller le fil", + "thread_tools.move": "Déplacer le fil", + "thread_tools.delete": "Supprimer le fil", + + "load_categories": "Chargement des Categories", + "disabled_categories_note": "Les Catégories Désactivées sont grisées", + "confirm_move": "Déplacer", + + "favourite": "Favoris", + "favourites": "Favoris", + "favourites.not_logged_in.title": "Non Connecté", + "favourites.not_logged_in.message": "Veuillez vous connecter avant de mettre ce message en Favoris", + "favourites.has_no_favourites": "Vous n'avez aucun Favoris, mettre en favoris des messages pour les voir apparaître ici!", + + "posted_by": "posté par", + "loading": "Chargement", + "more_posts": "d'autres Messages", + "move_topic": "Déplacer le Sujet", + "topic_will_be_moved_to": "Ce sujet sera déplacé vers la catégorie" +} diff --git a/public/language/fr/unread.json b/public/language/fr/unread.json new file mode 100644 index 0000000000..78f51ce820 --- /dev/null +++ b/public/language/fr/unread.json @@ -0,0 +1,5 @@ +{ + "no_unread_topics": "Aucun sujet non lu.", + "mark_all_read": "Marquer tout comme lu", + "load_more": "Charger la suite" +} diff --git a/public/language/fr/user.json b/public/language/fr/user.json new file mode 100644 index 0000000000..535975711b --- /dev/null +++ b/public/language/fr/user.json @@ -0,0 +1,36 @@ +{ + "banned": "Banni", + "offline": "Hors-ligne", + "email": "email", + "fullname": "Nom", + "website": "Site Web", + "location": "Emplacement", + "age": "age", + "joined": "adhésion", + "profil_views": "vues du profil", + "reputation": "réputation", + "posts": "messages", + "followers": "suiveurs", + "following": "suivis", + "signature": "signature", + "gravatar": "gravatar", + "birthday": "anniversaire", + + "change_picture": "changer d'image", + "edit": "editer", + "uploaded_pictures": "images uploadées", + "upload_new_picture": "uploader une nouvelle image", + "change_password": "chnger le mot de passe", + "confirm_password": "confirmer le mot de passe", + "password": "mot de passe", + + "upload_picture": "Uploader un image", + "upload_a_picture": "Uploader un image", + "image_spec": "Vous pouvez uploader seulement des fichiers de types PNG, JPG, ou GIF en dessous de 256kb.", + + "settings": "paramètres", + "show_my_email": "montrer mon email", + + "has_no_follower": "Cet utilisateur n'a aucun suiver :(", + "follows_no_one": "Cet utilisateur ne suit personne :(" +} diff --git a/public/language/fr/users.json b/public/language/fr/users.json new file mode 100644 index 0000000000..8cab0e5298 --- /dev/null +++ b/public/language/fr/users.json @@ -0,0 +1,9 @@ +{ + "latest_users": "Derniers Utilisateurs", + "top_posters": "Meilleurs Publieur", + "most_reputation": "Meilleur Réputation", + "online": "En Ligne", + "search": "Rechercher", + "enter_username": "Entrer un nom d'utilisateur pour rechercher", + "load_more": "Charger la suite" +} From 8e2cc1c8837f4b57835d7ddb6715e48e6a356fc0 Mon Sep 17 00:00:00 2001 From: tedr56 Date: Fri, 6 Dec 2013 21:06:07 +0100 Subject: [PATCH 02/60] Correct english language file --- public/language/en/topic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/en/topic.json b/public/language/en/topic.json index 2584436a22..434db262ed 100644 --- a/public/language/en/topic.json +++ b/public/language/en/topic.json @@ -32,7 +32,7 @@ "favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!", "posted_by": "posted by", - "loading": "Lade", + "loading": "Loading", "more_posts": "More Posts", "move_topic": "Move Topic", "topic_will_be_moved_to": "This topic will be moved to the category" From be6ed432234f084d38842fa2e3c102b6b3c3adc6 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Fri, 6 Dec 2013 18:58:22 -0500 Subject: [PATCH 03/60] removed the setName from sorted sets and stored them with _key like everything else --- src/database/mongo.js | 118 +++++++++++++++++++----------------------- src/routes/debug.js | 1 + 2 files changed, 54 insertions(+), 65 deletions(-) diff --git a/src/database/mongo.js b/src/database/mongo.js index 9408aff75a..c803e3a541 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -46,7 +46,7 @@ return; } if(collection) { - collection.ensureIndex({_key :1, setName:1}, {background:true}, function(err, name){ + collection.ensureIndex({_key :1}, {background:true}, function(err, name){ if(err) { winston.error("Error creating index " + err.message); } @@ -73,6 +73,39 @@ }); } + // + // helper functions + // + function removeHiddenFields(item) { + if(item) { + if(item._id) { + delete item._id; + } + if(item._key) { + delete item._key; + } + } + return item; + } + + function findItem(data, key) { + if(!data) { + return null; + } + + for(var i=0; i Date: Fri, 6 Dec 2013 21:08:21 -0500 Subject: [PATCH 04/60] small fixes --- src/categories.js | 2 +- src/posts.js | 17 ++++++++++++----- src/routes/api.js | 3 ++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/categories.js b/src/categories.js index 538bc0d5c3..a9d2138b5d 100644 --- a/src/categories.js +++ b/src/categories.js @@ -229,7 +229,7 @@ var db = require('./database.js'), return; } - posts.getPostSummaryByPids(pids, function(err, postData) { + posts.getPostSummaryByPids(pids, true, function(err, postData) { if (postData.length > count) { postData = postData.slice(0, count); } diff --git a/src/posts.js b/src/posts.js index c496afdd99..a9ab69f9d4 100644 --- a/src/posts.js +++ b/src/posts.js @@ -205,7 +205,7 @@ var db = require('./database'), Posts.addUserInfoToPost = function(post, callback) { user.getUserFields(post.uid, ['username', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned'], function(err, userData) { if (err) { - return callback(); + return callback(err); } postTools.parseSignature(userData.signature, function(err, signature) { @@ -242,7 +242,7 @@ var db = require('./database'), }); }; - Posts.getPostSummaryByPids = function(pids, callback) { + Posts.getPostSummaryByPids = function(pids, stripTags, callback) { var posts = []; @@ -283,10 +283,17 @@ var db = require('./database'), function(postData, next) { if (postData.content) { postTools.parse(postData.content, function(err, content) { - if (!err) { + if(err) { + return next(err); + } + + if(stripTags) { postData.content = utils.strip_tags(content); + } else { + postData.content = content; } - next(err, postData); + + next(null, postData); }); } else { next(null, postData); @@ -504,7 +511,7 @@ var db = require('./database'), if (err) return callback(err, null); - Posts.getPostSummaryByPids(pids, function(err, posts) { + Posts.getPostSummaryByPids(pids, false, function(err, posts) { if (err) return callback(err, null); diff --git a/src/routes/api.js b/src/routes/api.js index 0bebd9f975..dde83ad9e8 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -2,6 +2,7 @@ var path = require('path'), nconf = require('nconf'), async = require('async'), + db = require('../database'), user = require('../user'), auth = require('./authentication'), topics = require('../topics'), @@ -232,7 +233,7 @@ var path = require('path'), return callback(err, null); } - posts.getPostSummaryByPids(pids, function (err, posts) { + posts.getPostSummaryByPids(pids, false, function (err, posts) { if (err){ return callback(err, null); } From b0b0f3640c66e40eef9664a97ccd418e8948ab68 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sat, 7 Dec 2013 15:00:12 -0500 Subject: [PATCH 05/60] closed #629 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index af257f5775..d7216d83ca 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "socket.io": "~0.9.16", "redis": "0.8.3", - "mongodb": "1.3.20", + "mongodb": "~1.3.19", "express": "3.2.0", "express-namespace": "~0.1.1", "emailjs": "0.3.4", From d6f8162f17e9caaec7dd8e3ebe26a19987645099 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sat, 7 Dec 2013 15:02:00 -0500 Subject: [PATCH 06/60] upping markdown minver again? --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d7216d83ca..0defda969a 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "uglify-js": "~2.4.0", "validator": "~1.5.1", "nodebb-plugin-mentions": "~0.1.15", - "nodebb-plugin-markdown": "~0.1.9", + "nodebb-plugin-markdown": "~0.2.0", "nodebb-theme-vanilla": "~0.0.9", "nodebb-theme-cerulean": "0.0.10", "cron": "~1.0.1" From 347f5c132eb5abc5e27298abe3c5da09cac82f76 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sat, 7 Dec 2013 15:47:00 -0500 Subject: [PATCH 07/60] updates to language files, capitalizing some values across languages --- public/language/de/user.json | 4 +-- public/language/en/user.json | 46 +++++++++++++------------- public/language/es/user.json | 48 ++++++++++++++-------------- public/templates/account.tpl | 2 +- public/templates/accountsettings.tpl | 2 +- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/public/language/de/user.json b/public/language/de/user.json index 492307f50d..f8aefc8c47 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -7,7 +7,7 @@ "location": "Wohnort", "age": "Alter", "joined": "Beigetreten", - "profil_views": "Profilaufrufe", + "profile_views": "Profilaufrufe", "reputation": "Reputation", "posts": "Posts", "followers": "Follower", @@ -29,7 +29,7 @@ "image_spec": "Du solltest nur Dateien die PNG, JPG, oder GIF kleiner als 256kb hochladen.", "settings": "Einstellungen", - "show_my_email": "Zeige meine E-Mail Adresse an.", + "show_email": "Zeige meine E-Mail Adresse an.", "has_no_follower": "Dieser User hat noch keine Follower.", "follows_no_one": "Dieser User folgt noch niemanden." diff --git a/public/language/en/user.json b/public/language/en/user.json index 512fad96c3..d414d42e0f 100644 --- a/public/language/en/user.json +++ b/public/language/en/user.json @@ -1,35 +1,35 @@ { "banned": "Banned", - "offline": "offline", - "email": "email", - "fullname": "full name", - "website": "website", - "location": "location", - "age": "age", - "joined": "joined", - "profil_views": "profil views", - "reputation": "reputation", - "posts": "posts", - "followers": "followers", - "following": "following", - "signature": "signature", - "gravatar": "gravatar", - "birthday": "birthday", + "offline": "Offline", + "email": "Email", + "fullname": "Full Name", + "website": "Website", + "location": "Location", + "age": "Age", + "joined": "Joined", + "profile_views": "Profile views", + "reputation": "Reputation", + "posts": "Posts", + "followers": "Followers", + "following": "Following", + "signature": "Signature", + "gravatar": "Gravatar", + "birthday": "Birthday", - "change_picture": "change picture", - "edit": "edit", - "uploaded_pictures": "uploaded pictures", - "upload_new_picture": "upload new picture", - "change_password": "change password", - "confirm_password": "confirm password", - "password": "password", + "change_picture": "Change Picture", + "edit": "Edit", + "uploaded_pictures": "Uploaded Pictures", + "upload_new_picture": "Upload New Picture", + "change_password": "Change Password", + "confirm_password": "Confirm Password", + "password": "Password", "upload_picture": "Upload picture", "upload_a_picture": "Upload a picture", "image_spec": "You may only upload PNG, JPG, or GIF files under 256kb.", "settings": "settings", - "show_my_email": "show my email", + "show_email": "Show My Email", "has_no_follower": "This user doesn't have any followers :(", "follows_no_one": "This user isn't following anyone :(" diff --git a/public/language/es/user.json b/public/language/es/user.json index f1bfdf4ed0..41d42990d8 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -1,35 +1,35 @@ { "banned": "Banneado", - "offline": "desconectado", - "email": "email", - "fullname": "nombre completo", - "website": "website", - "location": "ubicación", - "age": "edad", - "joined": "registro", - "profil_views": "visitas en su perfil", - "reputation": "reputación", - "posts": "posts", - "followers": "seguidores", - "following": "siguiendo", - "signature": "firma", - "gravatar": "gravatar", - "birthday": "cumpleaños", + "offline": "Desconectado", + "email": "Email", + "fullname": "Nombre Completo", + "website": "Website", + "location": "Ubicación", + "age": "Edad", + "joined": "Registro", + "profile_views": "Visitas en su perfil", + "reputation": "Reputación", + "posts": "Posts", + "followers": "Seguidores", + "following": "Siguiendo", + "signature": "Firma", + "gravatar": "Gravatar", + "birthday": "Cumpleaños", - "change_picture": "cambiar foto", - "edit": "editar", - "uploaded_pictures": "fotos cargadas", - "upload_new_picture": "cargar nueva foto", - "change_password": "cambiar contraseña", - "confirm_password": "confirmar contraseña", - "password": "contraseña", + "change_picture": "Cambiar Foto", + "edit": "Editar", + "uploaded_pictures": "Fotos Cargadas", + "upload_new_picture": "Cargar Nueva Foto", + "change_password": "Cambiar Contraseña", + "confirm_password": "Confirmar Contraseña", + "password": "Contraseña", "upload_picture": "Cargar foto", "upload_a_picture": "Cargar una foto", "image_spec": "Solo puedes usar PNG, JPG, o GIF hasta 256kb.", - "settings": "opciones", - "show_my_email": "mostrar mi email", + "settings": "Opciones", + "show_email": "Mostrar mi Email", "has_no_follower": "Este miembro no tiene seguidores :(", "follows_no_one": "Este miembro no sigue a nadie, que pena :(" diff --git a/public/templates/account.tpl b/public/templates/account.tpl index da0014b0fe..200fd854c2 100644 --- a/public/templates/account.tpl +++ b/public/templates/account.tpl @@ -53,7 +53,7 @@
- + {profileviews}
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl index f705621153..f3987b69cc 100644 --- a/public/templates/accountsettings.tpl +++ b/public/templates/accountsettings.tpl @@ -12,7 +12,7 @@

privacy

From 090d35f306bd8d471ab347d8f524afdb1bc244c3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 7 Dec 2013 15:48:30 -0500 Subject: [PATCH 08/60] clean up conditional comments in the DOM; conditionals now treat undefined variables as false; closes #617 --- public/src/templates.js | 9 +++++++-- src/database/mongo.js | 3 +-- src/database/redis.js | 2 -- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/src/templates.js b/public/src/templates.js index 6772f998b7..04972140a5 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -320,14 +320,16 @@ if (conditionalBlock[1]) { // there is an else statement if (!value) { - template = template.replace(matches[i], conditionalBlock[1]); + template = template.replace(matches[i], conditionalBlock[1].replace(//gi, '')); } else { - template = template.replace(matches[i], conditionalBlock[0]); + template = template.replace(matches[i], conditionalBlock[0].replace(//gi, '')); } } else { // regular if statement if (!value) { template = template.replace(matches[i], ''); + } else { + template = template.replace(matches[i], matches[i].replace(//gi, '')); } } } @@ -351,6 +353,9 @@ var regex = new RegExp("{" + namespace + "[\\s\\S]*?}", 'g'); template = template.replace(regex, ''); } + //console.log (template); + // clean up all undefined conditionals + template = template.replace(//gi, ''); return template; diff --git a/src/database/mongo.js b/src/database/mongo.js index c803e3a541..d6af3bc0b2 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -188,8 +188,7 @@ stats.raw = JSON.stringify(stats, null, 4); stats.mongo = true; - //remove this when andrew adds in undefined checking to templates - stats.redis = false; + callback(err, stats); }); diff --git a/src/database/redis.js b/src/database/redis.js index b3a27ef895..d24573384b 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -168,8 +168,6 @@ } redisData.raw = JSON.stringify(redisData, null, 4); redisData.redis = true; - //remove this when andrew adds in undefined checking to templates - redisData.mongo = false; callback(null, redisData); }); From 36745608bf5e3700b11faadb391e7cddc55cfd32 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 7 Dec 2013 15:49:48 -0500 Subject: [PATCH 09/60] removed console.log --- public/src/templates.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/templates.js b/public/src/templates.js index 04972140a5..51dfd0dc65 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -353,7 +353,7 @@ var regex = new RegExp("{" + namespace + "[\\s\\S]*?}", 'g'); template = template.replace(regex, ''); } - //console.log (template); + // clean up all undefined conditionals template = template.replace(//gi, ''); From 34fc326a378c80b60fcd3dadb910982525533962 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Sat, 7 Dec 2013 15:59:44 -0500 Subject: [PATCH 10/60] closes #618 --- public/src/forum/footer.js | 2 +- public/src/modules/chat.js | 4 ++-- src/websockets.js | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index eb8d0f3e20..046a7e8186 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -208,7 +208,7 @@ }); }); - socket.on('chatMessage', function(data) { + socket.on('event:chats.receive', function(data) { require(['chat'], function(chat) { var modal = null; if (chat.modalExists(data.fromuid)) { diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 2aeb2f02bf..8c3b551330 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -114,7 +114,7 @@ define(['taskbar'], function(taskbar) { } function getChatMessages(chatModal, callback) { - socket.emit('getChatMessages', {touid:chatModal.touid}, function(messages) { + socket.emit('api:chats.get', {touid:chatModal.touid}, function(messages) { for(var i = 0; i Date: Sat, 7 Dec 2013 16:11:37 -0500 Subject: [PATCH 11/60] added translation to new post creation, closes #627 --- public/src/forum/category.js | 51 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 44a11eaea9..5c7d6c7e99 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -83,36 +83,39 @@ define(function () { Category.onNewTopic = function(data) { var html = templates.prepare(templates['category'].blocks['topics']).parse({ topics: [data] - }), - topic = $(html), - container = $('#topics-container'), - topics = $('#topics-container').children('.category-item'), - numTopics = topics.length; - - jQuery('#topics-container, .category-sidebar').removeClass('hidden'); - jQuery('#category-no-topics').remove(); - - if (numTopics > 0) { - for (var x = 0; x < numTopics; x++) { - if ($(topics[x]).find('.fa-thumb-tack').length) { - if(x === numTopics - 1) { - topic.insertAfter(topics[x]); + }); + + translator.translate(html, function(translatedHTML) { + var topic = $(translatedHTML), + container = $('#topics-container'), + topics = $('#topics-container').children('.category-item'), + numTopics = topics.length; + + jQuery('#topics-container, .category-sidebar').removeClass('hidden'); + jQuery('#category-no-topics').remove(); + + if (numTopics > 0) { + for (var x = 0; x < numTopics; x++) { + if ($(topics[x]).find('.fa-thumb-tack').length) { + if(x === numTopics - 1) { + topic.insertAfter(topics[x]); + } + continue; } - continue; + topic.insertBefore(topics[x]); + break; } - topic.insertBefore(topics[x]); - break; + } else { + container.append(topic); } - } else { - container.append(topic); - } - topic.hide().fadeIn('slow'); - socket.emit('api:categories.getRecentReplies', templates.get('category_id')); + topic.hide().fadeIn('slow'); + socket.emit('api:categories.getRecentReplies', templates.get('category_id')); - addActiveUser(data); + addActiveUser(data); - $('#topics-container span.timeago').timeago(); + $('#topics-container span.timeago').timeago(); + }); } function addActiveUser(data) { From e0e153eafbc1a6c5d2d0081709e96d2c03a1e376 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 7 Dec 2013 16:14:44 -0500 Subject: [PATCH 12/60] added translation to category infinite loader method --- public/src/forum/category.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 5c7d6c7e99..6b25a85701 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -134,20 +134,22 @@ define(function () { } Category.onTopicsLoaded = function(topics) { - var html = templates.prepare(templates['category'].blocks['topics']).parse({ topics: topics - }), - container = $('#topics-container'); + }); + + translator.translate(html, function(translatedHTML) { + var container = $('#topics-container'); - jQuery('#topics-container, .category-sidebar').removeClass('hidden'); - jQuery('#category-no-topics').remove(); + jQuery('#topics-container, .category-sidebar').removeClass('hidden'); + jQuery('#category-no-topics').remove(); - html = $(html); - container.append(html); + html = $(translatedHTML); + container.append(html); - $('#topics-container span.timeago').timeago(); - app.makeNumbersHumanReadable(html.find('.human-readable-number')); + $('#topics-container span.timeago').timeago(); + app.makeNumbersHumanReadable(html.find('.human-readable-number')); + }); } Category.loadMoreTopics = function(cid) { From 4c90d22e43f440083fa84d1da8fa94448ab57bea Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Sat, 7 Dec 2013 16:15:07 -0500 Subject: [PATCH 13/60] closes #619 --- src/websockets.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/websockets.js b/src/websockets.js index 6afcf16356..341038b508 100644 --- a/src/websockets.js +++ b/src/websockets.js @@ -696,9 +696,15 @@ websockets.init = function(io) { var msg = utils.strip_tags(data.message); - user.getUserField(uid, 'username', function(err, username) { + user.getMultipleUserFields([uid, touid], ['username'], function(err, usersData) { + if(err) { + return; + } + var finalMessage = username + ' : ' + msg, - notifText = 'New message from ' + username + ''; + notifText = 'New message from ' + username + '', + username = usersData[0].username, + toUsername = usersData[1].username; if (!isUserOnline(touid)) { notifications.create(notifText, 'javascript:app.openChat('' + username + '', ' + uid + ');', 'notification_' + uid + '_' + touid, function(nid) { @@ -731,7 +737,7 @@ websockets.init = function(io) { for (var x = 0; x < numSockets; ++x) { userSockets[uid][x].emit('event:chats.receive', { fromuid: touid, - username: username, + username: toUsername, message: 'You : ' + msg, timestamp: Date.now() }); From 98cf6eec71b58669ee068941c92115f7b0282b4d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 7 Dec 2013 16:18:01 -0500 Subject: [PATCH 14/60] shift clicking now opens links in a new window, closes #630 --- public/src/ajaxify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index bba039ea66..640c4da443 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -154,7 +154,7 @@ var ajaxify = {}; return; } - if (!e.ctrlKey && e.which === 1) { + if ((!e.ctrlKey && !e.shiftKey) && e.which === 1) { if (this.host === window.location.host) { // Internal link var url = this.href.replace(rootUrl + '/', ''); From ceac8e2dc9fe0f31fe8419dff7e09058d6481dca Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 7 Dec 2013 16:20:31 -0500 Subject: [PATCH 15/60] added translation to unread infinite loader --- public/src/forum/unread.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js index 6debeeba84..5151eb37cb 100644 --- a/public/src/forum/unread.js +++ b/public/src/forum/unread.js @@ -74,15 +74,18 @@ define(function() { var html = templates.prepare(templates['unread'].blocks['topics']).parse({ topics: topics - }), - container = $('#topics-container'); + }); + + translator.translate(html, function(translatedHTML) { + var container = $('#topics-container'); - $('#category-no-topics').remove(); + $('#category-no-topics').remove(); - html = $(html); - container.append(html); - $('span.timeago').timeago(); - app.makeNumbersHumanReadable(html.find('.human-readable-number')); + html = $(translatedHTML); + container.append(html); + $('span.timeago').timeago(); + app.makeNumbersHumanReadable(html.find('.human-readable-number')); + }); } function loadMoreTopics() { From 6c9e28232fbe61b922285cb201619758cf94136d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 7 Dec 2013 16:21:12 -0500 Subject: [PATCH 16/60] added translation method to recent's infinite loader --- public/src/forum/recent.js | 18 ++++++++++-------- public/src/forum/unread.js | 1 - 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/public/src/forum/recent.js b/public/src/forum/recent.js index 6b162db34f..c883c9c54b 100644 --- a/public/src/forum/recent.js +++ b/public/src/forum/recent.js @@ -81,18 +81,20 @@ define(function() { } Recent.onTopicsLoaded = function(topics) { - var html = templates.prepare(templates['recent'].blocks['topics']).parse({ topics: topics - }), - container = $('#topics-container'); + }); + + translator.translate(html, function(translatedHTML) { + var container = $('#topics-container'); - $('#category-no-topics').remove(); + $('#category-no-topics').remove(); - html = $(html); - container.append(html); - $('span.timeago').timeago(); - app.makeNumbersHumanReadable(html.find('.human-readable-number')); + html = $(html); + container.append(html); + $('span.timeago').timeago(); + app.makeNumbersHumanReadable(html.find('.human-readable-number')); + }); } Recent.loadMoreTopics = function() { diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js index 5151eb37cb..e0dd1dd7d7 100644 --- a/public/src/forum/unread.js +++ b/public/src/forum/unread.js @@ -71,7 +71,6 @@ define(function() { }); function onTopicsLoaded(topics) { - var html = templates.prepare(templates['unread'].blocks['topics']).parse({ topics: topics }); From ca087e6fa7f4a54f647dd159080cb7bceab47ec5 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 7 Dec 2013 16:27:22 -0500 Subject: [PATCH 17/60] fixes #576 --- public/src/ajaxify.js | 2 +- public/templates/footer.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 640c4da443..24f1e2e105 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -90,7 +90,7 @@ var ajaxify = {}; translator.load(tpl_url); - jQuery('#footer, #content').addClass('ajaxifying'); + jQuery('#footer, #content').removeClass('hide').addClass('ajaxifying'); templates.flush(); templates.load_template(function () { diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl index a9f51f2242..4434336ed8 100644 --- a/public/templates/footer.tpl +++ b/public/templates/footer.tpl @@ -59,7 +59,7 @@
-