From f0ed816edb08352c6e564942b97cb4df4fb429fa Mon Sep 17 00:00:00 2001 From: A Catty Alpaca Date: Tue, 23 Dec 2014 23:49:15 +0100 Subject: [PATCH 001/897] fix generated widgets areas glitching on small screens because columns should always be in rows --- public/src/widgets.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/widgets.js b/public/src/widgets.js index 9e34ba9513..2200f58d5e 100644 --- a/public/src/widgets.js +++ b/public/src/widgets.js @@ -51,12 +51,12 @@ if (!area.length && window.location.pathname.indexOf('/admin') === -1 && renderedWidgets.length) { if (location === 'footer' && !$('#content [widget-area="footer"]').length) { - $('#content').append($('
')); + $('#content').append($('
')); } else if (location === 'sidebar' && !$('#content [widget-area="sidebar"]').length) { - $('#content > *').wrapAll($('
')); - $('#content').append($('
')); + $('#content > *').wrapAll($('
')); + $('#content').append($('
')); } else if (location === 'header' && !$('#content [widget-area="header"]').length) { - $('#content').prepend($('
')); + $('#content').prepend($('
')); } area = $('#content [widget-area="' + location + '"]'); From f9887de478e5e8323c8673a7c2c041f8a652217d Mon Sep 17 00:00:00 2001 From: Oleksandr Pidlisnyi Date: Fri, 2 Jan 2015 17:29:03 +0200 Subject: [PATCH 002/897] footer.tpl loggedIn variable support --- src/middleware/middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 72dc37245f..57b8f20159 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -190,7 +190,7 @@ middleware.buildHeader = function(req, res, next) { controllers.api.getConfig(req, res, next); }, footer: function(next) { - app.render('footer', {}, next); + app.render('footer', {loggedIn: (req.user ? parseInt(req.user.uid, 10) !== 0 : false)}, next); } }, function(err, results) { if (err) { From 3da64660454b4a9d4803bcb0ee43d5f70eb68a5c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 3 Jan 2015 03:37:53 -0500 Subject: [PATCH 003/897] I thought I was on holiday (fixes infinite loop on language calls) --- public/src/translator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/translator.js b/public/src/translator.js index 1802e858d8..2fd8b79d1a 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -123,7 +123,7 @@ var parsedKey = key.replace('[[', '').replace(']]', '').split(':'); if (!(parsedKey[0] && parsedKey[1])) { - return; + return callback(data); } var languageFile = parsedKey[0]; From 112a1e8c8594ce494d8c2ca8b02d0cc9810fea22 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sat, 3 Jan 2015 17:53:25 -0500 Subject: [PATCH 004/897] happy new year! --- src/views/admin/footer.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/footer.tpl b/src/views/admin/footer.tpl index 92aba3d202..c54c67dd3c 100644 --- a/src/views/admin/footer.tpl +++ b/src/views/admin/footer.tpl @@ -43,7 +43,7 @@
From f3a113d318d9722c4d58afdd8fd7e2be1bf96fef Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 3 Jan 2015 20:07:09 -0500 Subject: [PATCH 005/897] jslinting on holiday ftw --- tests/categories.js | 2 ++ tests/database.js | 6 ++++-- tests/groups.js | 5 ++++- tests/messaging.js | 15 +++++++++------ tests/topics.js | 1 + tests/user.js | 3 +++ tests/utils.js | 25 ++++++++++++++----------- 7 files changed, 37 insertions(+), 20 deletions(-) diff --git a/tests/categories.js b/tests/categories.js index 7909f0a0f8..95c7a0f14b 100644 --- a/tests/categories.js +++ b/tests/categories.js @@ -1,3 +1,5 @@ +'use strict'; +/*global require, process, after*/ var winston = require('winston'); diff --git a/tests/database.js b/tests/database.js index 9118823d00..3f8c119002 100644 --- a/tests/database.js +++ b/tests/database.js @@ -1,6 +1,8 @@ +'use strict'; +/*global require*/ + var assert = require('assert'), - db = require('./mocks/databasemock'), - async = require('async'); + db = require('./mocks/databasemock'); describe('Test database', function() { diff --git a/tests/groups.js b/tests/groups.js index 02d9cd2ffa..6f36cbfa2c 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -1,3 +1,6 @@ +'use strict'; +/*global require, before, after*/ + var assert = require('assert'), async = require('async'), @@ -14,7 +17,7 @@ describe('Groups', function() { }, function(next) { // Create a new user - User.create({ + User.create({ username: 'testuser', email: 'b@c.com' }, done); diff --git a/tests/messaging.js b/tests/messaging.js index 29d3e79418..a709640430 100644 --- a/tests/messaging.js +++ b/tests/messaging.js @@ -1,3 +1,6 @@ +'use strict'; +/*global require, before, after*/ + var assert = require('assert'), db = require('./mocks/databasemock'), async = require('async'), @@ -6,7 +9,7 @@ var assert = require('assert'), Messaging = require('../src/messaging'), testUids; -describe("Messaging Library", function() { +describe('Messaging Library', function() { before(function(done) { // Create 3 users: 1 admin, 2 regular async.parallel([ @@ -22,7 +25,7 @@ describe("Messaging Library", function() { }); }); - describe(".canMessage()", function() { + describe('.canMessage()', function() { it('should not error out', function(done) { Messaging.canMessage(testUids[1], testUids[2], function(err, allowed) { assert.ifError(err); @@ -30,14 +33,14 @@ describe("Messaging Library", function() { }); }); - it("should allow messages to be sent to an unrestricted user", function(done) { + it('should allow messages to be sent to an unrestricted user', function(done) { Messaging.canMessage(testUids[1], testUids[2], function(err, allowed) { assert.strictEqual(allowed, true, 'should be true, received ' + allowed); done(); }); }); - it("should NOT allow messages to be sent to a restricted user", function(done) { + it('should NOT allow messages to be sent to a restricted user', function(done) { User.setSetting(testUids[1], 'restrictChat', '1', function() { Messaging.canMessage(testUids[2], testUids[1], function(err, allowed) { assert.strictEqual(allowed, false, 'should be false, received ' + allowed); @@ -46,14 +49,14 @@ describe("Messaging Library", function() { }); }); - it("should always allow admins through", function(done) { + it('should always allow admins through', function(done) { Messaging.canMessage(testUids[0], testUids[1], function(err, allowed) { assert.strictEqual(allowed, true, 'should be true, received ' + allowed); done(); }); }); - it("should allow messages to be sent to a restricted user if restricted user follows sender", function(done) { + it('should allow messages to be sent to a restricted user if restricted user follows sender', function(done) { User.follow(testUids[1], testUids[2], function() { Messaging.canMessage(testUids[2], testUids[1], function(err, allowed) { assert.strictEqual(allowed, true, 'should be true, received ' + allowed); diff --git a/tests/topics.js b/tests/topics.js index 6ee2d3ca79..bdc15643ba 100644 --- a/tests/topics.js +++ b/tests/topics.js @@ -1,4 +1,5 @@ 'use strict'; +/*global require, before, beforeEach, after*/ var assert = require('assert'), db = require('./mocks/databasemock'), diff --git a/tests/user.js b/tests/user.js index 9e53b4c4c5..3ef541623b 100644 --- a/tests/user.js +++ b/tests/user.js @@ -1,3 +1,6 @@ +'use strict'; +/*global require, process, before, beforeEach, after*/ + var winston = require('winston'); process.on('uncaughtException', function (err) { diff --git a/tests/utils.js b/tests/utils.js index ec88aa24c1..befb2f78d2 100644 --- a/tests/utils.js +++ b/tests/utils.js @@ -1,35 +1,38 @@ +'use strict'; +/*global require*/ + var assert = require('assert'), utils = require('./../public/src/utils.js'); -describe("Utility Methods", function(){ - describe("username validation", function(){ - it("accepts latin-1 characters", function(){ +describe('Utility Methods', function(){ + describe('username validation', function(){ + it('accepts latin-1 characters', function(){ var username = "John\"'-. Doeäâèéë1234"; assert(utils.isUserNameValid(username), 'invalid username'); }); - it("rejects empty string", function(){ - var username = ""; + it('rejects empty string', function(){ + var username = ''; assert.ifError(utils.isUserNameValid(username), 'accepted as valid username'); }); }); - describe("email validation", function(){ - it("accepts sample address", function(){ + describe('email validation', function(){ + it('accepts sample address', function(){ var email = 'sample@example.com'; assert(utils.isEmailValid(email), 'invalid email'); }); - it("rejects empty address", function(){ + it('rejects empty address', function(){ var email = ''; assert.ifError(utils.isEmailValid(email), 'accepted as valid email'); }); }); - describe("UUID generation", function(){ - it("return unique random value every time", function(){ + describe('UUID generation', function(){ + it('return unique random value every time', function(){ var uuid1 = utils.generateUUID(), uuid2 = utils.generateUUID(); - assert.notEqual(uuid1, uuid2, "matches"); + assert.notEqual(uuid1, uuid2, 'matches'); }); }); }); From 357de92624d1dcd1d05bfcf2d24c8d0048176f6b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 3 Jan 2015 20:08:49 -0500 Subject: [PATCH 006/897] tests/database linting --- tests/database/hash.js | 4 ++-- tests/database/keys.js | 1 + tests/database/list.js | 1 + tests/database/sets.js | 4 ++-- tests/database/sorted.js | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/database/hash.js b/tests/database/hash.js index 2086dc1af7..1478f401a1 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -1,7 +1,7 @@ 'use strict'; +/*global require, after*/ -var async = require('async'), - assert = require('assert'), +var assert = require('assert'), db = require('../mocks/databasemock'); describe('Hash methods', function() { diff --git a/tests/database/keys.js b/tests/database/keys.js index 415238832a..faa3133dcf 100644 --- a/tests/database/keys.js +++ b/tests/database/keys.js @@ -1,4 +1,5 @@ 'use strict'; +/*global require, after*/ var async = require('async'), assert = require('assert'), diff --git a/tests/database/list.js b/tests/database/list.js index 485526852d..abb4c0e939 100644 --- a/tests/database/list.js +++ b/tests/database/list.js @@ -1,4 +1,5 @@ 'use strict'; +/*global require, after*/ var async = require('async'), assert = require('assert'), diff --git a/tests/database/sets.js b/tests/database/sets.js index bdcd4fba30..b93d9a90e7 100644 --- a/tests/database/sets.js +++ b/tests/database/sets.js @@ -1,7 +1,7 @@ 'use strict'; +/*global require, after*/ -var async = require('async'), - assert = require('assert'), +var assert = require('assert'), db = require('../mocks/databasemock'); describe('Set methods', function() { diff --git a/tests/database/sorted.js b/tests/database/sorted.js index a675c709ec..fbe8ebb569 100644 --- a/tests/database/sorted.js +++ b/tests/database/sorted.js @@ -1,7 +1,7 @@ 'use strict'; +/*global require, after*/ -var async = require('async'), - assert = require('assert'), +var assert = require('assert'), db = require('../mocks/databasemock'); describe('Sorted Set methods', function() { From 64468a6f169786b0127140a4506debe5d5b8fa25 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 3 Jan 2015 20:10:08 -0500 Subject: [PATCH 007/897] more linting --- tests/mocks/databasemock.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/mocks/databasemock.js b/tests/mocks/databasemock.js index e694a9c9ba..d3dea94a8c 100644 --- a/tests/mocks/databasemock.js +++ b/tests/mocks/databasemock.js @@ -5,10 +5,9 @@ (function(module) { 'use strict'; - /*global before*/ + /*global require, before*/ - var utils = require('./../../public/src/utils.js'), - path = require('path'), + var path = require('path'), nconf = require('nconf'), winston = require('winston'), errorText; @@ -30,23 +29,23 @@ if(!testDbConfig){ errorText = 'test_database is not defined'; winston.info( - "\n===========================================================\n"+ - "Please, add parameters for test database in config.json\n"+ - "For example (redis):\n"+ + '\n===========================================================\n'+ + 'Please, add parameters for test database in config.json\n'+ + 'For example (redis):\n'+ '"test_database": {' + '\n' + ' "host": "127.0.0.1",' + '\n' + ' "port": "6379",' + '\n' + ' "password": "",' + '\n' + ' "database": "1"' + '\n' + '}\n'+ - " or (mongo):\n" + + ' or (mongo):\n' + '"test_database": {' + '\n' + ' "host": "127.0.0.1",' + '\n' + ' "port": "27017",' + '\n' + ' "password": "",' + '\n' + ' "database": "1"' + '\n' + '}\n'+ - "===========================================================" + '===========================================================' ); winston.error(errorText); throw new Error(errorText); From 8522af504a489f199798b577e3c9c66a9076f156 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Sun, 4 Jan 2015 11:37:20 -0500 Subject: [PATCH 008/897] closed #2571 --- src/controllers/api.js | 3 ++- src/controllers/index.js | 6 +++--- src/meta/title.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/controllers/api.js b/src/controllers/api.js index 52bfd6233f..75e4d558dd 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -6,6 +6,7 @@ var pkg = require('./../../package.json'), plugins = require('./../plugins'), widgets = require('../widgets'), + validator = require('validator'), nconf = require('nconf'); var apiController = {}; @@ -16,7 +17,7 @@ apiController.getConfig = function(req, res, next) { config.socketioTransports = nconf.get('socket.io:transports') || ['polling', 'websocket']; config.websocketAddress = nconf.get('socket.io:address') || ''; config.version = pkg.version; - config.siteTitle = meta.config.title || meta.config.browserTitle || 'NodeBB'; + config.siteTitle = validator.escape(meta.config.title || meta.config.browserTitle || 'NodeBB'); config.showSiteTitle = parseInt(meta.config.showSiteTitle, 10) === 1; config.postDelay = meta.config.postDelay; config.minimumTitleLength = meta.config.minimumTitleLength; diff --git a/src/controllers/index.js b/src/controllers/index.js index 2398ae7b00..0e982c59fa 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -43,13 +43,13 @@ Controllers.home = function(req, res, next) { header: function (next) { res.locals.metaTags = [{ name: "title", - content: meta.config.title || 'NodeBB' + content: validator.escape(meta.config.title || 'NodeBB') }, { name: "description", - content: meta.config.description || '' + content: validator.escape(meta.config.description || '') }, { property: 'og:title', - content: 'Index | ' + (meta.config.title || 'NodeBB') + content: 'Index | ' + validator.escape(meta.config.title || 'NodeBB') }, { property: 'og:type', content: 'website' diff --git a/src/meta/title.js b/src/meta/title.js index 286c25ac6b..a476cb61a3 100644 --- a/src/meta/title.js +++ b/src/meta/title.js @@ -17,7 +17,7 @@ module.exports = function(Meta) { Meta.title.build = function (urlFragment, language, locals, callback) { var uri = ''; - var fallbackTitle = Meta.config.browserTitle || Meta.config.title || 'NodeBB'; + var fallbackTitle = validator.escape(Meta.config.browserTitle || Meta.config.title || 'NodeBB'); try { uri = decodeURIComponent(urlFragment); } catch(e) { From a36391864a3e66a46c72ecd7b75e2816dd65118e Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Sun, 4 Jan 2015 11:41:37 -0500 Subject: [PATCH 009/897] fix recent replies crash, closes #2575 --- src/categories/recentreplies.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js index cbf5f5cd8b..bb1ae32775 100644 --- a/src/categories/recentreplies.js +++ b/src/categories/recentreplies.js @@ -61,7 +61,7 @@ module.exports = function(Categories) { function assignPostsToCategory(category, posts) { category.posts = posts.filter(function(post) { - return parseInt(post.category.cid, 10) === parseInt(category.cid, 10); + return post.category && parseInt(post.category.cid, 10) === parseInt(category.cid, 10); }).sort(function(a, b) { return b.timestamp - a.timestamp; }).slice(0, parseInt(category.numRecentReplies, 10)); From e26f8c3290a80567e1a6e123ff23c8a0ec55cb8b Mon Sep 17 00:00:00 2001 From: TheBronx Date: Mon, 5 Jan 2015 13:43:44 +0100 Subject: [PATCH 010/897] update bootstrap js to v3.3.1 fixes #2579 update bootstrap.min.js to v3.3.1 fixes #2579 --- public/vendor/bootstrap/js/bootstrap.min.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/vendor/bootstrap/js/bootstrap.min.js b/public/vendor/bootstrap/js/bootstrap.min.js index 1a6258efcb..d839865900 100644 --- a/public/vendor/bootstrap/js/bootstrap.min.js +++ b/public/vendor/bootstrap/js/bootstrap.min.js @@ -1,7 +1,7 @@ /*! - * Bootstrap v3.0.3 (http://getbootstrap.com) - * Copyright 2013 Twitter, Inc. - * Licensed under http://www.apache.org/licenses/LICENSE-2.0 + * Bootstrap v3.3.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ - -if("undefined"==typeof jQuery)throw new Error("Bootstrap requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]}}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d)};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.is("input")?"val":"html",e=c.data();a+="Text",e.resetText||c.data("resetText",c[d]()),c[d](e[a]||this.options[a]),setTimeout(function(){"loadingText"==a?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="buttons"]'),b=!0;if(a.length){var c=this.$element.find("input");"radio"===c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?b=!1:a.find(".active").removeClass("active")),b&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}b&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}this.sliding=!0,f&&this.pause();var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});if(!e.hasClass("active")){if(this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(j),j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(600)}else{if(this.$element.trigger(j),j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")}return f&&this.cycle(),this}};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?(this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350),void 0):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(jQuery),+function(a){"use strict";function b(){a(d).remove(),a(e).each(function(b){var d=c(a(this));d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown")),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown"))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){if("ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('
').insertAfter(a(this)).on("click",b),f.trigger(d=a.Event("show.bs.dropdown")),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown"),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=a("[role=menu] li:not(.divider):visible a",f);if(h.length){var i=h.index(h.filter(":focus"));38==b.keyCode&&i>0&&i--,40==b.keyCode&&i').appendTo(document.body),this.$element.on("click.dismiss.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data("bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focus",i="hover"==g?"mouseleave":"blur";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show),void 0):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide),void 0):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this.tip();this.setContent(),this.options.animation&&c.addClass("fade");var d="function"==typeof this.options.placement?this.options.placement.call(this,c[0],this.$element[0]):this.options.placement,e=/\s?auto?\s?/i,f=e.test(d);f&&(d=d.replace(e,"")||"top"),c.detach().css({top:0,left:0,display:"block"}).addClass(d),this.options.container?c.appendTo(this.options.container):c.insertAfter(this.$element);var g=this.getPosition(),h=c[0].offsetWidth,i=c[0].offsetHeight;if(f){var j=this.$element.parent(),k=d,l=document.documentElement.scrollTop||document.body.scrollTop,m="body"==this.options.container?window.innerWidth:j.outerWidth(),n="body"==this.options.container?window.innerHeight:j.outerHeight(),o="body"==this.options.container?0:j.offset().left;d="bottom"==d&&g.top+g.height+i-l>n?"top":"top"==d&&g.top-l-i<0?"bottom":"right"==d&&g.right+h>m?"left":"left"==d&&g.left-h

'}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(c).is("body")?a(window):a(c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#\w/.test(e)&&a(e);return f&&f.length&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parents(".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top()),"function"==typeof h&&(h=f.bottom());var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;this.affixed!==i&&(this.unpin&&this.$element.css("top",""),this.affixed=i,this.unpin="bottom"==i?e.top-d:null,this.$element.removeClass(b.RESET).addClass("affix"+(i?"-"+i:"")),"bottom"==i&&this.$element.offset({top:document.body.offsetHeight-h-this.$element.height()}))}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(jQuery); \ No newline at end of file +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.1",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.1",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.1",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c="prev"==a?-1:1,d=this.getItemIndex(b),e=(d+c)%this.$items.length;return this.$items.eq(e)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i="next"==b?"first":"last",j=this;if(!f.length){if(!this.options.wrap)return;f=this.$element.find(".item")[i]()}if(f.hasClass("active"))return this.sliding=!1;var k=f[0],l=a.Event("slide.bs.carousel",{relatedTarget:k,direction:h});if(this.$element.trigger(l),!l.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var m=a(this.$indicators.children()[this.getItemIndex(f)]);m&&m.addClass("active")}var n=a.Event("slid.bs.carousel",{relatedTarget:k,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),j.sliding=!1,setTimeout(function(){j.$element.trigger(n)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(n)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&"show"==b&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a(this.options.trigger).filter('[href="#'+b.id+'"], [data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.1",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0,trigger:'[data-toggle="collapse"]'},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.find("> .panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":a.extend({},e.data(),{trigger:this});c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=c(d),f={relatedTarget:this};e.hasClass("open")&&(e.trigger(b=a.Event("hide.bs.dropdown",f)),b.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f)))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.1",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('
').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(b){if(/(38|40|27|32)/.test(b.which)&&!/input|textarea/i.test(b.target.tagName)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=c(d),g=e.hasClass("open");if(!g&&27!=b.which||g&&27==b.which)return 27==b.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.divider):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(b.target);38==b.which&&j>0&&j--,40==b.which&&j').prependTo(this.$element).on("click.dismiss.bs.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.options.backdrop&&this.adjustBackdrop(),this.adjustDialog()},c.prototype.adjustBackdrop=function(){this.$backdrop.css("height",0).css("height",this.$element[0].scrollHeight)},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){this.bodyIsOverflowing=document.body.scrollHeight>document.documentElement.clientHeight,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b,g=f&&f.selector;(e||"destroy"!=b)&&(g?(e||d.data("bs.tooltip",e={}),e[g]||(e[g]=new c(this,f))):e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};c.VERSION="3.3.1",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c&&c.$tip&&c.$tip.is(":visible")?void(c.hoverState="in"):(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.options.container?a(this.options.container):this.$element.parent(),p=this.getPosition(o);h="bottom"==h&&k.bottom+m>p.bottom?"top":"top"==h&&k.top-mp.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.width&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type)})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b,g=f&&f.selector;(e||"destroy"!=b)&&(g?(e||d.data("bs.popover",e={}),e[g]||(e[g]=new c(this,f))):e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.1",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},c.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){var e=a.proxy(this.process,this);this.$body=a("body"),this.$scrollElement=a(a(c).is("body")?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.1",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b="offset",c=0;a.isWindow(this.$scrollElement[0])||(b="position",c=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var d=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+c,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){d.offsets.push(this[0]),d.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.1",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]}) +})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.1",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=i?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=a("body").height();"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file From 659d0f68cb27f9b551389cc5c82183d18edfd00e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Jan 2015 11:14:25 -0500 Subject: [PATCH 011/897] possibly fixing issue where mobile composer textarea is not properly sized when initially opened. Sort of related to #2417 --- public/src/modules/composer.js | 2 +- public/src/modules/composer/resize.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 5a80616517..cd5f458717 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -253,7 +253,6 @@ define('composer', [ updateTitle(postData, postContainer); activate(post_uuid); - resize.reposition(postContainer); if (config.allowFileUploads || config.hasImageUploadPlugin) { uploads.initialize(post_uuid); @@ -319,6 +318,7 @@ define('composer', [ formatting.addComposerButtons(); focusElements(postContainer); + resize.reposition(postContainer); }); } diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index fb452b838a..47cd93c33c 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -1,7 +1,7 @@ 'use strict'; -/* globals define, config, utils*/ +/* globals app, define, config, utils*/ define('composer/resize', function() { var resize = {}; @@ -38,6 +38,7 @@ define('composer/resize', function() { postContainer.css('visibility', 'visible').css('z-index', 2); + // Add some extra space at the bottom of the body so that the user can still scroll to the last post w/ composer open $('body').css({'margin-bottom': postContainer.css('height')}); resizeWritePreview(postContainer); From e42365f7c11e2ca10fac91ee58a733722aec87e8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Jan 2015 12:06:30 -0500 Subject: [PATCH 012/897] wrapping findBootstrapEnvironment so that it doesn't run before the DOM is ready #2417 --- public/src/utils.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/public/src/utils.js b/public/src/utils.js index a3f3be9648..4f596c6092 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -256,20 +256,22 @@ findBootstrapEnvironment: function() { //http://stackoverflow.com/questions/14441456/how-to-detect-which-device-view-youre-on-using-twitter-bootstrap-api - var envs = ['xs', 'sm', 'md', 'lg'], - $el = $('
'); + $(document).ready(function() { + var envs = ['xs', 'sm', 'md', 'lg'], + $el = $('
'); - $el.appendTo($('body')); + $el.appendTo($('body')); - for (var i = envs.length - 1; i >= 0; i--) { - var env = envs[i]; + for (var i = envs.length - 1; i >= 0; i--) { + var env = envs[i]; - $el.addClass('hidden-'+env); - if ($el.is(':hidden')) { - $el.remove(); - return env; + $el.addClass('hidden-'+env); + if ($el.is(':hidden')) { + $el.remove(); + return env; + } } - } + }); }, // get all the url params in a single key/value hash From 428a43116428140505d4225c0e6aef29fa058d7a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Jan 2015 16:05:06 -0500 Subject: [PATCH 013/897] Revert "wrapping findBootstrapEnvironment so that it doesn't run before the DOM is ready #2417" This reverts commit e42365f7c11e2ca10fac91ee58a733722aec87e8. --- public/src/utils.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/public/src/utils.js b/public/src/utils.js index 4f596c6092..a3f3be9648 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -256,22 +256,20 @@ findBootstrapEnvironment: function() { //http://stackoverflow.com/questions/14441456/how-to-detect-which-device-view-youre-on-using-twitter-bootstrap-api - $(document).ready(function() { - var envs = ['xs', 'sm', 'md', 'lg'], - $el = $('
'); + var envs = ['xs', 'sm', 'md', 'lg'], + $el = $('
'); - $el.appendTo($('body')); + $el.appendTo($('body')); - for (var i = envs.length - 1; i >= 0; i--) { - var env = envs[i]; + for (var i = envs.length - 1; i >= 0; i--) { + var env = envs[i]; - $el.addClass('hidden-'+env); - if ($el.is(':hidden')) { - $el.remove(); - return env; - } + $el.addClass('hidden-'+env); + if ($el.is(':hidden')) { + $el.remove(); + return env; } - }); + } }, // get all the url params in a single key/value hash From 835886998b7741b4c324dd5eecb2f9fa0167b97c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Jan 2015 16:09:35 -0500 Subject: [PATCH 014/897] having composer/resize call findBootstrapEnvironment only on the first resize method call, and not right when library is required, #2417 --- public/src/modules/composer/resize.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 47cd93c33c..20048eb7e6 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -4,9 +4,9 @@ /* globals app, define, config, utils*/ define('composer/resize', function() { - var resize = {}; - var env = utils.findBootstrapEnvironment(); - var oldPercentage = 0; + var resize = {}, + oldPercentage = 0, + env; resize.reposition = function(postContainer) { var percentage = localStorage.getItem('composer:resizePercentage'); @@ -15,6 +15,10 @@ define('composer/resize', function() { }; function doResize(postContainer, percentage) { + if (!env) { + env = utils.findBootstrapEnvironment(); + } + if (percentage) { if (env === 'md' || env === 'lg') { postContainer.css('height', Math.floor($(window).height() * percentage) + 'px'); From 9b8cc9fe6c621030a90ee2085d9be9699627a11e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Jan 2015 16:23:30 -0500 Subject: [PATCH 015/897] partial revert of 659d0f68cb27f9b551389cc5c82183d18edfd00e, #2417 --- public/src/modules/composer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index cd5f458717..5a80616517 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -253,6 +253,7 @@ define('composer', [ updateTitle(postData, postContainer); activate(post_uuid); + resize.reposition(postContainer); if (config.allowFileUploads || config.hasImageUploadPlugin) { uploads.initialize(post_uuid); @@ -318,7 +319,6 @@ define('composer', [ formatting.addComposerButtons(); focusElements(postContainer); - resize.reposition(postContainer); }); } From 3c1ee1f59f46c3968f81df5368ed901d77de43e9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Jan 2015 16:33:49 -0500 Subject: [PATCH 016/897] fixing incorrect language code for Italian --- public/language/it/language.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/it/language.json b/public/language/it/language.json index b749dfac01..76bc29d1e3 100644 --- a/public/language/it/language.json +++ b/public/language/it/language.json @@ -1,5 +1,5 @@ { "name": "Italiano", - "code": "it_IT", + "code": "it", "dir": "ltr" } \ No newline at end of file From 779fd0405ed0de9f512a31da2258bb0c2cda251c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Jan 2015 18:04:42 -0500 Subject: [PATCH 017/897] latest translations! --- public/language/bn/category.json | 2 +- public/language/bn/email.json | 30 +++---- public/language/bn/error.json | 2 +- public/language/bn/groups.json | 12 +-- public/language/bn/login.json | 2 +- public/language/bn/modules.json | 20 ++--- public/language/bn/notifications.json | 14 ++-- public/language/bn/pages.json | 2 +- public/language/bn/reset_password.json | 8 +- public/language/bn/success.json | 2 +- public/language/bn/tags.json | 10 +-- public/language/bn/topic.json | 108 ++++++++++++------------- public/language/bn/unread.json | 10 +-- public/language/bn/user.json | 42 +++++----- public/language/de/user.json | 2 +- public/language/es/email.json | 4 +- public/language/es/error.json | 54 ++++++------- public/language/es/global.json | 4 +- public/language/es/groups.json | 2 +- public/language/es/notifications.json | 6 +- public/language/es/pages.json | 4 +- public/language/es/tags.json | 2 +- public/language/es/topic.json | 16 ++-- public/language/es/user.json | 10 +-- public/language/fa_IR/email.json | 18 ++--- public/language/hu/email.json | 18 ++--- public/language/hu/error.json | 26 +++--- public/language/hu/global.json | 20 ++--- public/language/hu/login.json | 10 +-- public/language/hu/modules.json | 18 ++--- public/language/hu/pages.json | 4 +- public/language/hu/recent.json | 2 +- public/language/hu/user.json | 4 +- public/language/it/email.json | 2 +- public/language/it/error.json | 6 +- public/language/it/global.json | 2 +- public/language/it/user.json | 6 +- public/language/pl/error.json | 2 +- public/language/zh_CN/users.json | 2 +- 39 files changed, 254 insertions(+), 254 deletions(-) diff --git a/public/language/bn/category.json b/public/language/bn/category.json index faad73c96f..82626ebe86 100644 --- a/public/language/bn/category.json +++ b/public/language/bn/category.json @@ -1,7 +1,7 @@ { "new_topic_button": "নতুন টপিক", "no_topics": "এই বিভাগে কোন টপিক নেই!
আপনি চাইলে একটি পোষ্ট করতে পারেন।", - "browsing": "browsing", + "browsing": "ব্রাউজিং", "no_replies": "কোন রিপ্লাই নেই", "share_this_category": "এই বিভাগটি অন্যের সাথে ভাগাভাগি করুন", "ignore": "উপেক্ষা করুন" diff --git a/public/language/bn/email.json b/public/language/bn/email.json index 7b6b69c0ed..a0f40d8218 100644 --- a/public/language/bn/email.json +++ b/public/language/bn/email.json @@ -1,23 +1,23 @@ { - "password-reset-requested": "Password Reset Requested - %1!", - "welcome-to": "Welcome to %1", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", + "password-reset-requested": "পাসওয়ার্ড রিসেটের জন্য অনুরোধ করা হয়েছে - %1!", + "welcome-to": "%1 এ স্বাগতম", + "greeting_no_name": "স্বাগতম", + "greeting_with_name": "স্বাগতম %1", "welcome.text1": "%1 এ নিবন্ধন করার জন্য আপনাকে ধন্যবাদ!", "welcome.text2": "আপনার একাউন্ট এ্যাক্টিভেট করার জন্য, আপনি যে ইমেইল এড্রেস ব্যাবহার করে নিবন্ধন করেছেন তা যাচাই করতে হবে", "welcome.cta": "আপনার ইমেইল এড্রেস নিশ্চিত করার জন্য এখানে ক্লিক করুন", "reset.text1": "আমরা আপনার পাসওয়ার্ড রিসেট করার অনুরোধ পেয়েছি, সম্ভবত আপনি আপনার পাসওয়ার্ড ভুলে গিয়েছেন বলেই। তবে যদি তা না হয়ে থাকে, তাহলে এই মেইলকে উপেক্ষা করতে পারেন।", "reset.text2": "পাসওয়ার্ড রিসেট করতে নিচের লিংকে ক্লিক করুন", "reset.cta": "পাসওয়ার্ড রিসেট করতে এখানে ক্লিক করুন", - "digest.notifications": "You have unread notifications from %1:", - "digest.latest_topics": "Latest topics from %1", - "digest.cta": "Click here to visit %1", - "digest.unsub.info": "This digest was sent to you due to your subscription settings.", - "digest.no_topics": "There have been no active topics in the past %1", - "notif.chat.subject": "New chat message received from %1", - "notif.chat.cta": "Click here to continue the conversation", - "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", - "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", - "unsub.cta": "Click here to alter those settings", - "closing": "Thanks!" + "digest.notifications": "%1 থেকে আনরিড নোটিফিকেশন আছে।", + "digest.latest_topics": "%1 এর সর্বশেষ টপিকসমূহ", + "digest.cta": "%1 ভিজিট করতে এখানে ক্লিক করুন", + "digest.unsub.info": "আপনার সাবস্ক্রীপশন সেটিংসের কারনে আপনাকে এই ডাইজেষ্টটি পাঠানো হয়েছে।", + "digest.no_topics": "%1 এ কোন সক্রিয় টপিক নেই।", + "notif.chat.subject": "%1 এর থেকে নতুন মেসেজ এসেছে।", + "notif.chat.cta": "কথপোকথন চালিয়ে যেতে এখানে ক্লিক করুন", + "notif.chat.unsub.info": "আপনার সাবস্ক্রীপশন সেটিংসের কারনে আপনার এই নোটিফিকেশন পাঠানো হয়েছে", + "test.text1": "আপনি সঠিকভাবে নোডবিবির জন্য মেইলার সেটাপ করেছেন কিনা নিশ্চিত করার জন্য এই টেষ্ট ইমেইল পাঠানো হয়েছে", + "unsub.cta": "সেটিংসগুলো পরিবর্তন করতে এখানে ক্লিক করুন", + "closing": "ধন্যবাদ!" } \ No newline at end of file diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 01ae731780..79980346d3 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -62,6 +62,6 @@ "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।", "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই", "not-enough-reputation-to-flag": "এই পোষ্টকে ফ্লাগ করার জন্য আপনার পর্যাপ্ত সম্মাননা নেই", - "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", + "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ", "registration-error": "নিবন্ধন এরর!" } \ No newline at end of file diff --git a/public/language/bn/groups.json b/public/language/bn/groups.json index bf69c732b0..09ce10916c 100644 --- a/public/language/bn/groups.json +++ b/public/language/bn/groups.json @@ -1,8 +1,8 @@ { - "groups": "Groups", - "view_group": "View Group", - "details.title": "Group Details", - "details.members": "Member List", - "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "groups": "গ্রুপসমূহ", + "view_group": "গ্রুপ দেখুন", + "details.title": "গ্রুপের বিস্তারিত", + "details.members": "সদস্য তালিকা", + "details.has_no_posts": "এই গ্রুপের সদস্যরা এখনো কোন পোষ্ট করেন নি", + "details.latest_posts": "সর্বশেষ পোষ্টসমূহ" } \ No newline at end of file diff --git a/public/language/bn/login.json b/public/language/bn/login.json index 36cdebe2be..e9e2529361 100644 --- a/public/language/bn/login.json +++ b/public/language/bn/login.json @@ -3,7 +3,7 @@ "remember_me": "মনে রাখুন", "forgot_password": "পাসওয়ার্ড ভুলে গিয়েছেন?", "alternative_logins": "বিকল্প প্রবেশ", - "failed_login_attempt": "ব্যর্থ প্রবেশের প্রচেষ্টা, আবার চেষ্টা করুন।", + "failed_login_attempt": "প্রবেশ সফল হয় নি, আবার চেষ্টা করুন।", "login_successful": "আপনি সফলভাবে প্রবেশ করেছেন!", "dont_have_account": "কোন একাউন্ট নেই?" } \ No newline at end of file diff --git a/public/language/bn/modules.json b/public/language/bn/modules.json index eacf0556fe..cbd625d77a 100644 --- a/public/language/bn/modules.json +++ b/public/language/bn/modules.json @@ -1,20 +1,20 @@ { "chat.chatting_with": " এর সাথে কথোপকথন", - "chat.placeholder": "Type chat message here, press enter to send", + "chat.placeholder": "এখানে আপনার বার্তা লিখুন। পাঠানোর জন্য Enter চাপুন", "chat.send": "প্রেরন করুন", "chat.no_active": "আপনার কোন সচল কথোপকথন নেই", "chat.user_typing": "%1 লিখছেন", "chat.user_has_messaged_you": "%1 আপনাকে বার্তা পাঠিয়েছেন", "chat.see_all": "সকল কথোপকথন দেখুন", - "chat.no-messages": "Please select a recipient to view chat message history", - "chat.recent-chats": "Recent Chats", - "chat.contacts": "Contacts", - "chat.message-history": "Message History", - "chat.pop-out": "Pop out chat", - "chat.maximize": "Maximize", - "chat.seven_days": "7 Days", - "chat.thirty_days": "30 Days", - "chat.three_months": "3 Months", + "chat.no-messages": "মেসেজ হিস্টোরী দেখতে প্রাপক নির্বাচন করুন", + "chat.recent-chats": "সাম্প্রতিক চ্যাটসমূহ", + "chat.contacts": "কন্টাক্টস", + "chat.message-history": "মেসেজ হিস্টোরী", + "chat.pop-out": "চ্যাট উইন্ডো আলাদা করুন", + "chat.maximize": "ম্যাক্সিমাইজ", + "chat.seven_days": "৭ দিন", + "chat.thirty_days": "৩০ দিন", + "chat.three_months": "৩ মাস", "composer.user_said_in": "%1 বলেছেন %2:", "composer.user_said": "%1 বলেছেনঃ", "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?" diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index 0c6c8d4485..14604f6b38 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -4,21 +4,21 @@ "see_all": "সকল বিজ্ঞপ্তিগুলো দেখুন", "back_to_home": "ফিরুন %1", "outgoing_link": "বহির্গামী লিঙ্ক", - "outgoing_link_message": "You are now leaving %1.", - "continue_to": "Continue to %1", - "return_to": "Return to %1", + "outgoing_link_message": "আপনি এখন %1 ত্যাগ করছেন", + "continue_to": "%1 তে আগান", + "return_to": "%1 এ ফেরত যান", "new_notification": "নতুন বিজ্ঞপ্তি", "you_have_unread_notifications": "আপনার অপঠিত বিজ্ঞপ্তি আছে।", "new_message_from": "%1 থেকে নতুন বার্তা", - "upvoted_your_post_in": "%1 has upvoted your post in %2.", - "moved_your_post": "%1 has moved your post.", - "moved_your_topic": "%1 has moved your topic.", + "upvoted_your_post_in": "%1 , %2 এ আপানার পোষ্টকে আপভোট করেছেন। ", + "moved_your_post": "%1 আপনার পোষ্ট সরিয়ে নিয়েছেন। ", + "moved_your_topic": "%1 আপনার টপিক সরিয়ে নিয়েছেন। ", "favourited_your_post_in": "%1 has favourited your post in %2.", "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 একটি উত্তর দিয়েছেন: %2", "user_posted_topic": "%1 has posted a new topic: %2", "user_mentioned_you_in": "%1, %2 এ আপনার নাম উল্লেখ করেছেন", - "user_started_following_you": "%1 started following you.", + "user_started_following_you": "%1 আপনাকে অনুসরন করা শুরু করেছেন।", "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে", "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।", "email-confirm-error": "একটি ত্রুটি ঘটেছে...", diff --git a/public/language/bn/pages.json b/public/language/bn/pages.json index 62413970b1..1e28db3a2d 100644 --- a/public/language/bn/pages.json +++ b/public/language/bn/pages.json @@ -5,7 +5,7 @@ "recent": "সাম্প্রতিক টপিক", "users": "নিবন্ধিত সদস্যগণ", "notifications": "বিজ্ঞপ্তি", - "tags": "Topics tagged under \"%1\"", + "tags": "\"%1\" এ ট্যগকৃত টপিকসমূহ", "user.edit": "সম্পাদনা \"%1\"", "user.following": "%1 যাদের অনুসরণ করেন", "user.followers": "যারা %1 কে অনুসরণ করেন", diff --git a/public/language/bn/reset_password.json b/public/language/bn/reset_password.json index 70cfbc337b..d4aa6415c1 100644 --- a/public/language/bn/reset_password.json +++ b/public/language/bn/reset_password.json @@ -7,8 +7,8 @@ "wrong_reset_code.message": "প্রাপ্ত রিসেট কোডটি ভুল ছিল। আবার চেষ্টা করুন, অথবা একটি নতুন রিসেট কোড অনুরোধ করুন।", "new_password": "নতুন পাসওয়ার্ড", "repeat_password": "পাসওয়ার্ড নিশ্চিত করুন", - "enter_email": "Please enter your email address and we will send you an email with instructions on how to reset your account.", - "enter_email_address": "Enter Email Address", - "password_reset_sent": "Password Reset Sent", - "invalid_email": "Invalid Email / Email does not exist!" + "enter_email": "অনুগ্রহপূর্বক আপনার ইমেইল এড্রেস প্রদান করুন, আমরা আপনাকে আপনার পাসওয়ার্ড রিসেট সম্পর্কিত তথ্যাবলী ইমেইলে পাঠিয়ে দিবো। ", + "enter_email_address": "আপনার ইমেইল এড্রেস", + "password_reset_sent": "পাসওয়ার্ড রিসেট মেইল পাঠানো হয়েছে", + "invalid_email": "ভুল ইমেইল / ইমেইল ডেটাবেইজে নেই" } \ No newline at end of file diff --git a/public/language/bn/success.json b/public/language/bn/success.json index ecdecbdb27..281c9af652 100644 --- a/public/language/bn/success.json +++ b/public/language/bn/success.json @@ -1,6 +1,6 @@ { "success": "সফল হয়েছে", "topic-post": "আপনি সফলভাবে পোষ্ট করেছেন। ", - "authentication-successful": "Authentication Successful", + "authentication-successful": "অথেন্টিকেশন সফল হয়েছে", "settings-saved": "সেটিংস সেভ করা হয়েছে। " } \ No newline at end of file diff --git a/public/language/bn/tags.json b/public/language/bn/tags.json index d2e9a213ac..9db45491d2 100644 --- a/public/language/bn/tags.json +++ b/public/language/bn/tags.json @@ -1,7 +1,7 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "enter_tags_here_short": "Enter tags...", - "no_tags": "There are no tags yet." + "no_tag_topics": "এই ট্যাগ সম্বলিত কোন টপিক নেই", + "tags": "ট্যাগসমূহ", + "enter_tags_here": "এখানে আপনার ট্যাগ টাইপ করুন, প্রত্যেকটি ট্যাগের পর Enter চাপুন", + "enter_tags_here_short": "ট্যাগ বসান", + "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই" } \ No newline at end of file diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index b448763aa6..b8729242fb 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -14,7 +14,7 @@ "reply": "উত্তর", "edit": "সম্পাদণা", "delete": "মুছে ফেলুন", - "purge": "Purge", + "purge": "পার্জ", "restore": "পুনরূদ্ধার", "move": "সরানো", "fork": "শাখা", @@ -35,62 +35,62 @@ "watch": "দেখা", "unwatch": "অদেখা", "watch.title": "এই টপিকে নতুন উত্তর এলে বিজ্ঞাপণের মাধ্যমে জানুন।", - "unwatch.title": "Stop watching this topic", - "share_this_post": "Share this Post", - "thread_tools.title": "Topic Tools", - "thread_tools.markAsUnreadForAll": "Mark Unread", - "thread_tools.pin": "Pin Topic", - "thread_tools.unpin": "Unpin Topic", - "thread_tools.lock": "Lock Topic", - "thread_tools.unlock": "Unlock Topic", - "thread_tools.move": "Move Topic", - "thread_tools.move_all": "Move All", - "thread_tools.fork": "Fork Topic", - "thread_tools.delete": "Delete Topic", - "thread_tools.delete_confirm": "Are you sure you want to delete this topic?", - "thread_tools.restore": "Restore Topic", - "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", - "thread_tools.purge": "Purge Topic", - "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", - "topic_move_success": "This topic has been successfully moved to %1", - "post_delete_confirm": "Are you sure you want to delete this post?", - "post_restore_confirm": "Are you sure you want to restore this post?", - "post_purge_confirm": "Are you sure you want to purge this post?", - "load_categories": "Loading Categories", - "disabled_categories_note": "Disabled Categories are greyed out", - "confirm_move": "Move", - "confirm_fork": "Fork", - "favourite": "Favourite", - "favourites": "Favourites", - "favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!", - "loading_more_posts": "Loading More Posts", - "move_topic": "Move Topic", - "move_topics": "Move Topics", - "move_post": "Move Post", - "post_moved": "Post moved!", - "fork_topic": "Fork Topic", - "topic_will_be_moved_to": "This topic will be moved to the category", - "fork_topic_instruction": "Click the posts you want to fork", - "fork_no_pids": "No posts selected!", - "fork_success": "Successfully forked topic! Click here to go to the forked topic.", - "composer.title_placeholder": "Enter your topic title here...", - "composer.discard": "Discard", - "composer.submit": "Submit", - "composer.replying_to": "Replying to %1", - "composer.new_topic": "New Topic", - "composer.uploading": "uploading...", - "composer.thumb_url_label": "Paste a topic thumbnail URL", - "composer.thumb_title": "Add a thumbnail to this topic", + "unwatch.title": "এই টপিক দেখা বন্ধ করুন", + "share_this_post": "এই পোষ্টটি শেয়ার করুন", + "thread_tools.title": "টপিক সম্পর্কিত টুলস", + "thread_tools.markAsUnreadForAll": "\"অপঠিত\" হিসেবে চিহ্নিত করুন", + "thread_tools.pin": "টপিক পিন করুন", + "thread_tools.unpin": "টপিক আনপিন করুন", + "thread_tools.lock": "টপিক বন্ধ করুন", + "thread_tools.unlock": "টপিক খুলে দিন", + "thread_tools.move": "টপিক সরান", + "thread_tools.move_all": "সমস্ত টপিক সরান", + "thread_tools.fork": "টপিক ফর্ক করুন", + "thread_tools.delete": "টপিক মুছে ফেলুন", + "thread_tools.delete_confirm": "আপনি নিশ্চিত যে আপনি এই টপিকটি মুছে ফেলতে চান?", + "thread_tools.restore": "টপিক পুনরূদ্ধার করুন", + "thread_tools.restore_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পুনরূদ্ধার করতে চান?", + "thread_tools.purge": "টপিক পার্জ করুন", + "thread_tools.purge_confirm": "আপনি নিশ্চিত যে আপনি টপিকটি পার্জ করতে চাচ্ছেন ? ", + "topic_move_success": "টপিকটি %1 এ সরিয়ে নেয়া হয়েছে", + "post_delete_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি মুছে ফেলতে চান ?", + "post_restore_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পুনরূূদ্ধার করতে চান ? ", + "post_purge_confirm": "আপনি নিশ্চিত যে আপনি এই পোষ্টটি পার্জ করতে চান ? ", + "load_categories": "ক্যাটাগরী লোড করা হচ্ছে", + "disabled_categories_note": "নিস্ক্রীয় ক্যাটাগরীসমূহ ধূসর কালিতে লেখা রয়েছে। ", + "confirm_move": "সরান", + "confirm_fork": "ফর্ক", + "favourite": "পছন্দ", + "favourites": "পছন্দতালিকা", + "favourites.has_no_favourites": "আপনার যদি কোন পছন্দের পোষ্ট না থেকে থাকে তাহলে কিছু পোষ্ট ফেভারিট করা হলে সেগুলো এখানে দেখতে পাবেন।", + "loading_more_posts": "আরো পোষ্ট লোড করা হচ্ছে", + "move_topic": "টপিক সরান", + "move_topics": "টপিক সমূহ সরান", + "move_post": "পোষ্ট সরান", + "post_moved": "পোষ্ট সরানো হয়েছে", + "fork_topic": "টপিক ফর্ক করুন", + "topic_will_be_moved_to": "এই টপিকটি ক্যাটাগরীতে সরানো হবে", + "fork_topic_instruction": "যে পোষ্টটি ফর্ক করতে চান সেটি ক্লিক করুন", + "fork_no_pids": "কোন পোষ্ট সিলেক্ট করা হয় নি", + "fork_success": "টপিক ফর্ক করা হয়েছে। ফর্ক করা টপিকে যেতে এখানে ক্লিক করুন", + "composer.title_placeholder": "আপনার টপিকের শিরোনাম দিন", + "composer.discard": "বাতিল", + "composer.submit": "সাবমিট", + "composer.replying_to": "%1 এর উত্তরে:", + "composer.new_topic": "নতুন টপিক", + "composer.uploading": "আপলোডিং", + "composer.thumb_url_label": "টপিকে থাম্বনেইল URL পেষ্ট করুন", + "composer.thumb_title": "এই টপিকে থাম্বনেইল যোগ করুন", "composer.thumb_url_placeholder": "http://example.com/thumb.png", - "composer.thumb_file_label": "Or upload a file", - "composer.thumb_remove": "Clear fields", - "composer.drag_and_drop_images": "Drag and Drop Images Here", + "composer.thumb_file_label": "অথবা একটি ফাইল আপলোড করুন", + "composer.thumb_remove": "ফিল্ড ক্লিয়ার করুন", + "composer.drag_and_drop_images": "ছবি এখানে ড্র্যাগ করে এনে ছেড়ে দিন", "more_users_and_guests": "%1 more user(s) and %2 guest(s)", "more_users": "%1 more user(s)", "more_guests": "%1 more guest(s)", "users_and_others": "%1 and %2 others", - "sort_by": "Sort by", - "oldest_to_newest": "Oldest to Newest", - "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "sort_by": "সাজানোর ভিত্তি:", + "oldest_to_newest": "পুরাতন থেকে নতুন", + "newest_to_oldest": "নতুন থেকে পুরাতন", + "most_votes": "সর্বোচ্চ ভোট" } \ No newline at end of file diff --git a/public/language/bn/unread.json b/public/language/bn/unread.json index 8f7de2bd14..c5541d28e9 100644 --- a/public/language/bn/unread.json +++ b/public/language/bn/unread.json @@ -1,9 +1,9 @@ { - "title": "Unread", + "title": "অপঠিত", "no_unread_topics": "কোন অপঠিত টপিক নেই", "load_more": "আরো লোড করুন", - "mark_as_read": "Mark as Read", - "selected": "Selected", - "all": "All", - "topics_marked_as_read.success": "Topics marked as read!" + "mark_as_read": "পঠিত হিসেবে চিহ্নিত করুন", + "selected": "নির্বাচিত", + "all": "সবগুলো", + "topics_marked_as_read.success": "পঠিত হিসেবে চিহ্নিত টপিকসমূহ" } \ No newline at end of file diff --git a/public/language/bn/user.json b/public/language/bn/user.json index 2317c20a50..939ca6b33c 100644 --- a/public/language/bn/user.json +++ b/public/language/bn/user.json @@ -5,7 +5,7 @@ "email": "ইমেইল", "confirm_email": "ইমেইল নিশ্চিত করুন", "delete_account": "একাউন্ট মুছে ফেলুন", - "delete_account_confirm": "Are you sure you want to delete your account?
This action is irreversible and you will not be able to recover any of your data

Enter your username to confirm that you wish to destroy this account.", + "delete_account_confirm": "আপনি কি নিশ্চিত যে আপনি আপনার একাউন্ট মুছে ফেলতে চান ?
এই কাজটির ফলে আপনার কোন তথ্য পুনরূদ্ধার করা সম্ভব নয়

নিশ্চিত করতে আপনার ইউজারনেম প্রবেশ করান। ", "fullname": "পুর্ণ নাম", "website": "ওয়েবসাইট", "location": "স্থান", @@ -40,7 +40,7 @@ "change_password_success": "আপনার পাসওয়ার্ড আপডেট করা হয়েছে", "confirm_password": "পাসওয়ার্ড নিশ্চিত করুন", "password": "পাসওয়ার্ড", - "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1", + "username_taken_workaround": "আপনি যে ইউজারনেম চাচ্ছিলেন সেটি ইতিমধ্যে নেয়া হয়ে গেছে, কাজেই আমরা এটি কিঞ্চিং পরিবর্তন করেছি। আপনি এখন %1 হিসেবে পরিচিত", "upload_picture": "ছবি আপলোড করুন", "upload_a_picture": "ছবি (একটি) আপলোড করুন", "image_spec": "আপনি কেবলমাত্র PNG, JPG অথবা GIF ফাইল আপলোড করতে পারবেন", @@ -49,27 +49,27 @@ "show_email": "আমার ইমেইল দেখাও", "show_fullname": "আমার সম্পূর্ণ নাম দেখাও", "restrict_chats": "আমি যাদের ফলো করি কেবলমাত্র তাদের থেকে বার্তা গ্রহন করা হোক", - "digest_label": "Subscribe to Digest", - "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule", + "digest_label": "ডাইজেষ্টে সাবস্ক্রাইব করুন", + "digest_description": "শিডিউল অনূযায়ী এই ফোরামের ইমেইল আপডেটের জন্য সাবস্ক্রাইব করুন (নতুন নোটিফিকেশন এবং টপিকসমূহ )", "digest_off": "বন্ধ", "digest_daily": "দৈনিক", "digest_weekly": "সাপ্তাহিক", "digest_monthly": "মাসিক", - "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", - "has_no_follower": "This user doesn't have any followers :(", - "follows_no_one": "This user isn't following anyone :(", - "has_no_posts": "This user didn't post anything yet.", - "has_no_topics": "This user didn't post any topics yet.", - "email_hidden": "Email Hidden", - "hidden": "hidden", - "paginate_description": "Paginate topics and posts instead of using infinite scroll.", - "topics_per_page": "Topics per Page", - "posts_per_page": "Posts per Page", - "notification_sounds": "Play a sound when you receive a notification.", - "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?", - "enable_topic_searching": "Enable In-Topic Searching", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", - "follow_topics_you_reply_to": "Follow topics that you reply to.", - "follow_topics_you_create": "Follow topics you create." + "send_chat_notifications": "যদি আমি অনলাইনে না থাকি, সেক্ষেত্রে নতুন চ্যাট মেসেজ আসলে আমাকে ইমেইল করুন", + "has_no_follower": "এই সদস্যের কোন ফলোয়ার নেই :(", + "follows_no_one": "এই সদস্য কাউকে ফলো করছেন না :(", + "has_no_posts": "এই সদস্য এখনো কোন পোষ্ট করেন নি", + "has_no_topics": "এই সদস্য এখনো কোন টপিক পোষ্ট করেন নি", + "email_hidden": "ইমেইল গোপন রাখা হয়েছে", + "hidden": "গোপন করা হয়েছে", + "paginate_description": "ইনফাইনাইট স্ক্রলের বদলে টপিক এবং পোষ্টের জন্য পেজিনেশন ব্যাবহার করুন", + "topics_per_page": "প্রতি পেজে কতগুলো টপিক থাকবে", + "posts_per_page": "প্রতি পেইজে কতগুলো পোষ্ট থাকবে", + "notification_sounds": "নতুন নোটিফিকেশনের জন্য নোটিফিকেশন সাউন্ড বাজাও।", + "browsing": "Browsing সেটিংস", + "open_links_in_new_tab": "বাইরের URL গুলো নতুন ট্যাবে খোলা হবে ?", + "enable_topic_searching": "In-Topic সার্চ সক্রীয় করো", + "topic_search_help": "যদি এনাবল করা হয়ে থাকে, In-topic সার্চিং ব্রাউজারের ডিফল্ট সার্চের বদলে পুরো টপিকজুড়ে সার্চ করার সুবিধা দিবে, যা কেবলমাত্র বর্তমান স্কৃণে দেখানো অংশের মধ্যে সীমাবদ্ধ থাকবে না। ", + "follow_topics_you_reply_to": "আপনার উত্তর দেয়া টপিকগুলো ফলো করুন", + "follow_topics_you_create": "আপনার তৈরীকরা টপিকসমূহ ফলো করুন" } \ No newline at end of file diff --git a/public/language/de/user.json b/public/language/de/user.json index 6e73a8a1e2..ea42845779 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -69,7 +69,7 @@ "browsing": "Browser Einstellungen", "open_links_in_new_tab": "Externe Links in neuem Tab öffnen?", "enable_topic_searching": "Suchen innerhalb von Themen aktivieren", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", + "topic_search_help": "Falls aktiviert, wird die Suche im Thema das Standardsuchverhalten des Browsers überschreiben und es Ihnen erlauben, das ganze Thema statt dessen, was sich auf dem Bildschirm befindet, zu durchsuchen.", "follow_topics_you_reply_to": "Folge Themen, auf die du antwortest.", "follow_topics_you_create": "Folge Themen, die du erstellst." } \ No newline at end of file diff --git a/public/language/es/email.json b/public/language/es/email.json index 120b27a6d0..14e85c608c 100644 --- a/public/language/es/email.json +++ b/public/language/es/email.json @@ -9,11 +9,11 @@ "reset.text1": "Recibimos una solicitud para reiniciar tu contraseña, posiblemente porque la olvidaste. Si no es así, por favor ignora este email.", "reset.text2": "Para continuar con el reinicio de contraseña, por favor cliquea en el siguiente vínculo:", "reset.cta": "Cliquea aquí para reiniciar tu contraseña", - "digest.notifications": "You have unread notifications from %1:", + "digest.notifications": "Tiene notificaciones sin leer de %1:", "digest.latest_topics": "Últimos temas de %1", "digest.cta": "Cliquea aquí para visitar %1", "digest.unsub.info": "Este compendio te fue enviado debido a tus ajustes de subscripción.", - "digest.no_topics": "There have been no active topics in the past %1", + "digest.no_topics": "No han habido temas activos en el pasado %1", "notif.chat.subject": "Nuevo mensaje de chat recibido de %1", "notif.chat.cta": "Haz click aquí para continuar la conversación", "notif.chat.unsub.info": "Esta notificación de chat se te envió debido a tus ajustes de suscripción.", diff --git a/public/language/es/error.json b/public/language/es/error.json index 6c68f9b72c..67471699df 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -9,59 +9,59 @@ "invalid-uid": "Identificador de usuario no válido", "invalid-username": "Nombre de usuario no válido", "invalid-email": "Correo electrónico no válido", - "invalid-title": "Título no válido!", + "invalid-title": "¡Título no válido!", "invalid-user-data": "Datos de Usuario no válidos", "invalid-password": "Contraseña no válida", "invalid-username-or-password": "Por favor especifica tanto un usuario como contraseña", - "invalid-search-term": "Invalid search term", + "invalid-search-term": "Término de búsqueda inválido", "invalid-pagination-value": "Valor de paginación no válido.", "username-taken": "Nombre de usuario ya escogido", "email-taken": "El correo electrónico ya está escogido.", - "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.", "username-too-short": "El nombre de usuario es demasiado corto", "username-too-long": "Nombre de usuario demasiado largo", "user-banned": "Usuario expulsado", - "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post", - "no-category": "Category does not exist", - "no-topic": "Topic does not exist", - "no-post": "Post does not exist", - "no-group": "Group does not exist", - "no-user": "User does not exist", - "no-teaser": "Teaser does not exist", - "no-privileges": "You do not have enough privileges for this action.", + "user-too-new": "Lo sentimos, es necesario que espere %1 segudos antes de que pueda hacer su primera publicación", + "no-category": "La categoría no existe", + "no-topic": "El tema no existe", + "no-post": "La publicación no existe", + "no-group": "El grupo no existe", + "no-user": "El usuario no existe", + "no-teaser": "El resumen no existe", + "no-privileges": "No tiene suficientes privilegios para realizar esta acción.", "no-emailers-configured": "Ningún plugin para email fue cargado, así que no se pudo enviar email de prueba.", "category-disabled": "Categoría deshabilitada.", "topic-locked": "Tema bloqueado.", "still-uploading": "Por favor, espera a que terminen las subidas.", - "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", - "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", + "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caracteres.", + "title-too-short": "Por favor introduzca un título más largo. Los títulos deben contener al menos %1 caracteres.", "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.", - "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", - "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", - "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", + "too-many-posts": "Solo puede publicar una vez cada %1 segundos - por favor espere antes de volver a publicar", + "too-many-posts-newbie": "Como nuevo usuario, usted solo puede publicar una vez cada %1 segundos hasta que haya ganada una reputación de %2 - por favor espere antes de volver a publicar", + "file-too-big": "El tamaño de fichero máximo es de %1 kbs - por favor cargue un fichero más pequeño", "cant-vote-self-post": "No puedes votar tus propios posts", - "already-favourited": "You have already favourited this post", - "already-unfavourited": "You have already unfavourited this post", + "already-favourited": "Ya ha marcado esta publicación como favorita", + "already-unfavourited": "Ya ha desmarcado esta publicación como favorita", "cant-ban-other-admins": "No puedes expulsar a otros administradores!", "invalid-image-type": "Tipo de imagen no válido.", "group-name-too-short": "Nombre del grupo es demasiado corto.", "group-already-exists": "El grupo ya existe.", "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.", - "post-already-deleted": "This post has already been deleted", - "post-already-restored": "This post has already been restored", - "topic-already-deleted": "This topic has already been deleted", - "topic-already-restored": "This topic has already been restored", + "post-already-deleted": "Este publicación ya ha sido borrada", + "post-already-restored": "Esta publicación ya ha sido restaurada", + "topic-already-deleted": "Este tema ya ha sido borrado", + "topic-already-restored": "Este tema ya ha sido restaurado", "topic-thumbnails-are-disabled": "Las miniaturas de los temas están deshabilitadas.", "invalid-file": "Archivo no válido.", "uploads-are-disabled": "Las subidas están deshabilitadas.", "upload-error": "Error de subida: %1", - "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", + "signature-too-long": "Lo sentimos, su firma no puede ser más larga de %1 caracteres", "cant-chat-with-yourself": "No puedes conversar contigo mismo!", - "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirle antes de que pueda charlar con ellos", "reputation-system-disabled": "El sistema de reputación está deshabilitado.", "downvoting-disabled": "La votación negativa está deshabilitada.", "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post", - "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", - "reload-failed": "NodeBB encontró un problema mientras refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste antes de refrescar.", - "registration-error": "Registration Error" + "not-enough-reputation-to-flag": "No tiene suficiente reputación para poner una bandera a esta publicación", + "reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.", + "registration-error": "Error de registro" } \ No newline at end of file diff --git a/public/language/es/global.json b/public/language/es/global.json index 1b2e760b55..36f7d9eff4 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -72,6 +72,6 @@ "guests": "Invitados", "updated.title": "Foro actualizado", "updated.message": "El foro acaba de ser actualizado a la última versión. Haz click aquí para refrescar la página.", - "privacy": "Privacy", - "delete_all": "Delete All" + "privacy": "Privacidad", + "delete_all": "Borrar todo" } \ No newline at end of file diff --git a/public/language/es/groups.json b/public/language/es/groups.json index 1c4d93463f..6f253f1dfb 100644 --- a/public/language/es/groups.json +++ b/public/language/es/groups.json @@ -1,5 +1,5 @@ { - "groups": "Groups", + "groups": "Grupos", "view_group": "Ver Grupo", "details.title": "Detalles de Grupo", "details.members": "Lista de Miembros", diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 5239167a45..f28a53f4a8 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -11,12 +11,12 @@ "you_have_unread_notifications": "Tienes notificaciones sin leer.", "new_message_from": "Nuevo mensaje de %1", "upvoted_your_post_in": "%1 ha votado como relevante tu respuesta en %2.", - "moved_your_post": "%1 has moved your post.", - "moved_your_topic": "%1 has moved your topic.", + "moved_your_post": "%1 ha movido su publicación.", + "moved_your_topic": "%1 ha movido su tema.", "favourited_your_post_in": "%1 ha marcado como favorito su publicación en %2.", "user_flagged_post_in": "%1 ha marcado como indebida una respuesta en %2", "user_posted_to": "%1 ha publicado una respuesta a: %2", - "user_posted_topic": "%1 has posted a new topic: %2", + "user_posted_topic": "%1 ha publicado un nuevo tema: %2", "user_mentioned_you_in": "%1 te mencionó en %2", "user_started_following_you": "%1 comenzó a seguirte.", "email-confirmed": "Correo electrónico confirmado", diff --git a/public/language/es/pages.json b/public/language/es/pages.json index 5264c78215..1d5d38342c 100644 --- a/public/language/es/pages.json +++ b/public/language/es/pages.json @@ -13,6 +13,6 @@ "user.topics": "Temas creados por %1", "user.favourites": "Publicaciones favoritas de %1 ", "user.settings": "Preferencias del Usuario", - "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", - "maintenance.messageIntro": "Additionally, the administrator has left this message:" + "maintenance.text": "%1 está en mantenimiento actualmente. Por favor vuelva en otro momento.", + "maintenance.messageIntro": "Adicionalmente, el administrador ha dejado este mensaje:" } \ No newline at end of file diff --git a/public/language/es/tags.json b/public/language/es/tags.json index 36dabaf8f1..ba43b1a939 100644 --- a/public/language/es/tags.json +++ b/public/language/es/tags.json @@ -2,6 +2,6 @@ "no_tag_topics": "No hay temas con esta etiqueta.", "tags": "Etiquetas", "enter_tags_here": "Introduce las etiquetas aquí. Pulsa intro desde de cada una.", - "enter_tags_here_short": "Enter tags...", + "enter_tags_here_short": "Introduzca etiquetas...", "no_tags": "Aún no hay etiquetas." } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index c71513d4ce..2dd31c13d2 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -27,17 +27,17 @@ "flag_title": "Reportar esta publicación a los moderadores", "flag_confirm": "¿Estás seguro de que quieres marcar como indebido este mensaje?", "flag_success": "Este mensaje ha sido marcado para la moderación.", - "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", + "deleted_message": "Este tema ha sido borrado. Solo los usuarios que tengan privilegios de administración de temas pueden verlo.", "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.", "not_following_topic.message": "No recibiras notificaciones de este tema.", "login_to_subscribe": "Por favor, conectate para subscribirte a este tema.", "markAsUnreadForAll.success": "Publicación marcada como no leída para todos.", "watch": "Seguir", - "unwatch": "Unwatch", + "unwatch": "Dejar de seguir", "watch.title": "Serás notificado cuando haya nuevas respuestas en este tema", - "unwatch.title": "Stop watching this topic", + "unwatch.title": "Dejar de seguir este tema", "share_this_post": "Compartir este post", - "thread_tools.title": "Topic Tools", + "thread_tools.title": "Herramientas para Temas", "thread_tools.markAsUnreadForAll": "Marcar como no leído", "thread_tools.pin": "Tema Importante", "thread_tools.unpin": "Quitar Importante", @@ -47,11 +47,11 @@ "thread_tools.move_all": "Mover todo", "thread_tools.fork": "Bifurcar Tema", "thread_tools.delete": "Borrar Tema", - "thread_tools.delete_confirm": "Are you sure you want to delete this topic?", + "thread_tools.delete_confirm": "¿Está seguro que desea eliminar este tema?", "thread_tools.restore": "Restaurar Tema", - "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", + "thread_tools.restore_confirm": "¿Está seguro que desea restaurar este tema?", "thread_tools.purge": "Purgar publicación", - "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", + "thread_tools.purge_confirm": "¿Está seguro que desea eliminar definitivamente (purgar) este tema?", "topic_move_success": "El tema ha sido movido correctamente a %1", "post_delete_confirm": "¿Estás seguro de que quieres eliminar esta respuesta?", "post_restore_confirm": "¿Estás seguro de que quieres restaurar esta respuesta?", @@ -72,7 +72,7 @@ "topic_will_be_moved_to": "Este tema será movido a la categoría", "fork_topic_instruction": "Click en las publicaciones que quieres bifurcar", "fork_no_pids": "¡No seleccionaste publicaciones!", - "fork_success": "Successfully forked topic! Click here to go to the forked topic.", + "fork_success": "¡Se ha creado un nuevo tema a partir del tema padre! Haga click aquí para ir al nuevo tema.", "composer.title_placeholder": "Ingresa el titulo de tu tema", "composer.discard": "Descartar", "composer.submit": "Enviar", diff --git a/public/language/es/user.json b/public/language/es/user.json index fab1662a7e..b46c82cccd 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -29,7 +29,7 @@ "edit": "Editar", "uploaded_picture": "Fotos subidas", "upload_new_picture": "Subir Nueva Foto", - "upload_new_picture_from_url": "Upload New Picture From URL", + "upload_new_picture_from_url": "Cargar Nueva Imagen desde una URL", "current_password": "Contraseña actual", "change_password": "Cambiar Contraseña", "change_password_error": "Contraseña no válida!", @@ -47,8 +47,8 @@ "max": "máx.", "settings": "Opciones", "show_email": "Mostrar mi Correo electrónico", - "show_fullname": "Show My Full Name", - "restrict_chats": "Only allow chat messages from users I follow", + "show_fullname": "Mostrar Mi Nombre Completo", + "restrict_chats": "Permitir mensajes de chat sólo de usuarios a los que sigo", "digest_label": "Suscribirse a Resumen", "digest_description": "Suscribirse a actualizaciones por correo electrónico a este foro (nuevas notificaciones y temas) de acuerdo a una recurrencia definida", "digest_off": "Apagado", @@ -68,8 +68,8 @@ "notification_sounds": "Reproducir un sonido al recibir una notificación", "browsing": "Preferencias de navegación.", "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña?", - "enable_topic_searching": "Enable In-Topic Searching", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", + "enable_topic_searching": "Activar la búsqueda \"In-Topic\"", + "topic_search_help": "Si está activada, la búsqueda 'in-topic' invalidará el comportamiento por defecto del navegador de buscar sólo en la página mostrada y le permitirá entonces buscar en el tema al completo, en vez de hacer una búsqueda únicamente sobre el contenido de la pantalla.", "follow_topics_you_reply_to": "Seguir publicaciones en las que respondes.", "follow_topics_you_create": "Seguir publicaciones que creas." } \ No newline at end of file diff --git a/public/language/fa_IR/email.json b/public/language/fa_IR/email.json index fdbfb006c6..8e5bc5c20c 100644 --- a/public/language/fa_IR/email.json +++ b/public/language/fa_IR/email.json @@ -1,23 +1,23 @@ { "password-reset-requested": "Password Reset Requested - %1!", - "welcome-to": "Welcome to %1", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", + "welcome-to": "به 1% خوش آمدید", + "greeting_no_name": "سلام", + "greeting_with_name": "سلام 1%", "welcome.text1": "Thank you for registering with %1!", "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", - "welcome.cta": "Click here to confirm your email address", + "welcome.cta": "برای تأیید آدرس ایمیل خود اینجا کلیک کنید", "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", - "reset.cta": "Click here to reset your password", + "reset.cta": "برای تنظیم مجدد گذرواژه‌ی خود اینجا کلیک کنید", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", - "digest.cta": "Click here to visit %1", + "digest.cta": "برای دیدن 1% اینجا کلیک کنید", "digest.unsub.info": "This digest was sent to you due to your subscription settings.", "digest.no_topics": "There have been no active topics in the past %1", "notif.chat.subject": "New chat message received from %1", - "notif.chat.cta": "Click here to continue the conversation", + "notif.chat.cta": "برای ادامه‌ی گفتگو اینجا کلیک کنید", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", - "unsub.cta": "Click here to alter those settings", - "closing": "Thanks!" + "unsub.cta": "برای ویرایش آن تنظیمات اینجا کلیک کنید", + "closing": "سپاس!" } \ No newline at end of file diff --git a/public/language/hu/email.json b/public/language/hu/email.json index ed0a1f5a1e..921ee6218f 100644 --- a/public/language/hu/email.json +++ b/public/language/hu/email.json @@ -1,13 +1,13 @@ { "password-reset-requested": "Jelszó-visszaállítási kérelem - %1!", "welcome-to": "Üdvözlet a %1-on", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", - "welcome.text1": "Thank you for registering with %1!", - "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", - "welcome.cta": "Click here to confirm your email address", - "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", - "reset.text2": "To continue with the password reset, please click on the following link:", + "greeting_no_name": "Üdvözlet", + "greeting_with_name": "Üdvözlet %1", + "welcome.text1": "Köszönjük a regisztrációt %1!", + "welcome.text2": "A fiók aktiválásához ellenőriznünk kell, hogy valós e-mail cím lett e megadva.", + "welcome.cta": "Kattintsunk ide az e-mail cím megerősítéséhez", + "reset.text1": "Kaptunk egy kérést jelszava visszaállításához, valószínűleg azért, mert elfelejtette azt. Ha ez nem így van, hagyja figyelmen kívül ezt a levelet.", + "reset.text2": "Ha szeretné, hogy továbbra alaphelyzetbe a jelszavát, kérjük kattintson az alábbi linkre:", "reset.cta": "Kattints ide a jelszavad visszaállításához", "digest.notifications": "Olvasatlan értesítéseid vannak a következőtől: %1", "digest.latest_topics": "Legutóbbi témák a következőből: %1", @@ -18,6 +18,6 @@ "notif.chat.cta": "Kattints ide a beszélgetés folytatásához", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", - "unsub.cta": "Click here to alter those settings", - "closing": "Thanks!" + "unsub.cta": "Kattintson ide megváltoztatni ezeket a beállításokat", + "closing": "Köszönjük!" } \ No newline at end of file diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 3ebd2c4c81..d5819d7aa0 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -43,19 +43,19 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "You can't ban other admins!", - "invalid-image-type": "Invalid image type", - "group-name-too-short": "Group name too short", - "group-already-exists": "Group already exists", - "group-name-change-not-allowed": "Group name change not allowed", - "post-already-deleted": "This post has already been deleted", - "post-already-restored": "This post has already been restored", - "topic-already-deleted": "This topic has already been deleted", - "topic-already-restored": "This topic has already been restored", - "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", - "invalid-file": "Invalid File", - "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", - "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", + "invalid-image-type": "Érvénytelen kép típus", + "group-name-too-short": "A csoport név túl rövid", + "group-already-exists": "A csoport nem létezik", + "group-name-change-not-allowed": "A csoport névváltoztatás nem engedélyezett", + "post-already-deleted": "Ez a bejegyzés mát törlésre került", + "post-already-restored": "Ez a bejegyzés már visszaállításra került", + "topic-already-deleted": "Ezt a témakör már törlésre került", + "topic-already-restored": "Ez a témakör már helyreállításra került", + "topic-thumbnails-are-disabled": "Témakör bélyegképek tíltásra kerültek.", + "invalid-file": "Érvénytelen fájl", + "uploads-are-disabled": "A feltöltés nem engedélyezett", + "upload-error": "Feltöltés hiba: %1", + "signature-too-long": "Sajnáljuk, az aláírás nem lehet hosszabb %1 karakternél.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", "reputation-system-disabled": "Reputation system is disabled.", diff --git a/public/language/hu/global.json b/public/language/hu/global.json index d2580ee4a3..9e4854b8d4 100644 --- a/public/language/hu/global.json +++ b/public/language/hu/global.json @@ -3,22 +3,22 @@ "search": "Keresés", "buttons.close": "Mégsem", "403.title": "Hozzáférés megtagadva", - "403.message": "Úgy tűnik egy olyan oldalt szeretnél elérni, amihez nincs hozzáférésed. Talán be kellene lépned?", - "404.title": "Nem található", - "404.message": "Úgy tűnik egy olyan oldalt szeretnél elérni, ami nem létezik. Visszatérés a kezdőlapra.", + "403.message": "Úgy tűnik egy olyan oldalt szeretnénk elérni, amihez nincs hozzáférés. Talán be kellene jelentkezni", + "404.title": "Nincs találat", + "404.message": "Úgy tűnik egy olyan oldalt szeretnénk elérni, ami nem létezik. Visszatérés a kezdőlapra.", "500.title": "Belső hiba.", "500.message": "Hoppá! Úgy tűnik valami hiba történt!", - "register": "Regisztrálás", + "register": "Regisztráció", "login": "Belépés", - "please_log_in": "Kérjük, jelentkezzen be", + "please_log_in": "Jelentkezzünk be", "logout": "Kijelentkezés", "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.", - "welcome_back": "Welcome Back", - "you_have_successfully_logged_in": "Sikeresen bejelentkeztél", + "welcome_back": "Üdvözlet", + "you_have_successfully_logged_in": "Sikeres bejelentkezés", "save_changes": "Változások mentése", - "close": "Bezár", - "pagination": "Lapszámozás", - "pagination.out_of": "%1 out of %2", + "close": "Bezárás", + "pagination": "Lapozás", + "pagination.out_of": "%1 - %2", "pagination.enter_index": "Enter index", "header.admin": "Admin", "header.recent": "Friss", diff --git a/public/language/hu/login.json b/public/language/hu/login.json index ea28779f22..df6d518f81 100644 --- a/public/language/hu/login.json +++ b/public/language/hu/login.json @@ -1,9 +1,9 @@ { "username": "Felhasználónév / Email", - "remember_me": "Emlékezz rám", + "remember_me": "Megjegyzés", "forgot_password": "Elfelejtett Jelszó?", - "alternative_logins": "Alternatív Belépések", - "failed_login_attempt": "Sikertelen belépési kísérlet, kérlek próbálkozz újra.", - "login_successful": "Sikeresen beléptél!", - "dont_have_account": "Nincs fiókod?" + "alternative_logins": "Alternatív belépés", + "failed_login_attempt": "Sikertelen belépési kísérlet, kérlek próbálkozzunk újra.", + "login_successful": "Sikeres belépés", + "dont_have_account": "Nincs még fiók?" } \ No newline at end of file diff --git a/public/language/hu/modules.json b/public/language/hu/modules.json index f8f13275ae..c339652efe 100644 --- a/public/language/hu/modules.json +++ b/public/language/hu/modules.json @@ -1,21 +1,21 @@ { "chat.chatting_with": "Chat vele: ", - "chat.placeholder": "Írj be egy üzenetet, és nyomj enter-t a küldéshez", + "chat.placeholder": "Írjuk be üzenetünket, és nyomjunk meg egyenter-t a küldéshez", "chat.send": "Küldés", - "chat.no_active": "Nincs aktív csevegésed.", - "chat.user_typing": "%1 gépel...", - "chat.user_has_messaged_you": "%1 üzenetet küldött neked.", + "chat.no_active": "Nincs aktív csevegés.", + "chat.user_typing": "%1 éppen ír ...", + "chat.user_has_messaged_you": "%1 üzenetet küldött.", "chat.see_all": "Minden beszélgetés mutatása", - "chat.no-messages": "Please select a recipient to view chat message history", + "chat.no-messages": "Válasszuk ki a címzettet és tekintsük meg a chat előzményeket", "chat.recent-chats": "Legutóbbi beszélgetések", "chat.contacts": "Kapcsolatok", - "chat.message-history": "Üzenet napló", + "chat.message-history": "Üzenet előzmények", "chat.pop-out": "Felugró chat", "chat.maximize": "Maximalizálás", "chat.seven_days": "7 nap", "chat.thirty_days": "30 nap", "chat.three_months": "3 hónap", - "composer.user_said_in": "%1 said in %2:", - "composer.user_said": "%1 said:", - "composer.discard": "Biztosan el akarod vetni ezt a hozzászólást?" + "composer.user_said_in": "%1 válasza erre %2:", + "composer.user_said": "%1 válasza:", + "composer.discard": "Biztosan elvetjük ezt a hozzászólást?" } \ No newline at end of file diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json index e7b1500751..9dfa18ac9a 100644 --- a/public/language/hu/pages.json +++ b/public/language/hu/pages.json @@ -1,11 +1,11 @@ { "home": "Kezdőlap", - "unread": "Olvasatlan Topikok", + "unread": "Olvasatlan témakörök", "popular": "Népszerű Témák", "recent": "Friss Topikok", "users": "Regisztrált Felhasználók", "notifications": "Értesítések", - "tags": "Topics tagged under \"%1\"", + "tags": "Témák feliratú alatt \"%1\"", "user.edit": "Szerkesztés \"%1\"", "user.following": "Tagok akiket %1 követ", "user.followers": "Tagok akik követik %1 -t", diff --git a/public/language/hu/recent.json b/public/language/hu/recent.json index d158800ced..beecad4e2e 100644 --- a/public/language/hu/recent.json +++ b/public/language/hu/recent.json @@ -1,5 +1,5 @@ { - "title": "Friss", + "title": "Legújabb", "day": "Nap", "week": "Hét", "month": "Hónap", diff --git a/public/language/hu/user.json b/public/language/hu/user.json index 03d15c58f7..c4b4cea86a 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -1,6 +1,6 @@ { - "banned": "Tiltva", - "offline": "offline", + "banned": "Kitíltva", + "offline": "Nem elérhető", "username": "Felhasználónév", "email": "E-mail", "confirm_email": "E-mail megerősítése", diff --git a/public/language/it/email.json b/public/language/it/email.json index 7950641501..40ab3484a1 100644 --- a/public/language/it/email.json +++ b/public/language/it/email.json @@ -13,7 +13,7 @@ "digest.latest_topics": "Ultimi argomenti su %1", "digest.cta": "Clicca qui per visitare %1", "digest.unsub.info": "Questo sommario ti è stato inviato perché lo hai sottoscritto nelle tue impostazioni.", - "digest.no_topics": "There have been no active topics in the past %1", + "digest.no_topics": "Non ci sono state discussioni attive nell'ultimo %1", "notif.chat.subject": "Nuovo messaggio in chat da %1", "notif.chat.cta": "Clicca qui per continuare la conversazione", "notif.chat.unsub.info": "Questa notifica di chat ti è stata inviata perché l'hai scelta nelle impostazioni.", diff --git a/public/language/it/error.json b/public/language/it/error.json index e1c46af192..d81c2c1312 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -37,7 +37,7 @@ "title-too-short": "Inserisci un titolo più lungo. I titoli devono contenere almeno %1 caratteri.", "title-too-long": "Per favore inserire un titolo più corto, non può essere più lungo di %1 caratteri.", "too-many-posts": "È possibile inserire un Post ogni %1 secondi - si prega di attendere prima di postare di nuovo", - "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "too-many-posts-newbie": "Come nuovo utente puoi postare solamente una volta ogni %1 secondi finché non hai raggiunto un livello di reputazione %2 - per favore attendi prima di inviare ancora", "file-too-big": "La dimensione massima del file consentita è di % 1 kbs - si prega di caricare un file più piccolo", "cant-vote-self-post": "Non puoi votare il tuo stesso post", "already-favourited": "Hai già inserito tra i preferiti questo post", @@ -57,11 +57,11 @@ "upload-error": "Errore upload: %1", "signature-too-long": "Spiacenti, la tua firma non può essere lunga %1 caratteri.", "cant-chat-with-yourself": "Non puoi chattare con te stesso!", - "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "chat-restricted": "Questo utente ha ristretto i suoi messaggi in chat alle persone che segue. Per poter chattare con te ti deve prima seguire.", "reputation-system-disabled": "Il sistema di reputazione è disabilitato.", "downvoting-disabled": "Il Downvoting è disabilitato", "not-enough-reputation-to-downvote": "Non hai i privilegi per votare negativamente questo post", "not-enough-reputation-to-flag": "Tu non hai abbastanza reputazione per segnalare questo Post", "reload-failed": "NodeBB ha incontrato un problema durante il ricaricamento: \"%1\". NodeBB continuerà a servire gli assets esistenti lato client, così puoi annullare quello che hai fatto prima di ricaricare.", - "registration-error": "Registration Error" + "registration-error": "Errore nella registrazione" } \ No newline at end of file diff --git a/public/language/it/global.json b/public/language/it/global.json index 67a1cbdec4..ce0bcbfe31 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -73,5 +73,5 @@ "updated.title": "Forum Aggiornato", "updated.message": "Questo forum è stato aggiornato all'ultima versione. Clicca qui per ricaricare la pagina.", "privacy": "Privacy", - "delete_all": "Delete All" + "delete_all": "Elimina Tutto" } \ No newline at end of file diff --git a/public/language/it/user.json b/public/language/it/user.json index 020c2d3b4b..032ccea5df 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -48,7 +48,7 @@ "settings": "Impostazioni", "show_email": "Mostra la mia Email", "show_fullname": "Vedi il Mio Nome Completo", - "restrict_chats": "Only allow chat messages from users I follow", + "restrict_chats": "Abilita messaggi in chat soltanto dagli utenti che seguo", "digest_label": "Iscriviti al Sommario", "digest_description": "Abbonati agli aggiornamenti via email di questo forum (nuove notifiche e argomenti) secondo una pianificazione impostata", "digest_off": "Spento", @@ -68,8 +68,8 @@ "notification_sounds": "Riproduci un suono quando ricevi una notifica.", "browsing": "Impostazioni di Navigazione", "open_links_in_new_tab": "Aprire i link esterni in una nuova tab?", - "enable_topic_searching": "Enable In-Topic Searching", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", + "enable_topic_searching": "Abilita la ricerca negli argomenti", + "topic_search_help": "Se abilitata, la ricerca negli argomenti sovrascriverà la pagina di ricerca preimpostata del browser per consentirti di cercare all'interno delle discussioni, anziché soltanto nel contenuto visibile a schermo.", "follow_topics_you_reply_to": "Segui le discussioni in cui rispondi.", "follow_topics_you_create": "Segui le discussioni che crei." } \ No newline at end of file diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 1d7e0298a4..b2c1c94b7d 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -63,5 +63,5 @@ "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post.", "not-enough-reputation-to-flag": "Nie masz dość reputacji, by flagować ten post", "reload-failed": "NodeBB napotkał problem w czasie ładowania \"%1\". Forum będzie nadal dostarczać zasoby dostępne w kliencie, jednak powinieneś cofnąć ostatnią akcję.", - "registration-error": "Registration Error" + "registration-error": "Błąd rejestracji" } \ No newline at end of file diff --git a/public/language/zh_CN/users.json b/public/language/zh_CN/users.json index 6ad3fc4c32..8ff23a16a0 100644 --- a/public/language/zh_CN/users.json +++ b/public/language/zh_CN/users.json @@ -1,5 +1,5 @@ { - "latest_users": "最近访问", + "latest_users": "最新会员", "top_posters": "发帖排行", "most_reputation": "威望排行", "search": "搜索", From f5b758245f7a261c4daae67fc6d0ba780a23ba2e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Jan 2015 18:09:37 -0500 Subject: [PATCH 018/897] added indonesian to NodeBB, Terima kasih! --- .tx/config | 20 ++++++ public/language/id/category.json | 8 +++ public/language/id/email.json | 23 ++++++ public/language/id/error.json | 67 ++++++++++++++++++ public/language/id/global.json | 77 +++++++++++++++++++++ public/language/id/groups.json | 8 +++ public/language/id/language.json | 5 ++ public/language/id/login.json | 9 +++ public/language/id/modules.json | 21 ++++++ public/language/id/notifications.json | 27 ++++++++ public/language/id/pages.json | 18 +++++ public/language/id/recent.json | 9 +++ public/language/id/register.json | 18 +++++ public/language/id/reset_password.json | 14 ++++ public/language/id/search.json | 4 ++ public/language/id/success.json | 6 ++ public/language/id/tags.json | 7 ++ public/language/id/topic.json | 96 ++++++++++++++++++++++++++ public/language/id/unread.json | 9 +++ public/language/id/user.json | 75 ++++++++++++++++++++ public/language/id/users.json | 9 +++ 21 files changed, 530 insertions(+) create mode 100644 public/language/id/category.json create mode 100644 public/language/id/email.json create mode 100644 public/language/id/error.json create mode 100644 public/language/id/global.json create mode 100644 public/language/id/groups.json create mode 100644 public/language/id/language.json create mode 100644 public/language/id/login.json create mode 100644 public/language/id/modules.json create mode 100644 public/language/id/notifications.json create mode 100644 public/language/id/pages.json create mode 100644 public/language/id/recent.json create mode 100644 public/language/id/register.json create mode 100644 public/language/id/reset_password.json create mode 100644 public/language/id/search.json create mode 100644 public/language/id/success.json create mode 100644 public/language/id/tags.json create mode 100644 public/language/id/topic.json create mode 100644 public/language/id/unread.json create mode 100644 public/language/id/user.json create mode 100644 public/language/id/users.json diff --git a/.tx/config b/.tx/config index 3d20c53234..d8dce705c9 100644 --- a/.tx/config +++ b/.tx/config @@ -19,6 +19,7 @@ trans.fi = public/language/fi/category.json trans.fr = public/language/fr/category.json trans.he = public/language/he/category.json trans.hu = public/language/hu/category.json +trans.id = public/language/id/category.json trans.it = public/language/it/category.json trans.ja = public/language/ja/category.json trans.ko = public/language/ko/category.json @@ -58,6 +59,7 @@ trans.fi = public/language/fi/login.json trans.fr = public/language/fr/login.json trans.he = public/language/he/login.json trans.hu = public/language/hu/login.json +trans.id = public/language/id/login.json trans.it = public/language/it/login.json trans.ja = public/language/ja/login.json trans.ko = public/language/ko/login.json @@ -96,6 +98,7 @@ trans.fi = public/language/fi/recent.json trans.fr = public/language/fr/recent.json trans.he = public/language/he/recent.json trans.hu = public/language/hu/recent.json +trans.id = public/language/id/recent.json trans.it = public/language/it/recent.json trans.ja = public/language/ja/recent.json trans.ko = public/language/ko/recent.json @@ -134,6 +137,7 @@ trans.fi = public/language/fi/unread.json trans.fr = public/language/fr/unread.json trans.he = public/language/he/unread.json trans.hu = public/language/hu/unread.json +trans.id = public/language/id/unread.json trans.it = public/language/it/unread.json trans.ja = public/language/ja/unread.json trans.ko = public/language/ko/unread.json @@ -172,6 +176,7 @@ trans.fi = public/language/fi/modules.json trans.fr = public/language/fr/modules.json trans.he = public/language/he/modules.json trans.hu = public/language/hu/modules.json +trans.id = public/language/id/modules.json trans.it = public/language/it/modules.json trans.ja = public/language/ja/modules.json trans.ko = public/language/ko/modules.json @@ -210,6 +215,7 @@ trans.fi = public/language/fi/register.json trans.fr = public/language/fr/register.json trans.he = public/language/he/register.json trans.hu = public/language/hu/register.json +trans.id = public/language/id/register.json trans.it = public/language/it/register.json trans.ja = public/language/ja/register.json trans.ko = public/language/ko/register.json @@ -248,6 +254,7 @@ trans.fi = public/language/fi/user.json trans.fr = public/language/fr/user.json trans.he = public/language/he/user.json trans.hu = public/language/hu/user.json +trans.id = public/language/id/user.json trans.it = public/language/it/user.json trans.ja = public/language/ja/user.json trans.ko = public/language/ko/user.json @@ -286,6 +293,7 @@ trans.fi = public/language/fi/global.json trans.fr = public/language/fr/global.json trans.he = public/language/he/global.json trans.hu = public/language/hu/global.json +trans.id = public/language/id/global.json trans.it = public/language/it/global.json trans.ja = public/language/ja/global.json trans.ko = public/language/ko/global.json @@ -324,6 +332,7 @@ trans.fi = public/language/fi/notifications.json trans.fr = public/language/fr/notifications.json trans.he = public/language/he/notifications.json trans.hu = public/language/hu/notifications.json +trans.id = public/language/id/notifications.json trans.it = public/language/it/notifications.json trans.ja = public/language/ja/notifications.json trans.ko = public/language/ko/notifications.json @@ -362,6 +371,7 @@ trans.fi = public/language/fi/reset_password.json trans.fr = public/language/fr/reset_password.json trans.he = public/language/he/reset_password.json trans.hu = public/language/hu/reset_password.json +trans.id = public/language/id/reset_password.json trans.it = public/language/it/reset_password.json trans.ja = public/language/ja/reset_password.json trans.ko = public/language/ko/reset_password.json @@ -400,6 +410,7 @@ trans.fi = public/language/fi/users.json trans.fr = public/language/fr/users.json trans.he = public/language/he/users.json trans.hu = public/language/hu/users.json +trans.id = public/language/id/users.json trans.it = public/language/it/users.json trans.ja = public/language/ja/users.json trans.ko = public/language/ko/users.json @@ -438,6 +449,7 @@ trans.fi = public/language/fi/language.json trans.fr = public/language/fr/language.json trans.he = public/language/he/language.json trans.hu = public/language/hu/language.json +trans.id = public/language/id/language.json trans.it = public/language/it/language.json trans.ja = public/language/ja/language.json trans.ko = public/language/ko/language.json @@ -476,6 +488,7 @@ trans.fi = public/language/fi/pages.json trans.fr = public/language/fr/pages.json trans.he = public/language/he/pages.json trans.hu = public/language/hu/pages.json +trans.id = public/language/id/pages.json trans.it = public/language/it/pages.json trans.ja = public/language/ja/pages.json trans.ko = public/language/ko/pages.json @@ -514,6 +527,7 @@ trans.fi = public/language/fi/topic.json trans.fr = public/language/fr/topic.json trans.he = public/language/he/topic.json trans.hu = public/language/hu/topic.json +trans.id = public/language/id/topic.json trans.it = public/language/it/topic.json trans.ja = public/language/ja/topic.json trans.ko = public/language/ko/topic.json @@ -552,6 +566,7 @@ trans.fi = public/language/fi/success.json trans.fr = public/language/fr/success.json trans.he = public/language/he/success.json trans.hu = public/language/hu/success.json +trans.id = public/language/id/success.json trans.it = public/language/it/success.json trans.ja = public/language/ja/success.json trans.ko = public/language/ko/success.json @@ -590,6 +605,7 @@ trans.fi = public/language/fi/error.json trans.fr = public/language/fr/error.json trans.he = public/language/he/error.json trans.hu = public/language/hu/error.json +trans.id = public/language/id/error.json trans.it = public/language/it/error.json trans.ja = public/language/ja/error.json trans.ko = public/language/ko/error.json @@ -628,6 +644,7 @@ trans.fi = public/language/fi/tags.json trans.fr = public/language/fr/tags.json trans.he = public/language/he/tags.json trans.hu = public/language/hu/tags.json +trans.id = public/language/id/tags.json trans.it = public/language/it/tags.json trans.ja = public/language/ja/tags.json trans.ko = public/language/ko/tags.json @@ -666,6 +683,7 @@ trans.fi = public/language/fi/email.json trans.fr = public/language/fr/email.json trans.he = public/language/he/email.json trans.hu = public/language/hu/email.json +trans.id = public/language/id/email.json trans.it = public/language/it/email.json trans.ja = public/language/ja/email.json trans.ko = public/language/ko/email.json @@ -704,6 +722,7 @@ trans.fi = public/language/fi/search.json trans.fr = public/language/fr/search.json trans.he = public/language/he/search.json trans.hu = public/language/hu/search.json +trans.id = public/language/id/search.json trans.it = public/language/it/search.json trans.ja = public/language/ja/search.json trans.ko = public/language/ko/search.json @@ -742,6 +761,7 @@ trans.fi = public/language/fi/groups.json trans.fr = public/language/fr/groups.json trans.he = public/language/he/groups.json trans.hu = public/language/hu/groups.json +trans.id = public/language/id/groups.json trans.it = public/language/it/groups.json trans.ja = public/language/ja/groups.json trans.ko = public/language/ko/groups.json diff --git a/public/language/id/category.json b/public/language/id/category.json new file mode 100644 index 0000000000..89be56e6ff --- /dev/null +++ b/public/language/id/category.json @@ -0,0 +1,8 @@ +{ + "new_topic_button": "Topik Baru", + "no_topics": "Tidak ada topik dikategori ini
Mengapa anda tidak mencoba membuat yang baru?", + "browsing": "penjelajahan", + "no_replies": "Belum ada orang yang menjawab", + "share_this_category": "Bagikan kategori ini", + "ignore": "Abaikan" +} \ No newline at end of file diff --git a/public/language/id/email.json b/public/language/id/email.json new file mode 100644 index 0000000000..cddffe26df --- /dev/null +++ b/public/language/id/email.json @@ -0,0 +1,23 @@ +{ + "password-reset-requested": "Permintaan atur ulang Kata Sandi - %1!", + "welcome-to": "Selamat datang di %1", + "greeting_no_name": "Hai", + "greeting_with_name": "Hai %1", + "welcome.text1": "Terima kasih anda telah mendaftarkan diri anda dengan %1!", + "welcome.text2": "Untuk mengaktifkan akun anda sepenuhnya, kami perlu memverifkasi bahwa anda adalah pemilik email yang terdaftar.", + "welcome.cta": "Klik disini untuk mengkonfirmasi alamat email anda.", + "reset.text1": "Kami menerima permintan untuk mengatur ulang kata sandi anda, Ini dikarenakan anda telah lupa akan kata sandi anda. Tolong abaikan email ini jika sebaliknya.", + "reset.text2": "Mohon klik link berikut untuk mengatur ulang kata sandi anda.", + "reset.cta": "Klik di sini untuk mengatur ulang kata sandi anda", + "digest.notifications": "Anda mempunyai notifikasi yang belum terbaca dari %1:", + "digest.latest_topics": "Topik-topik terbaru dari %1", + "digest.cta": "Klik di sini untuk mengunjungi %1", + "digest.unsub.info": "Sesuai pengaturan langganan anda, maka ringkasan ini di kirimkan untuk anda ", + "digest.no_topics": "Tidak ada topik yang aktif selama %1", + "notif.chat.subject": "Pesan yang baru diterima dari %1", + "notif.chat.cta": "Klik di sini untuk melanjutkan percakapan", + "notif.chat.unsub.info": "Sesuai pengaturan langganan anda, notifikasi obrolan ini dikirmkan kepada anda", + "test.text1": "Ini hanya email percobaan untuk menverifkasi pengiriman email telah diatur oleh NodeBB secara benar", + "unsub.cta": "Klik di sini untuk mengubah pengaturan-pengaturan tersebut.", + "closing": "Terima kasih!" +} \ No newline at end of file diff --git a/public/language/id/error.json b/public/language/id/error.json new file mode 100644 index 0000000000..58d37de6cb --- /dev/null +++ b/public/language/id/error.json @@ -0,0 +1,67 @@ +{ + "invalid-data": "Data Salah", + "not-logged-in": "Kamu terlihat belum login", + "account-locked": "Akun kamu dikunci sementara", + "search-requires-login": "Pencarian butuh sebuah akun, silakan login atau register terlebih dulu", + "invalid-cid": "ID Kategori Salah", + "invalid-tid": "ID Topik Salah", + "invalid-pid": "ID Post Salah", + "invalid-uid": "ID User Salah", + "invalid-username": "Username Salah", + "invalid-email": "Email Salah", + "invalid-title": "Judul Salah", + "invalid-user-data": "Data Pengguna Salah", + "invalid-password": "Password Salah", + "invalid-username-or-password": "Mohon spesifikasikan username dan password", + "invalid-search-term": "Kata pencarian salah", + "invalid-pagination-value": "Nilai halaman salah", + "username-taken": "Username sudah terdaftar", + "email-taken": "Email sudah terdaftar", + "email-not-confirmed": "Email kamu belum dikonfirmasi, klik disini untuk mengkonfirmasi email.", + "username-too-short": "Username terlalu pendek", + "username-too-long": "Username terlalu panjang", + "user-banned": "Pengguna dibanned", + "user-too-new": "Maaf kamu harus menunggu %1 detik sebelum membuat post pertama", + "no-category": "Kategori tidak ditemukan", + "no-topic": "Topik tidak ditemukan", + "no-post": "Post tidak ditemukan", + "no-group": "Grup tidak ditemukan", + "no-user": "Pengguna tidak ditemukan", + "no-teaser": "Teaser tidak ditemukan", + "no-privileges": "Kamu tidak punya cukup izin untuk melakukan ini", + "no-emailers-configured": "Tidak ada plugin email, jadi test email tidak dapat dikirim", + "category-disabled": "Kategori ditiadakan", + "topic-locked": "Topik dikunci", + "still-uploading": "Tunggu proses upload sampai selesai", + "content-too-short": "Mohon masukkan posting yang lebih panjang. Posting harus memuat setidaknya %1 karakter.", + "title-too-short": "Mohon masukkan judul yang lebih panjang. Judul harus memuat setidaknya %1 karakter.", + "title-too-long": "Mohon masukkan judul yang lebih pendek. Judul tidak dapat melebihi %1 karakter.", + "too-many-posts": "Kamu hanya dapat melakukan posting satu kali setiap %1 detik - mohon tunggu beberapa saat sebelum melakukan posting kembali", + "too-many-posts-newbie": "Sebagai pengguna baru, kamu hanya diijinkan membuat posting satu kali setiap %1 detik sampai kamu mendapatkan %2 reputasi - mohon tunggu beberapa saat sebelum melakukan posting kembali", + "file-too-big": "Ukuran file yang boleh diupload %1 kbs - mohon upload file dengan ukuran lebih kecil", + "cant-vote-self-post": "Kamu tidak dapat vote postingan sendiri", + "already-favourited": "Post ini sudah kamu favorit", + "already-unfavourited": "Postingan ini sudah kamu unfavorit", + "cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!", + "invalid-image-type": "Tipe gambar salah", + "group-name-too-short": "Nama grup terlalu pendek", + "group-already-exists": "Grup sudah ada", + "group-name-change-not-allowed": "Perubahan nama grup tidak dibolehkan", + "post-already-deleted": "Postingan ini sudah dihapus", + "post-already-restored": "Postingan ini sudah direstore", + "topic-already-deleted": "Topik ini sudah dihapus", + "topic-already-restored": "Topik ini sudah direstore", + "topic-thumbnails-are-disabled": "Thumbnail di topik ditiadakan", + "invalid-file": "File Salah", + "uploads-are-disabled": "Upload ditiadakan", + "upload-error": "Upload Error: %1", + "signature-too-long": "Maaf, tanda pengenalmu tidak dapat melebihi %1 karakter.", + "cant-chat-with-yourself": "Kamu tidak dapat chat dengan akun sendiri", + "chat-restricted": "Pengguna ini telah membatasi percakapa mereka. Mereka harus mengikutimu sebelum kamu dapat melakukan percakapan dengan mereka ", + "reputation-system-disabled": "Sistem reputasi ditiadakan.", + "downvoting-disabled": "Downvoting ditiadakan", + "not-enough-reputation-to-downvote": "Tidak cukup reputation untuk downvote post ini", + "not-enough-reputation-to-flag": "Tidak cukup reputation untuk flag post ini", + "reload-failed": "NodeBB mengalami masalah saat memuat \"%1\". NodeBB akan melanjutkan pemuatan, kamu harus membatalkan tindakanmu sebelum pemuatan kembali dilakukan.", + "registration-error": "Registrasti Error" +} \ No newline at end of file diff --git a/public/language/id/global.json b/public/language/id/global.json new file mode 100644 index 0000000000..de13ab0ca3 --- /dev/null +++ b/public/language/id/global.json @@ -0,0 +1,77 @@ +{ + "home": "Beranda", + "search": "Cari", + "buttons.close": "Tutup", + "403.title": "Akses ditolak", + "403.message": "Kamu terlihat masuk ke halaman yang kamu tidak punya akses untuk melakukannya. Coba login terlebih dulu.", + "404.title": "Tidak ditemukan", + "404.message": "Kamu terlihat masuk ke halaman yang sudah tidak ada. Silakan kembali ke Halaman Depan.", + "500.title": "Kesalahan internal", + "500.message": "Oops! Terjadi kesalahan", + "register": "Daftar", + "login": "Login", + "please_log_in": "Silakan Log In", + "logout": "Logout", + "posting_restriction_info": "Posting hanya boleh dilakukan oleh pengguna terdaftar, klik disini untuk log in.", + "welcome_back": "Selamat Datang Kembali", + "you_have_successfully_logged_in": "Kamu sudah login", + "save_changes": "Menyimpan perubahan", + "close": "Tutup", + "pagination": "Halaman", + "pagination.out_of": "%1 dari %2", + "pagination.enter_index": "Masukkan index", + "header.admin": "Admin", + "header.recent": "Terbaru", + "header.unread": "Belum dibaca", + "header.tags": "Tag", + "header.popular": "Populer", + "header.users": "Pengguna", + "header.chats": "Chat", + "header.notifications": "Pemberitahuan", + "header.search": "Cari", + "header.profile": "Profil", + "notifications.loading": "Memuat Pemberitahuan", + "chats.loading": "Memuat Chat", + "motd.welcome": "Selamat datang di NodeBB, platform diskusi masa depan.", + "previouspage": "Halaman Sebelumnya", + "nextpage": "Halaman Selanjutnya", + "alert.success": "Sukses", + "alert.error": "Error", + "alert.banned": "Banned", + "alert.banned.message": "Akunmu telah dibanned, kamu akan logout sekarang", + "alert.unfollow": "Kamu tidak mengikuti %1", + "alert.follow": "Kamu mengikuti %1", + "online": "Online", + "users": "Pengguna", + "topics": "Topik", + "posts": "Post", + "views": "Views", + "reputation": "Reputasi", + "read_more": "selengkapnya", + "posted_ago_by_guest": "dibuat %1 oleh Guest", + "posted_ago_by": "dibuat %1 oleh %2", + "posted_ago": "dibuat %1", + "posted_in_ago_by_guest": "dibuat di %1 %2 oleh Tamu", + "posted_in_ago_by": "dibuat di %1 %2 oleh %3", + "posted_in_ago": "dibuat di %1 %2", + "replied_ago": "dibalas %1", + "user_posted_ago": "Dibuat oleh %1 %2", + "guest_posted_ago": "Dibuat oleh Tamu %1", + "last_edited_by_ago": "Terakhir diubah oleh %1 %2", + "norecentposts": "Tidak ada post terbaru", + "norecenttopics": "Tidak ada topik terbaru", + "recentposts": "Post Terbaru", + "recentips": "Beberapa IP yang digunakan untuk login baru-baru ini", + "away": "Tidak Ditempat", + "dnd": "Jangan ganggu", + "invisible": "Tidak Terlihat", + "offline": "Offline", + "email": "Email", + "language": "Bahasa", + "guest": "Tamu", + "guests": "Tamu", + "updated.title": "Forum telah diupdate", + "updated.message": "Forum ini telah diupdate ke versi terbaru. Klik disini untuk memuat halaman.", + "privacy": "Privasi", + "delete_all": "Hapus Semua" +} \ No newline at end of file diff --git a/public/language/id/groups.json b/public/language/id/groups.json new file mode 100644 index 0000000000..6b2f27c348 --- /dev/null +++ b/public/language/id/groups.json @@ -0,0 +1,8 @@ +{ + "groups": "Grup", + "view_group": "Tampilkan Grup", + "details.title": "Rincian Grup", + "details.members": "Daftar Anggota", + "details.has_no_posts": "Anggota grup ini belum membuat posting satupun.", + "details.latest_posts": "Posting Terkini" +} \ No newline at end of file diff --git a/public/language/id/language.json b/public/language/id/language.json new file mode 100644 index 0000000000..1bcec669d0 --- /dev/null +++ b/public/language/id/language.json @@ -0,0 +1,5 @@ +{ + "name": "Bahasa Indonesia", + "code": "id", + "dir": "ltr" +} \ No newline at end of file diff --git a/public/language/id/login.json b/public/language/id/login.json new file mode 100644 index 0000000000..8aede403da --- /dev/null +++ b/public/language/id/login.json @@ -0,0 +1,9 @@ +{ + "username": "Username / Email", + "remember_me": "Ingin Diingat?", + "forgot_password": "Lupa Password?", + "alternative_logins": "Login Alternatif", + "failed_login_attempt": "Percobaan login gagal, cobalah kembali.", + "login_successful": "Kamu telah berhasil login!", + "dont_have_account": "Belum memiliki akun?" +} \ No newline at end of file diff --git a/public/language/id/modules.json b/public/language/id/modules.json new file mode 100644 index 0000000000..53320cf627 --- /dev/null +++ b/public/language/id/modules.json @@ -0,0 +1,21 @@ +{ + "chat.chatting_with": "Gunakan untuk melakukan percakapan", + "chat.placeholder": "Tulis pesan percakapan di sini, tekan enter untuk mengirim", + "chat.send": "Kirim", + "chat.no_active": "Kamu tidak memiliki percakapan yang aktif.", + "chat.user_typing": "%1 sedang menulis ...", + "chat.user_has_messaged_you": "%1 telah mengirimkan pesan untukmu.", + "chat.see_all": "Lihat seluruh Percakapan", + "chat.no-messages": "Mohon pilih satu penerima untuk melihat riwayat pesan percakapan", + "chat.recent-chats": "Percakapan terbaru", + "chat.contacts": "Kontak", + "chat.message-history": "Riwayat Pesan", + "chat.pop-out": "Munculkan pesan", + "chat.maximize": "Maksimalkan", + "chat.seven_days": "7 Hari", + "chat.thirty_days": "30 Hari", + "chat.three_months": "3 Bulan", + "composer.user_said_in": "%1 berkata di %2: ", + "composer.user_said": "%1 berkata:", + "composer.discard": "Kamu yakin akan membuang posting ini?" +} \ No newline at end of file diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json new file mode 100644 index 0000000000..6a4145dc63 --- /dev/null +++ b/public/language/id/notifications.json @@ -0,0 +1,27 @@ +{ + "title": "Pemberitahuan", + "no_notifs": "Kamu tidak memiliki pemberitahuan baru", + "see_all": "Lihat seluruh Pemberitahuan", + "back_to_home": "Kembali ke %1", + "outgoing_link": "Tautan Keluar", + "outgoing_link_message": "Saat ini kamu meninggalkan %1.", + "continue_to": "Lanjut ke %1", + "return_to": "Kembali ke %1", + "new_notification": "Pemberitahuan Baru", + "you_have_unread_notifications": "Kamu memiliki pemberitahuan yang belum dibaca.", + "new_message_from": "Pesan baru dari %1", + "upvoted_your_post_in": "%1 telah melakukan upvote untuk posting kamu di %2.", + "moved_your_post": "%1 telah memindahkan postingmu.", + "moved_your_topic": "%1 telah memindahkan topikmu.", + "favourited_your_post_in": "%1 telah memfavoritkan posting mu di %2.", + "user_flagged_post_in": "%1 menandai sebuah posting di %2", + "user_posted_to": "%1 telah mengirim sebuah balasan kepada: %2", + "user_posted_topic": "%1 telah membuat topik baru: %2", + "user_mentioned_you_in": "%1 menyebut mu di %2", + "user_started_following_you": "%1 mulai mengikutimu.", + "email-confirmed": "Email telah Dikonfirmasi", + "email-confirmed-message": "Terimakasih telah melakukan validasi email. Akunmu saat ini telah aktif sepenuhnya.", + "email-confirm-error": "Terjadi error...", + "email-confirm-error-message": "Terjadi masalah saat melakukan validasi emailmu. Mungkin terjadi kesalahan kode atau waktu habis.", + "email-confirm-sent": "Email konfirmasi telah dikirim." +} \ No newline at end of file diff --git a/public/language/id/pages.json b/public/language/id/pages.json new file mode 100644 index 0000000000..bfedbfaa27 --- /dev/null +++ b/public/language/id/pages.json @@ -0,0 +1,18 @@ +{ + "home": "Beranda", + "unread": "Topik belum Dibaca", + "popular": "Topik Populer", + "recent": "Topik Terkini", + "users": "Pengguna Terdaftar", + "notifications": "Pemberitahuan", + "tags": "Topik ditag dalam \"%1\"", + "user.edit": "Sedang merubah \"%1\"", + "user.following": "Mengikuti Pengguna %1", + "user.followers": "Pengguna yang mengikuti %1", + "user.posts": "Posting dibuat oleh %1", + "user.topics": "Topik dibuat oleh %1", + "user.favourites": "Posting Favorit %1", + "user.settings": "Pengaturan Pengguna", + "maintenance.text": "%1 saat ini sedang dalam masa pemeliharaan. Silahkan kembali lain waktu.", + "maintenance.messageIntro": "Tambahan, Administrator meninggalkan pesan ini:" +} \ No newline at end of file diff --git a/public/language/id/recent.json b/public/language/id/recent.json new file mode 100644 index 0000000000..a68a649504 --- /dev/null +++ b/public/language/id/recent.json @@ -0,0 +1,9 @@ +{ + "title": "Terkini", + "day": "Hari", + "week": "Pekan", + "month": "Bulan", + "year": "Tahun", + "alltime": "Sepanjang Waktu", + "no_recent_topics": "Tidak ada topik terbaru." +} \ No newline at end of file diff --git a/public/language/id/register.json b/public/language/id/register.json new file mode 100644 index 0000000000..f38cb7a6d6 --- /dev/null +++ b/public/language/id/register.json @@ -0,0 +1,18 @@ +{ + "register": "Daftar", + "help.email": "Secara default, emailmu akan disembunyikan dari publik.", + "help.username_restrictions": "Nama Pengguna yang unik antara %1 dan %2 karakter. Pengguna lain dapat menyebutmu dengan menggunakan @nama pengguna.", + "help.minimum_password_length": "Panjang passwordmu harus memuat setidaknya %1 karakter.", + "email_address": "Alamat Email", + "email_address_placeholder": "Masukkan Alamat Email", + "username": "Nama Pengguna", + "username_placeholder": "Masukkan Nama Pengguna", + "password": "Kata Sandi", + "password_placeholder": "Masukkan Kata Sandi", + "confirm_password": "Konfirmasi Kata Sandi", + "confirm_password_placeholder": "Konfirmasi Kata Sandi", + "register_now_button": "Daftar Sekarang", + "alternative_registration": "Pendaftaran Alternatif", + "terms_of_use": "Aturan Penggunaan", + "agree_to_terms_of_use": "Saya menyetujui Aturan Penggunaan" +} \ No newline at end of file diff --git a/public/language/id/reset_password.json b/public/language/id/reset_password.json new file mode 100644 index 0000000000..7ae5b9e8d7 --- /dev/null +++ b/public/language/id/reset_password.json @@ -0,0 +1,14 @@ +{ + "reset_password": "Atur Ulang Kata Sandi", + "update_password": "Perbarui Kata Sandi", + "password_changed.title": "Kata Sandi telah Diganti", + "password_changed.message": "

Kata Sandi berhasil diatur ulang, silakan login kembali.", + "wrong_reset_code.title": "Kode Pengaturan Ulang Salah", + "wrong_reset_code.message": "Kode pengaturan ulang salah. Silakan coba lagi, atauminta kode pengaturan ulang baru.", + "new_password": "Kata Sandi Baru", + "repeat_password": "Konfirmasi Kata Sandi", + "enter_email": "Mohon masukkan alamat emailmu dan kami akan mengirimkan mu sebuah email dengan instruksi mengenai cara pengaturan ulang akunmu.", + "enter_email_address": "Masukkan Alamat Email", + "password_reset_sent": "Pengaturan Kembali Kata Sandi telah DIkirim", + "invalid_email": "Email Salah / Email tidak ada!" +} \ No newline at end of file diff --git a/public/language/id/search.json b/public/language/id/search.json new file mode 100644 index 0000000000..b296b8ef1b --- /dev/null +++ b/public/language/id/search.json @@ -0,0 +1,4 @@ +{ + "results_matching": "%1 hasil yang sesuai dengan \"%2\", (%3 detik)", + "no-matches": "Hasil pencarian tidak ditemukan" +} \ No newline at end of file diff --git a/public/language/id/success.json b/public/language/id/success.json new file mode 100644 index 0000000000..a978b89347 --- /dev/null +++ b/public/language/id/success.json @@ -0,0 +1,6 @@ +{ + "success": "Sukses", + "topic-post": "Kamu berhasil melakukan posting.", + "authentication-successful": "Otentikasi Sukses", + "settings-saved": "Pengaturan disimpan!" +} \ No newline at end of file diff --git a/public/language/id/tags.json b/public/language/id/tags.json new file mode 100644 index 0000000000..d6fece770e --- /dev/null +++ b/public/language/id/tags.json @@ -0,0 +1,7 @@ +{ + "no_tag_topics": "Tidak ada topik dengan tag ini.", + "tags": "Tag", + "enter_tags_here": "Masukkan tag di sini. Tekan enter untuk setiap tag.", + "enter_tags_here_short": "Masukkan tag...", + "no_tags": "Belum ada tag." +} \ No newline at end of file diff --git a/public/language/id/topic.json b/public/language/id/topic.json new file mode 100644 index 0000000000..9536cbc46c --- /dev/null +++ b/public/language/id/topic.json @@ -0,0 +1,96 @@ +{ + "topic": "Topik", + "topic_id": "ID Topik", + "topic_id_placeholder": "Masukkan ID topik", + "no_topics_found": "Tidak topik yang ditemukan!", + "no_posts_found": "Tidak ada posting yang ditemukan!", + "post_is_deleted": "Posting ini telah dihapus!", + "profile": "Profil", + "posted_by": "Dibuat oleh %1", + "posted_by_guest": "Dibuat oleh Tamu", + "chat": "Percakapan", + "notify_me": "Beritahukan balasan baru untuk topik ini", + "quote": "Kutip", + "reply": "Balas", + "edit": "Ubah", + "delete": "Hapus", + "purge": "Musnahkan", + "restore": "Kembalikan", + "move": "Pindah", + "fork": "Cabangkan", + "link": "Tautan", + "share": "Bagikan", + "tools": "Perangkat", + "flag": "Tandai", + "locked": "Terkunci", + "bookmark_instructions": "Klik di sini untuk kembali ke posisi terakhirmu atau tutup untuk membuang.", + "flag_title": "Tandai posting ini untuk moderasi", + "flag_confirm": "Kamu yakin ingin menandai posting ini?", + "flag_success": "Posting ini telah ditandai untuk moderasi", + "deleted_message": "Topik ini telah dihapus. Hanya pengguna dengan hak manajemen topik yang dapat melihatnya.", + "following_topic.message": "Saat ini kamu akan menerima pemberitahuan saat seseorang membuat posting di dalam topik ini.", + "not_following_topic.message": "Kamu tidak lagi menerima notiifikasi dari topik ini.", + "login_to_subscribe": "Daftar atau login untuk berlangganan topik ini.", + "markAsUnreadForAll.success": "Topik ditandai Belum Dibaca seluruhnya", + "watch": "Pantau", + "unwatch": "Batalkan Pantau", + "watch.title": "Beritahukan balasan baru untuk topik ini", + "unwatch.title": "Berhenti memantau topik ini", + "share_this_post": "Bagikan Posting ini", + "thread_tools.title": "Perangkat Topik", + "thread_tools.markAsUnreadForAll": "Tandai Belum Dibaca", + "thread_tools.pin": "Tempel Topik", + "thread_tools.unpin": "Copot Topik", + "thread_tools.lock": "Kunci Topik", + "thread_tools.unlock": "Lepas Topik", + "thread_tools.move": "Pindah Topik", + "thread_tools.move_all": "Pindah Semua", + "thread_tools.fork": "Cabangkan Topik", + "thread_tools.delete": "Hapus Topik", + "thread_tools.delete_confirm": "Kamu yakin ingin menghapus topik ini?", + "thread_tools.restore": "Kembalikan Topik", + "thread_tools.restore_confirm": "Kamu yakin ingin mengembalikan topik ini?", + "thread_tools.purge": "Musnahkan Topik", + "thread_tools.purge_confirm": "Kamu yakin ingin memusnahkan topik ini?", + "topic_move_success": "Topik ini berhasil dipindahkan ke %1", + "post_delete_confirm": "Kamu yakin ingin menghapus posting ini?", + "post_restore_confirm": "Kamu yakin ingin mengembalikan posting ini?", + "post_purge_confirm": "Kamu yakin ingin memusnahkan posting ini?", + "load_categories": "Memuat Kategori", + "disabled_categories_note": "Indikator Kategori yang Ditiadakan keabu-abuan", + "confirm_move": "Pindah", + "confirm_fork": "Cabangkan", + "favourite": "Favorit", + "favourites": "Beberapa Favorit", + "favourites.has_no_favourites": "Kamu tidak memiliki favorit, favoritkan beberapa posting untuk melihatnya di sini! ", + "loading_more_posts": "Memuat Lebih Banyak Posting", + "move_topic": "Pindahkan Topik", + "move_topics": "Pindahkan Beberapa Topik", + "move_post": "Pindahkan Posting", + "post_moved": "Posting dipindahkan!", + "fork_topic": "Cabangkan Topik", + "topic_will_be_moved_to": "Topik ini akan dipindahkan ke kategori", + "fork_topic_instruction": "Klik posting yang kamu ingin cabangkan", + "fork_no_pids": "Tidak ada posting yang dipilih!", + "fork_success": "Topik berhasil dicabangkan! Klik disini untuk menuju topik yang telah dicabangkan.", + "composer.title_placeholder": "Masukkan judul topik di sini...", + "composer.discard": "Buang", + "composer.submit": "Kirim", + "composer.replying_to": "Membalas ke %1", + "composer.new_topic": "Topik Baru", + "composer.uploading": "mengunggah...", + "composer.thumb_url_label": "Tempelkan URL gambar mini topik", + "composer.thumb_title": "Tambah gambar mini untuk topik ini", + "composer.thumb_url_placeholder": "http://example.com/thumb.png", + "composer.thumb_file_label": "Atau unggah sebuah berkas", + "composer.thumb_remove": "Hapus kolom", + "composer.drag_and_drop_images": "Geser dan Lepas Gambar di sini", + "more_users_and_guests": "%1 lebuh pengguna dan %2 tamu", + "more_users": "%1 lebih pengguna", + "more_guests": "%1 lebih tamu", + "users_and_others": "%1 dan %2 lainnya", + "sort_by": "Urutkan berdasakan", + "oldest_to_newest": "Terlama ke Terbaru", + "newest_to_oldest": "Terbaru ke Terlama", + "most_votes": "Vote terbanyak" +} \ No newline at end of file diff --git a/public/language/id/unread.json b/public/language/id/unread.json new file mode 100644 index 0000000000..326f9d732b --- /dev/null +++ b/public/language/id/unread.json @@ -0,0 +1,9 @@ +{ + "title": "Belum Dibaca", + "no_unread_topics": "Tidak ada topik yang belum dibaca.", + "load_more": "Tampilkan Lebih Banyak", + "mark_as_read": "Tandai Sudah Dibaca", + "selected": "Terpilih", + "all": "Semua", + "topics_marked_as_read.success": "Topik ditandai sudah dibaca!" +} \ No newline at end of file diff --git a/public/language/id/user.json b/public/language/id/user.json new file mode 100644 index 0000000000..8b5734bc09 --- /dev/null +++ b/public/language/id/user.json @@ -0,0 +1,75 @@ +{ + "banned": "Banned", + "offline": "Offline", + "username": "Nama Pengguna", + "email": "Email", + "confirm_email": "Konfirmasi Email", + "delete_account": "Hapus Akun", + "delete_account_confirm": "Kamu yakin ingin menghapus akunmu?
Tindakan ini tidak dapat dibatalkan dan kamu tidak dapat mengembalikan seluruh data mu

Masukkan nama pengguna kamu untuk memastikan jika kamu benar-benar ingin menghapus akun ini.", + "fullname": "Nama Lengkap", + "website": "Website", + "location": "Lokasi", + "age": "Umur", + "joined": "Tergabung", + "lastonline": "Online Terakhir", + "profile": "Profil", + "profile_views": "Tampilan profil", + "reputation": "Reputasi", + "favourites": "Favorit", + "followers": "Pengikut", + "following": "Mengikuti", + "signature": "Tanda Pengenal", + "gravatar": "Gravatar", + "birthday": "Hari Lahir", + "chat": "Percakapan", + "follow": "Ikuti", + "unfollow": "Tinggalkan", + "profile_update_success": "Profil berhasil diperbarui!", + "change_picture": "Ganti Gambar/Foto", + "edit": "Perbarui", + "uploaded_picture": "Gambar/Foto yang Diunggah", + "upload_new_picture": "Unggah Gambar/Foto Baru", + "upload_new_picture_from_url": "Unggah Gambar/Foto Baru dari URL", + "current_password": "Kata Sandi Saat Ini", + "change_password": "Ganti Kata Sandi", + "change_password_error": "Kata Sandi Salah!", + "change_password_error_wrong_current": "Kata Sandi kamu saat ini salah!", + "change_password_error_length": "Kata Sandi terlalu pendek!", + "change_password_error_match": "Kata Sandi harus sesuai!", + "change_password_error_privileges": "Kamu tidak memiliki hak untuk mengganti kata sandi ini.", + "change_password_success": "Kata Sandi kamu telah diperbarui!", + "confirm_password": "Konfirmasi Kata Sandi", + "password": "Kata Sandi", + "username_taken_workaround": "Nama pengguna yang kamu inginkan telah diambil, jadi kami merubahnya sedikit. Kamu saat ini dikenal sebagai %1", + "upload_picture": "Unggah gambar/foto", + "upload_a_picture": "Unggah sebuah gambar/foto", + "image_spec": "Kamu hanya diijinkan mengunggah berkas dengan format PNG, JPG, atau GIF", + "max": "maks.", + "settings": "Pengaturan", + "show_email": "Tampilkan Email Saya", + "show_fullname": "Tampilkan Nama Lengkap Saya", + "restrict_chats": "Hanya ijinkan pesan percakapan dari pengguna yang saya ikuti.", + "digest_label": "Berlangganan Digest", + "digest_description": "Berlangganan melalui email untuk forum ini (pemberitahuan baru dan topik) sesuai dengan pengaturan jadwal", + "digest_off": "Off", + "digest_daily": "Harian", + "digest_weekly": "Mingguan", + "digest_monthly": "Bulanan", + "send_chat_notifications": "Kirimkan email jika menerima pesan percakapan dan saya sedang tidak online", + "has_no_follower": "User ini tidak memiliki pengikut :(", + "follows_no_one": "User ini tidak mengikuti seorangpun :(", + "has_no_posts": "User ini belum pernah membuat posting.", + "has_no_topics": "User ini belum pernah membuat topik.", + "email_hidden": "Email Disembunyikan", + "hidden": "disembunyikan", + "paginate_description": "Gunakan halaman topik dan posting sebagai ganti penggunaan gulungan tanpa batas.", + "topics_per_page": "Topik per Halaman", + "posts_per_page": "Posting per Halaman", + "notification_sounds": "Mainkan suara saat kamu menerima pemberitahuan.", + "browsing": "Pengaturan Penelusuran", + "open_links_in_new_tab": "Buka tautan ke luar pada tab baru?", + "enable_topic_searching": "Gunakan Pencarian Di dalam Topik", + "topic_search_help": "Jika digunakan, pencarian di dalam topik akan mengambil alih tindakan pencarian default browser dan mengijinkan kamu untuk mencari keseluruhan topik sebagai pengganti pencarian hanya yang tampil pada layar saja.", + "follow_topics_you_reply_to": "Ikuti topik yang kamu balas.", + "follow_topics_you_create": "Ikuti topik yang kamu buat." +} \ No newline at end of file diff --git a/public/language/id/users.json b/public/language/id/users.json new file mode 100644 index 0000000000..c313a8760f --- /dev/null +++ b/public/language/id/users.json @@ -0,0 +1,9 @@ +{ + "latest_users": "Pengguna Terakhir", + "top_posters": "Posting Terbanyak", + "most_reputation": "Reputasi Terbanyak", + "search": "Pencarian", + "enter_username": "Masukkan nama pengguna untuk mencari", + "load_more": "Tampilkan Lebih Banyak", + "users-found-search-took": "%1 pengguna ditemukan! Pencarian butuh waktu %2 ms." +} \ No newline at end of file From b51127bd9c62affdcb711f28eef49cb337f1e6a8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 6 Jan 2015 23:29:48 -0500 Subject: [PATCH 019/897] closes #2578 --- src/plugins.js | 53 +++++++++++++++++--------------------------- src/plugins/hooks.js | 2 +- src/plugins/load.js | 45 +++++++++++++++++++++++++++---------- 3 files changed, 54 insertions(+), 46 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index fb0d9256ab..9768ffa10c 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -34,8 +34,8 @@ var fs = require('fs'), Plugins.initialized = false; - Plugins.requireLibrary = function(pluginData, libraryPath) { - Plugins.libraries[pluginData.id] = require(libraryPath); + Plugins.requireLibrary = function(pluginID, libraryPath) { + Plugins.libraries[pluginID] = require(libraryPath); Plugins.libraryPaths.push(libraryPath); }; @@ -287,45 +287,32 @@ var fs = require('fs'), async.waterfall([ function(next) { - async.parallel({ - packageJSON: function(next) { - fs.readFile(path.join(file, 'package.json'), next); - }, - pluginJSON: function(next) { - fs.readFile(path.join(file, 'plugin.json'), next); - } - }, next); + Plugins.loadPluginInfo(file, next); }, - function(results, next) { - var packageName = path.basename(file), - packageInfo, pluginInfo; - - try { - packageInfo = JSON.parse(results.packageJSON); - pluginInfo = JSON.parse(results.pluginJSON); - } catch (err) { + function(pluginData, next) { + var packageName = path.basename(file); + + if (!pluginData) { winston.warn("Plugin `" + packageName + "` is corrupted or invalid. Please check either package.json or plugin.json for errors."); - return next(null, { - id: packageName, - installed: true, - error: true, - active: null - }); + return next(null, { + id: packageName, + installed: true, + error: true, + active: null + }); } - Plugins.isActive(packageInfo.name, function(err, active) { + Plugins.isActive(pluginData.name, function(err, active) { if (err) { return next(new Error('no-active-state')); } - delete pluginInfo.hooks; - delete pluginInfo.library; - pluginInfo.active = active; - pluginInfo.installed = true; - pluginInfo.error = false; - pluginInfo.version = packageInfo.version; - - next(null, pluginInfo); + delete pluginData.hooks; + delete pluginData.library; + pluginData.active = active; + pluginData.installed = true; + pluginData.error = false; + next(null, pluginData); }); } ], function(err, config) { diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js index 63f9126678..6a2751545a 100644 --- a/src/plugins/hooks.js +++ b/src/plugins/hooks.js @@ -31,7 +31,7 @@ module.exports = function(Plugins) { if (typeof data.method === 'string' && data.method.length > 0) { method = data.method.split('.').reduce(function(memo, prop) { - if (memo !== null && memo[prop]) { + if (memo && memo[prop]) { return memo[prop]; } else { // Couldn't find method by path, aborting diff --git a/src/plugins/load.js b/src/plugins/load.js index 1d973a6544..32950bda20 100644 --- a/src/plugins/load.js +++ b/src/plugins/load.js @@ -12,20 +12,13 @@ var fs = require('fs'), module.exports = function(Plugins) { Plugins.loadPlugin = function(pluginPath, callback) { - fs.readFile(path.join(pluginPath, 'plugin.json'), function(err, data) { + Plugins.loadPluginInfo(pluginPath, function(err, pluginData) { if (err) { return callback(pluginPath.match('nodebb-theme') ? null : err); } - var pluginData, staticDir; - - try { - pluginData = JSON.parse(data); - } catch (err) { - var pluginDir = pluginPath.split(path.sep); - pluginDir = pluginDir[pluginDir.length -1]; - - winston.error('[plugins/' + pluginDir + '] Plugin not loaded - please check its plugin.json for errors'); + var staticDir; + if (!pluginData) { return callback(); } @@ -88,7 +81,7 @@ module.exports = function(Plugins) { } if (!Plugins.libraries[pluginData.id]) { - Plugins.requireLibrary(pluginData, libraryPath); + Plugins.requireLibrary(pluginData.id, libraryPath); } if (Array.isArray(pluginData.hooks) && pluginData.hooks.length > 0) { @@ -198,7 +191,35 @@ module.exports = function(Plugins) { callback(); }); }); - } + Plugins.loadPluginInfo = function(pluginPath, callback) { + async.parallel({ + package: function(next) { + fs.readFile(path.join(pluginPath, 'package.json'), next); + }, + plugin: function(next) { + fs.readFile(path.join(pluginPath, 'plugin.json'), next); + } + }, function(err, results) { + if (err) { + return callback(err); + } + try { + var pluginData = JSON.parse(results.plugin); + var packageData = JSON.parse(results.package); + + var obj = utils.merge(pluginData, packageData); + obj.id = packageData.name; + callback(null, obj); + } catch(err) { + var pluginDir = pluginPath.split(path.sep); + pluginDir = pluginDir[pluginDir.length -1]; + + winston.error('[plugins/' + pluginDir + '] Error in plugin.json/package.json! ' + err.message); + + callback(); + } + }); + }; }; \ No newline at end of file From f060a368537266c53c1ec16ac62692e0bb122df2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 6 Jan 2015 23:34:29 -0500 Subject: [PATCH 020/897] fix indent --- src/plugins.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index 9768ffa10c..62cf8c8695 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -294,12 +294,12 @@ var fs = require('fs'), if (!pluginData) { winston.warn("Plugin `" + packageName + "` is corrupted or invalid. Please check either package.json or plugin.json for errors."); - return next(null, { - id: packageName, - installed: true, - error: true, - active: null - }); + return next(null, { + id: packageName, + installed: true, + error: true, + active: null + }); } Plugins.isActive(pluginData.name, function(err, active) { From b34420c2d79f86e05643a1216d3d9b242fc1921f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 7 Jan 2015 02:46:10 -0500 Subject: [PATCH 021/897] Update CONTRIBUTING.md --- CONTRIBUTING.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 111cd41c46..7f7bc8aeb7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,4 +43,9 @@ If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewher If you have installed NodeBB via GitHub clone, are familiar with utilising git, and are willing to help us narrow down the specific commit that causes a bug, consider running `git bisect`. -A full guide can be found here: [Debugging with Git/Binary Search](http://git-scm.com/book/en/Git-Tools-Debugging-with-Git#Binary-Search) \ No newline at end of file +A full guide can be found here: [Debugging with Git/Binary Search](http://git-scm.com/book/en/Git-Tools-Debugging-with-Git#Binary-Search) + + +# Submitting a Pull Request to NodeBB? + +First of all, thank you! Please consider this [style guide](https://docs.nodebb.org/en/latest/contributing/style-guide.html) when submitting your changes. Also, please join our [community](https://community.nodebb.org) to meet other NodeBB developers and designers :) From fc7a8828778e651e2103c9f8caaba6eaca14a6b0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 7 Jan 2015 10:09:02 -0500 Subject: [PATCH 022/897] fixed #2582 --- src/install.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/install.js b/src/install.js index 6671a1a1d5..91c55293e0 100644 --- a/src/install.js +++ b/src/install.js @@ -44,6 +44,12 @@ questions.main = [ } ]; +questions.optional = [ + { + name: 'port', + default: 4567 + } +]; function checkSetupFlag(next) { var setupVal; @@ -149,11 +155,11 @@ function setupConfig(next) { var config = {}, redisQuestions = require('./database/redis').questions, mongoQuestions = require('./database/mongo').questions, - question, x, numQ, allQuestions = questions.main.concat(redisQuestions).concat(mongoQuestions); + question, x, numQ, allQuestions = questions.main.concat(questions.optional).concat(redisQuestions).concat(mongoQuestions); for(x=0,numQ=allQuestions.length;x Date: Wed, 7 Jan 2015 13:00:34 -0500 Subject: [PATCH 023/897] updating bootstrap in ACP to v3.3.1 --- public/less/admin/admin.less | 6 + public/less/admin/bootstrap/.csscomb.json | 15 +- public/less/admin/bootstrap/badges.less | 8 +- .../less/admin/bootstrap/button-groups.less | 29 +-- public/less/admin/bootstrap/buttons.less | 11 +- public/less/admin/bootstrap/carousel.less | 24 +++ public/less/admin/bootstrap/code.less | 1 + .../admin/bootstrap/component-animations.less | 7 +- public/less/admin/bootstrap/dropdowns.less | 8 +- public/less/admin/bootstrap/forms.less | 86 ++++---- public/less/admin/bootstrap/glyphicons.less | 3 +- public/less/admin/bootstrap/jumbotron.less | 11 +- public/less/admin/bootstrap/list-group.less | 9 +- public/less/admin/bootstrap/media.less | 63 +++--- .../less/admin/bootstrap/mixins/buttons.less | 2 + public/less/admin/bootstrap/mixins/forms.less | 6 +- .../bootstrap/mixins/grid-framework.less | 4 +- public/less/admin/bootstrap/mixins/image.less | 1 - .../less/admin/bootstrap/mixins/labels.less | 2 +- .../bootstrap/mixins/vendor-prefixes.less | 9 +- public/less/admin/bootstrap/modals.less | 8 +- public/less/admin/bootstrap/navbar.less | 55 ++--- public/less/admin/bootstrap/navs.less | 4 +- public/less/admin/bootstrap/normalize.less | 8 +- public/less/admin/bootstrap/pager.less | 3 +- public/less/admin/bootstrap/pagination.less | 2 +- public/less/admin/bootstrap/panels.less | 24 ++- public/less/admin/bootstrap/popovers.less | 10 +- public/less/admin/bootstrap/print.less | 198 +++++++++--------- .../less/admin/bootstrap/progress-bars.less | 20 +- .../admin/bootstrap/responsive-embed.less | 3 +- public/less/admin/bootstrap/scaffolding.less | 2 +- public/less/admin/bootstrap/tables.less | 21 +- public/less/admin/bootstrap/theme.less | 32 ++- public/less/admin/bootstrap/thumbnails.less | 2 +- public/less/admin/bootstrap/tooltip.less | 16 +- public/less/admin/bootstrap/type.less | 11 - public/less/admin/bootstrap/utilities.less | 1 - public/less/admin/bootstrap/variables.less | 58 ++--- 39 files changed, 435 insertions(+), 348 deletions(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index d1626805ce..2e5b868048 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -260,4 +260,10 @@ #taskbar { display: none; /* not sure why I have to do this, but it only seems to show up on prod */ } +} + +// Allowing text to the right of an image-type brand +// See: https://github.com/twbs/bootstrap/commit/8e2348e9eda51296eb680192379ab37f10355ca3 +.navbar-brand > img { + display: inline-block; } \ No newline at end of file diff --git a/public/less/admin/bootstrap/.csscomb.json b/public/less/admin/bootstrap/.csscomb.json index 8456e41df2..40695a4782 100644 --- a/public/less/admin/bootstrap/.csscomb.json +++ b/public/less/admin/bootstrap/.csscomb.json @@ -1,16 +1,21 @@ { "always-semicolon": true, "block-indent": 2, - "colon-space": [0, 1], "color-case": "lower", "color-shorthand": true, - "combinator-space": true, "element-case": "lower", "eof-newline": true, "leading-zero": false, "remove-empty-rulesets": true, - "rule-indent": 2, - "stick-brace": " ", + "space-after-colon": 1, + "space-after-combinator": 1, + "space-before-selector-delimiter": 0, + "space-between-declarations": "\n", + "space-after-opening-brace": "\n", + "space-before-closing-brace": "\n", + "space-before-colon": 0, + "space-before-combinator": 1, + "space-before-opening-brace": 1, "strip-spaces": true, "unitless-zero": true, "vendor-prefix-align": true, @@ -109,6 +114,8 @@ "list-style-type", "list-style-image", "pointer-events", + "-ms-touch-action", + "touch-action", "cursor", "visibility", "zoom", diff --git a/public/less/admin/bootstrap/badges.less b/public/less/admin/bootstrap/badges.less index 20624f30db..b27c405a30 100644 --- a/public/less/admin/bootstrap/badges.less +++ b/public/less/admin/bootstrap/badges.less @@ -44,11 +44,17 @@ } // Account for badges in navs - a.list-group-item.active > &, + .list-group-item.active > &, .nav-pills > .active > a > & { color: @badge-active-color; background-color: @badge-active-bg; } + .list-group-item > & { + float: right; + } + .list-group-item > & + & { + margin-right: 5px; + } .nav-pills > li > a > & { margin-left: 3px; } diff --git a/public/less/admin/bootstrap/button-groups.less b/public/less/admin/bootstrap/button-groups.less index 7021ecd171..f84febbd56 100644 --- a/public/less/admin/bootstrap/button-groups.less +++ b/public/less/admin/bootstrap/button-groups.less @@ -18,10 +18,6 @@ &.active { z-index: 2; } - &:focus { - // Remove focus outline when dropdown JS adds it after closing the menu - outline: 0; - } } } @@ -198,7 +194,6 @@ } - // Justified button groups // ---------------------- @@ -226,15 +221,23 @@ // Checkbox and radio options // // In order to support the browser's form validation feedback, powered by the -// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot -// use `display: none;` or `visibility: hidden;` as that also hides the popover. +// `required` attribute, we have to "hide" the inputs via `clip`. We cannot use +// `display: none;` or `visibility: hidden;` as that also hides the popover. +// Simply visually hiding the inputs via `opacity` would leave them clickable in +// certain cases which is prevented by using `clip` and `pointer-events`. // This way, we ensure a DOM element is visible to position the popover from. // -// See https://github.com/twbs/bootstrap/pull/12794 for more. +// See https://github.com/twbs/bootstrap/pull/12794 and +// https://github.com/twbs/bootstrap/pull/14559 for more information. -[data-toggle="buttons"] > .btn > input[type="radio"], -[data-toggle="buttons"] > .btn > input[type="checkbox"] { - position: absolute; - z-index: -1; - .opacity(0); +[data-toggle="buttons"] { + > .btn, + > .btn-group > .btn { + input[type="radio"], + input[type="checkbox"] { + position: absolute; + clip: rect(0,0,0,0); + pointer-events: none; + } + } } diff --git a/public/less/admin/bootstrap/buttons.less b/public/less/admin/bootstrap/buttons.less index 492bdc65ae..40553c6386 100644 --- a/public/less/admin/bootstrap/buttons.less +++ b/public/less/admin/bootstrap/buttons.less @@ -12,6 +12,7 @@ font-weight: @btn-font-weight; text-align: center; vertical-align: middle; + touch-action: manipulation; cursor: pointer; background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid transparent; @@ -22,13 +23,15 @@ &, &:active, &.active { - &:focus { + &:focus, + &.focus { .tab-focus(); } } &:hover, - &:focus { + &:focus, + &.focus { color: @btn-default-color; text-decoration: none; } @@ -43,7 +46,7 @@ &.disabled, &[disabled], fieldset[disabled] & { - cursor: not-allowed; + cursor: @cursor-disabled; pointer-events: none; // Future-proof disabling of clicks .opacity(.65); .box-shadow(none); @@ -85,11 +88,11 @@ .btn-link { color: @link-color; font-weight: normal; - cursor: pointer; border-radius: 0; &, &:active, + &.active, &[disabled], fieldset[disabled] & { background-color: transparent; diff --git a/public/less/admin/bootstrap/carousel.less b/public/less/admin/bootstrap/carousel.less index 1644ddf7f5..5724d8a56e 100644 --- a/public/less/admin/bootstrap/carousel.less +++ b/public/less/admin/bootstrap/carousel.less @@ -24,6 +24,30 @@ &:extend(.img-responsive); line-height: 1; } + + // WebKit CSS3 transforms for supported devices + @media all and (transform-3d), (-webkit-transform-3d) { + transition: transform .6s ease-in-out; + backface-visibility: hidden; + perspective: 1000; + + &.next, + &.active.right { + transform: translate3d(100%, 0, 0); + left: 0; + } + &.prev, + &.active.left { + transform: translate3d(-100%, 0, 0); + left: 0; + } + &.next.left, + &.prev.right, + &.active { + transform: translate3d(0, 0, 0); + left: 0; + } + } } > .active, diff --git a/public/less/admin/bootstrap/code.less b/public/less/admin/bootstrap/code.less index baa13df613..a08b4d48c4 100644 --- a/public/less/admin/bootstrap/code.less +++ b/public/less/admin/bootstrap/code.less @@ -32,6 +32,7 @@ kbd { kbd { padding: 0; font-size: 100%; + font-weight: bold; box-shadow: none; } } diff --git a/public/less/admin/bootstrap/component-animations.less b/public/less/admin/bootstrap/component-animations.less index 9400a0d32f..967715d98b 100644 --- a/public/less/admin/bootstrap/component-animations.less +++ b/public/less/admin/bootstrap/component-animations.less @@ -17,8 +17,9 @@ .collapse { display: none; + visibility: hidden; - &.in { display: block; } + &.in { display: block; visibility: visible; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } @@ -27,5 +28,7 @@ position: relative; height: 0; overflow: hidden; - .transition(height .35s ease); + .transition-property(~"height, visibility"); + .transition-duration(.35s); + .transition-timing-function(ease); } diff --git a/public/less/admin/bootstrap/dropdowns.less b/public/less/admin/bootstrap/dropdowns.less index 3eb7fc05c4..84a48c1413 100644 --- a/public/less/admin/bootstrap/dropdowns.less +++ b/public/less/admin/bootstrap/dropdowns.less @@ -103,16 +103,15 @@ &:focus { color: @dropdown-link-disabled-color; } -} -// Nuke hover/focus effects -.dropdown-menu > .disabled > a { + + // Nuke hover/focus effects &:hover, &:focus { text-decoration: none; background-color: transparent; background-image: none; // Remove CSS gradient .reset-filter(); - cursor: not-allowed; + cursor: @cursor-disabled; } } @@ -212,4 +211,3 @@ } } } - diff --git a/public/less/admin/bootstrap/forms.less b/public/less/admin/bootstrap/forms.less index 2c5e9bfa93..1bcc2b6b97 100644 --- a/public/less/admin/bootstrap/forms.less +++ b/public/less/admin/bootstrap/forms.less @@ -141,7 +141,7 @@ output { &[disabled], &[readonly], fieldset[disabled] & { - cursor: not-allowed; + cursor: @cursor-disabled; background-color: @input-bg-disabled; opacity: 1; // iOS fix for unreadable disabled content } @@ -168,23 +168,27 @@ input[type="search"] { // Special styles for iOS temporal inputs // // In Mobile Safari, setting `display: block` on temporal inputs causes the -// text within the input to become vertically misaligned. -// As a workaround, we set a pixel line-height that matches the -// given height of the input. Since this fucks up everything else, we have to -// appropriately reset it for Internet Explorer and the size variations. - -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - line-height: @input-height-base; - // IE8+ misaligns the text within date inputs, so we reset - line-height: @line-height-base ~"\0"; - - &.input-sm { +// text within the input to become vertically misaligned. As a workaround, we +// set a pixel line-height that matches the given height of the input, but only +// for Safari. + +@media screen and (-webkit-min-device-pixel-ratio: 0) { + input[type="date"], + input[type="time"], + input[type="datetime-local"], + input[type="month"] { + line-height: @input-height-base; + } + input[type="date"].input-sm, + input[type="time"].input-sm, + input[type="datetime-local"].input-sm, + input[type="month"].input-sm { line-height: @input-height-small; } - &.input-lg { + input[type="date"].input-lg, + input[type="time"].input-lg, + input[type="datetime-local"].input-lg, + input[type="month"].input-lg { line-height: @input-height-large; } } @@ -208,11 +212,11 @@ input[type="month"] { .checkbox { position: relative; display: block; - min-height: @line-height-computed; // clear the floating input if there is no label text margin-top: 10px; margin-bottom: 10px; label { + min-height: @line-height-computed; // Ensure the input doesn't jump when there is no text padding-left: 20px; margin-bottom: 0; font-weight: normal; @@ -258,7 +262,7 @@ input[type="checkbox"] { &[disabled], &.disabled, fieldset[disabled] & { - cursor: not-allowed; + cursor: @cursor-disabled; } } // These classes are used directly on 

`.
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
@@ -181,13 +184,20 @@
 @input-color:                    @gray;
 //** `` border color
 @input-border:                   #ccc;
-//** `` border radius
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
 @input-border-radius:            @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large:      @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small:      @border-radius-small;
+
 //** Border color for inputs on focus
 @input-border-focus:             #66afe9;
 
 //** Placeholder text color
-@input-color-placeholder:        @gray-light;
+@input-color-placeholder:        #999;
 
 //** Default `.form-control` height
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
@@ -204,6 +214,9 @@
 //** Border color for textual input addons
 @input-group-addon-border-color: @input-border;
 
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled:                not-allowed;
+
 
 //== Dropdowns
 //
@@ -252,8 +265,7 @@
 @zindex-popover:           1060;
 @zindex-tooltip:           1070;
 @zindex-navbar-fixed:      1030;
-@zindex-modal-background:  1040;
-@zindex-modal:             1050;
+@zindex-modal:             1040;
 
 
 //== Media queries breakpoints
@@ -302,10 +314,10 @@
 //** Number of columns in the grid.
 @grid-columns:              12;
 //** Padding between columns. Gets divided in half for the left and right.
-@grid-gutter-width:         15px;
+@grid-gutter-width:         30px;
 // Navbar collapse
 //** Point at which the navbar becomes uncollapsed.
-@grid-float-breakpoint:     0;
+@grid-float-breakpoint:     @screen-sm-min;
 //** Point at which the navbar begins collapsing.
 @grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
 
@@ -315,17 +327,17 @@
 //## Define the maximum width of `.container` for different screen sizes.
 
 // Small screen / tablet
-@container-tablet:             ((720px + @grid-gutter-width));
+@container-tablet:             (720px + @grid-gutter-width);
 //** For `@screen-sm-min` and up.
 @container-sm:                 @container-tablet;
 
 // Medium screen / desktop
-@container-desktop:            ((940px + @grid-gutter-width));
+@container-desktop:            (940px + @grid-gutter-width);
 //** For `@screen-md-min` and up.
 @container-md:                 @container-desktop;
 
 // Large screen / wide desktop
-@container-large-desktop:      ((1140px + @grid-gutter-width));
+@container-large-desktop:      (1140px + @grid-gutter-width);
 //** For `@screen-lg-min` and up.
 @container-lg:                 @container-large-desktop;
 
@@ -368,12 +380,12 @@
 
 // Inverted navbar
 // Reset inverted navbar basics
-@navbar-inverse-color:                      @gray-light;
+@navbar-inverse-color:                      lighten(@gray-light, 15%);
 @navbar-inverse-bg:                         #222;
 @navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
 
 // Inverted navbar links
-@navbar-inverse-link-color:                 @gray-light;
+@navbar-inverse-link-color:                 lighten(@gray-light, 15%);
 @navbar-inverse-link-hover-color:           #fff;
 @navbar-inverse-link-hover-bg:              transparent;
 @navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
@@ -403,8 +415,6 @@
 @nav-disabled-link-color:                   @gray-light;
 @nav-disabled-link-hover-color:             @gray-light;
 
-@nav-open-link-hover-color:                 #fff;
-
 //== Tabs
 @nav-tabs-border-color:                     #ddd;
 
@@ -529,7 +539,7 @@
 //** Popover arrow width
 @popover-arrow-width:                 10px;
 //** Popover arrow color
-@popover-arrow-color:                 #fff;
+@popover-arrow-color:                 @popover-bg;
 
 //** Popover outer arrow width
 @popover-arrow-outer-width:           (@popover-arrow-width + 1);
@@ -628,6 +638,8 @@
 @progress-bg:                 #f5f5f5;
 //** Progress bar text color
 @progress-bar-color:          #fff;
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius:      @border-radius-base;
 
 //** Default progress bar color
 @progress-bar-bg:             @brand-primary;
@@ -842,5 +854,3 @@
 @dl-horizontal-offset:        @component-offset-horizontal;
 //** Horizontal line color.
 @hr-border:                   @gray-lighter;
-
-

From c1ac92ac199fbb97ef39f2fee26f90ffe813bf14 Mon Sep 17 00:00:00 2001
From: barisusakli 
Date: Wed, 7 Jan 2015 13:35:49 -0500
Subject: [PATCH 024/897] popular topics will use topic creation time

---
 src/controllers/categories.js |  9 +++++++--
 src/topics/popular.js         |  9 +--------
 src/topics/recent.js          | 12 ++++++++----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/controllers/categories.js b/src/controllers/categories.js
index 0a06dafce1..14abb6f260 100644
--- a/src/controllers/categories.js
+++ b/src/controllers/categories.js
@@ -35,8 +35,13 @@ var anonCache = {}, lastUpdateTime = 0;
 
 categoriesController.popular = function(req, res, next) {
 	var uid = req.user ? req.user.uid : 0;
-
-	var term = req.params.term || 'daily';
+	var terms = {
+		daily: 'day',
+		weekly: 'week',
+		monthly: 'month',
+		alltime: 'alltime'
+	};
+	var term = terms[req.params.term] || 'day';
 
 	if (uid === 0) {
 		if (anonCache[term] && (Date.now() - lastUpdateTime) < 60 * 60 * 1000) {
diff --git a/src/topics/popular.js b/src/topics/popular.js
index 710dc27e7c..1f8ff31bf3 100644
--- a/src/topics/popular.js
+++ b/src/topics/popular.js
@@ -7,11 +7,6 @@ var async = require('async'),
 
 
 module.exports = function(Topics) {
-	var terms = {
-		daily: 'day',
-		weekly: 'week',
-		monthly: 'month'
-	};
 
 	Topics.getPopular = function(term, uid, count, callback) {
 		count = parseInt(count, 10) || 20;
@@ -20,11 +15,9 @@ module.exports = function(Topics) {
 			return getAllTimePopular(uid, count, callback);
 		}
 
-		var since = terms[term] || 'day';
-
 		async.waterfall([
 			function(next) {
-				Topics.getLatestTids(0, -1, since, next);
+				Topics.getLatestTidsFromSet('topics:tid', 0, -1, term, next);
 			},
 			function(tids, next) {
 				getTopics(tids, uid, count, next);
diff --git a/src/topics/recent.js b/src/topics/recent.js
index b316aa65a5..19c3debd03 100644
--- a/src/topics/recent.js
+++ b/src/topics/recent.js
@@ -3,10 +3,9 @@
 'use strict';
 
 var async = require('async'),
+	winston = require('winston'),
 	db = require('../database');
 
-
-
 module.exports = function(Topics) {
 	var terms = {
 		day: 86400000,
@@ -18,7 +17,7 @@ module.exports = function(Topics) {
 	Topics.getLatestTopics = function(uid, start, end, term, callback) {
 		async.waterfall([
 			function (next) {
-				Topics.getLatestTids(start, end, term, next);
+				Topics.getLatestTidsFromSet('topics:recent', start, end, term, next);
 			},
 			function(tids, next) {
 				Topics.getTopics(tids, uid, next);
@@ -30,6 +29,11 @@ module.exports = function(Topics) {
 	};
 
 	Topics.getLatestTids = function(start, end, term, callback) {
+		winston.warn('[deprecation warning] please use Topics.getLatestTidsFromSet("topics:recent")');
+		Topics.getLatestTidsFromSet('topics:recent', start, end, term, callback);
+	};
+
+	Topics.getLatestTidsFromSet = function(set, start, end, term, callback) {
 		var since = terms.day;
 		if (terms[term]) {
 			since = terms[term];
@@ -37,7 +41,7 @@ module.exports = function(Topics) {
 
 		var count = parseInt(end, 10) === -1 ? end : end - start + 1;
 
-		db.getSortedSetRevRangeByScore('topics:recent', start, count, '+inf', Date.now() - since, callback);
+		db.getSortedSetRevRangeByScore(set, start, count, '+inf', Date.now() - since, callback);
 	};
 
 	Topics.updateTimestamp = function(tid, timestamp, callback) {

From f3fa2f10eda89b5bacc6a74879e5d452484116e8 Mon Sep 17 00:00:00 2001
From: Julian Lam 
Date: Wed, 7 Jan 2015 13:16:34 -0500
Subject: [PATCH 025/897] added ACP option to enable private groups

---
 src/views/admin/partials/menu.tpl  |  1 +
 src/views/admin/settings/group.tpl | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/views/admin/settings/group.tpl

diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index 7059ad6ba0..29f049fa03 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -23,6 +23,7 @@
 						
  • Reputation
    • 
 						
  • Email
    • 
 						
  • User
    • 
+						
  • Group
    • 
 						
  • Guest
    • 
 						
  • Post
    • 
 						
  • Pagination
    • 
diff --git a/src/views/admin/settings/group.tpl b/src/views/admin/settings/group.tpl
new file mode 100644
index 0000000000..7da62689ce
--- /dev/null
+++ b/src/views/admin/settings/group.tpl
@@ -0,0 +1,22 @@
+
+
+
    
+	
    General
    
+	
    
+		
    
+			
    
+				
+			
    
+		
    
+	
    
+
    
+
+
\ No newline at end of file

From 917f76feab7a3e74192fc87f8e0e5b9e333ff147 Mon Sep 17 00:00:00 2001
From: Julian Lam 
Date: Wed, 7 Jan 2015 14:58:31 -0500
Subject: [PATCH 026/897] group join/leave controls in groups list page (+
 helper!)

---
 public/src/helpers.js     | 14 ++++++++++++++
 src/controllers/groups.js |  3 ++-
 src/groups.js             | 20 +++++++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/public/src/helpers.js b/public/src/helpers.js
index a89aeae0e2..38875ea8b8 100644
--- a/public/src/helpers.js
+++ b/public/src/helpers.js
@@ -17,6 +17,19 @@
 		return '';
 	};
 
+	// Groups helpers
+	helpers.membershipBtn = function(groupObj) {
+		if (groupObj.isMember) {
+			return '';
+		} else {
+			if (groupObj.pending) {
+				return '';
+			} else {
+				return '';
+			}
+		}
+	};
+
 	if ('undefined' !== typeof window) {
 		$(document).ready(module.exports);
 	}
@@ -26,6 +39,7 @@
 
 		templates.registerHelper('displayUsersLink', helpers.displayUsersLink);
 		templates.registerHelper('buildMetaTag', helpers.buildMetaTag);
+		templates.registerHelper('membershipBtn', helpers.membershipBtn);
 	};
 
 })('undefined' === typeof module ? {
diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index 3843672a09..72d83d4fc2 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -9,7 +9,8 @@ var groups = require('../groups'),
 groupsController.list = function(req, res, next) {
 	groups.list({
 		truncateUserList: true,
-		expand: true
+		expand: true,
+		uid: req.user ? req.user.uid : 0
 	}, function(err, groups) {
 		if (err) {
 			return next(err);
diff --git a/src/groups.js b/src/groups.js
index 47e7002db9..4f59d39820 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -71,7 +71,25 @@ var async = require('async'),
 			groupNames = groupNames.concat(ephemeralGroups);
 
 			async.map(groupNames, function (groupName, next) {
-				Groups.get(groupName, options, next);
+				async.waterfall([
+					async.apply(Groups.get, groupName, options),
+					function(groupObj, next) {
+						// Retrieve group membership state, if uid is passed in
+						if (!options.uid) {
+							return next(null, groupObj);
+						}
+
+						Groups.isMember(options.uid, groupName, function(err, isMember) {
+							if (err) {
+								winston.warn('[groups.list] Could not determine membership in group `' + groupName + '` for uid `' + options.uid + '`: ' + err.message);
+								return next(null, groupObj);
+							}
+
+							groupObj.isMember = isMember;
+							next(null, groupObj);
+						});
+					}
+				], next);
 			}, function (err, groups) {
 				callback(err, internals.filterGroups(groups, options));
 			});

From 60f1b9679ad42731fd9782261989efb8f4717f76 Mon Sep 17 00:00:00 2001
From: barisusakli 
Date: Wed, 7 Jan 2015 16:10:11 -0500
Subject: [PATCH 027/897] search filters

---
 public/language/en_GB/search.json |   5 +-
 public/src/app.js                 |   6 +-
 public/src/client/search.js       |  16 +++--
 public/src/modules/search.js      |  11 ++--
 src/controllers/index.js          |  30 +--------
 src/controllers/search.js         |  41 ++++++++++++
 src/routes/index.js               |   2 +-
 src/search.js                     | 102 ++++++++++++++++++------------
 src/socket.io/topics.js           |  33 +---------
 src/topics/tags.js                |  35 ++++++++++
 10 files changed, 165 insertions(+), 116 deletions(-)
 create mode 100644 src/controllers/search.js

diff --git a/public/language/en_GB/search.json b/public/language/en_GB/search.json
index 81c404a591..945e58c852 100644
--- a/public/language/en_GB/search.json
+++ b/public/language/en_GB/search.json
@@ -1,4 +1,5 @@
 {
 	"results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
-	"no-matches": "No posts found"
-}
\ No newline at end of file
+	"no-matches": "No matches found",
+	"in": "In"
+}
diff --git a/public/src/app.js b/public/src/app.js
index bf5ec32941..1664a251d5 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -435,11 +435,9 @@ app.uid = null;
 		require(['search', 'mousetrap'], function(search, Mousetrap) {
 			$('#search-form').on('submit', function (e) {
 				e.preventDefault();
-				var input = $(this).find('input'),
-					term = input.val();
+				var input = $(this).find('input');
 
-
-				search.query(term, function() {
+				search.query(input.val(), 'posts', function() {
 					input.val('');
 				});
 			});
diff --git a/public/src/client/search.js b/public/src/client/search.js
index 861d8dd441..e08a5dc410 100644
--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@@ -2,9 +2,17 @@ define('forum/search', ['search'], function(searchModule) {
 	var	Search = {};
 
 	Search.init = function() {
-		var searchQuery = $('#post-results').attr('data-search-query');
+		var searchQuery = $('#results').attr('data-search-query');
 		var regexes = [];
 		var searchTerms = searchQuery.split(' ');
+
+		$('#advanced-search input').val(searchQuery);
+		var params = utils.params();
+		if (params && params.in) {
+			$('#advanced-search select').val(params.in);
+		}
+
+
 		for (var i=0; i
Date: Wed, 7 Jan 2015 16:18:38 -0500
Subject: [PATCH 028/897] closed #2583

---
 public/src/app.js                   |  5 ++++-
 public/src/{ => modules}/helpers.js | 35 +++++++++++++++++++----------
 src/meta/js.js                      |  1 -
 src/webserver.js                    |  5 ++++-
 4 files changed, 31 insertions(+), 15 deletions(-)
 rename public/src/{ => modules}/helpers.js (65%)

diff --git a/public/src/app.js b/public/src/app.js
index bf5ec32941..7e1160dee1 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -568,8 +568,11 @@ app.uid = null;
 				}
 			});
 
-			require(['taskbar'], function(taskbar) {
+			require(['taskbar', 'helpers'], function(taskbar, helpers) {
 				taskbar.init();
+
+				// templates.js helpers
+				helpers.register();
 			});
 		});
 	};
diff --git a/public/src/helpers.js b/public/src/modules/helpers.js
similarity index 65%
rename from public/src/helpers.js
rename to public/src/modules/helpers.js
index 38875ea8b8..da4eaccaae 100644
--- a/public/src/helpers.js
+++ b/public/src/modules/helpers.js
@@ -1,8 +1,12 @@
-"use strict";
-/*global templates*/
+;(function(exports) {
+	"use strict";
+	/* globals define */
 
+	// export the class if we are in a Node-like system.
+	if (typeof module === 'object' && module.exports === exports) {
+	  exports = module.exports/* = SemVer*/;
+	}
 
-(function(module) {
 	var helpers = {};
 
 	helpers.displayUsersLink = function(config) {
@@ -30,20 +34,27 @@
 		}
 	};
 
-	if ('undefined' !== typeof window) {
-		$(document).ready(module.exports);
-	}
+	exports.register = function() {
+		var templates;
 
-	module.exports = function() {
-		var templates = templates || require('templates.js');
+		if (typeof module === 'object') {
+			templates = require('templates.js');
+		} else {
+			templates = window.templates;
+		}
 
 		templates.registerHelper('displayUsersLink', helpers.displayUsersLink);
 		templates.registerHelper('buildMetaTag', helpers.buildMetaTag);
 		templates.registerHelper('membershipBtn', helpers.membershipBtn);
 	};
 
-})('undefined' === typeof module ? {
-	module: {
-		exports: {}
+	// Use the define() function if we're in AMD land
+	if (typeof define === 'function' && define.amd) {
+	  define('helpers', exports);
 	}
-} : module);
+
+})(
+	typeof exports === 'object' ? exports :
+	typeof define === 'function' && define.amd ? {} :
+	helpers = {}
+);
\ No newline at end of file
diff --git a/src/meta/js.js b/src/meta/js.js
index c653a15de9..a960d108ee 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -45,7 +45,6 @@ module.exports = function(Meta) {
 				'public/src/variables.js',
 				'public/src/widgets.js',
 				'public/src/translator.js',
-				'public/src/helpers.js',
 				'public/src/overrides.js'
 			],
 			rjs: []
diff --git a/src/webserver.js b/src/webserver.js
index 8d905b99b6..01dee2b91c 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -18,7 +18,7 @@ var path = require('path'),
 	routes = require('./routes'),
 	emitter = require('./emitter'),
 
-	helpers = require('./../public/src/helpers')(),
+	helpers = require('./../public/src/modules/helpers'),
 	net;
 
 if(nconf.get('ssl')) {
@@ -48,6 +48,9 @@ if(nconf.get('ssl')) {
 		middleware = middleware(app);
 		routes(app, middleware);
 
+		// Load server-side template helpers
+		helpers.register();
+
 		// Cache static files on production
 		if (global.env !== 'development') {
 			app.enable('cache');

From aa62c525801b96f6cd0e08396ff4b5a7f9d35aa0 Mon Sep 17 00:00:00 2001
From: Julian Lam 
Date: Wed, 7 Jan 2015 16:18:38 -0500
Subject: [PATCH 029/897] closed #2583

---
 public/src/app.js             |  5 ++-
 public/src/helpers.js         | 35 ---------------------
 public/src/modules/helpers.js | 59 +++++++++++++++++++++++++++++++++++
 src/meta/js.js                |  1 -
 src/webserver.js              |  5 ++-
 5 files changed, 67 insertions(+), 38 deletions(-)
 delete mode 100644 public/src/helpers.js
 create mode 100644 public/src/modules/helpers.js

diff --git a/public/src/app.js b/public/src/app.js
index 1664a251d5..d894551064 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -566,8 +566,11 @@ app.uid = null;
 				}
 			});
 
-			require(['taskbar'], function(taskbar) {
+			require(['taskbar', 'helpers'], function(taskbar, helpers) {
 				taskbar.init();
+
+				// templates.js helpers
+				helpers.register();
 			});
 		});
 	};
diff --git a/public/src/helpers.js b/public/src/helpers.js
deleted file mode 100644
index a89aeae0e2..0000000000
--- a/public/src/helpers.js
+++ /dev/null
@@ -1,35 +0,0 @@
-"use strict";
-/*global templates*/
-
-
-(function(module) {
-	var helpers = {};
-
-	helpers.displayUsersLink = function(config) {
-		return (config.loggedIn || !config.privateUserInfo);
-	};
-
-	helpers.buildMetaTag = function(tag) {
-		var name = tag.name ? 'name="' + tag.name + '" ' : '',
-			property = tag.property ? 'property="' + tag.property + '" ' : '',
-			content = tag.content ? 'content="' + tag.content.replace(/\n/g, ' ') + '" ' : '';
-
-		return '';
-	};
-
-	if ('undefined' !== typeof window) {
-		$(document).ready(module.exports);
-	}
-
-	module.exports = function() {
-		var templates = templates || require('templates.js');
-
-		templates.registerHelper('displayUsersLink', helpers.displayUsersLink);
-		templates.registerHelper('buildMetaTag', helpers.buildMetaTag);
-	};
-
-})('undefined' === typeof module ? {
-	module: {
-		exports: {}
-	}
-} : module);
diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js
new file mode 100644
index 0000000000..1d13f93bf7
--- /dev/null
+++ b/public/src/modules/helpers.js
@@ -0,0 +1,59 @@
+;(function(exports) {
+	"use strict";
+	/* globals define */
+
+	// export the class if we are in a Node-like system.
+	if (typeof module === 'object' && module.exports === exports) {
+	  exports = module.exports/* = SemVer*/;
+	}
+
+	var helpers = {};
+
+	helpers.displayUsersLink = function(config) {
+		return (config.loggedIn || !config.privateUserInfo);
+	};
+
+	helpers.buildMetaTag = function(tag) {
+		var name = tag.name ? 'name="' + tag.name + '" ' : '',
+			property = tag.property ? 'property="' + tag.property + '" ' : '',
+			content = tag.content ? 'content="' + tag.content.replace(/\n/g, ' ') + '" ' : '';
+
+		return '';
+	};
+
+	// Groups helpers
+	helpers.membershipBtn = function(groupObj) {
+		if (groupObj.isMember) {
+			return '';
+		} else {
+			if (groupObj.pending) {
+				return '';
+			} else {
+				return '';
+			}
+		}
+	};
+
+	exports.register = function() {
+		var templates;
+
+		if (typeof module === 'object') {
+			templates = require('templates.js');
+		} else {
+			templates = window.templates;
+		}
+
+		templates.registerHelper('displayUsersLink', helpers.displayUsersLink);
+		templates.registerHelper('buildMetaTag', helpers.buildMetaTag);
+	};
+
+	// Use the define() function if we're in AMD land
+	if (typeof define === 'function' && define.amd) {
+	  define('helpers', exports);
+	}
+
+})(
+	typeof exports === 'object' ? exports :
+	typeof define === 'function' && define.amd ? {} :
+	helpers = {}
+);
diff --git a/src/meta/js.js b/src/meta/js.js
index c653a15de9..a960d108ee 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -45,7 +45,6 @@ module.exports = function(Meta) {
 				'public/src/variables.js',
 				'public/src/widgets.js',
 				'public/src/translator.js',
-				'public/src/helpers.js',
 				'public/src/overrides.js'
 			],
 			rjs: []
diff --git a/src/webserver.js b/src/webserver.js
index 8d905b99b6..01dee2b91c 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -18,7 +18,7 @@ var path = require('path'),
 	routes = require('./routes'),
 	emitter = require('./emitter'),
 
-	helpers = require('./../public/src/helpers')(),
+	helpers = require('./../public/src/modules/helpers'),
 	net;
 
 if(nconf.get('ssl')) {
@@ -48,6 +48,9 @@ if(nconf.get('ssl')) {
 		middleware = middleware(app);
 		routes(app, middleware);
 
+		// Load server-side template helpers
+		helpers.register();
+
 		// Cache static files on production
 		if (global.env !== 'development') {
 			app.enable('cache');

From b685194dae6f59cd48d428b9ecaedcdcaa907793 Mon Sep 17 00:00:00 2001
From: Julian Lam 
Date: Wed, 7 Jan 2015 16:38:23 -0500
Subject: [PATCH 030/897] updated helper loading so it loads all helpers in
 helpers local var

---
 public/src/modules/helpers.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js
index 1d13f93bf7..838ad7a4da 100644
--- a/public/src/modules/helpers.js
+++ b/public/src/modules/helpers.js
@@ -43,8 +43,9 @@
 			templates = window.templates;
 		}
 
-		templates.registerHelper('displayUsersLink', helpers.displayUsersLink);
-		templates.registerHelper('buildMetaTag', helpers.buildMetaTag);
+		Object.keys(helpers).forEach(function(helperName) {
+			templates.registerHelper(helperName, helpers[helperName]);
+		});
 	};
 
 	// Use the define() function if we're in AMD land

From ce9c17f8e540bf4f0295aabf61eecd3986f437cc Mon Sep 17 00:00:00 2001
From: barisusakli 
Date: Wed, 7 Jan 2015 17:27:09 -0500
Subject: [PATCH 031/897] ability to search posts by user

---
 public/language/en_GB/search.json |  4 +-
 public/src/app.js                 |  2 +-
 public/src/client/search.js       | 69 +++++++++++++++++++++++++------
 public/src/client/users.js        |  7 ++--
 public/src/modules/search.js      | 13 ++++--
 src/controllers/search.js         |  7 +++-
 src/search.js                     | 27 ++++++++++--
 src/socket.io/user.js             |  7 +++-
 8 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/public/language/en_GB/search.json b/public/language/en_GB/search.json
index 945e58c852..23519b038b 100644
--- a/public/language/en_GB/search.json
+++ b/public/language/en_GB/search.json
@@ -1,5 +1,7 @@
 {
 	"results_matching": "%1 result(s) matching \"%2\", (%3 seconds)",
 	"no-matches": "No matches found",
-	"in": "In"
+	"in": "In",
+	"by": "By",
+	"posted-by": "Posted by"
 }
diff --git a/public/src/app.js b/public/src/app.js
index d894551064..a77200fdd9 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -437,7 +437,7 @@ app.uid = null;
 				e.preventDefault();
 				var input = $(this).find('input');
 
-				search.query(input.val(), 'posts', function() {
+				search.query({term: input.val(), in: 'posts'}, function() {
 					input.val('');
 				});
 			});
diff --git a/public/src/client/search.js b/public/src/client/search.js
index e08a5dc410..e536aaa160 100644
--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@@ -1,18 +1,51 @@
+'use strict';
+
+/* globals app, define, utils, socket*/
+
 define('forum/search', ['search'], function(searchModule) {
 	var	Search = {};
 
 	Search.init = function() {
 		var searchQuery = $('#results').attr('data-search-query');
-		var regexes = [];
-		var searchTerms = searchQuery.split(' ');
 
-		$('#advanced-search input').val(searchQuery);
+		$('#advanced-search #search-input').val(searchQuery);
 		var params = utils.params();
+		var select = $('#advanced-search select');
 		if (params && params.in) {
-			$('#advanced-search select').val(params.in);
+			select.val(params.in);
 		}
 
+		if (params && params.by) {
+			$('.by-container #posted-by-input').val(params.by);
+		}
+
+		select.on('change', function() {
+			$('.by-container').toggleClass('hide', select.val() !== 'posts');
+		});
+
+		highlightMatches(searchQuery);
 
+		$('#advanced-search').off('submit').on('submit', function(e) {
+			e.preventDefault();
+			var input = $(this).find('#search-input');
+			var searchIn = $(this).find('select');
+			var postedBy = $(this).find('#posted-by-input');
+
+			searchModule.query({
+				term: input.val(),
+				in: searchIn.val(),
+				by: postedBy.val()
+			}, function() {
+				input.val('');
+			});
+		});
+
+		enableAutoComplete();
+	};
+
+	function highlightMatches(searchQuery) {
+		var searchTerms = searchQuery.split(' ');
+		var regexes = [];
 		for (var i=0; i
    +
    + + +
    diff --git a/tests/categories.js b/tests/categories.js index 95c7a0f14b..7115b88597 100644 --- a/tests/categories.js +++ b/tests/categories.js @@ -35,6 +35,8 @@ describe('Categories', function() { it('should retrieve a newly created category by its ID', function(done) { Categories.getCategoryById({ cid: categoryObj.cid, + set: 'cid:' + categoryObj.cid + ':tids', + reverse: true, start: 0, end: -1, uid: 0 @@ -52,6 +54,8 @@ describe('Categories', function() { it('should return a list of topics', function(done) { Categories.getCategoryTopics({ cid: categoryObj.cid, + set: 'cid:' + categoryObj.cid + ':tids', + reverse: true, start: 0, stop: 10, uid: 0 @@ -68,6 +72,8 @@ describe('Categories', function() { it('should return a list of topics by a specific user', function(done) { Categories.getCategoryTopics({ cid: categoryObj.cid, + set: 'cid:' + categoryObj.cid + ':uid:' + 1 + ':tids', + reverse: true, start: 0, stop: 10, uid: 0, From 501935d359315a40fb3e655cc27342498b32b23b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 7 Jan 2015 16:38:23 -0500 Subject: [PATCH 036/897] updated helper loading so it loads all helpers in helpers local var, #2588 --- public/src/modules/helpers.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 1d13f93bf7..838ad7a4da 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -43,8 +43,9 @@ templates = window.templates; } - templates.registerHelper('displayUsersLink', helpers.displayUsersLink); - templates.registerHelper('buildMetaTag', helpers.buildMetaTag); + Object.keys(helpers).forEach(function(helperName) { + templates.registerHelper(helperName, helpers[helperName]); + }); }; // Use the define() function if we're in AMD land From 9fa3675424a58efc7de7cb2fb66659e45c62348d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 7 Jan 2015 16:55:14 -0500 Subject: [PATCH 037/897] added methods and socket listeners for group joining and leaving, #2588 --- public/src/client/groups/list.js | 26 ++++++++++++++++++++++++++ src/socket.io/groups.js | 23 +++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 public/src/client/groups/list.js create mode 100644 src/socket.io/groups.js diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js new file mode 100644 index 0000000000..e7daf195f1 --- /dev/null +++ b/public/src/client/groups/list.js @@ -0,0 +1,26 @@ +"use strict"; +/* globals define, ajaxify, socket */ + +define('forum/groups/list', function() { + var Groups = {}; + + Groups.init = function() { + var groupsEl = $('.groups.row'); + + // Group joining and leaving + groupsEl.on('click', '[data-action]', function() { + var action = $(this).attr('data-action'), + groupName = $(this).parents('[data-group]').attr('data-group'); + + socket.emit('groups.' + action, { + groupName: groupName + }, function(err) { + if (!err) { + ajaxify.refresh(); + } + }); + }); + }; + + return Groups; +}); \ No newline at end of file diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js new file mode 100644 index 0000000000..9fd29bc2d4 --- /dev/null +++ b/src/socket.io/groups.js @@ -0,0 +1,23 @@ +"use strict"; + +var groups = require('../groups'), + + SocketGroups = {}; + +SocketGroups.join = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.join(data.groupName, socket.uid, callback); +}; + +SocketGroups.leave = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.leave(data.groupName, socket.uid, callback); +}; + +module.exports = SocketGroups; From a907fa2187a90ade503da100d40ac99746e3b43e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 8 Jan 2015 12:47:24 -0500 Subject: [PATCH 038/897] added concept of group ownership, #2588 --- public/language/en_GB/groups.json | 1 + src/groups.js | 50 +++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index cc4aeb8997..9aade4c62d 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -1,6 +1,7 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", "details.title": "Group Details", "details.members": "Member List", diff --git a/src/groups.js b/src/groups.js index 4f59d39820..2dcb708f66 100644 --- a/src/groups.js +++ b/src/groups.js @@ -123,7 +123,22 @@ var async = require('async'), } if (options.expand) { - async.map(uids, user.getUserData, next); + async.waterfall([ + async.apply(async.map, uids, user.getUserData), + function(users, next) { + async.mapLimit(users, 10, function(userObj, next) { + Groups.ownership.isOwner(userObj.uid, groupName, function(err, isOwner) { + if (err) { + winston.warn('[groups.get] Could not determine ownership in group `' + groupName + '` for uid `' + userObj.uid + '`: ' + err.message); + return next(null, userObj); + } + + userObj.isOwner = isOwner; + next(null, userObj); + }); + }, next); + } + ], next); } else { next(err, uids); } @@ -134,13 +149,9 @@ var async = require('async'), return callback(err); } - results.base.members = results.users.filter(function(user) { - return typeof user !== 'undefined'; - }); - + results.base.members = results.users.filter(Boolean); results.base.count = numUsers || results.base.members.length; results.base.memberCount = numUsers || results.base.members.length; - results.base.deleted = !!parseInt(results.base.deleted, 10); results.base.hidden = !!parseInt(results.base.hidden, 10); results.base.system = !!parseInt(results.base.system, 10); @@ -603,4 +614,31 @@ var async = require('async'), }); }); }; + + Groups.ownership = {}; + + Groups.ownership.isOwner = function(uid, groupName, callback) { + // Note: All admins are also owners + async.waterfall([ + async.apply(db.isSetMember, 'group:' + groupName + ':owners', uid), + function(isOwner, next) { + if (isOwner) { + return next(null, isOwner); + } + + user.isAdministrator(uid, next); + } + ], callback); + }; + + Groups.ownership.grant = function(toUid, groupName, callback) { + // Note: No ownership checking is done here on purpose! + db.setAdd('group:' + groupName + ':owners', toUid, callback); + }; + + Groups.ownership.rescind = function(toUid, groupName, callback) { + // Note: No ownership checking is done here on purpose! + db.setRemove('group:' + groupName + ':owners', toUid, callback); + }; + }(module.exports)); From d747ce5760a7d0a8ad00a46a9b951d88a99c7327 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 8 Jan 2015 15:13:05 -0500 Subject: [PATCH 039/897] granting and rescinding ownership, #2588 --- public/src/client/groups/details.js | 30 ++++++++++++---- src/controllers/groups.js | 4 ++- src/groups.js | 55 +++++++++++++++++++---------- src/socket.io/groups.js | 28 +++++++++++++++ 4 files changed, 91 insertions(+), 26 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 12ca74884a..e8d4ed957f 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -1,17 +1,35 @@ "use strict"; +/* globals socket, ajaxify */ define('forum/groups/details', function() { var Details = {}; Details.init = function() { - var memberListEl = $('.groups.details .members'); - - memberListEl.on('click', '[data-slug]', function() { - var slug = this.getAttribute('data-slug'); - ajaxify.go('user/' + slug); - }); + var memberList = $('.groups .members'); $('.latest-posts .content img').addClass('img-responsive'); + + memberList.on('click', '[data-action]', function() { + var btnEl = $(this), + userRow = btnEl.parents('tr'), + ownerFlagEl = userRow.find('.member-name i'), + isOwner = !ownerFlagEl.hasClass('hidden') ? true : false, + uid = userRow.attr('data-uid'), + action = btnEl.attr('data-action'); + + switch(action) { + case 'toggleOwnership': + socket.emit('groups.' + (isOwner ? 'rescind' : 'grant'), { + toUid: uid, + groupName: ajaxify.variables.get('group_name') + }, function(err) { + if (!err) { + ownerFlagEl.toggleClass('hidden'); + } + }); + break; + } + }); }; return Details; diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 72d83d4fc2..2d2ce8f050 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -23,10 +23,12 @@ groupsController.list = function(req, res, next) { groupsController.details = function(req, res, next) { var uid = req.user ? parseInt(req.user.uid, 10) : 0; + async.parallel({ group: function(next) { groups.get(req.params.name, { - expand: true + expand: true, + uid: uid }, next); }, posts: function(next) { diff --git a/src/groups.js b/src/groups.js index 2dcb708f66..60019a47b9 100644 --- a/src/groups.js +++ b/src/groups.js @@ -71,25 +71,7 @@ var async = require('async'), groupNames = groupNames.concat(ephemeralGroups); async.map(groupNames, function (groupName, next) { - async.waterfall([ - async.apply(Groups.get, groupName, options), - function(groupObj, next) { - // Retrieve group membership state, if uid is passed in - if (!options.uid) { - return next(null, groupObj); - } - - Groups.isMember(options.uid, groupName, function(err, isMember) { - if (err) { - winston.warn('[groups.list] Could not determine membership in group `' + groupName + '` for uid `' + options.uid + '`: ' + err.message); - return next(null, groupObj); - } - - groupObj.isMember = isMember; - next(null, groupObj); - }); - } - ], next); + Groups.get(groupName, options, next); }, function (err, groups) { callback(err, internals.filterGroups(groups, options)); }); @@ -126,6 +108,9 @@ var async = require('async'), async.waterfall([ async.apply(async.map, uids, user.getUserData), function(users, next) { + // Filter out non-matches + users = users.filter(Boolean); + async.mapLimit(users, 10, function(userObj, next) { Groups.ownership.isOwner(userObj.uid, groupName, function(err, isOwner) { if (err) { @@ -143,6 +128,36 @@ var async = require('async'), next(err, uids); } }); + }, + isMember: function(next) { + // Retrieve group membership state, if uid is passed in + if (!options.uid) { + return next(); + } + + Groups.isMember(options.uid, groupName, function(err, isMember) { + if (err) { + winston.warn('[groups.get] Could not determine membership in group `' + groupName + '` for uid `' + options.uid + '`: ' + err.message); + return next(); + } + + next(null, isMember); + }); + }, + isOwner: function(next) { + // Retrieve group ownership state, if uid is passed in + if (!options.uid) { + return next(); + } + + Groups.ownership.isOwner(options.uid, groupName, function(err, isOwner) { + if (err) { + winston.warn('[groups.get] Could not determine ownership in group `' + groupName + '` for uid `' + options.uid + '`: ' + err.message); + return next(); + } + + next(null, isOwner); + }); } }, function (err, results) { if (err || !results.base) { @@ -157,6 +172,8 @@ var async = require('async'), results.base.system = !!parseInt(results.base.system, 10); results.base.deletable = !results.base.system; results.base.truncated = truncated; + results.base.isMember = results.isMember; + results.base.isOwner = results.isOwner; callback(err, results.base); }); diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 9fd29bc2d4..943b9dc10c 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -20,4 +20,32 @@ SocketGroups.leave = function(socket, data, callback) { groups.leave(data.groupName, socket.uid, callback); }; +SocketGroups.grant = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { + if (!isOwner) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.ownership.grant(data.toUid, data.groupName, callback); + }); +}; + +SocketGroups.rescind = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { + if (!isOwner) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.ownership.rescind(data.toUid, data.groupName, callback); + }); +}; + module.exports = SocketGroups; From bb0b6d9db451a97b0c8d3165e28c9e7401caf9df Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 8 Jan 2015 15:36:34 -0500 Subject: [PATCH 040/897] using 'invisible' class instead of 'hidden', #2588 --- public/src/client/groups/details.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index e8d4ed957f..af3bf54afa 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -13,7 +13,7 @@ define('forum/groups/details', function() { var btnEl = $(this), userRow = btnEl.parents('tr'), ownerFlagEl = userRow.find('.member-name i'), - isOwner = !ownerFlagEl.hasClass('hidden') ? true : false, + isOwner = !ownerFlagEl.hasClass('invisible') ? true : false, uid = userRow.attr('data-uid'), action = btnEl.attr('data-action'); @@ -24,7 +24,7 @@ define('forum/groups/details', function() { groupName: ajaxify.variables.get('group_name') }, function(err) { if (!err) { - ownerFlagEl.toggleClass('hidden'); + ownerFlagEl.toggleClass('invisible'); } }); break; From db1cc6b8d235cc432d72409eac84678e113b65d3 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 8 Jan 2015 15:49:00 -0500 Subject: [PATCH 041/897] search by fullname --- public/src/client/users.js | 2 +- src/socket.io/user.js | 2 +- src/upgrade.js | 39 ++++++++++++++++++++++++++++++++++++-- src/user/profile.js | 26 +++++++++++++++++++++++++ src/user/search.js | 7 ++----- 5 files changed, 67 insertions(+), 9 deletions(-) diff --git a/public/src/client/users.js b/public/src/client/users.js index 60f9d6abb1..67d51dc052 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -115,7 +115,7 @@ define('forum/users', function() { notify.html(''); - socket.emit('user.search', {query: username}, function(err, data) { + socket.emit('user.search', {query: username, by: $('.search select').val()}, function(err, data) { if (err) { reset(); return app.alertError(err.message); diff --git a/src/socket.io/user.js b/src/socket.io/user.js index aadd177e9a..7b1b7eea0e 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -69,7 +69,7 @@ SocketUser.search = function(socket, data, callback) { if (!socket.uid) { return callback(new Error('[[error:not-logged-in]]')); } - user.search({query: data.query}, callback); + user.search({query: data.query, by: data.by}, callback); }; // Password Reset diff --git a/src/upgrade.js b/src/upgrade.js index 1564b5453c..f5e548e614 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 0, 8); + latestSchema = Date.UTC(2015, 0, 9); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -459,7 +459,7 @@ Upgrade.upgrade = function(callback) { db.getSortedSetRange('topics:tid', 0, -1, function(err, tids) { if (err) { - winston.error('[2014/12/20] Error encountered while updating digest settings'); + winston.error('[2015/01/08] Error encountered while Updating category topics sorted sets'); return next(err); } @@ -490,6 +490,41 @@ Upgrade.upgrade = function(callback) { winston.info('[2015/01/08] Updating category topics sorted sets skipped'); next(); } + }, + function(next) { + thisSchemaDate = Date.UTC(2015, 0, 9); + if (schemaDate < thisSchemaDate) { + winston.info('[2015/01/09] Creating fullname:uid hash'); + + db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) { + if (err) { + winston.error('[2014/01/09] Error encountered while Creating fullname:uid hash'); + return next(err); + } + + var now = Date.now(); + + async.eachLimit(uids, 50, function(uid, next) { + db.getObjectFields('user:' + uid, ['fullname'], function(err, userData) { + if (err || !userData || !userData.fullname) { + return next(err); + } + + db.setObjectField('fullname:uid', userData.fullname, uid, next); + }); + }, function(err) { + if (err) { + winston.error('[2015/01/09] Error encountered while Creating fullname:uid hash'); + return next(err); + } + winston.info('[2015/01/09] Creating fullname:uid hash done'); + Upgrade.update(thisSchemaDate, next); + }); + }); + } else { + winston.info('[2015/01/09] Creating fullname:uid hash skipped'); + next(); + } } diff --git a/src/user/profile.js b/src/user/profile.js index 866cc05219..b901bdb066 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -113,6 +113,8 @@ module.exports = function(User) { return updateEmail(uid, data.email, next); } else if (field === 'username') { return updateUsername(uid, data.username, next); + } else if (field === 'fullname') { + return updateFullname(uid, data.fullname, next); } else if (field === 'signature') { data[field] = S(data[field]).stripTags().s; } else if (field === 'website') { @@ -222,6 +224,30 @@ module.exports = function(User) { }); } + function updateFullname(uid, newFullname, callback) { + async.waterfall([ + function(next) { + User.getUserField(uid, 'fullname', next); + }, + function(fullname, next) { + if (newFullname === fullname) { + return callback(); + } + db.deleteObjectField('fullname:uid', fullname, next); + }, + function(next) { + User.setUserField(uid, 'fullname', newFullname, next); + }, + function(next) { + if (newFullname) { + db.setObjectField('fullname:uid', newFullname, uid, next); + } else { + next(); + } + } + ], callback); + } + User.changePassword = function(uid, data, callback) { if (!uid || !data || !data.uid) { return callback(new Error('[[error:invalid-uid]]')); diff --git a/src/user/search.js b/src/user/search.js index 9bc162d097..0df56d94de 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -20,13 +20,10 @@ module.exports = function(User) { } var start = process.hrtime(); - var key = 'username:uid'; - if (by === 'email') { - key = 'email:uid'; - } + var key = by + ':uid'; db.getObject(key, function(err, hash) { - if (err) { + if (err || !hash) { return callback(null, {timing: 0, users:[]}); } From 71b41239ac5fa0de762060584d4e2300f2fd8062 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 8 Jan 2015 16:50:31 -0500 Subject: [PATCH 042/897] attempting to join a private group causes the join to be pending, #2588 --- public/src/modules/helpers.js | 2 +- src/groups.js | 29 +++++++++++++++++++++++++++++ src/socket.io/groups.js | 13 ++++++++++++- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 838ad7a4da..bc40bde658 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -26,7 +26,7 @@ if (groupObj.isMember) { return ''; } else { - if (groupObj.pending) { + if (groupObj.isPending) { return ''; } else { return ''; diff --git a/src/groups.js b/src/groups.js index 60019a47b9..eadabda28f 100644 --- a/src/groups.js +++ b/src/groups.js @@ -144,6 +144,14 @@ var async = require('async'), next(null, isMember); }); }, + isPending: function(next) { + // Retrieve group membership state, if uid is passed in + if (!options.uid) { + return next(); + } + + db.isSetMember('group:' + groupName + ':pending', options.uid, next); + }, isOwner: function(next) { // Retrieve group ownership state, if uid is passed in if (!options.uid) { @@ -173,12 +181,19 @@ var async = require('async'), results.base.deletable = !results.base.system; results.base.truncated = truncated; results.base.isMember = results.isMember; + results.base.isPending = results.isPending; results.base.isOwner = results.isOwner; callback(err, results.base); }); }; + Groups.isPrivate = function(groupName, callback) { + db.getObjectField('group:' + groupName, 'private', function(err, isPrivate) { + callback(err, isPrivate || isPrivate === null); // Private, if not set at all + }); + }; + Groups.getMembers = function(groupName, callback) { db.getSetMembers('group:' + groupName + ':members', callback); }; @@ -521,6 +536,20 @@ var async = require('async'), }); }; + Groups.requestMembership = function(groupName, uid, callback) { + db.setAdd('group:' + groupName + ':pending', uid, callback); + plugins.fireHook('action:groups.requestMembership', { + groupName: groupName, + uid: uid + }); + }; + + Groups.approveMembership = function(groupName, uid, callback) { + // Note: For simplicity, this method intentially doesn't check the caller uid for ownership! + db.setRemove('group:' + groupName + ':pending', uid, callback); + Groups.join.apply(Groups, arguments); + }; + Groups.leave = function(groupName, uid, callback) { callback = callback || function() {}; diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 943b9dc10c..366a12348f 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -1,6 +1,7 @@ "use strict"; var groups = require('../groups'), + meta = require('../meta'), SocketGroups = {}; @@ -9,7 +10,17 @@ SocketGroups.join = function(socket, data, callback) { return callback(new Error('[[error:invalid-data]]')); } - groups.join(data.groupName, socket.uid, callback); + if (meta.config.allowPrivateGroups) { + groups.isPrivate(data.groupName, function(err, isPrivate) { + if (isPrivate) { + groups.requestMembership(data.groupName, socket.uid, callback); + } else { + groups.join(data.groupName, socket.uid, callback); + } + }); + } else { + groups.join(data.groupName, socket.uid, callback); + } }; SocketGroups.leave = function(socket, data, callback) { From 3712fe1fb5bac4200e5a5e0f97fe5bacc35176ce Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 8 Jan 2015 16:57:15 -0500 Subject: [PATCH 043/897] latest t.js --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b449297adc..1efe0580c4 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "socket.io-redis": "^0.1.3", "socketio-wildcard": "~0.1.1", "string": "^3.0.0", - "templates.js": "0.1.9", + "templates.js": "0.1.10", "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git", "underscore": "~1.7.0", "validator": "~3.26.0", From 3a3d45155e76883b1d8aa29cb5f70cd0350d73b8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 8 Jan 2015 17:06:33 -0500 Subject: [PATCH 044/897] show pending members in frontend UI, #2588 --- public/language/en_GB/groups.json | 1 + src/groups.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index 9aade4c62d..d537e28667 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -5,6 +5,7 @@ "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts" } \ No newline at end of file diff --git a/src/groups.js b/src/groups.js index eadabda28f..f6f619ff87 100644 --- a/src/groups.js +++ b/src/groups.js @@ -129,6 +129,19 @@ var async = require('async'), } }); }, + pending: function (next) { + db.getSetMembers('group:' + groupName + ':pending', function (err, uids) { + if (err) { + return next(err); + } + + if (options.expand) { + async.map(uids, user.getUserData, next); + } else { + next(err, uids); + } + }); + }, isMember: function(next) { // Retrieve group membership state, if uid is passed in if (!options.uid) { @@ -173,6 +186,7 @@ var async = require('async'), } results.base.members = results.users.filter(Boolean); + results.base.pending = results.pending.filter(Boolean); results.base.count = numUsers || results.base.members.length; results.base.memberCount = numUsers || results.base.members.length; results.base.deleted = !!parseInt(results.base.deleted, 10); From 96c37c25b05e485f3852a67a329b57234dc0313c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 8 Jan 2015 17:23:40 -0500 Subject: [PATCH 045/897] join, leave, accept, reject: handlers + UI, #2588 --- public/src/client/groups/details.js | 24 +++++++++++++++++++++--- src/groups.js | 7 ++++++- src/socket.io/groups.js | 28 ++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index af3bf54afa..15291cb9d8 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -1,15 +1,15 @@ "use strict"; -/* globals socket, ajaxify */ +/* globals define, socket, ajaxify, app */ define('forum/groups/details', function() { var Details = {}; Details.init = function() { - var memberList = $('.groups .members'); + var detailsPage = $('.groups'); $('.latest-posts .content img').addClass('img-responsive'); - memberList.on('click', '[data-action]', function() { + detailsPage.on('click', '[data-action]', function() { var btnEl = $(this), userRow = btnEl.parents('tr'), ownerFlagEl = userRow.find('.member-name i'), @@ -25,6 +25,24 @@ define('forum/groups/details', function() { }, function(err) { if (!err) { ownerFlagEl.toggleClass('invisible'); + } else { + app.alertError(err); + } + }); + break; + + case 'join': // intentional fall-throughs! + case 'leave': + case 'accept': + case 'reject': + socket.emit('groups.' + action, { + toUid: uid, + groupName: ajaxify.variables.get('group_name') + }, function(err) { + if (!err) { + ajaxify.refresh(); + } else { + app.alertError(err); } }); break; diff --git a/src/groups.js b/src/groups.js index f6f619ff87..6286fe7a9d 100644 --- a/src/groups.js +++ b/src/groups.js @@ -558,12 +558,17 @@ var async = require('async'), }); }; - Groups.approveMembership = function(groupName, uid, callback) { + Groups.acceptMembership = function(groupName, uid, callback) { // Note: For simplicity, this method intentially doesn't check the caller uid for ownership! db.setRemove('group:' + groupName + ':pending', uid, callback); Groups.join.apply(Groups, arguments); }; + Groups.rejectMembership = function(groupName, uid, callback) { + // Note: For simplicity, this method intentially doesn't check the caller uid for ownership! + db.setRemove('group:' + groupName + ':pending', uid, callback); + }; + Groups.leave = function(groupName, uid, callback) { callback = callback || function() {}; diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 366a12348f..039ad42b89 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -59,4 +59,32 @@ SocketGroups.rescind = function(socket, data, callback) { }); }; +SocketGroups.accept = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { + if (!isOwner) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.acceptMembership(data.groupName, data.toUid, callback); + }); +}; + +SocketGroups.reject = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { + if (!isOwner) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.rejectMembership(data.groupName, data.toUid, callback); + }); +}; + module.exports = SocketGroups; From 9b40c44fd8dde3a11b8f4b1e43af612cd2c24146 Mon Sep 17 00:00:00 2001 From: Schamper Date: Thu, 8 Jan 2015 23:25:28 +0100 Subject: [PATCH 046/897] Simple bat file for Windows. Not all options are supported, but it's a good start. --- nodebb.bat | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 nodebb.bat diff --git a/nodebb.bat b/nodebb.bat new file mode 100644 index 0000000000..aea408a1e5 --- /dev/null +++ b/nodebb.bat @@ -0,0 +1,122 @@ +@echo off + +rem %1 action +rem %2 subaction + +setlocal enabledelayedexpansion +2>nul call :CASE_%1 +if ERRORLEVEL 1 call :DEFAULT_CASE + +exit /B + +:CASE_start + echo Starting NodeBB + echo "nodebb.bat stop" to stop the NodeBB server + echo "nodebb.bat log" to view server output + + # Start the loader daemon + node loader %* + + goto END_CASE + +:CASE_stop + call :pidexists + if %_result%==0 ( + echo NodeBB is already stopped. + ) else ( + echo Stopping NodeBB. Goodbye! + + rem Doing this forcefully is probably not the best method + taskkill /PID !_pid! /f>nul + ) + + goto END_CASE + +:CASE_restart + echo Unsupported + + goto END_CASE + +:CASE_reload + echo Unsupported + + goto END_CASE + +:CASE_status + call :pidexists + if %_result%==0 ( + echo NodeBB is not running + echo "nodebb.bat start" to launch the NodeBB server + ) else ( + echo NodeBB Running ^(pid !_pid!^) + echo "nodebb.bat stop" to stop the NodeBB server + echo "nodebb.bat log" to view server output + echo "nodebb.bat restart" to restart NodeBB + ) + + goto END_CASE + +:CASE_log + cls + type .\logs\output.log + + goto END_CASE + +:CASE_upgrade + call npm install + call npm i nodebb-theme-vanilla nodebb-theme-lavender nodebb-widget-essentials + node app --upgrade + copy /b package.json +,,>nul + + goto END_CASE + +:CASE_setup + node app --setup %* + + goto END_CASE + +:CASE_reset + node app --reset --%2 + + goto END_CASE + +:CASE_dev + echo Launching NodeBB in "development" mode. + echo To run the production build of NodeBB, please use "forever". + echo More Information: https://docs.nodebb.org/en/latest/running/index.html + set NODE_ENV=development + node loader --no-daemon %* + + goto END_CASE + +:CASE_watch + echo Not supported + + goto END_CASE + +:DEFAULT_CASE + echo Welcome to NodeBB + echo Usage: nodebb.bat ^{start^|stop^|reload^|restart^|log^|setup^|reset^|upgrade^|dev^|watch^} + + goto END_CASE + +:END_CASE + endlocal + VER > NUL + goto :EOF + +:pidexists +if exist %~dp0pidfile ( + set /p _pid= Date: Thu, 8 Jan 2015 23:29:12 +0100 Subject: [PATCH 047/897] That's not how you do comments silly --- nodebb.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodebb.bat b/nodebb.bat index aea408a1e5..d432dd3143 100644 --- a/nodebb.bat +++ b/nodebb.bat @@ -14,7 +14,7 @@ exit /B echo "nodebb.bat stop" to stop the NodeBB server echo "nodebb.bat log" to view server output - # Start the loader daemon + rem Start the loader daemon node loader %* goto END_CASE From d7c27b35ab40ee93c669a98a190104dd39ea1cb8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 8 Jan 2015 17:47:20 -0500 Subject: [PATCH 048/897] closes #2586 --- src/favourites.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/favourites.js b/src/favourites.js index 1af5c881b8..11d6ba6721 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -172,6 +172,10 @@ var async = require('async'), return callback(err); } + if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) { + return callback(); + } + var hook, current = voteStatus.upvoted ? 'upvote' : 'downvote'; @@ -184,17 +188,17 @@ var async = require('async'), current = 'unvote'; } - plugins.fireHook('action:post.' + hook, { - pid: pid, - uid: uid, - current: current + vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, function(err, data) { + if (err) { + return callback(err); + } + plugins.fireHook('action:post.' + hook, { + pid: pid, + uid: uid, + current: current + }); + callback(null, data); }); - - if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) { - return callback(); - } - - vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, callback); }); } From a8de1c14659a4d6f754846c6349d5bd556719fed Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 8 Jan 2015 18:24:05 -0500 Subject: [PATCH 049/897] properly fix #2586 --- src/favourites.js | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/favourites.js b/src/favourites.js index 11d6ba6721..4f5ff90274 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -17,15 +17,11 @@ var async = require('async'), return callback(new Error('[[error:not-logged-in]]')); } - posts.getPostFields(pid, ['pid', 'uid', 'timestamp'], function (err, postData) { + posts.getPostFields(pid, ['pid', 'uid'], function (err, postData) { if (err) { return callback(err); } - if (uid === parseInt(postData.uid, 10)) { - return callback(new Error('[[error:cant-vote-self-post]]')); - } - var now = Date.now(); if(type === 'upvote' && !unvote) { @@ -167,16 +163,24 @@ var async = require('async'), }; function unvote(pid, uid, command, callback) { - Favourites.hasVoted(pid, uid, function(err, voteStatus) { + async.parallel({ + owner: function(next) { + posts.getPostField(pid, 'uid', next); + }, + voteStatus: function(next) { + Favourites.hasVoted(pid, uid, next); + } + }, function(err, results) { if (err) { return callback(err); } - if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) { - return callback(); + if (parseInt(uid, 10) === parseInt(results.owner, 10)) { + return callback(new Error('[[error:cant-vote-self-post]]')); } - var hook, + var voteStatus = results.voteStatus, + hook, current = voteStatus.upvoted ? 'upvote' : 'downvote'; if (voteStatus.upvoted && command === 'downvote' || voteStatus.downvoted && command === 'upvote') { @@ -188,17 +192,17 @@ var async = require('async'), current = 'unvote'; } - vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, function(err, data) { - if (err) { - return callback(err); - } - plugins.fireHook('action:post.' + hook, { - pid: pid, - uid: uid, - current: current - }); - callback(null, data); + plugins.fireHook('action:post.' + hook, { + pid: pid, + uid: uid, + current: current }); + + if (!voteStatus || (!voteStatus.upvoted && !voteStatus.downvoted)) { + return callback(); + } + + vote(voteStatus.upvoted ? 'downvote' : 'upvote', true, pid, uid, callback); }); } From 65537d997f4155a483638cd15716caabdc37aca9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 9 Jan 2015 09:43:45 -0500 Subject: [PATCH 050/897] if a group is deleted, flush the owner and pending sets, too --- src/groups.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/groups.js b/src/groups.js index 6286fe7a9d..f8d5470035 100644 --- a/src/groups.js +++ b/src/groups.js @@ -500,15 +500,11 @@ var async = require('async'), Groups.destroy = function(groupName, callback) { async.parallel([ - function(next) { - db.delete('group:' + groupName, next); - }, - function(next) { - db.setRemove('groups', groupName, next); - }, - function(next) { - db.delete('group:' + groupName + ':members', next); - }, + async.apply(db.delete, 'group:' + groupName), + async.apply(db.setRemove, 'groups', groupName), + async.apply(db.delete, 'group:' + groupName + ':members'), + async.apply(db.delete, 'group:' + groupName + ':pending'), + async.apply(db.delete, 'group:' + groupName + ':owners'), function(next) { db.getSetMembers('groups', function(err, groups) { if (err) { From 84c19921b99ac93be592671cf21ea0b178f9e823 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 9 Jan 2015 10:33:54 -0500 Subject: [PATCH 051/897] newly created groups automatically assign the creator as the owner, some tweaks to isPrivate parsing, added groups link to header, #2588 --- public/language/en_GB/global.json | 1 + public/src/admin/manage/groups.js | 4 +-- src/groups.js | 56 ++++++++++++++++++------------- src/socket.io/admin/groups.js | 8 +++-- 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/public/language/en_GB/global.json b/public/language/en_GB/global.json index a373c7a4d3..240b11d3a0 100644 --- a/public/language/en_GB/global.json +++ b/public/language/en_GB/global.json @@ -33,6 +33,7 @@ "header.tags": "Tags", "header.popular": "Popular", "header.users": "Users", + "header.groups": "Groups", "header.chats": "Chats", "header.notifications": "Notifications", "header.search": "Search", diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index 61e1e3b0f8..8f4b341f7d 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -49,7 +49,7 @@ define('admin/manage/groups', [ }, errorText; - socket.emit('admin.groups.create', submitObj, function(err, data) { + socket.emit('admin.groups.create', submitObj, function(err) { if (err) { switch (err) { case 'group-exists': @@ -68,7 +68,7 @@ define('admin/manage/groups', [ createModalError.addClass('hide'); createGroupName.val(''); createModal.on('hidden.bs.modal', function() { - ajaxify.go('admin/manage/groups'); + ajaxify.refresh(); }); createModal.modal('hide'); } diff --git a/src/groups.js b/src/groups.js index f8d5470035..e9e8685d6d 100644 --- a/src/groups.js +++ b/src/groups.js @@ -204,7 +204,13 @@ var async = require('async'), Groups.isPrivate = function(groupName, callback) { db.getObjectField('group:' + groupName, 'private', function(err, isPrivate) { - callback(err, isPrivate || isPrivate === null); // Private, if not set at all + isPrivate = isPrivate || isPrivate === null; + + if (typeof isPrivate === 'string') { + isPrivate = (isPrivate === '0' ? false : true); + } + + callback(err, isPrivate); // Private, if not set at all }); }; @@ -358,16 +364,16 @@ var async = require('async'), } }; - Groups.create = function(name, description, callback) { - if (name.length === 0) { + Groups.create = function(data, callback) { + if (data.name.length === 0) { return callback(new Error('[[error:group-name-too-short]]')); } - if (name === 'administrators' || name === 'registered-users') { + if (data.name === 'administrators' || data.name === 'registered-users') { var system = true; } - meta.userOrGroupExists(name, function (err, exists) { + meta.userOrGroupExists(data.name, function (err, exists) { if (err) { return callback(err); } @@ -377,24 +383,25 @@ var async = require('async'), } var groupData = { - name: name, - userTitle: name, - description: description, - deleted: '0', - hidden: '0', - system: system ? '1' : '0' - }; - - async.parallel([ - function(next) { - db.setAdd('groups', name, next); + name: data.name, + userTitle: data.name, + description: data.description, + deleted: '0', + hidden: '0', + system: system ? '1' : '0', + 'private': data.private || '1' }, - function(next) { - db.setObject('group:' + name, groupData, function(err) { - Groups.get(name, {}, next); - }); - } - ], callback); + tasks = [ + async.apply(db.setAdd, 'groups', data.name), + async.apply(db.setObject, 'group:' + data.name, groupData) + ]; + + if (data.hasOwnProperty('ownerUid')) { + tasks.push(async.apply(db.setAdd, 'group:' + data.name + ':owners', data.ownerUid)); + tasks.push(async.apply(db.setAdd, 'group:' + data.name + ':members', data.ownerUid)); + } + + async.parallel(tasks, callback); }); }; @@ -529,7 +536,10 @@ var async = require('async'), uid: uid }); } else { - Groups.create(groupName, '', function(err) { + Groups.create({ + name: groupName, + description: '' + }, function(err) { if (err && err.message !== '[[error:group-already-exists]]') { winston.error('[groups.join] Could not create new hidden group: ' + err.message); return callback(err); diff --git a/src/socket.io/admin/groups.js b/src/socket.io/admin/groups.js index 9aec355986..0bcf60ab7b 100644 --- a/src/socket.io/admin/groups.js +++ b/src/socket.io/admin/groups.js @@ -8,9 +8,11 @@ Groups.create = function(socket, data, callback) { return callback(new Error('[[error:invalid-data]]')); } - groups.create(data.name, data.description, function(err, groupObj) { - callback(err, groupObj || undefined); - }); + groups.create({ + name: data.name, + description: data.description, + ownerUid: socket.uid + }, callback); }; Groups.delete = function(socket, groupName, callback) { From 7be08307514f9362d04deb850384a631cdf0fa2d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 9 Jan 2015 10:45:50 -0500 Subject: [PATCH 052/897] properly showing private state in group details, #2588 --- public/language/en_GB/groups.json | 4 +++- src/groups.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index d537e28667..8abfdbec4e 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -7,5 +7,7 @@ "details.members": "Member List", "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group" } \ No newline at end of file diff --git a/src/groups.js b/src/groups.js index e9e8685d6d..50b5bc5c8d 100644 --- a/src/groups.js +++ b/src/groups.js @@ -192,6 +192,7 @@ var async = require('async'), results.base.deleted = !!parseInt(results.base.deleted, 10); results.base.hidden = !!parseInt(results.base.hidden, 10); results.base.system = !!parseInt(results.base.system, 10); + results.base.private = results.base.private ? !!parseInt(results.base.private, 10) : true; results.base.deletable = !results.base.system; results.base.truncated = truncated; results.base.isMember = results.isMember; From b4731ad47bf3db9ed12c879decf3dac185e4d7b2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 9 Jan 2015 13:51:27 -0500 Subject: [PATCH 053/897] added colorpicker to frontend, badge colour changes for groups, #2588 --- public/language/en_GB/groups.json | 4 +- public/src/client/groups/details.js | 68 ++++++++++++++++++++++- public/vendor/colorpicker/colorpicker.css | 24 ++++---- src/groups.js | 3 +- src/meta/css.js | 4 +- src/socket.io/admin/groups.js | 1 + src/socket.io/groups.js | 14 +++++ src/views/admin/header.tpl | 1 - 8 files changed, 102 insertions(+), 17 deletions(-) diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index 8abfdbec4e..1dafb41ed6 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -9,5 +9,7 @@ "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", "details.private": "Private Group", - "details.public": "Public Group" + "details.public": "Public Group", + + "details.owner_options": "Group Administration" } \ No newline at end of file diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 15291cb9d8..1d6cb4141c 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -5,7 +5,10 @@ define('forum/groups/details', function() { var Details = {}; Details.init = function() { - var detailsPage = $('.groups'); + var detailsPage = $('.groups'), + settingsFormEl = detailsPage.find('form'); + + Details.prepareSettings(); $('.latest-posts .content img').addClass('img-responsive'); @@ -31,6 +34,10 @@ define('forum/groups/details', function() { }); break; + case 'update': + Details.update(); + break; + case 'join': // intentional fall-throughs! case 'leave': case 'accept': @@ -50,5 +57,64 @@ define('forum/groups/details', function() { }); }; + Details.prepareSettings = function() { + var settingsFormEl = $('.groups form'), + colorBtn = settingsFormEl.find('[data-action="color-select"]'), + colorValueEl = settingsFormEl.find('[name="labelColor"]'), + previewEl = settingsFormEl.find('.label'); + + if (settingsFormEl.length) { + // Add color picker to settings form + require(['vendor/colorpicker/colorpicker'], function() { + console.log(colorBtn, colorBtn.ColorPicker); + colorBtn.ColorPicker({ + color: colorValueEl.val() || '#000', + onChange: function(hsb, hex) { + colorValueEl.val('#' + hex); + previewEl.css('background-color', '#' + hex); + }, + onShow: function(colpkr) { + $(colpkr).css('z-index', 1051); + } + }); + }); + } + }; + + Details.update = function() { + var settingsFormEl = $('.groups form'); + + if (settingsFormEl.length) { + require(['vendor/jquery/serializeObject/jquery.ba-serializeobject.min'], function() { + var settings = settingsFormEl.serializeObject(), + keys = Object.keys(settings), + inputEl; + + // Fix checkbox values + keys.forEach(function(key) { + inputEl = settingsFormEl.find('input[type="checkbox"][name="' + key + '"]'); + if (inputEl.length) { + settings[key] = settings[key] === 'on' ? true : false; + } + }); + + socket.emit('groups.update', { + groupName: ajaxify.variables.get('group_name'), + values: settings + }, function(err) { + if (err) { + return app.alertError(err.message); + } + + if (settings.name) { + ajaxify.go('groups/' + encodeURIComponent(settings.name)); + } else { + ajaxify.refresh(); + } + }); + }); + } + }; + return Details; }); \ No newline at end of file diff --git a/public/vendor/colorpicker/colorpicker.css b/public/vendor/colorpicker/colorpicker.css index b5b2158534..5ee96ba682 100644 --- a/public/vendor/colorpicker/colorpicker.css +++ b/public/vendor/colorpicker/colorpicker.css @@ -3,7 +3,7 @@ height: 176px; overflow: hidden; position: absolute; - background: url(./images/custom_background.png); + background: url(./vendor/colorpicker/images/custom_background.png); font-family: Arial, Helvetica, sans-serif; display: none; } @@ -23,7 +23,7 @@ left: 0; width: 150px; height: 150px; - background: url(./images/colorpicker_overlay.png); + background: url(./vendor/colorpicker/images/colorpicker_overlay.png); } .colorpicker_color div div { position: absolute; @@ -32,7 +32,7 @@ width: 11px; height: 11px; overflow: hidden; - background: url(./images/colorpicker_select.gif); + background: url(./vendor/colorpicker/images/colorpicker_select.gif); margin: -5px 0 0 -5px; } .colorpicker_hue { @@ -48,7 +48,7 @@ width: 35px; height: 9px; overflow: hidden; - background: url(./images/custom_indic.gif) left top; + background: url(./vendor/colorpicker/images/custom_indic.gif) left top; margin: -4px 0 0 0; left: 0px; } @@ -86,7 +86,7 @@ position: absolute; width: 72px; height: 22px; - background: url(./images/custom_hex.png) top; + background: url(./vendor/colorpicker/images/custom_hex.png) top; left: 212px; top: 142px; } @@ -109,32 +109,32 @@ cursor: n-resize; } .colorpicker_rgb_r { - background-image: url(./images/custom_rgb_r.png); + background-image: url(./vendor/colorpicker/images/custom_rgb_r.png); top: 52px; left: 212px; } .colorpicker_rgb_g { - background-image: url(./images/custom_rgb_g.png); + background-image: url(./vendor/colorpicker/images/custom_rgb_g.png); top: 82px; left: 212px; } .colorpicker_rgb_b { - background-image: url(./images/custom_rgb_b.png); + background-image: url(./vendor/colorpicker/images/custom_rgb_b.png); top: 112px; left: 212px; } .colorpicker_hsb_h { - background-image: url(./images/custom_hsb_h.png); + background-image: url(./vendor/colorpicker/images/custom_hsb_h.png); top: 52px; left: 282px; } .colorpicker_hsb_s { - background-image: url(./images/custom_hsb_s.png); + background-image: url(./vendor/colorpicker/images/custom_hsb_s.png); top: 82px; left: 282px; } .colorpicker_hsb_b { - background-image: url(./images/custom_hsb_b.png); + background-image: url(./vendor/colorpicker/images/custom_hsb_b.png); top: 112px; left: 282px; } @@ -143,7 +143,7 @@ position: absolute; width: 22px; height: 22px; - background: url(./images/custom_submit.png) top; + background: url(./vendor/colorpicker/images/custom_submit.png) top; left: 322px; top: 142px; overflow: hidden; diff --git a/src/groups.js b/src/groups.js index 50b5bc5c8d..333b823396 100644 --- a/src/groups.js +++ b/src/groups.js @@ -423,7 +423,8 @@ var async = require('async'), description: values.description || '', icon: values.icon || '', labelColor: values.labelColor || '#000000', - hidden: values.hidden || '0' + hidden: values.hidden || '0', + 'private': values.private === false ? '0' : '1' }, function(err) { if (err) { return callback(err); diff --git a/src/meta/css.js b/src/meta/css.js index 5021e9b302..9c00ba8633 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -49,9 +49,11 @@ module.exports = function(Meta) { source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css";'; source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";'; - + source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";'; acpSource = '\n@import "..' + path.sep + 'public/less/admin/admin";\n' + source; + acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";'; + source = '@import "./theme";\n' + source; async.parallel([ diff --git a/src/socket.io/admin/groups.js b/src/socket.io/admin/groups.js index 0bcf60ab7b..b78380428e 100644 --- a/src/socket.io/admin/groups.js +++ b/src/socket.io/admin/groups.js @@ -41,6 +41,7 @@ Groups.leave = function(socket, data, callback) { groups.leave(data.groupName, data.uid, callback); }; +// Possibly remove this and call SocketGroups.update instead Groups.update = function(socket, data, callback) { if(!data) { return callback(new Error('[[error:invalid-data]]')); diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 039ad42b89..fe401a4d15 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -87,4 +87,18 @@ SocketGroups.reject = function(socket, data, callback) { }); }; +SocketGroups.update = function(socket, data, callback) { + if(!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { + if (!isOwner) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.update(data.groupName, data.values, callback); + }); +}; + module.exports = SocketGroups; diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index dfa2dc9c89..9bd680936a 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -5,7 +5,6 @@ - From 311d02dbe1eea00595e5e18c04b3942d114a3a88 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 9 Jan 2015 13:53:19 -0500 Subject: [PATCH 054/897] removed console log --- public/src/client/groups/details.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 1d6cb4141c..f4e889d70f 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -66,7 +66,6 @@ define('forum/groups/details', function() { if (settingsFormEl.length) { // Add color picker to settings form require(['vendor/colorpicker/colorpicker'], function() { - console.log(colorBtn, colorBtn.ColorPicker); colorBtn.ColorPicker({ color: colorValueEl.val() || '#000', onChange: function(hsb, hex) { From a7d73d4106157eb0f2bceaea04180f9e0575208e Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 9 Jan 2015 14:33:42 -0500 Subject: [PATCH 055/897] fixes adding new routes to user/xxx/route --- public/src/ajaxify.js | 3 ++- src/views/config.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 4896c58195..8a5fa5b4fa 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -195,7 +195,8 @@ $(document).ready(function() { ajaxify.getCustomTemplateMapping = function(tpl) { if (templatesModule.config && templatesModule.config.custom_mapping && tpl !== undefined) { for (var pattern in templatesModule.config.custom_mapping) { - if (tpl.match(pattern)) { + var match = tpl.match(pattern); + if (match && match[0] === tpl) { return (templatesModule.config.custom_mapping[pattern]); } } diff --git a/src/views/config.json b/src/views/config.json index 70ba11b3af..7a7a5da07d 100644 --- a/src/views/config.json +++ b/src/views/config.json @@ -13,7 +13,7 @@ "^user/.*/favourites": "account/favourites", "^user/.*/posts": "account/posts", "^user/.*/topics": "account/topics", - "^user/.*": "account/profile", + "^user/[.^\/]*": "account/profile", "^reset/.*": "reset_code", "^tags/.*": "tag", "^groups/?$": "groups/list", From 5d43aa32126d50b524af9cd20a870f4f2e8ebc63 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 10 Jan 2015 14:50:28 -0500 Subject: [PATCH 056/897] ability to redirect the user from anywhere just send ``` callback({ status: 302, path: '/user/psychobunny' }); ``` --- src/routes/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/routes/index.js b/src/routes/index.js index ffee5b8272..eb35860928 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -211,6 +211,10 @@ function handleErrors(app, middleware) { return res.sendStatus(403); } + if (parseInt(err.status, 10) === 302 && err.path) { + return res.locals.isAPI ? res.status(302).json(err) : res.redirect(err.path); + } + res.status(err.status || 500); if (res.locals.isAPI) { From 4ab288acaec34a53aa72acb5c24c461818bd7b53 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 10 Jan 2015 15:03:29 -0500 Subject: [PATCH 057/897] delete fullname:uid mapping on user delete --- src/user/delete.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/user/delete.js b/src/user/delete.js index 12b3f390eb..ce7f70a30f 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -42,7 +42,7 @@ module.exports = function(User) { } User.deleteAccount = function(uid, callback) { - User.getUserFields(uid, ['username', 'userslug', 'email'], function(err, userData) { + User.getUserFields(uid, ['username', 'userslug', 'fullname', 'email'], function(err, userData) { if (err) { return callback(err); } @@ -54,6 +54,9 @@ module.exports = function(User) { function(next) { db.deleteObjectField('userslug:uid', userData.userslug, next); }, + function(next) { + db.deleteObjectField('fullname:uid', userData.fullname, next); + }, function(next) { if (userData.email) { db.deleteObjectField('email:uid', userData.email.toLowerCase(), next); From 1caddb6182c24dd6bb6df303abfe6ce052357857 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 10 Jan 2015 16:40:54 -0500 Subject: [PATCH 058/897] uploads controller --- src/controllers/uploads.js | 125 ++++++++++++++++++++++++++++++ src/routes/api.js | 151 +++++-------------------------------- 2 files changed, 142 insertions(+), 134 deletions(-) create mode 100644 src/controllers/uploads.js diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js new file mode 100644 index 0000000000..237ae5c453 --- /dev/null +++ b/src/controllers/uploads.js @@ -0,0 +1,125 @@ +"use strict"; + +var uploadsController = {}, + + fs = require('fs'), + path = require('path'), + async = require('async'), + + meta = require('../meta'), + plugins = require('../plugins'), + utils = require('../../public/src/utils'), + image = require('../image'); + + +uploadsController.upload = function(req, res, filesIterator, next) { + var files = req.files.files; + + if (!req.user) { + deleteTempFiles(files); + return res.status(403).json('not allowed'); + } + + if (!Array.isArray(files)) { + return res.status(500).json('invalid files'); + } + + if (Array.isArray(files[0])) { + files = files[0]; + } + + async.map(files, filesIterator, function(err, images) { + deleteTempFiles(files); + + if (err) { + return res.status(500).send(err.message); + } + + // IE8 - send it as text/html so browser won't trigger a file download for the json response + // malsup.com/jquery/form/#file-upload + res.status(200).send(req.xhr ? images : JSON.stringify(images)); + }); +}; + +uploadsController.uploadPost = function(req, res, next) { + uploadsController.upload(req, res, function(file, next) { + if (file.type.match(/image./)) { + uploadImage(req.user.uid, file, next); + } else { + uploadFile(req.user.uid, file, next); + } + }, next); +}; + +uploadsController.uploadThumb = function(req, res, next) { + if (parseInt(meta.config.allowTopicsThumbnail, 10) !== 1) { + deleteTempFiles(req.files.files); + return next(new Error('[[error:topic-thumbnails-are-disabled]]')); + } + + uploadsController.upload(req, res, function(file, next) { + if(file.type.match(/image./)) { + var size = meta.config.topicThumbSize || 120; + image.resizeImage(file.path, path.extname(file.name), size, size, function(err) { + if (err) { + return next(err); + } + uploadImage(req.user.uid, file, next); + }); + } else { + next(new Error('[[error:invalid-file]]')); + } + }, next); +}; + +function uploadImage(uid, image, callback) { + if (plugins.hasListeners('filter:uploadImage')) { + return plugins.fireHook('filter:uploadImage', {image: image, uid: uid}, callback); + } + + if (parseInt(meta.config.allowFileUploads, 10)) { + uploadFile(uid, image, callback); + } else { + callback(new Error('[[error:uploads-are-disabled]]')); + } +} + +function uploadFile(uid, file, callback) { + if (plugins.hasListeners('filter:uploadFile')) { + return plugins.fireHook('filter:uploadFile', {file: file, uid: uid}, callback); + } + + if (parseInt(meta.config.allowFileUploads, 10) !== 1) { + return callback(new Error('[[error:uploads-are-disabled]]')); + } + + if (!file) { + return callback(new Error('[[error:invalid-file]]')); + } + + if (file.size > parseInt(meta.config.maximumFileSize, 10) * 1024) { + return callback(new Error('[[error:file-too-big, ' + meta.config.maximumFileSize + ']]')); + } + + var filename = 'upload-' + utils.generateUUID() + path.extname(file.name); + require('../file').saveFileToLocal(filename, 'files', file.path, function(err, upload) { + if (err) { + return callback(err); + } + + callback(null, { + url: upload.url, + name: file.name + }); + }); +} + +function deleteTempFiles(files) { + for(var i=0; i parseInt(meta.config.maximumFileSize, 10) * 1024) { - return callback(new Error('[[error:file-too-big, ' + meta.config.maximumFileSize + ']]')); - } + router.get('/config', middleware.applyCSRF, controllers.api.getConfig); + router.get('/widgets/render', controllers.api.renderWidgets); - var filename = 'upload-' + utils.generateUUID() + path.extname(file.name); - require('../file').saveFileToLocal(filename, 'files', file.path, function(err, upload) { - if(err) { - return callback(err); - } + router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID); + router.get('/get_templates_listing', getTemplatesListing); + router.get('/categories/:cid/moderators', getModerators); + router.get('/recent/posts/:term?', getRecentPosts); - callback(null, { - url: upload.url, - name: file.name - }); - }); - } -} + var multipart = require('connect-multiparty'); + var multipartMiddleware = multipart(); + router.post('/post/upload', multipartMiddleware, middleware.applyCSRF, uploadsController.uploadPost); + router.post('/topic/thumb/upload', multipartMiddleware, middleware.applyCSRF, uploadsController.uploadThumb); + router.post('/user/:userslug/uploadpicture', multipartMiddleware, middleware.applyCSRF, middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions, controllers.accounts.uploadPicture); +}; function getModerators(req, res, next) { categories.getModerators(req.params.cid, function(err, moderators) { @@ -196,26 +101,4 @@ function getRecentPosts(req, res, next) { res.json(data); }); -} - -module.exports = function(app, middleware, controllers) { - - var router = express.Router(); - app.use('/api', router); - - router.get('/config', middleware.applyCSRF, controllers.api.getConfig); - router.get('/widgets/render', controllers.api.renderWidgets); - - router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID); - router.get('/get_templates_listing', getTemplatesListing); - router.get('/categories/:cid/moderators', getModerators); - router.get('/recent/posts/:term?', getRecentPosts); - - var multipart = require('connect-multiparty'); - var multipartMiddleware = multipart(); - - router.post('/post/upload', multipartMiddleware, middleware.applyCSRF, uploadPost); - router.post('/topic/thumb/upload', multipartMiddleware, middleware.applyCSRF, uploadThumb); - router.post('/user/:userslug/uploadpicture', multipartMiddleware, middleware.applyCSRF, middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions, controllers.accounts.uploadPicture); - -}; +} \ No newline at end of file From 9f35a2b251eafa510538cd3c2ae7a3661dca9953 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 10 Jan 2015 17:12:32 -0500 Subject: [PATCH 059/897] flat threadtools.purge --- src/threadTools.js | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/threadTools.js b/src/threadTools.js index 50cd3def95..8e622ce4a0 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -73,31 +73,28 @@ var winston = require('winston'), } ThreadTools.purge = function(tid, uid, callback) { - ThreadTools.exists(tid, function(err, exists) { - if (err || !exists) { - return callback(err); - } - - batch.processSortedSet('tid:' + tid + ':posts', function(pids, next) { - async.eachLimit(pids, 10, posts.purge, next); - }, {alwaysStartAt: 0}, function(err) { - if (err) { - return callback(err); + async.waterfall([ + function(next) { + ThreadTools.exists(tid, next); + }, + function(exists, next) { + if (!exists) { + return callback(); } - - topics.getTopicField(tid, 'mainPid', function(err, mainPid) { - if (err) { - return callback(err); - } - posts.purge(mainPid, function(err) { - if (err) { - return callback(err); - } - topics.purge(tid, callback); - }); - }); - }); - }); + batch.processSortedSet('tid:' + tid + ':posts', function(pids, next) { + async.eachLimit(pids, 10, posts.purge, next); + }, {alwaysStartAt: 0}, next); + }, + function(next) { + topics.getTopicField(tid, 'mainPid', next); + }, + function(mainPid, next) { + posts.purge(mainPid, next); + }, + function(next) { + topics.purge(tid, next); + } + ], callback); }; ThreadTools.lock = function(tid, uid, callback) { From 5414c268a05e18299a53d216014f4dfd90badc61 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 10 Jan 2015 17:41:03 -0500 Subject: [PATCH 060/897] sort numerically --- public/src/client/topic/fork.js | 4 ++-- src/topics/fork.js | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js index 92e9438b24..21f8d06e59 100644 --- a/public/src/client/topic/fork.js +++ b/public/src/client/topic/fork.js @@ -101,8 +101,8 @@ define('forum/topic/fork', function() { post.css('opacity', '1.0'); } - if(pids.length) { - pids.sort(); + if (pids.length) { + pids.sort(function(a,b) { return a - b; }); forkModal.find('#fork-pids').html(pids.toString()); } else { showNoPostsSelected(); diff --git a/src/topics/fork.js b/src/topics/fork.js index d5670bfb9a..4eb1274b2a 100644 --- a/src/topics/fork.js +++ b/src/topics/fork.js @@ -28,7 +28,9 @@ module.exports = function(Topics) { return callback(new Error('[[error:invalid-pid]]')); } - pids.sort(); + pids.sort(function(a, b) { + return a - b; + }); var mainPid = pids[0]; async.parallel({ From 23f450adbd42e81eaa108731bccd4a57634c8365 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 10 Jan 2015 17:47:31 -0500 Subject: [PATCH 061/897] delete topic post sorted sets on topic purge --- src/topics/delete.js | 6 +++++- src/topics/posts.js | 9 +-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/topics/delete.js b/src/topics/delete.js index eb4c6c43a0..de86eb7bbc 100644 --- a/src/topics/delete.js +++ b/src/topics/delete.js @@ -45,7 +45,11 @@ module.exports = function(Topics) { Topics.purge = function(tid, callback) { async.parallel([ function(next) { - db.deleteAll(['tid:' + tid + ':followers', 'tid:' + tid + ':read_by_uid'], next); + db.deleteAll([ + 'tid:' + tid + ':followers', + 'tid:' + tid + ':posts', + 'tid:' + tid + ':posts:votes' + ], next); }, function(next) { db.sortedSetsRemove(['topics:tid', 'topics:recent', 'topics:posts', 'topics:views'], tid, next); diff --git a/src/topics/posts.js b/src/topics/posts.js index 66fbb6bc4a..9e3275887f 100644 --- a/src/topics/posts.js +++ b/src/topics/posts.js @@ -218,14 +218,7 @@ module.exports = function(Topics) { }; Topics.removePostFromTopic = function(tid, pid, callback) { - async.parallel([ - function (next) { - db.sortedSetRemove('tid:' + tid + ':posts', pid, next); - }, - function (next) { - db.sortedSetRemove('tid:' + tid + ':posts:votes', pid, next); - } - ], function(err, results) { + db.sortedSetsRemove(['tid:' + tid + ':posts', 'tid:' + tid + ':posts:votes'], pid, function(err) { if (err) { return callback(err); } From f74383bba4814c05426631596c1745b112831127 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 10 Jan 2015 18:59:24 -0500 Subject: [PATCH 062/897] changed userPhoto to files[] --- public/src/client/account/profile.js | 8 +-- public/src/modules/uploader.js | 3 +- src/controllers/accounts.js | 32 ++++++----- src/controllers/admin/uploads.js | 82 ++++++++++++++-------------- src/middleware/middleware.js | 7 +++ src/routes/admin.js | 2 +- src/routes/api.js | 8 +-- src/views/admin/footer.tpl | 2 +- 8 files changed, 77 insertions(+), 67 deletions(-) diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js index 2c3db09a07..421fc006ef 100644 --- a/public/src/client/account/profile.js +++ b/public/src/client/account/profile.js @@ -36,11 +36,7 @@ define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll'] socket.removeListener('event:user_status_change', onUserStatusChange); socket.on('event:user_status_change', onUserStatusChange); - if (yourid !== theirid) { - socket.emit('user.increaseViewCount', theirid); - } - - infinitescroll.init(loadMoreTopics); + infinitescroll.init(loadMorePosts); }; function processPage() { @@ -84,7 +80,7 @@ define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll'] } - function loadMoreTopics(direction) { + function loadMorePosts(direction) { if(direction < 0 || !$('.user-recent-posts').length) { return; } diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index 4156507683..a510cee750 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -20,9 +20,8 @@ define('uploader', ['csrf'], function(csrf) { uploadForm[0].reset(); uploadForm.attr('action', route); uploadForm.find('#params').val(JSON.stringify(params)); - // uploadForm.find('#csrfToken').val(csrf.get()); - if(fileSize) { + if (fileSize) { uploadForm.find('#upload-file-size').html(fileSize); uploadForm.find('#file-size-block').removeClass('hide'); } else { diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 804541fe42..07dd1c5790 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -144,6 +144,10 @@ accountsController.getAccount = function(req, res, next) { return helpers.notFound(req, res); } + if (callerUID !== parseInt(userData.uid, 10)) { + user.incrementUserFieldBy(userData.uid, 'profileviews', 1); + } + async.parallel({ isFollowing: function(next) { user.isFollowing(callerUID, userData.theirid, next); @@ -386,25 +390,27 @@ accountsController.accountSettings = function(req, res, next) { }; accountsController.uploadPicture = function (req, res, next) { + var userPhoto = req.files.files[0]; var uploadSize = parseInt(meta.config.maximumProfileImageSize, 10) || 256; - if (req.files.userPhoto.size > uploadSize * 1024) { - fs.unlink(req.files.userPhoto.path); + + if (userPhoto.size > uploadSize * 1024) { + fs.unlink(userPhoto.path); return res.json({ error: 'Images must be smaller than ' + uploadSize + ' kb!' }); } var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif']; - if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) { - fs.unlink(req.files.userPhoto.path); + if (allowedTypes.indexOf(userPhoto.type) === -1) { + fs.unlink(userPhoto.path); return res.json({ error: 'Allowed image types are png, jpg and gif!' }); } - var extension = path.extname(req.files.userPhoto.name); + var extension = path.extname(userPhoto.name); if (!extension) { - fs.unlink(req.files.userPhoto.path); + fs.unlink(userPhoto.path); return res.json({ error: 'Error uploading file! Error : Invalid extension!' }); @@ -415,11 +421,11 @@ accountsController.uploadPicture = function (req, res, next) { async.waterfall([ function(next) { - image.resizeImage(req.files.userPhoto.path, extension, imageDimension, imageDimension, next); + image.resizeImage(userPhoto.path, extension, imageDimension, imageDimension, next); }, function(next) { if (parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1) { - image.convertImageToPng(req.files.userPhoto.path, extension, next); + image.convertImageToPng(userPhoto.path, extension, next); } else { next(); } @@ -447,7 +453,7 @@ accountsController.uploadPicture = function (req, res, next) { ], function(err, result) { function done(err, image) { - fs.unlink(req.files.userPhoto.path); + fs.unlink(userPhoto.path); if(err) { return res.json({error: err.message}); } @@ -460,12 +466,12 @@ accountsController.uploadPicture = function (req, res, next) { } if (err) { - fs.unlink(req.files.userPhoto.path); + fs.unlink(userPhoto.path); return res.json({error:err.message}); } if (plugins.hasListeners('filter:uploadImage')) { - return plugins.fireHook('filter:uploadImage', {image: req.files.userPhoto, uid: updateUid}, done); + return plugins.fireHook('filter:uploadImage', {image: userPhoto, uid: updateUid}, done); } var convertToPNG = parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1; @@ -473,7 +479,7 @@ accountsController.uploadPicture = function (req, res, next) { user.getUserField(updateUid, 'uploadedpicture', function (err, oldpicture) { if (!oldpicture) { - file.saveFileToLocal(filename, 'profile', req.files.userPhoto.path, done); + file.saveFileToLocal(filename, 'profile', userPhoto.path, done); return; } @@ -484,7 +490,7 @@ accountsController.uploadPicture = function (req, res, next) { winston.err(err); } - file.saveFileToLocal(filename, 'profile', req.files.userPhoto.path, done); + file.saveFileToLocal(filename, 'profile', userPhoto.path, done); }); }); }); diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js index a3f5caf533..98d8e42fb2 100644 --- a/src/controllers/admin/uploads.js +++ b/src/controllers/admin/uploads.js @@ -8,37 +8,8 @@ var fs = require('fs'), var uploadsController = {}; -function validateUpload(res, req, allowedTypes) { - if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) { - var err = { - error: 'Invalid image type. Allowed types are: ' + allowedTypes.join(', ') - }; - - fs.unlink(req.files.userPhoto.path); - res.send(req.xhr ? err : JSON.stringify(err)); - return false; - } - - return true; -} - -uploadsController.uploadImage = function(filename, folder, req, res) { - function done(err, image) { - fs.unlink(req.files.userPhoto.path); - - var response = err ? {error: err.message} : {path: image.url}; - - res.send(req.xhr ? response : JSON.stringify(response)); - } - - if (plugins.hasListeners('filter:uploadImage')) { - plugins.fireHook('filter:uploadImage', {image: req.files.userPhoto, uid: req.user.uid}, done); - } else { - file.saveFileToLocal(filename, folder, req.files.userPhoto.path, done); - } -}; - uploadsController.uploadCategoryPicture = function(req, res, next) { + var uploadedFile = req.files.files[0]; var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/svg+xml'], params = null; @@ -48,22 +19,23 @@ uploadsController.uploadCategoryPicture = function(req, res, next) { var err = { error: 'Error uploading file! Error :' + e.message }; - fs.unlink(req.files.userPhoto.path); + fs.unlink(uploadedFile.path); return res.send(req.xhr ? err : JSON.stringify(err)); } - if (validateUpload(res, req, allowedTypes)) { - var filename = 'category-' + params.cid + path.extname(req.files.userPhoto.name); - uploadsController.uploadImage(filename, 'category', req, res); + if (validateUpload(req, res, uploadedFile, allowedTypes)) { + var filename = 'category-' + params.cid + path.extname(uploadedFile.name); + uploadImage(filename, 'category', uploadedFile, req, res); } }; uploadsController.uploadFavicon = function(req, res, next) { + var uploadedFile = req.files.files[0]; var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon']; - if (validateUpload(res, req, allowedTypes)) { - file.saveFileToLocal('favicon.ico', 'files', req.files.userPhoto.path, function(err, image) { - fs.unlink(req.files.userPhoto.path); + if (validateUpload(res, req, uploadedFile, allowedTypes)) { + file.saveFileToLocal('favicon.ico', 'files', uploadedFile.path, function(err, image) { + fs.unlink(uploadedFile.path); var response = err ? {error: err.message} : {path: image.url}; @@ -81,11 +53,41 @@ uploadsController.uploadGravatarDefault = function(req, res, next) { }; function upload(name, req, res, next) { + var uploadedFile = req.files.files[0]; var allowedTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif']; + if (validateUpload(req, res, uploadedFile, allowedTypes)) { + var filename = name + path.extname(uploadedFile.name); + uploadImage(filename, 'files', uploadedFile, req, res); + } +} + +function validateUpload(req, res, uploadedFile, allowedTypes) { + if (allowedTypes.indexOf(uploadedFile.type) === -1) { + var err = { + error: 'Invalid image type. Allowed types are: ' + allowedTypes.join(', ') + }; + + fs.unlink(uploadedFile.path); + res.send(req.xhr ? err : JSON.stringify(err)); + return false; + } - if (validateUpload(res, req, allowedTypes)) { - var filename = name + path.extname(req.files.userPhoto.name); - uploadsController.uploadImage(filename, 'files', req, res); + return true; +} + +function uploadImage(filename, folder, uploadedFile, req, res) { + function done(err, uploadedImage) { + fs.unlink(uploadedFile.path); + + var response = err ? {error: err.message} : {path: uploadedImage.url}; + + res.send(req.xhr ? response : JSON.stringify(response)); + } + + if (plugins.hasListeners('filter:uploadImage')) { + plugins.fireHook('filter:uploadImage', {image: uploadedFile, uid: req.user.uid}, done); + } else { + file.saveFileToLocal(filename, folder, uploadedFile.path, done); } } diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 57b8f20159..3d8c463805 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -106,6 +106,13 @@ middleware.addSlug = function(req, res, next) { next(); }; +middleware.validateFiles = function(req, res, next) { + if (!Array.isArray(req.files.files) || !req.files.files.length) { + return next(new Error(['[[error:invalid-files]]'])); + } + next(); +}; + middleware.prepareAPI = function(req, res, next) { res.locals.isAPI = true; next(); diff --git a/src/routes/admin.js b/src/routes/admin.js index 7d867ddbf0..1b9efcef58 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -10,7 +10,7 @@ function apiRoutes(app, middleware, controllers) { var multipart = require('connect-multiparty'); var multipartMiddleware = multipart(); - var middlewares = [multipartMiddleware, middleware.applyCSRF, middleware.authenticate]; + var middlewares = [multipartMiddleware, middleware.validateFiles, middleware.applyCSRF, middleware.authenticate]; app.post('/category/uploadpicture', middlewares, controllers.admin.uploads.uploadCategoryPicture); app.post('/uploadfavicon', middlewares, controllers.admin.uploads.uploadFavicon); diff --git a/src/routes/api.js b/src/routes/api.js index 9d216b8d02..da281280cc 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -28,10 +28,10 @@ module.exports = function(app, middleware, controllers) { var multipart = require('connect-multiparty'); var multipartMiddleware = multipart(); - - router.post('/post/upload', multipartMiddleware, middleware.applyCSRF, uploadsController.uploadPost); - router.post('/topic/thumb/upload', multipartMiddleware, middleware.applyCSRF, uploadsController.uploadThumb); - router.post('/user/:userslug/uploadpicture', multipartMiddleware, middleware.applyCSRF, middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions, controllers.accounts.uploadPicture); + var middlewares = [multipartMiddleware, middleware.validateFiles, middleware.applyCSRF]; + router.post('/post/upload', middlewares, uploadsController.uploadPost); + router.post('/topic/thumb/upload', middlewares, uploadsController.uploadThumb); + router.post('/user/:userslug/uploadpicture', middlewares.concat([middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions]), controllers.accounts.uploadPicture); }; function getModerators(req, res, next) { diff --git a/src/views/admin/footer.tpl b/src/views/admin/footer.tpl index c54c67dd3c..e81d9e6a1a 100644 --- a/src/views/admin/footer.tpl +++ b/src/views/admin/footer.tpl @@ -13,7 +13,7 @@
    - +

    From 0305ad989c876f6c3de1897995bc825dca38a691 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 10 Jan 2015 19:48:00 -0500 Subject: [PATCH 063/897] match uploader return --- public/src/modules/uploader.js | 60 ++++++++++++++------------------ src/controllers/accounts.js | 6 ++-- src/controllers/admin/uploads.js | 6 ++-- 3 files changed, 31 insertions(+), 41 deletions(-) diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index a510cee750..91eb439a25 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -1,16 +1,10 @@ +'use strict'; + +/* globals define */ + define('uploader', ['csrf'], function(csrf) { - var module = {}, - maybeParse = function(response) { - if (typeof response == 'string') { - try { - return $.parseJSON(response); - } catch (e) { - return {error: 'Something went wrong while parsing server response'}; - } - } - return response; - }; + var module = {}; module.open = function(route, params, fileSize, callback) { var uploadModal = $('#upload-picture-modal'); @@ -34,28 +28,18 @@ define('uploader', ['csrf'], function(csrf) { uploadForm.off('submit').submit(function() { - function status(message) { + function showAlert(type, message) { module.hideAlerts(); - uploadModal.find('#alert-status').text(message).removeClass('hide'); + uploadModal.find('#alert-' + type).text(message).removeClass('hide'); } - function success(message) { - module.hideAlerts(); - uploadModal.find('#alert-success').text(message).removeClass('hide'); - } - - function error(message) { - module.hideAlerts(); - uploadModal.find('#alert-error').text(message).removeClass('hide'); - } - - status('uploading the file ...'); + showAlert('status', 'uploading the file ...'); uploadModal.find('#upload-progress-bar').css('width', '0%'); uploadModal.find('#upload-progress-box').show().removeClass('hide'); if (!$('#userPhotoInput').val()) { - error('select an image to upload!'); + showAlert('error', 'select an image to upload!'); return false; } @@ -65,7 +49,7 @@ define('uploader', ['csrf'], function(csrf) { }, error: function(xhr) { xhr = maybeParse(xhr); - error('Error: ' + xhr.status); + showAlert('error', 'Error: ' + xhr.status); }, uploadProgress: function(event, position, total, percent) { @@ -76,12 +60,13 @@ define('uploader', ['csrf'], function(csrf) { response = maybeParse(response); if (response.error) { - error(response.error); + showAlert('error', response.error); return; } - callback(response.path); - success('File uploaded successfully!'); + callback(response[0].url); + + showAlert('success', 'File uploaded successfully!'); setTimeout(function() { module.hideAlerts(); uploadModal.modal('hide'); @@ -93,12 +78,19 @@ define('uploader', ['csrf'], function(csrf) { }); }; + function maybeParse(response) { + if (typeof response === 'string') { + try { + return $.parseJSON(response); + } catch (e) { + return {error: 'Something went wrong while parsing server response'}; + } + } + return response; + } + module.hideAlerts = function() { - var uploadModal = $('#upload-picture-modal'); - uploadModal.find('#alert-status').addClass('hide'); - uploadModal.find('#alert-success').addClass('hide'); - uploadModal.find('#alert-error').addClass('hide'); - uploadModal.find('#upload-progress-box').addClass('hide'); + $('#upload-picture-modal').find('#alert-status, #alert-success, #alert-error, #upload-progress-box').addClass('hide'); }; return module; diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 07dd1c5790..69ea848ec0 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -454,15 +454,13 @@ accountsController.uploadPicture = function (req, res, next) { function done(err, image) { fs.unlink(userPhoto.path); - if(err) { + if (err) { return res.json({error: err.message}); } user.setUserFields(updateUid, {uploadedpicture: image.url, picture: image.url}); - res.json({ - path: image.url - }); + res.json([{name: userPhoto.name, url: image.url}]); } if (err) { diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js index 98d8e42fb2..0b7ece2775 100644 --- a/src/controllers/admin/uploads.js +++ b/src/controllers/admin/uploads.js @@ -37,7 +37,7 @@ uploadsController.uploadFavicon = function(req, res, next) { file.saveFileToLocal('favicon.ico', 'files', uploadedFile.path, function(err, image) { fs.unlink(uploadedFile.path); - var response = err ? {error: err.message} : {path: image.url}; + var response = err ? {error: err.message} : [{name: uploadedFile.name, url: image.url}]; res.send(req.xhr ? response : JSON.stringify(response)); }); @@ -76,10 +76,10 @@ function validateUpload(req, res, uploadedFile, allowedTypes) { } function uploadImage(filename, folder, uploadedFile, req, res) { - function done(err, uploadedImage) { + function done(err, image) { fs.unlink(uploadedFile.path); - var response = err ? {error: err.message} : {path: uploadedImage.url}; + var response = err ? {error: err.message} : [{name: uploadedFile.name, url: image.url}]; res.send(req.xhr ? response : JSON.stringify(response)); } From 19f0f6b7e04945b102457dce4f88ddd71f2afbcd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 11 Jan 2015 16:55:25 -0500 Subject: [PATCH 064/897] fixed issue where trying to go to the user profile would cause a cold load instead of ajaxify --- src/views/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/config.json b/src/views/config.json index 7a7a5da07d..9fc65e5781 100644 --- a/src/views/config.json +++ b/src/views/config.json @@ -13,7 +13,7 @@ "^user/.*/favourites": "account/favourites", "^user/.*/posts": "account/posts", "^user/.*/topics": "account/topics", - "^user/[.^\/]*": "account/profile", + "^user/[^\/]+": "account/profile", "^reset/.*": "reset_code", "^tags/.*": "tag", "^groups/?$": "groups/list", From 69ed8ac45d5f5549ac5fc5796b4b8df6b041fe3b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 11 Jan 2015 17:24:15 -0500 Subject: [PATCH 065/897] icon selection interface -- moved iconSelect module out of admin space, #2588 --- public/less/admin/admin.less | 19 ------------------- public/src/admin/manage/categories.js | 2 +- public/src/admin/manage/groups.js | 2 +- public/src/client/groups/details.js | 11 +++++++++-- public/src/{admin => }/modules/iconSelect.js | 6 ++++-- src/views/admin/manage/categories.tpl | 2 +- src/views/admin/manage/groups.tpl | 2 +- src/views/admin/partials/fontawesome.tpl | 1 - 8 files changed, 17 insertions(+), 28 deletions(-) rename public/src/{admin => }/modules/iconSelect.js (83%) delete mode 100644 src/views/admin/partials/fontawesome.tpl diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 2e5b868048..4042e3d621 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -195,25 +195,6 @@ } } - .icon-container { - .row { - margin: 0; - i { - width:20px; - height:20px; - margin: 1px; - .pointer; - line-height: 20px; - text-align: center; - - &:hover, &.selected { - background: black; - color: white; - } - } - } - } - .navbar { padding: 0 5px; diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 5bf1bfe945..54385b6d0c 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -3,7 +3,7 @@ define('admin/manage/categories', [ 'uploader', - 'admin/modules/iconSelect', + 'iconSelect', 'admin/modules/colorpicker' ], function(uploader, iconSelect, colorpicker) { var Categories = {}; diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index 8f4b341f7d..19f0bf31e9 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -2,7 +2,7 @@ /*global define, templates, socket, ajaxify, app, admin, bootbox*/ define('admin/manage/groups', [ - 'admin/modules/iconSelect', + 'iconSelect', 'admin/modules/colorpicker' ], function(iconSelect, colorpicker) { var Groups = {}; diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index f4e889d70f..0c46f1580a 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -1,7 +1,7 @@ "use strict"; /* globals define, socket, ajaxify, app */ -define('forum/groups/details', function() { +define('forum/groups/details', ['iconSelect'], function(iconSelect) { var Details = {}; Details.init = function() { @@ -61,7 +61,9 @@ define('forum/groups/details', function() { var settingsFormEl = $('.groups form'), colorBtn = settingsFormEl.find('[data-action="color-select"]'), colorValueEl = settingsFormEl.find('[name="labelColor"]'), - previewEl = settingsFormEl.find('.label'); + iconBtn = settingsFormEl.find('[data-action="icon-select"]'), + previewEl = settingsFormEl.find('.label'), + previewIcon = previewEl.find('i'); if (settingsFormEl.length) { // Add color picker to settings form @@ -77,6 +79,11 @@ define('forum/groups/details', function() { } }); }); + + // Add icon selection interface + iconSelect.init(previewIcon, function() { + console.log(arguments); + }); } }; diff --git a/public/src/admin/modules/iconSelect.js b/public/src/modules/iconSelect.js similarity index 83% rename from public/src/admin/modules/iconSelect.js rename to public/src/modules/iconSelect.js index 286009bf0f..88ab1903ed 100644 --- a/public/src/admin/modules/iconSelect.js +++ b/public/src/modules/iconSelect.js @@ -7,7 +7,9 @@ define(function() { iconSelect.init = function(el, onModified) { onModified = onModified || function() {}; - var selected = el.attr('class').replace('fa-2x', '').replace('fa', '').replace(/\s+/g, ''); + var doubleSize = el.hasClass('fa-2x'), + selected = el.attr('class').replace('fa-2x', '').replace('fa', '').replace(/\s+/g, ''); + $('#icons .selected').removeClass('selected'); if (selected === '') { @@ -25,7 +27,7 @@ define(function() { categoryIconClass = ''; } - el.attr('class', 'fa fa-2x ' + categoryIconClass); + el.attr('class', 'fa ' + (doubleSize ? 'fa-2x ' : '') + categoryIconClass); el.val(categoryIconClass); el.attr('value', categoryIconClass); diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index b3b9427abb..2c0dcf48da 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -149,7 +149,7 @@
    - +
    diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index ee8f8f24ea..69f8bad37b 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -136,7 +136,7 @@
    - +
    diff --git a/src/views/admin/partials/fontawesome.tpl b/src/views/admin/partials/fontawesome.tpl deleted file mode 100644 index b0263d95a9..0000000000 --- a/src/views/admin/partials/fontawesome.tpl +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 240056d1694a7e271ebdb30d2bcb17f946f8188f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 11 Jan 2015 17:44:51 -0500 Subject: [PATCH 066/897] added icon container styles back to ACP, proper hooking-up of iconSelect module in group settings panel, #2588 --- public/less/admin/admin.less | 19 ++++++++++++++++++ public/src/client/groups/details.js | 31 +++++++++++++++-------------- src/socket.io/groups.js | 2 +- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 4042e3d621..2e5b868048 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -195,6 +195,25 @@ } } + .icon-container { + .row { + margin: 0; + i { + width:20px; + height:20px; + margin: 1px; + .pointer; + line-height: 20px; + text-align: center; + + &:hover, &.selected { + background: black; + color: white; + } + } + } + } + .navbar { padding: 0 5px; diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 0c46f1580a..0aacde97ce 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -1,7 +1,7 @@ "use strict"; /* globals define, socket, ajaxify, app */ -define('forum/groups/details', ['iconSelect'], function(iconSelect) { +define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker'], function(iconSelect) { var Details = {}; Details.init = function() { @@ -63,26 +63,27 @@ define('forum/groups/details', ['iconSelect'], function(iconSelect) { colorValueEl = settingsFormEl.find('[name="labelColor"]'), iconBtn = settingsFormEl.find('[data-action="icon-select"]'), previewEl = settingsFormEl.find('.label'), - previewIcon = previewEl.find('i'); + previewIcon = previewEl.find('i'), + previewValueEl = settingsFormEl.find('[name="icon"]'); if (settingsFormEl.length) { // Add color picker to settings form - require(['vendor/colorpicker/colorpicker'], function() { - colorBtn.ColorPicker({ - color: colorValueEl.val() || '#000', - onChange: function(hsb, hex) { - colorValueEl.val('#' + hex); - previewEl.css('background-color', '#' + hex); - }, - onShow: function(colpkr) { - $(colpkr).css('z-index', 1051); - } - }); + colorBtn.ColorPicker({ + color: colorValueEl.val() || '#000', + onChange: function(hsb, hex) { + colorValueEl.val('#' + hex); + previewEl.css('background-color', '#' + hex); + }, + onShow: function(colpkr) { + $(colpkr).css('z-index', 1051); + } }); // Add icon selection interface - iconSelect.init(previewIcon, function() { - console.log(arguments); + iconBtn.on('click', function() { + iconSelect.init(previewIcon, function() { + previewValueEl.val(previewIcon.val()); + }); }); } }; diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index fe401a4d15..3c9dc9b069 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -10,7 +10,7 @@ SocketGroups.join = function(socket, data, callback) { return callback(new Error('[[error:invalid-data]]')); } - if (meta.config.allowPrivateGroups) { + if (meta.config.allowPrivateGroups !== '0') { groups.isPrivate(data.groupName, function(err, isPrivate) { if (isPrivate) { groups.requestMembership(data.groupName, socket.uid, callback); From 08e883de44f1523c51dfa5e77fdd23e102534d5e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 11 Jan 2015 18:04:35 -0500 Subject: [PATCH 067/897] added widget areas to the bottom of the group details page, #2588 --- src/controllers/admin.js | 3 +++ src/views/admin/extend/widgets.tpl | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 5a43e1ba6c..5ccfa3a6df 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -237,6 +237,9 @@ adminController.extend.widgets = function(req, res, next) { { name: 'Global Sidebar', template: 'global', location: 'sidebar' }, { name: 'Global Header', template: 'global', location: 'header' }, { name: 'Global Footer', template: 'global', location: 'footer' }, + + { name: 'Group Page (Left)', template: 'groups/details.tpl', location: 'left'}, + { name: 'Group Page (Right)', template: 'groups/details.tpl', location: 'right'} ]; plugins.fireHook('filter:widgets.getAreas', defaultAreas, next); diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index 4571f70d1f..1f504fbdf1 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -10,7 +10,7 @@ -
    +
    From 765975e6671ec4c4c0b52e99f341596b0bd89fdd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 11 Jan 2015 18:17:49 -0500 Subject: [PATCH 068/897] ACP groups delete calls generic groups socket listener now, #2588 --- public/src/admin/manage/groups.js | 6 ++++-- src/socket.io/admin/groups.js | 4 ---- src/socket.io/groups.js | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index 19f0bf31e9..5833f99b66 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -102,12 +102,14 @@ define('admin/manage/groups', [ case 'delete': bootbox.confirm('Are you sure you wish to delete this group?', function(confirm) { if (confirm) { - socket.emit('admin.groups.delete', groupName, function(err, data) { + socket.emit('groups.delete', { + groupName: groupName + }, function(err, data) { if(err) { return app.alertError(err.message); } - ajaxify.go('admin/manage/groups'); + ajaxify.refresh(); }); } }); diff --git a/src/socket.io/admin/groups.js b/src/socket.io/admin/groups.js index b78380428e..9700bee3ca 100644 --- a/src/socket.io/admin/groups.js +++ b/src/socket.io/admin/groups.js @@ -15,10 +15,6 @@ Groups.create = function(socket, data, callback) { }, callback); }; -Groups.delete = function(socket, groupName, callback) { - groups.destroy(groupName, callback); -}; - Groups.get = function(socket, groupName, callback) { groups.get(groupName, { expand: true diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 3c9dc9b069..c517cbabb2 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -101,4 +101,18 @@ SocketGroups.update = function(socket, data, callback) { }); }; +SocketGroups.delete = function(socket, data, callback) { + if(!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { + if (!isOwner) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.destroy(data.groupName, callback); + }); +}; + module.exports = SocketGroups; From 2974f1ba8aff4e35eb43596adb6791ec5fbd357d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 11:07:38 -0500 Subject: [PATCH 069/897] closes #2602 --- src/middleware/middleware.js | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 3d8c463805..be112f810f 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -445,7 +445,7 @@ middleware.addExpiresHeaders = function(req, res, next) { }; middleware.maintenanceMode = function(req, res, next) { - if (meta.config.maintenanceMode !== '1') { + if (parseInt(meta.config.maintenanceMode, 10) !== 1) { return next(); } @@ -480,35 +480,35 @@ middleware.maintenanceMode = function(req, res, next) { return true; } } + return false; }, isApiRoute = /^\/api/; - if (!isAllowed(req.url)) { - if (!req.user) { - return render(); - } else { - user.isAdministrator(req.user.uid, function(err, isAdmin) { - if (!isAdmin) { - return render(); - } else { - return next(); - } - }); - } - } else { + if (isAllowed(req.url)) { return next(); } + + if (!req.user) { + return render(); + } + + user.isAdministrator(req.user.uid, function(err, isAdmin) { + if (err) { + return next(err); + } + if (!isAdmin) { + render(); + } else { + next(); + } + }); }; middleware.publicTagListing = function(req, res, next) { - if ((!meta.config.hasOwnProperty('publicTagListing') || parseInt(meta.config.publicTagListing, 10) === 1)) { + if (req.user || (!meta.config.hasOwnProperty('publicTagListing') || parseInt(meta.config.publicTagListing, 10) === 1)) { next(); } else { - if (res.locals.isAPI) { - res.sendStatus(401); - } else { - middleware.ensureLoggedIn(req, res, next); - } + controllers.helpers.notAllowed(req, res); } }; From 635393a274d67289d0bdaf8402d1b045869649ed Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 12 Jan 2015 13:00:23 -0500 Subject: [PATCH 070/897] group creation and deletion from outside ACP, #2588 --- public/language/en_GB/groups.json | 7 ++++++- public/src/client/groups/details.js | 29 ++++++++++++++++++++++++++++- public/src/client/groups/list.js | 19 ++++++++++++++++++- src/groups.js | 2 +- src/socket.io/groups.js | 11 +++++++++++ 5 files changed, 64 insertions(+), 4 deletions(-) diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index 1dafb41ed6..f7ccec33bc 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -2,6 +2,8 @@ "groups": "Groups", "view_group": "View Group", "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", "details.title": "Group Details", "details.members": "Member List", @@ -11,5 +13,8 @@ "details.private": "Private Group", "details.public": "Public Group", - "details.owner_options": "Group Administration" + "details.owner_options": "Group Administration", + + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 0aacde97ce..d8d98a2edc 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -1,5 +1,5 @@ "use strict"; -/* globals define, socket, ajaxify, app */ +/* globals define, socket, ajaxify, app, bootbox */ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker'], function(iconSelect) { var Details = {}; @@ -38,6 +38,10 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker'], Details.update(); break; + case 'delete': + Details.deleteGroup(); + break; + case 'join': // intentional fall-throughs! case 'leave': case 'accept': @@ -118,10 +122,33 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker'], } else { ajaxify.refresh(); } + + app.alertSuccess('[[groups:event.updated'); }); }); } }; + Details.deleteGroup = function() { + bootbox.confirm('Are you sure you want to delete the group: ' + ajaxify.variables.get('group_name'), function(confirm) { + if (confirm) { + bootbox.prompt('Please enter the name of this group in order to delete it:', function(response) { + if (response === ajaxify.variables.get('group_name')) { + socket.emit('groups.delete', { + groupName: ajaxify.variables.get('group_name') + }, function(err) { + if (!err) { + app.alertSuccess('[[groups:event.deleted, ' + ajaxify.variables.get('group_name') + ']]'); + ajaxify.go('groups'); + } else { + app.alertError(err.message); + } + }); + } + }); + } + }); + }; + return Details; }); \ No newline at end of file diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index e7daf195f1..03243d6822 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -1,5 +1,5 @@ "use strict"; -/* globals define, ajaxify, socket */ +/* globals app, define, ajaxify, socket, bootbox */ define('forum/groups/list', function() { var Groups = {}; @@ -20,6 +20,23 @@ define('forum/groups/list', function() { } }); }); + + // Group creation + $('button[data-action="new"]').on('click', function() { + bootbox.prompt('Group Name:', function(name) { + if (name && name.length) { + socket.emit('groups.create', { + name: name + }, function(err) { + if (!err) { + ajaxify.go('groups/' + name); + } else { + app.alertError(err.message); + } + }); + } + }); + }); }; return Groups; diff --git a/src/groups.js b/src/groups.js index 333b823396..19560ca14c 100644 --- a/src/groups.js +++ b/src/groups.js @@ -386,7 +386,7 @@ var async = require('async'), var groupData = { name: data.name, userTitle: data.name, - description: data.description, + description: data.description || '', deleted: '0', hidden: '0', system: system ? '1' : '0', diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index c517cbabb2..3f3718d97f 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -101,6 +101,17 @@ SocketGroups.update = function(socket, data, callback) { }); }; +SocketGroups.create = function(socket, data, callback) { + if(!data) { + return callback(new Error('[[error:invalid-data]]')); + } else if (socket.uid === 0) { + return callback(new Error('[[error:no-privileges]]')); + } + + data.ownerUid = socket.uid; + groups.create(data, callback); +}; + SocketGroups.delete = function(socket, data, callback) { if(!data) { return callback(new Error('[[error:invalid-data]]')); From 8be98540625d03965b3b4f4514509f8fe2b741bc Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 12 Jan 2015 13:24:01 -0500 Subject: [PATCH 071/897] latest translations --- public/language/sv/email.json | 12 +++---- public/language/sv/error.json | 50 +++++++++++++-------------- public/language/sv/global.json | 6 ++-- public/language/sv/groups.json | 2 +- public/language/sv/modules.json | 6 ++-- public/language/sv/notifications.json | 6 ++-- public/language/sv/pages.json | 4 +-- public/language/sv/tags.json | 2 +- public/language/sv/topic.json | 16 ++++----- public/language/sv/user.json | 14 ++++---- 10 files changed, 59 insertions(+), 59 deletions(-) diff --git a/public/language/sv/email.json b/public/language/sv/email.json index 7fb193ba98..3b72de3280 100644 --- a/public/language/sv/email.json +++ b/public/language/sv/email.json @@ -9,15 +9,15 @@ "reset.text1": "Vi fick en förfrågan att återställa ditt lösenord, kanske för att du glömt det. Om det inte är så, så kan du ignorera det här epostmeddelandet. ", "reset.text2": "För att fortsätta med återställning av lösenordet så kan du klicka på följande länk:", "reset.cta": "Klicka här för att återställa ditt lösenord", - "digest.notifications": "You have unread notifications from %1:", + "digest.notifications": "Du har olästa notiser från %1:", "digest.latest_topics": "Senaste ämnen från %1", "digest.cta": "Klicka här för att besöka %1", "digest.unsub.info": "Det här meddelandet fick du på grund av dina inställningar för prenumeration. ", - "digest.no_topics": "There have been no active topics in the past %1", - "notif.chat.subject": "New chat message received from %1", - "notif.chat.cta": "Click here to continue the conversation", - "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "digest.no_topics": "Inga aktiva ämnen dom senaste %1", + "notif.chat.subject": "Nytt chatt-meddelande från %1", + "notif.chat.cta": "Klicka här för att fortsätta konversationen", + "notif.chat.unsub.info": "Denna chatt-notifikation skickades till dig på grund av dina inställningar för prenumerationer.", "test.text1": "\nDet här är ett textmeddelande som verifierar att eposten är korrekt installerat för din NodeBB. ", - "unsub.cta": "Click here to alter those settings", + "unsub.cta": "Klicka här för att ändra dom inställningarna", "closing": "Tack!" } \ No newline at end of file diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 8fb6b54577..506f8f5a83 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -13,55 +13,55 @@ "invalid-user-data": "Ogiltig användardata", "invalid-password": "Ogiltigt lösenord", "invalid-username-or-password": "Specificera både användarnamn och lösenord", - "invalid-search-term": "Invalid search term", + "invalid-search-term": "Ogiltig sökterm", "invalid-pagination-value": "Ogiltigt sidnummer", "username-taken": "Användarnamn upptaget", "email-taken": "Epostadress upptagen", - "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed": "Din epostadress är ännu inte bekräftad. Klicka här för att bekräfta din epostadress.", "username-too-short": "Användarnamnet är för kort", "username-too-long": "Användarnamnet är för långt", "user-banned": "Användare bannad", - "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post", - "no-category": "Category does not exist", - "no-topic": "Topic does not exist", - "no-post": "Post does not exist", - "no-group": "Group does not exist", - "no-user": "User does not exist", - "no-teaser": "Teaser does not exist", - "no-privileges": "You do not have enough privileges for this action.", + "user-too-new": "Tyvärr, du måste vänta %1 sekunder innan du kan skapa ditt första inlägg", + "no-category": "Kategorin hittades inte", + "no-topic": "Ämnet hittades inte", + "no-post": "Inlägget hittades inte", + "no-group": "Gruppen hittades inte", + "no-user": "Användaren hittades inte", + "no-teaser": "Förhandsvisningen hittades inte", + "no-privileges": "Du har inte tillräckliga rättigheter för den här åtgärden", "no-emailers-configured": "Inga tillägg för epostadress har laddats, så något textmeddelande kunde inte skickas", "category-disabled": "Kategorin inaktiverad", "topic-locked": "Ämnet låst", "still-uploading": "Vänta medan uppladdningen slutförs.", - "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", - "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", + "content-too-short": "Skriv ett längre inlägg. Inlägget måste ha minst %1 tecken.", + "title-too-short": "Skriv en längre rubrik. Rubriken måste ha minst %1 tecken.", "title-too-long": "Skriv in en kortare rubrik. Rubriker får inte vara längre än %1 tecken.", - "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", - "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", - "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", + "too-many-posts": "Du kan endast skapa inlägg var %1:e sekund - vänta ett tag innan du försöker skapa ett nytt inlägg", + "too-many-posts-newbie": "Som en ny användare kan du endast skapa nya inlägg var %1:e sekund tills du har %2 förtroende - vänta ett tag innan du försöker skapa ett nytt inlägg", + "file-too-big": "Maximal filstorlek är %1 kbs - var god ladda upp en mindre fil", "cant-vote-self-post": "Du kan in rösta på ditt eget inlägg.", - "already-favourited": "You have already favourited this post", - "already-unfavourited": "You have already unfavourited this post", + "already-favourited": "Du har redan favoriserat det här inlägget", + "already-unfavourited": "Du har redan avfavoriserat det här inlägget", "cant-ban-other-admins": "Du kan inte banna andra administratörer.", "invalid-image-type": "Ogiltigt bildformat", "group-name-too-short": "Gruppnamnet är för kort", "group-already-exists": "Gruppen existerar redan", "group-name-change-not-allowed": "Gruppnamnet får inte ändras", - "post-already-deleted": "This post has already been deleted", - "post-already-restored": "This post has already been restored", - "topic-already-deleted": "This topic has already been deleted", - "topic-already-restored": "This topic has already been restored", + "post-already-deleted": "Inlägget är redan raderat", + "post-already-restored": "Inlägget är redan återställt", + "topic-already-deleted": "Ämnet är redan raderat", + "topic-already-restored": "Ämnet är redan återställt", "topic-thumbnails-are-disabled": "Miniatyrbilder för ämnen är inaktiverat", "invalid-file": "Ogiltig fil", "uploads-are-disabled": "Uppladdningar är inaktiverat", "upload-error": "Fel vid uppladdning: %1", - "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", + "signature-too-long": "Signaturer kan tyvärr inte vara längre än %1 tecken.", "cant-chat-with-yourself": "Du kan inte chatta med dig själv.", - "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "chat-restricted": "Denna användaren har begränsat sina chatt-meddelanden. Användaren måste följa dig innan ni kan chatta med varann", "reputation-system-disabled": "Ryktessystemet är inaktiverat.", "downvoting-disabled": "Nedröstning är inaktiverat", "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet", - "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", + "not-enough-reputation-to-flag": "Du har inte tillräckligt förtroende för att flagga det här inlägget.", "reload-failed": "NodeBB stötte på problem med att ladda om: \"%1\". NodeBB kommer fortsätta servera den befintliga resurser till klienten, men du borde återställa det du gjorde alldeles innan du försökte ladda om.", - "registration-error": "Registration Error" + "registration-error": "Registreringsfel" } \ No newline at end of file diff --git a/public/language/sv/global.json b/public/language/sv/global.json index 408cbc0f0b..43cb2e1e79 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -71,7 +71,7 @@ "guest": "Anonym", "guests": "Anonyma", "updated.title": "Forum uppdaterades", - "updated.message": "Det här forumet har nu uppdaterats till senaste versionen. Klicka här för att åter hämta sidan.", - "privacy": "Privacy", - "delete_all": "Delete All" + "updated.message": "Det här forumet har nu uppdaterats till senaste versionen. Klicka här för att ladda om sidan.", + "privacy": "Integritet", + "delete_all": "Ta bort Alla" } \ No newline at end of file diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json index b333b857a4..03c57199f5 100644 --- a/public/language/sv/groups.json +++ b/public/language/sv/groups.json @@ -1,5 +1,5 @@ { - "groups": "Groups", + "groups": "Grupper", "view_group": "Visa grupp ", "details.title": "Detaljer för gruppen ", "details.members": "Medlemmar", diff --git a/public/language/sv/modules.json b/public/language/sv/modules.json index 89a6cdc618..cb61fddae5 100644 --- a/public/language/sv/modules.json +++ b/public/language/sv/modules.json @@ -12,9 +12,9 @@ "chat.message-history": "Historik för meddelande", "chat.pop-out": "Utskjutande chatt", "chat.maximize": "Maximera", - "chat.seven_days": "7 Days", - "chat.thirty_days": "30 Days", - "chat.three_months": "3 Months", + "chat.seven_days": "7 Dagar", + "chat.thirty_days": "30 Dagar", + "chat.three_months": "3 Månader", "composer.user_said_in": "%1 sa i %2:", "composer.user_said": "%1 sa:", "composer.discard": "Är du säker på att du vill förkasta det här inlägget?" diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index 364f40188d..eddc4f1ae0 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -11,12 +11,12 @@ "you_have_unread_notifications": "Du har olästa notiser.", "new_message_from": "Nytt medelande från %1", "upvoted_your_post_in": "%1 har röstat upp ditt inlägg i %2", - "moved_your_post": "%1 has moved your post.", - "moved_your_topic": "%1 has moved your topic.", + "moved_your_post": "%1 har flyttat ditt inlägg.", + "moved_your_topic": "%1 har flyttat ditt ämne.", "favourited_your_post_in": "%1 har favoriserat ditt inlägg i %2.", "user_flagged_post_in": "%1 flaggade ett inlägg i %2", "user_posted_to": "%1 har skrivit ett svar på: %2", - "user_posted_topic": "%1 has posted a new topic: %2", + "user_posted_topic": "%1 har skapat ett nytt ämne: %2", "user_mentioned_you_in": "%1 nämnde dig i %2", "user_started_following_you": "%1 började följa dig.", "email-confirmed": "Epost bekräftad", diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json index cf041ca1bc..2082249d8c 100644 --- a/public/language/sv/pages.json +++ b/public/language/sv/pages.json @@ -13,6 +13,6 @@ "user.topics": "Ämnen skapade av %1", "user.favourites": "%1's favorit-inlägg", "user.settings": "Avnändarinställningar", - "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", - "maintenance.messageIntro": "Additionally, the administrator has left this message:" + "maintenance.text": "%1 genomgår underhåll just nu. Vänligen kom tillbaka lite senare.", + "maintenance.messageIntro": "Ytterligare så lämnade administratören detta meddelande:" } \ No newline at end of file diff --git a/public/language/sv/tags.json b/public/language/sv/tags.json index e2e8199384..09f84c36b9 100644 --- a/public/language/sv/tags.json +++ b/public/language/sv/tags.json @@ -2,6 +2,6 @@ "no_tag_topics": "Det finns inga ämnen med detta märkord.", "tags": "Märkord", "enter_tags_here": "Skriv in märkord här. Tryck på enter efter varje märkord.", - "enter_tags_here_short": "Enter tags...", + "enter_tags_here_short": "Ange taggar...", "no_tags": "Det finns inga märkord ännu." } \ No newline at end of file diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 21cda10ea5..a49071f1b6 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -27,17 +27,17 @@ "flag_title": "Rapportera detta inlägg för granskning", "flag_confirm": "Är du säker på att du vill flagga det här inlägget?", "flag_success": "Det här inlägget har flaggats för moderering.", - "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", + "deleted_message": "Det här ämnet har raderats. Endast användare med ämneshanterings-privilegier kan se det.", "following_topic.message": "Du kommer nu få notiser när någon gör inlägg i detta ämne.", "not_following_topic.message": "Du kommer inte längre få notiser från detta ämne.", "login_to_subscribe": "Var god registrera eller logga in för att kunna prenumerera på detta ämne.", "markAsUnreadForAll.success": "Ämne markerat som oläst av alla.", "watch": "Följ", - "unwatch": "Unwatch", + "unwatch": "Sluta bevaka", "watch.title": "Få notis om nya svar till det här ämnet", - "unwatch.title": "Stop watching this topic", + "unwatch.title": "Sluta bevaka detta ämne", "share_this_post": "Dela detta inlägg", - "thread_tools.title": "Topic Tools", + "thread_tools.title": "Ämnesverktyg", "thread_tools.markAsUnreadForAll": "Markera som oläst", "thread_tools.pin": "Fäst ämne", "thread_tools.unpin": "Lösgör ämne", @@ -47,11 +47,11 @@ "thread_tools.move_all": "Flytta alla.", "thread_tools.fork": "Grena ämne", "thread_tools.delete": "Ta bort ämne", - "thread_tools.delete_confirm": "Are you sure you want to delete this topic?", + "thread_tools.delete_confirm": "Är du säker på att du vill ta bort det här ämnet?", "thread_tools.restore": "Återställ ämne", - "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", + "thread_tools.restore_confirm": "Är du säker på att du vill återställa det här ämnet?", "thread_tools.purge": "Rensa ämne", - "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", + "thread_tools.purge_confirm": "Är du säker att du vill rensa ut det här ämnet?", "topic_move_success": "Det här ämnet har flyttats till %1", "post_delete_confirm": "Är du säker på att du vill ta bort det här inlägget?", "post_restore_confirm": "Är du säker på att du vill återställa det här inlägget?", @@ -72,7 +72,7 @@ "topic_will_be_moved_to": "Detta ämne kommer bli flytta till kategori", "fork_topic_instruction": "Klicka på de inlägg du vill grena", "fork_no_pids": "Inga inlägg valda!", - "fork_success": "Successfully forked topic! Click here to go to the forked topic.", + "fork_success": "Ämnet har blivit förgrenat. Klicka här för att gå till det förgrenade ämnet.", "composer.title_placeholder": "Skriv in ämnets titel här...", "composer.discard": "Avbryt", "composer.submit": "Spara", diff --git a/public/language/sv/user.json b/public/language/sv/user.json index b019d5fc04..b8727afa48 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -5,7 +5,7 @@ "email": "Epost", "confirm_email": "Bekräfta epostadress ", "delete_account": "Ta bort ämne", - "delete_account_confirm": "Are you sure you want to delete your account?
    This action is irreversible and you will not be able to recover any of your data

    Enter your username to confirm that you wish to destroy this account.", + "delete_account_confirm": "Är du säker på att du vill radera ditt konto?
    Denna åtgärd går inte att ångra och du kommer inte kunna återställa ditt konto

    Skriv in ditt användarnamn för att bekräfta att du vill radera ditt konto.", "fullname": "Hela namnet", "website": "Webbsida", "location": "Plats", @@ -29,7 +29,7 @@ "edit": "Ändra", "uploaded_picture": "Uppladdad bild", "upload_new_picture": "Ladda upp ny bild", - "upload_new_picture_from_url": "Upload New Picture From URL", + "upload_new_picture_from_url": "Ladda Upp Ny Bild Från Länk", "current_password": "Nuvarande lösenord", "change_password": "Ändra lösenord", "change_password_error": "Ogiltigt lösenord.", @@ -47,15 +47,15 @@ "max": "max", "settings": "Inställningar", "show_email": "Visa min epost", - "show_fullname": "Show My Full Name", - "restrict_chats": "Only allow chat messages from users I follow", + "show_fullname": "Visa Fullständigt Namn", + "restrict_chats": "Tillåt endast chatt-meddelanden från användare som jag följer", "digest_label": "Prenumerera på sammanställt flöde", "digest_description": "Prenumerera på epostuppdateringar för det här forumet (notiser och ämnen) med en viss regelbundenhet", "digest_off": "Avslagen", "digest_daily": "Daligen", "digest_weekly": "Veckovis", "digest_monthly": "Månadsvis", - "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_chat_notifications": "Skicka ett epostmeddelande om nya chatt-meddelanden tas emot när jag inte är online.", "has_no_follower": "Denna användare har inga följare :(", "follows_no_one": "Denna användare följer ingen :(", "has_no_posts": "Denna användare har inte gjort några inlägg än.", @@ -68,8 +68,8 @@ "notification_sounds": "Spela ett ljud när du får en notis.", "browsing": "Inställning för bläddring", "open_links_in_new_tab": "Öppna utgående länkar på ny flik?", - "enable_topic_searching": "Enable In-Topic Searching", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", + "enable_topic_searching": "Aktivera Sökning Inom Ämne", + "topic_search_help": "Om aktiverat kommer sökning inom ämne överskrida webbläsarens vanliga sid-sökfunktion och tillåta dig att söka genom hela ämnet istället för det som endast visas på skärmen.", "follow_topics_you_reply_to": "Följ ämnen so du svarat på.", "follow_topics_you_create": "Följ ämnen du skapat." } \ No newline at end of file From f417e07b9d56efb6cd618a2b2a42f1eafa7ffb1f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 15:57:45 -0500 Subject: [PATCH 072/897] user search changes --- public/language/en_GB/user.json | 2 + public/language/en_GB/users.json | 5 +- public/src/admin/manage/groups.js | 2 +- public/src/admin/manage/users.js | 2 +- public/src/client/users.js | 126 ++++++++++++-------- src/controllers/users.js | 53 ++++++--- src/posts/user.js | 2 +- src/socket.io/admin/user.js | 2 +- src/socket.io/user.js | 16 ++- src/user.js | 8 +- src/user/search.js | 191 +++++++++++++++++++++++++----- src/views/admin/settings/user.tpl | 13 ++ 12 files changed, 309 insertions(+), 113 deletions(-) diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json index eaf15bff36..211d6907ab 100644 --- a/public/language/en_GB/user.json +++ b/public/language/en_GB/user.json @@ -2,6 +2,8 @@ "banned": "Banned", "offline": "Offline", "username": "User Name", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Confirm Email", diff --git a/public/language/en_GB/users.json b/public/language/en_GB/users.json index fa46c52cdd..683ad7e155 100644 --- a/public/language/en_GB/users.json +++ b/public/language/en_GB/users.json @@ -5,5 +5,8 @@ "search": "Search", "enter_username": "Enter a username to search", "load_more": "Load More", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index 61e1e3b0f8..4ab72c8570 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -150,7 +150,7 @@ define('admin/manage/groups', [ var searchText = groupDetailsSearch.val(), foundUser; - socket.emit('admin.user.search', {type: 'username', query:searchText}, function(err, results) { + socket.emit('admin.user.search', {query: searchText}, function(err, results) { if (!err && results && results.users.length > 0) { var numResults = results.users.length, x; if (numResults > 4) { diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index 75ab7e224c..e2b5a8f408 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -237,7 +237,7 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable) timeoutId = setTimeout(function() { $('.fa-spinner').removeClass('hidden'); - socket.emit('admin.user.search', {type: type, query: $this.val()}, function(err, data) { + socket.emit('admin.user.search', {searchBy: [type], query: $this.val()}, function(err, data) { if (err) { return app.alertError(err.message); } diff --git a/public/src/client/users.js b/public/src/client/users.js index 67d51dc052..c19c69afe6 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -86,65 +86,93 @@ define('forum/users', function() { function handleSearch() { var timeoutId = 0; - var lastSearch = null; $('#search-user').on('keyup', function() { - if (timeoutId !== 0) { + if (timeoutId) { clearTimeout(timeoutId); timeoutId = 0; } - timeoutId = setTimeout(function() { - function reset() { - notify.html(''); - notify.parent().removeClass('btn-warning label-warning btn-success label-success'); - } - var username = $('#search-user').val(); - var notify = $('#user-notfound-notify'); - - if (username === '') { - notify.html(''); - notify.parent().removeClass('btn-warning label-warning btn-success label-success'); - return; - } - - if (lastSearch === username) { - return; - } - lastSearch = username; - - notify.html(''); - - socket.emit('user.search', {query: username, by: $('.search select').val()}, function(err, data) { - if (err) { - reset(); - return app.alertError(err.message); - } + timeoutId = setTimeout(doSearch, 250); + }); - if (!data) { - return reset(); - } + $('.search select, .search .checkbox input').on('change', function() { + console.log('doing search'); + doSearch(); + }); - templates.parse('users', 'users', data, function(html) { - translator.translate(html, function(translated) { - $('#users-container').html(translated); - - if (!data.users.length) { - translator.translate('[[error:no-user]]', function(translated) { - notify.html(translated); - notify.parent().addClass('btn-warning label-warning'); - }); - } else { - translator.translate('[[users:users-found-search-took, ' + data.users.length + ', ' + data.timing + ']]', function(translated) { - notify.html(translated); - notify.parent().addClass('btn-success label-success'); - }); - } - }); - }); + $('.pagination').on('click', 'a', function() { + console.log('loading page', $(this).attr('data-page')); + doSearch($(this).attr('data-page')); + return false; + }) + } + + function doSearch(page) { + function reset() { + notify.html(''); + notify.parent().removeClass('btn-warning label-warning btn-success label-success'); + } + + var username = $('#search-user').val(); + var notify = $('#user-notfound-notify'); + page = page || 1; + if (!username) { + notify.html(''); + notify.parent().removeClass('btn-warning label-warning btn-success label-success'); + return; + } + + notify.html(''); + var filters = []; + $('.user-filter').each(function() { + var $this = $(this); + if($this.is(':checked')) { + filters.push({ + field:$this.attr('data-filter-field'), + type: $this.attr('data-filter-type'), + value: $this.attr('data-filter-value') }); + } + }); + + socket.emit('user.search', { + query: username, + page: page, + searchBy: ['username', 'fullname'], + sortBy: $('.search select').val(), + filterBy: filters + }, function(err, data) { + if (err) { + reset(); + return app.alertError(err.message); + } + + if (!data) { + return reset(); + } + + templates.parse('users', 'pages', data, function(html) { + $('.pagination').html(html); + }); + + templates.parse('users', 'users', data, function(html) { + translator.translate(html, function(translated) { + $('#users-container').html(translated); - }, 250); + if (!data.users.length) { + translator.translate('[[error:no-user]]', function(translated) { + notify.html(translated); + notify.parent().removeClass('btn-success label-success').addClass('btn-warning label-warning'); + }); + } else { + translator.translate('[[users:users-found-search-took, ' + data.matchCount + ', ' + data.timing + ']]', function(translated) { + notify.html(translated); + notify.parent().removeClass('btn-warning label-warning').addClass('btn-success label-success'); + }); + } + }); + }); }); } diff --git a/src/controllers/users.js b/src/controllers/users.js index 626d69da4a..107c64a166 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -4,6 +4,7 @@ var usersController = {}; var async = require('async'), user = require('../user'), + meta = require('../meta'), db = require('../database'); usersController.getOnlineUsers = function(req, res, next) { @@ -59,41 +60,57 @@ usersController.getUsersSortedByJoinDate = function(req, res, next) { }; function getUsers(set, res, next) { + getUsersAndCount(set, 50, function(err, data) { + if (err) { + return next(err); + } + var userData = { + search_display: 'hidden', + loadmore_display: data.count > 50 ? 'block' : 'hide', + users: data.users, + show_anon: 'hide' + }; + + res.render('users', userData); + }); +} + +function getUsersAndCount(set, count, callback) { async.parallel({ users: function(next) { - user.getUsersFromSet(set, 0, 49, next); + user.getUsersFromSet(set, 0, count - 1, next); }, count: function(next) { db.getObjectField('global', 'userCount', next); } }, function(err, results) { if (err) { - return next(err); + return callback(err); } results.users = results.users.filter(function(user) { return user && parseInt(user.uid, 10); }); - var userData = { - search_display: 'hidden', - loadmore_display: results.count > 50 ? 'block' : 'hide', - users: results.users, - show_anon: 'hide' - }; - - res.render('users', userData); + callback(null, {users: results.users, count: results.count}); }); } usersController.getUsersForSearch = function(req, res, next) { - var data = { - search_display: 'block', - loadmore_display: 'hidden', - users: [], - show_anon: 'hide' - }; - - res.render('users', data); + var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20; + getUsersAndCount('users:joindate', resultsPerPage, function(err, data) { + if (err) { + return next(err); + } + + var result = { + search_display: 'block', + loadmore_display: 'hidden', + users: data.users, + show_anon: 'hide' + }; + + res.render('users', result); + }); }; diff --git a/src/posts/user.js b/src/posts/user.js index fcfcd8643b..555b60e46d 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -32,7 +32,7 @@ module.exports = function(Posts) { var userData = results.userData; for(var i=0; i resultsPerPage) { + pageCount = Math.ceil(matchCount / resultsPerPage); + var currentPage = Math.max(1, Math.ceil((start + 1) / resultsPerPage)); + for(var i=1; i<=pageCount; ++i) { + pages.push({page: i, active: i === currentPage}); + } + } + + var diff = process.hrtime(startTime); + var timing = (diff[0] * 1e3 + diff[1] / 1e6).toFixed(1); + next(null, { + timing: timing, + users: userData, + matchCount: matchCount, + pages: pages + }); + } + ], callback); + }; - db.getObject(key, function(err, hash) { - if (err || !hash) { - return callback(null, {timing: 0, users:[]}); + function findUids(query, keys, startsWith, callback) { + db.getObjects(keys, function(err, hashes) { + if (err || !hashes) { + return callback(err, []); } + hashes = hashes.filter(Boolean); + query = query.toLowerCase(); - var values = Object.keys(hash); var uids = []; + var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20; + var hardCap = resultsPerPage * 10; - for(var i=0; i= hardCap) { + break; + } } - } else if (values[i].toLowerCase().indexOf(query) !== -1) { - uids.push(values[i]); + } + + if (uids.length >= hardCap) { + break; } } - uids = uids.slice(0, 20) - .sort(function(a, b) { - return a > b; - }) - .map(function(username) { - return hash[username]; + if (hashes.length > 1) { + uids = uids.filter(function(uid, index, array) { + return array.indexOf(uid) === index; }); + } + + callback(null, uids); + }); + } + + function filterAndSortUids(uids, filterBy, sortBy, callback) { + sortBy = sortBy || 'joindate'; - User.getUsers(uids, function(err, userdata) { - if (err) { - return callback(err); + var fields = filterBy.map(function(filter) { + return filter.field; + }).concat(['uid', sortBy]).filter(function(field, index, array) { + return array.indexOf(field) === index; + }); + + async.parallel({ + userData: function(next) { + user.getMultipleUserFields(uids, fields, next); + }, + isOnline: function(next) { + if (fields.indexOf('status') !== -1) { + require('../socket.io').isUsersOnline(uids, next); + } else { + next(); } + } + }, function(err, results) { + if (err) { + return callback(err); + } + var userData = results.userData; - var diff = process.hrtime(start); - var timing = (diff[0] * 1e3 + diff[1] / 1e6).toFixed(1); - callback(null, {timing: timing, users: userdata}); + if (results.isOnline) { + userData.forEach(function(userData, index) { + userData.status = user.getStatus(userData.status, results.isOnline[index]); + }); + } + + userData = filterUsers(userData, filterBy); + + sortUsers(userData, sortBy); + + uids = userData.map(function(user) { + return user && user.uid; }); + callback(null, uids); }); - }; + } + + function filterUsers(userData, filterBy) { + function passesFilter(user, filter) { + if (!user || !filter) { + return false; + } + var userValue = user[filter.field]; + if (filter.type === '=') { + return userValue === filter.value; + } else if (filter.type === '!=') { + return userValue !== filter.value; + } + return false; + } + + if (!filterBy.length) { + return userData; + } + + return userData.filter(function(user) { + for(var i=0; i user2[sortBy]) { + return 1; + } + return 0; + } + }); + } function searchByIP(ip, callback) { var start = process.hrtime(); diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl index b76f04476e..5f1bfd11f9 100644 --- a/src/views/admin/settings/user.tpl +++ b/src/views/admin/settings/user.tpl @@ -141,4 +141,17 @@
    +
    +
    User Search
    +
    + +
    + + +
    + + +
    +
    + \ No newline at end of file From 08c1dad3ee5867930c247448ffc1998c49100a2d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 16:57:18 -0500 Subject: [PATCH 073/897] topics.isFollowing works with multiple tids now --- public/language/en_GB/global.json | 3 ++- public/src/ajaxify.js | 2 +- public/src/app.js | 3 ++- src/threadTools.js | 6 +++--- src/topics.js | 4 ++-- src/topics/follow.js | 12 +++++++++--- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/public/language/en_GB/global.json b/public/language/en_GB/global.json index a373c7a4d3..78998f6f0e 100644 --- a/public/language/en_GB/global.json +++ b/public/language/en_GB/global.json @@ -98,6 +98,7 @@ "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.", "privacy": "Privacy", - + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 8a5fa5b4fa..d53c89b651 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -115,7 +115,7 @@ $(document).ready(function() { ajaxify.variables.parse(); ajaxify.widgets.render(tpl_url, url, function() { - $(window).trigger('action:ajaxify.end', {url: url}); + $(window).trigger('action:ajaxify.end', {url: url, tpl_url: tpl_url}); }); $(window).trigger('action:ajaxify.contentLoaded', {url: url}); diff --git a/public/src/app.js b/public/src/app.js index a77200fdd9..a3d8fa62ca 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -539,7 +539,8 @@ app.uid = null; ajaxify.widgets.render(tpl_url, url, function() { app.processPage(); $window.trigger('action:ajaxify.end', { - url: url + url: url, + tpl_url: tpl_url }); }); }); diff --git a/src/threadTools.js b/src/threadTools.js index 8e622ce4a0..74b316f987 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -239,11 +239,11 @@ var winston = require('winston'), if (!exists) { return next(new Error('[[error:no-topic]]')); } - topics.isFollowing(tid, uid, next); + topics.isFollowing([tid], uid, next); }, function (isFollowing, next) { - db[isFollowing ? 'setRemove' : 'setAdd']('tid:' + tid + ':followers', uid, function(err) { - next(err, !isFollowing); + db[isFollowing[0] ? 'setRemove' : 'setAdd']('tid:' + tid + ':followers', uid, function(err) { + next(err, !isFollowing[0]); }); } ], callback); diff --git a/src/topics.js b/src/topics.js index a296bb1a30..d7b1b04c7d 100644 --- a/src/topics.js +++ b/src/topics.js @@ -234,7 +234,7 @@ var async = require('async'), category: async.apply(Topics.getCategoryData, tid), threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', []), tags: async.apply(Topics.getTopicTagsObjects, tid), - isFollowing: async.apply(Topics.isFollowing, tid, uid) + isFollowing: async.apply(Topics.isFollowing, [tid], uid) }, function(err, results) { if (err) { return callback(err); @@ -244,7 +244,7 @@ var async = require('async'), topicData.category = results.category; topicData.thread_tools = results.threadTools; topicData.tags = results.tags; - topicData.isFollowing = results.isFollowing; + topicData.isFollowing = results.isFollowing[0]; topicData.unreplied = parseInt(topicData.postcount, 10) === 1; topicData.deleted = parseInt(topicData.deleted, 10) === 1; diff --git a/src/topics/follow.js b/src/topics/follow.js index 6a0e2b97f8..b79e513c07 100644 --- a/src/topics/follow.js +++ b/src/topics/follow.js @@ -14,11 +14,17 @@ var async = require('async'), module.exports = function(Topics) { - Topics.isFollowing = function(tid, uid, callback) { + Topics.isFollowing = function(tids, uid, callback) { + if (!Array.isArray(tids)) { + return callback(); + } if (!parseInt(uid, 10)) { - return callback(null, false); + return callback(null, tids.map(function() { return false; })); } - db.isSetMember('tid:' + tid + ':followers', uid, callback); + var keys = tids.map(function(tid) { + return 'tid:' + tid + ':followers'; + }) + db.isMemberOfSets(keys, uid, callback); }; Topics.getFollowers = function(tid, callback) { From 456b844e61fccc561e2b1204d08b9c139dac7d6f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 17:33:11 -0500 Subject: [PATCH 074/897] closes #2596 --- public/language/en_GB/error.json | 6 +++-- public/language/en_GB/uploads.json | 5 ++++ public/src/modules/uploader.js | 12 ++++----- src/controllers/accounts.js | 17 ++++++------- src/controllers/admin/uploads.js | 40 ++++++++++++++---------------- src/socket.io/user.js | 2 +- 6 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 public/language/en_GB/uploads.json diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 4efb4cd52f..251db61998 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -59,7 +59,8 @@ "cant-ban-other-admins": "You can't ban other admins!", - "invalid-image-type": "Invalid image type", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", @@ -88,5 +89,6 @@ "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/en_GB/uploads.json b/public/language/en_GB/uploads.json new file mode 100644 index 0000000000..5dc53ede1f --- /dev/null +++ b/public/language/en_GB/uploads.json @@ -0,0 +1,5 @@ +{ + "uploading-file" : "Uploading the file...", + "select-file-to-upload": "Select a file to upload!", + "upload-success": "File uploaded successfully!" +} \ No newline at end of file diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index 91eb439a25..d2f7612c0e 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -30,16 +30,16 @@ define('uploader', ['csrf'], function(csrf) { function showAlert(type, message) { module.hideAlerts(); - uploadModal.find('#alert-' + type).text(message).removeClass('hide'); + uploadModal.find('#alert-' + type).translateText(message).removeClass('hide'); } - showAlert('status', 'uploading the file ...'); + showAlert('status', '[[uploads:uploading-file]]'); uploadModal.find('#upload-progress-bar').css('width', '0%'); uploadModal.find('#upload-progress-box').show().removeClass('hide'); if (!$('#userPhotoInput').val()) { - showAlert('error', 'select an image to upload!'); + showAlert('error', '[[uploads:select-file-to-upload]]'); return false; } @@ -49,7 +49,7 @@ define('uploader', ['csrf'], function(csrf) { }, error: function(xhr) { xhr = maybeParse(xhr); - showAlert('error', 'Error: ' + xhr.status); + showAlert('error', xhr.responseJSON.error); }, uploadProgress: function(event, position, total, percent) { @@ -66,7 +66,7 @@ define('uploader', ['csrf'], function(csrf) { callback(response[0].url); - showAlert('success', 'File uploaded successfully!'); + showAlert('success', '[[uploads:upload-success]]'); setTimeout(function() { module.hideAlerts(); uploadModal.modal('hide'); @@ -83,7 +83,7 @@ define('uploader', ['csrf'], function(csrf) { try { return $.parseJSON(response); } catch (e) { - return {error: 'Something went wrong while parsing server response'}; + return {error: '[[error:parse-error]]'}; } } return response; diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 69ea848ec0..fd972ccd3b 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -395,25 +395,19 @@ accountsController.uploadPicture = function (req, res, next) { if (userPhoto.size > uploadSize * 1024) { fs.unlink(userPhoto.path); - return res.json({ - error: 'Images must be smaller than ' + uploadSize + ' kb!' - }); + return next(new Error('[[error:file-too-big, ' + uploadSize + ']]')); } var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif']; if (allowedTypes.indexOf(userPhoto.type) === -1) { fs.unlink(userPhoto.path); - return res.json({ - error: 'Allowed image types are png, jpg and gif!' - }); + return next(new Error('[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]')); } var extension = path.extname(userPhoto.name); if (!extension) { fs.unlink(userPhoto.path); - return res.json({ - error: 'Error uploading file! Error : Invalid extension!' - }); + return next(new Error('[[error:invalid-image-extension]]')); } var updateUid = req.user ? req.user.uid : 0; @@ -465,7 +459,7 @@ accountsController.uploadPicture = function (req, res, next) { if (err) { fs.unlink(userPhoto.path); - return res.json({error:err.message}); + return next(err); } if (plugins.hasListeners('filter:uploadImage')) { @@ -476,6 +470,9 @@ accountsController.uploadPicture = function (req, res, next) { var filename = updateUid + '-profileimg' + (convertToPNG ? '.png' : extension); user.getUserField(updateUid, 'uploadedpicture', function (err, oldpicture) { + if (err) { + return next(err); + } if (!oldpicture) { file.saveFileToLocal(filename, 'profile', userPhoto.path, done); return; diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js index 0b7ece2775..9ba3ad049c 100644 --- a/src/controllers/admin/uploads.js +++ b/src/controllers/admin/uploads.js @@ -16,16 +16,13 @@ uploadsController.uploadCategoryPicture = function(req, res, next) { try { params = JSON.parse(req.body.params); } catch (e) { - var err = { - error: 'Error uploading file! Error :' + e.message - }; fs.unlink(uploadedFile.path); - return res.send(req.xhr ? err : JSON.stringify(err)); + return next(e); } - if (validateUpload(req, res, uploadedFile, allowedTypes)) { + if (validateUpload(req, res, next, uploadedFile, allowedTypes)) { var filename = 'category-' + params.cid + path.extname(uploadedFile.name); - uploadImage(filename, 'category', uploadedFile, req, res); + uploadImage(filename, 'category', uploadedFile, req, res, next); } }; @@ -33,13 +30,14 @@ uploadsController.uploadFavicon = function(req, res, next) { var uploadedFile = req.files.files[0]; var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon']; - if (validateUpload(res, req, uploadedFile, allowedTypes)) { + if (validateUpload(res, req, next, uploadedFile, allowedTypes)) { file.saveFileToLocal('favicon.ico', 'files', uploadedFile.path, function(err, image) { fs.unlink(uploadedFile.path); + if (err) { + return next(err); + } - var response = err ? {error: err.message} : [{name: uploadedFile.name, url: image.url}]; - - res.send(req.xhr ? response : JSON.stringify(response)); + res.json([{name: uploadedFile.name, url: image.url}]); }); } }; @@ -55,33 +53,31 @@ uploadsController.uploadGravatarDefault = function(req, res, next) { function upload(name, req, res, next) { var uploadedFile = req.files.files[0]; var allowedTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif']; - if (validateUpload(req, res, uploadedFile, allowedTypes)) { + if (validateUpload(req, res, next, uploadedFile, allowedTypes)) { var filename = name + path.extname(uploadedFile.name); - uploadImage(filename, 'files', uploadedFile, req, res); + uploadImage(filename, 'files', uploadedFile, req, res, next); } } -function validateUpload(req, res, uploadedFile, allowedTypes) { +function validateUpload(req, res, next, uploadedFile, allowedTypes) { if (allowedTypes.indexOf(uploadedFile.type) === -1) { - var err = { - error: 'Invalid image type. Allowed types are: ' + allowedTypes.join(', ') - }; - fs.unlink(uploadedFile.path); - res.send(req.xhr ? err : JSON.stringify(err)); + + next(new Error('[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]')); return false; } return true; } -function uploadImage(filename, folder, uploadedFile, req, res) { +function uploadImage(filename, folder, uploadedFile, req, res, next) { function done(err, image) { fs.unlink(uploadedFile.path); + if (err) { + return next(err); + } - var response = err ? {error: err.message} : [{name: uploadedFile.name, url: image.url}]; - - res.send(req.xhr ? response : JSON.stringify(response)); + res.json([{name: uploadedFile.name, url: image.url}]); } if (plugins.hasListeners('filter:uploadImage')) { diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 3620800e7a..023a823f88 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -166,7 +166,7 @@ SocketUser.changePicture = function(socket, data, callback) { } else if (type === 'uploaded') { type = 'uploadedpicture'; } else { - return callback(new Error('[[error:invalid-image-type]]')); + return callback(new Error('[[error:invalid-image-type, ' + ['gravatar', 'uploadedpicture'].join(', ') + ']]')); } if (socket.uid === parseInt(data.uid, 10)) { From bbfec7d443b08cde2167e11ea14130495b4ff60f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 17:54:07 -0500 Subject: [PATCH 075/897] fix post index parse --- public/src/ajaxify.js | 4 ++-- public/src/app.js | 3 ++- public/src/client/recent.js | 2 +- public/src/client/topic.js | 5 ++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index d53c89b651..e6cce7a920 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -53,8 +53,6 @@ $(document).ready(function() { $(window).off('scroll'); - $(window).trigger('action:ajaxify.start', {url: url}); - if ($('#content').hasClass('ajaxifying') && apiXHR) { apiXHR.abort(); } @@ -64,6 +62,8 @@ $(document).ready(function() { var tpl_url = ajaxify.getTemplateMapping(url); + $(window).trigger('action:ajaxify.start', {url: url, tpl_url: tpl_url}); + var hash = ''; if(ajaxify.initialLoad) { hash = window.location.hash ? window.location.hash : ''; diff --git a/public/src/app.js b/public/src/app.js index a3d8fa62ca..ea567e239e 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -497,7 +497,8 @@ app.uid = null; $window.trigger('action:ajaxify.start', { - url: url + url: url, + tpl_url: tpl_url }); collapseNavigationOnClick(); diff --git a/public/src/client/recent.js b/public/src/client/recent.js index fc591fbb3b..5b6a4d7527 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -9,7 +9,7 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) { newPostCount = 0; $(window).on('action:ajaxify.start', function(ev, data) { - if(data.url.indexOf('recent') !== 0) { + if (data.tpl_url !== 'recent') { Recent.removeListeners(); } }); diff --git a/public/src/client/topic.js b/public/src/client/topic.js index e1d3a1a153..1d5e16ce7e 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -105,7 +105,10 @@ define('forum/topic', [ function getPostIndex() { var parts = window.location.pathname.split('/'); - return parts[parts.length - 1] ? parseInt(parts[parts.length - 1], 10) : 0; + if (parts[parts.length - 1] && utils.isNumber(parts[parts.length - 1])) { + return parseInt(parts[parts.length - 1], 10) + } + return 0; } function addBlockQuoteHandler() { From 200f74f1c7f53fe1231d357fbf337f81b8ec9902 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 18:16:34 -0500 Subject: [PATCH 076/897] closes #2592 --- public/src/ajaxify.js | 10 +++++++--- public/src/client/topic.js | 4 ++-- public/src/modules/navigator.js | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index e6cce7a920..cc7c0cbff1 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -38,11 +38,15 @@ $(document).ready(function() { app.previousUrl = url; return ajaxify.go('login'); } else if (status === 302) { - if (!ajaxify.go(data.responseJSON.path, callback, quiet)) { - window.location.href = data.responseJSON.path; + if (data.responseJSON.path) { + if (!ajaxify.go(data.responseJSON.path, callback, quiet)) { + window.location.href = data.responseJSON.path; + } + } else if (data.responseJSON) { + ajaxify.go(data.responseJSON.slice(1), callback, quiet); } } - } else if (textStatus !== "abort") { + } else if (textStatus !== 'abort') { app.alertError(data.responseJSON.error); } } diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 1d5e16ce7e..40c1a84e13 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -76,9 +76,9 @@ define('forum/topic', [ Topic.toBottom = function() { socket.emit('topics.postcount', ajaxify.variables.get('topic_id'), function(err, postCount) { if (config.topicPostSort !== 'oldest_to_newest') { - postCount = 1; + postCount = 2; } - navigator.scrollBottom(postCount - 1); + navigator.scrollBottom(postCount); }); }; diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index b35a06c666..43b355ccf8 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -137,7 +137,7 @@ define('navigator', ['forum/pagination'], function(pagination) { if ($('li[data-index="' + index + '"]').length) { navigator.scrollToPost(index, true); } else { - index = parseInt(index, 10) + 1; + index = parseInt(index, 10); ajaxify.go(generateUrl(index)); } }; From 05894d14c61fec589077d40500c2ecb696d3cfe3 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 18:28:47 -0500 Subject: [PATCH 077/897] closes #2151 --- src/middleware/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/middleware/index.js b/src/middleware/index.js index 487bda3592..c7358ca5ac 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -68,10 +68,11 @@ module.exports = function(app) { app.use(function (req, res, next) { res.setHeader('X-Powered-By', 'NodeBB'); - res.setHeader('X-Frame-Options', 'SAMEORIGIN'); if (meta.config['allow-from-uri']) { - res.setHeader('ALLOW-FROM', meta.config['allow-from-uri']); + res.setHeader('X-Frame-Options', 'ALLOW-FROM ' + meta.config['allow-from-uri']); + } else { + res.setHeader('X-Frame-Options', 'SAMEORIGIN'); } next(); From 1f674f10e2f5734b0f078f56fd9fc695dbe900c3 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 18:35:28 -0500 Subject: [PATCH 078/897] added before to hash test --- tests/database/hash.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/database/hash.js b/tests/database/hash.js index 1478f401a1..d35666bf53 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -10,9 +10,17 @@ describe('Hash methods', function() { age: 99 }; + before(function(done) { + db.setObject('testObject1', testData, function(err) { + assert.equal(err, null); + assert.equal(arguments.length, 1); + done(); + }); + }) + describe('setObject()', function() { it('should create a object', function(done) { - db.setObject('testObject1', testData, function(err) { + db.setObject('testObject2', testData, function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); done(); From 02dbce57fbfe0ab5eb93b52f9b01d7db8198b168 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 18:52:41 -0500 Subject: [PATCH 079/897] relative path fix missing ; --- public/src/modules/navigator.js | 3 ++- src/middleware/middleware.js | 9 +++------ tests/database/hash.js | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 43b355ccf8..1b039d9b60 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -60,7 +60,8 @@ define('navigator', ['forum/pagination'], function(pagination) { }; function generateUrl(index) { - var parts = window.location.pathname.split('/'); + var pathname = window.location.pathname.replace(config.relative_path, ''); + var parts = pathname.split('/'); return parts[1] + '/' + parts[2] + '/' + parts[3] + (index ? '/' + index : ''); } diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index be112f810f..334e6d0b5a 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -83,7 +83,7 @@ middleware.addSlug = function(req, res, next) { return next(err); } - var url = name + encodeURI(slug); + var url = nconf.get('relative_path') + name + encodeURI(slug); if (res.locals.isAPI) { res.status(302).json(url); @@ -95,13 +95,10 @@ middleware.addSlug = function(req, res, next) { if (!req.params.slug) { if (req.params.category_id) { - redirect(categories.getCategoryField, req.params.category_id, '/category/'); + return redirect(categories.getCategoryField, req.params.category_id, '/category/'); } else if (req.params.topic_id) { - redirect(topics.getTopicField, req.params.topic_id, '/topic/'); - } else { - return next(); + return redirect(topics.getTopicField, req.params.topic_id, '/topic/'); } - return; } next(); }; diff --git a/tests/database/hash.js b/tests/database/hash.js index d35666bf53..74bfff0298 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -16,11 +16,11 @@ describe('Hash methods', function() { assert.equal(arguments.length, 1); done(); }); - }) + }); describe('setObject()', function() { it('should create a object', function(done) { - db.setObject('testObject2', testData, function(err) { + db.setObject('testObject10', testData, function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); done(); From 7a7aeb131ed0b26213588c2dabf07a4af63fa98a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 19:04:14 -0500 Subject: [PATCH 080/897] use tpl_url --- public/src/client/category.js | 2 +- public/src/client/home.js | 2 +- public/src/client/topic.js | 2 +- public/src/client/unread.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/client/category.js b/public/src/client/category.js index 2f33a0d33c..58d7074528 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -13,7 +13,7 @@ define('forum/category', [ var Category = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if(data && data.url.indexOf('category') !== 0) { + if(data && data.tpl_url !== 'category') { navigator.hide(); removeListeners(); diff --git a/public/src/client/home.js b/public/src/client/home.js index ca18223881..23049af741 100644 --- a/public/src/client/home.js +++ b/public/src/client/home.js @@ -6,7 +6,7 @@ define('forum/home', function() { var home = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if (data.url !== '') { + if (data.tpl_url !== 'home') { socket.removeListener('event:new_post', home.onNewPost); } }); diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 40c1a84e13..621521eaed 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -18,7 +18,7 @@ define('forum/topic', [ currentUrl = ''; $(window).on('action:ajaxify.start', function(ev, data) { - if(data.url.indexOf('topic') !== 0) { + if(data.tpl_url !== 'topic') { navigator.hide(); $('.header-topic-title').find('span').text('').hide(); app.removeAlert('bookmark'); diff --git a/public/src/client/unread.js b/public/src/client/unread.js index 342102f634..96c54e7536 100644 --- a/public/src/client/unread.js +++ b/public/src/client/unread.js @@ -6,7 +6,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], var Unread = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if(data.url.indexOf('unread') !== 0) { + if (data.tpl_url !== 'unread') { recent.removeListeners(); } }); From 5a940778ee23af7d92b2cfa81f6bf5adf7922d9e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 20:15:00 -0500 Subject: [PATCH 081/897] closes #2603 --- public/language/en_GB/recent.json | 16 ++++++++++++- public/src/client/recent.js | 37 +++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/public/language/en_GB/recent.json b/public/language/en_GB/recent.json index ff6400f27a..f01670e47c 100644 --- a/public/language/en_GB/recent.json +++ b/public/language/en_GB/recent.json @@ -5,5 +5,19 @@ "month": "Month", "year": "Year", "alltime": "All Time", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "There are no recent topics.", + + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + + "click-here-to-reload": "Click here to reload." + } \ No newline at end of file diff --git a/public/src/client/recent.js b/public/src/client/recent.js index 5b6a4d7527..fed290296b 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -50,23 +50,36 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) { }; Recent.updateAlertText = function() { - var text = 'There'; + var text = ''; - if (newTopicCount > 1) { - text += ' are ' + newTopicCount + ' new topics'; - } else if (newTopicCount === 1) { - text += ' is a new topic'; + if (newTopicCount === 0) { + if (newPostCount === 1) { + text = '[[recent:there-is-a-new-post]]'; + } else if (newPostCount > 1) { + text = '[[recent:there-are-new-posts, ' + newPostCount + ']]'; + } } - - if (newPostCount > 1) { - text += (newTopicCount?' and ':' are ') + newPostCount + ' new posts'; - } else if(newPostCount === 1) { - text += (newTopicCount?' and ':' is ') + ' a new post'; + else if (newTopicCount === 1) { + if (newPostCount === 0) { + text = '[[recent:there-is-a-new-topic]]'; + } else if (newPostCount === 1) { + text = '[[recent:there-is-a-new-topic-and-a-new-post]]'; + } else if (newPostCount > 1) { + text = '[[recent:there-is-a-new-topic-and-new-posts, ' + newPostCount +']]'; + } + } else if (newTopicCount > 1) { + if (newPostCount === 0) { + text = '[[recent:there-are-new-topics, ' + newTopicCount + ']]'; + } else if (newPostCount === 1) { + text = '[[recent:there-are-new-topics-and-a-new-post, ' + newTopicCount + ']]'; + } else if (newPostCount > 1) { + text = '[[recent:there-are-new-topics-and-new-posts, ' + newTopicCount + ', ' + newPostCount +']]'; + } } - text += '. Click here to reload.'; + text += ' [[recent:click-here-to-reload]]'; - $('#new-topics-alert').html(text).removeClass('hide').fadeIn('slow'); + $('#new-topics-alert').translateText(text).removeClass('hide').fadeIn('slow'); $('#category-no-topics').addClass('hide'); }; From 675968f0f37d8fc465b86ef06a57d2db0d4ed515 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 12 Jan 2015 20:34:15 -0500 Subject: [PATCH 082/897] cover photo for groups, #2588 --- public/language/en_GB/groups.json | 5 + public/src/client/groups/details.js | 91 +++++++++- .../backgroundDraggable.js | 157 ++++++++++++++++++ src/controllers/uploads.js | 4 + src/groups.js | 82 ++++++++- src/socket.io/groups.js | 22 +++ 6 files changed, 356 insertions(+), 5 deletions(-) create mode 100644 public/vendor/jquery/draggable-background/backgroundDraggable.js diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index f7ccec33bc..eb9a45f994 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -5,6 +5,11 @@ "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", + "details.title": "Group Details", "details.members": "Member List", "details.pending": "Pending Members", diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index d8d98a2edc..de9ec199db 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -1,14 +1,17 @@ "use strict"; -/* globals define, socket, ajaxify, app, bootbox */ +/* globals define, socket, ajaxify, app, bootbox, RELATIVE_PATH */ -define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker'], function(iconSelect) { - var Details = {}; +define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', 'vendor/jquery/draggable-background/backgroundDraggable'], function(iconSelect) { + var Details = { + cover: {} + }; Details.init = function() { var detailsPage = $('.groups'), settingsFormEl = detailsPage.find('form'); Details.prepareSettings(); + Details.initialiseCover(); $('.latest-posts .content img').addClass('img-responsive'); @@ -150,5 +153,87 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker'], }); }; + Details.initialiseCover = function() { + var coverEl = $('.group-cover'); + coverEl.find('.change').on('click', function() { + coverEl.toggleClass('active', 1); + coverEl.backgroundDraggable(); + coverEl.on('dragover', Details.cover.onDragOver); + coverEl.on('drop', Details.cover.onDrop); + }); + + coverEl.find('.save').on('click', Details.cover.save); + }; + + // Cover Photo Handling Code + + Details.cover.load = function() { + socket.emit('groups.cover.get', function(err, data) { + if (!err) { + var coverEl = $('.group-cover'); + if (data['cover:url']) { + coverEl.css('background-image', 'url(' + RELATIVE_PATH + '/theme-rocket/cover/' + data['cover:url'] + ')'); + } + + if (data['cover:position']) { + coverEl.css('background-position', data['cover:position']); + } + + delete Details.cover.newCover; + } else { + app.alertError(err.message); + } + }); + }; + + Details.cover.onDragOver = function(e) { + e.stopPropagation(); + e.preventDefault(); + e.originalEvent.dataTransfer.dropEffect = 'copy'; + }; + + Details.cover.onDrop = function(e) { + var coverEl = $('.group-cover'); + e.stopPropagation(); + e.preventDefault(); + + var files = e.originalEvent.dataTransfer.files, + reader = new FileReader(); + + if (files.length && files[0].type.match('image.*')) { + reader.onload = function(e) { + coverEl.css('background-image', 'url(' + e.target.result + ')'); + coverEl.backgroundDraggable(); + Details.cover.newCover = e.target.result; + }; + + reader.readAsDataURL(files[0]); + } + }; + + Details.cover.save = function() { + var coverEl = $('.group-cover'); + + coverEl.addClass('saving'); + + socket.emit('groups.cover.update', { + groupName: ajaxify.variables.get('group_name'), + imageData: Details.cover.newCover || undefined, + position: $('.group-cover').css('background-position') + }, function(err) { + if (!err) { + coverEl.toggleClass('active', 0); + coverEl.backgroundDraggable('disable'); + coverEl.off('dragover', Details.cover.onDragOver); + coverEl.off('drop', Details.cover.onDrop); + Details.cover.load(); + } else { + app.alertError(err.message); + } + + coverEl.removeClass('saving'); + }); + }; + return Details; }); \ No newline at end of file diff --git a/public/vendor/jquery/draggable-background/backgroundDraggable.js b/public/vendor/jquery/draggable-background/backgroundDraggable.js new file mode 100644 index 0000000000..baae4d0f95 --- /dev/null +++ b/public/vendor/jquery/draggable-background/backgroundDraggable.js @@ -0,0 +1,157 @@ +/** + * Draggable Background plugin for jQuery + * + * v1.2.4 + * + * Copyright (c) 2014 Kenneth Chung + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/mit-license.php + */ +;(function($) { + var $window = $(window); + + // Helper function to guarantee a value between low and hi unless bool is false + var limit = function(low, hi, value, bool) { + if (arguments.length === 3 || bool) { + if (value < low) return low; + if (value > hi) return hi; + } + return value; + }; + + // Adds clientX and clientY properties to the jQuery's event object from touch + var modifyEventForTouch = function(e) { + e.clientX = e.originalEvent.touches[0].clientX; + e.clientY = e.originalEvent.touches[0].clientY; + }; + + var getBackgroundImageDimensions = function($el) { + var bgSrc = ($el.css('background-image').match(/^url\(['"]?(.*?)['"]?\)$/i) || [])[1]; + if (!bgSrc) return; + + var imageDimensions = { width: 0, height: 0 }, + image = new Image(); + + image.onload = function() { + if ($el.css('background-size') == "cover") { + var elementWidth = $el.innerWidth(), + elementHeight = $el.innerHeight(), + elementAspectRatio = elementWidth / elementHeight; + imageAspectRatio = image.width / image.height, + scale = 1; + + if (imageAspectRatio >= elementAspectRatio) { + scale = elementHeight / image.height; + } else { + scale = elementWidth / image.width; + } + + imageDimensions.width = image.width * scale; + imageDimensions.height = image.height * scale; + } else { + imageDimensions.width = image.width; + imageDimensions.height = image.height; + } + }; + + image.src = bgSrc; + + return imageDimensions; + }; + + function Plugin(element, options) { + this.element = element; + this.options = options; + this.init(); + } + + Plugin.prototype.init = function() { + var $el = $(this.element), + bgSrc = ($el.css('background-image').match(/^url\(['"]?(.*?)['"]?\)$/i) || [])[1], + options = this.options; + + if (!bgSrc) return; + + // Get the image's width and height if bound + var imageDimensions = { width: 0, height: 0 }; + if (options.bound) { + imageDimensions = getBackgroundImageDimensions($el); + } + + $el.on('mousedown.dbg touchstart.dbg', function(e) { + if (e.target !== $el[0]) { + return; + } + e.preventDefault(); + + if (e.originalEvent.touches) { + modifyEventForTouch(e); + } else if (e.which !== 1) { + return; + } + + var x0 = e.clientX, + y0 = e.clientY, + pos = $el.css('background-position').match(/(-?\d+).*?\s(-?\d+)/) || [], + xPos = parseInt(pos[1]) || 0, + yPos = parseInt(pos[2]) || 0; + + $window.on('mousemove.dbg touchmove.dbg', function(e) { + e.preventDefault(); + + if (e.originalEvent.touches) { + modifyEventForTouch(e); + } + + var x = e.clientX, + y = e.clientY; + + xPos = options.axis === 'y' ? xPos : limit($el.innerWidth()-imageDimensions.width, 0, xPos+x-x0, options.bound); + yPos = options.axis === 'x' ? yPos : limit($el.innerHeight()-imageDimensions.height, 0, yPos+y-y0, options.bound); + x0 = x; + y0 = y; + + $el.css('background-position', xPos + 'px ' + yPos + 'px'); + }); + + $window.on('mouseup.dbg touchend.dbg mouseleave.dbg', function() { + if (options.done) { + options.done(); + } + + $window.off('mousemove.dbg touchmove.dbg'); + $window.off('mouseup.dbg touchend.dbg mouseleave.dbg'); + }); + }); + }; + + Plugin.prototype.disable = function() { + var $el = $(this.element); + $el.off('mousedown.dbg touchstart.dbg'); + $window.off('mousemove.dbg touchmove.dbg mouseup.dbg touchend.dbg mouseleave.dbg'); + } + + $.fn.backgroundDraggable = function(options) { + var options = options; + var args = Array.prototype.slice.call(arguments, 1); + + return this.each(function() { + var $this = $(this); + + if (typeof options == 'undefined' || typeof options == 'object') { + options = $.extend({}, $.fn.backgroundDraggable.defaults, options); + var plugin = new Plugin(this, options); + $this.data('dbg', plugin); + } else if (typeof options == 'string' && $this.data('dbg')) { + var plugin = $this.data('dbg'); + Plugin.prototype[options].apply(plugin, args); + } + }); + }; + + $.fn.backgroundDraggable.defaults = { + bound: true, + axis: undefined + }; +}(jQuery)); \ No newline at end of file diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js index 237ae5c453..b7e590b6bf 100644 --- a/src/controllers/uploads.js +++ b/src/controllers/uploads.js @@ -72,6 +72,10 @@ uploadsController.uploadThumb = function(req, res, next) { }, next); }; +uploadsController.uploadGroupCover = function(data, next) { + uploadImage(0/*req.user.uid*/, data, next); +}; + function uploadImage(uid, image, callback) { if (plugins.hasListeners('filter:uploadImage')) { return plugins.fireHook('filter:uploadImage', {image: image, uid: uid}, callback); diff --git a/src/groups.js b/src/groups.js index 19560ca14c..4e4656dd3a 100644 --- a/src/groups.js +++ b/src/groups.js @@ -3,14 +3,20 @@ var async = require('async'), winston = require('winston'), _ = require('underscore'), + crypto = require('crypto'), + path = require('path'), + nconf = require('nconf'), + fs = require('fs'), + user = require('./user'), meta = require('./meta'), db = require('./database'), plugins = require('./plugins'), posts = require('./posts'), privileges = require('./privileges'), - utils = require('../public/src/utils'); + utils = require('../public/src/utils'), + uploadsController = require('./controllers/uploads'); (function(Groups) { @@ -60,7 +66,12 @@ var async = require('async'), } return groups; - } + }/*, + fixImageUrl: function(url) { + if (url) { + return url.indexOf('http') === -1 ? nconf.get('relative_path') + url : url; + } + }*/ }; Groups.list = function(options, callback) { @@ -185,6 +196,7 @@ var async = require('async'), return callback(err); } + // results.base.image = internals.fixImageUrl(results.base.image); results.base.members = results.users.filter(Boolean); results.base.pending = results.pending.filter(Boolean); results.base.count = numUsers || results.base.members.length; @@ -203,6 +215,15 @@ var async = require('async'), }); }; + Groups.getGroupFields = function(groupName, fields, callback) { + db.getObjectFields('group:' + groupName, fields, callback); + }; + + Groups.setGroupField = function(groupName, field, value, callback) { + plugins.fireHook('action:group.set', {field: field, value: value, type: 'set'}); + db.setObjectField('group:' + groupName, field, value, callback); + }; + Groups.isPrivate = function(groupName, callback) { db.getObjectField('group:' + groupName, 'private', function(err, isPrivate) { isPrivate = isPrivate || isPrivate === null; @@ -688,6 +709,63 @@ var async = require('async'), }); }; + Groups.updateCoverPosition = function(groupName, position, callback) { + Groups.setGroupField(groupName, 'cover:position', position, callback); + }; + + Groups.updateCover = function(data, callback) { + var tempPath, md5sum, url; + + // Position only? That's fine + if (!data.imageData && data.position) { + return Groups.updateCoverPosition(data.groupName, data.position, callback); + } + + async.series([ + function(next) { + // Calculate md5sum of image + // This is required because user data can be private + md5sum = crypto.createHash('md5'); + md5sum.update(data.imageData); + md5sum = md5sum.digest('hex'); + next(); + }, + function(next) { + // Save image + tempPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), md5sum); + var buffer = new Buffer(data.imageData.slice(data.imageData.indexOf('base64') + 7), 'base64'); + + fs.writeFile(tempPath, buffer, { + encoding: 'base64' + }, next); + }, + function(next) { + uploadsController.uploadGroupCover({ + path: tempPath + }, function(err, uploadData) { + if (err) { + return next(err); + } + + url = uploadData.url; + next(); + }); + }, + function(next) { + Groups.setGroupField(data.groupName, 'cover:url', url, next); + }, + function(next) { + fs.unlink(tempPath, next); // Delete temporary file + } + ], function(err) { + if (err) { + return callback(err); + } + + Groups.updateCoverPosition(data.groupName, data.position, callback); + }); + } + Groups.ownership = {}; Groups.ownership.isOwner = function(uid, groupName, callback) { diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 3f3718d97f..c4b4535e82 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -126,4 +126,26 @@ SocketGroups.delete = function(socket, data, callback) { }); }; +SocketGroups.cover = {}; + +SocketGroups.cover.get = function(socket, data, callback) { + groups.getGroupFields(data.groupName, ['cover:url', 'cover:position'], callback); +}; + +SocketGroups.cover.update = function(socket, data, callback) { + if(!data) { + return callback(new Error('[[error:invalid-data]]')); + } else if (socket.uid === 0) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { + if (!isOwner) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.updateCover(data, callback); + }); +}; + module.exports = SocketGroups; From 203a15204ee15d229c7221f07a37ec8b1c9b8d16 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 12 Jan 2015 20:40:34 -0500 Subject: [PATCH 083/897] bugfixes to cover photo, #2588 --- public/src/client/groups/details.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index de9ec199db..062ce43467 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -157,7 +157,9 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', var coverEl = $('.group-cover'); coverEl.find('.change').on('click', function() { coverEl.toggleClass('active', 1); - coverEl.backgroundDraggable(); + coverEl.backgroundDraggable({ + axis: 'y' + }); coverEl.on('dragover', Details.cover.onDragOver); coverEl.on('drop', Details.cover.onDrop); }); @@ -168,11 +170,13 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', // Cover Photo Handling Code Details.cover.load = function() { - socket.emit('groups.cover.get', function(err, data) { + socket.emit('groups.cover.get', { + groupName: ajaxify.variables.get('group_name') + }, function(err, data) { if (!err) { var coverEl = $('.group-cover'); if (data['cover:url']) { - coverEl.css('background-image', 'url(' + RELATIVE_PATH + '/theme-rocket/cover/' + data['cover:url'] + ')'); + coverEl.css('background-image', 'url(' + data['cover:url'] + ')'); } if (data['cover:position']) { From 698f598a3086d80deb7522c997eaf0e59009a08e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 12 Jan 2015 21:14:00 -0500 Subject: [PATCH 084/897] default cover photo for groups, #2588 --- public/images/cover-default.png | Bin 0 -> 33702 bytes src/groups.js | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 public/images/cover-default.png diff --git a/public/images/cover-default.png b/public/images/cover-default.png new file mode 100644 index 0000000000000000000000000000000000000000..8b1d392408147834387766c9212cffbf549fb0d4 GIT binary patch literal 33702 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 literal 0 HcmV?d00001 diff --git a/src/groups.js b/src/groups.js index 4e4656dd3a..a3799b4bcf 100644 --- a/src/groups.js +++ b/src/groups.js @@ -196,7 +196,12 @@ var async = require('async'), return callback(err); } - // results.base.image = internals.fixImageUrl(results.base.image); + // Default image + if (!results.base['cover:url']) { + results.base['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; + results.base['cover:position'] = '50% 50%'; + } + results.base.members = results.users.filter(Boolean); results.base.pending = results.pending.filter(Boolean); results.base.count = numUsers || results.base.members.length; From 710df626b5b3e139336aa579eceeb77d629d5e64 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 12 Jan 2015 21:21:02 -0500 Subject: [PATCH 085/897] removed join/view buttons from group list, made cover clickable, #2588 --- public/src/client/groups/list.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 03243d6822..3fc76a4962 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -7,18 +7,10 @@ define('forum/groups/list', function() { Groups.init = function() { var groupsEl = $('.groups.row'); - // Group joining and leaving - groupsEl.on('click', '[data-action]', function() { - var action = $(this).attr('data-action'), - groupName = $(this).parents('[data-group]').attr('data-group'); + groupsEl.on('click', '.list-cover', function() { + var groupName = $(this).parents('[data-group]').attr('data-group'); - socket.emit('groups.' + action, { - groupName: groupName - }, function(err) { - if (!err) { - ajaxify.refresh(); - } - }); + ajaxify.go('groups/' + groupName); }); // Group creation From de58f4ff6bf4713796cccf477463b07d473edc95 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 12 Jan 2015 22:47:58 -0500 Subject: [PATCH 086/897] hiding group admin and cover photo controls from non-owners, #2588 --- public/src/client/groups/details.js | 41 +++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 062ce43467..d4effed12d 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -10,8 +10,10 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', var detailsPage = $('.groups'), settingsFormEl = detailsPage.find('form'); - Details.prepareSettings(); - Details.initialiseCover(); + if (ajaxify.variables.get('is_owner') === 'true') { + Details.prepareSettings(); + Details.initialiseCover(); + } $('.latest-posts .content img').addClass('img-responsive'); @@ -73,26 +75,24 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', previewIcon = previewEl.find('i'), previewValueEl = settingsFormEl.find('[name="icon"]'); - if (settingsFormEl.length) { - // Add color picker to settings form - colorBtn.ColorPicker({ - color: colorValueEl.val() || '#000', - onChange: function(hsb, hex) { - colorValueEl.val('#' + hex); - previewEl.css('background-color', '#' + hex); - }, - onShow: function(colpkr) { - $(colpkr).css('z-index', 1051); - } - }); + // Add color picker to settings form + colorBtn.ColorPicker({ + color: colorValueEl.val() || '#000', + onChange: function(hsb, hex) { + colorValueEl.val('#' + hex); + previewEl.css('background-color', '#' + hex); + }, + onShow: function(colpkr) { + $(colpkr).css('z-index', 1051); + } + }); - // Add icon selection interface - iconBtn.on('click', function() { - iconSelect.init(previewIcon, function() { - previewValueEl.val(previewIcon.val()); - }); + // Add icon selection interface + iconBtn.on('click', function() { + iconSelect.init(previewIcon, function() { + previewValueEl.val(previewIcon.val()); }); - } + }); }; Details.update = function() { @@ -165,6 +165,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', }); coverEl.find('.save').on('click', Details.cover.save); + coverEl.addClass('initialised') }; // Cover Photo Handling Code From 5f12679426db4aa84ea6eb699a6721eeac872ac8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 23:10:36 -0500 Subject: [PATCH 087/897] #2604 --- src/plugins/load.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plugins/load.js b/src/plugins/load.js index 32950bda20..2bd527217c 100644 --- a/src/plugins/load.js +++ b/src/plugins/load.js @@ -209,9 +209,14 @@ module.exports = function(Plugins) { var pluginData = JSON.parse(results.plugin); var packageData = JSON.parse(results.package); - var obj = utils.merge(pluginData, packageData); - obj.id = packageData.name; - callback(null, obj); + pluginData.id = packageData.name; + pluginData.name = packageData.name; + pluginData.description = packageData.description; + pluginData.version = packageData.version; + pluginData.repository = packageData.repository; + pluginData.nbbpm = packageData.nbbpm; + + callback(null, pluginData); } catch(err) { var pluginDir = pluginPath.split(path.sep); pluginDir = pluginDir[pluginDir.length -1]; From be8385e8dc9f1d24cddd62c95e99233aff80aeaa Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 23:11:32 -0500 Subject: [PATCH 088/897] fix else if style --- public/src/client/recent.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/src/client/recent.js b/public/src/client/recent.js index fed290296b..9bc840d125 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -58,8 +58,7 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) { } else if (newPostCount > 1) { text = '[[recent:there-are-new-posts, ' + newPostCount + ']]'; } - } - else if (newTopicCount === 1) { + } else if (newTopicCount === 1) { if (newPostCount === 0) { text = '[[recent:there-is-a-new-topic]]'; } else if (newPostCount === 1) { From c2fab07236ced4637bc6efddf05d1a72bd80c96a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 12 Jan 2015 23:24:19 -0500 Subject: [PATCH 089/897] replaces fs.exists with try catch --- src/plugins/load.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/plugins/load.js b/src/plugins/load.js index 2bd527217c..4bd432f582 100644 --- a/src/plugins/load.js +++ b/src/plugins/load.js @@ -75,11 +75,7 @@ module.exports = function(Plugins) { var libraryPath = path.join(pluginPath, pluginData.library); - fs.exists(libraryPath, function(exists) { - if (!exists) { - return libraryNotFound(); - } - + try { if (!Plugins.libraries[pluginData.id]) { Plugins.requireLibrary(pluginData.id, libraryPath); } @@ -91,7 +87,10 @@ module.exports = function(Plugins) { } else { callback(); } - }); + } catch(err) { + winston.error(err.stack); + libraryNotFound(); + } } function mapStaticDirectories(pluginData, pluginPath, callback) { From b3b3300bd61d9d5b5812652ce47f50a50dc7e814 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 13 Jan 2015 00:25:44 -0500 Subject: [PATCH 090/897] fixing bug with checkboxes, #2588 --- public/src/client/groups/details.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index d4effed12d..62371368e8 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -96,19 +96,18 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', }; Details.update = function() { - var settingsFormEl = $('.groups form'); + var settingsFormEl = $('.groups form'), + checkboxes = settingsFormEl.find('input[type="checkbox"][name]'); if (settingsFormEl.length) { require(['vendor/jquery/serializeObject/jquery.ba-serializeobject.min'], function() { - var settings = settingsFormEl.serializeObject(), - keys = Object.keys(settings), - inputEl; + var settings = settingsFormEl.serializeObject(); // Fix checkbox values - keys.forEach(function(key) { - inputEl = settingsFormEl.find('input[type="checkbox"][name="' + key + '"]'); + checkboxes.each(function(idx, inputEl) { + inputEl = $(inputEl); if (inputEl.length) { - settings[key] = settings[key] === 'on' ? true : false; + settings[inputEl.attr('name')] = inputEl.prop('checked'); } }); @@ -126,7 +125,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', ajaxify.refresh(); } - app.alertSuccess('[[groups:event.updated'); + app.alertSuccess('[[groups:event.updated]]'); }); }); } @@ -153,6 +152,8 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', }); }; + // Cover Photo Handling Code + Details.initialiseCover = function() { var coverEl = $('.group-cover'); coverEl.find('.change').on('click', function() { @@ -165,11 +166,9 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', }); coverEl.find('.save').on('click', Details.cover.save); - coverEl.addClass('initialised') + coverEl.addClass('initialised'); }; - // Cover Photo Handling Code - Details.cover.load = function() { socket.emit('groups.cover.get', { groupName: ajaxify.variables.get('group_name') From 1c497f842ab53552877a05f9dc32e0618374b12c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 13 Jan 2015 11:27:48 -0500 Subject: [PATCH 091/897] fixes travis, #2588 --- tests/groups.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/groups.js b/tests/groups.js index 6f36cbfa2c..3d24c6f5ae 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -13,14 +13,17 @@ describe('Groups', function() { async.parallel([ function(next) { // Create a group to play around with - Groups.create('Test', 'Foobar!', next); + Groups.create({ + name: 'Test', + description: 'Foobar!' + }, next); }, function(next) { // Create a new user User.create({ username: 'testuser', email: 'b@c.com' - }, done); + }, next); }, function(next) { // Also create a hidden group @@ -166,7 +169,10 @@ describe('Groups', function() { describe('.create()', function() { it('should create another group', function(done) { - Groups.create('foo', 'bar', function(err) { + Groups.create({ + name: 'foo', + description: 'bar' + }, function(err) { if (err) return done(err); Groups.get('foo', {}, done); From 2a66aad0783ede0f346c1c2db25a6ab65786eb6c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 12:02:08 -0500 Subject: [PATCH 092/897] ability to add extra fields to user data, new hook filter:user.addFields --- src/user.js | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/src/user.js b/src/user.js index e61dc00f72..a640b946d7 100644 --- a/src/user.js +++ b/src/user.js @@ -217,32 +217,41 @@ var async = require('async'), }; User.getUsers = function(uids, callback) { - async.parallel({ - userData: function(next) { - User.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture', 'status', 'banned', 'postcount', 'reputation', 'email:confirmed'], next); - }, - isAdmin: function(next) { - User.isAdministrator(uids, next); - }, - isOnline: function(next) { - require('./socket.io').isUsersOnline(uids, next); - } - }, function(err, results) { + var fields = ['uid', 'username', 'userslug', 'picture', 'status', 'banned', 'postcount', 'reputation', 'email:confirmed']; + plugins.fireHook('filter:users.addFields', {fields: fields}, function(err, data) { if (err) { return callback(err); } - - results.userData.forEach(function(user, index) { - if (!user) { - return; - } - user.status = User.getStatus(user.status, results.isOnline[index]); - user.administrator = results.isAdmin[index]; - user.banned = parseInt(user.banned, 10) === 1; - user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1; + data.fields = data.fields.filter(function(field, index, array) { + return array.indexOf(field) === index; }); + async.parallel({ + userData: function(next) { + User.getMultipleUserFields(uids, data.fields, next); + }, + isAdmin: function(next) { + User.isAdministrator(uids, next); + }, + isOnline: function(next) { + require('./socket.io').isUsersOnline(uids, next); + } + }, function(err, results) { + if (err) { + return callback(err); + } - callback(null, results.userData); + results.userData.forEach(function(user, index) { + if (!user) { + return; + } + user.status = User.getStatus(user.status, results.isOnline[index]); + user.administrator = results.isAdmin[index]; + user.banned = parseInt(user.banned, 10) === 1; + user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1; + }); + + callback(null, results.userData); + }); }); }; From f6525a13c80dd90384e2146b74bc7d9a2babc966 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 12:26:41 -0500 Subject: [PATCH 093/897] data will be always inside socket.io/ modules --- src/socket.io/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 7faca188ab..072b7d6514 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -214,7 +214,7 @@ function addRedisAdapter(io) { } function callMethod(method, socket, params, callback) { - method.call(null, socket, params, function(err, result) { + method(socket, params || {}, function(err, result) { callback(err ? {message: err.message} : null, result); }); } From 6ccdf187ea8c0a9c4ec2adea0df44abacb3a9a54 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 14:54:13 -0500 Subject: [PATCH 094/897] closes #2595 --- public/language/en_GB/user.json | 2 + public/src/client/account/followers.js | 10 ---- public/src/client/account/header.js | 15 ++--- public/src/client/account/watched.js | 45 +++++++++++++++ src/controllers/accounts.js | 77 +++++++------------------- src/routes/index.js | 1 + src/socket.io/index.js | 2 +- src/socket.io/modules.js | 1 + src/socket.io/topics.js | 4 +- src/threadTools.js | 40 +------------ src/topics.js | 4 ++ src/topics/create.js | 6 +- src/topics/follow.js | 64 ++++++++++++++++++++- src/topics/fork.js | 2 +- src/upgrade.js | 44 ++++++++++++++- src/user/delete.js | 2 +- src/views/config.json | 1 + 17 files changed, 192 insertions(+), 128 deletions(-) create mode 100644 public/src/client/account/watched.js diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json index 211d6907ab..9ee1bbfefc 100644 --- a/public/language/en_GB/user.json +++ b/public/language/en_GB/user.json @@ -20,6 +20,7 @@ "profile_views": "Profile views", "reputation": "Reputation", "favourites":"Favourites", + "watched": "Watched", "followers": "Followers", "following": "Following", "signature": "Signature", @@ -68,6 +69,7 @@ "follows_no_one": "This user isn't following anyone :(", "has_no_posts": "This user didn't post anything yet.", "has_no_topics": "This user didn't post any topics yet.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Hidden", "hidden": "hidden", diff --git a/public/src/client/account/followers.js b/public/src/client/account/followers.js index 6dfb3bf83c..71b3dd38da 100644 --- a/public/src/client/account/followers.js +++ b/public/src/client/account/followers.js @@ -3,16 +3,6 @@ define('forum/account/followers', ['forum/account/header'], function(header) { Followers.init = function() { header.init(); - - var yourid = ajaxify.variables.get('yourid'), - theirid = ajaxify.variables.get('theirid'), - followersCount = ajaxify.variables.get('followersCount'); - - - if (parseInt(followersCount, 10) === 0) { - $('#no-followers-notice').removeClass('hide'); - } - }; return Followers; diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js index f552bf4056..f0a0c112fa 100644 --- a/public/src/client/account/header.js +++ b/public/src/client/account/header.js @@ -7,17 +7,10 @@ define('forum/account/header', function() { }; function displayAccountMenus() { - var yourid = ajaxify.variables.get('yourid'), - theirid = ajaxify.variables.get('theirid'); - - if (parseInt(yourid, 10) !== 0 && parseInt(yourid, 10) === parseInt(theirid, 10)) { - $('#editLink, #settingsLink, #favouritesLink').removeClass('hide'); - } else { - $('.account-sub-links .plugin-link').each(function() { - var $this = $(this); - $this.toggleClass('hide', $this.hasClass('private')); - }); - } + $('.account-sub-links .plugin-link').each(function() { + var $this = $(this); + $this.toggleClass('hide', $this.hasClass('private')); + }); } function selectActivePill() { diff --git a/public/src/client/account/watched.js b/public/src/client/account/watched.js new file mode 100644 index 0000000000..7a71699b50 --- /dev/null +++ b/public/src/client/account/watched.js @@ -0,0 +1,45 @@ +'use strict'; + +/* globals define, app, socket, utils */ +define('forum/account/watched', ['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) { + var AccountTopics = {}; + + AccountTopics.init = function() { + header.init(); + + infinitescroll.init(loadMore); + }; + + function loadMore(direction) { + console.log(direction); + if (direction < 0) { + return; + } + + infinitescroll.loadMore('topics.loadMoreFromSet', { + set: 'uid:' + $('.account-username-box').attr('data-uid') + ':followed_tids', + after: $('.user-topics').attr('data-nextstart') + }, function(data, done) { +console.log(data); + if (data.topics && data.topics.length) { + onTopicsLoaded(data.topics, done); + $('.user-topics').attr('data-nextstart', data.nextStart); + } else { + done(); + } + }); + } + + function onTopicsLoaded(topics, callback) { + infinitescroll.parseAndTranslate('account/watched', 'topics', {topics: topics}, function(html) { + $('#topics-container').append(html); + html.find('span.timeago').timeago(); + app.createUserTooltips(); + utils.makeNumbersHumanReadable(html.find('.human-readable-number')); + $(window).trigger('action:topics.loaded'); + callback(); + }); + } + + return AccountTopics; +}); diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index fd972ccd3b..2732c593dc 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -89,7 +89,7 @@ function getUserDataByUserSlug(userslug, callerUID, callback) { userData.yourid = callerUID; userData.theirid = userData.uid; userData.isSelf = self; - userData.showSettings = self || isAdmin; + userData.showHidden = self || isAdmin; userData.groups = Array.isArray(results.groups) && results.groups.length ? results.groups[0] : []; userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1; userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10); @@ -192,7 +192,7 @@ accountsController.getFollowers = function(req, res, next) { getFollow('account/followers', 'followers', req, res, next); }; -function getFollow(route, name, req, res, next) { +function getFollow(tpl, name, req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; var userData; @@ -215,64 +215,28 @@ function getFollow(route, name, req, res, next) { userData[name] = users; userData[name + 'Count'] = users.length; - res.render(route, userData); + res.render(tpl, userData); }); } accountsController.getFavourites = function(req, res, next) { - var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - - getBaseUser(req.params.userslug, callerUID, function(err, userData) { - if (err) { - return next(err); - } - - if (!userData) { - return helpers.notFound(req, res); - } - - if (parseInt(userData.uid, 10) !== callerUID) { - return helpers.notAllowed(req, res); - } - - posts.getPostsFromSet('uid:' + userData.uid + ':favourites', callerUID, 0, 9, function(err, favourites) { - if (err) { - return next(err); - } - - userData.posts = favourites.posts; - userData.nextStart = favourites.nextStart; - - res.render('account/favourites', userData); - }); - }); + getFromUserSet('account/favourites', 'favourites', posts.getPostsFromSet, 'posts', req, res, next); }; accountsController.getPosts = function(req, res, next) { - var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - - getBaseUser(req.params.userslug, callerUID, function(err, userData) { - if (err) { - return next(err); - } - - if (!userData) { - return helpers.notFound(req, res); - } - posts.getPostsFromSet('uid:' + userData.uid + ':posts', callerUID, 0, 19, function(err, userPosts) { - if (err) { - return next(err); - } - - userData.posts = userPosts.posts; - userData.nextStart = userPosts.nextStart; + getFromUserSet('account/posts', 'posts', posts.getPostsFromSet, 'posts', req, res, next); +}; - res.render('account/posts', userData); - }); - }); +accountsController.getWatchedTopics = function(req, res, next) { + getFromUserSet('account/watched', 'followed_tids', topics.getTopicsFromSet, 'topics', req, res, next); }; accountsController.getTopics = function(req, res, next) { + getFromUserSet('account/topics', 'topics', topics.getTopicsFromSet, 'topics', req, res, next); +}; + + +function getFromUserSet(tpl, set, method, type, req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; getBaseUser(req.params.userslug, callerUID, function(err, userData) { @@ -284,19 +248,18 @@ accountsController.getTopics = function(req, res, next) { return helpers.notFound(req, res); } - var set = 'uid:' + userData.uid + ':topics'; - topics.getTopicsFromSet(set, callerUID, 0, 19, function(err, userTopics) { - if(err) { + method('uid:' + userData.uid + ':' + set, callerUID, 0, 19, function(err, data) { + if (err) { return next(err); } - userData.topics = userTopics.topics; - userData.nextStart = userTopics.nextStart; + userData[type] = data[type]; + userData.nextStart = data.nextStart; - res.render('account/topics', userData); + res.render(tpl, userData); }); }); -}; +} function getBaseUser(userslug, callerUID, callback) { user.getUidByUserslug(userslug, function (err, uid) { @@ -326,7 +289,7 @@ function getBaseUser(userslug, callerUID, callback) { results.user.yourid = callerUID; results.user.theirid = uid; results.user.isSelf = parseInt(callerUID, 10) === parseInt(uid, 10); - results.user.showSettings = results.user.isSelf || results.isAdmin; + results.user.showHidden = results.user.isSelf || results.isAdmin; results.user.profile_links = results.profile_links; callback(null, results.user); }); diff --git a/src/routes/index.js b/src/routes/index.js index eb35860928..c189404e5f 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -70,6 +70,7 @@ function accountRoutes(app, middleware, controllers) { setupPageRoute(app, '/user/:userslug/topics', middleware, middlewares, controllers.accounts.getTopics); setupPageRoute(app, '/user/:userslug/favourites', middleware, accountMiddlewares, controllers.accounts.getFavourites); + setupPageRoute(app, '/user/:userslug/watched', middleware, accountMiddlewares, controllers.accounts.getWatchedTopics); setupPageRoute(app, '/user/:userslug/edit', middleware, accountMiddlewares, controllers.accounts.accountEdit); setupPageRoute(app, '/user/:userslug/settings', middleware, accountMiddlewares, controllers.accounts.accountSettings); diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 072b7d6514..08dab140e6 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -214,7 +214,7 @@ function addRedisAdapter(io) { } function callMethod(method, socket, params, callback) { - method(socket, params || {}, function(err, result) { + method(socket, params, function(err, result) { callback(err ? {message: err.message} : null, result); }); } diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js index 71a44f36bd..8fd517e9bd 100644 --- a/src/socket.io/modules.js +++ b/src/socket.io/modules.js @@ -83,6 +83,7 @@ SocketModules.composer.editCheck = function(socket, pid, callback) { }; SocketModules.composer.renderPreview = function(socket, content, callback) { + console.log(content); plugins.fireHook('filter:parse.raw', content, callback); }; diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 5edda3f51e..52d2c2cb01 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -172,7 +172,7 @@ SocketTopics.markAsUnreadForAll = function(socket, tids, callback) { async.each(tids, function(tid, next) { async.waterfall([ function(next) { - threadTools.exists(tid, next); + topics.exists(tid, next); }, function(exists, next) { if (!exists) { @@ -409,7 +409,7 @@ SocketTopics.follow = function(socket, tid, callback) { return callback(new Error('[[error:not-logged-in]]')); } - threadTools.toggleFollow(tid, socket.uid, callback); + topics.toggleFollow(tid, socket.uid, callback); }; SocketTopics.loadMore = function(socket, data, callback) { diff --git a/src/threadTools.js b/src/threadTools.js index 74b316f987..1fe1369d35 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -19,10 +19,6 @@ var winston = require('winston'), (function(ThreadTools) { - ThreadTools.exists = function(tid, callback) { - db.isSortedSetMember('topics:tid', tid, callback); - }; - ThreadTools.delete = function(tid, uid, callback) { toggleDelete(tid, uid, true, callback); }; @@ -75,7 +71,7 @@ var winston = require('winston'), ThreadTools.purge = function(tid, uid, callback) { async.waterfall([ function(next) { - ThreadTools.exists(tid, next); + topics.exists(tid, next); }, function(exists, next) { if (!exists) { @@ -229,39 +225,5 @@ var winston = require('winston'), }); }; - ThreadTools.toggleFollow = function(tid, uid, callback) { - callback = callback || function() {}; - async.waterfall([ - function (next) { - ThreadTools.exists(tid, next); - }, - function (exists, next) { - if (!exists) { - return next(new Error('[[error:no-topic]]')); - } - topics.isFollowing([tid], uid, next); - }, - function (isFollowing, next) { - db[isFollowing[0] ? 'setRemove' : 'setAdd']('tid:' + tid + ':followers', uid, function(err) { - next(err, !isFollowing[0]); - }); - } - ], callback); - }; - - ThreadTools.follow = function(tid, uid, callback) { - callback = callback || function() {}; - async.waterfall([ - function (next) { - ThreadTools.exists(tid, next); - }, - function (exists, next) { - if (!exists) { - return next(new Error('[[error:no-topic]]')); - } - db.setAdd('tid:' + tid + ':followers', uid, next); - } - ], callback); - }; }(exports)); diff --git a/src/topics.js b/src/topics.js index d7b1b04c7d..1e9df9958f 100644 --- a/src/topics.js +++ b/src/topics.js @@ -26,6 +26,10 @@ var async = require('async'), require('./topics/tags')(Topics); require('./topics/teaser')(Topics); + Topics.exists = function(tid, callback) { + db.isSortedSetMember('topics:tid', tid, callback); + }; + Topics.getTopicData = function(tid, callback) { db.getObject('topic:' + tid, function(err, topic) { if (err || !topic) { diff --git a/src/topics/create.js b/src/topics/create.js index 415c3b955a..b3038911c1 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -148,7 +148,7 @@ module.exports = function(Topics) { return next(err); } if (settings.followTopicsOnCreate) { - threadTools.follow(postData.tid, uid, next); + Topics.follow(postData.tid, uid, next); } else { next(); } @@ -193,7 +193,7 @@ module.exports = function(Topics) { function(next) { async.parallel({ exists: function(next) { - threadTools.exists(tid, next); + Topics.exists(tid, next); }, locked: function(next) { Topics.isLocked(tid, next); @@ -266,7 +266,7 @@ module.exports = function(Topics) { } if (results.settings.followTopicsOnReply) { - threadTools.follow(postData.tid, uid); + Topics.follow(postData.tid, uid); } postData.index = results.postIndex - 1; postData.favourited = false; diff --git a/src/topics/follow.js b/src/topics/follow.js index b79e513c07..00785ffd77 100644 --- a/src/topics/follow.js +++ b/src/topics/follow.js @@ -13,6 +13,68 @@ var async = require('async'), module.exports = function(Topics) { + Topics.toggleFollow = function(tid, uid, callback) { + callback = callback || function() {}; + var isFollowing; + async.waterfall([ + function (next) { + Topics.exists(tid, next); + }, + function (exists, next) { + if (!exists) { + return next(new Error('[[error:no-topic]]')); + } + Topics.isFollowing([tid], uid, next); + }, + function (_isFollowing, next) { + isFollowing = _isFollowing[0]; + if (isFollowing) { + Topics.unfollow(tid, uid, next); + } else { + Topics.follow(tid, uid, next); + } + }, + function(next) { + next(null, !isFollowing); + } + ], callback); + }; + + Topics.follow = function(tid, uid, callback) { + callback = callback || function() {}; + async.waterfall([ + function (next) { + Topics.exists(tid, next); + }, + function (exists, next) { + if (!exists) { + return next(new Error('[[error:no-topic]]')); + } + db.setAdd('tid:' + tid + ':followers', uid, next); + }, + function(next) { + db.sortedSetAdd('uid:' + uid + ':followed_tids', Date.now(), tid, next); + } + ], callback); + }; + + Topics.unfollow = function(tid, uid, callback) { + callback = callback || function() {}; + async.waterfall([ + function (next) { + Topics.exists(tid, next); + }, + function (exists, next) { + if (!exists) { + return next(new Error('[[error:no-topic]]')); + } + db.setRemove('tid:' + tid + ':followers', uid, next); + }, + function(next) { + db.sortedSetRemove('uid:' + uid + ':followed_tids', tid, next); + } + ], callback); + }; Topics.isFollowing = function(tids, uid, callback) { if (!Array.isArray(tids)) { @@ -23,7 +85,7 @@ module.exports = function(Topics) { } var keys = tids.map(function(tid) { return 'tid:' + tid + ':followers'; - }) + }); db.isMemberOfSets(keys, uid, callback); }; diff --git a/src/topics/fork.js b/src/topics/fork.js index 4eb1274b2a..4cd5e0c53e 100644 --- a/src/topics/fork.js +++ b/src/topics/fork.js @@ -76,7 +76,7 @@ module.exports = function(Topics) { var postData; async.waterfall([ function(next) { - threadTools.exists(tid, next); + Topics.exists(tid, next); }, function(exists, next) { if (!exists) { diff --git a/src/upgrade.js b/src/upgrade.js index f5e548e614..23194cddf9 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 0, 9); + latestSchema = Date.UTC(2015, 0, 13); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -525,8 +525,48 @@ Upgrade.upgrade = function(callback) { winston.info('[2015/01/09] Creating fullname:uid hash skipped'); next(); } - } + }, + function(next) { + thisSchemaDate = Date.UTC(2015, 0, 13); + if (schemaDate < thisSchemaDate) { + winston.info('[2015/01/13] Creating uid:followed_tids sorted set'); + + db.getSortedSetRange('topics:tid', 0, -1, function(err, tids) { + if (err) { + winston.error('[2014/01/13] Error encountered while Creating uid:followed_tids sorted set'); + return next(err); + } + + var now = Date.now(); + + async.eachLimit(tids, 50, function(tid, next) { + db.getSetMembers('tid:' + tid + ':followers', function(err, uids) { + if (err) { + return next(err); + } + async.eachLimit(uids, 50, function(uid, next) { + if (parseInt(uid, 10)) { + db.sortedSetAdd('uid:' + uid + ':followed_tids', now, tid, next); + } else { + next(); + } + }, next); + }); + }, function(err) { + if (err) { + winston.error('[2015/01/13] Error encountered while Creating uid:followed_tids sorted set'); + return next(err); + } + winston.info('[2015/01/13] Creating uid:followed_tids sorted set done'); + Upgrade.update(thisSchemaDate, next); + }); + }); + } else { + winston.info('[2015/01/13] Creating uid:followed_tids sorted set skipped'); + next(); + } + } // Add new schema updates here // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 22!!! diff --git a/src/user/delete.js b/src/user/delete.js index ce7f70a30f..c115c727f1 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -76,7 +76,7 @@ module.exports = function(User) { function(next) { var keys = [ 'uid:' + uid + ':notifications:read', 'uid:' + uid + ':notifications:unread', - 'uid:' + uid + ':favourites', 'user:' + uid + ':settings', + 'uid:' + uid + ':favourites', 'uid:' + uid + ':followed_tids', 'user:' + uid + ':settings', 'uid:' + uid + ':topics', 'uid:' + uid + ':posts', 'uid:' + uid + ':chats', 'uid:' + uid + ':chats:unread', 'uid:' + uid + ':ip', 'uid:' + uid + ':upvote', 'uid:' + uid + ':downvote', diff --git a/src/views/config.json b/src/views/config.json index 9fc65e5781..70997cf4a8 100644 --- a/src/views/config.json +++ b/src/views/config.json @@ -11,6 +11,7 @@ "^user/.*/followers": "account/followers", "^user/.*/settings": "account/settings", "^user/.*/favourites": "account/favourites", + "^user/.*/watched": "account/watched", "^user/.*/posts": "account/posts", "^user/.*/topics": "account/topics", "^user/[^\/]+": "account/profile", From 82c44885053c535f6a7d65ddfdd5a3120c12e9b5 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 14:56:43 -0500 Subject: [PATCH 095/897] remove console.log fix typos --- public/src/client/account/watched.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/public/src/client/account/watched.js b/public/src/client/account/watched.js index 7a71699b50..bd0e8282dd 100644 --- a/public/src/client/account/watched.js +++ b/public/src/client/account/watched.js @@ -2,9 +2,9 @@ /* globals define, app, socket, utils */ define('forum/account/watched', ['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) { - var AccountTopics = {}; + var AccountWatched = {}; - AccountTopics.init = function() { + AccountWatched.init = function() { header.init(); infinitescroll.init(loadMore); @@ -20,7 +20,6 @@ define('forum/account/watched', ['forum/account/header', 'forum/infinitescroll'] set: 'uid:' + $('.account-username-box').attr('data-uid') + ':followed_tids', after: $('.user-topics').attr('data-nextstart') }, function(data, done) { -console.log(data); if (data.topics && data.topics.length) { onTopicsLoaded(data.topics, done); $('.user-topics').attr('data-nextstart', data.nextStart); @@ -41,5 +40,5 @@ console.log(data); }); } - return AccountTopics; + return AccountWatched; }); From 1adc3b4ea70c04b1edec4dccc0672e8634b47aaa Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 14:57:41 -0500 Subject: [PATCH 096/897] removed console.log --- src/socket.io/modules.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js index 8fd517e9bd..71a44f36bd 100644 --- a/src/socket.io/modules.js +++ b/src/socket.io/modules.js @@ -83,7 +83,6 @@ SocketModules.composer.editCheck = function(socket, pid, callback) { }; SocketModules.composer.renderPreview = function(socket, content, callback) { - console.log(content); plugins.fireHook('filter:parse.raw', content, callback); }; From a9bf9745b696fe2f510e50e4a0a401dec82acd40 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 15:10:50 -0500 Subject: [PATCH 097/897] removed unused yourid --- public/src/admin/manage/groups.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index dad2c5208b..7b8f8cb5b4 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -8,8 +8,7 @@ define('admin/manage/groups', [ var Groups = {}; Groups.init = function() { - var yourid = ajaxify.variables.get('yourid'), - createModal = $('#create-modal'), + var createModal = $('#create-modal'), createGroupName = $('#create-group-name'), createModalGo = $('#create-modal-go'), createModalError = $('#create-modal-error'), From f2bfb4c0d11a792c469f5c48dd677868a31c4fc6 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 15:13:34 -0500 Subject: [PATCH 098/897] removed following count hide --- public/src/client/account/following.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/public/src/client/account/following.js b/public/src/client/account/following.js index 0e27a235aa..4d31a2cbb6 100644 --- a/public/src/client/account/following.js +++ b/public/src/client/account/following.js @@ -3,12 +3,6 @@ define('forum/account/following', ['forum/account/header'], function(header) { Following.init = function() { header.init(); - - var followingCount = ajaxify.variables.get('followingCount'); - - if (parseInt(followingCount, 10) === 0) { - $('#no-following-notice').removeClass('hide'); - } }; return Following; From a8c818c6cd70c2b37e6ea55986a248050e7a501c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 13 Jan 2015 15:47:32 -0500 Subject: [PATCH 099/897] added new hook, filter:controllers.topic.get --- src/controllers/topics.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index f912f20bd6..791baa0c79 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -11,6 +11,7 @@ var topicsController = {}, topics = require('../topics'), posts = require('../posts'), privileges = require('../privileges'), + plugins = require('../plugins'), helpers = require('./helpers'), utils = require('../../public/src/utils'); @@ -120,7 +121,9 @@ topicsController.get = function(req, res, next) { topicData.posts.splice(0, 1); } - next(null, topicData); + plugins.fireHook('filter:controllers.topic.get', topicData, function(err, topicData) { + next(null, topicData); + }); }); }, function (topicData, next) { From fd2edcaf6f64b0a33eb77ce682df286f17673bb5 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 17:15:10 -0500 Subject: [PATCH 100/897] closes #2594 --- public/src/client/account/followers.js | 36 +++++++++++++- public/src/client/account/following.js | 10 +++- src/controllers/accounts.js | 14 +++--- src/socket.io/user.js | 11 +++-- src/upgrade.js | 66 +++++++++++++++++++++++++- src/user/follow.js | 64 ++++++++++--------------- 6 files changed, 146 insertions(+), 55 deletions(-) diff --git a/public/src/client/account/followers.js b/public/src/client/account/followers.js index 71b3dd38da..8c98a6bacd 100644 --- a/public/src/client/account/followers.js +++ b/public/src/client/account/followers.js @@ -1,9 +1,43 @@ -define('forum/account/followers', ['forum/account/header'], function(header) { +'use strict'; + +/* globals define, socket, utils */ + +define('forum/account/followers', ['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) { var Followers = {}; Followers.init = function() { header.init(); + + infinitescroll.init(function(direction) { + Followers.loadMore(direction, 'account/followers', 'followers:' + $('.account-username-box').attr('data-uid')); + }); }; + Followers.loadMore = function(direction, tpl, set) { + if (direction < 0) { + return; + } + + infinitescroll.loadMore('user.loadMore', { + set: set, + after: $('#users-container').attr('data-nextstart') + }, function(data, done) { + if (data.users && data.users.length) { + onUsersLoaded(tpl, data.users, done); + $('#users-container').attr('data-nextstart', data.nextStart); + } else { + done(); + } + }); + }; + + function onUsersLoaded(tpl, users, callback) { + infinitescroll.parseAndTranslate(tpl, 'users', {users: users}, function(html) { + $('#users-container').append(html); + utils.addCommasToNumbers(html.find('.formatted-number')); + callback(); + }); + } + return Followers; }); diff --git a/public/src/client/account/following.js b/public/src/client/account/following.js index 4d31a2cbb6..3b7ba980b7 100644 --- a/public/src/client/account/following.js +++ b/public/src/client/account/following.js @@ -1,8 +1,16 @@ -define('forum/account/following', ['forum/account/header'], function(header) { +'use strict'; + +/* globals define */ + +define('forum/account/following', ['forum/account/header', 'forum/infinitescroll', 'forum/account/followers'], function(header, infinitescroll, followers) { var Following = {}; Following.init = function() { header.init(); + + infinitescroll.init(function(direction) { + followers.loadMore(direction, 'account/following', 'following:' + $('.account-username-box').attr('data-uid')); + }); }; return Following; diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 2732c593dc..63a2d91000 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -45,9 +45,6 @@ function getUserDataByUserSlug(userslug, callerUID, callback) { isAdmin : function(next) { user.isAdministrator(callerUID, next); }, - followStats: function(next) { - user.getFollowStats(uid, next); - }, ips: function(next) { user.getIPs(uid, 4, next); }, @@ -97,8 +94,8 @@ function getUserDataByUserSlug(userslug, callerUID, callback) { userData.status = websockets.isUserOnline(userData.uid) ? (userData.status || 'online') : 'offline'; userData.banned = parseInt(userData.banned, 10) === 1; userData.websiteName = userData.website.replace(validator.escape('http://'), '').replace(validator.escape('https://'), ''); - userData.followingCount = results.followStats.followingCount; - userData.followerCount = results.followStats.followerCount; + userData.followingCount = parseInt(userData.followingCount, 10) || 0; + userData.followerCount = parseInt(userData.followerCount, 10) || 0; callback(null, userData); }); @@ -206,14 +203,15 @@ function getFollow(tpl, name, req, res, next) { return helpers.notFound(req, res); } var method = name === 'following' ? 'getFollowing' : 'getFollowers'; - user[method](userData.uid, next); + user[method](userData.uid, 0, 49, next); } ], function(err, users) { if(err) { return next(err); } - userData[name] = users; - userData[name + 'Count'] = users.length; + + userData.users = users; + userData.nextStart = 50; res.render(tpl, userData); }); diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 023a823f88..d28421c383 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -329,27 +329,28 @@ SocketUser.loadMore = function(socket, data, callback) { return callback(new Error('[[error:no-privileges]]')); } - var start = data.after, + var start = parseInt(data.after, 10), end = start + 19; user.getUsersFromSet(data.set, start, end, function(err, userData) { - if(err) { + if (err) { return callback(err); } user.isAdministrator(socket.uid, function (err, isAdministrator) { - if(err) { + if (err) { return callback(err); } - if(!isAdministrator && data.set === 'users:online') { + if (!isAdministrator && data.set === 'users:online') { userData = userData.filter(function(item) { return item.status !== 'offline'; }); } callback(null, { - users: userData + users: userData, + nextStart: end + 1 }); }); }); diff --git a/src/upgrade.js b/src/upgrade.js index 23194cddf9..10ca9fef14 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 0, 13); + latestSchema = Date.UTC(2015, 0, 14); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -566,6 +566,70 @@ Upgrade.upgrade = function(callback) { winston.info('[2015/01/13] Creating uid:followed_tids sorted set skipped'); next(); } + }, + function(next) { + thisSchemaDate = Date.UTC(2015, 0, 14); + if (schemaDate < thisSchemaDate) { + winston.info('[2015/01/14] Upgrading follow sets to sorted sets'); + + db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) { + if (err) { + winston.error('[2014/01/14] Error encountered while Upgrading follow sets to sorted sets'); + return next(err); + } + + var now = Date.now(); + + async.eachLimit(uids, 50, function(uid, next) { + async.parallel({ + following: function(next) { + db.getSetMembers('following:' + uid, next); + }, + followers: function(next) { + db.getSetMembers('followers:' + uid, next); + } + }, function(err, results) { + function updateToSortedSet(set, uids, callback) { + async.eachLimit(uids, 50, function(uid, next) { + if (parseInt(uid, 10)) { + db.sortedSetAdd(set, now, uid, next); + } else { + next(); + } + }, callback); + } + if (err) { + return next(err); + } + + async.parallel([ + async.apply(db.delete, 'following:' + uid), + async.apply(db.delete, 'followers:' + uid) + ], function(err) { + if (err) { + return next(err); + } + async.parallel([ + async.apply(updateToSortedSet, 'following:' + uid, results.following), + async.apply(updateToSortedSet, 'followers:' + uid, results.followers), + async.apply(db.setObjectField, 'user:' + uid, 'followingCount', results.following.length), + async.apply(db.setObjectField, 'user:' + uid, 'followerCount', results.followers.length), + ], next); + }); + }); + }, function(err) { + if (err) { + winston.error('[2015/01/14] Error encountered while Upgrading follow sets to sorted sets'); + return next(err); + } + winston.info('[2015/01/14] Upgrading follow sets to sorted sets done'); + Upgrade.update(thisSchemaDate, next); + }); + }); + } else { + winston.info('[2015/01/14] Upgrading follow sets to sorted sets skipped'); + next(); + } } // Add new schema updates here diff --git a/src/user/follow.js b/src/user/follow.js index 94b9d555f8..4c4dfc5223 100644 --- a/src/user/follow.js +++ b/src/user/follow.js @@ -23,29 +23,40 @@ module.exports = function(User) { return callback(new Error('[[error:you-cant-follow-yourself]]')); } - var command = type === 'follow' ? 'setAdd' : 'setRemove'; - db[command]('following:' + uid, theiruid, function(err) { - if(err) { - return callback(err); - } - db[command]('followers:' + theiruid, uid, callback); - }); + var now = Date.now(); + + if (type === 'follow') { + async.parallel([ + async.apply(db.sortedSetAdd, 'following:' + uid, now, theiruid), + async.apply(db.sortedSetAdd, 'followers:' + theiruid, now, uid), + async.apply(User.incrementUserFieldBy, uid, 'followingCount', 1), + async.apply(User.incrementUserFieldBy, theiruid, 'followerCount', 1) + ], callback); + + } else { + async.parallel([ + async.apply(db.sortedSetRemove, 'following:' + uid, theiruid), + async.apply(db.sortedSetRemove, 'followers:' + theiruid, uid), + async.apply(User.decrementUserFieldBy, uid, 'followingCount', 1), + async.apply(User.decrementUserFieldBy, theiruid, 'followerCount', 1) + ], callback); + } } - User.getFollowing = function(uid, callback) { - getFollow(uid, 'following:' + uid, callback); + User.getFollowing = function(uid, start, end, callback) { + getFollow(uid, 'following:' + uid, start, end, callback); }; - User.getFollowers = function(uid, callback) { - getFollow(uid, 'followers:' + uid, callback); + User.getFollowers = function(uid, start, end, callback) { + getFollow(uid, 'followers:' + uid, start, end, callback); }; - function getFollow(uid, set, callback) { + function getFollow(uid, set, start, end, callback) { if (!parseInt(uid, 10)) { return callback(null, []); } - db.getSetMembers(set, function(err, uids) { + db.getSortedSetRevRange(set, start, end, function(err, uids) { if (err) { return callback(err); } @@ -54,36 +65,11 @@ module.exports = function(User) { }); } - User.getFollowingCount = function(uid, callback) { - if (!parseInt(uid, 10)) { - return callback(null, 0); - } - db.setCount('following:' + uid, callback); - }; - - User.getFollowerCount = function(uid, callback) { - if (!parseInt(uid, 10)) { - return callback(null, 0); - } - db.setCount('followers:' + uid, callback); - }; - - User.getFollowStats = function (uid, callback) { - async.parallel({ - followingCount: function(next) { - User.getFollowingCount(uid, next); - }, - followerCount : function(next) { - User.getFollowerCount(uid, next); - } - }, callback); - }; - User.isFollowing = function(uid, theirid, callback) { if (!parseInt(uid, 10) || !parseInt(theirid, 10)) { return callback(null, false); } - db.isSetMember('following:' + uid, theirid, callback); + db.isSortedSetMember('following:' + uid, theirid, callback); }; }; From e414008c59b3fa156c07339a9fb12e24d68d0819 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 13 Jan 2015 17:30:44 -0500 Subject: [PATCH 101/897] closes #2584 --- src/user/follow.js | 4 +--- src/user/notifications.js | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/user/follow.js b/src/user/follow.js index 4c4dfc5223..c3e2cb340c 100644 --- a/src/user/follow.js +++ b/src/user/follow.js @@ -23,16 +23,14 @@ module.exports = function(User) { return callback(new Error('[[error:you-cant-follow-yourself]]')); } - var now = Date.now(); - if (type === 'follow') { + var now = Date.now(); async.parallel([ async.apply(db.sortedSetAdd, 'following:' + uid, now, theiruid), async.apply(db.sortedSetAdd, 'followers:' + theiruid, now, uid), async.apply(User.incrementUserFieldBy, uid, 'followingCount', 1), async.apply(User.incrementUserFieldBy, theiruid, 'followerCount', 1) ], callback); - } else { async.parallel([ async.apply(db.sortedSetRemove, 'following:' + uid, theiruid), diff --git a/src/user/notifications.js b/src/user/notifications.js index 6e65d37649..ccadf4f999 100644 --- a/src/user/notifications.js +++ b/src/user/notifications.js @@ -7,7 +7,6 @@ var async = require('async'), S = require('string'), user = require('../user'), - utils = require('../../public/src/utils'), db = require('../database'), meta = require('../meta'), notifications = require('../notifications'), From aeafbe6170fc9b4fd3e0260ff88e3d1797045ff8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Jan 2015 09:29:44 -0500 Subject: [PATCH 102/897] better widget representation on smaller screens --- src/views/admin/extend/widgets.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index 1f504fbdf1..cf2f3f194e 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -42,7 +42,7 @@
    -
    +
    {widgets.name} From 6ac04e9da76aebb6ac80a9f6e3c7175874a1221f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Jan 2015 09:33:02 -0500 Subject: [PATCH 103/897] closed #2609 --- src/groups.js | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/groups.js b/src/groups.js index a3799b4bcf..48572c5d17 100644 --- a/src/groups.js +++ b/src/groups.js @@ -444,18 +444,24 @@ var async = require('async'), return callback(err || new Error('[[error:no-group]]')); } - db.setObject('group:' + groupName, { - userTitle: values.userTitle || '', - description: values.description || '', - icon: values.icon || '', - labelColor: values.labelColor || '#000000', - hidden: values.hidden || '0', - 'private': values.private === false ? '0' : '1' - }, function(err) { + var values = { + userTitle: values.userTitle || '', + description: values.description || '', + icon: values.icon || '', + labelColor: values.labelColor || '#000000', + hidden: values.hidden || '0', + 'private': values.private === false ? '0' : '1' + }; + + db.setObject('group:' + groupName, values, function(err) { if (err) { return callback(err); } + plugins.fireHook('action:group.updated', { + name: 'group:' + groupName, + values: values + }); renameGroup(groupName, values.name, callback); }); }); @@ -511,6 +517,14 @@ var async = require('async'), }, function(next) { renameGroupMember('groups', oldName, newName, next); + }, + function(next) { + plugins.fireHook('action:group.rename', { + old: oldName, + new: newName + }); + + next(); } ], callback); }); From d02f7e0e42d93965eb0a15a9ccf4bab9f351a044 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Jan 2015 09:42:09 -0500 Subject: [PATCH 104/897] #2609 --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 48572c5d17..ec21035228 100644 --- a/src/groups.js +++ b/src/groups.js @@ -459,7 +459,7 @@ var async = require('async'), } plugins.fireHook('action:group.updated', { - name: 'group:' + groupName, + name: groupName, values: values }); renameGroup(groupName, values.name, callback); From fc75e3258d828e3f53b5f3997a68037648900298 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Jan 2015 09:44:43 -0500 Subject: [PATCH 105/897] closed #2608 --- src/views/admin/extend/widgets.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index cf2f3f194e..62ea972ea9 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -76,7 +76,7 @@
    Jumbotron
    -
    +
    Panel
    From 7289d50e6c3c8f0800d9ef9c8695248589388026 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Jan 2015 09:46:13 -0500 Subject: [PATCH 106/897] whoops, fixing travis and groups --- src/groups.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/groups.js b/src/groups.js index ec21035228..3d0bbe6d6c 100644 --- a/src/groups.js +++ b/src/groups.js @@ -444,7 +444,7 @@ var async = require('async'), return callback(err || new Error('[[error:no-group]]')); } - var values = { + var payload = { userTitle: values.userTitle || '', description: values.description || '', icon: values.icon || '', @@ -453,16 +453,16 @@ var async = require('async'), 'private': values.private === false ? '0' : '1' }; - db.setObject('group:' + groupName, values, function(err) { + db.setObject('group:' + groupName, payload, function(err) { if (err) { return callback(err); } plugins.fireHook('action:group.updated', { name: groupName, - values: values + values: payload }); - renameGroup(groupName, values.name, callback); + renameGroup(groupName, payload.name, callback); }); }); }; From 87b9a60610aec65a974a5b8c85d542062ec689f5 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Jan 2015 10:04:50 -0500 Subject: [PATCH 107/897] fixed group renaming, ping @schamper --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 3d0bbe6d6c..da7a0f2a41 100644 --- a/src/groups.js +++ b/src/groups.js @@ -462,7 +462,7 @@ var async = require('async'), name: groupName, values: payload }); - renameGroup(groupName, payload.name, callback); + renameGroup(groupName, values.name, callback); }); }); }; From 86a69796069692b50f591ad1770f66f49deb2ab2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Jan 2015 11:18:45 -0500 Subject: [PATCH 108/897] added comments to explain the voting logic --- src/favourites.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/favourites.js b/src/favourites.js index 4f5ff90274..0673626f51 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -183,11 +183,11 @@ var async = require('async'), hook, current = voteStatus.upvoted ? 'upvote' : 'downvote'; - if (voteStatus.upvoted && command === 'downvote' || voteStatus.downvoted && command === 'upvote') { + if (voteStatus.upvoted && command === 'downvote' || voteStatus.downvoted && command === 'upvote') { // e.g. User *has* upvoted, and clicks downvote hook = command; - } else if (voteStatus.upvoted || voteStatus.downvoted) { + } else if (voteStatus.upvoted || voteStatus.downvoted) { // e.g. User *has* upvotes, clicks upvote (so we "unvote") hook = 'unvote'; - } else { + } else { // e.g. User *has not* voted, clicks upvote hook = command; current = 'unvote'; } From 468d2be66860da098a45c39025374841031ac70c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 14 Jan 2015 11:47:01 -0500 Subject: [PATCH 109/897] added error checks and missing returns to widgets closes #2611 --- src/widgets.js | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/src/widgets.js b/src/widgets.js index 0390b2d1f0..7a46fc7e9b 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -12,12 +12,13 @@ var async = require('async'), Widgets.render = function(uid, area, callback) { if (!area.locations || !area.template) { - callback({ - error: 'Missing location and template data' - }); + return callback(new Error('[[error:invalid-data]]')); } Widgets.getAreas(['global', area.template], area.locations, function(err, data) { + if (err) { + return callback(err); + } var widgetsByLocation = {}; @@ -39,6 +40,10 @@ var async = require('async'), area: area, data: widget.data }, function(err, html) { + if (err) { + return next(err); + } + if (widget.data.container && widget.data.container.match('{body}')) { html = templates.parse(widget.data.container, { title: widget.data.title, @@ -46,7 +51,7 @@ var async = require('async'), }); } - next(err, {html: html}); + next(null, {html: html}); }); }, function(err, widgets) { done(err, {location: location, widgets: widgets.filter(Boolean)}); @@ -70,7 +75,12 @@ var async = require('async'), returnData[template] = returnData[template] || {}; locations.forEach(function(location) { if (data && data[index] && data[index][location]) { - returnData[template][location] = JSON.parse(data[index][location]); + try { + returnData[template][location] = JSON.parse(data[index][location]); + } catch(err) { + winston.error('can not parse widget data. template: ' + template + ' location: ' + location); + returnData[template][location] = []; + } } else { returnData[template][location] = []; } @@ -83,23 +93,28 @@ var async = require('async'), Widgets.getArea = function(template, location, callback) { db.getObjectField('widgets:' + template, location, function(err, widgets) { + if (err) { + return callback(err); + } if (!widgets) { - return callback(err, []); + return callback(null, []); } - callback(err, JSON.parse(widgets)); + try { + widgets = JSON.parse(widgets); + } catch(err) { + return callback(err); + } + + callback(null, widgets); }); }; Widgets.setArea = function(area, callback) { if (!area.location || !area.template) { - callback({ - error: 'Missing location and template data' - }); + return callback(new Error('Missing location and template data')); } - db.setObjectField('widgets:' + area.template, area.location, JSON.stringify(area.widgets), function(err) { - callback(err); - }); + db.setObjectField('widgets:' + area.template, area.location, JSON.stringify(area.widgets), callback); }; Widgets.reset = function(callback) { @@ -108,10 +123,17 @@ var async = require('async'), ]; plugins.fireHook('filter:widgets.getAreas', defaultAreas, function(err, areas) { + if (err) { + return callback(err); + } var drafts = []; async.each(areas, function(area, next) { Widgets.getArea(area.template, area.location, function(err, areaData) { + if (err) { + return callback(err); + } + drafts = drafts.concat(areaData); area.widgets = []; Widgets.setArea(area, next); From d9a7547e63c0ee490662cd2b1b45ddc8b8dc137c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 14 Jan 2015 11:49:04 -0500 Subject: [PATCH 110/897] next(err) --- src/widgets.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/widgets.js b/src/widgets.js index 7a46fc7e9b..047befa8c2 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -131,7 +131,7 @@ var async = require('async'), async.each(areas, function(area, next) { Widgets.getArea(area.template, area.location, function(err, areaData) { if (err) { - return callback(err); + return next(err); } drafts = drafts.concat(areaData); @@ -139,6 +139,9 @@ var async = require('async'), Widgets.setArea(area, next); }); }, function(err) { + if (err) { + return callback(err); + } Widgets.setArea({ template: 'global', location: 'drafts', From 188c667580fbb766d7f177dd9b79b89669572086 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Jan 2015 14:48:25 -0500 Subject: [PATCH 111/897] closed #2612 --- src/meta.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/meta.js b/src/meta.js index 30a9e96e75..0e07681223 100644 --- a/src/meta.js +++ b/src/meta.js @@ -69,6 +69,7 @@ var async = require('async'), if (!err) { emitter.emit('nodebb:ready'); } + Meta.reloadRequired = false; callback(err); }); From 8f5bf1a7edc991f7b40c3f8520cec87b8b10b8f8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 14 Jan 2015 15:29:57 -0500 Subject: [PATCH 112/897] closes #2587 --- src/topics/delete.js | 21 ++++++++++++++------- src/upgrade.js | 41 +++++++++++++++++++++++++++++++++++++++-- src/user.js | 5 ++++- src/user/create.js | 1 + 4 files changed, 58 insertions(+), 10 deletions(-) diff --git a/src/topics/delete.js b/src/topics/delete.js index de86eb7bbc..1bb8e0798c 100644 --- a/src/topics/delete.js +++ b/src/topics/delete.js @@ -3,6 +3,7 @@ var async = require('async'), db = require('../database'), + user = require('../user'), plugins = require('../plugins'); @@ -77,13 +78,19 @@ module.exports = function(Topics) { if (err) { return callback(err); } - - db.sortedSetsRemove([ - 'cid:' + topicData.cid + ':tids', - 'cid:' + topicData.cid + ':tids:posts', - 'cid:' + topicData.cid + ':uid:' + topicData.uid + ':tids', - 'uid:' + topicData.uid + ':topics' - ], tid, callback); + async.parallel([ + function(next) { + db.sortedSetsRemove([ + 'cid:' + topicData.cid + ':tids', + 'cid:' + topicData.cid + ':tids:posts', + 'cid:' + topicData.cid + ':uid:' + topicData.uid + ':tids', + 'uid:' + topicData.uid + ':topics' + ], tid, next); + }, + function(next) { + user.decrementUserFieldBy(topicData.uid, 'topiccount', 1, next); + } + ], callback); }); } diff --git a/src/upgrade.js b/src/upgrade.js index 10ca9fef14..35f3acaa87 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 0, 14); + latestSchema = Date.UTC(2015, 0, 15); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -630,7 +630,44 @@ Upgrade.upgrade = function(callback) { winston.info('[2015/01/14] Upgrading follow sets to sorted sets skipped'); next(); } - } + }, + function(next) { + thisSchemaDate = Date.UTC(2015, 0, 15); + if (schemaDate < thisSchemaDate) { + winston.info('[2015/01/15] Creating topiccount for users'); + + db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) { + if (err) { + winston.error('[2014/01/15] Error encountered while Creating topiccount for users'); + return next(err); + } + + async.eachLimit(uids, 50, function(uid, next) { + db.sortedSetCard('uid:' + uid + ':topics', function(err, count) { + if (err) { + return next(err); + } + + if (parseInt(count, 10)) { + db.setObjectField('user:' + uid, 'topiccount', count, next); + } else { + next(); + } + }); + }, function(err) { + if (err) { + winston.error('[2015/01/15] Error encountered while Creating topiccount for users'); + return next(err); + } + winston.info('[2015/01/15] Creating topiccount for users done'); + Upgrade.update(thisSchemaDate, next); + }); + }); + } else { + winston.info('[2015/01/15] Creating topiccount for users skipped'); + next(); + } + }, // Add new schema updates here // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 22!!! diff --git a/src/user.js b/src/user.js index a640b946d7..0a83994964 100644 --- a/src/user.js +++ b/src/user.js @@ -287,7 +287,10 @@ var async = require('async'), }; User.addTopicIdToUser = function(uid, tid, timestamp, callback) { - db.sortedSetAdd('uid:' + uid + ':topics', timestamp, tid, callback); + async.parallel([ + async.apply(db.sortedSetAdd, 'uid:' + uid + ':topics', timestamp, tid), + async.apply(User.incrementUserFieldBy, uid, 'topiccount', 1) + ], callback); }; User.exists = function(userslug, callback) { diff --git a/src/user/create.js b/src/user/create.js index e43c612488..d02635a550 100644 --- a/src/user/create.js +++ b/src/user/create.js @@ -43,6 +43,7 @@ module.exports = function(User) { 'profileviews': 0, 'reputation': 0, 'postcount': 0, + 'topiccount': 0, 'lastposttime': 0, 'banned': 0, 'status': 'online' From cd99324286417fc232ba21c0c85b0266796a6c83 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 14 Jan 2015 16:02:29 -0500 Subject: [PATCH 113/897] closes #2413, closes #2599 --- src/categories.js | 4 +--- src/controllers/categories.js | 36 ++++++++++++----------------------- src/topics/popular.js | 33 +++++++++++++++----------------- 3 files changed, 28 insertions(+), 45 deletions(-) diff --git a/src/categories.js b/src/categories.js index 675eb4a80b..574e435081 100644 --- a/src/categories.js +++ b/src/categories.js @@ -64,9 +64,7 @@ var async = require('async'), category.isIgnored = results.isIgnored[0]; category.topic_row_size = 'col-md-9'; - plugins.fireHook('filter:category.get', {category: category, uid: data.uid}, function(err, data) { - callback(err, data ? data.category : null); - }); + callback(null, category); }); }); }; diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 75b80a17d0..06b2b957fa 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -22,12 +22,7 @@ categoriesController.recent = function(req, res, next) { data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; - plugins.fireHook('filter:category.get', {category: data, uid: uid}, function(err, data) { - if (err) { - return next(err); - } - res.render('recent', data.category); - }); + res.render('recent', data); }); }; @@ -49,24 +44,22 @@ categoriesController.popular = function(req, res, next) { } } - topics.getPopular(term, uid, meta.config.topicsPerList, function(err, data) { + topics.getPopular(term, uid, meta.config.topicsPerList, function(err, topics) { if (err) { return next(err); } - data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; + var data = { + topics: topics, + 'feeds:disableRSS': parseInt(meta.config['feeds:disableRSS'], 10) === 1 + }; - plugins.fireHook('filter:category.get', {category: {topics: data}, uid: uid}, function(err, data) { - if (err) { - return next(err); - } - if (uid === 0) { - anonCache[term] = data.category; - lastUpdateTime = Date.now(); - } + if (uid === 0) { + anonCache[term] = data; + lastUpdateTime = Date.now(); + } - res.render('popular', data.category); - }); + res.render('popular', data); }); }; @@ -78,12 +71,7 @@ categoriesController.unread = function(req, res, next) { return next(err); } - plugins.fireHook('filter:category.get', {category: data, uid: uid}, function(err, data) { - if (err) { - return next(err); - } - res.render('unread', data.category); - }); + res.render('unread', data); }); }; diff --git a/src/topics/popular.js b/src/topics/popular.js index 1f8ff31bf3..ce2182cabf 100644 --- a/src/topics/popular.js +++ b/src/topics/popular.js @@ -32,24 +32,21 @@ module.exports = function(Topics) { } function getTopics(tids, uid, count, callback) { - Topics.getTopicsFields(tids, ['tid', 'postcount'], function(err, topics) { - if (err) { - return callback(err); + async.waterfall([ + function(next) { + Topics.getTopicsFields(tids, ['tid', 'postcount'], next); + }, + function(topics, next) { + tids = topics.sort(function(a, b) { + return b.postcount - a.postcount; + }).slice(0, count).map(function(topic) { + return topic.tid; + }); + privileges.topics.filter('read', tids, uid, next); + }, + function(tids, next) { + Topics.getTopicsByTids(tids, uid, next); } - - tids = topics.sort(function(a, b) { - return b.postcount - a.postcount; - }).slice(0, count).map(function(topic) { - return topic.tid; - }); - - privileges.topics.filter('read', tids, uid, function(err, tids) { - if (err) { - return callback(err); - } - - Topics.getTopicsByTids(tids, uid, callback); - }); - }); + ], callback); } }; From 36a49cd9943e1620ce4fab17be85d9953c3b548a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 10:44:27 -0500 Subject: [PATCH 114/897] guests can no longer attempt to join a group, #2588 --- public/src/client/groups/details.js | 2 +- src/groups.js | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 62371368e8..c439216d25 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -58,7 +58,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', if (!err) { ajaxify.refresh(); } else { - app.alertError(err); + app.alertError(err.message); } }); break; diff --git a/src/groups.js b/src/groups.js index da7a0f2a41..0f41e1654f 100644 --- a/src/groups.js +++ b/src/groups.js @@ -599,11 +599,15 @@ var async = require('async'), }; Groups.requestMembership = function(groupName, uid, callback) { - db.setAdd('group:' + groupName + ':pending', uid, callback); - plugins.fireHook('action:groups.requestMembership', { - groupName: groupName, - uid: uid - }); + if (parseInt(uid, 10) > 0) { + db.setAdd('group:' + groupName + ':pending', uid, callback); + plugins.fireHook('action:groups.requestMembership', { + groupName: groupName, + uid: uid + }); + } else { + callback(new Error('[[error:not-logged-in]]')); + } }; Groups.acceptMembership = function(groupName, uid, callback) { From 666cef402902f2aa907527b2f209651bf1694ef8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 10:53:21 -0500 Subject: [PATCH 115/897] updated hooks action:groups.join, action:groups.leave, and action:groups.requestMembership to match other action hooks in group namespace (that's "group", not "groups"), ping @EisFrei --- src/groups.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/groups.js b/src/groups.js index 0f41e1654f..a10acab287 100644 --- a/src/groups.js +++ b/src/groups.js @@ -573,7 +573,7 @@ var async = require('async'), Groups.exists(groupName, function(err, exists) { if (exists) { db.setAdd('group:' + groupName + ':members', uid, callback); - plugins.fireHook('action:groups.join', { + plugins.fireHook('action:group.join', { groupName: groupName, uid: uid }); @@ -589,7 +589,7 @@ var async = require('async'), Groups.hide(groupName); db.setAdd('group:' + groupName + ':members', uid, callback); - plugins.fireHook('action:groups.join', { + plugins.fireHook('action:group.join', { groupName: groupName, uid: uid }); @@ -601,7 +601,7 @@ var async = require('async'), Groups.requestMembership = function(groupName, uid, callback) { if (parseInt(uid, 10) > 0) { db.setAdd('group:' + groupName + ':pending', uid, callback); - plugins.fireHook('action:groups.requestMembership', { + plugins.fireHook('action:group.requestMembership', { groupName: groupName, uid: uid }); From 2ed6b78cc5325fe676960b04ff760c0ca92eb289 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 10:54:55 -0500 Subject: [PATCH 116/897] missed one, ping @EisFrei --- src/groups.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/groups.js b/src/groups.js index a10acab287..797a5b1ba3 100644 --- a/src/groups.js +++ b/src/groups.js @@ -428,7 +428,12 @@ var async = require('async'), tasks.push(async.apply(db.setAdd, 'group:' + data.name + ':members', data.ownerUid)); } - async.parallel(tasks, callback); + async.parallel(tasks, function(err) { + plugins.fireHook('action:group.create', { + name: data.name + }); + callback(err); + }); }); }; @@ -564,7 +569,10 @@ var async = require('async'), }, next); }); } - ], callback); + ], function(err) { + plugins.fireHook('action:group.') + callback(err); + }); }; Groups.join = function(groupName, uid, callback) { @@ -629,7 +637,7 @@ var async = require('async'), return callback(err); } - plugins.fireHook('action:groups.leave', { + plugins.fireHook('action:group.leave', { groupName: groupName, uid: uid }); From cfdd4ec164e4a894fa8ddfbf2d8e27824f7435d4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 10:55:10 -0500 Subject: [PATCH 117/897] Revert "missed one, ping @EisFrei" This reverts commit 2ed6b78cc5325fe676960b04ff760c0ca92eb289. --- src/groups.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/groups.js b/src/groups.js index 797a5b1ba3..a10acab287 100644 --- a/src/groups.js +++ b/src/groups.js @@ -428,12 +428,7 @@ var async = require('async'), tasks.push(async.apply(db.setAdd, 'group:' + data.name + ':members', data.ownerUid)); } - async.parallel(tasks, function(err) { - plugins.fireHook('action:group.create', { - name: data.name - }); - callback(err); - }); + async.parallel(tasks, callback); }); }; @@ -569,10 +564,7 @@ var async = require('async'), }, next); }); } - ], function(err) { - plugins.fireHook('action:group.') - callback(err); - }); + ], callback); }; Groups.join = function(groupName, uid, callback) { @@ -637,7 +629,7 @@ var async = require('async'), return callback(err); } - plugins.fireHook('action:group.leave', { + plugins.fireHook('action:groups.leave', { groupName: groupName, uid: uid }); From 5c6dfb746285053d60cb99735b03d1de238b89a5 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 10:58:31 -0500 Subject: [PATCH 118/897] missed one, @EisFrei --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index a10acab287..53943bf893 100644 --- a/src/groups.js +++ b/src/groups.js @@ -629,7 +629,7 @@ var async = require('async'), return callback(err); } - plugins.fireHook('action:groups.leave', { + plugins.fireHook('action:group.leave', { groupName: groupName, uid: uid }); From d813bda88379be18d315f7c1e2515f977cad70de Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 11:19:38 -0500 Subject: [PATCH 119/897] update, create, destroy hooks, #2609 --- src/groups.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/groups.js b/src/groups.js index 53943bf893..709aaeda05 100644 --- a/src/groups.js +++ b/src/groups.js @@ -428,7 +428,15 @@ var async = require('async'), tasks.push(async.apply(db.setAdd, 'group:' + data.name + ':members', data.ownerUid)); } - async.parallel(tasks, callback); + async.parallel(tasks, function(err) { + if (!err) { + plugins.fireHook('action:group.create', { + name: data.name + }); + } + + callback(err); + }); }); }; @@ -458,7 +466,7 @@ var async = require('async'), return callback(err); } - plugins.fireHook('action:group.updated', { + plugins.fireHook('action:group.update', { name: groupName, values: payload }); @@ -564,7 +572,15 @@ var async = require('async'), }, next); }); } - ], callback); + ], function(err) { + if (!err) { + plugins.fireHook('action:group.destroy', { + name: groupName + }); + } + + callback(err); + }); }; Groups.join = function(groupName, uid, callback) { From 3e666adfea44bca37a786e6d066e93aedc9359b9 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 12:34:11 -0500 Subject: [PATCH 120/897] action:plugin.install and uninstall --- src/plugins/install.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/install.js b/src/plugins/install.js index e9882cc449..55723f79b5 100644 --- a/src/plugins/install.js +++ b/src/plugins/install.js @@ -64,7 +64,7 @@ module.exports = function(Plugins) { if (err) { return callback(err); } - + var type = installed ? 'uninstall' : 'install'; async.waterfall([ function(next) { Plugins.isActive(id, next); @@ -82,10 +82,14 @@ module.exports = function(Plugins) { npm.load({}, next); }, function(res, next) { - npm.commands[installed ? 'uninstall' : 'install'](installed ? id : [id + '@' + (version || 'latest')], next); + npm.commands[type](installed ? id : [id + '@' + (version || 'latest')], next); } ], function(err) { - callback(err, {id: id, installed: !installed}); + if (err) { + return callback(err); + } + plugins.fireHook('action:plugin.' + type, id); + callback(null, {id: id, installed: !installed}); }); }); } From 429c4022f0ecb8232a820fda4c1ad04a62b4da31 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 12:47:44 -0500 Subject: [PATCH 121/897] closes #2561 --- public/src/admin/manage/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index e2b5a8f408..fdd63556e4 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -28,7 +28,7 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable) } function removeSelected() { - $('#users-container .users-box .selected').remove(); + $('#users-container .users-box .selected').parents('.users-box').remove(); } function done(successMessage, className, flag) { From fa87d883dcfc4565ad3f28104b557ff33253899e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 13:22:10 -0500 Subject: [PATCH 122/897] allowing "hidden" to be passed directly to Groups.create --- src/groups.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/groups.js b/src/groups.js index 709aaeda05..f2d9b38e9a 100644 --- a/src/groups.js +++ b/src/groups.js @@ -414,7 +414,7 @@ var async = require('async'), userTitle: data.name, description: data.description || '', deleted: '0', - hidden: '0', + hidden: data.hidden || '0', system: system ? '1' : '0', 'private': data.private || '1' }, @@ -596,14 +596,14 @@ var async = require('async'), } else { Groups.create({ name: groupName, - description: '' + description: '', + hidden: 1 }, function(err) { if (err && err.message !== '[[error:group-already-exists]]') { winston.error('[groups.join] Could not create new hidden group: ' + err.message); return callback(err); } - Groups.hide(groupName); db.setAdd('group:' + groupName + ':members', uid, callback); plugins.fireHook('action:group.join', { groupName: groupName, From c324d71727a090517b8511ab70b95b899d52649e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 13:33:49 -0500 Subject: [PATCH 123/897] closes #2610 --- src/views/admin/extend/widgets.tpl | 36 ++++++++++++++++-------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index 62ea972ea9..3e172566b2 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -3,29 +3,31 @@
    Widget Areas
    -
    - -
    - -
    - -
    -

    {templates.areas.name} {templates.template} / {templates.areas.location}

    -
    + + +
    +
    +
    + +
    + +
    +

    {templates.areas.name} {templates.template} / {templates.areas.location}

    +
    +
    +
    - +
    - +
    - -
    From d4d99cba7cb0cca77085bad7eaeaab44e2be81e8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 13:53:17 -0500 Subject: [PATCH 124/897] fixes #2615 --- src/plugins/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/install.js b/src/plugins/install.js index 55723f79b5..a95f16b3b1 100644 --- a/src/plugins/install.js +++ b/src/plugins/install.js @@ -88,7 +88,7 @@ module.exports = function(Plugins) { if (err) { return callback(err); } - plugins.fireHook('action:plugin.' + type, id); + Plugins.fireHook('action:plugin.' + type, id); callback(null, {id: id, installed: !installed}); }); }); From 5bc078d9dff7b7a60433089e8cca3907c0fdea8a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 13:56:53 -0500 Subject: [PATCH 125/897] latest spanish translations --- public/language/es/category.json | 2 +- public/language/es/login.json | 8 ++++---- public/language/es/modules.json | 12 ++++++------ public/language/es/recent.json | 2 +- public/language/es/register.json | 10 +++++----- public/language/es/reset_password.json | 18 +++++++++--------- public/language/es/success.json | 8 ++++---- public/language/es/unread.json | 8 ++++---- public/language/es/users.json | 6 +++--- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/public/language/es/category.json b/public/language/es/category.json index 7146b3eed2..2bc1d330df 100644 --- a/public/language/es/category.json +++ b/public/language/es/category.json @@ -1,5 +1,5 @@ { - "new_topic_button": "Nuevo Tema", + "new_topic_button": "Nuevo tema", "no_topics": "No hay temas en esta categoría.
    ¿Por que no te animas y publicas uno?", "browsing": "viendo ahora", "no_replies": "Nadie ha respondido aún", diff --git a/public/language/es/login.json b/public/language/es/login.json index 7eb903ac87..abf84d1921 100644 --- a/public/language/es/login.json +++ b/public/language/es/login.json @@ -2,8 +2,8 @@ "username": "Usuario / Email", "remember_me": "¿Recordarme?", "forgot_password": "¿Olvidaste tu contraseña?", - "alternative_logins": "Conexiones Alternativas", - "failed_login_attempt": "Error al iniciar sesión, intentalo otra vez.", - "login_successful": "¡Te has conectado con éxito!", - "dont_have_account": "No tienes una cuenta creada?" + "alternative_logins": "Métodos alternativos", + "failed_login_attempt": "Error al iniciar sesión, inténtalo otra vez.", + "login_successful": "¡Identificado satisfactoriamente!", + "dont_have_account": "¿Aún no tienes cuenta?" } \ No newline at end of file diff --git a/public/language/es/modules.json b/public/language/es/modules.json index ade76dc88a..6c7642869b 100644 --- a/public/language/es/modules.json +++ b/public/language/es/modules.json @@ -3,19 +3,19 @@ "chat.placeholder": "Introduce tu mensaje aquí, pulsa intro para enviar", "chat.send": "Enviar", "chat.no_active": "No tiene conversaciones activas.", - "chat.user_typing": "%1 está escribiendo ...", + "chat.user_typing": "%1 está escribiendo...", "chat.user_has_messaged_you": "%1 te ha enviado un mensaje.", "chat.see_all": "Ver todas las conversaciones", - "chat.no-messages": "Por favor selecciona un contacto para ver el historial de mensajes", + "chat.no-messages": "Por favor, selecciona un contacto para ver el historial de mensajes", "chat.recent-chats": "Chats recientes", "chat.contacts": "Contactos", "chat.message-history": "Historial de mensajes", "chat.pop-out": "Mostrar en ventana independiente", "chat.maximize": "Maximizar", - "chat.seven_days": "7 Días", - "chat.thirty_days": "30 Días", - "chat.three_months": "3 Meses", + "chat.seven_days": "7 días", + "chat.thirty_days": "30 días", + "chat.three_months": "3 meses", "composer.user_said_in": "%1 dijo en %2:", "composer.user_said": "%1 dijo:", - "composer.discard": "¿Estás seguro de que deseas descargar este post?" + "composer.discard": "¿Estás seguro de que deseas descartar este mensaje?" } \ No newline at end of file diff --git a/public/language/es/recent.json b/public/language/es/recent.json index 7a86201674..e0188789af 100644 --- a/public/language/es/recent.json +++ b/public/language/es/recent.json @@ -5,5 +5,5 @@ "month": "Mes", "year": "Año", "alltime": "Siempre", - "no_recent_topics": "No hay publicaciones recientes" + "no_recent_topics": "No hay publicaciones recientes." } \ No newline at end of file diff --git a/public/language/es/register.json b/public/language/es/register.json index ddc0aeffd7..4ffa4d8bdd 100644 --- a/public/language/es/register.json +++ b/public/language/es/register.json @@ -5,12 +5,12 @@ "help.minimum_password_length": "Tu contraseña debe tener al menos %1 carácteres.", "email_address": "Correo electrónico", "email_address_placeholder": "Escribe tu correo electrónico", - "username": "Usuario", - "username_placeholder": "Escribe tu usuario", + "username": "Nombre de usuario", + "username_placeholder": "Introduce tu nombre de usuario", "password": "Contraseña", - "password_placeholder": "Escribe tu Contraseña", - "confirm_password": "Confirmar Contraseña", - "confirm_password_placeholder": "Confirmar Contraseña", + "password_placeholder": "Introduce tu contraseña", + "confirm_password": "Confirmar contraseña", + "confirm_password_placeholder": "Confirmar contraseña", "register_now_button": "Registrarme ahora", "alternative_registration": "Métodos de registro alternativos", "terms_of_use": "Términos y Condiciones de uso", diff --git a/public/language/es/reset_password.json b/public/language/es/reset_password.json index a9f2114972..ea8e2b1fac 100644 --- a/public/language/es/reset_password.json +++ b/public/language/es/reset_password.json @@ -1,14 +1,14 @@ { - "reset_password": "Reiniciar Contraseña", + "reset_password": "Restablecer contraseña", "update_password": "Actualizar contraseña", - "password_changed.title": "Contraseña editada", + "password_changed.title": "Contraseña cambiada", "password_changed.message": "

    La contraseña fue modificada con éxito, por favor inicia sesión de nuevo.", - "wrong_reset_code.title": "Código de reinicio incorrecto", - "wrong_reset_code.message": "El código de reinicio ingresado no es correcto. Por favor inténtalo de nuevo o pide un nuevo código.", - "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.", + "wrong_reset_code.title": "Código de restablecimiento incorrecto", + "wrong_reset_code.message": "El código de restablecimiento ingresado no es correcto. Por favor inténtalo de nuevo o solicita un nuevo código.", + "new_password": "Nueva contraseña", + "repeat_password": "Confirmar contraseña", + "enter_email": "Por favor ingresa tu correo electrónico y te enviaremos un mensaje con indicaciones para restablecer tu cuenta.", "enter_email_address": "Introduce tu correo electrónico", - "password_reset_sent": "Reinicio de contraseña enviado", - "invalid_email": "Correo Electrónico no válido o inexistente!" + "password_reset_sent": "Restablecimiento 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/es/success.json b/public/language/es/success.json index ed5f88db31..ad5ed36c1d 100644 --- a/public/language/es/success.json +++ b/public/language/es/success.json @@ -1,6 +1,6 @@ { - "success": "Exito!", - "topic-post": "Has publicado correctamente.", - "authentication-successful": "El inicio de sesión ha sido correcto!", - "settings-saved": "Su configuración ha sido guardada correctamente." + "success": "¡Éxito!", + "topic-post": "Mensaje publicado satisfactoriamente.", + "authentication-successful": "Identificado satisfactoriamente", + "settings-saved": "¡Ajustes guardados satisfactoriamente!" } \ No newline at end of file diff --git a/public/language/es/unread.json b/public/language/es/unread.json index fa029aafcc..95bd38fd77 100644 --- a/public/language/es/unread.json +++ b/public/language/es/unread.json @@ -2,8 +2,8 @@ "title": "No leído", "no_unread_topics": "No hay temas nuevos para leer.", "load_more": "Cargar más", - "mark_as_read": "Marcar como leído.", - "selected": "Seleccionado", - "all": "Todo", - "topics_marked_as_read.success": "Temas marcados como leídos correctamente!" + "mark_as_read": "Marcar como leído", + "selected": "Seleccionados", + "all": "Todos", + "topics_marked_as_read.success": "¡Temas marcados como leídos!" } \ No newline at end of file diff --git a/public/language/es/users.json b/public/language/es/users.json index 1ebdfd7147..e92d9ca48a 100644 --- a/public/language/es/users.json +++ b/public/language/es/users.json @@ -1,7 +1,7 @@ { - "latest_users": "Últimos Miembros", - "top_posters": "Top Publicadores", - "most_reputation": "Mayor Reputación", + "latest_users": "Últimos usuarios", + "top_posters": "Top por mensajes", + "most_reputation": "Más reputados", "search": "Buscar", "enter_username": "Ingresa el nombre de usuario que quieres buscar", "load_more": "Cargar más", From 6b5b0b9eec9a3e681ac73592b2a65c41cfd52c69 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 14:02:51 -0500 Subject: [PATCH 126/897] proper list tests, added before hooks --- tests/database/list.js | 93 +++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 29 deletions(-) diff --git a/tests/database/list.js b/tests/database/list.js index abb4c0e939..84f1d586da 100644 --- a/tests/database/list.js +++ b/tests/database/list.js @@ -9,9 +9,9 @@ describe('List methods', function() { describe('listAppend()', function() { it('should append to a list', function(done) { - db.listAppend('testList', 5, function(err) { - assert.equal(err, null, 'db.listAppend error'); - assert.equal(arguments.length, 1, 'arguments.length error'); + db.listAppend('testList1', 5, function(err) { + assert.equal(err, null); + assert.equal(arguments.length, 1); done(); }); }); @@ -20,8 +20,8 @@ describe('List methods', function() { describe('listPrepend()', function() { it('should prepend to a list', function(done) { db.listPrepend('testList2', 3, function(err) { - assert.equal(err, null, 'db.listPrepend error'); - assert.equal(arguments.length, 1, 'arguments.length error'); + assert.equal(err, null); + assert.equal(arguments.length, 1); done(); }); }); @@ -35,64 +35,99 @@ describe('List methods', function() { db.listPrepend('testList2', 1, next); } ], function(err) { - assert.equal(err, null, 'db.listPrepend error'); + assert.equal(err, null); done(); }); }); }); describe('getListRange()', function() { + before(function(done) { + async.series([ + function(next) { + db.listAppend('testList3', 7, next); + }, + function(next) { + db.listPrepend('testList3', 3, next); + }, + function(next) { + db.listAppend('testList4', 5, next); + } + ], done); + }); + it('should return an empty list', function(done) { db.getListRange('doesnotexist', 0, -1, function(err, list) { - assert.equal(err, null, 'db.getListRange error'); - assert.equal(arguments.length, 2, 'arguments.length error'); - assert.equal(Array.isArray(list), true, 'list is not an array'); - assert.equal(list.length, 0, 'list not empty'); + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.equal(Array.isArray(list), true); + assert.equal(list.length, 0); done(); }); }); it('should return a list with one element', function(done) { - db.getListRange('testList', 0, 0, function(err, list) { - assert.equal(err, null, 'db.getListRange error'); - assert.equal(Array.isArray(list), true, 'list is not an array'); - assert.equal(list[0], 5, 'list does not have value'); + db.getListRange('testList4', 0, 0, function(err, list) { + assert.equal(err, null); + assert.equal(Array.isArray(list), true,); + assert.equal(list[0], 5); done(); }); }); - it('should return a list with 3 elements 1,2,3', function(done) { + it('should return a list with 2 elements 3, 7', function(done) { db.getListRange('testList2', 0, -1, function(err, list) { - assert.equal(err, null, 'db.getListRange error'); - assert.equal(Array.isArray(list), true, 'list is not an array'); - assert.equal(list.length, 3, 'list length is not 3'); - assert.deepEqual(list, ['1', '2', '3'], 'lists not equal'); + assert.equal(err, null); + assert.equal(Array.isArray(list), true); + assert.equal(list.length, 2); + assert.deepEqual(list, ['3', '7']); done(); }); }); }); describe('listRemoveLast()', function() { - it('should remove the last element of list', function(done) { + before(function(done) { + async.series([ + function(next) { + db.listAppend('testList4', 12, next); + }, + function(next) { + db.listPrepend('testList4', 9, next); + } + ], done); + }); + + it('should remove the last element of list and return it', function(done) { db.listRemoveLast('testList2', function(err, lastElement) { - assert.equal(err, null, 'db.listRemoveLast error'); - assert.equal(arguments.length, 2, 'arguments.length error'); - assert.equal(lastElement, '3', 'last element not correct'); + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.equal(lastElement, '12'); done(); }); }); }); describe('listRemoveAll()', function() { + before(function(done) { + async.series([ + async.apply(db.listAppend, 'testList5', 1), + async.apply(db.listAppend, 'testList5', 1), + async.apply(db.listAppend, 'testList5', 1), + async.apply(db.listAppend, 'testList5', 2), + async.apply(db.listAppend, 'testList5', 5) + ], done); + }); + it('should remove all the matching elements of list', function(done) { db.listRemoveAll('testList2', '1', function(err) { - assert.equal(err, null, 'db.listRemoveAll error'); - assert.equal(arguments.length, 1, 'arguments.length error'); + assert.equal(err, null); + assert.equal(arguments.length, 1); db.getListRange('testList2', 0, -1, function(err, list) { - assert.equal(Array.isArray(list), true, 'list is not an array'); - assert.equal(list.length, 1, 'element not removed'); - assert.equal(list.indexOf('1'), -1, 'element not removed'); + assert.equal(Array.isArray(list), true); + assert.equal(list.length, 2); + assert.equal(list.indexOf('1'), -1); done(); }); }); @@ -103,7 +138,7 @@ describe('List methods', function() { it('should trim list to a certain range', function(done) { var list = ['1', '2', '3', '4', '5']; async.eachSeries(list, function(value, next) { - db.listAppend('testList3', value, next); + db.listAppend('testList6', value, next); }, function(err) { if (err) { return done(err); From 8d232653249097620632d4830ede777f01f64ad8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 15 Jan 2015 14:09:20 -0500 Subject: [PATCH 127/897] sending in groupObj data into group.delete hook --- src/groups.js | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/src/groups.js b/src/groups.js index f2d9b38e9a..696d8a690f 100644 --- a/src/groups.js +++ b/src/groups.js @@ -556,31 +556,27 @@ var async = require('async'), } Groups.destroy = function(groupName, callback) { - async.parallel([ - async.apply(db.delete, 'group:' + groupName), - async.apply(db.setRemove, 'groups', groupName), - async.apply(db.delete, 'group:' + groupName + ':members'), - async.apply(db.delete, 'group:' + groupName + ':pending'), - async.apply(db.delete, 'group:' + groupName + ':owners'), - function(next) { - db.getSetMembers('groups', function(err, groups) { - if (err) { - return next(err); - } - async.each(groups, function(group, next) { - db.setRemove('group:' + group + ':members', groupName, next); - }, next); - }); - } - ], function(err) { - if (!err) { - plugins.fireHook('action:group.destroy', { - name: groupName - }); - } - - callback(err); - }); + Groups.get(groupName, {}, function(err, groupObj) { + plugins.fireHook('action:group.destroy', groupObj); + + async.parallel([ + async.apply(db.delete, 'group:' + groupName), + async.apply(db.setRemove, 'groups', groupName), + async.apply(db.delete, 'group:' + groupName + ':members'), + async.apply(db.delete, 'group:' + groupName + ':pending'), + async.apply(db.delete, 'group:' + groupName + ':owners'), + function(next) { + db.getSetMembers('groups', function(err, groups) { + if (err) { + return next(err); + } + async.each(groups, function(group, next) { + db.setRemove('group:' + group + ':members', groupName, next); + }, next); + }); + } + ], callback); + }) }; Groups.join = function(groupName, uid, callback) { From 74099d1d8c24dfd1f6050ff4ad2584374ca67530 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 14:27:41 -0500 Subject: [PATCH 128/897] proper set tests with before hooks --- tests/database/sets.js | 117 ++++++++++++++++++++++++++++------------- 1 file changed, 81 insertions(+), 36 deletions(-) diff --git a/tests/database/sets.js b/tests/database/sets.js index b93d9a90e7..c109f62039 100644 --- a/tests/database/sets.js +++ b/tests/database/sets.js @@ -1,46 +1,51 @@ 'use strict'; -/*global require, after*/ +/*global require, after, before*/ -var assert = require('assert'), +var async = require('async'), + assert = require('assert'), db = require('../mocks/databasemock'); describe('Set methods', function() { describe('setAdd()', function() { it('should add to a set', function(done) { - db.setAdd('testSet', 5, function(err) { + db.setAdd('testSet1', 5, function(err) { assert.equal(err, null); - assert.equal(arguments.length, 1, 'arguments.length error'); + assert.equal(arguments.length, 1); done(); }); }); it('should add an array to a set', function(done) { - db.setAdd('testSet', [1, 2, 3, 4], function(err) { + db.setAdd('testSet1', [1, 2, 3, 4], function(err) { assert.equal(err, null); - assert.equal(arguments.length, 1, 'arguments.length error'); + assert.equal(arguments.length, 1); done(); }); }); }); describe('getSetMembers()', function() { + before(function(done) { + db.setAdd('testSet2', [1,2,3,4,5], done); + }); + it('should return an empty set', function(done) { db.getSetMembers('doesnotexist', function(err, set) { assert.equal(err, null); - assert.equal(arguments.length, 2, 'arguments.length error'); - assert.equal(Array.isArray(set), true, 'set is not an array'); - assert.equal(set.length, 0, 'set not empty'); + assert.equal(arguments.length, 2); + assert.equal(Array.isArray(set), true); + assert.equal(set.length, 0); done(); }); }); it('should return a set with all elements', function(done) { - db.getSetMembers('testSet', function(err, set) { + db.getSetMembers('testSet2', function(err, set) { assert.equal(err, null); - assert.equal(set.length, 5, 'set is empty'); + assert.equal(set.length, 5); set.forEach(function(value) { - assert.notEqual(['1', '2', '3', '4', '5'].indexOf(value), -1, 'set does not have correct elements'); + assert.notEqual(['1', '2', '3', '4', '5'].indexOf(value), -1); }); done(); @@ -52,40 +57,48 @@ describe('Set methods', function() { it('should add to multiple sets', function(done) { db.setsAdd(['set1', 'set2'], 'value', function(err) { assert.equal(err, null); - assert.equal(arguments.length, 1, 'arguments.length error'); + assert.equal(arguments.length, 1); done(); }); }); }); describe('getSetsMembers()', function() { + before(function(done) { + db.setsAdd(['set3', 'set4'], 'value', done); + }); + it('should return members of two sets', function(done) { - db.getSetsMembers(['set1', 'set2'], function(err, sets) { + db.getSetsMembers(['set3', 'set4'], function(err, sets) { assert.equal(err, null); - assert.equal(Array.isArray(sets), true, 'sets is not an array'); - assert.equal(arguments.length, 2, 'arguments.length error'); - assert.equal(Array.isArray(sets[0]) && Array.isArray(sets[1]), true, 'sets not arrays'); - assert.strictEqual(sets[0][0], 'value', 'set value not correct'); - assert.strictEqual(sets[1][0], 'value', 'set value not correct'); + assert.equal(Array.isArray(sets), true); + assert.equal(arguments.length, 2); + assert.equal(Array.isArray(sets[0]) && Array.isArray(sets[1]), true); + assert.strictEqual(sets[0][0], 'value'); + assert.strictEqual(sets[1][0], 'value'); done(); }); }); }); describe('isSetMember()', function() { + before(function(done) { + db.setAdd('testSet3', 5, done); + }); + it('should return false if element is not member of set', function(done) { - db.isSetMember('testSet', 10, function(err, isMember) { + db.isSetMember('testSet3', 10, function(err, isMember) { assert.equal(err, null); - assert.equal(arguments.length, 2, 'arguments.length error'); + assert.equal(arguments.length, 2); assert.equal(isMember, false); done(); }); }); it('should return true if element is a member of set', function(done) { - db.isSetMember('testSet', 5, function(err, isMember) { + db.isSetMember('testSet3', 5, function(err, isMember) { assert.equal(err, null); - assert.equal(arguments.length, 2, 'arguments.length error'); + assert.equal(arguments.length, 2); assert.equal(isMember, true); done(); }); @@ -93,10 +106,14 @@ describe('Set methods', function() { }); describe('isSetMembers()', function() { + before(function(done) { + db.setAdd('testSet4', [1, 2, 3, 4, 5], done); + }); + it('should return an array of booleans', function(done) { - db.isSetMembers('testSet', ['1', '2', '10', '3'], function(err, members) { + db.isSetMembers('testSet4', ['1', '2', '10', '3'], function(err, members) { assert.equal(err, null); - assert.equal(arguments.length, 2, 'arguments.length error'); + assert.equal(arguments.length, 2); assert.equal(Array.isArray(members), true); assert.deepEqual(members, [true, true, false, true]); done(); @@ -105,10 +122,14 @@ describe('Set methods', function() { }); describe('isMemberOfSets()', function() { + before(function(done) { + db.setsAdd(['set1', 'set2'], 'value', done); + }); + it('should return an array of booleans', function(done) { - db.isMemberOfSets(['set1', 'testSet', 'set2', 'doesnotexist'], 'value', function(err, members) { + db.isMemberOfSets(['set1', 'testSet1', 'set2', 'doesnotexist'], 'value', function(err, members) { assert.equal(err, null); - assert.equal(arguments.length, 2, 'arguments.length error'); + assert.equal(arguments.length, 2); assert.equal(Array.isArray(members), true); assert.deepEqual(members, [true, false, true, false]); done(); @@ -117,10 +138,14 @@ describe('Set methods', function() { }); describe('setCount()', function() { + before(function(done) { + db.setAdd('testSet5', [1,2,3,4,5], done); + }); + it('should return the element count of set', function(done) { db.setCount('testSet', function(err, count) { assert.equal(err, null); - assert.equal(arguments.length, 2, 'arguments.length error'); + assert.equal(arguments.length, 2); assert.strictEqual(count, 5); done(); }); @@ -128,10 +153,18 @@ describe('Set methods', function() { }); describe('setsCount()', function() { + before(function(done) { + async.parallel([ + async.apply(db.setAdd, 'set4', [1,2,3,4,5]), + async.apply(db.setAdd, 'set5', 1), + async.apply(db.setAdd, 'set6', 2) + ], done); + }); + it('should return the element count of sets', function(done) { - db.setsCount(['testSet', 'set1', 'set2', 'doesnotexist'], function(err, counts) { + db.setsCount(['set4', 'set5', 'set6', 'doesnotexist'], function(err, counts) { assert.equal(err, null); - assert.equal(arguments.length, 2, 'arguments.length error'); + assert.equal(arguments.length, 2); assert.equal(Array.isArray(counts), true); assert.deepEqual(counts, [5, 1, 1, 0]); done(); @@ -140,12 +173,16 @@ describe('Set methods', function() { }); describe('setRemove()', function() { + before(function(done) { + db.setAdd('testSet6', [1, 2], done); + }); + it('should remove a element from set', function(done) { - db.setRemove('testSet', '2', function(err) { + db.setRemove('testSet6', '2', function(err) { assert.equal(err, null); - assert.equal(arguments.length, 1, 'arguments.length error'); + assert.equal(arguments.length, 1); - db.isSetMember('testSet', '2', function(err, isMember) { + db.isSetMember('testSet6', '2', function(err, isMember) { assert.equal(err, null); assert.equal(isMember, false); done(); @@ -155,10 +192,14 @@ describe('Set methods', function() { }); describe('setsRemove()', function() { + before(function(done) { + db.setsAdd(['set1', 'set2'], 'value', done); + }); + it('should remove a element from multiple sets', function(done) { db.setsRemove(['set1', 'set2'], 'value', function(err) { assert.equal(err, null); - assert.equal(arguments.length, 1, 'arguments.length error'); + assert.equal(arguments.length, 1); db.isMemberOfSets(['set1', 'set2'], 'value', function(err, members) { assert.equal(err, null); assert.deepEqual(members, [false, false]); @@ -169,10 +210,14 @@ describe('Set methods', function() { }); describe('setRemoveRandom()', function() { + before(function(done) { + db.setAdd('testSet7', [1,2,3,4,5], done); + }); + it('should remove a random element from set', function(done) { - db.setRemoveRandom('testSet', function(err, element) { + db.setRemoveRandom('testSet7', function(err, element) { assert.equal(err, null); - assert.equal(arguments.length, 2, 'arguments.length error'); + assert.equal(arguments.length, 2); db.isSetMember('testSet', element, function(err, ismember) { assert.equal(err, null); From 584daf12a0b8260a2623c2c4a78fa324b8782c12 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 14:36:03 -0500 Subject: [PATCH 129/897] cleaned up key tests --- tests/database/keys.js | 70 ++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/tests/database/keys.js b/tests/database/keys.js index faa3133dcf..ffad5a01ca 100644 --- a/tests/database/keys.js +++ b/tests/database/keys.js @@ -10,38 +10,47 @@ describe('Key methods', function() { it('should set a key without error', function(done) { db.set('testKey', 'testValue', function(err) { - assert.equal(err, null, 'db.set error'); - assert.equal(arguments.length, 1, 'db.set too many parameters returned'); + assert.equal(err, null); + assert.equal(arguments.length, 1); done(); }); }); it('should get a key without error', function(done) { db.get('testKey', function(err, value) { - assert.equal(err, null, 'db.get error'); - assert.equal(arguments.length, 2, 'db.get arguments.length error'); - assert.strictEqual(value, 'testValue', 'db.get returned value type is different'); + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.strictEqual(value, 'testValue'); done(); }); }); it('should return true if key exist', function(done) { db.exists('testKey', function(err, exists) { - assert.equal(err, null, 'db.exists error'); - assert.equal(arguments.length, 2, 'db.exists arguments.length error'); - assert.strictEqual(exists, true, 'db.exists did not return true for existing key'); + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.strictEqual(exists, true); + done(); + }); + }); + + it('should return false if key does not exist', function(done) { + db.exists('doesnotexist', function(err, exists) { + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.strictEqual(exists, false); done(); }); }); it('should delete a key without error', function(done) { db.delete('testKey', function(err) { - assert.equal(err, null, 'db.delete error'); - assert.equal(arguments.length, 1, 'db.delete arguments.length error'); + assert.equal(err, null); + assert.equal(arguments.length, 1); db.get('testKey', function(err, value) { - assert.equal(err, null, 'db.get error'); - assert.equal(false, !!value, 'db.get deleted key is not falsy'); + assert.equal(err, null); + assert.equal(false, !!value); done(); }); }); @@ -49,8 +58,8 @@ describe('Key methods', function() { it('should return false if key does not exist or was deleted', function(done) { db.exists('testKey', function(err, exists) { - assert.equal(err, null, 'db.exists error'); - assert.strictEqual(exists, false, 'db.exists did not return false for non-existing key'); + assert.equal(err, null); + assert.strictEqual(exists, false); done(); }); }); @@ -68,10 +77,19 @@ describe('Key methods', function() { return done(err); } db.deleteAll(['key1', 'key2'], function(err) { - assert.equal(err, null, 'db.deleteAll error'); - assert.equal(arguments.length, 1, 'arguments.length error'); - db.exists('key1', function(err, exists) { - assert.equal(exists, false, 'deleted key is not falsy'); + assert.equal(err, null); + assert.equal(arguments.length, 1); + async.parallel([ + key1exists: function(next) { + db.exists('key1', next); + }, + key2exists: function(next) { + db.exists('key2', next); + } + ], function(err, results) { + assert.equal(err, null); + assert.equal(results.key1exists, false); + assert.equal(results.key2exists, false); done(); }); }); @@ -81,16 +99,16 @@ describe('Key methods', function() { describe('increment', function() { it('should initialize key to 1', function(done) { db.increment('keyToIncrement', function(err, value) { - assert.equal(err, null, 'db.increment error'); - assert.strictEqual(parseInt(value, 10), 1, 'value not incremented'); + assert.equal(err, null); + assert.strictEqual(parseInt(value, 10), 1); done(); }); }); it('should increment key to 2', function(done) { db.increment('keyToIncrement', function(err, value) { - assert.equal(err, null, 'db.increment error'); - assert.strictEqual(parseInt(value, 10), 2, 'value not incremented'); + assert.equal(err, null); + assert.strictEqual(parseInt(value, 10), 2); done(); }); }); @@ -103,12 +121,12 @@ describe('Key methods', function() { return done(err); } db.rename('keyOldName', 'keyNewName', function(err) { - assert.equal(err, null, 'db.rename error'); - assert.equal(arguments.length, 1, 'db.rename arguments.length error'); + assert.equal(err, null); + assert.equal(arguments.length, 1); db.get('keyNewName', function(err, value) { - assert.equal(err, null, 'db.rename error'); - assert.equal(value, 'renamedKeyValue', 'renamed key value does not match'); + assert.equal(err, null); + assert.equal(value, 'renamedKeyValue'); done(); }); }); From 162a7b9e0c65130c87e9f8af2c6ef7db5a6456d9 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 14:58:29 -0500 Subject: [PATCH 130/897] cleanup hash tests before hooks --- tests/database/hash.js | 90 +++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 31 deletions(-) diff --git a/tests/database/hash.js b/tests/database/hash.js index 74bfff0298..c5dc1d5d88 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -1,26 +1,24 @@ 'use strict'; -/*global require, after*/ +/*global require, after, before*/ -var assert = require('assert'), +var async = require('async'), + assert = require('assert'), db = require('../mocks/databasemock'); describe('Hash methods', function() { var testData = { name: 'baris', + lastname: 'usakli', age: 99 }; before(function(done) { - db.setObject('testObject1', testData, function(err) { - assert.equal(err, null); - assert.equal(arguments.length, 1); - done(); - }); + db.setObject('hashTestObject', testData, done); }); describe('setObject()', function() { it('should create a object', function(done) { - db.setObject('testObject10', testData, function(err) { + db.setObject('testObject1', {foo: 'baris', bar: 99}, function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); done(); @@ -29,16 +27,16 @@ describe('Hash methods', function() { }); describe('setObjectField()', function() { - it('should add a new field to an object', function(done) { - db.setObjectField('testObject1', 'lastname', 'usakli', function(err) { + it('should create a new object with field', function(done) { + db.setObjectField('testObject2', 'name', 'ginger', function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); done(); }); }); - it('should create a new object with field', function(done) { - db.setObjectField('testObject2', 'name', 'ginger', function(err) { + it('should add a new field to an object', function(done) { + db.setObjectField('testObject2', 'type', 'cat', function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); done(); @@ -57,7 +55,7 @@ describe('Hash methods', function() { }); it('should retrieve an object', function(done) { - db.getObject('testObject1', function(err, data) { + db.getObject('hashTestObject', function(err, data) { assert.equal(err, null); assert.equal(data.name, testData.name); assert.equal(data.age, testData.age); @@ -68,6 +66,13 @@ describe('Hash methods', function() { }); describe('getObjects()', function() { + before(function(done) { + async([ + async.apply(db.setObject, 'testObject4', {name: 'baris'}), + async.apply(db.setObjectField, 'testObject5', 'name', 'ginger') + ], done); + }); + it('should return 3 objects with correct data', function(done) { db.getObjects(['testObject1', 'testObject2', 'doesnotexist'], function(err, objects) { assert.equal(err, null); @@ -92,7 +97,7 @@ describe('Hash methods', function() { }); it('should return falsy if field does not exist', function(done) { - db.getObjectField('testObject1', 'fieldName', function(err, value) { + db.getObjectField('hashTestObject', 'fieldName', function(err, value) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(!!value, false); @@ -101,7 +106,7 @@ describe('Hash methods', function() { }); it('should get an objects field', function(done) { - db.getObjectField('testObject1', 'lastname', function(err, value) { + db.getObjectField('hashTestObject', 'lastname', function(err, value) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(value, 'usakli'); @@ -123,7 +128,7 @@ describe('Hash methods', function() { }); it('should return an object with correct fields', function(done) { - db.getObjectFields('testObject1', ['lastname', 'age', 'field1'], function(err, object) { + db.getObjectFields('hashTestObject', ['lastname', 'age', 'field1'], function(err, object) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(typeof object, 'object'); @@ -136,8 +141,15 @@ describe('Hash methods', function() { }); describe('getObjectsFields()', function() { + before(function(done) { + async([ + async.apply(db.setObject, 'testObject8', {name: 'baris', age:99}), + async.apply(db.setObject, 'testObject9', {name: 'ginger', age: 3}) + ], done); + }); + it('should return an array of objects with correct values', function(done) { - db.getObjectsFields(['testObject1', 'testObject2', 'doesnotexist'], ['name', 'age'], function(err, objects) { + db.getObjectsFields(['testObject8', 'testObject9', 'doesnotexist'], ['name', 'age'], function(err, objects) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(Array.isArray(objects), true); @@ -145,6 +157,7 @@ describe('Hash methods', function() { assert.equal(objects[0].name, 'baris'); assert.equal(objects[0].age, 99); assert.equal(objects[1].name, 'ginger'); + assert.equal(objects[1].age, 3); assert.equal(!!objects[2].name, false); done(); }); @@ -162,14 +175,13 @@ describe('Hash methods', function() { }); it('should return an array of keys for the object\'s fields', function(done) { - db.getObjectKeys('testObject1', function(err, keys) { + db.getObjectKeys('hashTestObject', function(err, keys) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(Array.isArray(keys) && keys.length === 3, true); keys.forEach(function(key) { assert.notEqual(['name', 'lastname', 'age'].indexOf(key), -1); }); - done(); }); }); @@ -186,7 +198,7 @@ describe('Hash methods', function() { }); it('should return an array of values for the object\'s fields', function(done) { - db.getObjectValues('testObject1', function(err, values) { + db.getObjectValues('hashTestObject', function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(Array.isArray(values) && values.length === 3, true); @@ -219,7 +231,7 @@ describe('Hash methods', function() { }); it('should return true if field exists', function(done) { - db.isObjectField('testObject1', 'lastname', function(err, value) { + db.isObjectField('hashTestObject', 'name', function(err, value) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(value, true); @@ -229,11 +241,15 @@ describe('Hash methods', function() { }); describe('deleteObjectField()', function() { + before(function(done) { + db.setObject('testObject10', {foo: 'bar', delete: 'this'}, done); + }); + it('should delete an objects field', function(done) { - db.deleteObjectField('testObject1', 'lastname', function(err) { + db.deleteObjectField('testObject10', 'delete', function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); - db.isObjectField('testObject1', 'lastname', function(err, isField) { + db.isObjectField('testObject10', 'delete', function(err, isField) { assert.equal(err, null); assert.equal(isField, false); done(); @@ -243,8 +259,12 @@ describe('Hash methods', function() { }); describe('incrObjectField()', function() { + before(function(done) { + db.setObject('testObject11', {age: 99}, done); + }); + it('should set an objects field to 1 if object does not exist', function(done) { - db.incrObjectField('testObject3', 'field1', function(err, newValue) { + db.incrObjectField('testObject12', 'field1', function(err, newValue) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(newValue, 1); @@ -253,7 +273,7 @@ describe('Hash methods', function() { }); it('should increment an object fields by 1 and return it', function(done) { - db.incrObjectField('testObject1', 'age', function(err, newValue) { + db.incrObjectField('testObject11', 'age', function(err, newValue) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(newValue, 100); @@ -263,8 +283,12 @@ describe('Hash methods', function() { }); describe('decrObjectField()', function() { + before(function(done) { + db.setObject('testObject13', {age: 99}, done); + }); + it('should set an objects field to -1 if object does not exist', function(done) { - db.decrObjectField('testObject4', 'field1', function(err, newValue) { + db.decrObjectField('testObject14', 'field1', function(err, newValue) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(newValue, -1); @@ -273,18 +297,22 @@ describe('Hash methods', function() { }); it('should decrement an object fields by 1 and return it', function(done) { - db.decrObjectField('testObject1', 'age', function(err, newValue) { + db.decrObjectField('testObject13', 'age', function(err, newValue) { assert.equal(err, null); assert.equal(arguments.length, 2); - assert.equal(newValue, 99); + assert.equal(newValue, 98); done(); }); }); }); describe('incrObjectFieldBy()', function() { + before(function(done) { + db.setObject('testObject15', {age: 100}, done); + }); + it('should set an objects field to 5 if object does not exist', function(done) { - db.incrObjectFieldBy('testObject5', 'field1', 5, function(err, newValue) { + db.incrObjectFieldBy('testObject16', 'field1', 5, function(err, newValue) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(newValue, 5); @@ -293,10 +321,10 @@ describe('Hash methods', function() { }); it('should increment an object fields by passed in value and return it', function(done) { - db.incrObjectFieldBy('testObject1', 'age', 11, function(err, newValue) { + db.incrObjectFieldBy('testObject15', 'age', 11, function(err, newValue) { assert.equal(err, null); assert.equal(arguments.length, 2); - assert.equal(newValue, 110); + assert.equal(newValue, 111); done(); }); }); From 46fd1843ba4e1765cd454d24317a984a19ca400a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 15:02:50 -0500 Subject: [PATCH 131/897] fix key tests --- tests/database/keys.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/database/keys.js b/tests/database/keys.js index ffad5a01ca..43a44e5753 100644 --- a/tests/database/keys.js +++ b/tests/database/keys.js @@ -79,14 +79,14 @@ describe('Key methods', function() { db.deleteAll(['key1', 'key2'], function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); - async.parallel([ + async.parallel({ key1exists: function(next) { db.exists('key1', next); }, key2exists: function(next) { db.exists('key2', next); } - ], function(err, results) { + }, function(err, results) { assert.equal(err, null); assert.equal(results.key1exists, false); assert.equal(results.key2exists, false); From 15d2f54cd05915e3ce0d8ef75b65699c9ab6853e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 15:06:02 -0500 Subject: [PATCH 132/897] fix list tests --- tests/database/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/database/list.js b/tests/database/list.js index 84f1d586da..986a1fc1bb 100644 --- a/tests/database/list.js +++ b/tests/database/list.js @@ -1,5 +1,5 @@ 'use strict'; -/*global require, after*/ +/*global require, after, before*/ var async = require('async'), assert = require('assert'), @@ -69,7 +69,7 @@ describe('List methods', function() { it('should return a list with one element', function(done) { db.getListRange('testList4', 0, 0, function(err, list) { assert.equal(err, null); - assert.equal(Array.isArray(list), true,); + assert.equal(Array.isArray(list), true); assert.equal(list[0], 5); done(); }); From 4554ef2195ff77e9842571e4c7e06198c615c665 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 15:33:22 -0500 Subject: [PATCH 133/897] more test fixes --- tests/database/list.js | 18 +++--- tests/database/sorted.js | 122 +++++++++++++++++++++++---------------- 2 files changed, 80 insertions(+), 60 deletions(-) diff --git a/tests/database/list.js b/tests/database/list.js index 986a1fc1bb..3983285dae 100644 --- a/tests/database/list.js +++ b/tests/database/list.js @@ -76,7 +76,7 @@ describe('List methods', function() { }); it('should return a list with 2 elements 3, 7', function(done) { - db.getListRange('testList2', 0, -1, function(err, list) { + db.getListRange('testList3', 0, -1, function(err, list) { assert.equal(err, null); assert.equal(Array.isArray(list), true); assert.equal(list.length, 2); @@ -120,11 +120,11 @@ describe('List methods', function() { }); it('should remove all the matching elements of list', function(done) { - db.listRemoveAll('testList2', '1', function(err) { + db.listRemoveAll('testList5', '1', function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); - db.getListRange('testList2', 0, -1, function(err, list) { + db.getListRange('testList5', 0, -1, function(err, list) { assert.equal(Array.isArray(list), true); assert.equal(list.length, 2); assert.equal(list.indexOf('1'), -1); @@ -144,12 +144,12 @@ describe('List methods', function() { return done(err); } - db.listTrim('testList3', 0, 2, function(err) { - assert.equal(err, null, 'db.listTrim error'); - assert.equal(arguments.length, 1, 'arguments.length error'); - db.getListRange('testList3', 0, -1, function(err, list) { - assert.equal(list.length, 3, 'list length is not 3'); - assert.deepEqual(list, ['1', '2', '3'], 'list not properly trimmed'); + db.listTrim('testList6testList6', 0, 2, function(err) { + assert.equal(err, null); + assert.equal(arguments.length, 1); + db.getListRange('testList6', 0, -1, function(err, list) { + assert.equal(list.length, 3); + assert.deepEqual(list, ['1', '2', '3']); done(); }); }); diff --git a/tests/database/sorted.js b/tests/database/sorted.js index fbe8ebb569..1739989689 100644 --- a/tests/database/sorted.js +++ b/tests/database/sorted.js @@ -1,11 +1,26 @@ 'use strict'; -/*global require, after*/ +/*global require, after, before*/ -var assert = require('assert'), +var async = require('async'), + assert = require('assert'), db = require('../mocks/databasemock'); describe('Sorted Set methods', function() { + before(function(done) { + async.parallel([ + function(next) { + db.sortedSetAdd('sortedSetTest1', [1, 2, 3], ['value1', 'value2', 'value3'], next); + }, + function(next) { + db.sortedSetAdd('sortedSetTest2', [1, 4], ['value1', 'value4'], next); + }, + function(next) { + db.sortedSetAdd('sortedSetTest3', [2, 4], ['value2', 'value4'], next); + } + ], done); + }); + describe('sortedSetAdd()', function() { it('should add an element to a sorted set', function(done) { db.sortedSetAdd('sorted1', 1, 'value1', function(err) { @@ -22,14 +37,6 @@ describe('Sorted Set methods', function() { done(); }); }); - - it('should add four elements to a sorted set', function(done) { - db.sortedSetAdd('sorted3', [2, 3, 4, 5], ['value2', 'value3', 'value4', 'value5'], function(err) { - assert.equal(err, null); - assert.equal(arguments.length, 1); - done(); - }); - }); }); describe('sortedSetsAdd()', function() { @@ -44,7 +51,7 @@ describe('Sorted Set methods', function() { describe('getSortedSetRange()', function() { it('should return the lowest scored element', function(done) { - db.getSortedSetRange('sorted2', 0, 0, function(err, value) { + db.getSortedSetRange('sortedSetTest1', 0, 0, function(err, value) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(value, 'value1'); @@ -53,7 +60,7 @@ describe('Sorted Set methods', function() { }); it('should return elements sorted by score lowest to highest', function(done) { - db.getSortedSetRange('sorted2', 0, -1, function(err, values) { + db.getSortedSetRange('sortedSetTest1', 0, -1, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(values, ['value1', 'value2', 'value3']); @@ -64,7 +71,7 @@ describe('Sorted Set methods', function() { describe('getSortedSetRevRange()', function() { it('should return the highest scored element', function(done) { - db.getSortedSetRevRange('sorted2', 0, 0, function(err, value) { + db.getSortedSetRevRange('sortedSetTest1', 0, 0, function(err, value) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(value, 'value3'); @@ -73,7 +80,7 @@ describe('Sorted Set methods', function() { }); it('should return elements sorted by score highest to lowest', function(done) { - db.getSortedSetRevRange('sorted2', 0, -1, function(err, values) { + db.getSortedSetRevRange('sortedSetTest1', 0, -1, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(values, ['value3', 'value2', 'value1']); @@ -84,7 +91,7 @@ describe('Sorted Set methods', function() { describe('getSortedSetRangeWithScores()', function() { it('should return array of elements sorted by score lowest to highest with scores', function(done) { - db.getSortedSetRangeWithScores('sorted2', 0, -1, function(err, values) { + db.getSortedSetRangeWithScores('sortedSetTest1', 0, -1, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(values, [{value: 'value1', score: 1}, {value: 'value2', score: 2}, {value: 'value3', score: 3}]); @@ -95,7 +102,7 @@ describe('Sorted Set methods', function() { describe('getSortedSetRevRangeWithScores()', function() { it('should return array of elements sorted by score highest to lowest with scores', function(done) { - db.getSortedSetRevRangeWithScores('sorted2', 0, -1, function(err, values) { + db.getSortedSetRevRangeWithScores('sortedSetTest1', 0, -1, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(values, [{value: 'value3', score: 3}, {value: 'value2', score: 2}, {value: 'value1', score: 1}]); @@ -104,10 +111,9 @@ describe('Sorted Set methods', function() { }); }); - describe('getSortedSetRangeByScore()', function() { it('should get count elements with score between min max sorted by score lowest to highest', function(done) { - db.getSortedSetRangeByScore('sorted2', 0, -1, '-inf', 2, function(err, values) { + db.getSortedSetRangeByScore('sortedSetTest1', 0, -1, '-inf', 2, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(values, ['value1', 'value2']); @@ -118,7 +124,7 @@ describe('Sorted Set methods', function() { describe('getSortedSetRevRangeByScore()', function() { it('should get count elements with score between max min sorted by score highest to lowest', function(done) { - db.getSortedSetRevRangeByScore('sorted2', 0, -1, '+inf', 2, function(err, values) { + db.getSortedSetRevRangeByScore('sortedSetTest1', 0, -1, '+inf', 2, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(values, ['value3', 'value2']); @@ -127,10 +133,9 @@ describe('Sorted Set methods', function() { }); }); - describe('getSortedSetRangeByScoreWithScores()', function() { it('should get count elements with score between min max sorted by score lowest to highest with scores', function(done) { - db.getSortedSetRangeByScoreWithScores('sorted2', 0, -1, '-inf', 2, function(err, values) { + db.getSortedSetRangeByScoreWithScores('sortedSetTest1', 0, -1, '-inf', 2, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(values, [{value: 'value1', score: 1}, {value: 'value2', score: 2}]); @@ -141,7 +146,7 @@ describe('Sorted Set methods', function() { describe('getSortedSetRevRangeByScoreWithScores()', function() { it('should get count elements with score between max min sorted by score highest to lowest', function(done) { - db.getSortedSetRevRangeByScoreWithScores('sorted2', 0, -1, '+inf', 2, function(err, values) { + db.getSortedSetRevRangeByScoreWithScores('sortedSetTest1', 0, -1, '+inf', 2, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(values, [{value: 'value3', score: 3}, {value: 'value2', score: 2}]); @@ -161,7 +166,7 @@ describe('Sorted Set methods', function() { }); it('should return number of elements between scores min max inclusive', function(done) { - db.sortedSetCount('sorted2', '-inf', 2, function(err, count) { + db.sortedSetCount('sortedSetTest1', '-inf', 2, function(err, count) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(count, 2); @@ -181,7 +186,7 @@ describe('Sorted Set methods', function() { }); it('should return number of elements in a sorted set', function(done) { - db.sortedSetCard('sorted2', function(err, count) { + db.sortedSetCard('sortedSetTest1', function(err, count) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(count, 3); @@ -192,17 +197,17 @@ describe('Sorted Set methods', function() { describe('sortedSetsCard()', function() { it('should return the number of elements in sorted sets', function(done) { - db.sortedSetsCard(['sorted1', 'sorted2', 'doesnotexist'], function(err, counts) { + db.sortedSetsCard(['sortedSetTest1', 'sortedSetTest2', 'doesnotexist'], function(err, counts) { assert.equal(err, null); assert.equal(arguments.length, 2); - assert.deepEqual(counts, [2, 3, 0]); + assert.deepEqual(counts, [3, 2, 0]); done(); }); }); }); describe('sortedSetRank()', function() { - it('should return falsy if sorted set doesnot exist', function(done) { + it('should return falsy if sorted set does not exist', function(done) { db.sortedSetRank('doesnotexist', 'value1', function(err, rank) { assert.equal(err, null); assert.equal(arguments.length, 2); @@ -212,7 +217,7 @@ describe('Sorted Set methods', function() { }); it('should return falsy if element isnt in sorted set', function(done) { - db.sortedSetRank('sorted2', 'value5', function(err, rank) { + db.sortedSetRank('sortedSetTest1', 'value5', function(err, rank) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(!!rank, false); @@ -221,7 +226,7 @@ describe('Sorted Set methods', function() { }); it('should return the rank of the element in the sorted set sorted by lowest to highest score', function(done) { - db.sortedSetRank('sorted2', 'value1', function(err, rank) { + db.sortedSetRank('sortedSetTest1', 'value1', function(err, rank) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(rank, 0); @@ -241,7 +246,7 @@ describe('Sorted Set methods', function() { }); it('should return falsy if element isnt in sorted set', function(done) { - db.sortedSetRevRank('sorted2', 'value5', function(err, rank) { + db.sortedSetRevRank('sortedSetTest1', 'value5', function(err, rank) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(!!rank, false); @@ -250,7 +255,7 @@ describe('Sorted Set methods', function() { }); it('should return the rank of the element in the sorted set sorted by highest to lowest score', function(done) { - db.sortedSetRevRank('sorted2', 'value1', function(err, rank) { + db.sortedSetRevRank('sortedSetTest1', 'value1', function(err, rank) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(rank, 2); @@ -261,7 +266,7 @@ describe('Sorted Set methods', function() { describe('sortedSetsRanks()', function() { it('should return the ranks of values in sorted sets', function(done) { - db.sortedSetsRanks(['sorted1', 'sorted2'], ['value1', 'value2'], function(err, ranks) { + db.sortedSetsRanks(['sortedSetTest1', 'sortedSetTest2'], ['value1', 'value4'], function(err, ranks) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(ranks, [0, 1]); @@ -272,7 +277,7 @@ describe('Sorted Set methods', function() { describe('sortedSetRanks()', function() { it('should return the ranks of values in a sorted set', function(done) { - db.sortedSetRanks('sorted2', ['value2', 'value1', 'value3', 'value4'], function(err, ranks) { + db.sortedSetRanks('sortedSetTest1', ['value2', 'value1', 'value3', 'value4'], function(err, ranks) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(ranks, [1, 0, 2, null]); @@ -292,7 +297,7 @@ describe('Sorted Set methods', function() { }); it('should return falsy if element is not in sorted set', function(done) { - db.sortedSetScore('sorted2', 'value5', function(err, score) { + db.sortedSetScore('sortedSetTest1', 'value5', function(err, score) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(!!score, false); @@ -301,7 +306,7 @@ describe('Sorted Set methods', function() { }); it('should return the score of an element', function(done) { - db.sortedSetScore('sorted2', 'value2', function(err, score) { + db.sortedSetScore('sortedSetTest1', 'value2', function(err, score) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(score, 2); @@ -312,10 +317,10 @@ describe('Sorted Set methods', function() { describe('sortedSetsScore()', function() { it('should return the scores of value in sorted sets', function(done) { - db.sortedSetsScore(['sorted1', 'sorted2', 'doesnotexist'], 'value2', function(err, scores) { + db.sortedSetsScore(['sortedSetTest1', 'sortedSetTest2', 'doesnotexist'], 'value1', function(err, scores) { assert.equal(err, null); assert.equal(arguments.length, 2); - assert.deepEqual(scores, [null, 2, null]); + assert.deepEqual(scores, [1, 1, null]); done(); }); }); @@ -323,7 +328,7 @@ describe('Sorted Set methods', function() { describe('sortedSetScores()', function() { it('should return the scores of value in sorted sets', function(done) { - db.sortedSetScores('sorted2', ['value2', 'value1', 'doesnotexist'], function(err, scores) { + db.sortedSetScores('sortedSetTest1', ['value2', 'value1', 'doesnotexist'], function(err, scores) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(scores, [2, 1, null]); @@ -352,7 +357,7 @@ describe('Sorted Set methods', function() { }); it('should return true if element is in sorted set', function(done) { - db.isSortedSetMember('sorted2', 'value2', function(err, isMember) { + db.isSortedSetMember('sortedSetTest1', 'value2', function(err, isMember) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(isMember, true); @@ -363,7 +368,7 @@ describe('Sorted Set methods', function() { describe('isSortedSetMembers()', function() { it('should return an array of booleans indicating membership', function(done) { - db.isSortedSetMembers('sorted2', ['value1', 'value2', 'value5'], function(err, isMembers) { + db.isSortedSetMembers('sortedSetTest1', ['value1', 'value2', 'value5'], function(err, isMembers) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(isMembers, [true, true, false]); @@ -374,10 +379,10 @@ describe('Sorted Set methods', function() { describe('getSortedSetUnion()', function() { it('should return an array of values from both sorted sets sorted by scores lowest to highest', function(done) { - db.getSortedSetUnion(['sorted1', 'sorted3'], 0, -1, function(err, values) { + db.getSortedSetUnion(['sortedSetTest2', 'sortedSetTest3'], 0, -1, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); - assert.deepEqual(values, ['value1', 'value2', 'value4', 'value5', 'value3']); + assert.deepEqual(values, ['value1', 'value2', 'value4']); done(); }); }); @@ -385,10 +390,10 @@ describe('Sorted Set methods', function() { describe('getSortedSetRevUnion()', function() { it('should return an array of values from both sorted sets sorted by scores highest to lowest', function(done) { - db.getSortedSetRevUnion(['sorted1', 'sorted3'], 0, -1, function(err, values) { + db.getSortedSetRevUnion(['sortedSetTest2', 'sortedSetTest3'], 0, -1, function(err, values) { assert.equal(err, null); assert.equal(arguments.length, 2); - assert.deepEqual(values, ['value3', 'value5', 'value4', 'value2', 'value1']); + assert.deepEqual(values, ['value4', 'value2', 'value1']); done(); }); }); @@ -424,11 +429,15 @@ describe('Sorted Set methods', function() { describe('sortedSetRemove()', function() { + before(function(done) { + db.sortedSetAdd('sorted3', [1, 2], ['value1', 'value2'], done); + }); + it('should remove an element from a sorted set', function(done) { - db.sortedSetRemove('sorted2', 'value2', function(err) { + db.sortedSetRemove('sorted3', 'value2', function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); - db.isSortedSetMember('sorted2', 'value2', function(err, isMember) { + db.isSortedSetMember('sorted3', 'value2', function(err, isMember) { assert.equal(err, null); assert.equal(isMember, false); done(); @@ -438,11 +447,18 @@ describe('Sorted Set methods', function() { }); describe('sortedSetsRemove()', function() { + before(function(done) { + async.parallel([ + async.apply(db.sortedSetAdd, 'sorted4', [1,2], ['value1', 'value2']), + async.apply(db.sortedSetAdd, 'sorted5', [1,2], ['value1', 'value3']), + ], done); + }); + it('should remove element from multiple sorted sets', function(done) { - db.sortedSetsRemove(['sorted1', 'sorted2'], 'value1', function(err) { + db.sortedSetsRemove(['sorted4', 'sorted5'], 'value1', function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); - db.sortedSetsScore(['sorted1', 'sorted2'], 'value1', function(err, scores) { + db.sortedSetsScore(['sorted4', 'sorted5'], 'value1', function(err, scores) { assert.equal(err, null); assert.deepEqual(scores, [null, null]); done(); @@ -452,13 +468,17 @@ describe('Sorted Set methods', function() { }); describe('sortedSetsRemoveRangeByScore()', function() { + before(function(done) { + db.sortedSetAdd('sorted6', [1,2,3,4,5], ['value1','value2','value3','value4','value5'], done); + }); + it('should remove elements with scores between min max inclusive', function(done) { - db.sortedSetsRemoveRangeByScore(['sorted3'], 4, 5, function(err) { + db.sortedSetsRemoveRangeByScore(['sorted6'], 4, 5, function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); - db.getSortedSetRange('sorted3', 0, -1, function(err, values) { + db.getSortedSetRange('sorted6', 0, -1, function(err, values) { assert.equal(err, null); - assert.deepEqual(values, ['value2', 'value3']); + assert.deepEqual(values, ['value1', 'value2', 'value3']); done(); }); }); From d94668216d1d5bd86e69fe4c2c2391b3929bf050 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 15:42:55 -0500 Subject: [PATCH 134/897] misc test fixes --- tests/database/hash.js | 2 +- tests/database/list.js | 2 +- tests/database/sets.js | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/database/hash.js b/tests/database/hash.js index c5dc1d5d88..65d74c6757 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -67,7 +67,7 @@ describe('Hash methods', function() { describe('getObjects()', function() { before(function(done) { - async([ + async.parallel([ async.apply(db.setObject, 'testObject4', {name: 'baris'}), async.apply(db.setObjectField, 'testObject5', 'name', 'ginger') ], done); diff --git a/tests/database/list.js b/tests/database/list.js index 3983285dae..8819a4c861 100644 --- a/tests/database/list.js +++ b/tests/database/list.js @@ -144,7 +144,7 @@ describe('List methods', function() { return done(err); } - db.listTrim('testList6testList6', 0, 2, function(err) { + db.listTrim('testList6', 0, 2, function(err) { assert.equal(err, null); assert.equal(arguments.length, 1); db.getListRange('testList6', 0, -1, function(err, list) { diff --git a/tests/database/sets.js b/tests/database/sets.js index c109f62039..a7a23f4dd8 100644 --- a/tests/database/sets.js +++ b/tests/database/sets.js @@ -143,7 +143,7 @@ describe('Set methods', function() { }); it('should return the element count of set', function(done) { - db.setCount('testSet', function(err, count) { + db.setCount('testSet5', function(err, count) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.strictEqual(count, 5); @@ -155,14 +155,14 @@ describe('Set methods', function() { describe('setsCount()', function() { before(function(done) { async.parallel([ - async.apply(db.setAdd, 'set4', [1,2,3,4,5]), - async.apply(db.setAdd, 'set5', 1), - async.apply(db.setAdd, 'set6', 2) + async.apply(db.setAdd, 'set5', [1,2,3,4,5]), + async.apply(db.setAdd, 'set6', 1), + async.apply(db.setAdd, 'set7', 2) ], done); }); it('should return the element count of sets', function(done) { - db.setsCount(['set4', 'set5', 'set6', 'doesnotexist'], function(err, counts) { + db.setsCount(['set5', 'set6', 'set7', 'doesnotexist'], function(err, counts) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(Array.isArray(counts), true); From 61f069a071dfb534a040c60855f36765f8dc171b Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 15:47:01 -0500 Subject: [PATCH 135/897] final test fixes copy pasta is bad --- tests/database/hash.js | 4 ++-- tests/database/list.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/database/hash.js b/tests/database/hash.js index 65d74c6757..c67b57fd64 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -74,7 +74,7 @@ describe('Hash methods', function() { }); it('should return 3 objects with correct data', function(done) { - db.getObjects(['testObject1', 'testObject2', 'doesnotexist'], function(err, objects) { + db.getObjects(['testObject4', 'testObject5', 'doesnotexist'], function(err, objects) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(Array.isArray(objects) && objects.length === 3, true); @@ -142,7 +142,7 @@ describe('Hash methods', function() { describe('getObjectsFields()', function() { before(function(done) { - async([ + async.parallel([ async.apply(db.setObject, 'testObject8', {name: 'baris', age:99}), async.apply(db.setObject, 'testObject9', {name: 'ginger', age: 3}) ], done); diff --git a/tests/database/list.js b/tests/database/list.js index 8819a4c861..59fa82aa58 100644 --- a/tests/database/list.js +++ b/tests/database/list.js @@ -99,7 +99,7 @@ describe('List methods', function() { }); it('should remove the last element of list and return it', function(done) { - db.listRemoveLast('testList2', function(err, lastElement) { + db.listRemoveLast('testList4', function(err, lastElement) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(lastElement, '12'); From 3eb922393fec3818c3b4c1d3aeaf739014510028 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 15 Jan 2015 21:05:04 -0500 Subject: [PATCH 136/897] closes #2616 --- src/controllers/accounts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 63a2d91000..741de9a626 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -468,7 +468,7 @@ accountsController.getChats = function(req, res, next) { return helpers.notFound(req, res); } async.parallel({ - contacts: async.apply(user.getFollowing, req.user.uid), + contacts: async.apply(user.getFollowing, req.user.uid, 0, 19), recentChats: async.apply(messaging.getRecentChats, req.user.uid, 0, 19) }, function(err, results) { if (err) { From 6fe8d25166e4d3bfe5b9cc3b7831662c7d201375 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 16 Jan 2015 12:58:31 -0500 Subject: [PATCH 137/897] add uid to filter:topic.get --- src/topics.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/topics.js b/src/topics.js index 1e9df9958f..3135fd6a88 100644 --- a/src/topics.js +++ b/src/topics.js @@ -255,7 +255,9 @@ var async = require('async'), topicData.locked = parseInt(topicData.locked, 10) === 1; topicData.pinned = parseInt(topicData.pinned, 10) === 1; - plugins.fireHook('filter:topic.get', topicData, callback); + plugins.fireHook('filter:topic.get', {topic: topicData, uid: uid}, function(err, data) { + callback(err, data ? data.topics : null); + }); }); }); }; From 236fe91e953200fae651707293c556eff16deef6 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 16 Jan 2015 13:00:50 -0500 Subject: [PATCH 138/897] fix typo --- src/topics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/topics.js b/src/topics.js index 3135fd6a88..d206b5c211 100644 --- a/src/topics.js +++ b/src/topics.js @@ -256,7 +256,7 @@ var async = require('async'), topicData.pinned = parseInt(topicData.pinned, 10) === 1; plugins.fireHook('filter:topic.get', {topic: topicData, uid: uid}, function(err, data) { - callback(err, data ? data.topics : null); + callback(err, data ? data.topic : null); }); }); }); From 577a646adcb712883b8d24aa24269088d199f68e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 16 Jan 2015 17:02:58 -0500 Subject: [PATCH 139/897] this should appease @barisusakli --- public/src/client/groups/list.js | 2 +- src/groups.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 3fc76a4962..d4a92ac9aa 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -10,7 +10,7 @@ define('forum/groups/list', function() { groupsEl.on('click', '.list-cover', function() { var groupName = $(this).parents('[data-group]').attr('data-group'); - ajaxify.go('groups/' + groupName); + ajaxify.go('groups/' + encodeURIComponent(groupName)); }); // Group creation diff --git a/src/groups.js b/src/groups.js index 696d8a690f..78e874851c 100644 --- a/src/groups.js +++ b/src/groups.js @@ -7,6 +7,7 @@ var async = require('async'), path = require('path'), nconf = require('nconf'), fs = require('fs'), + validator = require('validator'), user = require('./user'), meta = require('./meta'), @@ -202,6 +203,9 @@ var async = require('async'), results.base['cover:position'] = '50% 50%'; } + results.base.name = validator.escape(results.base.name); + results.base.description = validator.escape(results.base.description); + results.base.userTitle = validator.escape(results.base.userTitle); results.base.members = results.users.filter(Boolean); results.base.pending = results.pending.filter(Boolean); results.base.count = numUsers || results.base.members.length; From 8ba05c08fef9778bafcfcaf00f66156b64f79610 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 16 Jan 2015 17:03:05 -0500 Subject: [PATCH 140/897] category privilege rescinding --- src/privileges/categories.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/privileges/categories.js b/src/privileges/categories.js index 7662ef5913..5ff70730d4 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -143,6 +143,12 @@ module.exports = function(privileges) { }, callback); }; + privileges.categories.rescind = function(privileges, cid, groupName, callback) { + async.each(privileges, function(privilege, next) { + groups.leave('cid:' + cid + ':privileges:groups:' + privilege, groupName, next); + }, callback); + }; + privileges.categories.canMoveAllTopics = function(currentCid, targetCid, uid, callback) { async.parallel({ isAdministrator: function(next) { From 04be40158cae5266022f93e40b221e822a11b897 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 16 Jan 2015 20:14:39 -0500 Subject: [PATCH 141/897] if you attempt to join a group when you're already in a group, you can't anymore. --- public/language/en_GB/error.json | 1 + src/groups.js | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 251db61998..fed0c807c9 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -65,6 +65,7 @@ "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", + "group-already-member": "You are already part of this group", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", diff --git a/src/groups.js b/src/groups.js index 78e874851c..8f64ea57bd 100644 --- a/src/groups.js +++ b/src/groups.js @@ -615,15 +615,26 @@ var async = require('async'), }; Groups.requestMembership = function(groupName, uid, callback) { - if (parseInt(uid, 10) > 0) { - db.setAdd('group:' + groupName + ':pending', uid, callback); - plugins.fireHook('action:group.requestMembership', { - groupName: groupName, - uid: uid - }); - } else { - callback(new Error('[[error:not-logged-in]]')); - } + async.parallel({ + exists: async.apply(Groups.isMember, uid, groupName), + isMember: async.apply(Groups.exists, groupName) + }, function(err, checks) { + if (!checks.exists) { + return callback(new Error('[[error:no-group]]')); + } else if (checks.isMember) { + return callback(new Error('[[error:group-already-member]]')); + } + + if (parseInt(uid, 10) > 0) { + db.setAdd('group:' + groupName + ':pending', uid, callback); + plugins.fireHook('action:group.requestMembership', { + groupName: groupName, + uid: uid + }); + } else { + callback(new Error('[[error:not-logged-in]]')); + } + }); }; Groups.acceptMembership = function(groupName, uid, callback) { From b333653464458c2cd27717768f28d9a356e8c3a7 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 16 Jan 2015 23:52:51 -0500 Subject: [PATCH 142/897] prevent js crash if responseJSON is undefined --- public/src/modules/uploader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index d2f7612c0e..6efdbd988c 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -49,7 +49,7 @@ define('uploader', ['csrf'], function(csrf) { }, error: function(xhr) { xhr = maybeParse(xhr); - showAlert('error', xhr.responseJSON.error); + showAlert('error', xhr.responseJSON ? xhr.responseJSON.error : 'error uploading, code : ' + xhr.status); }, uploadProgress: function(event, position, total, percent) { From f67053df527c6da344f183f22a1f7010854a35ee Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 17 Jan 2015 15:06:12 -0500 Subject: [PATCH 143/897] figure out pathname, dont crash if callback isnt supplied --- public/src/client/groups/details.js | 4 +++- src/database/redis/main.js | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index c439216d25..0ef47b3fd8 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -120,7 +120,9 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', } if (settings.name) { - ajaxify.go('groups/' + encodeURIComponent(settings.name)); + var pathname = window.location.pathname; + pathname = pathname.substr(1, pathname.lastIndexOf('/')); + ajaxify.go(pathname + encodeURIComponent(settings.name)); } else { ajaxify.refresh(); } diff --git a/src/database/redis/main.js b/src/database/redis/main.js index 5157386d3b..9b08e4af65 100644 --- a/src/database/redis/main.js +++ b/src/database/redis/main.js @@ -77,6 +77,7 @@ module.exports = function(redisClient, module) { }; module.deleteAll = function(keys, callback) { + callback = callback || function() {}; var multi = redisClient.multi(); for(var i=0; i Date: Sat, 17 Jan 2015 16:22:04 -0500 Subject: [PATCH 144/897] on user delete remove from ip sorted set, fix search by ip --- src/user/delete.js | 22 +++++++++++++++++++++- src/user/search.js | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/user/delete.js b/src/user/delete.js index c115c727f1..b13fa1aa97 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -79,11 +79,14 @@ module.exports = function(User) { 'uid:' + uid + ':favourites', 'uid:' + uid + ':followed_tids', 'user:' + uid + ':settings', 'uid:' + uid + ':topics', 'uid:' + uid + ':posts', 'uid:' + uid + ':chats', 'uid:' + uid + ':chats:unread', - 'uid:' + uid + ':ip', 'uid:' + uid + ':upvote', 'uid:' + uid + ':downvote', + 'uid:' + uid + ':upvote', 'uid:' + uid + ':downvote', 'uid:' + uid + ':ignored:cids' ]; db.deleteAll(keys, next); }, + function(next) { + deleteUserIps(uids, next); + }, function(next) { deleteUserFromFollowers(uid, next); }, @@ -110,6 +113,23 @@ module.exports = function(User) { }); }; + function deleteUserIps(uid, callback) { + db.getSortedSetRange('uid:' + uid + ':ip', 0, -1, function(err, ips) { + if (err) { + return callback(err); + } + + async.each(ips, function(ip, next) { + db.sortedSetRemove('ip:' + ip + ':uid', uid, next); + }, function(err) { + if (err) { + return callback(err); + } + db.delete('uid:' + uid + ':ip', callback); + }); + }) + } + function deleteUserFromFollowers(uid, callback) { db.getSetMembers('followers:' + uid, function(err, uids) { if (err) { diff --git a/src/user/search.js b/src/user/search.js index 1ea83a863f..a95b64bfaa 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -18,7 +18,7 @@ module.exports = function(User) { return callback(null, {timing: 0, users: [], matchCount: 0, pages: []}); } - if (searchBy === 'ip') { + if (searchBy.indexOf('ip') !== -1) { return searchByIP(query, callback); } From 6ccb35576cc6811eb51d42b9f1a72dc2f8e68000 Mon Sep 17 00:00:00 2001 From: TheBronx Date: Sun, 18 Jan 2015 13:38:42 +0100 Subject: [PATCH 145/897] new filter hooks on favourite actions #2620 before a favourite action is made, fire a filter hook so plugins can modify or cancel that action before it takes place. --- src/socket.io/posts.js | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 97b8e7ea74..7d4ae8ea37 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -168,22 +168,40 @@ function favouriteCommand(socket, command, eventName, notification, data, callba return callback(new Error('[[error:post-deleted]]')); } - favourites[command](data.pid, socket.uid, function(err, result) { + /* + hooks: + filter.post.upvote + filter.post.downvote + filter.post.unvote + filter.post.favourite + filter.post.unfavourite + */ + plugins.fireHook('filter:post.' + command, data, function(err, filteredData) { if (err) { return callback(err); } - socket.emit('posts.' + command, result); + executeFavouriteCommand(socket, command, eventName, notification, filteredData, callback); + }); + }); +} - if (result && eventName) { - websockets.in(data.room_id).emit('event:' + eventName, result); - } +function executeFavouriteCommand(socket, command, eventName, notification, data, callback) { + favourites[command](data.pid, socket.uid, function(err, result) { + if (err) { + return callback(err); + } - if (notification) { - SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, notification); - } - callback(); - }); + socket.emit('posts.' + command, result); + + if (result && eventName) { + websockets.in(data.room_id).emit('event:' + eventName, result); + } + + if (notification) { + SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, notification); + } + callback(); }); } From e3cf528b57a260745b1796cbf69d7532642e54e9 Mon Sep 17 00:00:00 2001 From: TheBronx Date: Sun, 18 Jan 2015 19:09:26 +0100 Subject: [PATCH 146/897] pass also user id on fireHook pass also user id on fireHook as suggested by @barisusakli --- src/socket.io/posts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 7d4ae8ea37..a040493942 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -176,7 +176,7 @@ function favouriteCommand(socket, command, eventName, notification, data, callba filter.post.favourite filter.post.unfavourite */ - plugins.fireHook('filter:post.' + command, data, function(err, filteredData) { + plugins.fireHook('filter:post.' + command, {data: data, uid: socket.uid}, function(err, filteredData) { if (err) { return callback(err); } From 0bd48ef023b1f06517fbafdf1bf0fe1f229911ed Mon Sep 17 00:00:00 2001 From: TheBronx Date: Sun, 18 Jan 2015 19:15:59 +0100 Subject: [PATCH 147/897] fix error in previous commit fix error in previous commit --- src/socket.io/posts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index a040493942..fb67639c94 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -181,7 +181,7 @@ function favouriteCommand(socket, command, eventName, notification, data, callba return callback(err); } - executeFavouriteCommand(socket, command, eventName, notification, filteredData, callback); + executeFavouriteCommand(socket, command, eventName, notification, filteredData.data, callback); }); }); } From e46cda835a1d0b83954d55dfcc841ae71736090f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 18 Jan 2015 14:31:37 -0500 Subject: [PATCH 148/897] closes #2624 --- src/categories/update.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/categories/update.js b/src/categories/update.js index e103d3e5dc..f68a7aed20 100644 --- a/src/categories/update.js +++ b/src/categories/update.js @@ -11,12 +11,18 @@ module.exports = function(Categories) { Categories.update = function(modified, callback) { function updateCategory(cid, next) { - var category = modified[cid]; - var fields = Object.keys(category); - - async.each(fields, function(key, next) { - updateCategoryField(cid, key, category[key], next); - }, next); + Categories.exists(cid, function(err, exists) { + if (err || !exists) { + return next(err); + } + + var category = modified[cid]; + var fields = Object.keys(category); + + async.each(fields, function(key, next) { + updateCategoryField(cid, key, category[key], next); + }, next); + }); } var cids = Object.keys(modified); From f5b448c300e10f865d6c5db55c21d3043ff08667 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 18 Jan 2015 14:32:47 -0500 Subject: [PATCH 149/897] closes #2623 --- src/categories/delete.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/categories/delete.js b/src/categories/delete.js index d01dd13317..0ebac949d7 100644 --- a/src/categories/delete.js +++ b/src/categories/delete.js @@ -31,6 +31,7 @@ module.exports = function(Categories) { 'cid:' + cid + ':tids', 'cid:' + cid + ':tids:posts', 'cid:' + cid + ':pids', + 'cid:' + cid + ':read_by_uid', 'category:' + cid ], next); } From fe45fc967d3aae8f845bd7435dd2e1d3ca3ec838 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 18 Jan 2015 16:21:26 -0500 Subject: [PATCH 150/897] updating maintenance mode middleware so js doesn't crash until login client-side js is ready --- src/middleware/middleware.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 334e6d0b5a..f71c2b638f 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -450,7 +450,9 @@ middleware.maintenanceMode = function(req, res, next) { '/login', '/stylesheet.css', '/nodebb.min.js', - '/vendor/fontawesome/fonts/fontawesome-webfont.woff' + '/vendor/fontawesome/fonts/fontawesome-webfont.woff', + '/src/modules/[\\w]+\.js', + '/api/get_templates_listing' ], render = function() { res.status(503); From 491e0060d410c6f04dd3b1da884bdca6840fb614 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 18 Jan 2015 16:52:50 -0500 Subject: [PATCH 151/897] more files that should be loaded for maintenanceMode to work --- src/middleware/middleware.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index f71c2b638f..2d5faace76 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -452,7 +452,10 @@ middleware.maintenanceMode = function(req, res, next) { '/nodebb.min.js', '/vendor/fontawesome/fonts/fontawesome-webfont.woff', '/src/modules/[\\w]+\.js', - '/api/get_templates_listing' + '/api/get_templates_listing', + '/api/login', + '/api/?', + '/language/.+' ], render = function() { res.status(503); From 4317b3c8721c1a5f8ad49b6f7302df6ab04f1b45 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 18 Jan 2015 17:03:08 -0500 Subject: [PATCH 152/897] fixing more exposed XSS outlets in groups frontend --- public/src/client/groups/details.js | 4 ++-- public/src/client/groups/list.js | 2 +- public/src/utils.js | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 0ef47b3fd8..7ad5702a7d 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -134,7 +134,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', }; Details.deleteGroup = function() { - bootbox.confirm('Are you sure you want to delete the group: ' + ajaxify.variables.get('group_name'), function(confirm) { + bootbox.confirm('Are you sure you want to delete the group: ' + utils.escapeHTML(ajaxify.variables.get('group_name')), function(confirm) { if (confirm) { bootbox.prompt('Please enter the name of this group in order to delete it:', function(response) { if (response === ajaxify.variables.get('group_name')) { @@ -142,7 +142,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', groupName: ajaxify.variables.get('group_name') }, function(err) { if (!err) { - app.alertSuccess('[[groups:event.deleted, ' + ajaxify.variables.get('group_name') + ']]'); + app.alertSuccess('[[groups:event.deleted, ' + utils.escapeHTML(ajaxify.variables.get('group_name')) + ']]'); ajaxify.go('groups'); } else { app.alertError(err.message); diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index d4a92ac9aa..7022a64725 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -21,7 +21,7 @@ define('forum/groups/list', function() { name: name }, function(err) { if (!err) { - ajaxify.go('groups/' + name); + ajaxify.go('groups/' + encodeURIComponent(name)); } else { app.alertError(err.message); } diff --git a/public/src/utils.js b/public/src/utils.js index a3f3be9648..27a4f2e8e5 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -248,6 +248,10 @@ return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); }, + escapeHTML: function(raw) { + return raw.replace(/&/gm,"&").replace(//gm,">"); + }, + isAndroidBrowser: function() { // http://stackoverflow.com/questions/9286355/how-to-detect-only-the-native-android-browser var nua = navigator.userAgent; From 6f140384e0995fdb61930c0206e2f1bbab09250f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 18 Jan 2015 17:07:21 -0500 Subject: [PATCH 153/897] send groupData on action:group.create --- src/groups.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/groups.js b/src/groups.js index 8f64ea57bd..7615666903 100644 --- a/src/groups.js +++ b/src/groups.js @@ -434,9 +434,7 @@ var async = require('async'), async.parallel(tasks, function(err) { if (!err) { - plugins.fireHook('action:group.create', { - name: data.name - }); + plugins.fireHook('action:group.create', groupData); } callback(err); From c026a64e8e05764b26bad2849d561d50511a6461 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 18 Jan 2015 17:18:53 -0500 Subject: [PATCH 154/897] adding concept of group slugs, #2588. ping @barisusakli for downstream plugin changes --- public/src/client/groups/list.js | 6 +++--- src/controllers/groups.js | 2 +- src/groups.js | 27 ++++++++++++++++++++++++--- src/routes/index.js | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 7022a64725..d11eb7c8e6 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -1,5 +1,5 @@ "use strict"; -/* globals app, define, ajaxify, socket, bootbox */ +/* globals app, define, ajaxify, socket, bootbox, utils */ define('forum/groups/list', function() { var Groups = {}; @@ -10,7 +10,7 @@ define('forum/groups/list', function() { groupsEl.on('click', '.list-cover', function() { var groupName = $(this).parents('[data-group]').attr('data-group'); - ajaxify.go('groups/' + encodeURIComponent(groupName)); + ajaxify.go('groups/' + utils.slugify(groupName)); }); // Group creation @@ -21,7 +21,7 @@ define('forum/groups/list', function() { name: name }, function(err) { if (!err) { - ajaxify.go('groups/' + encodeURIComponent(name)); + ajaxify.go('groups/' + utils.slugify(name)); } else { app.alertError(err.message); } diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 2d2ce8f050..d6307b8daf 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -26,7 +26,7 @@ groupsController.details = function(req, res, next) { async.parallel({ group: function(next) { - groups.get(req.params.name, { + groups.getByGroupslug(req.params.slug, { expand: true, uid: uid }, next); diff --git a/src/groups.js b/src/groups.js index 7615666903..6d2b5a3e7b 100644 --- a/src/groups.js +++ b/src/groups.js @@ -193,8 +193,10 @@ var async = require('async'), }); } }, function (err, results) { - if (err || !results.base) { + if (err) { return callback(err); + } else if (!results.base) { + return callback(new Error('[[error:no-group]]')); } // Default image @@ -224,6 +226,18 @@ var async = require('async'), }); }; + Groups.getByGroupslug = function(slug, options, callback) { + db.getObjectField('groupslug:groupname', slug, function(err, groupName) { + if (err) { + return callback(err); + } else if (!groupName) { + return callback(new Error('[[error:no-group]]')); + } + + Groups.get.call(Groups, groupName, options, callback); + }); + }; + Groups.getGroupFields = function(groupName, fields, callback) { db.getObjectFields('group:' + groupName, fields, callback); }; @@ -413,8 +427,10 @@ var async = require('async'), return callback(new Error('[[error:group-already-exists]]')); } - var groupData = { + var slug = utils.slugify(data.name), + groupData = { name: data.name, + slug: slug, userTitle: data.name, description: data.description || '', deleted: '0', @@ -432,6 +448,10 @@ var async = require('async'), tasks.push(async.apply(db.setAdd, 'group:' + data.name + ':members', data.ownerUid)); } + if (!data.hidden) { + tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', slug, data.name)); + } + async.parallel(tasks, function(err) { if (!err) { plugins.fireHook('action:group.create', groupData); @@ -567,6 +587,7 @@ var async = require('async'), async.apply(db.delete, 'group:' + groupName + ':members'), async.apply(db.delete, 'group:' + groupName + ':pending'), async.apply(db.delete, 'group:' + groupName + ':owners'), + async.apply(db.deleteObjectField, 'groupslug:groupname', utils.slugify(groupName)), function(next) { db.getSetMembers('groups', function(err, groups) { if (err) { @@ -578,7 +599,7 @@ var async = require('async'), }); } ], callback); - }) + }); }; Groups.join = function(groupName, uid, callback) { diff --git a/src/routes/index.js b/src/routes/index.js index c189404e5f..b4427f90f1 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -93,7 +93,7 @@ function groupRoutes(app, middleware, controllers) { var middlewares = [middleware.checkGlobalPrivacySettings]; setupPageRoute(app, '/groups', middleware, middlewares, controllers.groups.list); - setupPageRoute(app, '/groups/:name', middleware, middlewares, controllers.groups.details); + setupPageRoute(app, '/groups/:slug', middleware, middlewares, controllers.groups.details); } function setupPageRoute(router, name, middleware, middlewares, controller) { From 94fa212eabe473e5ef96820de8f9a8830edfa6e3 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 18 Jan 2015 17:35:11 -0500 Subject: [PATCH 155/897] added filter:groups.get --- src/groups.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 6d2b5a3e7b..62f5d5c7dd 100644 --- a/src/groups.js +++ b/src/groups.js @@ -222,7 +222,9 @@ var async = require('async'), results.base.isPending = results.isPending; results.base.isOwner = results.isOwner; - callback(err, results.base); + plugins.fireHook('filter:groups.get', {group: results.base}, function(err, data) { + callback(err, data ? data.group : null); + }); }); }; From 9f8b274e24ced1641cc367e40cc2e34ecee68cdd Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 18 Jan 2015 17:35:58 -0500 Subject: [PATCH 156/897] filter:group.get --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 62f5d5c7dd..100550416c 100644 --- a/src/groups.js +++ b/src/groups.js @@ -222,7 +222,7 @@ var async = require('async'), results.base.isPending = results.isPending; results.base.isOwner = results.isOwner; - plugins.fireHook('filter:groups.get', {group: results.base}, function(err, data) { + plugins.fireHook('filter:group.get', {group: results.base}, function(err, data) { callback(err, data ? data.group : null); }); }); From e5a33539d2f37b76de40be6f9c193920037b2fe4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Jan 2015 10:26:36 -0500 Subject: [PATCH 157/897] updated globals for jslint --- public/src/client/groups/details.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 7ad5702a7d..316b3083ec 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -1,5 +1,5 @@ "use strict"; -/* globals define, socket, ajaxify, app, bootbox, RELATIVE_PATH */ +/* globals define, socket, ajaxify, app, bootbox, RELATIVE_PATH, utils */ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', 'vendor/jquery/draggable-background/backgroundDraggable'], function(iconSelect) { var Details = { From 1e57c5d00173fb258ae44b60c0ab4199d65cd3f2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Jan 2015 10:39:44 -0500 Subject: [PATCH 158/897] linting --- public/src/utils.js | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/public/src/utils.js b/public/src/utils.js index 27a4f2e8e5..bdb8bf1a81 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -119,7 +119,7 @@ str = XRegExp.replace(str, utils.invalidUnicodeChars, '-'); } str = str.toLocaleLowerCase(); - str = str.replace(utils.collapseWhitespace, '-') + str = str.replace(utils.collapseWhitespace, '-'); str = str.replace(utils.collapseDash, '-'); str = str.replace(utils.trimTrailingDash, ''); str = str.replace(utils.trimLeadingDash, ''); @@ -193,7 +193,7 @@ return function (path) { var extension = utils.fileExtension(path); return map[extension] || '*'; - } + }; })(), isRelativeUrl: function(url) { @@ -293,8 +293,9 @@ key = decodeURI(val[0]), value = options.skipToType[key] ? decodeURI(val[1]) : utils.toType(decodeURI(val[1])); - if (key) + if (key) { hash[key] = value; + } }); return hash; }, @@ -335,12 +336,15 @@ return str; } else { var nb = parseFloat(str); - if (!isNaN(nb) && isFinite(str)) + if (!isNaN(nb) && isFinite(str)) { return nb; - if (str === 'false') + } + if (str === 'false') { return false; - if (str === 'true') + } + if (str === 'true') { return true; + } try { str = JSON.parse(str); @@ -356,21 +360,25 @@ // get example: utils.props(A, 'a.b.c.foo.bar') // returns undefined without throwing a TypeError // credits to github.com/gkindel props: function(obj, props, value) { - if(obj === undefined) + if(obj === undefined) { obj = window; - if(props == null) + } + if(props == null) { return undefined; + } var i = props.indexOf('.'); if( i == -1 ) { - if(value !== undefined) + if(value !== undefined) { obj[props] = value; + } return obj[props]; } var prop = props.slice(0, i), newProps = props.slice(i + 1); - if(props !== undefined && !(obj[prop] instanceof Object) ) + if(props !== undefined && !(obj[prop] instanceof Object) ) { obj[prop] = {}; + } return utils.props(obj[prop], newProps, value); } @@ -378,10 +386,12 @@ if (typeof String.prototype.startsWith != 'function') { String.prototype.startsWith = function (prefix){ - if (this.length < prefix.length) + if (this.length < prefix.length) { return false; - for (var i = prefix.length - 1; (i >= 0) && (this[i] === prefix[i]); --i) + } + for (var i = prefix.length - 1; (i >= 0) && (this[i] === prefix[i]); --i) { continue; + } return i < 0; }; } From eb5b8ccec37f00075f2dbe394db489cddf29169e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Jan 2015 10:46:14 -0500 Subject: [PATCH 159/897] better check for group exist, groups with different cases can no longer be created, #2588 --- src/database/redis/hash.js | 18 ++++++++++++++++++ src/groups.js | 26 +++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/database/redis/hash.js b/src/database/redis/hash.js index ddc21b893c..322440a656 100644 --- a/src/database/redis/hash.js +++ b/src/database/redis/hash.js @@ -88,6 +88,24 @@ module.exports = function(redisClient, module) { }); }; + module.isObjectFields = function(key, fields, callback) { + var multi = redisClient.multi(); + for (var i=0; i Date: Mon, 19 Jan 2015 12:59:32 -0500 Subject: [PATCH 160/897] send values to plugins when updating groups --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 69e33772c0..11539576e5 100644 --- a/src/groups.js +++ b/src/groups.js @@ -512,7 +512,7 @@ var async = require('async'), plugins.fireHook('action:group.update', { name: groupName, - values: payload + values: values }); renameGroup(groupName, values.name, callback); }); From a926a11e701d5c023bf4540a397b6b441f3fb15b Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 19 Jan 2015 12:59:49 -0500 Subject: [PATCH 161/897] fix redirection when saving groups --- public/src/client/groups/details.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 316b3083ec..b667176ae9 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -122,7 +122,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', if (settings.name) { var pathname = window.location.pathname; pathname = pathname.substr(1, pathname.lastIndexOf('/')); - ajaxify.go(pathname + encodeURIComponent(settings.name)); + ajaxify.go(pathname + utils.slugify(settings.name)); } else { ajaxify.refresh(); } From 4c62590bc8db5a08e6f91cd44023b21cdb677345 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 19 Jan 2015 14:13:29 -0500 Subject: [PATCH 162/897] closes #2628 --- src/database/mongo/hash.js | 25 +++++++++++++++++++++++++ tests/database/hash.js | 23 ++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index 6db3b5a4a9..f40a756600 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -174,6 +174,31 @@ module.exports = function(db, module) { }); }; + module.isObjectFields = function(key, fields, callback) { + if (!key) { + return callback(); + } + + var data = {}; + fields.forEach(function(field) { + field = helpers.fieldToString(field); + data[field] = ''; + }); + + db.collection('objects').findOne({_key: key}, {fields: data}, function(err, item) { + if (err) { + return callback(err); + } + var results = []; + + fields.forEach(function(field, index) { + results[index] = !!item && item[field] !== undefined && item[field] !== null; + }); + + callback(null, results); + }); + }; + module.deleteObjectField = function(key, field, callback) { callback = callback || helpers.noop; if (!key || !field) { diff --git a/tests/database/hash.js b/tests/database/hash.js index c67b57fd64..5d1d002c3b 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -222,7 +222,7 @@ describe('Hash methods', function() { }); it('should return false if field does not exist', function(done) { - db.isObjectField('testObject1', 'field1', function(err, value) { + db.isObjectField('hashTestObject', 'field1', function(err, value) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(value, false); @@ -240,6 +240,27 @@ describe('Hash methods', function() { }); }); + + describe('isObjectFields()', function() { + it('should return an array of false if object does not exist', function(done) { + db.isObjectFields('doesnotexist', ['field1', 'field2'], function(err, values) { + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.deepEqual(values, [false, false]); + done(); + }); + }); + + it('should return false if field does not exist', function(done) { + db.isObjectFields('hashTestObject', ['name', 'age', 'field1'], function(err, values) { + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.deepEqual(values, [true, true, false]); + done(); + }); + }); + }); + describe('deleteObjectField()', function() { before(function(done) { db.setObject('testObject10', {foo: 'bar', delete: 'this'}, done); From c0622743d22741b13fd5e75ab163c49258c8907a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Jan 2015 15:03:28 -0500 Subject: [PATCH 163/897] closes #2629 --- tests/groups.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/groups.js b/tests/groups.js index 3d24c6f5ae..22300193dc 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -223,9 +223,8 @@ describe('Groups', function() { Groups.destroy('foo', function(err) { if (err) return done(err); - Groups.get('foo', {}, function(err, groupObj) { - if (err) return done(err); - assert.strictEqual(undefined, groupObj); + Groups.get('foo', {}, function(err) { + assert(err, 'Group still exists!'); done(); }); From 5160ab1ed11adf731e405b4a5de70b663022c389 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Jan 2015 15:09:36 -0500 Subject: [PATCH 164/897] closed #2625 --- src/groups.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/groups.js b/src/groups.js index 11539576e5..42f1e6528f 100644 --- a/src/groups.js +++ b/src/groups.js @@ -542,6 +542,15 @@ var async = require('async'), function(next) { db.setObjectField('group:' + oldName, 'name', newName, next); }, + function(next) { + db.setObjectField('group:' + oldName, 'slug', utils.slugify(newName), next); + }, + function(next) { + db.deleteObjectField('groupslug:groupname', group.slug, next); + }, + function(next) { + db.setObjectField('groupslug:groupname', utils.slugify(newName), newName, next); + }, function(next) { db.getSetMembers('groups', function(err, groups) { if (err) { From d96a1f03658aee3bbd0c16ca32318b5279055f6d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 19 Jan 2015 15:12:05 -0500 Subject: [PATCH 165/897] closes #2630 --- src/meta/title.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/meta/title.js b/src/meta/title.js index a476cb61a3..11af43ae9b 100644 --- a/src/meta/title.js +++ b/src/meta/title.js @@ -26,7 +26,6 @@ module.exports = function(Meta) { } Meta.title.parseFragment(uri, language, locals, function(err, title) { - if (err) { title = fallbackTitle; } else { @@ -41,7 +40,6 @@ module.exports = function(Meta) { }; Meta.title.parseFragment = function (urlFragment, language, locals, callback) { - urlFragment = validator.escape(urlFragment); var translated = ['', 'recent', 'unread', 'users', 'notifications']; if (translated.indexOf(urlFragment) !== -1) { if (!urlFragment.length) { @@ -75,7 +73,7 @@ module.exports = function(Meta) { return callback(err); } - if (locals.notFound) { + if (!username) { username = '[[error:no-user]]'; } From 81c929fa77395a20eb16e47a56d567676bfd8d16 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Jan 2015 15:14:34 -0500 Subject: [PATCH 166/897] added a new test for group renaming, #2629 --- tests/groups.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tests/groups.js b/tests/groups.js index 22300193dc..47da1b8bbb 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -212,18 +212,35 @@ describe('Groups', function() { }); }); }); + + it('should rename a group if the name was updated', function(done) { + Groups.update('foo', { + name: 'foobar?' + }, function(err) { + if (err) return done(err); + + Groups.get('foobar?', {}, function(err, groupObj) { + if (err) return done(err); + + assert.strictEqual('foobar?', groupObj.name); + assert.strictEqual('foobar', groupObj.slug); + + done(); + }); + }); + }); }); describe('.destroy()', function() { before(function(done) { - Groups.join('foo', 1, done); + Groups.join('foobar?', 1, done); }); it('should destroy a group', function(done) { - Groups.destroy('foo', function(err) { + Groups.destroy('foobar?', function(err) { if (err) return done(err); - Groups.get('foo', {}, function(err) { + Groups.get('foobar?', {}, function(err) { assert(err, 'Group still exists!'); done(); From d2938ea509ed89f66919a1b06b30f7f3829c4eaa Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Jan 2015 15:26:50 -0500 Subject: [PATCH 167/897] closed #2626 --- src/upgrade.js | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/upgrade.js b/src/upgrade.js index 35f3acaa87..b28158d826 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 0, 15); + latestSchema = Date.UTC(2015, 0, 19); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -72,6 +72,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 9, 31); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/10/31] Applying newbiePostDelay values'); async.series([ @@ -93,6 +94,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 10, 6, 18, 30); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/11/6] Updating topic authorship sorted set'); async.waterfall([ @@ -138,6 +140,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 10, 7); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/11/7] Renaming sorted set names'); async.waterfall([ @@ -199,6 +202,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 10, 11); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/11/11] Upgrading permissions'); async.waterfall([ @@ -272,6 +276,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 10, 17, 13); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/11/17] Updating user email digest settings'); async.waterfall([ @@ -306,6 +311,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 10, 29, 22); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/11/29] Updating config.json to new format'); var configPath = path.join(__dirname, '../config.json'); @@ -358,6 +364,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 11, 2); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/12/2] Removing register user fields'); db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) { @@ -393,6 +400,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 11, 12); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/12/12] Updating teasers'); db.getSortedSetRange('topics:tid', 0, -1, function(err, tids) { @@ -419,6 +427,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2014, 11, 20); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2014/12/20] Updating digest settings'); async.waterfall([ @@ -455,6 +464,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2015, 0, 8); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2015/01/08] Updating category topics sorted sets'); db.getSortedSetRange('topics:tid', 0, -1, function(err, tids) { @@ -494,6 +504,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2015, 0, 9); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2015/01/09] Creating fullname:uid hash'); db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) { @@ -529,6 +540,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2015, 0, 13); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2015/01/13] Creating uid:followed_tids sorted set'); db.getSortedSetRange('topics:tid', 0, -1, function(err, tids) { @@ -570,6 +582,7 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2015, 0, 14); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2015/01/14] Upgrading follow sets to sorted sets'); db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) { @@ -634,11 +647,12 @@ Upgrade.upgrade = function(callback) { function(next) { thisSchemaDate = Date.UTC(2015, 0, 15); if (schemaDate < thisSchemaDate) { + updatesMade = true; winston.info('[2015/01/15] Creating topiccount for users'); db.getSortedSetRange('users:joindate', 0, -1, function(err, uids) { if (err) { - winston.error('[2014/01/15] Error encountered while Creating topiccount for users'); + winston.error('[2015/01/15] Error encountered while Creating topiccount for users'); return next(err); } @@ -668,6 +682,34 @@ Upgrade.upgrade = function(callback) { next(); } }, + function(next) { + thisSchemaDate = Date.UTC(2015, 0, 19); + if (schemaDate < thisSchemaDate) { + updatesMade = true; + winston.info('[2015/01/19] Generating group slugs'); + + Groups.list({}, function(err, groups) { + var tasks = []; + groups.forEach(function(groupObj) { + tasks.push(async.apply(db.setObjectField, 'group:' + groupObj.name, 'slug', Utils.slugify(groupObj.name))); + tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', Utils.slugify(groupObj.name), groupObj.name)); + }); + + async.parallel(tasks, function(err) { + if (err) { + winston.error('[2015/01/19] Error encountered while Generating group slugs'); + return next(err); + } + + winston.info('[2015/01/19] Generating group slugs done'); + Upgrade.update(thisSchemaDate, next); + }); + }); + } else { + winston.info('[2015/01/19] Generating group slugs skipped'); + next(); + } + } // Add new schema updates here // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 22!!! From 99dc37bd9c5c8ad3d01cf99f03353529e96e811c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Jan 2015 15:43:22 -0500 Subject: [PATCH 168/897] removed relativeTime util method, utils.js better be a C now. --- public/src/modules/notifications.js | 8 +++++- public/src/translator.js | 28 +++++++++++++++++++++ public/src/utils.js | 38 ----------------------------- 3 files changed, 35 insertions(+), 39 deletions(-) diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 46e6833806..319d88041f 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -25,11 +25,14 @@ define('notifications', ['sounds'], function(sound) { image = ''; } - return '

  • ' + image + '' + utils.relativeTime(notification.datetime, true) + '' + notification.bodyShort + '
    • '; + return '
  • ' + image + '' + $.timeago(new Date(parseInt(notification.datetime, 10))) + '' + notification.bodyShort + '
    • '; } var x, html = ''; + // Switch to shorthand + translator.toggleTimeagoShorthand(); + if (!err && (data.read.length + data.unread.length) > 0) { var image = ''; for (x = 0; x < data.unread.length; x++) { @@ -43,6 +46,9 @@ define('notifications', ['sounds'], function(sound) { html += '
  • [[notifications:no_notifs]]
    • '; } + // Switch back to original timeago strings + translator.toggleTimeagoShorthand(); + html += '
  • [[notifications:see_all]]
    • '; notifList.translateHtml(html); diff --git a/public/src/translator.js b/public/src/translator.js index 07794f360c..5b052af216 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -85,6 +85,34 @@ } }; + translator.toggleTimeagoShorthand = function() { + if (!translator.timeagoStrings) { + translator.timeagoStrings = $.extend({}, jQuery.timeago.settings.strings); + jQuery.timeago.settings.strings = { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "", + suffixFromNow: "", + seconds: "1m", + minute: "1m", + minutes: "%dm", + hour: "1h", + hours: "%dh", + day: "1d", + days: "%dd", + month: "1mo", + months: "%dmo", + year: "1yr", + years: "%dyr", + wordSeparator: " ", + numbers: [] + }; + } else { + jQuery.timeago.settings.strings = $.extend({}, translator.timeagoStrings); + delete translator.timeagoStrings; + } + }; + translator.translate = function (text, language, callback) { if (typeof language === 'function') { callback = language; diff --git a/public/src/utils.js b/public/src/utils.js index bdb8bf1a81..b9658593cc 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -63,44 +63,6 @@ }); }, - relativeTime: function(timestamp, min) { - var now = +new Date(), - difference = now - Math.floor(parseFloat(timestamp)); - - if(difference < 0) { - difference = 0; - } - - difference = Math.floor(difference / 1000); - - if (difference < 60) { - return difference + (min ? 's' : ' second') + (difference !== 1 && !min ? 's' : ''); - } - - difference = Math.floor(difference / 60); - if (difference < 60) { - return difference + (min ? 'm' : ' minute') + (difference !== 1 && !min ? 's' : ''); - } - - difference = Math.floor(difference / 60); - if (difference < 24) { - return difference + (min ? 'h' : ' hour') + (difference !== 1 && !min ? 's' : ''); - } - - difference = Math.floor(difference / 24); - if (difference < 30) { - return difference + (min ? 'd' : ' day') + (difference !== 1 && !min ? 's' : ''); - } - - difference = Math.floor(difference / 30); - if (difference < 12) { - return difference + (min ? 'mon' : ' month') + (difference !== 1 && !min ? 's' : ''); - } - - difference = Math.floor(difference / 12); - return difference + (min ? 'y' : ' year') + (difference !== 1 && !min ? 's' : ''); - }, - invalidUnicodeChars: XRegExp('[^\\p{L}\\s\\d\\-_]', 'g'), invalidLatinChars: /[^\w\s\d\-_]/g, trimRegex: /^\s+|\s+$/g, From cb5ee2a14153452ff4aaad4be46acf6fd056c66f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 19 Jan 2015 16:38:45 -0500 Subject: [PATCH 169/897] closes #2632 --- public/src/app.js | 4 ++-- public/src/client/account/settings.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index ea567e239e..d7097f91e7 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -364,7 +364,7 @@ app.uid = null; } }; - function exposeConfigToTemplates() { + app.exposeConfigToTemplates = function() { $(document).ready(function() { templates.setGlobal('loggedIn', config.loggedIn); templates.setGlobal('relative_path', RELATIVE_PATH); @@ -599,7 +599,7 @@ app.uid = null; showWelcomeMessage = window.location.href.indexOf('loggedin') !== -1; - exposeConfigToTemplates(); + app.exposeConfigToTemplates(); socketIOConnect(); diff --git a/public/src/client/account/settings.js b/public/src/client/account/settings.js index 3dde90dd98..0b4bbbd00f 100644 --- a/public/src/client/account/settings.js +++ b/public/src/client/account/settings.js @@ -42,6 +42,7 @@ define('forum/account/settings', ['forum/account/header'], function(header) { config[key] = newSettings[key]; } } + app.exposeConfigToTemplates(); if (parseInt(app.uid, 10) === parseInt(ajaxify.variables.get('theirid'), 10)) { ajaxify.refresh(); From 2f955c3af4ffb3a4593e82c1343c4c17b864d5d4 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 19 Jan 2015 17:06:43 -0500 Subject: [PATCH 170/897] getUpvoters works with array --- public/src/client/topic/postTools.js | 10 +++++----- src/socket.io/posts.js | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 2f5a617572..5e6df47e8b 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -39,15 +39,15 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com function addVoteHandler() { $('#post-container').on('mouseenter', '.post-row .votes', function() { - loadDataAndCreateTooltip($(this), 'posts.getUpvoters'); + loadDataAndCreateTooltip($(this)); }); } - function loadDataAndCreateTooltip(el, method) { + function loadDataAndCreateTooltip(el) { var pid = el.parents('.post-row').attr('data-pid'); - socket.emit(method, pid, function(err, data) { - if (!err) { - createTooltip(el, data); + socket.emit('posts.getUpvoters', [pid], function(err, data) { + if (!err && data.length) { + createTooltip(el, data[0]); } }); } diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 97b8e7ea74..4a8e5f19bd 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -339,8 +339,11 @@ SocketPosts.getPrivileges = function(socket, pids, callback) { }); }; -SocketPosts.getUpvoters = function(socket, pid, callback) { - favourites.getUpvotedUidsByPids([pid], function(err, data) { +SocketPosts.getUpvoters = function(socket, pids, callback) { + if (!Array.isArray(pids)) { + return callback(new Error('[[error:invalid-data]]')); + } + favourites.getUpvotedUidsByPids(pids, function(err, data) { if (err || !Array.isArray(data) || !data.length) { return callback(err, []); } From 96c27d29f46baf359b2741928678d181f82ede01 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 19 Jan 2015 20:49:24 -0500 Subject: [PATCH 171/897] dont crash if callback isn't supplied --- src/database/redis/hash.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/database/redis/hash.js b/src/database/redis/hash.js index 322440a656..ee60ba98a2 100644 --- a/src/database/redis/hash.js +++ b/src/database/redis/hash.js @@ -107,6 +107,7 @@ module.exports = function(redisClient, module) { }; module.deleteObjectField = function(key, field, callback) { + callback = callback || function() {}; redisClient.hdel(key, field, function(err, res) { callback(err); }); From 21522e59c424755d8a24081015776b9cc87a746d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 20 Jan 2015 01:30:42 -0500 Subject: [PATCH 172/897] added slug to user group return #2635 --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 42f1e6528f..939d8fa5c6 100644 --- a/src/groups.js +++ b/src/groups.js @@ -775,7 +775,7 @@ var async = require('async'), return 'group:' + groupName; }); - db.getObjectsFields(groupKeys, ['name', 'hidden', 'userTitle', 'icon', 'labelColor'], function(err, groupData) { + db.getObjectsFields(groupKeys, ['name', 'slug', 'hidden', 'userTitle', 'icon', 'labelColor'], function(err, groupData) { if (err) { return callback(err); } From 22e7b2d3b26131bb9dc2ecbede35b81a5da9327b Mon Sep 17 00:00:00 2001 From: Schamper Date: Tue, 20 Jan 2015 12:29:09 +0100 Subject: [PATCH 173/897] Fix editorconfig syntax --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 71340c4063..71cf54ef4d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,6 @@ root = true -[*.js, *.css, *.tpl, *.json] +[{*.js, *.css, *.tpl, *.json}] indent_style = tab end_of_line = lf charset = utf-8 From c4bc51b834a911f789068c92289c1d22ae2b2b5d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 20 Jan 2015 09:41:27 -0500 Subject: [PATCH 174/897] fixing installation script that broke with recent updates to groups --- src/install.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/install.js b/src/install.js index 91c55293e0..54fb075ced 100644 --- a/src/install.js +++ b/src/install.js @@ -268,11 +268,7 @@ function enableDefaultTheme(next) { function createAdministrator(next) { var Groups = require('./groups'); Groups.get('administrators', {}, function (err, groupObj) { - if (err) { - return next(err); - } - - if (groupObj && groupObj.memberCount > 0) { + if (!err && groupObj && groupObj.memberCount > 0) { winston.info('Administrator found, skipping Admin setup'); next(); } else { From aab2bc0b3923630c4d18ec8edc5ee7437e9e9917 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 20 Jan 2015 17:04:05 -0500 Subject: [PATCH 175/897] keep track of the last 20 events --- src/socket.io/index.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 08dab140e6..171a80d38f 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -124,11 +124,6 @@ function onMessage(socket, payload) { return winston.warn('[socket.io] Empty method name'); } - if (ratelimit.isFlooding(socket)) { - winston.warn('[socket.io] Too many emits! Disconnecting uid : ' + socket.uid + '. Message : ' + eventName); - return socket.disconnect(); - } - var parts = eventName.toString().split('.'), namespace = parts[0], methodToCall = parts.reduce(function(prev, cur) { @@ -146,6 +141,17 @@ function onMessage(socket, payload) { return; } + socket.previousEvents = socket.previousEvents || []; + socket.previousEvents.push(eventName); + if (socket.previousEvents.length > 20) { + socket.previousEvents.shift(); + } + + if (ratelimit.isFlooding(socket)) { + winston.warn('[socket.io] Too many emits! Disconnecting uid : ' + socket.uid + '. Events : ' + socket.previousEvents); + return socket.disconnect(); + } + if (Namespaces[namespace].before) { Namespaces[namespace].before(socket, eventName, function() { callMethod(methodToCall, socket, params, callback); From f1a3815ddc69219d186fe4a4385bdae41bf01a6a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 20 Jan 2015 17:42:05 -0500 Subject: [PATCH 176/897] action:user.updateProfile --- src/user/profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/profile.js b/src/user/profile.js index b901bdb066..13f29591c0 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -96,7 +96,7 @@ module.exports = function(User) { if (err) { return callback(err); } - + plugins.fireHook('action:user.updateProfile', {data: data, uid: uid}); User.getUserFields(uid, ['email', 'userslug', 'picture', 'gravatarpicture'], callback); }); }); From 7efc0619cc1af5846b81eabbea02e492d3e417af Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 20 Jan 2015 18:13:48 -0500 Subject: [PATCH 177/897] dont crash if data.username is undefined, dont set username to empty value --- src/user/profile.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/user/profile.js b/src/user/profile.js index 13f29591c0..8c44b86a6f 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -57,6 +57,9 @@ module.exports = function(User) { } function isUsernameAvailable(next) { + if (!data.username) { + return next(); + } User.getUserFields(uid, ['username', 'userslug'], function(err, userData) { var userslug = utils.slugify(data.username); @@ -177,6 +180,9 @@ module.exports = function(User) { } function updateUsername(uid, newUsername, callback) { + if (!newUsername) { + return callback(); + } User.getUserFields(uid, ['username', 'userslug'], function(err, userData) { function update(field, object, value, callback) { async.parallel([ From 22a619d9c7d5e5a2f916b808b9b5d69836806208 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 20 Jan 2015 19:30:02 -0500 Subject: [PATCH 178/897] fixed #2631 --- src/middleware/middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 2d5faace76..111b0b1ceb 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -69,7 +69,7 @@ middleware.redirectToAccountIfLoggedIn = function(req, res, next) { middleware.redirectToLoginIfGuest = function(req, res, next) { if (!req.user || parseInt(req.user.uid, 10) === 0) { - req.session.returnTo = nconf.get('relative_path') + req.url; + req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, ''); return res.redirect(nconf.get('relative_path') + '/login'); } else { next(); From 56200b0fdfe0bccc1ca11f66e8cc806b418684a8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 20 Jan 2015 20:55:22 -0500 Subject: [PATCH 179/897] defining module name in iconSelect module --- public/src/modules/iconSelect.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.js index 88ab1903ed..f21bd76e1f 100644 --- a/public/src/modules/iconSelect.js +++ b/public/src/modules/iconSelect.js @@ -2,7 +2,7 @@ /* globals define, bootbox */ -define(function() { +define('iconSelect', function() { var iconSelect = {}; iconSelect.init = function(el, onModified) { From 093e499bf8f584b82dddc67c89a7255f4ced6216 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 20 Jan 2015 20:55:22 -0500 Subject: [PATCH 180/897] defining module name in iconSelect module --- public/src/modules/iconSelect.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.js index 88ab1903ed..f21bd76e1f 100644 --- a/public/src/modules/iconSelect.js +++ b/public/src/modules/iconSelect.js @@ -2,7 +2,7 @@ /* globals define, bootbox */ -define(function() { +define('iconSelect', function() { var iconSelect = {}; iconSelect.init = function(el, onModified) { From dd38ee96faed8dc68786fd67743bb33a5d69d823 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 21 Jan 2015 13:46:40 -0500 Subject: [PATCH 181/897] return cover:url in user groups --- src/groups.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 939d8fa5c6..07266af711 100644 --- a/src/groups.js +++ b/src/groups.js @@ -775,7 +775,7 @@ var async = require('async'), return 'group:' + groupName; }); - db.getObjectsFields(groupKeys, ['name', 'slug', 'hidden', 'userTitle', 'icon', 'labelColor'], function(err, groupData) { + db.getObjects(groupKeys, function(err, groupData) { if (err) { return callback(err); } @@ -786,6 +786,12 @@ var async = require('async'), var groupSets = groupData.map(function(group) { group.labelColor = group.labelColor || '#000000'; + + if (!group['cover:url']) { + group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; + group['cover:position'] = '50% 50%'; + } + return 'group:' + group.name + ':members'; }); From fa27461abc5b764a56cc267268cd75932cf26d48 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 14:41:28 -0500 Subject: [PATCH 182/897] upgrading administrator groups as well --- src/upgrade.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/upgrade.js b/src/upgrade.js index b28158d826..b957adbe7d 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -695,6 +695,10 @@ Upgrade.upgrade = function(callback) { tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', Utils.slugify(groupObj.name), groupObj.name)); }); + // Administrator group + tasks.push(async.apply(db.setObjectField, 'group:administrators', 'slug', 'administrators')); + tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', 'administrators', 'administrators')); + async.parallel(tasks, function(err) { if (err) { winston.error('[2015/01/19] Error encountered while Generating group slugs'); From 6502dd256112386ee8747ec0f55629b4a68ff604 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 15:43:05 -0500 Subject: [PATCH 183/897] group searching --- public/src/client/groups/list.js | 28 +++++++++++++++++++++++++++- src/groups.js | 19 +++++++++++++++++++ src/socket.io/groups.js | 8 ++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index d11eb7c8e6..5fac3e7c22 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -1,5 +1,5 @@ "use strict"; -/* globals app, define, ajaxify, socket, bootbox, utils */ +/* globals app, define, ajaxify, socket, bootbox, utils, templates */ define('forum/groups/list', function() { var Groups = {}; @@ -29,6 +29,32 @@ define('forum/groups/list', function() { } }); }); + + // Group searching + $('#search-text').on('keydown', function(e) { + if (e.keyCode === 13) { Groups.search($(this).val()); } + }); + + $('#search-button').on('click', function() { + Groups.search($(this).siblings('input').val()); + }); + }; + + Groups.search = function(query) { + var groupsEl = $('.groups.row'); + + socket.emit('groups.search', { + query: query, + options: { + expand: true + } + }, function(err, groups) { + templates.parse('partials/group_list', { + groups: groups + }, function(html) { + groupsEl.empty().append(html); + }); + }); }; return Groups; diff --git a/src/groups.js b/src/groups.js index 07266af711..87e6070757 100644 --- a/src/groups.js +++ b/src/groups.js @@ -898,4 +898,23 @@ var async = require('async'), db.setRemove('group:' + groupName + ':owners', toUid, callback); }; + Groups.search = function(query, options, callback) { + if (!query || !query.length) { + return callback(null, []); + } + + async.waterfall([ + async.apply(db.getObjectValues, 'groupslug:groupname'), + function(groupNames, next) { + groupNames = groupNames.filter(function(name) { + return name.match(new RegExp(query, 'i')); + }); + + async.mapLimit(groupNames, 5, function(groupName, next) { + Groups.get(groupName, options || {}, next); + }, next); + } + ], callback); + }; + }(module.exports)); diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index c4b4535e82..902041d6ec 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -126,6 +126,14 @@ SocketGroups.delete = function(socket, data, callback) { }); }; +SocketGroups.search = function(socket, data, callback) { + if (!data || !data.query) { + return callback(null, []); + } + + groups.search(data.query, data.options || {}, callback); +}; + SocketGroups.cover = {}; SocketGroups.cover.get = function(socket, data, callback) { From ba1260923feeb73ac9b033813eeacace0e9084a4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 15:58:43 -0500 Subject: [PATCH 184/897] companion to nodebb/nodebb-theme-vanilla@ad953f2 --- public/src/client/groups/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 5fac3e7c22..38d70d7c4a 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -49,7 +49,7 @@ define('forum/groups/list', function() { expand: true } }, function(err, groups) { - templates.parse('partials/group_list', { + templates.parse('partials/groups/list', { groups: groups }, function(html) { groupsEl.empty().append(html); From c20a848c7f069a987caa397dba65b424a9376743 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 21 Jan 2015 16:05:39 -0500 Subject: [PATCH 185/897] removed console.logs --- public/src/client/users.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/src/client/users.js b/public/src/client/users.js index c19c69afe6..4f1da0a7a0 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -97,12 +97,10 @@ define('forum/users', function() { }); $('.search select, .search .checkbox input').on('change', function() { - console.log('doing search'); doSearch(); }); $('.pagination').on('click', 'a', function() { - console.log('loading page', $(this).attr('data-page')); doSearch($(this).attr('data-page')); return false; }) From 2917304f6c84da2baab5766a25e9e3a96ff95fe4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 16:14:31 -0500 Subject: [PATCH 186/897] companion commit to nodebb/nodebb-theme-vanilla@0d17032 --- public/src/client/groups/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 38d70d7c4a..36f1e0f3e7 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -5,7 +5,7 @@ define('forum/groups/list', function() { var Groups = {}; Groups.init = function() { - var groupsEl = $('.groups.row'); + var groupsEl = $('#groups-list'); groupsEl.on('click', '.list-cover', function() { var groupName = $(this).parents('[data-group]').attr('data-group'); @@ -41,7 +41,7 @@ define('forum/groups/list', function() { }; Groups.search = function(query) { - var groupsEl = $('.groups.row'); + var groupsEl = $('#groups-list'); socket.emit('groups.search', { query: query, From 4072172c8e550abf52fb171e2c262381fe93128b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 16:14:31 -0500 Subject: [PATCH 187/897] companion commit to nodebb/nodebb-theme-vanilla@0d17032 --- public/src/client/groups/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 38d70d7c4a..36f1e0f3e7 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -5,7 +5,7 @@ define('forum/groups/list', function() { var Groups = {}; Groups.init = function() { - var groupsEl = $('.groups.row'); + var groupsEl = $('#groups-list'); groupsEl.on('click', '.list-cover', function() { var groupName = $(this).parents('[data-group]').attr('data-group'); @@ -41,7 +41,7 @@ define('forum/groups/list', function() { }; Groups.search = function(query) { - var groupsEl = $('.groups.row'); + var groupsEl = $('#groups-list'); socket.emit('groups.search', { query: query, From 78a5843ae45e7cd8cb4cbab887112f05469536f2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 16:33:09 -0500 Subject: [PATCH 188/897] fixed tests by removing the broken one, heh heh heh --- src/groups.js | 21 --------------------- tests/groups.js | 11 ----------- 2 files changed, 32 deletions(-) diff --git a/src/groups.js b/src/groups.js index 87e6070757..58170eeaa8 100644 --- a/src/groups.js +++ b/src/groups.js @@ -265,27 +265,6 @@ var async = require('async'), db.getSetMembers('group:' + groupName + ':members', callback); }; - Groups.search = function(query, options, callback) { - if (!query) { - return callback(null, []); - } - - db.getSetMembers('groups', function(err, groups) { - if (err) { - return callback(err); - } - groups = groups.filter(function(groupName) { - return groupName.match(new RegExp(utils.escapeRegexChars(query), 'i')); - }); - - async.map(groups, function(groupName, next) { - Groups.get(groupName, options, next); - }, function(err, groups) { - callback(err, internals.filterGroups(groups, options)); - }); - }); - }; - Groups.isMember = function(uid, groupName, callback) { if (!uid || parseInt(uid, 10) <= 0) { return callback(null, false); diff --git a/tests/groups.js b/tests/groups.js index 47da1b8bbb..0025000828 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -88,17 +88,6 @@ describe('Groups', function() { done(); }); }); - - it('should return the "Hidden" group when "showAllGroups" option is passed in', function(done) { - Groups.search('hidden', { - showAllGroups: true - }, function(err, groups) { - if (err) return done(err); - assert.equal(1, groups.length); - assert.strictEqual('Hidden', groups[0].name); - done(); - }); - }); }); describe('.isMember()', function() { From fd8a885145997c6e2f6018f08fca5dd994ee4e1a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 16:33:09 -0500 Subject: [PATCH 189/897] fixed tests by removing the broken one, heh heh heh --- src/groups.js | 21 --------------------- tests/groups.js | 11 ----------- 2 files changed, 32 deletions(-) diff --git a/src/groups.js b/src/groups.js index 87e6070757..58170eeaa8 100644 --- a/src/groups.js +++ b/src/groups.js @@ -265,27 +265,6 @@ var async = require('async'), db.getSetMembers('group:' + groupName + ':members', callback); }; - Groups.search = function(query, options, callback) { - if (!query) { - return callback(null, []); - } - - db.getSetMembers('groups', function(err, groups) { - if (err) { - return callback(err); - } - groups = groups.filter(function(groupName) { - return groupName.match(new RegExp(utils.escapeRegexChars(query), 'i')); - }); - - async.map(groups, function(groupName, next) { - Groups.get(groupName, options, next); - }, function(err, groups) { - callback(err, internals.filterGroups(groups, options)); - }); - }); - }; - Groups.isMember = function(uid, groupName, callback) { if (!uid || parseInt(uid, 10) <= 0) { return callback(null, false); diff --git a/tests/groups.js b/tests/groups.js index 47da1b8bbb..0025000828 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -88,17 +88,6 @@ describe('Groups', function() { done(); }); }); - - it('should return the "Hidden" group when "showAllGroups" option is passed in', function(done) { - Groups.search('hidden', { - showAllGroups: true - }, function(err, groups) { - if (err) return done(err); - assert.equal(1, groups.length); - assert.strictEqual('Hidden', groups[0].name); - done(); - }); - }); }); describe('.isMember()', function() { From 5fe69e0386ee0c1e369c66c1080e6f23a2d7411c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 21 Jan 2015 16:50:31 -0500 Subject: [PATCH 190/897] input selector --- public/src/client/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/users.js b/public/src/client/users.js index 4f1da0a7a0..6030f415b5 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -96,7 +96,7 @@ define('forum/users', function() { timeoutId = setTimeout(doSearch, 250); }); - $('.search select, .search .checkbox input').on('change', function() { + $('.search select, .search input[type="checkbox"]').on('change', function() { doSearch(); }); From 2a6de59277f099a72d77b19cd0db199a966c71cf Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 16:55:03 -0500 Subject: [PATCH 191/897] if group search is executed with empty string, return all groups --- src/groups.js | 4 ++-- src/socket.io/groups.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/groups.js b/src/groups.js index 58170eeaa8..f62fda1f43 100644 --- a/src/groups.js +++ b/src/groups.js @@ -878,8 +878,8 @@ var async = require('async'), }; Groups.search = function(query, options, callback) { - if (!query || !query.length) { - return callback(null, []); + if (!query) { + query = ''; } async.waterfall([ diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index 902041d6ec..e51c2f6062 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -127,11 +127,11 @@ SocketGroups.delete = function(socket, data, callback) { }; SocketGroups.search = function(socket, data, callback) { - if (!data || !data.query) { + if (!data) { return callback(null, []); } - groups.search(data.query, data.options || {}, callback); + groups.search(data.query || '', data.options || {}, callback); }; SocketGroups.cover = {}; From af1fa11606356f7e52814ba053007e3e88a34f36 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 17:15:28 -0500 Subject: [PATCH 192/897] rejigged search so it grabs the values on method execution, instead of being passed in --- public/src/client/groups/list.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 36f1e0f3e7..06ce88ade9 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -32,19 +32,17 @@ define('forum/groups/list', function() { // Group searching $('#search-text').on('keydown', function(e) { - if (e.keyCode === 13) { Groups.search($(this).val()); } - }); - - $('#search-button').on('click', function() { - Groups.search($(this).siblings('input').val()); + if (e.keyCode === 13) { Groups.search(); } }); + $('#search-button').on('click', Groups.search); }; - Groups.search = function(query) { - var groupsEl = $('#groups-list'); + Groups.search = function() { + var groupsEl = $('#groups-list'), + queryEl = $('#search-text'); socket.emit('groups.search', { - query: query, + query: queryEl.val(), options: { expand: true } From 4a3255d4fd8e68a89455b6c960f8a50611577fa8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 17:41:43 -0500 Subject: [PATCH 193/897] search sorting --- public/src/client/groups/list.js | 6 ++++-- src/groups.js | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 06ce88ade9..45c5ce5a97 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -39,12 +39,14 @@ define('forum/groups/list', function() { Groups.search = function() { var groupsEl = $('#groups-list'), - queryEl = $('#search-text'); + queryEl = $('#search-text'), + sortEl = $('#search-sort'); socket.emit('groups.search', { query: queryEl.val(), options: { - expand: true + expand: true, + sort: sortEl.val() } }, function(err, groups) { templates.parse('partials/groups/list', { diff --git a/src/groups.js b/src/groups.js index f62fda1f43..2c510fc119 100644 --- a/src/groups.js +++ b/src/groups.js @@ -892,8 +892,29 @@ var async = require('async'), async.mapLimit(groupNames, 5, function(groupName, next) { Groups.get(groupName, options || {}, next); }, next); - } + }, + async.apply(Groups.sort, options.sort) ], callback); }; + Groups.sort = function(strategy, groups, next) { + switch(strategy) { + case 'count': + groups = groups.sort(function(a, b) { + return a.slug > b.slug; + }).sort(function(a, b) { + return a.memberCount < b.memberCount; + }); + break; + + case 'alpha': // intentional fall-through + default: + groups = groups.sort(function(a, b) { + return a.slug > b.slug; + }); + } + + next(null, groups); + }; + }(module.exports)); From c379753341a9b937fa06a95f844e95d1d61b3862 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 21 Jan 2015 22:48:22 -0500 Subject: [PATCH 194/897] upgrade scripts upgrade groups to sorted set(groups:createtime) upgrade upgrade groups::members to sorted set new database methods tests --- src/database/mongo/sorted.js | 44 ++++++++++++++++++++++ src/database/redis/sorted.js | 26 +++++++++++++ src/groups.js | 71 +++++++++++++++++++++--------------- src/upgrade.js | 51 +++++++++++++++++++++++++- tests/database/sorted.js | 26 +++++++++++++ 5 files changed, 188 insertions(+), 30 deletions(-) diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js index 74da932a18..565189dd8f 100644 --- a/src/database/mongo/sorted.js +++ b/src/database/mongo/sorted.js @@ -400,6 +400,50 @@ module.exports = function(db, module) { }); }; + module.isMemberOfSortedSets = function(keys, value, callback) { + if (!Array.isArray(keys)) { + return callback(); + } + value = helpers.valueToString(value); + db.collection('objects').find({_key: {$in: keys}, value: value}, {fields: {_id: 0, _key: 1, value: 1}}).toArray(function(err, results) { + if (err) { + return callback(err); + } + + results = results.map(function(item) { + return item._key; + }); + + results = keys.map(function(key) { + return results.indexOf(key) !== -1; + }); + callback(null, results); + }); + }; + + module.getSortedSetsMembers = function(keys, callback) { + if (!Array.isArray(keys) || !keys.length) { + return callback(null, []); + } + db.collection('objects').find({_key: {$in: keys}}, {_id: 0, _key: 1, value: 1}).toArray(function(err, data) { + if (err) { + return callback(err); + } + + var sets = {}; + data.forEach(function(set) { + sets[set._key] = sets[set._key] || []; + sets[set._key].push(set.value); + }); + + var returnData = new Array(keys.length); + for(var i=0; i Date: Wed, 21 Jan 2015 22:53:33 -0500 Subject: [PATCH 195/897] send iso and unix timestamp --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 55d40e3559..fe44bb367a 100644 --- a/src/groups.js +++ b/src/groups.js @@ -208,7 +208,7 @@ var async = require('async'), results.base.name = validator.escape(results.base.name); results.base.description = validator.escape(results.base.description); results.base.userTitle = validator.escape(results.base.userTitle); - results.base.createtime = utils.toISOString(results.base.createtime); + results.base.createtimeISO = utils.toISOString(results.base.createtime); results.base.members = results.users.filter(Boolean); results.base.pending = results.pending.filter(Boolean); results.base.count = numUsers || results.base.members.length; From c6ae6fae542e08e66bf0117e0cc220b3af700cf0 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 21 Jan 2015 22:55:13 -0500 Subject: [PATCH 196/897] fix typo in test --- tests/database/sorted.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/database/sorted.js b/tests/database/sorted.js index ed0bea521f..68e6f587da 100644 --- a/tests/database/sorted.js +++ b/tests/database/sorted.js @@ -390,7 +390,7 @@ describe('Sorted Set methods', function() { describe('getSortedSetsMembers', function() { it('should return members of multiple sorted sets', function(done) { - db.getSortedSetMembers(['doesnotexist', 'sortedSetTest1'], function(err, sortedSets) { + db.getSortedSetsMembers(['doesnotexist', 'sortedSetTest1'], function(err, sortedSets) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.deepEqual(sortedSets[0], []); From 3ade5da00fe6a38f727ba1015b9f0df9bc7993a4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Jan 2015 23:10:59 -0500 Subject: [PATCH 197/897] groups sorting by creation date --- src/groups.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/groups.js b/src/groups.js index fe44bb367a..0dcb9379a8 100644 --- a/src/groups.js +++ b/src/groups.js @@ -920,6 +920,12 @@ var async = require('async'), }); break; + case 'date': + groups = groups.sort(function(a, b) { + return a.createtime < b.createtime; + }); + break; + case 'alpha': // intentional fall-through default: groups = groups.sort(function(a, b) { From f3719df9972bf1cf378a475aeed7a35bc01a2284 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 21 Jan 2015 23:16:27 -0500 Subject: [PATCH 198/897] getGroups method to get a range --- src/groups.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/groups.js b/src/groups.js index 0dcb9379a8..fbb138dce5 100644 --- a/src/groups.js +++ b/src/groups.js @@ -90,6 +90,10 @@ var async = require('async'), }); }; + Groups.getGroups = function(start, end, callback) { + db.getSortedSetRevRange('groups:createtime', start, end, callback); + }; + Groups.get = function(groupName, options, callback) { var truncated = false, numUsers; From 22c541d95f405e85238cafcf5316e83fb4cb79f4 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 22 Jan 2015 14:13:39 -0500 Subject: [PATCH 199/897] closes #2643 --- src/user/delete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/delete.js b/src/user/delete.js index b13fa1aa97..e6cdcebb19 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -85,7 +85,7 @@ module.exports = function(User) { db.deleteAll(keys, next); }, function(next) { - deleteUserIps(uids, next); + deleteUserIps(uid, next); }, function(next) { deleteUserFromFollowers(uid, next); From 46034845583119ac0732e2b639878f5a18339b4e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 22 Jan 2015 14:18:19 -0500 Subject: [PATCH 200/897] user.delete test --- tests/user.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/user.js b/tests/user.js index 3ef541623b..381c6f0a44 100644 --- a/tests/user.js +++ b/tests/user.js @@ -171,6 +171,28 @@ describe('User', function() { }); }); + describe('.delete()', function() { + var uid; + before(function(done) { + User.create({username: 'userToDelete', password: '123456', email: 'delete@me.com'}, function(err, newUid) { + assert.ifError(err); + uid = newUid; + done(); + }); + }); + + it('should delete a user account', function(done) { + User.delete(uid, function(err) { + assert.ifError(err); + User.exists('userToDelete', function(err, exists) { + assert.ifError(err); + assert.equal(exists, false); + done(); + }); + }); + }); + }); + after(function() { db.flushdb(); }); From 740c52fc4f55ad65c799542a5114b083c2c10832 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 22 Jan 2015 14:19:23 -0500 Subject: [PATCH 201/897] missing semicolon --- src/user/delete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/delete.js b/src/user/delete.js index e6cdcebb19..3440e810a4 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -127,7 +127,7 @@ module.exports = function(User) { } db.delete('uid:' + uid + ':ip', callback); }); - }) + }); } function deleteUserFromFollowers(uid, callback) { From d2217b813740cc4eda6eb0af846f5f1c3e67cf84 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 22 Jan 2015 14:19:59 -0500 Subject: [PATCH 202/897] closed #2641 --- public/language/en_GB/error.json | 1 + public/src/client/groups/details.js | 2 +- src/groups.js | 21 +++++++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index fed0c807c9..7e21a1290a 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -66,6 +66,7 @@ "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index b667176ae9..09826fb673 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -34,7 +34,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', if (!err) { ownerFlagEl.toggleClass('invisible'); } else { - app.alertError(err); + app.alertError(err.message); } }); break; diff --git a/src/groups.js b/src/groups.js index fbb138dce5..beeddd19a9 100644 --- a/src/groups.js +++ b/src/groups.js @@ -659,8 +659,8 @@ var async = require('async'), Groups.requestMembership = function(groupName, uid, callback) { async.parallel({ - exists: async.apply(Groups.isMember, uid, groupName), - isMember: async.apply(Groups.exists, groupName) + exists: async.apply(Groups.exists, groupName), + isMember: async.apply(Groups.isMember, uid, groupName) }, function(err, checks) { if (!checks.exists) { return callback(new Error('[[error:no-group]]')); @@ -694,7 +694,12 @@ var async = require('async'), Groups.leave = function(groupName, uid, callback) { callback = callback || function() {}; - db.sortedSetRemove('group:' + groupName + ':members', uid, function(err) { + var tasks = [ + async.apply(db.sortedSetRemove, 'group:' + groupName + ':members', uid), + async.apply(db.setRemove, 'group:' + groupName + ':owners', uid) + ]; + + async.parallel(tasks, function(err) { if (err) { return callback(err); } @@ -891,7 +896,15 @@ var async = require('async'), Groups.ownership.rescind = function(toUid, groupName, callback) { // Note: No ownership checking is done here on purpose! - db.setRemove('group:' + groupName + ':owners', toUid, callback); + + // If the owners set only contains one member, error out! + db.setCount('group:' + groupName + ':owners', function(err, numOwners) { + if (numOwners <= 1) { + return callback(new Error('[[error:group-needs-owner]]')); + } + + db.setRemove('group:' + groupName + ':owners', toUid, callback); + }); }; Groups.search = function(query, options, callback) { From 5fb8817b3c54e9c4e86eaf9c6dbeae34b732a0c1 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 22 Jan 2015 14:13:39 -0500 Subject: [PATCH 203/897] closes #2643 --- src/user/delete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/delete.js b/src/user/delete.js index b13fa1aa97..e6cdcebb19 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -85,7 +85,7 @@ module.exports = function(User) { db.deleteAll(keys, next); }, function(next) { - deleteUserIps(uids, next); + deleteUserIps(uid, next); }, function(next) { deleteUserFromFollowers(uid, next); From 77216acbcc341c0572b4a7324064fb0f19492c1f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 22 Jan 2015 14:18:19 -0500 Subject: [PATCH 204/897] user.delete test --- tests/user.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/user.js b/tests/user.js index 3ef541623b..381c6f0a44 100644 --- a/tests/user.js +++ b/tests/user.js @@ -171,6 +171,28 @@ describe('User', function() { }); }); + describe('.delete()', function() { + var uid; + before(function(done) { + User.create({username: 'userToDelete', password: '123456', email: 'delete@me.com'}, function(err, newUid) { + assert.ifError(err); + uid = newUid; + done(); + }); + }); + + it('should delete a user account', function(done) { + User.delete(uid, function(err) { + assert.ifError(err); + User.exists('userToDelete', function(err, exists) { + assert.ifError(err); + assert.equal(exists, false); + done(); + }); + }); + }); + }); + after(function() { db.flushdb(); }); From d895ca6827d203abd71f9170fb24fe2daa9014b7 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 22 Jan 2015 14:19:23 -0500 Subject: [PATCH 205/897] missing semicolon --- src/user/delete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/delete.js b/src/user/delete.js index e6cdcebb19..3440e810a4 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -127,7 +127,7 @@ module.exports = function(User) { } db.delete('uid:' + uid + ':ip', callback); }); - }) + }); } function deleteUserFromFollowers(uid, callback) { From 72f28b7b3831bc084ef5606c5a3c2c8760f1f579 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 22 Jan 2015 14:19:59 -0500 Subject: [PATCH 206/897] closed #2641 --- public/language/en_GB/error.json | 1 + public/src/client/groups/details.js | 2 +- src/groups.js | 21 +++++++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index fed0c807c9..7e21a1290a 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -66,6 +66,7 @@ "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index b667176ae9..09826fb673 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -34,7 +34,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', if (!err) { ownerFlagEl.toggleClass('invisible'); } else { - app.alertError(err); + app.alertError(err.message); } }); break; diff --git a/src/groups.js b/src/groups.js index fbb138dce5..beeddd19a9 100644 --- a/src/groups.js +++ b/src/groups.js @@ -659,8 +659,8 @@ var async = require('async'), Groups.requestMembership = function(groupName, uid, callback) { async.parallel({ - exists: async.apply(Groups.isMember, uid, groupName), - isMember: async.apply(Groups.exists, groupName) + exists: async.apply(Groups.exists, groupName), + isMember: async.apply(Groups.isMember, uid, groupName) }, function(err, checks) { if (!checks.exists) { return callback(new Error('[[error:no-group]]')); @@ -694,7 +694,12 @@ var async = require('async'), Groups.leave = function(groupName, uid, callback) { callback = callback || function() {}; - db.sortedSetRemove('group:' + groupName + ':members', uid, function(err) { + var tasks = [ + async.apply(db.sortedSetRemove, 'group:' + groupName + ':members', uid), + async.apply(db.setRemove, 'group:' + groupName + ':owners', uid) + ]; + + async.parallel(tasks, function(err) { if (err) { return callback(err); } @@ -891,7 +896,15 @@ var async = require('async'), Groups.ownership.rescind = function(toUid, groupName, callback) { // Note: No ownership checking is done here on purpose! - db.setRemove('group:' + groupName + ':owners', toUid, callback); + + // If the owners set only contains one member, error out! + db.setCount('group:' + groupName + ':owners', function(err, numOwners) { + if (numOwners <= 1) { + return callback(new Error('[[error:group-needs-owner]]')); + } + + db.setRemove('group:' + groupName + ':owners', toUid, callback); + }); }; Groups.search = function(query, options, callback) { From a5265779275ae51727beba2870c8f99a64e91687 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 22 Jan 2015 15:08:23 -0500 Subject: [PATCH 207/897] only attempt to remove address bar if current position is at the top of screen --- public/src/app.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index d7097f91e7..e24e2500dd 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -254,7 +254,9 @@ app.uid = null; app.replaceSelfLinks(); setTimeout(function () { - window.scrollTo(0, 1); // rehide address bar on mobile after page load completes. + if (window.scrollY === 0) { + window.scrollTo(0, 1); // rehide address bar on mobile after page load completes. + } }, 100); }; From 0c2d2a28ba8c8a678d4818d2da2595c07bca51b6 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 22 Jan 2015 16:01:17 -0500 Subject: [PATCH 208/897] admins can bypass the request step of a group and just join it, and they also become owners when they join a group --- src/groups.js | 21 +++++++++++++++++---- src/socket.io/groups.js | 10 ++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/groups.js b/src/groups.js index beeddd19a9..e7c1eed77b 100644 --- a/src/groups.js +++ b/src/groups.js @@ -631,10 +631,23 @@ var async = require('async'), Groups.exists(groupName, function(err, exists) { if (exists) { - db.sortedSetAdd('group:' + groupName + ':members', Date.now(), uid, callback); - plugins.fireHook('action:group.join', { - groupName: groupName, - uid: uid + var tasks = [ + async.apply(db.sortedSetAdd, 'group:' + groupName + ':members', Date.now(), uid) + ]; + + user.isAdministrator(uid, function(err, isAdmin) { + if (isAdmin) { + tasks.push(async.apply(db.setAdd, 'group:' + groupName + ':owners', uid)); + } + + async.parallel(tasks, function(err) { + plugins.fireHook('action:group.join', { + groupName: groupName, + uid: uid + }); + + callback(); + }); }); } else { Groups.create({ diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index e51c2f6062..d85640e9fa 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -2,6 +2,9 @@ var groups = require('../groups'), meta = require('../meta'), + user = require('../user'), + + async = require('async'), SocketGroups = {}; @@ -11,8 +14,11 @@ SocketGroups.join = function(socket, data, callback) { } if (meta.config.allowPrivateGroups !== '0') { - groups.isPrivate(data.groupName, function(err, isPrivate) { - if (isPrivate) { + async.parallel({ + isAdmin: async.apply(user.isAdministrator, socket.uid), + isPrivate: async.apply(groups.isPrivate, data.groupName) + }, function(err, checks) { + if (checks.isPrivate && !checks.isAdmin) { groups.requestMembership(data.groupName, socket.uid, callback); } else { groups.join(data.groupName, socket.uid, callback); From 070215b05ef45fc8cab78cc334098d3ce508a12b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 22 Jan 2015 16:08:20 -0500 Subject: [PATCH 209/897] simplified isOwner check because there's no need to check admin status as admins automatically become owners now --- src/groups.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/groups.js b/src/groups.js index e7c1eed77b..7082ba5b65 100644 --- a/src/groups.js +++ b/src/groups.js @@ -884,22 +884,13 @@ var async = require('async'), Groups.updateCoverPosition(data.groupName, data.position, callback); }); - } + }; Groups.ownership = {}; Groups.ownership.isOwner = function(uid, groupName, callback) { - // Note: All admins are also owners - async.waterfall([ - async.apply(db.isSetMember, 'group:' + groupName + ':owners', uid), - function(isOwner, next) { - if (isOwner) { - return next(null, isOwner); - } - - user.isAdministrator(uid, next); - } - ], callback); + // Note: All admins automatically become owners upon joining + db.isSetMember('group:' + groupName + ':owners', uid, callback); }; Groups.ownership.grant = function(toUid, groupName, callback) { From 0bf98b549422b46fbaaf460154601bfaf3c36a97 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 22 Jan 2015 16:08:20 -0500 Subject: [PATCH 210/897] simplified isOwner check because there's no need to check admin status as admins automatically become owners now --- src/groups.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/groups.js b/src/groups.js index e7c1eed77b..7082ba5b65 100644 --- a/src/groups.js +++ b/src/groups.js @@ -884,22 +884,13 @@ var async = require('async'), Groups.updateCoverPosition(data.groupName, data.position, callback); }); - } + }; Groups.ownership = {}; Groups.ownership.isOwner = function(uid, groupName, callback) { - // Note: All admins are also owners - async.waterfall([ - async.apply(db.isSetMember, 'group:' + groupName + ':owners', uid), - function(isOwner, next) { - if (isOwner) { - return next(null, isOwner); - } - - user.isAdministrator(uid, next); - } - ], callback); + // Note: All admins automatically become owners upon joining + db.isSetMember('group:' + groupName + ':owners', uid, callback); }; Groups.ownership.grant = function(toUid, groupName, callback) { From 2c45dc64503ad5699b648cc27fba8fc0dd053247 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 22 Jan 2015 16:21:32 -0500 Subject: [PATCH 211/897] redis helpers --- src/database/redis/hash.js | 35 +++++-------------- src/database/redis/helpers.js | 33 ++++++++++++++++++ src/database/redis/sets.js | 65 +++++++---------------------------- src/database/redis/sorted.js | 58 ++++++++----------------------- 4 files changed, 68 insertions(+), 123 deletions(-) diff --git a/src/database/redis/hash.js b/src/database/redis/hash.js index ee60ba98a2..92ae7017c0 100644 --- a/src/database/redis/hash.js +++ b/src/database/redis/hash.js @@ -1,6 +1,9 @@ "use strict"; module.exports = function(redisClient, module) { + + var helpers = module.helpers.redis; + module.setObject = function(key, data, callback) { callback = callback || function() {}; redisClient.hmset(key, data, function(err) { @@ -20,28 +23,18 @@ module.exports = function(redisClient, module) { }; module.getObjects = function(keys, callback) { - var multi = redisClient.multi(); - - for(var x=0; x Date: Thu, 22 Jan 2015 16:23:38 -0500 Subject: [PATCH 212/897] dont crash if callback isnt passed in --- src/database/redis/sets.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/database/redis/sets.js b/src/database/redis/sets.js index 4c01de392e..9443ed928f 100644 --- a/src/database/redis/sets.js +++ b/src/database/redis/sets.js @@ -11,6 +11,7 @@ module.exports = function(redisClient, module) { }; module.setsAdd = function(keys, value, callback) { + callback = callback || function() {}; helpers.multiKeysValue(redisClient, 'sadd', keys, value, function(err, res) { callback(err); }); @@ -65,6 +66,7 @@ module.exports = function(redisClient, module) { }; module.setRemoveRandom = function(key, callback) { + callback = callback || function() {}; redisClient.spop(key, callback); }; From 70f6c396fcb53137d78db0f77122d7b9f0dfb302 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 22 Jan 2015 16:38:08 -0500 Subject: [PATCH 213/897] updated widget container to use h3 in panel header --- src/views/admin/extend/widgets.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index 3e172566b2..f083200b98 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -83,7 +83,7 @@ Panel
    -
    +
    Panel Header
    From ca9237267694e7ba6d8973ff1a6d8252f3939427 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 23 Jan 2015 07:27:49 -0500 Subject: [PATCH 214/897] fixed #2644 --- src/socket.io/groups.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index d85640e9fa..1b97dad0bb 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -123,8 +123,13 @@ SocketGroups.delete = function(socket, data, callback) { return callback(new Error('[[error:invalid-data]]')); } - groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { - if (!isOwner) { + var tasks = { + isOwner: async.apply(groups.ownership.isOwner, socket.uid, data.groupName), + isAdmin: async.apply(user.isAdministrator, socket.uid) + }; + + async.parallel(tasks, function(err, checks) { + if (!checks.isOwner && !checks.isAdmin) { return callback(new Error('[[error:no-privileges]]')); } From 3fb7eb766b9dea2795d984310cdaa2e36948c0a2 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 23 Jan 2015 15:06:44 -0500 Subject: [PATCH 215/897] closes #2646 --- src/views/admin/manage/flags.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl index 4697c951fe..929fd6674d 100644 --- a/src/views/admin/manage/flags.tpl +++ b/src/views/admin/manage/flags.tpl @@ -25,8 +25,8 @@
    - Posted in {posts.category.name}, • - Read More + Posted in {posts.category.name}, • + Read More
    From caec7180921b85257be74809b1efa8cb809254f1 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 23 Jan 2015 15:12:53 -0500 Subject: [PATCH 216/897] callback for getUidsInRoom --- src/socket.io/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 171a80d38f..0e04b9ab1d 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -314,13 +314,15 @@ Sockets.getUsersInRoom = function (uid, roomName, callback) { }); }; -Sockets.getUidsInRoom = function(roomName) { +Sockets.getUidsInRoom = function(roomName, callback) { + callback = callback || function() {}; // TODO : doesnt work in cluster var uids = []; var socketids = Object.keys(io.sockets.adapter.rooms[roomName] || {}); if (!Array.isArray(socketids) || !socketids.length) { + callback(null, []); return []; } @@ -334,7 +336,7 @@ Sockets.getUidsInRoom = function(roomName) { }); } } - + callback(null, uids); return uids; }; From 4b3aa26abd5e19636804d7fa17987fe0b0eccb98 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 23 Jan 2015 18:19:30 -0500 Subject: [PATCH 217/897] closes #2633 --- src/socket.io/topics.js | 42 +++++++++++++++++------------------------ src/topics/unread.js | 32 ++++++++++++++----------------- 2 files changed, 31 insertions(+), 43 deletions(-) diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 52d2c2cb01..c7c59e642b 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -124,7 +124,7 @@ SocketTopics.markTopicNotificationsRead = function(socket, tid, callback) { }; SocketTopics.markAllRead = function(socket, data, callback) { - topics.getUnreadTids(socket.uid, 0, -1, function(err, tids) { + topics.getLatestTidsFromSet('topics:recent', 0, -1, 'day', function(err, tids) { if (err) { return callback(err); } @@ -182,31 +182,23 @@ SocketTopics.markAsUnreadForAll = function(socket, tids, callback) { }, function(cid, next) { user.isModerator(socket.uid, cid, next); - } - ], function(err, isMod) { - if (err) { - return next(err); - } - - if (!isAdmin && !isMod) { - return next(new Error('[[error:no-privileges]]')); - } - - topics.markAsUnreadForAll(tid, function(err) { - if(err) { - return next(err); + }, + function(isMod, next) { + if (!isAdmin && !isMod) { + return next(new Error('[[error:no-privileges]]')); } - - topics.updateRecent(tid, Date.now(), function(err) { - if(err) { - return next(err); - } - topics.pushUnreadCount(socket.uid); - next(); - }); - }); - }); - }, callback); + topics.markAsUnreadForAll(tid, next); + }, + function(next) { + topics.updateRecent(tid, Date.now(), next); + } + ], next); + }, function(err) { + if (err) { + return callback(err); + } + topics.pushUnreadCount(socket.uid); + }); }); }; diff --git a/src/topics/unread.js b/src/topics/unread.js index d4adf2a994..4683395f6f 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -27,30 +27,26 @@ module.exports = function(Topics) { topics: [] }; - Topics.getUnreadTids(uid, start, stop, function(err, tids) { - if (err) { - return callback(err); - } - - if (!tids.length) { - return callback(null, unreadTopics); - } - - Topics.getTopicsByTids(tids, uid, function(err, topicData) { - if (err) { - return callback(err); + async.waterfall([ + function(next) { + Topics.getUnreadTids(uid, start, stop, next); + }, + function(tids, next) { + if (!tids.length) { + return next(null, []); } - + Topics.getTopicsByTids(tids, uid, next); + }, + function(topicData, next) { if (!Array.isArray(topicData) || !topicData.length) { - return callback(null, unreadTopics); + return next(null, unreadTopics); } unreadTopics.topics = topicData; unreadTopics.nextStart = stop + 1; - - callback(null, unreadTopics); - }); - }); + next(null, unreadTopics); + } + ], callback); }; Topics.getUnreadTids = function(uid, start, stop, callback) { From bc9ede7b6cd88f1040b8165c449ed084f2545498 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 23 Jan 2015 21:27:42 -0500 Subject: [PATCH 218/897] changed emailer.send so that it processes a callback, if provided. Also added new option to receive emails every time a topic you subscribe to is posted to. --- public/language/en_GB/email.json | 3 +++ public/language/en_GB/user.json | 1 + src/emailer.js | 17 +++++++++++------ src/topics/follow.js | 22 +++++++++++++++++++++- src/views/emails/notif_post.tpl | 16 ++++++++++++++++ src/views/emails/notif_post_plaintext.tpl | 14 ++++++++++++++ 6 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 src/views/emails/notif_post.tpl create mode 100644 src/views/emails/notif_post_plaintext.tpl diff --git a/public/language/en_GB/email.json b/public/language/en_GB/email.json index 75813bcb58..efee400748 100644 --- a/public/language/en_GB/email.json +++ b/public/language/en_GB/email.json @@ -23,6 +23,9 @@ "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json index 9ee1bbfefc..9c32b2d26e 100644 --- a/public/language/en_GB/user.json +++ b/public/language/en_GB/user.json @@ -64,6 +64,7 @@ "digest_weekly": "Weekly", "digest_monthly": "Monthly", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "This user doesn't have any followers :(", "follows_no_one": "This user isn't following anyone :(", diff --git a/src/emailer.js b/src/emailer.js index 3472ec0d2c..6eaf913e4c 100644 --- a/src/emailer.js +++ b/src/emailer.js @@ -19,10 +19,10 @@ var fs = require('fs'), return Emailer; }; - Emailer.send = function(template, uid, params) { + Emailer.send = function(template, uid, params, callback) { if (!app) { winston.warn('[emailer] App not ready!'); - return; + return callback(); } async.parallel({ @@ -36,7 +36,8 @@ var fs = require('fs'), settings: async.apply(User.getSettings, uid) }, function(err, results) { if (err) { - return winston.error('[emailer] Error sending digest : ' + err.stack); + winston.error('[emailer] Error sending digest : ' + err.stack); + return callback(err); } async.map([results.html, results.plaintext, params.subject], function(raw, next) { translator.translate(raw, results.settings.language || meta.config.defaultLang || 'en_GB', function(translated) { @@ -44,9 +45,11 @@ var fs = require('fs'), }); }, function(err, translated) { if (err) { - return winston.error(err.message); + winston.error(err.message); + return callback(err); } else if (!results.email) { - return winston.warn('uid : ' + uid + ' has no email, not sending.'); + winston.warn('uid : ' + uid + ' has no email, not sending.'); + return callback(); } if (Plugins.hasListeners('action:email.send')) { @@ -57,10 +60,12 @@ var fs = require('fs'), html: translated[0], plaintext: translated[1], template: template, - uid: uid + uid: uid, + pid: params.pid }); } else { winston.warn('[emailer] No active email plugin found!'); + callback(); } }); }); diff --git a/src/topics/follow.js b/src/topics/follow.js index 00785ffd77..c1ba78e384 100644 --- a/src/topics/follow.js +++ b/src/topics/follow.js @@ -9,7 +9,9 @@ var async = require('async'), user = require('../user'), posts = require('../posts'), postTools = require('../postTools'), - notifications = require('../notifications'); + notifications = require('../notifications'), + meta = require('../meta'), + emailer = require('../emailer'); module.exports = function(Topics) { @@ -125,6 +127,24 @@ module.exports = function(Topics) { notifications.push(notification, followers); } }); + + async.eachLimit(followers, 3, function(toUid, next) { + async.parallel({ + userData: async.apply(user.getUserFields, toUid, ['username']), + userSettings: async.apply(user.getSettings, toUid) + }, function(err, data) { + emailer.send('notif_post', toUid, { + pid: postData.pid, + subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title, + intro: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + title + ']]', + postBody: postData.content, + site_title: meta.config.title || 'NodeBB', + username: data.userData.username, + url: nconf.get('url') + '/topics/' + postData.topic.tid, + base_url: nconf.get('url') + }, next); + }); + }); }); }; }; \ No newline at end of file diff --git a/src/views/emails/notif_post.tpl b/src/views/emails/notif_post.tpl new file mode 100644 index 0000000000..1f91d044be --- /dev/null +++ b/src/views/emails/notif_post.tpl @@ -0,0 +1,16 @@ +

    [[email:greeting_with_name, {username}]],

    + +

    {intro}:

    +
    {postBody}
    + +[[email:notif.post.cta]] + +

    + [[email:closing]]
    + {site_title} +

    + +
    +

    + [[email:notif.post.unsub.info]] [[email:unsub.cta]]. +

    \ No newline at end of file diff --git a/src/views/emails/notif_post_plaintext.tpl b/src/views/emails/notif_post_plaintext.tpl new file mode 100644 index 0000000000..0920b2f79e --- /dev/null +++ b/src/views/emails/notif_post_plaintext.tpl @@ -0,0 +1,14 @@ +[[email:greeting_with_name, {username}]], + +{intro}: + +{postBody} + +[[email:notif.post.cta]]: {url} + +[[email:closing]] +{site_title} + +=== + +[[email:notif.post.unsub.info]] [[email:unsub.cta]]. \ No newline at end of file From 835ad3ea537e80baad35e90b6b438b037f03cfa4 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 24 Jan 2015 13:16:07 -0500 Subject: [PATCH 219/897] fix post.getUpvoters to work with an array --- src/socket.io/posts.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 4a8e5f19bd..f6b599884e 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -347,17 +347,20 @@ SocketPosts.getUpvoters = function(socket, pids, callback) { if (err || !Array.isArray(data) || !data.length) { return callback(err, []); } - var otherCount = 0; - if (data[0].length > 6) { - otherCount = data[0].length - 5; - data[0] = data[0].slice(0, 5); - } - user.getUsernamesByUids(data[0], function(err, usernames) { - callback(err, { - otherCount: otherCount, - usernames: usernames + + async.map(data, function(uids, next) { + var otherCount = 0; + if (uids.length > 6) { + otherCount = uids.length - 5; + uids = uids.slice(0, 5); + } + user.getUsernamesByUids(uids, function(err, usernames) { + next(err, { + otherCount: otherCount, + usernames: usernames + }); }); - }); + }, callback); }); }; From 288d507eb6096a594e71512b7bcaac90e22d6a3b Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 24 Jan 2015 18:48:34 -0500 Subject: [PATCH 220/897] pass the loaded pids to action:posts.loaded --- public/src/client/topic/posts.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 6303ca8864..8e21928498 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -127,32 +127,31 @@ define('forum/topic/posts', [ html.hide().fadeIn('slow'); - $(window).trigger('action:posts.loaded'); - onNewPostsLoaded(html, data.posts); + var pids = []; + for(var i=0; i Date: Sun, 25 Jan 2015 09:41:51 -0500 Subject: [PATCH 221/897] booleanifying sendPostNotification user setting when requested, and now only sending the post notification if the user has flipped that option on in user settings... kind of an important thing to forget... --- src/topics/follow.js | 25 +++++++++++++++---------- src/user/settings.js | 1 + 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/topics/follow.js b/src/topics/follow.js index c1ba78e384..7d88c9752e 100644 --- a/src/topics/follow.js +++ b/src/topics/follow.js @@ -4,6 +4,7 @@ var async = require('async'), nconf = require('nconf'), S = require('string'), + winston = require('winston'), db = require('../database'), user = require('../user'), @@ -133,16 +134,20 @@ module.exports = function(Topics) { userData: async.apply(user.getUserFields, toUid, ['username']), userSettings: async.apply(user.getSettings, toUid) }, function(err, data) { - emailer.send('notif_post', toUid, { - pid: postData.pid, - subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title, - intro: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + title + ']]', - postBody: postData.content, - site_title: meta.config.title || 'NodeBB', - username: data.userData.username, - url: nconf.get('url') + '/topics/' + postData.topic.tid, - base_url: nconf.get('url') - }, next); + if (data.userSettings.hasOwnProperty('sendPostNotifications') && data.userSettings.sendPostNotifications) { + emailer.send('notif_post', toUid, { + pid: postData.pid, + subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title, + intro: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + title + ']]', + postBody: postData.content, + site_title: meta.config.title || 'NodeBB', + username: data.userData.username, + url: nconf.get('url') + '/topics/' + postData.topic.tid, + base_url: nconf.get('url') + }, next); + } else { + winston.debug('[topics.notifyFollowers] uid ' + toUid + ' does not have post notifications enabled, skipping.'); + } }); }); }); diff --git a/src/user/settings.js b/src/user/settings.js index 9ac714ea6e..9f3e1166eb 100644 --- a/src/user/settings.js +++ b/src/user/settings.js @@ -69,6 +69,7 @@ module.exports = function(User) { settings.followTopicsOnCreate = (settings.followTopicsOnCreate === null || settings.followTopicsOnCreate === undefined) ? true : parseInt(settings.followTopicsOnCreate, 10) === 1; settings.followTopicsOnReply = parseInt(settings.followTopicsOnReply, 10) === 1; settings.sendChatNotifications = parseInt(settings.sendChatNotifications, 10) === 1; + settings.sendPostNotifications = parseInt(settings.sendPostNotifications, 10) === 1; settings.restrictChat = parseInt(settings.restrictChat, 10) === 1; settings.topicSearchEnabled = parseInt(settings.topicSearchEnabled, 10) === 1; From e31bf9131f8e7292830c364dc0ef2a5b39a6633d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 25 Jan 2015 16:47:47 -0500 Subject: [PATCH 222/897] added topics.follow and toggleFollow --- src/socket.io/topics.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index c7c59e642b..9f96f17f29 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -396,7 +396,7 @@ SocketTopics.moveAll = function(socket, data, callback) { }); }; -SocketTopics.follow = function(socket, tid, callback) { +SocketTopics.toggleFollow = function(socket, tid, callback) { if(!socket.uid) { return callback(new Error('[[error:not-logged-in]]')); } @@ -404,6 +404,14 @@ SocketTopics.follow = function(socket, tid, callback) { topics.toggleFollow(tid, socket.uid, callback); }; +SocketTopics.follow = function(socket, tid, callback) { + if(!socket.uid) { + return callback(new Error('[[error:not-logged-in]]')); + } + + topics.follow(tid, socket.uid, callback); +}; + SocketTopics.loadMore = function(socket, data, callback) { if(!data || !data.tid || !utils.isNumber(data.after) || parseInt(data.after, 10) < 0) { return callback(new Error('[[error:invalid-data]]')); From 26defd7dca91fb6afd775d195e9c9b14a4484312 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 25 Jan 2015 20:53:57 -0500 Subject: [PATCH 223/897] Groups.getGroupNameByGroupSlug --- src/groups.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/groups.js b/src/groups.js index 7082ba5b65..31b657be67 100644 --- a/src/groups.js +++ b/src/groups.js @@ -246,6 +246,10 @@ var async = require('async'), }); }; + Groups.getGroupNameByGroupSlug = function(slug, callback) { + db.getObjectField('groupslug:groupname', slug, callback); + }; + Groups.getGroupFields = function(groupName, fields, callback) { db.getObjectFields('group:' + groupName, fields, callback); }; From 57a3d53dee3a105f834d0d752e56ba00c3f80fee Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 25 Jan 2015 21:04:06 -0500 Subject: [PATCH 224/897] updating mentions minver --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1efe0580c4..c46f966b43 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "nconf": "~0.7.1", "nodebb-plugin-dbsearch": "^0.1.0", "nodebb-plugin-markdown": "^0.8.0", - "nodebb-plugin-mentions": "^0.7.0", + "nodebb-plugin-mentions": "^0.9.0", "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", "nodebb-theme-lavender": "^0.2.0", From d3d321f1b7ddae1a51e68c54f8b2dfbfe243d029 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 26 Jan 2015 15:46:22 -0500 Subject: [PATCH 225/897] CLA mention in contributing.md --- CONTRIBUTING.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f7bc8aeb7..c5f4665b5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,14 @@ +# Submitting a Pull Request to NodeBB? + +First of all, thank you! Please consider this [style guide](https://docs.nodebb.org/en/latest/contributing/style-guide.html) when submitting your changes. Also, please join our [community](https://community.nodebb.org) to meet other NodeBB developers and designers :) + +## Contributor License Agreement + +Thank you for considering contributing to NodeBB. Before we can accept any pull requests, please take a moment to read and sign our [license agreement](https://www.clahub.com/agreements/NodeBB/NodeBB). In summary, signing this document means that 1) you own the code that you are contributing and 2) you give permission to NodeBB Inc. to license the code to others. This agreement applies to any repository under the NodeBB organization. + +If you are writing contributions as part of employment from another company / individual, then your employer will need to sign a separate agreement. Please [contact us](mailto:accounts@nodebb.org) so that we can send this additional agreement to your employer. + + # Having problems installing NodeBB? Chances are somebody has run into this problem before. After consulting our [documentation](https://docs.nodebb.org/en/latest/installing/os.html), please head over to our [community support forum](https://community.nodebb.org) for advice. @@ -43,9 +54,4 @@ If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewher If you have installed NodeBB via GitHub clone, are familiar with utilising git, and are willing to help us narrow down the specific commit that causes a bug, consider running `git bisect`. -A full guide can be found here: [Debugging with Git/Binary Search](http://git-scm.com/book/en/Git-Tools-Debugging-with-Git#Binary-Search) - - -# Submitting a Pull Request to NodeBB? - -First of all, thank you! Please consider this [style guide](https://docs.nodebb.org/en/latest/contributing/style-guide.html) when submitting your changes. Also, please join our [community](https://community.nodebb.org) to meet other NodeBB developers and designers :) +A full guide can be found here: [Debugging with Git/Binary Search](http://git-scm.com/book/en/Git-Tools-Debugging-with-Git#Binary-Search) \ No newline at end of file From c9f0e61b57cb103e29d6acceea52e75cd6af36fc Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 26 Jan 2015 15:47:28 -0500 Subject: [PATCH 226/897] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c5f4665b5c..c602661541 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ First of all, thank you! Please consider this [style guide](https://docs.nodebb. ## Contributor License Agreement -Thank you for considering contributing to NodeBB. Before we can accept any pull requests, please take a moment to read and sign our [license agreement](https://www.clahub.com/agreements/NodeBB/NodeBB). In summary, signing this document means that 1) you own the code that you are contributing and 2) you give permission to NodeBB Inc. to license the code to others. This agreement applies to any repository under the NodeBB organization. +Thank you for considering contributing to NodeBB. **Before we can accept any pull requests, please take a moment to read and sign our [license agreement](https://www.clahub.com/agreements/NodeBB/NodeBB)**. In summary, signing this document means that 1) you own the code that you are contributing and 2) you give permission to NodeBB Inc. to license the code to others. This agreement applies to any repository under the NodeBB organization. If you are writing contributions as part of employment from another company / individual, then your employer will need to sign a separate agreement. Please [contact us](mailto:accounts@nodebb.org) so that we can send this additional agreement to your employer. @@ -54,4 +54,4 @@ If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewher If you have installed NodeBB via GitHub clone, are familiar with utilising git, and are willing to help us narrow down the specific commit that causes a bug, consider running `git bisect`. -A full guide can be found here: [Debugging with Git/Binary Search](http://git-scm.com/book/en/Git-Tools-Debugging-with-Git#Binary-Search) \ No newline at end of file +A full guide can be found here: [Debugging with Git/Binary Search](http://git-scm.com/book/en/Git-Tools-Debugging-with-Git#Binary-Search) From bf9b633d50bfd82227b73f5d551241fc880c7176 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 26 Jan 2015 16:48:39 -0500 Subject: [PATCH 227/897] fix Group.exists if an array is passed in --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 31b657be67..0e3f1ed066 100644 --- a/src/groups.js +++ b/src/groups.js @@ -400,7 +400,7 @@ var async = require('async'), }); async.parallel([ async.apply(db.isObjectFields, 'groupslug:groupname', slugs), - async.apply(db.isSortedSetMember, 'groups:createtime', name) + async.apply(db.isSortedSetMembers, 'groups:createtime', name) ], function(err, results) { if (err) { return callback(err); From d102ff0704adf13688321a5cff2bc038201d3940 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 26 Jan 2015 21:35:14 -0500 Subject: [PATCH 228/897] fixed #2656 --- public/src/app.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index e24e2500dd..35037c8033 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -253,11 +253,8 @@ app.uid = null; app.replaceSelfLinks(); - setTimeout(function () { - if (window.scrollY === 0) { - window.scrollTo(0, 1); // rehide address bar on mobile after page load completes. - } - }, 100); + // Scroll back to top of page + window.scrollTo(0, 0); }; app.showLoginMessage = function () { From 72e14e6db69931e1d4db6914d033496b342a0576 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 27 Jan 2015 04:38:51 -0500 Subject: [PATCH 229/897] closes #2653 --- public/vendor/colorpicker/colorpicker.css | 1 - 1 file changed, 1 deletion(-) diff --git a/public/vendor/colorpicker/colorpicker.css b/public/vendor/colorpicker/colorpicker.css index 5ee96ba682..6f8ed782b9 100644 --- a/public/vendor/colorpicker/colorpicker.css +++ b/public/vendor/colorpicker/colorpicker.css @@ -139,7 +139,6 @@ left: 282px; } .colorpicker_submit { - display: none; position: absolute; width: 22px; height: 22px; From c33b369858a54841c6f1388c5e4265935e6c19d0 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 27 Jan 2015 10:36:30 -0500 Subject: [PATCH 230/897] closes #2658 --- src/topics/unread.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/topics/unread.js b/src/topics/unread.js index 4683395f6f..a12f1c4d77 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -154,11 +154,9 @@ module.exports = function(Topics) { return callback(); } tids = tids.filter(Boolean); - - var now = Date.now(); - var scores = tids.map(function(tid) { - return now; - }); + if (!tids.length) { + return callback(); + } async.parallel({ topicScores: function(next) { @@ -180,6 +178,11 @@ module.exports = function(Topics) { return callback(); } + var now = Date.now(); + var scores = tids.map(function(tid) { + return now; + }); + async.parallel({ markRead: function(next) { db.sortedSetAdd('uid:' + uid + ':tids_read', scores, tids, next); From 06238f689415e216cf131e9e295fae8c4e9566a2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 27 Jan 2015 11:12:14 -0500 Subject: [PATCH 231/897] partial fix to #2655 --- src/upgrade.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/upgrade.js b/src/upgrade.js index 506639c463..d433c9c06f 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -688,11 +688,22 @@ Upgrade.upgrade = function(callback) { updatesMade = true; winston.info('[2015/01/19] Generating group slugs'); - Groups.list({}, function(err, groups) { + async.waterfall([ + async.apply(db.getSetMembers, 'groups'), + function(groups, next) { + async.filter(groups, function(groupName, next) { + db.getObjectField('group:' + groupName, 'hidden', function(err, hidden) { + next((err || parseInt(hidden, 10)) ? false : true); + }); + }, function(groups) { + next(null, groups); + }); + } + ], function(err, groups) { var tasks = []; - groups.forEach(function(groupObj) { - tasks.push(async.apply(db.setObjectField, 'group:' + groupObj.name, 'slug', Utils.slugify(groupObj.name))); - tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', Utils.slugify(groupObj.name), groupObj.name)); + groups.forEach(function(groupName) { + tasks.push(async.apply(db.setObjectField, 'group:' + groupName, 'slug', Utils.slugify(groupName))); + tasks.push(async.apply(db.setObjectField, 'groupslug:groupname', Utils.slugify(groupName), groupName)); }); // Administrator group From 08e39d150e161cb04edd8ef9ff4fb69299b24e8c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 27 Jan 2015 11:19:36 -0500 Subject: [PATCH 232/897] fixed #2655 --- src/controllers/groups.js | 2 +- src/groups.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/controllers/groups.js b/src/controllers/groups.js index d6307b8daf..f72d7ed1d4 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -32,7 +32,7 @@ groupsController.details = function(req, res, next) { }, next); }, posts: function(next) { - groups.getLatestMemberPosts(req.params.name, 10, uid, next); + groups.getLatestMemberPosts(req.params.slug, 10, uid, next); } }, function(err, results) { if (err) { diff --git a/src/groups.js b/src/groups.js index 0e3f1ed066..e228ffbcf0 100644 --- a/src/groups.js +++ b/src/groups.js @@ -758,11 +758,10 @@ var async = require('async'), }); }; - Groups.getLatestMemberPosts = function(groupName, max, uid, callback) { + Groups.getLatestMemberPosts = function(groupSlug, max, uid, callback) { async.waterfall([ - function(next) { - Groups.getMembers(groupName, next); - }, + async.apply(Groups.getGroupNameByGroupSlug, groupSlug), + Groups.getMembers, function(uids, next) { if (!Array.isArray(uids) || !uids.length) { return callback(null, []); From 891731ca5208d1694060d50e3b935084466268f6 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 27 Jan 2015 11:42:03 -0500 Subject: [PATCH 233/897] enabled saving of sendPostNotification setting --- src/user/settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/user/settings.js b/src/user/settings.js index 9f3e1166eb..3daa3db869 100644 --- a/src/user/settings.js +++ b/src/user/settings.js @@ -101,6 +101,7 @@ module.exports = function(User) { followTopicsOnCreate: data.followTopicsOnCreate, followTopicsOnReply: data.followTopicsOnReply, sendChatNotifications: data.sendChatNotifications, + sendPostNotifications: data.sendPostNotifications, restrictChat: data.restrictChat, topicSearchEnabled: data.topicSearchEnabled }, next); From d096a639d6d51c02b71c243dc8b1b29f94a73007 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 27 Jan 2015 13:14:07 -0500 Subject: [PATCH 234/897] fixed #2657 -- there's a slight chance this might break other ACP pages, but my limited testing tells me it is ok so far --- public/src/modules/settings.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js index b31975c1ab..66b76fc4fd 100644 --- a/public/src/modules/settings.js +++ b/public/src/modules/settings.js @@ -457,6 +457,17 @@ define('settings', function () { console.log('[settings] Unable to load settings for hash: ', hash); return callback(err); } + + // Parse all values. If they are json, return json + for(var key in values) { + if (values.hasOwnProperty(key)) { + try { + values[key] = JSON.parse(values[key]); + } catch (e) { + // Leave the value as is + } + } + } $(formEl).deserialize(values); @@ -474,6 +485,13 @@ define('settings', function () { values[inputEl.attr('id')] = 'off'; } }); + + // Normalizing value of multiple selects + formEl.find('select[multiple]').each(function(idx, selectEl) { + selectEl = $(selectEl); + values[selectEl.attr('id')] = JSON.stringify(selectEl.val()); + }); + socket.emit('admin.settings.set', { hash: hash, values: values From a3cadff1d3652893bf4232a01e739de6a10a2d4c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 27 Jan 2015 14:47:39 -0500 Subject: [PATCH 235/897] updated settings module (v2) to fix multiple selects and checkboxes using name instead of id, which isn't always guaranteed to be set. --- public/src/modules/settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js index 66b76fc4fd..8c7d74a448 100644 --- a/public/src/modules/settings.js +++ b/public/src/modules/settings.js @@ -482,14 +482,14 @@ define('settings', function () { formEl.find('input[type="checkbox"]').each(function (idx, inputEl) { inputEl = $(inputEl); if (!inputEl.is(':checked')) { - values[inputEl.attr('id')] = 'off'; + values[inputEl.attr('name')] = 'off'; } }); // Normalizing value of multiple selects formEl.find('select[multiple]').each(function(idx, selectEl) { selectEl = $(selectEl); - values[selectEl.attr('id')] = JSON.stringify(selectEl.val()); + values[selectEl.attr('name')] = JSON.stringify(selectEl.val()); }); socket.emit('admin.settings.set', { From 27518716a0d59b941b9071edac9f431cb1a21890 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 27 Jan 2015 16:03:57 -0500 Subject: [PATCH 236/897] make getUsers public for plugins --- src/controllers/users.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/controllers/users.js b/src/controllers/users.js index 107c64a166..f7765ca469 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -48,32 +48,32 @@ usersController.getOnlineUsers = function(req, res, next) { }; usersController.getUsersSortedByPosts = function(req, res, next) { - getUsers('users:postcount', res, next); + usersController.getUsers('users:postcount', 50, res, next); }; usersController.getUsersSortedByReputation = function(req, res, next) { - getUsers('users:reputation', res, next); + usersController.getUsers('users:reputation', 50, res, next); }; usersController.getUsersSortedByJoinDate = function(req, res, next) { - getUsers('users:joindate', res, next); + usersController.getUsers('users:joindate', 50, res, next); }; -function getUsers(set, res, next) { - getUsersAndCount(set, 50, function(err, data) { +usersController.getUsers = function(set, count, res, next) { + getUsersAndCount(set, count, function(err, data) { if (err) { return next(err); } var userData = { search_display: 'hidden', - loadmore_display: data.count > 50 ? 'block' : 'hide', + loadmore_display: data.count > count ? 'block' : 'hide', users: data.users, show_anon: 'hide' }; res.render('users', userData); }); -} +}; function getUsersAndCount(set, count, callback) { async.parallel({ From 943e268ffce22ace428d0d822fe4dd122f51ebcf Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 27 Jan 2015 16:39:33 -0500 Subject: [PATCH 237/897] add filter:users.get --- src/controllers/users.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/controllers/users.js b/src/controllers/users.js index f7765ca469..40f0f1f8bd 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -5,6 +5,7 @@ var usersController = {}; var async = require('async'), user = require('../user'), meta = require('../meta'), + plugins = require('../plugins'), db = require('../database'); usersController.getOnlineUsers = function(req, res, next) { @@ -43,23 +44,27 @@ usersController.getOnlineUsers = function(req, res, next) { show_anon: anonymousUserCount ? '' : 'hide' }; - res.render('users', userData); + plugins.fireHook('filter:users.get', {data: userData, uid: uid}, function(err, userData) { + res.render('users', userData); + }); }); }; usersController.getUsersSortedByPosts = function(req, res, next) { - usersController.getUsers('users:postcount', 50, res, next); + usersController.getUsers('users:postcount', 50, req, res, next); }; usersController.getUsersSortedByReputation = function(req, res, next) { - usersController.getUsers('users:reputation', 50, res, next); + usersController.getUsers('users:reputation', 50, req, res, next); }; usersController.getUsersSortedByJoinDate = function(req, res, next) { - usersController.getUsers('users:joindate', 50, res, next); + usersController.getUsers('users:joindate', 50, req, res, next); }; -usersController.getUsers = function(set, count, res, next) { +usersController.getUsers = function(set, count, req, res, next) { + var uid = req.user ? req.user.uid : 0; + getUsersAndCount(set, count, function(err, data) { if (err) { return next(err); @@ -71,7 +76,9 @@ usersController.getUsers = function(set, count, res, next) { show_anon: 'hide' }; - res.render('users', userData); + plugins.fireHook('filter:users.get', {data: userData, uid: uid}, function(err, userData) { + res.render('users', userData); + }); }); }; @@ -96,20 +103,24 @@ function getUsersAndCount(set, count, callback) { } usersController.getUsersForSearch = function(req, res, next) { - var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20; + var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20, + uid = req.user ? req.user.uid : 0; + getUsersAndCount('users:joindate', resultsPerPage, function(err, data) { if (err) { return next(err); } - var result = { + var userData = { search_display: 'block', loadmore_display: 'hidden', users: data.users, show_anon: 'hide' }; - res.render('users', result); + plugins.fireHook('filter:users.get', {data: userData, uid: uid}, function(err, userData) { + res.render('users', userData); + }); }); }; From 0828caab32ccdf638c76c1172bef0a7b62b86bc3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 27 Jan 2015 16:51:48 -0500 Subject: [PATCH 238/897] renamed to filter:userlist.get --- src/controllers/users.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controllers/users.js b/src/controllers/users.js index 40f0f1f8bd..7c48efeae8 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -44,7 +44,7 @@ usersController.getOnlineUsers = function(req, res, next) { show_anon: anonymousUserCount ? '' : 'hide' }; - plugins.fireHook('filter:users.get', {data: userData, uid: uid}, function(err, userData) { + plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { res.render('users', userData); }); }); @@ -76,7 +76,7 @@ usersController.getUsers = function(set, count, req, res, next) { show_anon: 'hide' }; - plugins.fireHook('filter:users.get', {data: userData, uid: uid}, function(err, userData) { + plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { res.render('users', userData); }); }); @@ -105,7 +105,7 @@ function getUsersAndCount(set, count, callback) { usersController.getUsersForSearch = function(req, res, next) { var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20, uid = req.user ? req.user.uid : 0; - + getUsersAndCount('users:joindate', resultsPerPage, function(err, data) { if (err) { return next(err); @@ -118,7 +118,7 @@ usersController.getUsersForSearch = function(req, res, next) { show_anon: 'hide' }; - plugins.fireHook('filter:users.get', {data: userData, uid: uid}, function(err, userData) { + plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { res.render('users', userData); }); }); From f253b11d71bd63fd2031e84b22ea4ba1d5114236 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 27 Jan 2015 17:09:45 -0500 Subject: [PATCH 239/897] passed in wrong object --- src/controllers/users.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/users.js b/src/controllers/users.js index 7c48efeae8..a1d5b84f19 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -45,7 +45,7 @@ usersController.getOnlineUsers = function(req, res, next) { }; plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData); + res.render('users', userData.data); }); }); }; @@ -77,7 +77,7 @@ usersController.getUsers = function(set, count, req, res, next) { }; plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData); + res.render('users', userData.data); }); }); }; @@ -119,7 +119,7 @@ usersController.getUsersForSearch = function(req, res, next) { }; plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData); + res.render('users', userData.data); }); }); }; From ab69477b24ef9d44a0fd74d40d97ce4e3c7bc64b Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 27 Jan 2015 17:37:21 -0500 Subject: [PATCH 240/897] moved filter:user,get to central function --- src/controllers/users.js | 12 +++--------- src/user.js | 8 ++++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/controllers/users.js b/src/controllers/users.js index a1d5b84f19..0a2d4d0d67 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -44,9 +44,7 @@ usersController.getOnlineUsers = function(req, res, next) { show_anon: anonymousUserCount ? '' : 'hide' }; - plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData.data); - }); + res.render('users', userData); }); }; @@ -76,9 +74,7 @@ usersController.getUsers = function(set, count, req, res, next) { show_anon: 'hide' }; - plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData.data); - }); + res.render('users', userData); }); }; @@ -118,9 +114,7 @@ usersController.getUsersForSearch = function(req, res, next) { show_anon: 'hide' }; - plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData.data); - }); + res.render('users', userData); }); }; diff --git a/src/user.js b/src/user.js index 0a83994964..5e9382efd9 100644 --- a/src/user.js +++ b/src/user.js @@ -249,8 +249,12 @@ var async = require('async'), user.banned = parseInt(user.banned, 10) === 1; user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1; }); - - callback(null, results.userData); + plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) { + if (err) { + return callback(err); + } + callback(null, data.users); + }); }); }); }; From 0dc0c39f4813745ebde5d812ef0b6d1f81f81975 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 27 Jan 2015 19:58:17 -0500 Subject: [PATCH 241/897] removed li selector --- public/src/client/topic/posts.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 8e21928498..7fd55e8bd4 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -52,7 +52,7 @@ define('forum/topic/posts', [ function removeAlreadyAddedPosts() { data.posts = data.posts.filter(function(post) { - return $('#post-container li[data-pid="' + post.pid +'"]').length === 0; + return $('#post-container [data-pid="' + post.pid +'"]').length === 0; }); } @@ -64,8 +64,8 @@ define('forum/topic/posts', [ var firstPostVotes = parseInt(data.posts[0].votes, 10); var firstPostIndex = parseInt(data.posts[0].index, 10); - var firstReply = $('#post-container li.post-row[data-index!="0"]').first(); - var lastReply = $('#post-container li.post-row[data-index!="0"]').last(); + var firstReply = $('#post-container .post-row[data-index!="0"]').first(); + var lastReply = $('#post-container .post-row[data-index!="0"]').last(); if (config.topicPostSort === 'oldest_to_newest') { if (firstPostTimestamp < parseInt(firstReply.attr('data-timestamp'), 10)) { @@ -111,7 +111,7 @@ define('forum/topic/posts', [ // Save document height and position for future reference (about 5 lines down) var height = $(document).height(), scrollTop = $(document).scrollTop(), - originalPostEl = $('li[data-index="0"]'); + originalPostEl = $('.post-row[data-index="0"]'); // Insert the new post html.insertBefore(before); @@ -186,7 +186,7 @@ define('forum/topic/posts', [ function loadPostsAfter(after) { var tid = ajaxify.variables.get('topic_id'); - if (!utils.isNumber(tid) || !utils.isNumber(after) || (after === 0 && $('#post-container li.post-row[data-index="1"]').length)) { + if (!utils.isNumber(tid) || !utils.isNumber(after) || (after === 0 && $('#post-container .post-row[data-index="1"]').length)) { return; } @@ -235,13 +235,13 @@ define('forum/topic/posts', [ }; function showBottomPostBar() { - if($('#post-container .post-row').length > 1 || !$('#post-container li[data-index="0"]').length) { + if($('#post-container .post-row').length > 1 || !$('#post-container [data-index="0"]').length) { $('.bottom-post-bar').removeClass('hide'); } } function hidePostToolsForDeletedPosts(element) { - element.find('li.deleted').each(function() { + element.find('.post-row.deleted').each(function() { postTools.toggle($(this).attr('data-pid'), true); }); } From d47cd270dfffd1a899a8c27f66e495401d71a73c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 27 Jan 2015 23:37:47 -0500 Subject: [PATCH 242/897] some random favourite typo --- src/favourites.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/favourites.js b/src/favourites.js index 0673626f51..c07468c78a 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -274,7 +274,7 @@ var async = require('async'), } if (!isFavouriting && !results.hasFavourited) { - return callback(new Error('[[error:alrady-unfavourited]]')); + return callback(new Error('[[error:already-unfavourited]]')); } async.waterfall([ From 370a60c14fd5409e4e059dffd11d2c2d17f1d17b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 27 Jan 2015 23:50:01 -0500 Subject: [PATCH 243/897] potential bug @barisusakli I think you changed this, just pinging you in case --- public/src/client/topic/threadTools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 41a3d532bf..b401a850ed 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -61,7 +61,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func fork.init(); $('.posts').on('click', '.follow', function() { - socket.emit('topics.follow', tid, function(err, state) { + socket.emit('topics.toggleFollow', tid, function(err, state) { if(err) { return app.alert({ type: 'danger', From 5a3c056759be7e51e1154564197a1c39e43b5397 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 27 Jan 2015 23:50:10 -0500 Subject: [PATCH 244/897] removing li specific selector --- public/src/client/topic/events.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 90f54ec064..40217b0969 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -69,7 +69,7 @@ define('forum/topic/events', [ }; function updatePostVotesAndUserReputation(data) { - var votes = $('li[data-pid="' + data.post.pid + '"] .votes'), + var votes = $('[data-pid="' + data.post.pid + '"] .votes'), reputationElements = $('.reputation[data-uid="' + data.post.uid + '"]'); votes.html(data.post.votes).attr('data-votes', data.post.votes); @@ -77,7 +77,7 @@ define('forum/topic/events', [ } function updateFavouriteCount(data) { - $('li[data-pid="' + data.post.pid + '"] .favouriteCount').html(data.post.reputation).attr('data-favourites', data.post.reputation); + $('[data-pid="' + data.post.pid + '"] .favouriteCount').html(data.post.reputation).attr('data-favourites', data.post.reputation); } function toggleTopicDeleteState(data) { @@ -139,14 +139,14 @@ define('forum/topic/events', [ } function onPostPurged(pid) { - $('#post-container li[data-pid="' + pid + '"]').fadeOut(500, function() { + $('#post-container [data-pid="' + pid + '"]').fadeOut(500, function() { $(this).remove(); }); postTools.updatePostCount(); } function togglePostDeleteState(data) { - var postEl = $('#post-container li[data-pid="' + data.pid + '"]'); + var postEl = $('#post-container [data-pid="' + data.pid + '"]'); if (!postEl.length) { return; @@ -166,7 +166,7 @@ define('forum/topic/events', [ } function togglePostFavourite(data) { - var favBtn = $('li[data-pid="' + data.post.pid + '"] .favourite'); + var favBtn = $('[data-pid="' + data.post.pid + '"] .favourite'); if (!favBtn.length) { return; } @@ -185,7 +185,7 @@ define('forum/topic/events', [ } function togglePostVote(data) { - var post = $('li[data-pid="' + data.post.pid + '"]'); + var post = $('[data-pid="' + data.post.pid + '"]'); post.find('.upvote').toggleClass('btn-primary upvoted', data.upvote); post.find('.downvote').toggleClass('btn-primary downvoted', data.downvote); From 9db7f0f9a06dc35a2d2ee1118c411fa011dbc528 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 28 Jan 2015 10:30:18 -0500 Subject: [PATCH 245/897] doing on master as well --- src/controllers/users.js | 12 +++--------- src/user.js | 8 +++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/controllers/users.js b/src/controllers/users.js index a1d5b84f19..0a2d4d0d67 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -44,9 +44,7 @@ usersController.getOnlineUsers = function(req, res, next) { show_anon: anonymousUserCount ? '' : 'hide' }; - plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData.data); - }); + res.render('users', userData); }); }; @@ -76,9 +74,7 @@ usersController.getUsers = function(set, count, req, res, next) { show_anon: 'hide' }; - plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData.data); - }); + res.render('users', userData); }); }; @@ -118,9 +114,7 @@ usersController.getUsersForSearch = function(req, res, next) { show_anon: 'hide' }; - plugins.fireHook('filter:userlist.get', {data: userData, uid: uid}, function(err, userData) { - res.render('users', userData.data); - }); + res.render('users', userData); }); }; diff --git a/src/user.js b/src/user.js index 0a83994964..998ce2db23 100644 --- a/src/user.js +++ b/src/user.js @@ -250,7 +250,13 @@ var async = require('async'), user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1; }); - callback(null, results.userData); + plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) { + if (err) { + return callback(err); + } + + callback(null, data.users); + }); }); }); }; From 63eeee4394d5237fdd9fff8fa570f34b9282019b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 28 Jan 2015 13:38:08 -0500 Subject: [PATCH 246/897] fixed issue where hitting enter while searching for groups would cause the page to reload. --- public/src/client/groups/list.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 45c5ce5a97..9ff22d9396 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -32,16 +32,18 @@ define('forum/groups/list', function() { // Group searching $('#search-text').on('keydown', function(e) { - if (e.keyCode === 13) { Groups.search(); } + if (e.keyCode === 13) { Groups.search(e); } }); $('#search-button').on('click', Groups.search); }; - Groups.search = function() { + Groups.search = function(event) { var groupsEl = $('#groups-list'), queryEl = $('#search-text'), sortEl = $('#search-sort'); + event.preventDefault(); + socket.emit('groups.search', { query: queryEl.val(), options: { From 98ff75b9c36e7292d19ab4a8a7f08e511c7c5600 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 28 Jan 2015 13:46:07 -0500 Subject: [PATCH 247/897] closes #2581 --- public/src/client/category.js | 4 -- public/src/client/pagination.js | 81 ++------------------------------- src/controllers/categories.js | 16 +++---- src/controllers/topics.js | 16 +++---- src/pagination.js | 66 +++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 100 deletions(-) create mode 100644 src/pagination.js diff --git a/public/src/client/category.js b/public/src/client/category.js index 58d7074528..b9ab5bc800 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -233,10 +233,6 @@ define('forum/category', [ topic.hide().fadeIn('slow'); - socket.emit('categories.getPageCount', ajaxify.variables.get('category_id'), function(err, newPageCount) { - pagination.recreatePaginationLinks(newPageCount); - }); - topic.find('span.timeago').timeago(); app.createUserTooltips(); updateTopicCount(); diff --git a/public/src/client/pagination.js b/public/src/client/pagination.js index 5aab6ada6b..3d306e9f65 100644 --- a/public/src/client/pagination.js +++ b/public/src/client/pagination.js @@ -11,69 +11,13 @@ define('forum/pagination', function() { pagination.currentPage = parseInt(currentPage, 10); pagination.pageCount = parseInt(pageCount, 10); - pagination.recreatePaginationLinks(pageCount); - - $('.pagination') - .on('click', '.previous', function() { - return pagination.loadPage(pagination.currentPage - 1); - }).on('click', '.next', function() { - return pagination.loadPage(pagination.currentPage + 1); - }).on('click', '.select_page', function(e) { - e.preventDefault(); - bootbox.prompt('Enter page number:', function(pageNum) { - pagination.loadPage(pageNum); - }); + $('.pagination').on('click', '.select_page', function(e) { + e.preventDefault(); + bootbox.prompt('Enter page number:', function(pageNum) { + pagination.loadPage(pageNum); }); - }; - - pagination.recreatePaginationLinks = function(newPageCount) { - pagination.pageCount = parseInt(newPageCount, 10); - - var pagesToShow = determinePagesToShow(); - - var html = ''; - for(var i=0; i 0) { - if (pagesToShow[i] - 1 !== pagesToShow[i-1]) { - html += '
  • |
    • '; - } - } - html += '
  • ' + pagesToShow[i] + '
    • '; - } - - $('.pagination li.page').remove(); - $('.pagination li .select_page').parent().remove(); - $(html).insertAfter($('.pagination li.previous')); - - updatePageLinks(); - }; - - function determinePagesToShow() { - var pagesToShow = [1]; - if(pagination.pageCount !== 1) { - pagesToShow.push(pagination.pageCount); - } - - var previous = pagination.currentPage - 1; - var next = pagination.currentPage + 1; - - if(previous > 1 && pagesToShow.indexOf(previous) === -1) { - pagesToShow.push(previous); - } - - if(next < pagination.pageCount && pagesToShow.indexOf(next) === -1) { - pagesToShow.push(next); - } - - if(pagesToShow.indexOf(pagination.currentPage) === -1) { - pagesToShow.push(pagination.currentPage); - } - - pagesToShow.sort(function(a, b) { - return parseInt(a, 10) - parseInt(b, 10); }); - return pagesToShow; - } + }; pagination.loadPage = function(page, callback) { page = parseInt(page, 10); @@ -89,20 +33,5 @@ define('forum/pagination', function() { return true; }; - function updatePageLinks() { - $('.pagination').toggleClass('hide', pagination.pageCount === 0 || pagination.pageCount === 1); - - $('.pagination .next').toggleClass('disabled', pagination.currentPage === pagination.pageCount); - $('.pagination .previous').toggleClass('disabled', pagination.currentPage === 1); - - $('.pagination .page').removeClass('active'); - $('.pagination .page[data-page="' + pagination.currentPage + '"]').addClass('active'); - $('.pagination .page').each(function(index, element) { - var li = $(this); - var page = li.attr('data-page'); - li.find('a').attr('href', window.location.pathname + '?page=' + page); - }); - } - return pagination; }); diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 06b2b957fa..5083a7d71a 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -9,6 +9,7 @@ var categoriesController = {}, topics = require('../topics'), meta = require('../meta'), plugins = require('../plugins'), + pagination = require('../pagination'), helpers = require('./helpers'), utils = require('../../public/src/utils'); @@ -255,16 +256,11 @@ categoriesController.get = function(req, res, next) { data.currentPage = page; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; - if (!res.locals.isAPI) { - // Paginator for noscript - data.pages = []; - for(var x=1;x<=data.pageCount;x++) { - data.pages.push({ - page: x, - active: x === parseInt(page, 10) - }); - } - } + pagination.create(data.currentPage, data.pageCount, data); + + data.pagination.rel.forEach(function(rel) { + res.locals.linkTags.push(rel); + }); res.render('category', data); }); diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 791baa0c79..d3d6e571e6 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -13,6 +13,7 @@ var topicsController = {}, privileges = require('../privileges'), plugins = require('../plugins'), helpers = require('./helpers'), + pagination = require('../pagination'), utils = require('../../public/src/utils'); topicsController.get = function(req, res, next) { @@ -257,16 +258,11 @@ topicsController.get = function(req, res, next) { topics.increaseViewCount(tid); - if (!res.locals.isAPI) { - // Paginator for noscript - data.pages = []; - for(var x=1; x<=data.pageCount; x++) { - data.pages.push({ - page: x, - active: x === parseInt(page, 10) - }); - } - } + pagination.create(data.currentPage, data.pageCount, data); + + data.pagination.rel.forEach(function(rel) { + res.locals.linkTags.push(rel); + }); res.render('topic', data); }); diff --git a/src/pagination.js b/src/pagination.js new file mode 100644 index 0000000000..3fa2e31bf7 --- /dev/null +++ b/src/pagination.js @@ -0,0 +1,66 @@ +'use strict'; + +var pagination = {}; + +pagination.create = function(currentPage, pageCount, data) { + + if (pageCount <= 1) { + data.pagination = { + prev: {page: 1, active: currentPage > 1}, + next: {page: 1, active: currentPage < pageCount}, + rel: [], + pages: [] + }; + return; + } + + var pagesToShow = [1]; + if (pageCount !== 1) { + pagesToShow.push(pageCount); + } + + currentPage = parseInt(currentPage, 10) || 1; + var previous = Math.max(1, currentPage - 1); + var next = Math.min(pageCount, currentPage + 1); + + var startPage = currentPage - 2; + for(var i=0; i<5; ++i) { + var p = startPage + i; + if (p >= 1 && p <= pageCount && pagesToShow.indexOf(p) === -1) { + pagesToShow.push(startPage + i); + } + } + + pagesToShow.sort(function(a, b) { + return a - b; + }); + + var pages = pagesToShow.map(function(page) { + return {page: page, active: page === currentPage}; + }); + + data.pagination = { + prev: {page: previous, active: currentPage > 1}, + next: {page: next, active: currentPage < pageCount}, + rel: [], + pages: pages + }; + + if (currentPage < pageCount) { + data.pagination.rel.push({ + rel: 'next', + href: '?page=' + next + }); + } + + if (currentPage > 1) { + data.pagination.rel.push({ + rel: 'prev', + href: '?page=' + previous + }); + } + +}; + + +module.exports = pagination; \ No newline at end of file From ed714cdf77005b9c1e17cbedeb4a5dfd05c77df6 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 28 Jan 2015 15:08:33 -0500 Subject: [PATCH 248/897] user search paginator --- public/src/client/users.js | 8 ++++---- src/user/search.js | 23 ++++++++++------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/public/src/client/users.js b/public/src/client/users.js index 6030f415b5..b96f3f5501 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -100,7 +100,7 @@ define('forum/users', function() { doSearch(); }); - $('.pagination').on('click', 'a', function() { + $('.users').on('click', '.pagination a', function() { doSearch($(this).attr('data-page')); return false; }) @@ -150,9 +150,9 @@ define('forum/users', function() { return reset(); } - templates.parse('users', 'pages', data, function(html) { - $('.pagination').html(html); - }); + templates.parse('partials/paginator', {pagination: data.pagination}, function(html) { + $('.pagination-container').replaceWith(html); + }) templates.parse('users', 'users', data, function(html) { translator.translate(html, function(translated) { diff --git a/src/user/search.js b/src/user/search.js index a95b64bfaa..bad43be25b 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -4,6 +4,7 @@ var async = require('async'), meta = require('../meta'), user = require('../user'), + pagination = require('../pagination'), db = require('../database'); module.exports = function(User) { @@ -49,23 +50,19 @@ module.exports = function(User) { }, function(userData, next) { - var pages = []; - if (matchCount > resultsPerPage) { - pageCount = Math.ceil(matchCount / resultsPerPage); - var currentPage = Math.max(1, Math.ceil((start + 1) / resultsPerPage)); - for(var i=1; i<=pageCount; ++i) { - pages.push({page: i, active: i === currentPage}); - } - } - var diff = process.hrtime(startTime); var timing = (diff[0] * 1e3 + diff[1] / 1e6).toFixed(1); - next(null, { + var data = { timing: timing, users: userData, - matchCount: matchCount, - pages: pages - }); + matchCount: matchCount + }; + + var currentPage = Math.max(1, Math.ceil((start + 1) / resultsPerPage)); + pageCount = Math.ceil(matchCount / resultsPerPage); + pagination.create(currentPage, pageCount, data); + + next(null, data); } ], callback); }; From c87c99eadde790f5f651fd94f3e2cfc802bfc442 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 28 Jan 2015 17:08:41 -0500 Subject: [PATCH 249/897] dont check admin emits against flooding --- src/socket.io/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 0e04b9ab1d..9274f72222 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -147,7 +147,7 @@ function onMessage(socket, payload) { socket.previousEvents.shift(); } - if (ratelimit.isFlooding(socket)) { + if (!eventName.startsWith('admin.') && ratelimit.isFlooding(socket)) { winston.warn('[socket.io] Too many emits! Disconnecting uid : ' + socket.uid + '. Events : ' + socket.previousEvents); return socket.disconnect(); } From 0fab6c243c81394e594587b8b7763581acb4fc59 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 28 Jan 2015 19:07:44 -0500 Subject: [PATCH 250/897] increase rate limit timeframe from 1 second to 10 seconds --- src/middleware/ratelimit.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/middleware/ratelimit.js b/src/middleware/ratelimit.js index 8b1d1dffcc..7c244a6cd9 100644 --- a/src/middleware/ratelimit.js +++ b/src/middleware/ratelimit.js @@ -5,8 +5,8 @@ var winston = require('winston'); var ratelimit = {}; -var allowedCallsPerSecond = 20; - +var allowedCalls = 100; +var timeframe = 10000; ratelimit.isFlooding = function(socket) { socket.callsPerSecond = socket.callsPerSecond || 0; @@ -18,12 +18,12 @@ ratelimit.isFlooding = function(socket) { var now = Date.now(); socket.elapsedTime += now - socket.lastCallTime; - if (socket.callsPerSecond > allowedCallsPerSecond && socket.elapsedTime < 1000) { + if (socket.callsPerSecond > allowedCalls && socket.elapsedTime < timeframe) { winston.warn('Flooding detected! Calls : ' + socket.callsPerSecond + ', Duration : ' + socket.elapsedTime); return true; } - if (socket.elapsedTime >= 1000) { + if (socket.elapsedTime >= timeframe) { socket.elapsedTime = 0; socket.callsPerSecond = 0; } From f9fecf4bc1a18f576a3bd29742c75cead662a603 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 28 Jan 2015 19:19:55 -0500 Subject: [PATCH 251/897] faster sort users --- src/user/search.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/user/search.js b/src/user/search.js index bad43be25b..95130bf68f 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -178,18 +178,20 @@ module.exports = function(User) { } function sortUsers(userData, sortBy) { - userData.sort(function(user1, user2) { - if (sortBy === 'joindate' || sortBy === 'postcount') { - return user2[sortBy] - user1[sortBy]; - } else { - if(user1[sortBy] < user2[sortBy]) { + if (sortBy === 'joindate' || sortBy === 'postcount') { + userData.sort(function(u1, u2) { + return u2[sortBy] - u1[sortBy]; + }); + } else { + userData.sort(function(u1, u2) { + if(u1[sortBy] < u2[sortBy]) { return -1; - } else if(user1[sortBy] > user2[sortBy]) { + } else if(u1[sortBy] > u2[sortBy]) { return 1; } return 0; - } - }); + }); + } } function searchByIP(ip, callback) { From 4d6a6f64b0e2dd1b4c15a2e24caa213618a76b13 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 28 Jan 2015 23:43:08 -0500 Subject: [PATCH 252/897] slug is lowercase --- tests/user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/user.js b/tests/user.js index 381c6f0a44..466379c6e8 100644 --- a/tests/user.js +++ b/tests/user.js @@ -174,7 +174,7 @@ describe('User', function() { describe('.delete()', function() { var uid; before(function(done) { - User.create({username: 'userToDelete', password: '123456', email: 'delete@me.com'}, function(err, newUid) { + User.create({username: 'usertodelete', password: '123456', email: 'delete@me.com'}, function(err, newUid) { assert.ifError(err); uid = newUid; done(); @@ -184,7 +184,7 @@ describe('User', function() { it('should delete a user account', function(done) { User.delete(uid, function(err) { assert.ifError(err); - User.exists('userToDelete', function(err, exists) { + User.exists('usertodelete', function(err, exists) { assert.ifError(err); assert.equal(exists, false); done(); From aaa1fae55828e8451ec1ca818504c3776611b340 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 29 Jan 2015 01:06:48 -0500 Subject: [PATCH 253/897] closes #2597 --- public/src/client/topic/posts.js | 2 -- src/controllers/categories.js | 11 ++++++++--- src/controllers/helpers.js | 34 ++++++++++++++++++++++++-------- src/controllers/index.js | 20 +++++++++++++++---- src/controllers/search.js | 6 ++++-- src/controllers/tags.js | 20 ++++++++++++++----- src/controllers/topics.js | 3 ++- 7 files changed, 71 insertions(+), 25 deletions(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 8e21928498..ec566d9812 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -34,8 +34,6 @@ define('forum/topic/posts', [ var posts = data.posts; socket.emit('topics.getPageCount', ajaxify.variables.get('topic_id'), function(err, newPageCount) { - pagination.recreatePaginationLinks(newPageCount); - if (pagination.currentPage === pagination.pageCount) { createNewPosts(data); } else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) { diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 5083a7d71a..1783fd69b3 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -22,7 +22,8 @@ categoriesController.recent = function(req, res, next) { } data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; - + data['rssFeedUrl'] = nconf.get('relative_path') + '/recent.rss'; + data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[recent:title]]'}]); res.render('recent', data); }); }; @@ -52,7 +53,9 @@ categoriesController.popular = function(req, res, next) { var data = { topics: topics, - 'feeds:disableRSS': parseInt(meta.config['feeds:disableRSS'], 10) === 1 + 'feeds:disableRSS': parseInt(meta.config['feeds:disableRSS'], 10) === 1, + rssFeedUrl: nconf.get('relative_path') + '/popular.rss', + breadcrumbs: helpers.buildBreadcrumbs([{text: '[[global:header.popular]]'}]) }; if (uid === 0) { @@ -72,6 +75,7 @@ categoriesController.unread = function(req, res, next) { return next(err); } + data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[unread:title]]'}]); res.render('unread', data); }); }; @@ -188,7 +192,7 @@ categoriesController.get = function(req, res, next) { url: nconf.get('relative_path') + '/category/' + categoryData.slug } ]; - helpers.buildBreadcrumbs(categoryData.parentCid, function(err, crumbs) { + helpers.buildCategoryBreadcrumbs(categoryData.parentCid, function(err, crumbs) { if (err) { return next(err); } @@ -255,6 +259,7 @@ categoriesController.get = function(req, res, next) { data.currentPage = page; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; + data['rssFeedUrl'] = nconf.get('relative_path') + '/category/' + data.cid + '.rss'; pagination.create(data.currentPage, data.pageCount, data); diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 45d6ea7579..7958ace2df 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -38,7 +38,7 @@ helpers.notAllowed = function(req, res, error) { } }; -helpers.buildBreadcrumbs = function(cid, callback) { +helpers.buildCategoryBreadcrumbs = function(cid, callback) { var breadcrumbs = []; async.whilst(function() { @@ -62,15 +62,33 @@ helpers.buildBreadcrumbs = function(cid, callback) { return callback(err); } - translator.translate('[[global:home]]', meta.config.defaultLang || 'en_GB', function(translated) { - breadcrumbs.unshift({ - text: translated, - url: nconf.get('relative_path') + '/' - }); - - callback(null, breadcrumbs); + breadcrumbs.unshift({ + text: '[[global:home]]', + url: nconf.get('relative_path') + '/' }); + + callback(null, breadcrumbs); + }); +}; + +helpers.buildBreadcrumbs = function(crumbs) { + var breadcrumbs = [ + { + text: '[[global:home]]', + url: nconf.get('relative_path') + '/' + } + ]; + + crumbs.forEach(function(crumb) { + if (crumb) { + if (crumb.url) { + crumb.url = nconf.get('relative_path') + crumb.url; + } + breadcrumbs.push(crumb); + } }); + + return breadcrumbs; }; module.exports = helpers; \ No newline at end of file diff --git a/src/controllers/index.js b/src/controllers/index.js index 49bf28f35c..797d30e22d 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -105,9 +105,18 @@ Controllers.home = function(req, res, next) { }; Controllers.reset = function(req, res, next) { - res.render(req.params.code ? 'reset_code' : 'reset', { - reset_code: req.params.code ? req.params.code : null - }); + if (req.params.code) { + res.render('reset_code', { + reset_code: req.params.code ? req.params.code : null, + breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}]) + }); + } else { + res.render('reset', { + reset_code: req.params.code ? req.params.code : null, + breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]'}]) + }); + } + }; Controllers.login = function(req, res, next) { @@ -120,6 +129,7 @@ Controllers.login = function(req, res, next) { data.showResetLink = emailersPresent; data.allowLocalLogin = parseInt(meta.config.allowLocalLogin, 10) === 1; data.allowRegistration = parseInt(meta.config.allowRegistration, 10) === 1; + data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:login]]'}]); data.error = req.flash('error')[0]; res.render('login', data); @@ -151,6 +161,7 @@ Controllers.register = function(req, res, next) { data.maximumUsernameLength = meta.config.maximumUsernameLength; data.minimumPasswordLength = meta.config.minimumPasswordLength; data.termsOfUse = meta.config.termsOfUse; + data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[register:register]]'}]); data.regFormEntry = []; data.error = req.flash('error')[0]; @@ -200,7 +211,8 @@ Controllers.outgoing = function(req, res, next) { var url = req.query.url, data = { url: url, - title: meta.config.title + title: meta.config.title, + breadcrumbs: helpers.buildBreadcrumbs([{text: '[[notifications:outgoing_link]]'}]) }; if (url) { diff --git a/src/controllers/search.js b/src/controllers/search.js index 1a5690a6e7..355fddeced 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -12,7 +12,7 @@ searchController.search = function(req, res, next) { if (!plugins.hasListeners('filter:search.query')) { return helpers.notFound(req, res); } - + var breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:search]]'}]); if (!req.params.term) { return res.render('search', { time: 0, @@ -20,7 +20,8 @@ searchController.search = function(req, res, next) { posts: [], topics: [], users: [], - tags: [] + tags: [], + breadcrumbs: breadcrumbs }); } @@ -38,6 +39,7 @@ searchController.search = function(req, res, next) { return next(err); } + results.breadcrumbs = breadcrumbs; res.render('search', results); }); }; diff --git a/src/controllers/tags.js b/src/controllers/tags.js index 269e5a3599..3d450e06a7 100644 --- a/src/controllers/tags.js +++ b/src/controllers/tags.js @@ -5,7 +5,8 @@ var tagsController = {}, nconf = require('nconf'), validator = require('validator'), meta = require('../meta'), - topics = require('../topics'); + topics = require('../topics'), + helpers = require('./helpers'); tagsController.getTag = function(req, res, next) { var tag = validator.escape(req.params.tag); @@ -41,8 +42,13 @@ tagsController.getTag = function(req, res, next) { content: nconf.get('url') + '/tags/' + tag } ]; - - res.render('tag', {topics: topics, tag: tag, nextStart: end + 1}); + var data = { + topics: topics, + tag: tag, + nextStart: end + 1, + breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]', url: '/tags'}, {text: tag}]) + }; + res.render('tag', data); }); }); }; @@ -52,8 +58,12 @@ tagsController.getTags = function(req, res, next) { if (err) { return next(err); } - - res.render('tags', {tags: tags, nextStart: 100}); + var data = { + tags: tags, + nextStart: 100, + breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]'}]) + }; + res.render('tags', data); }); }; diff --git a/src/controllers/topics.js b/src/controllers/topics.js index d3d6e571e6..6b3b42ab93 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -139,7 +139,7 @@ topicsController.get = function(req, res, next) { } ]; - helpers.buildBreadcrumbs(topicData.category.parentCid, function(err, crumbs) { + helpers.buildCategoryBreadcrumbs(topicData.category.parentCid, function(err, crumbs) { if (err) { return next(err); } @@ -255,6 +255,7 @@ topicsController.get = function(req, res, next) { data['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1; data['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; + data['rssFeedUrl'] = nconf.get('relative_path') + '/topic/' + data.tid + '.rss'; topics.increaseViewCount(tid); From 8bc2d973527f2eaa252e0cca28770f612e3bb5ab Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 29 Jan 2015 10:08:48 -0500 Subject: [PATCH 254/897] stringify helper for t.js --- public/src/modules/helpers.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index bc40bde658..e8f77a5614 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -4,7 +4,7 @@ // export the class if we are in a Node-like system. if (typeof module === 'object' && module.exports === exports) { - exports = module.exports/* = SemVer*/; + exports = module.exports/* = SemVer*/; } var helpers = {}; @@ -21,6 +21,11 @@ return ''; }; + helpers.stringify = function(obj) { + // Turns the incoming object into a JSON string + return JSON.stringify(obj).replace(/&/gm,"&").replace(//gm,">").replace(/"/g, '"'); + }; + // Groups helpers helpers.membershipBtn = function(groupObj) { if (groupObj.isMember) { From a1c8902b4eee68b2d819f31ffeeec215873747ce Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 29 Jan 2015 12:52:30 -0500 Subject: [PATCH 255/897] hook fixes new hook, action:user.online, fix action:user.set hooks so they pass in uid check err before firing hooks --- src/user.js | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/user.js b/src/user.js index 998ce2db23..ccb30fecfb 100644 --- a/src/user.js +++ b/src/user.js @@ -152,23 +152,37 @@ var async = require('async'), if (err || now - parseInt(score, 10) < 300000) { return callback(err); } - db.sortedSetAdd('users:online', now, uid, callback); + db.sortedSetAdd('users:online', now, uid, function(err) { + if (err) { + return callback(err); + } + plugins.fireHook('action:user.online', {uid: uid, timestamp: now}); + }); }); }; User.setUserField = function(uid, field, value, callback) { - plugins.fireHook('action:user.set', {field: field, value: value, type: 'set'}); - db.setObjectField('user:' + uid, field, value, callback); + db.setObjectField('user:' + uid, field, value, function(err) { + if (err) { + return callback(err) + } + plugins.fireHook('action:user.set', {uid: uid, field: field, value: value, type: 'set'}); + callback(); + }); }; User.setUserFields = function(uid, data, callback) { - for (var field in data) { - if (data.hasOwnProperty(field)) { - plugins.fireHook('action:user.set', {field: field, value: data[field], type: 'set'}); + db.setObject('user:' + uid, data, function(err) { + if (err) { + return callback(err); } - } - - db.setObject('user:' + uid, data, callback); + for (var field in data) { + if (data.hasOwnProperty(field)) { + plugins.fireHook('action:user.set', {uid: uid, field: field, value: data[field], type: 'set'}); + } + } + callback(); + }); }; User.incrementUserFieldBy = function(uid, field, value, callback) { @@ -177,7 +191,7 @@ var async = require('async'), if (err) { return callback(err); } - plugins.fireHook('action:user.set', {field: field, value: value, type: 'increment'}); + plugins.fireHook('action:user.set', {uid: uid, field: field, value: value, type: 'increment'}); callback(null, value); }); @@ -189,7 +203,7 @@ var async = require('async'), if (err) { return callback(err); } - plugins.fireHook('action:user.set', {field: field, value: value, type: 'decrement'}); + plugins.fireHook('action:user.set', {uid: uid, field: field, value: value, type: 'decrement'}); callback(null, value); }); From 57453f33ab1fd71fb929bd8a35be310e1cb066ae Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 29 Jan 2015 13:37:45 -0500 Subject: [PATCH 256/897] new group members route getMembers can take start end ability to specify how many group members to return --- src/categories.js | 2 +- src/controllers/groups.js | 26 ++++++++++++++++++++++++-- src/groups.js | 13 ++++++++----- src/routes/index.js | 1 + src/socket.io/posts.js | 4 ++-- 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/categories.js b/src/categories.js index 574e435081..22c7807c96 100644 --- a/src/categories.js +++ b/src/categories.js @@ -130,7 +130,7 @@ var async = require('async'), }; Categories.getModerators = function(cid, callback) { - Groups.getMembers('cid:' + cid + ':privileges:mods', function(err, uids) { + Groups.getMembers('cid:' + cid + ':privileges:mods', 0, -1, function(err, uids) { if (err || !Array.isArray(uids) || !uids.length) { return callback(err, []); } diff --git a/src/controllers/groups.js b/src/controllers/groups.js index f72d7ed1d4..c20993a7df 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -1,8 +1,9 @@ "use strict"; -var groups = require('../groups'), - async = require('async'), +var async = require('async'), nconf = require('nconf'), + groups = require('../groups'), + user = require('../user'), helpers = require('./helpers'), groupsController = {}; @@ -47,4 +48,25 @@ groupsController.details = function(req, res, next) { }); }; +groupsController.members = function(req, res, next) { + async.waterfall([ + function(next) { + groups.getGroupNameByGroupSlug(req.params.slug, next); + }, + function(groupName, next) { + user.getUsersFromSet('group:' + groupName + ':members', 0, 49, next); + }, + ], function(err, users) { + if (err) { + return next(err); + } + + res.render('groups/members', { + users: users, + nextStart: 50, + loadmore_display: users.length > 50 ? 'block' : 'hide', + }); + }); +}; + module.exports = groupsController; diff --git a/src/groups.js b/src/groups.js index e228ffbcf0..bd832a9178 100644 --- a/src/groups.js +++ b/src/groups.js @@ -113,9 +113,10 @@ var async = require('async'), } if (options.truncateUserList) { - if (uids.length > 4) { + var userListCount = parseInt(options.userListCount, 10) || 4; + if (uids.length > userListCount) { numUsers = uids.length; - uids.length = 4; + uids.length = userListCount; truncated = true; } } @@ -271,8 +272,8 @@ var async = require('async'), }); }; - Groups.getMembers = function(groupName, callback) { - db.getSortedSetRevRange('group:' + groupName + ':members', 0, -1, callback); + Groups.getMembers = function(groupName, start, end, callback) { + db.getSortedSetRevRange('group:' + groupName + ':members', start, end, callback); }; Groups.isMember = function(uid, groupName, callback) { @@ -761,7 +762,9 @@ var async = require('async'), Groups.getLatestMemberPosts = function(groupSlug, max, uid, callback) { async.waterfall([ async.apply(Groups.getGroupNameByGroupSlug, groupSlug), - Groups.getMembers, + function(groupName, next) { + Groups.getMembers(groupName, 0, -1, next); + }, function(uids, next) { if (!Array.isArray(uids) || !uids.length) { return callback(null, []); diff --git a/src/routes/index.js b/src/routes/index.js index b4427f90f1..1af03e0930 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -94,6 +94,7 @@ function groupRoutes(app, middleware, controllers) { setupPageRoute(app, '/groups', middleware, middlewares, controllers.groups.list); setupPageRoute(app, '/groups/:slug', middleware, middlewares, controllers.groups.details); + setupPageRoute(app, '/groups/:slug/members', middleware, middlewares, controllers.groups.members); } function setupPageRoute(router, name, middleware, middlewares, controller) { diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index f6b599884e..71e5577178 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -403,10 +403,10 @@ SocketPosts.flag = function(socket, pid, callback) { function(post, next) { async.parallel({ admins: function(next) { - groups.getMembers('administrators', next); + groups.getMembers('administrators', 0, -1, next); }, moderators: function(next) { - groups.getMembers('cid:' + post.topic.cid + ':privileges:mods', next); + groups.getMembers('cid:' + post.topic.cid + ':privileges:mods', 0, -1, next); } }, next); }, From 6a2c35c263bba4319603932768bc971e74e110e7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 29 Jan 2015 15:45:31 -0500 Subject: [PATCH 257/897] latest t.js --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c46f966b43..c67d9268e6 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "socket.io-redis": "^0.1.3", "socketio-wildcard": "~0.1.1", "string": "^3.0.0", - "templates.js": "0.1.10", + "templates.js": "0.1.15", "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git", "underscore": "~1.7.0", "validator": "~3.26.0", From 6ebc048f1f3a626881b600887a7b43a93ca96077 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 29 Jan 2015 16:41:48 -0500 Subject: [PATCH 258/897] searching on keyup instead of enter key --- public/src/client/groups/list.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 9ff22d9396..a3f9394450 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -31,9 +31,7 @@ define('forum/groups/list', function() { }); // Group searching - $('#search-text').on('keydown', function(e) { - if (e.keyCode === 13) { Groups.search(e); } - }); + $('#search-text').on('keyup', Groups.search); $('#search-button').on('click', Groups.search); }; From b052ed35049eef9cd2bc8be9efa166cf77e95777 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 29 Jan 2015 16:41:48 -0500 Subject: [PATCH 259/897] searching on keyup instead of enter key --- public/src/client/groups/list.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 9ff22d9396..a3f9394450 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -31,9 +31,7 @@ define('forum/groups/list', function() { }); // Group searching - $('#search-text').on('keydown', function(e) { - if (e.keyCode === 13) { Groups.search(e); } - }); + $('#search-text').on('keyup', Groups.search); $('#search-button').on('click', Groups.search); }; From f753cfb1c9f36ab8578d6ccae0581909e28adcf3 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 29 Jan 2015 16:45:51 -0500 Subject: [PATCH 260/897] search on grop sort change too --- public/src/client/groups/list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index a3f9394450..0410a9fa17 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -33,6 +33,7 @@ define('forum/groups/list', function() { // Group searching $('#search-text').on('keyup', Groups.search); $('#search-button').on('click', Groups.search); + $('#search-sort').on('change', Groups.search); }; Groups.search = function(event) { From b54f2de504880fc26d40c41f7a347103c24c77ae Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 29 Jan 2015 17:02:20 -0500 Subject: [PATCH 261/897] pass uid to getUsers and getUsersFromSets --- src/controllers/admin/users.js | 3 ++- src/controllers/groups.js | 3 ++- src/controllers/users.js | 10 +++++----- src/search.js | 6 +++--- src/socket.io/admin/categories.js | 2 +- src/socket.io/admin/user.js | 2 +- src/socket.io/user.js | 5 +++-- src/user.js | 8 ++++---- src/user/follow.js | 2 +- src/user/search.js | 9 +++++---- 10 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js index 17944b8370..283302b48e 100644 --- a/src/controllers/admin/users.js +++ b/src/controllers/admin/users.js @@ -31,7 +31,8 @@ usersController.banned = function(req, res, next) { }; function getUsers(set, req, res, next) { - user.getUsersFromSet(set, 0, 49, function(err, users) { + var uid = req.user ? parseInt(req.user.uid, 10) : 0; + user.getUsersFromSet(set, uid, 0, 49, function(err, users) { if (err) { return next(err); } diff --git a/src/controllers/groups.js b/src/controllers/groups.js index c20993a7df..18ea0cbf2d 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -49,12 +49,13 @@ groupsController.details = function(req, res, next) { }; groupsController.members = function(req, res, next) { + var uid = req.user ? parseInt(req.user.uid, 10) : 0; async.waterfall([ function(next) { groups.getGroupNameByGroupSlug(req.params.slug, next); }, function(groupName, next) { - user.getUsersFromSet('group:' + groupName + ':members', 0, 49, next); + user.getUsersFromSet('group:' + groupName + ':members', uid, 0, 49, next); }, ], function(err, users) { if (err) { diff --git a/src/controllers/users.js b/src/controllers/users.js index 0a2d4d0d67..81001d0f3a 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -14,7 +14,7 @@ usersController.getOnlineUsers = function(req, res, next) { async.parallel({ users: function(next) { - user.getUsersFromSet('users:online', 0, 49, next); + user.getUsersFromSet('users:online', uid, 0, 49, next); }, count: function(next) { var now = Date.now(); @@ -63,7 +63,7 @@ usersController.getUsersSortedByJoinDate = function(req, res, next) { usersController.getUsers = function(set, count, req, res, next) { var uid = req.user ? req.user.uid : 0; - getUsersAndCount(set, count, function(err, data) { + getUsersAndCount(set, uid, count, function(err, data) { if (err) { return next(err); } @@ -78,10 +78,10 @@ usersController.getUsers = function(set, count, req, res, next) { }); }; -function getUsersAndCount(set, count, callback) { +function getUsersAndCount(set, uid, count, callback) { async.parallel({ users: function(next) { - user.getUsersFromSet(set, 0, count - 1, next); + user.getUsersFromSet(set, uid, 0, count - 1, next); }, count: function(next) { db.getObjectField('global', 'userCount', next); @@ -102,7 +102,7 @@ usersController.getUsersForSearch = function(req, res, next) { var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20, uid = req.user ? req.user.uid : 0; - getUsersAndCount('users:joindate', resultsPerPage, function(err, data) { + getUsersAndCount('users:joindate', uid, resultsPerPage, function(err, data) { if (err) { return next(err); } diff --git a/src/search.js b/src/search.js index c4a830f41a..e0be3ecafd 100644 --- a/src/search.js +++ b/src/search.js @@ -40,7 +40,7 @@ search.search = function(data, callback) { if (searchIn === 'posts') { searchInPosts(query, data.postedBy, uid, done); } else if (searchIn === 'users') { - searchInUsers(query, done); + searchInUsers(query, uid, done); } else if (searchIn === 'tags') { searchInTags(query, done); } else { @@ -99,8 +99,8 @@ function searchInPosts(query, postedBy, uid, callback) { }); } -function searchInUsers(query, callback) { - user.search({query: query}, function(err, results) { +function searchInUsers(query, uid, callback) { + user.search({query: query, uid: uid}, function(err, results) { callback(err, results ? results.users : null); }); } diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js index 2ba036d7e0..9a9ef0ea7e 100644 --- a/src/socket.io/admin/categories.js +++ b/src/socket.io/admin/categories.js @@ -36,7 +36,7 @@ Categories.search = function(socket, data, callback) { var username = data.username, cid = data.cid; - user.search({query: username}, function(err, data) { + user.search({query: username, uid: socket.uid}, function(err, data) { if (err) { return callback(err); } diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js index 9189727fbb..5f7199bf29 100644 --- a/src/socket.io/admin/user.js +++ b/src/socket.io/admin/user.js @@ -175,7 +175,7 @@ User.deleteUsers = function(socket, uids, callback) { }; User.search = function(socket, data, callback) { - user.search({query: data.query, searchBy: data.searchBy, startsWith: false}, function(err, searchData) { + user.search({query: data.query, searchBy: data.searchBy, startsWith: false, uid: socket.uid}, function(err, searchData) { if (err) { return callback(err); } diff --git a/src/socket.io/user.js b/src/socket.io/user.js index d28421c383..6004bdd469 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -66,7 +66,8 @@ SocketUser.search = function(socket, data, callback) { page: data.page, searchBy: data.searchBy, sortBy: data.sortBy, - filterBy: data.filterBy + filterBy: data.filterBy, + uid: socket.uid }, callback); }; @@ -332,7 +333,7 @@ SocketUser.loadMore = function(socket, data, callback) { var start = parseInt(data.after, 10), end = start + 19; - user.getUsersFromSet(data.set, start, end, function(err, userData) { + user.getUsersFromSet(data.set, socket.uid, start, end, function(err, userData) { if (err) { return callback(err); } diff --git a/src/user.js b/src/user.js index 80f7a951db..c7d8649d22 100644 --- a/src/user.js +++ b/src/user.js @@ -219,18 +219,18 @@ var async = require('async'), } }; - User.getUsersFromSet = function(set, start, stop, callback) { + User.getUsersFromSet = function(set, uid, start, stop, callback) { async.waterfall([ function(next) { User.getUidsFromSet(set, start, stop, next); }, function(uids, next) { - User.getUsers(uids, next); + User.getUsers(uids, uid, next); } ], callback); }; - User.getUsers = function(uids, callback) { + User.getUsers = function(uids, uid, callback) { var fields = ['uid', 'username', 'userslug', 'picture', 'status', 'banned', 'postcount', 'reputation', 'email:confirmed']; plugins.fireHook('filter:users.addFields', {fields: fields}, function(err, data) { if (err) { @@ -264,7 +264,7 @@ var async = require('async'), user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1; }); - plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) { + plugins.fireHook('filter:userlist.get', {users: results.userData, uid: uid}, function(err, data) { if (err) { return callback(err); } diff --git a/src/user/follow.js b/src/user/follow.js index c3e2cb340c..6b0c0a3973 100644 --- a/src/user/follow.js +++ b/src/user/follow.js @@ -59,7 +59,7 @@ module.exports = function(User) { return callback(err); } - User.getUsers(uids, callback); + User.getUsers(uids, uid, callback); }); } diff --git a/src/user/search.js b/src/user/search.js index 95130bf68f..9df346f6ec 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -14,13 +14,14 @@ module.exports = function(User) { var searchBy = data.searchBy || ['username']; var startsWith = data.hasOwnProperty('startsWith') ? data.startsWith : true; var page = data.page || 1; + var uid = data.uid || 0; if (!query) { return callback(null, {timing: 0, users: [], matchCount: 0, pages: []}); } if (searchBy.indexOf('ip') !== -1) { - return searchByIP(query, callback); + return searchByIP(query, uid, callback); } var startTime = process.hrtime(); @@ -46,7 +47,7 @@ module.exports = function(User) { matchCount = uids.length; uids = uids.slice(start, end); - User.getUsers(uids, next); + User.getUsers(uids, uid, next); }, function(userData, next) { @@ -194,14 +195,14 @@ module.exports = function(User) { } } - function searchByIP(ip, callback) { + function searchByIP(ip, uid, callback) { var start = process.hrtime(); async.waterfall([ function(next) { db.getSortedSetRevRange('ip:' + ip + ':uid', 0, -1, next); }, function(uids, next) { - User.getUsers(uids, next); + User.getUsers(uids, uid, next); }, function(users, next) { var diff = process.hrtime(start); From 530bdbbd1a375b3b51bc2f9b824af36de45c2876 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 29 Jan 2015 17:10:49 -0500 Subject: [PATCH 262/897] dont rename if key doesn't exist --- src/database/redis/main.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/database/redis/main.js b/src/database/redis/main.js index 9b08e4af65..e9bd5b2f09 100644 --- a/src/database/redis/main.js +++ b/src/database/redis/main.js @@ -105,8 +105,13 @@ module.exports = function(redisClient, module) { module.rename = function(oldKey, newKey, callback) { callback = callback || function() {}; - redisClient.rename(oldKey, newKey, function(err, res) { - callback(err); + redisClient.exist(oldKey, function(err, exists) { + if (err || !exists) { + return callback(err); + } + redisClient.rename(oldKey, newKey, function(err, res) { + callback(err); + }); }); }; From d1a1cada19af00a8247f5550aa48a394baeb06ea Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 29 Jan 2015 17:12:12 -0500 Subject: [PATCH 263/897] fix typo --- src/database/redis/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database/redis/main.js b/src/database/redis/main.js index e9bd5b2f09..efe1b7958a 100644 --- a/src/database/redis/main.js +++ b/src/database/redis/main.js @@ -105,7 +105,7 @@ module.exports = function(redisClient, module) { module.rename = function(oldKey, newKey, callback) { callback = callback || function() {}; - redisClient.exist(oldKey, function(err, exists) { + redisClient.exists(oldKey, function(err, exists) { if (err || !exists) { return callback(err); } From f7935361310ec0917dd462ada7f15aed7c4a4f90 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 29 Jan 2015 17:45:42 -0500 Subject: [PATCH 264/897] latest translations and fallbacks --- public/language/ar/email.json | 2 + public/language/ar/error.json | 9 +++- public/language/ar/global.json | 8 ++- public/language/ar/groups.json | 15 +++++- public/language/ar/recent.json | 11 +++- public/language/ar/search.json | 5 +- public/language/ar/topic.json | 4 +- public/language/ar/user.json | 5 ++ public/language/ar/users.json | 5 +- public/language/bn/email.json | 2 + public/language/bn/error.json | 9 +++- public/language/bn/global.json | 8 ++- public/language/bn/groups.json | 15 +++++- public/language/bn/recent.json | 11 +++- public/language/bn/search.json | 5 +- public/language/bn/topic.json | 4 +- public/language/bn/user.json | 5 ++ public/language/bn/users.json | 5 +- public/language/cs/email.json | 2 + public/language/cs/error.json | 9 +++- public/language/cs/global.json | 8 ++- public/language/cs/groups.json | 15 +++++- public/language/cs/recent.json | 11 +++- public/language/cs/search.json | 5 +- public/language/cs/topic.json | 4 +- public/language/cs/user.json | 5 ++ public/language/cs/users.json | 5 +- public/language/de/email.json | 2 + public/language/de/error.json | 9 +++- public/language/de/global.json | 8 ++- public/language/de/groups.json | 15 +++++- public/language/de/recent.json | 11 +++- public/language/de/search.json | 5 +- public/language/de/topic.json | 4 +- public/language/de/user.json | 5 ++ public/language/de/users.json | 5 +- public/language/el/email.json | 2 + public/language/el/error.json | 9 +++- public/language/el/global.json | 8 ++- public/language/el/groups.json | 15 +++++- public/language/el/recent.json | 11 +++- public/language/el/search.json | 5 +- public/language/el/topic.json | 4 +- public/language/el/user.json | 5 ++ public/language/el/users.json | 5 +- public/language/en@pirate/email.json | 2 + public/language/en@pirate/error.json | 9 +++- public/language/en@pirate/global.json | 8 ++- public/language/en@pirate/groups.json | 15 +++++- public/language/en@pirate/recent.json | 11 +++- public/language/en@pirate/search.json | 5 +- public/language/en@pirate/topic.json | 4 +- public/language/en@pirate/user.json | 5 ++ public/language/en@pirate/users.json | 5 +- public/language/en_US/email.json | 2 + public/language/en_US/error.json | 9 +++- public/language/en_US/global.json | 8 ++- public/language/en_US/groups.json | 15 +++++- public/language/en_US/recent.json | 11 +++- public/language/en_US/search.json | 5 +- public/language/en_US/topic.json | 4 +- public/language/en_US/user.json | 5 ++ public/language/en_US/users.json | 5 +- public/language/es/email.json | 2 + public/language/es/error.json | 47 +++++++++-------- public/language/es/global.json | 58 +++++++++++---------- public/language/es/groups.json | 15 +++++- public/language/es/notifications.json | 18 +++---- public/language/es/pages.json | 14 ++--- public/language/es/recent.json | 11 +++- public/language/es/search.json | 5 +- public/language/es/tags.json | 4 +- public/language/es/topic.json | 74 ++++++++++++++------------- public/language/es/user.json | 69 +++++++++++++------------ public/language/es/users.json | 5 +- public/language/et/email.json | 2 + public/language/et/error.json | 9 +++- public/language/et/global.json | 8 ++- public/language/et/groups.json | 15 +++++- public/language/et/recent.json | 11 +++- public/language/et/search.json | 5 +- public/language/et/topic.json | 4 +- public/language/et/user.json | 5 ++ public/language/et/users.json | 5 +- public/language/fa_IR/email.json | 2 + public/language/fa_IR/error.json | 9 +++- public/language/fa_IR/global.json | 8 ++- public/language/fa_IR/groups.json | 15 +++++- public/language/fa_IR/recent.json | 11 +++- public/language/fa_IR/search.json | 5 +- public/language/fa_IR/topic.json | 4 +- public/language/fa_IR/user.json | 5 ++ public/language/fa_IR/users.json | 5 +- public/language/fi/email.json | 2 + public/language/fi/error.json | 9 +++- public/language/fi/global.json | 8 ++- public/language/fi/groups.json | 15 +++++- public/language/fi/recent.json | 11 +++- public/language/fi/search.json | 5 +- public/language/fi/topic.json | 4 +- public/language/fi/user.json | 5 ++ public/language/fi/users.json | 5 +- public/language/fr/email.json | 2 + public/language/fr/error.json | 9 +++- public/language/fr/global.json | 8 ++- public/language/fr/groups.json | 15 +++++- public/language/fr/recent.json | 11 +++- public/language/fr/search.json | 5 +- public/language/fr/topic.json | 4 +- public/language/fr/user.json | 5 ++ public/language/fr/users.json | 5 +- public/language/he/email.json | 2 + public/language/he/error.json | 9 +++- public/language/he/global.json | 8 ++- public/language/he/groups.json | 15 +++++- public/language/he/recent.json | 11 +++- public/language/he/search.json | 5 +- public/language/he/topic.json | 4 +- public/language/he/user.json | 5 ++ public/language/he/users.json | 5 +- public/language/hu/email.json | 2 + public/language/hu/error.json | 9 +++- public/language/hu/global.json | 8 ++- public/language/hu/groups.json | 15 +++++- public/language/hu/recent.json | 11 +++- public/language/hu/search.json | 5 +- public/language/hu/topic.json | 4 +- public/language/hu/user.json | 5 ++ public/language/hu/users.json | 5 +- public/language/id/email.json | 2 + public/language/id/error.json | 9 +++- public/language/id/global.json | 8 ++- public/language/id/groups.json | 15 +++++- public/language/id/recent.json | 11 +++- public/language/id/search.json | 5 +- public/language/id/topic.json | 4 +- public/language/id/user.json | 5 ++ public/language/id/users.json | 5 +- public/language/it/email.json | 2 + public/language/it/error.json | 9 +++- public/language/it/global.json | 8 ++- public/language/it/groups.json | 15 +++++- public/language/it/recent.json | 11 +++- public/language/it/search.json | 5 +- public/language/it/topic.json | 4 +- public/language/it/user.json | 5 ++ public/language/it/users.json | 5 +- public/language/ja/email.json | 2 + public/language/ja/error.json | 9 +++- public/language/ja/global.json | 8 ++- public/language/ja/groups.json | 15 +++++- public/language/ja/recent.json | 11 +++- public/language/ja/search.json | 5 +- public/language/ja/topic.json | 4 +- public/language/ja/user.json | 5 ++ public/language/ja/users.json | 5 +- public/language/ko/email.json | 2 + public/language/ko/error.json | 9 +++- public/language/ko/global.json | 8 ++- public/language/ko/groups.json | 15 +++++- public/language/ko/recent.json | 11 +++- public/language/ko/search.json | 5 +- public/language/ko/topic.json | 4 +- public/language/ko/user.json | 5 ++ public/language/ko/users.json | 5 +- public/language/lt/email.json | 2 + public/language/lt/error.json | 9 +++- public/language/lt/global.json | 8 ++- public/language/lt/groups.json | 15 +++++- public/language/lt/recent.json | 11 +++- public/language/lt/search.json | 5 +- public/language/lt/topic.json | 4 +- public/language/lt/user.json | 5 ++ public/language/lt/users.json | 5 +- public/language/ms/email.json | 2 + public/language/ms/error.json | 9 +++- public/language/ms/global.json | 8 ++- public/language/ms/groups.json | 15 +++++- public/language/ms/recent.json | 11 +++- public/language/ms/search.json | 5 +- public/language/ms/topic.json | 4 +- public/language/ms/user.json | 5 ++ public/language/ms/users.json | 5 +- public/language/nb/email.json | 4 +- public/language/nb/error.json | 9 +++- public/language/nb/global.json | 10 ++-- public/language/nb/groups.json | 15 +++++- public/language/nb/recent.json | 11 +++- public/language/nb/search.json | 5 +- public/language/nb/topic.json | 4 +- public/language/nb/user.json | 9 +++- public/language/nb/users.json | 5 +- public/language/nl/email.json | 2 + public/language/nl/error.json | 9 +++- public/language/nl/global.json | 8 ++- public/language/nl/groups.json | 15 +++++- public/language/nl/recent.json | 11 +++- public/language/nl/search.json | 5 +- public/language/nl/topic.json | 4 +- public/language/nl/user.json | 5 ++ public/language/nl/users.json | 5 +- public/language/pl/email.json | 8 +-- public/language/pl/error.json | 11 ++-- public/language/pl/global.json | 10 ++-- public/language/pl/groups.json | 15 +++++- public/language/pl/modules.json | 10 ++-- public/language/pl/recent.json | 11 +++- public/language/pl/search.json | 5 +- public/language/pl/success.json | 6 +-- public/language/pl/topic.json | 14 ++--- public/language/pl/user.json | 13 +++-- public/language/pl/users.json | 5 +- public/language/pt_BR/email.json | 2 + public/language/pt_BR/error.json | 9 +++- public/language/pt_BR/global.json | 8 ++- public/language/pt_BR/groups.json | 15 +++++- public/language/pt_BR/recent.json | 11 +++- public/language/pt_BR/search.json | 5 +- public/language/pt_BR/topic.json | 4 +- public/language/pt_BR/user.json | 5 ++ public/language/pt_BR/users.json | 5 +- public/language/ro/email.json | 2 + public/language/ro/error.json | 9 +++- public/language/ro/global.json | 8 ++- public/language/ro/groups.json | 15 +++++- public/language/ro/recent.json | 11 +++- public/language/ro/search.json | 5 +- public/language/ro/topic.json | 4 +- public/language/ro/user.json | 5 ++ public/language/ro/users.json | 5 +- public/language/ru/email.json | 2 + public/language/ru/error.json | 9 +++- public/language/ru/global.json | 8 ++- public/language/ru/groups.json | 15 +++++- public/language/ru/recent.json | 11 +++- public/language/ru/search.json | 5 +- public/language/ru/topic.json | 4 +- public/language/ru/user.json | 5 ++ public/language/ru/users.json | 5 +- public/language/sc/email.json | 2 + public/language/sc/error.json | 9 +++- public/language/sc/global.json | 8 ++- public/language/sc/groups.json | 15 +++++- public/language/sc/recent.json | 11 +++- public/language/sc/search.json | 5 +- public/language/sc/topic.json | 4 +- public/language/sc/user.json | 5 ++ public/language/sc/users.json | 5 +- public/language/sk/email.json | 2 + public/language/sk/error.json | 9 +++- public/language/sk/global.json | 8 ++- public/language/sk/groups.json | 15 +++++- public/language/sk/recent.json | 11 +++- public/language/sk/search.json | 5 +- public/language/sk/topic.json | 4 +- public/language/sk/user.json | 5 ++ public/language/sk/users.json | 5 +- public/language/sv/category.json | 2 +- public/language/sv/email.json | 6 ++- public/language/sv/error.json | 15 ++++-- public/language/sv/global.json | 10 ++-- public/language/sv/groups.json | 15 +++++- public/language/sv/recent.json | 11 +++- public/language/sv/search.json | 5 +- public/language/sv/topic.json | 4 +- public/language/sv/user.json | 5 ++ public/language/sv/users.json | 5 +- public/language/th/email.json | 2 + public/language/th/error.json | 9 +++- public/language/th/global.json | 8 ++- public/language/th/groups.json | 15 +++++- public/language/th/recent.json | 11 +++- public/language/th/search.json | 5 +- public/language/th/topic.json | 4 +- public/language/th/user.json | 5 ++ public/language/th/users.json | 5 +- public/language/tr/email.json | 2 + public/language/tr/error.json | 9 +++- public/language/tr/global.json | 8 ++- public/language/tr/groups.json | 15 +++++- public/language/tr/recent.json | 11 +++- public/language/tr/search.json | 5 +- public/language/tr/topic.json | 4 +- public/language/tr/user.json | 5 ++ public/language/tr/users.json | 5 +- public/language/vi/category.json | 2 +- public/language/vi/email.json | 8 +-- public/language/vi/error.json | 9 +++- public/language/vi/global.json | 8 ++- public/language/vi/groups.json | 15 +++++- public/language/vi/recent.json | 11 +++- public/language/vi/search.json | 5 +- public/language/vi/topic.json | 4 +- public/language/vi/user.json | 5 ++ public/language/vi/users.json | 5 +- public/language/zh_CN/email.json | 12 +++-- public/language/zh_CN/error.json | 15 ++++-- public/language/zh_CN/global.json | 8 ++- public/language/zh_CN/groups.json | 15 +++++- public/language/zh_CN/recent.json | 21 +++++--- public/language/zh_CN/search.json | 5 +- public/language/zh_CN/tags.json | 2 +- public/language/zh_CN/topic.json | 4 +- public/language/zh_CN/user.json | 7 ++- public/language/zh_CN/users.json | 5 +- public/language/zh_TW/email.json | 2 + public/language/zh_TW/error.json | 9 +++- public/language/zh_TW/global.json | 8 ++- public/language/zh_TW/groups.json | 15 +++++- public/language/zh_TW/recent.json | 11 +++- public/language/zh_TW/search.json | 5 +- public/language/zh_TW/topic.json | 4 +- public/language/zh_TW/user.json | 5 ++ public/language/zh_TW/users.json | 5 +- 314 files changed, 2051 insertions(+), 487 deletions(-) diff --git a/public/language/ar/email.json b/public/language/ar/email.json index a015fa445c..f2820e0600 100644 --- a/public/language/ar/email.json +++ b/public/language/ar/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "هناك محادثة جديدة من %1", "notif.chat.cta": "انقر هنا لمتابعة المحادثة", "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.", "unsub.cta": "انقر هنا لتغيير تلك الإعدادات", "closing": "شكرًا لك!" diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 21b27c5bce..592d7365e4 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -18,6 +18,7 @@ "username-taken": "اسم المستخدم مأخوذ", "email-taken": "البريد الالكتروني مأخوذ", "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "اسم المستخدم قصير.", "username-too-long": "اسم المستخدم طويل", "user-banned": "المستخدم محظور", @@ -43,10 +44,13 @@ "already-favourited": "لقد سبق وأضفت هذا الرد إلى المفضلة", "already-unfavourited": "لقد سبق وحذفت هذا الرد من المفضلة", "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.", - "invalid-image-type": "نوع الصورة ممنوع", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "اسم المجموعة قصير", "group-already-exists": "المجموعة موجودة مسبقا", "group-name-change-not-allowed": "لايسمح بتغيير أسماء المجموعات", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "سبق وتم حذف هذا الرد", "post-already-restored": "سبق وتم إلغاء حذف هذا الرد", "topic-already-deleted": "سبق وتم حذف هذا الموضوع", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع", "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل", "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\". سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.", - "registration-error": "حدث خطأ أثناء التسجيل" + "registration-error": "حدث خطأ أثناء التسجيل", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/ar/global.json b/public/language/ar/global.json index 78853f6439..1671e2806f 100644 --- a/public/language/ar/global.json +++ b/public/language/ar/global.json @@ -3,9 +3,10 @@ "search": "بحث", "buttons.close": "أغلق", "403.title": "غير مسموح بالدخول", - "403.message": "يبدو أنك قد تعثر على الصفحة التي لم يكن لديك الوصول إليها. ربما يجب عليك تسجيل الدخول ", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "لم يتم العثور", - "404.message": "يبدو أنك قد تعثرت على صفحة غير موجودة. عودة إلى الصفحة الرئيسية.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "خطأ داخلي.", "500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!", "register": "تسجيل", @@ -26,6 +27,7 @@ "header.tags": "وسم", "header.popular": "الأكثر شهرة", "header.users": "المستخدمين", + "header.groups": "Groups", "header.chats": "المحادثات", "header.notifications": "التنبيهات", "header.search": "بحث", @@ -73,5 +75,7 @@ "updated.title": "تم تحديث المنتدى", "updated.message": "لقد تم تحديث المنتدى إلى آخر نسخة للتو. المرجو إعادة تحميل الصفحة.", "privacy": "الخصوصية", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "حذف الكل" } \ No newline at end of file diff --git a/public/language/ar/groups.json b/public/language/ar/groups.json index 9cc78c49e8..5ca494a696 100644 --- a/public/language/ar/groups.json +++ b/public/language/ar/groups.json @@ -1,8 +1,21 @@ { "groups": "المجموعات", "view_group": "معاينة المجموعة", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "تفاصيل المجموعة", "details.members": "لائحة الأعضاء", + "details.pending": "Pending Members", "details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة", - "details.latest_posts": "آخر المشاركات" + "details.latest_posts": "آخر المشاركات", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ar/recent.json b/public/language/ar/recent.json index 12b5140260..41da45d951 100644 --- a/public/language/ar/recent.json +++ b/public/language/ar/recent.json @@ -5,5 +5,14 @@ "month": "شهر", "year": "سنة", "alltime": "دائمًا", - "no_recent_topics": "لاوجود لمشاركات جديدة" + "no_recent_topics": "لاوجود لمشاركات جديدة", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/ar/search.json b/public/language/ar/search.json index 3321c45835..581a791905 100644 --- a/public/language/ar/search.json +++ b/public/language/ar/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 نتيجة (نتائج) موافقة ل \"%2\", (%3 ثواني)", - "no-matches": "لم يتم إيجاد أية مشاركات" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 6df5a6018f..256a6d2b0c 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "لم تختر أي مشاركة", "fork_success": "تم إنشاء فرع للموضوع بنجاح! إضغط هنا لمعاينة الفرع.", "composer.title_placeholder": "أدخل عنوان موضوعك هنا...", + "composer.handle_placeholder": "Name", "composer.discard": "نبذ التغييرات", "composer.submit": "حفظ", "composer.replying_to": "الرد على %1", @@ -92,5 +93,6 @@ "sort_by": "ترتيب حسب", "oldest_to_newest": "من الأقدم إلى الأحدث", "newest_to_oldest": "من الأحدث إلى الأقدم", - "most_votes": "الأكثر تصويتًا" + "most_votes": "الأكثر تصويتًا", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/ar/user.json b/public/language/ar/user.json index ff95cadcb6..29094b2d39 100644 --- a/public/language/ar/user.json +++ b/public/language/ar/user.json @@ -2,6 +2,8 @@ "banned": "محظور", "offline": "ليس موجود حالياً", "username": "إسم المستخدم", + "joindate": "Join Date", + "postcount": "Post Count", "email": "البريد الإلكتروني", "confirm_email": "تأكيد عنوان البريد الإلكتروني", "delete_account": "حذف الحساب", @@ -16,6 +18,7 @@ "profile_views": "عدد مشاهدات الملف الشخصي", "reputation": "السمعة", "favourites": "المفضلات", + "watched": "Watched", "followers": "المتابعون", "following": "يتابع", "signature": "توقيع", @@ -56,10 +59,12 @@ "digest_weekly": "أسبوعيًّا", "digest_monthly": "شهريًّا", "send_chat_notifications": "استلام رسالة إلكترونية عند ورود محادثة وأنا غير متصل.", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "هذا المستخدم ليس لديه أي متابع :(", "follows_no_one": "هذا المستخدم لا يتابع أحد :(", "has_no_posts": "هذا المستخدم لم يكتب أي شيء بعد.", "has_no_topics": "هذا المستخدم لم ينشئ أي موضوع بعد.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "البريد الإلكتروني مخفي", "hidden": "مخفي", "paginate_description": "عرض المواضيع والردود موزعة على صفحات عوض صفحة واحدة.", diff --git a/public/language/ar/users.json b/public/language/ar/users.json index bd81c8d5ba..b37bca619f 100644 --- a/public/language/ar/users.json +++ b/public/language/ar/users.json @@ -5,5 +5,8 @@ "search": "بحث", "enter_username": "أدخل اسم مستخدم للبحث", "load_more": "حمل المزيد", - "users-found-search-took": "تم إيجاد %1 مستخدمـ(ين)! استغرق البحث %2 ميليثانية." + "users-found-search-took": "تم إيجاد %1 مستخدمـ(ين)! استغرق البحث %2 ميليثانية.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/bn/email.json b/public/language/bn/email.json index a0f40d8218..b151164f2f 100644 --- a/public/language/bn/email.json +++ b/public/language/bn/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "%1 এর থেকে নতুন মেসেজ এসেছে।", "notif.chat.cta": "কথপোকথন চালিয়ে যেতে এখানে ক্লিক করুন", "notif.chat.unsub.info": "আপনার সাবস্ক্রীপশন সেটিংসের কারনে আপনার এই নোটিফিকেশন পাঠানো হয়েছে", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "আপনি সঠিকভাবে নোডবিবির জন্য মেইলার সেটাপ করেছেন কিনা নিশ্চিত করার জন্য এই টেষ্ট ইমেইল পাঠানো হয়েছে", "unsub.cta": "সেটিংসগুলো পরিবর্তন করতে এখানে ক্লিক করুন", "closing": "ধন্যবাদ!" diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 79980346d3..83aa15b6b5 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -18,6 +18,7 @@ "username-taken": "ইউজারনেম আগেই ব্যবহৃত", "email-taken": "ইমেইল আগেই ব্যবহৃত", "email-not-confirmed": "আপনার ইমেইল এড্রেস নিশ্চিত করা হয় নি, নিশ্চিত করতে এখানে ক্লিক করুন।", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "খুব ছোট ইউজারনেম", "username-too-long": "ইউজারনেম বড় হয়ে গিয়েছে", "user-banned": "ব্যবহারকারী নিষিদ্ধ", @@ -43,10 +44,13 @@ "already-favourited": "আপনি ইতিমধ্যে এই পোষ্টটি পছন্দের তালিকায় যোগ করেছেন", "already-unfavourited": "আপনি ইতিমধ্যে এই পোষ্টটি আপনার পছন্দের তালিকা থেকে সরিয়ে ফেলেছেন", "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!", - "invalid-image-type": "ভুল ছবির টাইপ", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "গ্রুপের নাম খুব ছোট", "group-already-exists": "গ্রুপ ইতিমধ্যেই বিদ্যমান", "group-name-change-not-allowed": "গ্রুপের নাম পরিবর্তনের অনুমতি নেই", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "এই পোস্টটি ইতিমধ্যে ডিলিট করা হয়ে গিয়েছে", "post-already-restored": "এই পোষ্টটি ইতিমধ্যে পুনরোদ্ধার করা হয়েছে", "topic-already-deleted": "এই টপিকটি ইতিমধ্যে ডিলিট করা হয়েছে", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই", "not-enough-reputation-to-flag": "এই পোষ্টকে ফ্লাগ করার জন্য আপনার পর্যাপ্ত সম্মাননা নেই", "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ", - "registration-error": "নিবন্ধন এরর!" + "registration-error": "নিবন্ধন এরর!", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/bn/global.json b/public/language/bn/global.json index 760766d189..64d9b71ff3 100644 --- a/public/language/bn/global.json +++ b/public/language/bn/global.json @@ -3,9 +3,10 @@ "search": "অনুসন্ধান", "buttons.close": "বন্ধ", "403.title": "প্রবেশাধিকার প্রত্যাখ্যাত", - "403.message": "আপনি এমন একটি পাতায় যাওয়ার চেষ্টা করছেন যেখানে আপনার প্রবেশাধিকার নেই। আপনি কি প্রবেশ করে আবার চেষ্টা করবেন?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "পাওয়া যায়নি", - "404.message": "আপনি এমন একটি পাতায় যাওয়ার চেষ্টা করছেন যার অস্তিত্ব নেই। নীড়পাতায় ফিরে যান। ", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "অভ্যন্তরীণ ত্রুটি।", "500.message": "ওহো! কিছু ভুল হয়েছে মনে হচ্ছে!", "register": "নিবন্ধন", @@ -26,6 +27,7 @@ "header.tags": "ট্যাগ", "header.popular": "জনপ্রিয়", "header.users": "ব্যবহারকারীগণ", + "header.groups": "Groups", "header.chats": "কথোপকথন", "header.notifications": "বিজ্ঞপ্তি", "header.search": "অনুসন্ধান", @@ -73,5 +75,7 @@ "updated.title": "ফোরাম আপডেট করা হয়েছে", "updated.message": "এই ফোরামে এইমাত্র সর্বশেষ সংস্করণে আপডেট করা হয়েছে। পৃষ্ঠাটি রিফ্রেশ করতে এখানে ক্লিক করুন।", "privacy": "নিরাপত্তা", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "সব মুছে ফেলুন" } \ No newline at end of file diff --git a/public/language/bn/groups.json b/public/language/bn/groups.json index 09ce10916c..a9f9207a2f 100644 --- a/public/language/bn/groups.json +++ b/public/language/bn/groups.json @@ -1,8 +1,21 @@ { "groups": "গ্রুপসমূহ", "view_group": "গ্রুপ দেখুন", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "গ্রুপের বিস্তারিত", "details.members": "সদস্য তালিকা", + "details.pending": "Pending Members", "details.has_no_posts": "এই গ্রুপের সদস্যরা এখনো কোন পোষ্ট করেন নি", - "details.latest_posts": "সর্বশেষ পোষ্টসমূহ" + "details.latest_posts": "সর্বশেষ পোষ্টসমূহ", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/bn/recent.json b/public/language/bn/recent.json index 248267756e..518b443560 100644 --- a/public/language/bn/recent.json +++ b/public/language/bn/recent.json @@ -5,5 +5,14 @@ "month": "মাস", "year": "বছর", "alltime": "সবসময় ", - "no_recent_topics": "কোন সাম্প্রতিক টপিক নেই। " + "no_recent_topics": "কোন সাম্প্রতিক টপিক নেই। ", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/bn/search.json b/public/language/bn/search.json index daf27f87ac..eafce184ec 100644 --- a/public/language/bn/search.json +++ b/public/language/bn/search.json @@ -1,4 +1,7 @@ { "results_matching": "\"%2\" এর সাথে মিলিয়ে %1 ফলাফল পাওয়া গেছে, ( %3 seconds সময় লেগেছে )", - "no-matches": "কোন পোষ্ট খুঁজে পাওয়া যায় নি" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index b8729242fb..e7a0b35aa0 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "কোন পোষ্ট সিলেক্ট করা হয় নি", "fork_success": "টপিক ফর্ক করা হয়েছে। ফর্ক করা টপিকে যেতে এখানে ক্লিক করুন", "composer.title_placeholder": "আপনার টপিকের শিরোনাম দিন", + "composer.handle_placeholder": "Name", "composer.discard": "বাতিল", "composer.submit": "সাবমিট", "composer.replying_to": "%1 এর উত্তরে:", @@ -92,5 +93,6 @@ "sort_by": "সাজানোর ভিত্তি:", "oldest_to_newest": "পুরাতন থেকে নতুন", "newest_to_oldest": "নতুন থেকে পুরাতন", - "most_votes": "সর্বোচ্চ ভোট" + "most_votes": "সর্বোচ্চ ভোট", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/bn/user.json b/public/language/bn/user.json index 939ca6b33c..98f94c7936 100644 --- a/public/language/bn/user.json +++ b/public/language/bn/user.json @@ -2,6 +2,8 @@ "banned": "নিষিদ্ধ", "offline": "অফলাইন", "username": "সদস্যের নাম", + "joindate": "Join Date", + "postcount": "Post Count", "email": "ইমেইল", "confirm_email": "ইমেইল নিশ্চিত করুন", "delete_account": "একাউন্ট মুছে ফেলুন", @@ -16,6 +18,7 @@ "profile_views": "প্রোফাইল দেখেছেন", "reputation": "সন্মাননা", "favourites": "পছন্দের তালিকা", + "watched": "Watched", "followers": "যাদের অনুসরণ করছেন", "following": "যারা আপনাকে অনুসরণ করছে", "signature": "স্বাক্ষর", @@ -56,10 +59,12 @@ "digest_weekly": "সাপ্তাহিক", "digest_monthly": "মাসিক", "send_chat_notifications": "যদি আমি অনলাইনে না থাকি, সেক্ষেত্রে নতুন চ্যাট মেসেজ আসলে আমাকে ইমেইল করুন", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "এই সদস্যের কোন ফলোয়ার নেই :(", "follows_no_one": "এই সদস্য কাউকে ফলো করছেন না :(", "has_no_posts": "এই সদস্য এখনো কোন পোষ্ট করেন নি", "has_no_topics": "এই সদস্য এখনো কোন টপিক পোষ্ট করেন নি", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "ইমেইল গোপন রাখা হয়েছে", "hidden": "গোপন করা হয়েছে", "paginate_description": "ইনফাইনাইট স্ক্রলের বদলে টপিক এবং পোষ্টের জন্য পেজিনেশন ব্যাবহার করুন", diff --git a/public/language/bn/users.json b/public/language/bn/users.json index 923718a0f7..5d7dbd5cec 100644 --- a/public/language/bn/users.json +++ b/public/language/bn/users.json @@ -5,5 +5,8 @@ "search": "খুঁজুন", "enter_username": "ইউজারনেম এর ভিত্তিতে সার্চ করুন", "load_more": "আরো লোড করুন", - "users-found-search-took": "%1 সদস্য(দের) খুঁজে পাওয়া গিয়েছে! সময় লেগেছে %2 ms." + "users-found-search-took": "%1 সদস্য(দের) খুঁজে পাওয়া গিয়েছে! সময় লেগেছে %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/cs/email.json b/public/language/cs/email.json index 2702ddcc83..27a2f06198 100644 --- a/public/language/cs/email.json +++ b/public/language/cs/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Nová zpráva z chatu od %1", "notif.chat.cta": "Chcete-li pokračovat v konverzaci, klikněte zde.", "notif.chat.unsub.info": "Toto oznámení z chatu vám bylo zasláno, protože jste si to nastavili ve vašich odběrech.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Tento testovací email slouží k ověření, že mailer je správně nastaven. NodeBB.", "unsub.cta": "Chcete-li změnit tyto nastavení, klikněte zde.", "closing": "Díky!" diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 7583f801b7..d9d20cdf64 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -18,6 +18,7 @@ "username-taken": "Uživatelské jméno je již použito", "email-taken": "Email je již použit", "email-not-confirmed": "Vaše emailová adresa zatím nebyla potvrzena. Kliknutím zde svůj email potvrdíte.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Uživatelské jméno je příliš krátké", "username-too-long": "Uživatelské jméno je příliš dlouhé", "user-banned": "Uživatel byl zakázán", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "Nemůžete zakazovat ostatní administrátory!", - "invalid-image-type": "Neplatný typ obrázku", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Název skupiny je příliš krátký", "group-already-exists": "Skupina už exstuje", "group-name-change-not-allowed": "Změna názvu skupiny není povolena", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Tento příspěvek byl již vymazán", "post-already-restored": "Tento příspěvek byl již obnoven", "topic-already-deleted": "Toto téma bylo již vymazáno", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Chyba při registraci" + "registration-error": "Chyba při registraci", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/cs/global.json b/public/language/cs/global.json index 026a981f2d..8fa5d860bb 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -3,9 +3,10 @@ "search": "Hledat", "buttons.close": "Zavřít", "403.title": "Přístup odepřen", - "403.message": "K této stránce nemáte přístup. Zkuste se přihlásit?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Stránka nenalezena", - "404.message": "Tato stránka bohužel neexistuje. Vraťte se na domovskou stránku.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Neznámá chyba", "500.message": "Jejda, vypadá to, že se něco pokazilo.", "register": "Registrovat", @@ -26,6 +27,7 @@ "header.tags": "Tagy", "header.popular": "Populární", "header.users": "Uživatelé", + "header.groups": "Groups", "header.chats": "Chats", "header.notifications": "Oznámení", "header.search": "Hledat", @@ -73,5 +75,7 @@ "updated.title": "Fórum zaktualizováno", "updated.message": "Toto fórum bylo právě aktualizováno na poslední verzi. Klikněte zde a obnovte tuto stránku.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Vymazat vše" } \ No newline at end of file diff --git a/public/language/cs/groups.json b/public/language/cs/groups.json index b777659938..980b41e1b7 100644 --- a/public/language/cs/groups.json +++ b/public/language/cs/groups.json @@ -1,8 +1,21 @@ { "groups": "Skupiny", "view_group": "Prohlédnout skupinu", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "podrobnosti skupiny", "details.members": "Seznam členů", + "details.pending": "Pending Members", "details.has_no_posts": "Členové této skupiny dosud neodeslali ani jeden příspěvek.", - "details.latest_posts": "Nejnovější příspěvky" + "details.latest_posts": "Nejnovější příspěvky", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/cs/recent.json b/public/language/cs/recent.json index d769997c6f..9432ffeac8 100644 --- a/public/language/cs/recent.json +++ b/public/language/cs/recent.json @@ -5,5 +5,14 @@ "month": "Měsíc", "year": "Year", "alltime": "All Time", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "There are no recent topics.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/cs/search.json b/public/language/cs/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/cs/search.json +++ b/public/language/cs/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 89b3bea7bb..9b18a9ba03 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Žádné příspěvky nebyly vybrány!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Enter your topic title here...", + "composer.handle_placeholder": "Name", "composer.discard": "Discard", "composer.submit": "Submit", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/cs/user.json b/public/language/cs/user.json index 63cea57e2b..55c22b5b0b 100644 --- a/public/language/cs/user.json +++ b/public/language/cs/user.json @@ -2,6 +2,8 @@ "banned": "Banned", "offline": "Offline", "username": "Uživatelské jméno", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Potvrdit email", "delete_account": "Vymazat účet", @@ -16,6 +18,7 @@ "profile_views": "Zobrazení profilu", "reputation": "Reputace", "favourites": "Oblíbené", + "watched": "Watched", "followers": "Sledují ho", "following": "Sleduje", "signature": "Podpis", @@ -56,10 +59,12 @@ "digest_weekly": "Weekly", "digest_monthly": "Monthly", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Tohoto uživatele nikdo nesleduje :(", "follows_no_one": "Tento uživatel nikoho nesleduje :(", "has_no_posts": "This user didn't post anything yet.", "has_no_topics": "This user didn't post any topics yet.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Skrytý email", "hidden": "skrytý", "paginate_description": "Paginate topics and posts instead of using infinite scroll.", diff --git a/public/language/cs/users.json b/public/language/cs/users.json index b3bc661463..fe3e7cb9b7 100644 --- a/public/language/cs/users.json +++ b/public/language/cs/users.json @@ -5,5 +5,8 @@ "search": "Vyhledávat", "enter_username": "Zadej uživatelské jméno k hledání", "load_more": "Načíst další", - "users-found-search-took": "Nazelezeno: %1 uživetel(ů)! Vyhledání trvalo %2 ms." + "users-found-search-took": "Nazelezeno: %1 uživetel(ů)! Vyhledání trvalo %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/de/email.json b/public/language/de/email.json index 1b874b2276..408c511c84 100644 --- a/public/language/de/email.json +++ b/public/language/de/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Neue Chatnachricht von %1 erhalten", "notif.chat.cta": "Klicke hier, um die Unterhaltung fortzusetzen", "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.", "unsub.cta": "Klicke hier, um diese Einstellungen zu ändern.", "closing": "Danke!" diff --git a/public/language/de/error.json b/public/language/de/error.json index 23026bcba2..67cf44ca9c 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -18,6 +18,7 @@ "username-taken": "Der Benutzername ist bereits vergeben", "email-taken": "Die E-Mail-Adresse ist bereits vergeben", "email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Benutzername ist zu kurz", "username-too-long": "Der Benutzername ist zu lang", "user-banned": "Der Benutzer ist gesperrt", @@ -43,10 +44,13 @@ "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten", "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt", "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!", - "invalid-image-type": "Ungültiger Bildtyp", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Gruppenname zu kurz", "group-already-exists": "Gruppe existiert bereits", "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Dieser Beitrag ist bereits gelöscht worden", "post-already-restored": "Dieser Beitrag ist bereits wiederhergestellt worden", "topic-already-deleted": "Dieses Thema ist bereits gelöscht worden", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.", "not-enough-reputation-to-flag": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden", "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.", - "registration-error": "Registrierungsfehler" + "registration-error": "Registrierungsfehler", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/de/global.json b/public/language/de/global.json index 8dfcd1f009..3f4242ea16 100644 --- a/public/language/de/global.json +++ b/public/language/de/global.json @@ -3,9 +3,10 @@ "search": "Suche", "buttons.close": "Schließen", "403.title": "Zugriff verweigert", - "403.message": "Du bist nicht dazu berechtigt, diese Seite aufzurufen. Logge dich ein und versuche es erneut.", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": " Nicht Gefunden", - "404.message": "Die angeforderte Seite wurde nicht gefunden. Zurück zur Übersicht.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Interner Fehler.", "500.message": "Ups! Scheint als wäre etwas schief gelaufen!", "register": "Registrieren", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Beliebt", "header.users": "Benutzer", + "header.groups": "Groups", "header.chats": "Chats", "header.notifications": "Benachrichtigungen", "header.search": "Suche", @@ -73,5 +75,7 @@ "updated.title": "Forum aktualisiert", "updated.message": "Dieses Forum wurde gerade auf die neueste Version aktualisiert. Klicke hier, um die Seite neuzuladen.", "privacy": "Privatsphäre", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Alles löschen" } \ No newline at end of file diff --git a/public/language/de/groups.json b/public/language/de/groups.json index abd292d21c..28138f6426 100644 --- a/public/language/de/groups.json +++ b/public/language/de/groups.json @@ -1,8 +1,21 @@ { "groups": "Gruppen", "view_group": "Gruppe betrachten", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Gruppendetails", "details.members": "Mitgliederliste", + "details.pending": "Pending Members", "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.", - "details.latest_posts": "Aktuelle Beiträge" + "details.latest_posts": "Aktuelle Beiträge", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/de/recent.json b/public/language/de/recent.json index dfed232f64..86cdfa5713 100644 --- a/public/language/de/recent.json +++ b/public/language/de/recent.json @@ -5,5 +5,14 @@ "month": "Monat", "year": "Jahr", "alltime": "Gesamter Zeitraum", - "no_recent_topics": "Es gibt keine aktuellen Themen." + "no_recent_topics": "Es gibt keine aktuellen Themen.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/de/search.json b/public/language/de/search.json index 4141710537..3cdafdd487 100644 --- a/public/language/de/search.json +++ b/public/language/de/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)", - "no-matches": "Keine Beiträge gefunden" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/de/topic.json b/public/language/de/topic.json index d1f1bc7e88..23d6b0771e 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Keine Beiträge ausgewählt!", "fork_success": "Thema erfolgreich abgespalten! Klicke hier, um zum abgespalteten Thema zu gelangen.", "composer.title_placeholder": "Hier den Titel des Themas eingeben...", + "composer.handle_placeholder": "Name", "composer.discard": "Verwerfen", "composer.submit": "Absenden", "composer.replying_to": "Antworte auf %1", @@ -92,5 +93,6 @@ "sort_by": "Sortieren nach", "oldest_to_newest": "Älteste zuerst", "newest_to_oldest": "Neuster zuerst", - "most_votes": "Die meisten Stimmen" + "most_votes": "Die meisten Stimmen", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/de/user.json b/public/language/de/user.json index ea42845779..8e320bcb85 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -2,6 +2,8 @@ "banned": "Gebannt", "offline": "offline", "username": "Nutzername", + "joindate": "Join Date", + "postcount": "Post Count", "email": "E-Mail", "confirm_email": "E-Mail bestätigen", "delete_account": "Konto löschen", @@ -16,6 +18,7 @@ "profile_views": "Profilaufrufe", "reputation": "Reputation", "favourites": "Favoriten", + "watched": "Watched", "followers": "Folger", "following": "Folgt", "signature": "Signatur", @@ -56,10 +59,12 @@ "digest_weekly": "Wöchentlich", "digest_monthly": "Monatlich", "send_chat_notifications": "Sende eine E-Mail, wenn eine neue Chat-Nachricht eingeht und ich nicht online bin", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Dieser User hat noch keine Follower.", "follows_no_one": "Dieser User folgt noch niemandem :(", "has_no_posts": "Dieser Nutzer hat noch nichts gepostet.", "has_no_topics": "Dieser Nutzer hat noch keine Themen gepostet.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "E-Mail Adresse versteckt", "hidden": "versteckt", "paginate_description": "Themen und Beiträge auf Seiten aufteilen statt unendliches Scrollen verwenden.", diff --git a/public/language/de/users.json b/public/language/de/users.json index d00001e0f4..1e0bf2eb01 100644 --- a/public/language/de/users.json +++ b/public/language/de/users.json @@ -5,5 +5,8 @@ "search": "Suchen", "enter_username": "Benutzer durchsuchen", "load_more": "mehr laden", - "users-found-search-took": "%1 Benutzer gefunden! Die Suche dauerte %2 ms." + "users-found-search-took": "%1 Benutzer gefunden! Die Suche dauerte %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/el/email.json b/public/language/el/email.json index 7831ba8562..6563d675d5 100644 --- a/public/language/el/email.json +++ b/public/language/el/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Νέο μήνυμα συνομιλίας από τον/την %1", "notif.chat.cta": "Κάνε κλικ εδώ για να πας στην συνομιλία", "notif.chat.unsub.info": "Αυτή η ειδοποίηση για συνομιλία σου στάλθηκε λόγω των ρυθμίσεών σου. ", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Αυτό είναι ένα δοκιμαστικό email για να επιβεβαιώσουμε ότι ο emailer έχει στηθεί σωστά για το NodeBB.", "unsub.cta": "Κάνε κλικ εδώ για να αλλάξεις αυτές τις ρυθμίσεις", "closing": "Ευχαριστούμε!" diff --git a/public/language/el/error.json b/public/language/el/error.json index 1af21d0aad..ce1173a11d 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -18,6 +18,7 @@ "username-taken": "Το όνομα χρήστη είναι πιασμένο", "email-taken": "Το email είναι πιασμένο", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Το όνομα χρήστη είναι πολύ μικρό", "username-too-long": "Το όνομα χρήστη είναι πολύ μεγάλο", "user-banned": "Ο Χρήστης είναι αποκλεισμένος/η", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!", - "invalid-image-type": "Άκυρος τύπος εικόνας", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Το όνομα της ομάδας είναι πολύ μικρό", "group-already-exists": "Το όνομα της ομάδας υπάρχει ήδη", "group-name-change-not-allowed": "Αλλαγή του ονόματος της ομάδας δεν επιτρέπεται", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Δεν έχεις αρκετή φήμη για να καταψηφίσεις αυτή την δημοσίευση", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "Το NodeBB συνάντησε ένα πρόβλημα καθώς γινόταν η ανανέωση: \"%1\". Το NodeBB θα συνεχίσει να προσφέρει τα στοιχεία του χρήστη, αν και θα ήταν καλή ιδέα να επαναφέρεις ότι έκανες πριν την ανανέωση.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/el/global.json b/public/language/el/global.json index 9ec5c25a11..e7ce30b6a7 100644 --- a/public/language/el/global.json +++ b/public/language/el/global.json @@ -3,9 +3,10 @@ "search": "Αναζήτηση", "buttons.close": "Κλείσιμο", "403.title": "Δεν επιτρέπεται η πρόσβαση", - "403.message": "Φαίνεται πως βρέθηκες σε κάποια σελίδα στην οποία δεν έχεις πρόσβαση. Ίσως πρέπει να συνδεθείς;", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Δεν βρέθηκε", - "404.message": "Φαίνεται πως βρέθηκες σε κάποια σελίδα στην οποία δεν έχεις πρόσβαση. Επιστροφή στην κεντρική σελίδα.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Εσωτερικό σφάλμα.", "500.message": "Ουπς! Φαίνεται πως κάτι πήγε στραβά!", "register": "Εγγραφή", @@ -26,6 +27,7 @@ "header.tags": "Ετικέτες", "header.popular": "Δημοφιλή", "header.users": "Χρήστες", + "header.groups": "Groups", "header.chats": "Συνομιλίες", "header.notifications": "Ειδοποιήσεις", "header.search": "Αναζήτηση", @@ -73,5 +75,7 @@ "updated.title": "Το φόρουμ αναβαθμίστηκε", "updated.message": "Το φόρουμ μόλις αναβαθμίστηκε στην πιο πρόσφατη έκδοση. Κάνε κλικ εδώ για να ανανεώσεις την σελίδα.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/el/groups.json b/public/language/el/groups.json index b531e8ebe0..5fa5a25877 100644 --- a/public/language/el/groups.json +++ b/public/language/el/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "Προβολή Ομάδας", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Λεπτομέρειες Ομάδας", "details.members": "Λίστα Μελών", + "details.pending": "Pending Members", "details.has_no_posts": "Τα μέλη αυτής της ομάδας δεν έχουν δημοσιεύσει τίποτα.", - "details.latest_posts": "Τελευταίες δημοσιεύσεις." + "details.latest_posts": "Τελευταίες δημοσιεύσεις.", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/el/recent.json b/public/language/el/recent.json index 6ec70d2c53..d5ca1ec34f 100644 --- a/public/language/el/recent.json +++ b/public/language/el/recent.json @@ -5,5 +5,14 @@ "month": "Μήνας", "year": "Έτος", "alltime": "Όλο το Ιστορικό", - "no_recent_topics": "Δεν υπάρχουν πρόσφατα θέματα." + "no_recent_topics": "Δεν υπάρχουν πρόσφατα θέματα.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/el/search.json b/public/language/el/search.json index 38171d7953..fd5d9fa97e 100644 --- a/public/language/el/search.json +++ b/public/language/el/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 αποτελεσμα(τα) για \"%2\", (%3 δευτερόλεπτα)", - "no-matches": "Δεν βρέθηκαν δημοσιεύσεις" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/el/topic.json b/public/language/el/topic.json index 063f4ac2a0..c8df981fa3 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Δεν έχουν επιλεχθεί δημοσιεύσεις!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Εισαγωγή του τίτλου του θέματος εδώ...", + "composer.handle_placeholder": "Name", "composer.discard": "Πέταγμα", "composer.submit": "Υποβολή", "composer.replying_to": "Απάντηση στο %1", @@ -92,5 +93,6 @@ "sort_by": "Ταξινόμηση κατά", "oldest_to_newest": "Παλαιότερο προς Νεότερο", "newest_to_oldest": "Νεότερο προς Παλαιότερο", - "most_votes": "Περισσότερες ψήφοι" + "most_votes": "Περισσότερες ψήφοι", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/el/user.json b/public/language/el/user.json index 17206384d9..306604b44d 100644 --- a/public/language/el/user.json +++ b/public/language/el/user.json @@ -2,6 +2,8 @@ "banned": "Αποκλεισμένος/η", "offline": "Εκτός Σύνδεσης", "username": "Όνομα Χρήστη", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Emai", "confirm_email": "Επιβεβαίωση Email", "delete_account": "Διαγραφή Λογαριασμού", @@ -16,6 +18,7 @@ "profile_views": "Views του προφίλ", "reputation": "Φήμη", "favourites": "Αγαπημένα", + "watched": "Watched", "followers": "Ακόλουθοι", "following": "Ακολουθά", "signature": "Υπογραφή", @@ -56,10 +59,12 @@ "digest_weekly": "Εβδομαδιαίως", "digest_monthly": "Μηνιαία", "send_chat_notifications": "Αποστολή email αν μου έρθει μήνυμα συνομιλίας και δεν είμαι συνδεδεμένος", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Αυτός ο χρήστης δεν έχει κανέναν ακόλουθο :(", "follows_no_one": "Αυτός ο χρήστης δεν ακολουθεί κανέναν :(", "has_no_posts": "Αυτός ο χρήστης δεν έχει δημοσιεύσει τίποτα ακόμη.", "has_no_topics": "Αυτός ο χρήστης δεν έχει δημοσιεύσει κανένα θέμα ακόμη.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Κρυμμένο Emai", "hidden": "κρυμμένο", "paginate_description": "Σελιδοποίηση των θεμάτων και των δημοσιεύσεων αντί για χρήση άπειρου scroll.", diff --git a/public/language/el/users.json b/public/language/el/users.json index aa0c1479dd..7a668b12a8 100644 --- a/public/language/el/users.json +++ b/public/language/el/users.json @@ -5,5 +5,8 @@ "search": "Αναζήτηση", "enter_username": "Γράψε ένα όνομα χρήστη προς αναζήτηση", "load_more": "Φόρτωση περισσότερων", - "users-found-search-took": "%1 χρήστης(ες) βρέθηκαν! Η αναζήτηση πήρε %2 ms." + "users-found-search-took": "%1 χρήστης(ες) βρέθηκαν! Η αναζήτηση πήρε %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/en@pirate/email.json b/public/language/en@pirate/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/en@pirate/email.json +++ b/public/language/en@pirate/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json index 27de09631f..a40a628042 100644 --- a/public/language/en@pirate/error.json +++ b/public/language/en@pirate/error.json @@ -18,6 +18,7 @@ "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "You can't ban other admins!", - "invalid-image-type": "Invalid image type", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/en@pirate/global.json b/public/language/en@pirate/global.json index 98626005f5..f331b79472 100644 --- a/public/language/en@pirate/global.json +++ b/public/language/en@pirate/global.json @@ -3,9 +3,10 @@ "search": "Finderer", "buttons.close": "Shoot down", "403.title": "Not Enough Booty Power", - "403.message": "Ye seem to have stumbled upon a page that ye do not have access to. Perhaps ye give a go' loggin' in?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "T'ere be nut'in 'ere", - "404.message": "Ye seem to have stumbled upon a page that does not exist. Return to th' home page", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Broken beam.", "500.message": "Looks like we've got somethin' in th' sails.", "register": "Register", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Famous", "header.users": "Mates", + "header.groups": "Groups", "header.chats": "Yik-Yaks", "header.notifications": "Parrot Calls", "header.search": "Finderer", @@ -73,5 +75,7 @@ "updated.title": "Forum Updated", "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/en@pirate/groups.json b/public/language/en@pirate/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/en@pirate/groups.json +++ b/public/language/en@pirate/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/en@pirate/recent.json b/public/language/en@pirate/recent.json index bb4318cb39..065b6dc6a5 100644 --- a/public/language/en@pirate/recent.json +++ b/public/language/en@pirate/recent.json @@ -5,5 +5,14 @@ "month": "Month", "year": "Year", "alltime": "All Time", - "no_recent_topics": "There be no recent topics." + "no_recent_topics": "There be no recent topics.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/en@pirate/search.json b/public/language/en@pirate/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/en@pirate/search.json +++ b/public/language/en@pirate/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json index 058ba68d99..eb06a391c8 100644 --- a/public/language/en@pirate/topic.json +++ b/public/language/en@pirate/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "No posts selected!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Enter your topic title here...", + "composer.handle_placeholder": "Name", "composer.discard": "Discard", "composer.submit": "Submit", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json index 9d17d3fdc6..5fb6a30da2 100644 --- a/public/language/en@pirate/user.json +++ b/public/language/en@pirate/user.json @@ -2,6 +2,8 @@ "banned": "Blackmarked", "offline": "Asleep at the wheel", "username": "User Name", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Confirm Email", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "Profile views", "reputation": "Reputation", "favourites": "Favourites", + "watched": "Watched", "followers": "Followers", "following": "Following", "signature": "Signature", @@ -56,10 +59,12 @@ "digest_weekly": "Weekly", "digest_monthly": "Monthly", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "This user doesn't have any followers :(", "follows_no_one": "This user isn't following anyone :(", "has_no_posts": "This user didn't post anything yet.", "has_no_topics": "This user didn't post any topics yet.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Hidden", "hidden": "hidden", "paginate_description": "Paginate topics and posts instead of using infinite scroll.", diff --git a/public/language/en@pirate/users.json b/public/language/en@pirate/users.json index 58caf6e9cf..adbfee83cc 100644 --- a/public/language/en@pirate/users.json +++ b/public/language/en@pirate/users.json @@ -5,5 +5,8 @@ "search": "Search", "enter_username": "Gimme y'er handle", "load_more": "Load More", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/en_US/email.json b/public/language/en_US/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/en_US/email.json +++ b/public/language/en_US/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json index 27de09631f..a40a628042 100644 --- a/public/language/en_US/error.json +++ b/public/language/en_US/error.json @@ -18,6 +18,7 @@ "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "You can't ban other admins!", - "invalid-image-type": "Invalid image type", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/en_US/global.json b/public/language/en_US/global.json index 6e533e73be..6de9e8b364 100644 --- a/public/language/en_US/global.json +++ b/public/language/en_US/global.json @@ -3,9 +3,10 @@ "search": "Search", "buttons.close": "Close", "403.title": "Access Denied", - "403.message": "You seem to have stumbled upon a page that you do not have access to. Perhaps you should try logging in?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Not Found", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Internal error.", "500.message": "Oops! Looks like something went wrong!", "register": "Register", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Popular", "header.users": "Users", + "header.groups": "Groups", "header.chats": "Chats", "header.notifications": "Notifications", "header.search": "Search", @@ -73,5 +75,7 @@ "updated.title": "Forum Updated", "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/en_US/groups.json b/public/language/en_US/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/en_US/groups.json +++ b/public/language/en_US/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/en_US/recent.json b/public/language/en_US/recent.json index d683cce436..5e105ace78 100644 --- a/public/language/en_US/recent.json +++ b/public/language/en_US/recent.json @@ -5,5 +5,14 @@ "month": "Month", "year": "Year", "alltime": "All Time", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "There are no recent topics.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/en_US/search.json b/public/language/en_US/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/en_US/search.json +++ b/public/language/en_US/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json index f657ad4ef3..6a2e3d93c7 100644 --- a/public/language/en_US/topic.json +++ b/public/language/en_US/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "No posts selected!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Enter your topic title here...", + "composer.handle_placeholder": "Name", "composer.discard": "Discard", "composer.submit": "Submit", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json index 3ebf12c20b..825cc3acae 100644 --- a/public/language/en_US/user.json +++ b/public/language/en_US/user.json @@ -2,6 +2,8 @@ "banned": "Banned", "offline": "Offline", "username": "User Name", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Confirm Email", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "Profile views", "reputation": "Reputation", "favourites": "Favorites", + "watched": "Watched", "followers": "Followers", "following": "Following", "signature": "Signature", @@ -56,10 +59,12 @@ "digest_weekly": "Weekly", "digest_monthly": "Monthly", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "This user doesn't have any followers :(", "follows_no_one": "This user isn't following anyone :(", "has_no_posts": "This user didn't post anything yet.", "has_no_topics": "This user didn't post any topics yet.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Hidden", "hidden": "hidden", "paginate_description": "Paginate topics and posts instead of using infinite scroll.", diff --git a/public/language/en_US/users.json b/public/language/en_US/users.json index e12967eeda..a06aee2734 100644 --- a/public/language/en_US/users.json +++ b/public/language/en_US/users.json @@ -5,5 +5,8 @@ "search": "Search", "enter_username": "Enter a username to search", "load_more": "Load More", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/es/email.json b/public/language/es/email.json index 14e85c608c..cff3a5d025 100644 --- a/public/language/es/email.json +++ b/public/language/es/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Nuevo mensaje de chat recibido de %1", "notif.chat.cta": "Haz click aquí para continuar la conversación", "notif.chat.unsub.info": "Esta notificación de chat se te envió debido a tus ajustes de suscripción.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Este es un email de prueba para verificar que el envío de email está ajustado correctamente para tu NodeBB", "unsub.cta": "Haz click aquí para modificar los ajustes.", "closing": "¡Gracias!" diff --git a/public/language/es/error.json b/public/language/es/error.json index 67471699df..d656a309f6 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -10,58 +10,63 @@ "invalid-username": "Nombre de usuario no válido", "invalid-email": "Correo electrónico no válido", "invalid-title": "¡Título no válido!", - "invalid-user-data": "Datos de Usuario no válidos", + "invalid-user-data": "Datos de usuario no válidos", "invalid-password": "Contraseña no válida", "invalid-username-or-password": "Por favor especifica tanto un usuario como contraseña", "invalid-search-term": "Término de búsqueda inválido", "invalid-pagination-value": "Valor de paginación no válido.", - "username-taken": "Nombre de usuario ya escogido", - "email-taken": "El correo electrónico ya está escogido.", + "username-taken": "Nombre de usuario ocupado", + "email-taken": "Correo electrónico ocupado", "email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.", - "username-too-short": "El nombre de usuario es demasiado corto", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "username-too-short": "Nombre de usuario es demasiado corto", "username-too-long": "Nombre de usuario demasiado largo", - "user-banned": "Usuario expulsado", - "user-too-new": "Lo sentimos, es necesario que espere %1 segudos antes de que pueda hacer su primera publicación", + "user-banned": "Usuario baneado", + "user-too-new": "Lo sentimos, es necesario que esperes %1 segudos antes poder hacer tu primera publicación", "no-category": "La categoría no existe", "no-topic": "El tema no existe", "no-post": "La publicación no existe", "no-group": "El grupo no existe", "no-user": "El usuario no existe", "no-teaser": "El resumen no existe", - "no-privileges": "No tiene suficientes privilegios para realizar esta acción.", - "no-emailers-configured": "Ningún plugin para email fue cargado, así que no se pudo enviar email de prueba.", - "category-disabled": "Categoría deshabilitada.", - "topic-locked": "Tema bloqueado.", + "no-privileges": "No tienes suficientes privilegios para realizar esta acción.", + "no-emailers-configured": "No se ha cargado ningún plugin de email, así que no se pudo enviar el email de prueba.", + "category-disabled": "Categoría deshabilitada", + "topic-locked": "Tema bloqueado", "still-uploading": "Por favor, espera a que terminen las subidas.", "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caracteres.", "title-too-short": "Por favor introduzca un título más largo. Los títulos deben contener al menos %1 caracteres.", "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.", - "too-many-posts": "Solo puede publicar una vez cada %1 segundos - por favor espere antes de volver a publicar", - "too-many-posts-newbie": "Como nuevo usuario, usted solo puede publicar una vez cada %1 segundos hasta que haya ganada una reputación de %2 - por favor espere antes de volver a publicar", - "file-too-big": "El tamaño de fichero máximo es de %1 kbs - por favor cargue un fichero más pequeño", + "too-many-posts": "Solo puedes publicar una vez cada %1 segundos - por favor espere antes de volver a publicar", + "too-many-posts-newbie": "Como nuevo usuario, solo puedes publicar una vez cada %1 segundos hasta hayas ganado una reputación de %2 - por favor espere antes de volver a publicar", + "file-too-big": "El tamaño de fichero máximo es de %1 kbs - por favor, suba un fichero más pequeño", "cant-vote-self-post": "No puedes votar tus propios posts", "already-favourited": "Ya ha marcado esta publicación como favorita", "already-unfavourited": "Ya ha desmarcado esta publicación como favorita", - "cant-ban-other-admins": "No puedes expulsar a otros administradores!", - "invalid-image-type": "Tipo de imagen no válido.", + "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Nombre del grupo es demasiado corto.", "group-already-exists": "El grupo ya existe.", "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Este publicación ya ha sido borrada", "post-already-restored": "Esta publicación ya ha sido restaurada", "topic-already-deleted": "Este tema ya ha sido borrado", "topic-already-restored": "Este tema ya ha sido restaurado", "topic-thumbnails-are-disabled": "Las miniaturas de los temas están deshabilitadas.", - "invalid-file": "Archivo no válido.", + "invalid-file": "Archivo no válido", "uploads-are-disabled": "Las subidas están deshabilitadas.", "upload-error": "Error de subida: %1", - "signature-too-long": "Lo sentimos, su firma no puede ser más larga de %1 caracteres", - "cant-chat-with-yourself": "No puedes conversar contigo mismo!", - "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirle antes de que pueda charlar con ellos", + "signature-too-long": "Lo sentimos, pero tu firma no puede ser más larga de %1 caracteres.", + "cant-chat-with-yourself": "¡No puedes conversar contigo mismo!", + "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirte antes de que pueda charlar con ellos", "reputation-system-disabled": "El sistema de reputación está deshabilitado.", "downvoting-disabled": "La votación negativa está deshabilitada.", "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post", - "not-enough-reputation-to-flag": "No tiene suficiente reputación para poner una bandera a esta publicación", + "not-enough-reputation-to-flag": "No tiene suficiente reputación para poner reportar esta publicación", "reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.", - "registration-error": "Error de registro" + "registration-error": "Error de registro", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/es/global.json b/public/language/es/global.json index 36f7d9eff4..b452d2a26f 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -3,44 +3,46 @@ "search": "Buscar", "buttons.close": "Cerrar", "403.title": "Acceso denegado", - "403.message": "Al parecer no tienes premisos necesarios para estar en este lugar. ¿Tal vez quieras intentar conectarte?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "No encontrado", - "404.message": "Al parecer lo que estas buscando no existe. Volver a la página principal.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Error Interno.", "500.message": "¡Ooops! ¡Parece que algo salió mal! No te preocupes, ¡nuestros simios hiperinteligentes lo solucionarán!", "register": "Registrarse", "login": "Conectarse", - "please_log_in": "Por favor conectate.", + "please_log_in": "Por favor, identifíquese.", "logout": "Salir", - "posting_restriction_info": "Para publicar debes ser miembro, registrate o conectate.", - "welcome_back": "Bienvenido de nuevo!", - "you_have_successfully_logged_in": "Te has conectado!", - "save_changes": "Guardar Cambios", + "posting_restriction_info": "Publicar requiere ser usuario registrado, conéctate o regístrate.", + "welcome_back": "¡Bienvenido de nuevo!", + "you_have_successfully_logged_in": "Identificado satisfactoriamente", + "save_changes": "Guardar cambios", "close": "Cerrar", "pagination": "Paginación", "pagination.out_of": "%1 de %2", - "pagination.enter_index": "Ingrese índice", + "pagination.enter_index": "Introduzca el número", "header.admin": "Administración", "header.recent": "Recientes", "header.unread": "No leídos", "header.tags": "Etiquetas", "header.popular": "Popular", - "header.users": "Miembros", + "header.users": "Usuarios", + "header.groups": "Groups", "header.chats": "Chats", "header.notifications": "Notificaciones", "header.search": "Buscar", "header.profile": "Perfil", - "notifications.loading": "Cargando Notificaciones", - "chats.loading": "Cargando Chats", + "notifications.loading": "Cargando notificaciones", + "chats.loading": "Cargando chats", "motd.welcome": "Bienvenido a NodeBB, la plataforma de debate del el futuro.", - "previouspage": "Página Anterior", - "nextpage": "Siguente Página", - "alert.success": "Éxito!", + "previouspage": "Página anterior", + "nextpage": "Página siguiente", + "alert.success": "¡Éxito!", "alert.error": "Error", "alert.banned": "Baneado", - "alert.banned.message": "Acabas de ser expulsado, a continuación tu sesión se desconectará.", + "alert.banned.message": "Has sido expulsado y se procederá a tu desconexión.", "alert.unfollow": "Ya no estás siguiendo a %1!", - "alert.follow": "Estás siguiendo a %1!", + "alert.follow": "Ahora sigues a %1!", "online": "Conectado", "users": "Usuarios", "topics": "Temas", @@ -49,29 +51,31 @@ "reputation": "Reputación", "read_more": "leer más", "posted_ago_by_guest": "publicado %1 por Invitado", - "posted_ago_by": "publicado hace %1 por %2", - "posted_ago": "publicado hace %1", + "posted_ago_by": "publicado %1 por %2", + "posted_ago": "publicado %1", "posted_in_ago_by_guest": "publicado en %1 %2 por", - "posted_in_ago_by": "publicado en %1 hace %2 por %3", - "posted_in_ago": "publicado en %1 hace %2", - "replied_ago": "contestado hace %1", + "posted_in_ago_by": "publicado en %1 %2 por %3", + "posted_in_ago": "publicado en %1 %2", + "replied_ago": "contestado %1", "user_posted_ago": "%1 publicó %2", "guest_posted_ago": "Invitado publicó %1", - "last_edited_by_ago": "última edición por %1 el %2", + "last_edited_by_ago": "última edición por %1 %2", "norecentposts": "No hay publicaciones recientes", "norecenttopics": "No hay temas recientes", - "recentposts": "Publicaciones Recientes", - "recentips": "Conexions recientes de estas IP's", - "away": "No disponible", + "recentposts": "Publicaciones recientes", + "recentips": "IP's conectadas recientemente", + "away": "Ausente", "dnd": "No molestar", "invisible": "Invisible", "offline": "Desconectado", "email": "Email", - "language": "Lenguaje", + "language": "Idioma", "guest": "Invitado", "guests": "Invitados", "updated.title": "Foro actualizado", "updated.message": "El foro acaba de ser actualizado a la última versión. Haz click aquí para refrescar la página.", "privacy": "Privacidad", - "delete_all": "Borrar todo" + "follow": "Follow", + "unfollow": "Unfollow", + "delete_all": "Eliminar todo" } \ No newline at end of file diff --git a/public/language/es/groups.json b/public/language/es/groups.json index 6f253f1dfb..92be20f80a 100644 --- a/public/language/es/groups.json +++ b/public/language/es/groups.json @@ -1,8 +1,21 @@ { "groups": "Grupos", "view_group": "Ver Grupo", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Detalles de Grupo", "details.members": "Lista de Miembros", + "details.pending": "Pending Members", "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.", - "details.latest_posts": "Últimas Publicaciones" + "details.latest_posts": "Últimas Publicaciones", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index f28a53f4a8..36cc975006 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -3,25 +3,25 @@ "no_notifs": "No tiene nuevas notificaciones", "see_all": "Ver todas las notificaciones", "back_to_home": "Volver a %1", - "outgoing_link": "Enlace Externo", - "outgoing_link_message": "Ahora estás saliendo %1.", + "outgoing_link": "Enlace externo", + "outgoing_link_message": "Ahora estás saliendo de %1.", "continue_to": "Continuar a %1", "return_to": "Regresar a %1", - "new_notification": "Nueva Notificación", + "new_notification": "Nueva notificación", "you_have_unread_notifications": "Tienes notificaciones sin leer.", "new_message_from": "Nuevo mensaje de %1", - "upvoted_your_post_in": "%1 ha votado como relevante tu respuesta en %2.", - "moved_your_post": "%1 ha movido su publicación.", + "upvoted_your_post_in": "%1 ha votado positivamente tu respuesta en %2.", + "moved_your_post": "%1 ha movido su mensaje.", "moved_your_topic": "%1 ha movido su tema.", "favourited_your_post_in": "%1 ha marcado como favorito su publicación en %2.", - "user_flagged_post_in": "%1 ha marcado como indebida una respuesta en %2", - "user_posted_to": "%1 ha publicado una respuesta a: %2", + "user_flagged_post_in": "%1 ha reportado una respuesta en %2", + "user_posted_to": "%1 ha respondido a: %2", "user_posted_topic": "%1 ha publicado un nuevo tema: %2", "user_mentioned_you_in": "%1 te mencionó en %2", "user_started_following_you": "%1 comenzó a seguirte.", "email-confirmed": "Correo electrónico confirmado", "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.", - "email-confirm-error": "Un error ocurrió...", - "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró.", + "email-confirm-error": "Ha ocurrido un error...", + "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró...", "email-confirm-sent": "Correo de confirmación enviado." } \ No newline at end of file diff --git a/public/language/es/pages.json b/public/language/es/pages.json index 1d5d38342c..27d9ca8f67 100644 --- a/public/language/es/pages.json +++ b/public/language/es/pages.json @@ -1,18 +1,18 @@ { "home": "Inicio", - "unread": "Temas No Leídos", - "popular": "Temas Populares", - "recent": "Temas Recientes", - "users": "Usuarios Registrado", + "unread": "Temas no leídos", + "popular": "Temas populares", + "recent": "Temas recientes", + "users": "Usuarios registrados", "notifications": "Notificaciones", "tags": "Temas etiquetados bajo \"%1\"", "user.edit": "Editando \"%1\"", "user.following": "Gente que sigue %1 ", "user.followers": "Seguidores de %1", - "user.posts": "Posteos de %1", + "user.posts": "Mensajes de %1", "user.topics": "Temas creados por %1", "user.favourites": "Publicaciones favoritas de %1 ", - "user.settings": "Preferencias del Usuario", + "user.settings": "Preferencias de usuario", "maintenance.text": "%1 está en mantenimiento actualmente. Por favor vuelva en otro momento.", - "maintenance.messageIntro": "Adicionalmente, el administrador ha dejado este mensaje:" + "maintenance.messageIntro": "Adicionalmente, la administración ha dejado este mensaje:" } \ No newline at end of file diff --git a/public/language/es/recent.json b/public/language/es/recent.json index e0188789af..6c8600afec 100644 --- a/public/language/es/recent.json +++ b/public/language/es/recent.json @@ -5,5 +5,14 @@ "month": "Mes", "year": "Año", "alltime": "Siempre", - "no_recent_topics": "No hay publicaciones recientes." + "no_recent_topics": "No hay publicaciones recientes.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/es/search.json b/public/language/es/search.json index 5cd357b2e9..add13e50c1 100644 --- a/public/language/es/search.json +++ b/public/language/es/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 resuldado(s) coinciden con \"%2\". (%3 segundos)", - "no-matches": "No se encontraron publicaciones" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/es/tags.json b/public/language/es/tags.json index ba43b1a939..2b41cc48c5 100644 --- a/public/language/es/tags.json +++ b/public/language/es/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "No hay temas con esta etiqueta.", "tags": "Etiquetas", - "enter_tags_here": "Introduce las etiquetas aquí. Pulsa intro desde de cada una.", - "enter_tags_here_short": "Introduzca etiquetas...", + "enter_tags_here": "Introduce las etiquetas aquí. Pulsa Intro después de introducir cada una.", + "enter_tags_here_short": "Introduzca las etiquetas...", "no_tags": "Aún no hay etiquetas." } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index 2dd31c13d2..30563b67ae 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -2,7 +2,7 @@ "topic": "Tema", "topic_id": "ID de Tema", "topic_id_placeholder": "Introducir ID del tema", - "no_topics_found": "No se encontraron temas!", + "no_topics_found": "¡No se encontraron temas!", "no_posts_found": "¡No se encontraron publicaciones!", "post_is_deleted": "¡Esta publicación está eliminada!", "profile": "Perfil", @@ -17,72 +17,73 @@ "purge": "Purgar", "restore": "Restaurar", "move": "Mover", - "fork": "Bifurcar", + "fork": "Dividir", "link": "Link", "share": "Compartir", "tools": "Herramientas", "flag": "Reportar", "locked": "Cerrado", "bookmark_instructions": "Haz click aquí para volver al último post que viste o ciérralo para ocultarlo.", - "flag_title": "Reportar esta publicación a los moderadores", - "flag_confirm": "¿Estás seguro de que quieres marcar como indebido este mensaje?", - "flag_success": "Este mensaje ha sido marcado para la moderación.", + "flag_title": "Reportar este mensaje", + "flag_confirm": "¿Estás seguro de que quieres reportar este mensaje?", + "flag_success": "Este mensaje ha sido reportado para moderación.", "deleted_message": "Este tema ha sido borrado. Solo los usuarios que tengan privilegios de administración de temas pueden verlo.", "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.", "not_following_topic.message": "No recibiras notificaciones de este tema.", - "login_to_subscribe": "Por favor, conectate para subscribirte a este tema.", + "login_to_subscribe": "Por favor, conéctate para subscribirte a este tema.", "markAsUnreadForAll.success": "Publicación marcada como no leída para todos.", "watch": "Seguir", "unwatch": "Dejar de seguir", "watch.title": "Serás notificado cuando haya nuevas respuestas en este tema", "unwatch.title": "Dejar de seguir este tema", "share_this_post": "Compartir este post", - "thread_tools.title": "Herramientas para Temas", + "thread_tools.title": "Herramientas del tema", "thread_tools.markAsUnreadForAll": "Marcar como no leído", - "thread_tools.pin": "Tema Importante", - "thread_tools.unpin": "Quitar Importante", - "thread_tools.lock": "Cerrar Tema", - "thread_tools.unlock": "Abrir Tema", - "thread_tools.move": "Mover Tema", + "thread_tools.pin": "Adherir tema", + "thread_tools.unpin": "Despegar tema", + "thread_tools.lock": "Cerrar tema", + "thread_tools.unlock": "Reabrir tema", + "thread_tools.move": "Mover tema", "thread_tools.move_all": "Mover todo", - "thread_tools.fork": "Bifurcar Tema", - "thread_tools.delete": "Borrar Tema", - "thread_tools.delete_confirm": "¿Está seguro que desea eliminar este tema?", - "thread_tools.restore": "Restaurar Tema", - "thread_tools.restore_confirm": "¿Está seguro que desea restaurar este tema?", - "thread_tools.purge": "Purgar publicación", + "thread_tools.fork": "Dividir tema", + "thread_tools.delete": "Borrar tema", + "thread_tools.delete_confirm": "¿Estás seguro que deseas eliminar este tema?", + "thread_tools.restore": "Restaurar tema", + "thread_tools.restore_confirm": "¿Estás seguro que deseas restaurar este tema?", + "thread_tools.purge": "Purgar tema", "thread_tools.purge_confirm": "¿Está seguro que desea eliminar definitivamente (purgar) este tema?", "topic_move_success": "El tema ha sido movido correctamente a %1", "post_delete_confirm": "¿Estás seguro de que quieres eliminar esta respuesta?", "post_restore_confirm": "¿Estás seguro de que quieres restaurar esta respuesta?", - "post_purge_confirm": "Estás seguro de que quieres limpiar esta publicación?", - "load_categories": "Cargando Categorías", - "disabled_categories_note": "Las categorías deshabilitadas estan en gris", + "post_purge_confirm": "¡Estás seguro de que quieres purgar esta publicación?", + "load_categories": "Cargando categorías", + "disabled_categories_note": "Las categorías deshabilitadas están en gris", "confirm_move": "Mover", - "confirm_fork": "Bifurcar", + "confirm_fork": "Dividir", "favourite": "Favorito", "favourites": "Favoritos", - "favourites.has_no_favourites": "No tienes favoritos, puedes agregar alguno y volver a verlos aquí!", + "favourites.has_no_favourites": "No tienes favoritos, ¡puedes agregar alguno y volver a verlos aquí!", "loading_more_posts": "Cargando más publicaciones", - "move_topic": "Mover Tema", - "move_topics": "Mover Temas", - "move_post": "Mover Publicación", + "move_topic": "Mover tema", + "move_topics": "Mover temas", + "move_post": "Mover publicación", "post_moved": "¡Publicación movida correctamente!", - "fork_topic": "Bifurcar Tema", + "fork_topic": "Dividir tema", "topic_will_be_moved_to": "Este tema será movido a la categoría", - "fork_topic_instruction": "Click en las publicaciones que quieres bifurcar", - "fork_no_pids": "¡No seleccionaste publicaciones!", - "fork_success": "¡Se ha creado un nuevo tema a partir del tema padre! Haga click aquí para ir al nuevo tema.", - "composer.title_placeholder": "Ingresa el titulo de tu tema", + "fork_topic_instruction": "Pulsa en los mensajes que quieres dividir", + "fork_no_pids": "¡No has seleccionado ningún mensaje!", + "fork_success": "¡Se ha creado un nuevo tema a partir del original! Haz click aquí para ir al nuevo tema.", + "composer.title_placeholder": "Ingresa el título de tu tema...", + "composer.handle_placeholder": "Name", "composer.discard": "Descartar", "composer.submit": "Enviar", "composer.replying_to": "En respuesta a %1", - "composer.new_topic": "Nuevo Tema", + "composer.new_topic": "Nuevo tema", "composer.uploading": "subiendo...", - "composer.thumb_url_label": "Agregar imagen destacada a este tema", + "composer.thumb_url_label": "Agrega una URL de miniatura para el hilo", "composer.thumb_title": "Agregar miniatura a este tema", - "composer.thumb_url_placeholder": "http://ejemplo.com/mini.png", - "composer.thumb_file_label": "Subir un fichero", + "composer.thumb_url_placeholder": "http://example.com/thumb.png", + "composer.thumb_file_label": "O subir un fichero", "composer.thumb_remove": "Limpiar campos", "composer.drag_and_drop_images": "Arrastra las imagenes aqui", "more_users_and_guests": "%1 usuario(s) y %2 invitado(s) más", @@ -92,5 +93,6 @@ "sort_by": "Ordenar por", "oldest_to_newest": "Más antiguo a más nuevo", "newest_to_oldest": "Más nuevo a más antiguo", - "most_votes": "Mayor número de votos" + "most_votes": "Mayor número de votos", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/es/user.json b/public/language/es/user.json index b46c82cccd..23976718fb 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -2,12 +2,14 @@ "banned": "Baneado", "offline": "Desconectado", "username": "Nombre de usuario", - "email": "Correo Electrónico", - "confirm_email": "Repetir correo electrónico", + "joindate": "Join Date", + "postcount": "Post Count", + "email": "Correo electrónico", + "confirm_email": "Confirmar correo electrónico", "delete_account": "Eliminar cuenta", - "delete_account_confirm": "Estás seguro de que quieres eliminar tu cuenta?
    Esta acción es irreversible y no podrás recuperar tus datos

    Introduce tu nombre de usuario para confirmar la eliminación de la cuenta.", + "delete_account_confirm": "¿Estás seguro de que quieres eliminar tu cuenta?
    Esta acción es irreversible y no podrás recuperar ninguno de tus datos.

    Introduce tu nombre de usuario para confirmar la eliminación de la cuenta.", "fullname": "Nombre completo", - "website": "Sitio Web", + "website": "Sitio web", "location": "Ubicación", "age": "Edad", "joined": "Registrado", @@ -16,60 +18,63 @@ "profile_views": "Visitas", "reputation": "Reputación", "favourites": "Favoritos", + "watched": "Watched", "followers": "Seguidores", - "following": "Sigue", + "following": "Siguiendo", "signature": "Firma", "gravatar": "Gravatar", "birthday": "Cumpleaños", - "chat": "Chat!", + "chat": "Chat", "follow": "Seguir", - "unfollow": "Dejar de Seguir", - "profile_update_success": "El perfil ha sido actualizado correctamente!", - "change_picture": "Cambiar Foto", + "unfollow": "Dejar de seguir", + "profile_update_success": "¡El perfil ha sido actualizado correctamente!", + "change_picture": "Cambiar imágen", "edit": "Editar", - "uploaded_picture": "Fotos subidas", - "upload_new_picture": "Subir Nueva Foto", - "upload_new_picture_from_url": "Cargar Nueva Imagen desde una URL", + "uploaded_picture": "Imágen subida", + "upload_new_picture": "Subir nueva imágen", + "upload_new_picture_from_url": "Cargar imágen desde una URL", "current_password": "Contraseña actual", - "change_password": "Cambiar Contraseña", - "change_password_error": "Contraseña no válida!", - "change_password_error_wrong_current": "Su contraseña actual no es correcta!", - "change_password_error_length": "La contraseña es demasiado corta!", - "change_password_error_match": "Las contraseñas deben coincidir!", + "change_password": "Cambiar contraseña", + "change_password_error": "¡Contraseña no válida!", + "change_password_error_wrong_current": "¡Su contraseña actual no es correcta!", + "change_password_error_length": "¡La contraseña es demasiado corta!", + "change_password_error_match": "¡Las contraseñas deben coincidir!", "change_password_error_privileges": "No tienes los permisos suficientes para cambiar esta contraseña.", - "change_password_success": "La contraseña ha sido actualizada correctamente!", - "confirm_password": "Confirmar Contraseña", + "change_password_success": "¡Tu contraseña ha sido actualizada!", + "confirm_password": "Confirmar contraseña", "password": "Contraseña", - "username_taken_workaround": "El nombre de usuario que has solicitada ya está escogido, por tanto lo hemos alterado ligeramente. Ahora eres conocido como %1", + "username_taken_workaround": "El nombre de usuario que has solicitada ya está siendo usado, por tanto lo hemos alterado ligeramente. Ahora eres conocido como %1.", "upload_picture": "Subir foto", "upload_a_picture": "Subir una foto", "image_spec": "Sólo puedes subir imágenes en formato PNG, JPG o GIF.", "max": "máx.", "settings": "Opciones", - "show_email": "Mostrar mi Correo electrónico", - "show_fullname": "Mostrar Mi Nombre Completo", - "restrict_chats": "Permitir mensajes de chat sólo de usuarios a los que sigo", - "digest_label": "Suscribirse a Resumen", + "show_email": "Mostrar mi correo electrónico", + "show_fullname": "Mostrar mi nombre completo", + "restrict_chats": "Solo permitir mensajes de chat de usuarios a los que sigo", + "digest_label": "Suscribirse al resumen", "digest_description": "Suscribirse a actualizaciones por correo electrónico a este foro (nuevas notificaciones y temas) de acuerdo a una recurrencia definida", "digest_off": "Apagado", "digest_daily": "Diariamente", "digest_weekly": "Semanalmente", "digest_monthly": "Mensualmente", - "send_chat_notifications": "Envía un correo electrónico si recibes un mensaje de chat cuando no estás en línea.", - "has_no_follower": "Este miembro no tiene seguidores. :(", - "follows_no_one": "Este miembro no sigue a nadie. :(", + "send_chat_notifications": "Enviar un email si recibo un mensaje de chat cuando no esté en línea.", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "has_no_follower": "Este usuario no tiene seguidores :(", + "follows_no_one": "Este miembro no sigue a nadie :(", "has_no_posts": "Este usuario aún no ha publicado nada.", "has_no_topics": "Este usuario aún no ha publicado nada.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Correo electrónico oculto", "hidden": "oculto", - "paginate_description": "La paginación de los temas no es por página, ya que tiene scroll infinito.", + "paginate_description": "Paginar hilos y mensajes en lugar de usar desplazamiento infinito.", "topics_per_page": "Temas por página", "posts_per_page": "Post por página", - "notification_sounds": "Reproducir un sonido al recibir una notificación", + "notification_sounds": "Reproducir un sonido al recibir una notificación.", "browsing": "Preferencias de navegación.", - "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña?", - "enable_topic_searching": "Activar la búsqueda \"In-Topic\"", + "open_links_in_new_tab": "¿Abrir los enlaces externos en una nueva pestaña?", + "enable_topic_searching": "Activar la búsqueda \"in-topic\"", "topic_search_help": "Si está activada, la búsqueda 'in-topic' invalidará el comportamiento por defecto del navegador de buscar sólo en la página mostrada y le permitirá entonces buscar en el tema al completo, en vez de hacer una búsqueda únicamente sobre el contenido de la pantalla.", - "follow_topics_you_reply_to": "Seguir publicaciones en las que respondes.", + "follow_topics_you_reply_to": "Seguir los temas en las que respondes.", "follow_topics_you_create": "Seguir publicaciones que creas." } \ No newline at end of file diff --git a/public/language/es/users.json b/public/language/es/users.json index e92d9ca48a..18b783a6c1 100644 --- a/public/language/es/users.json +++ b/public/language/es/users.json @@ -5,5 +5,8 @@ "search": "Buscar", "enter_username": "Ingresa el nombre de usuario que quieres buscar", "load_more": "Cargar más", - "users-found-search-took": "¡%1 usuario(s) encontrados! La búsqueda tardó %2 ms." + "users-found-search-took": "¡%1 usuario(s) encontrados! La búsqueda tardó %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/et/email.json b/public/language/et/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/et/email.json +++ b/public/language/et/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/et/error.json b/public/language/et/error.json index 8a3b6f0c56..0cbb8ea85f 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -18,6 +18,7 @@ "username-taken": "Kasutajanimi on juba võetud", "email-taken": "Email on võetud", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Kasutajanimi on liiga lühike", "username-too-long": "Username too long", "user-banned": "Kasutaja bannitud", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!", - "invalid-image-type": "Vigane pildi formaat", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Grupi nimi liiga lühike", "group-already-exists": "Grupp juba eksisteerib", "group-name-change-not-allowed": "Grupi nimevahetus ei ole lubatud", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/et/global.json b/public/language/et/global.json index 80f06373ad..5e14fb2623 100644 --- a/public/language/et/global.json +++ b/public/language/et/global.json @@ -3,9 +3,10 @@ "search": "Otsi", "buttons.close": "Sulge", "403.title": "Ligipääs puudub", - "403.message": "Tundub, et sul pole piisvalt õigusi selle lehe vaatamiseks. Äkki peaksid sisse logima?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Ei leitud", - "404.message": "Tundub, et lehte mida otsid, ei eksisteeri. Mine tagasi avalehele.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Süsteemi viga", "500.message": "Oih! Midagi läks valesti!", "register": "Registreeri", @@ -26,6 +27,7 @@ "header.tags": "Märksõnad", "header.popular": "Populaarne", "header.users": "Kasutajad", + "header.groups": "Groups", "header.chats": "Vestlused", "header.notifications": "Teated", "header.search": "Otsi", @@ -73,5 +75,7 @@ "updated.title": "Foorum on uuendatud", "updated.message": "See foorum uuendati just kõige uuemale versioonile. Vajuta siia et värskendada veebilehte.", "privacy": "Privaatsus", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Kustuta kõik" } \ No newline at end of file diff --git a/public/language/et/groups.json b/public/language/et/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/et/groups.json +++ b/public/language/et/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/et/recent.json b/public/language/et/recent.json index 4de6812ea2..4c35d7484b 100644 --- a/public/language/et/recent.json +++ b/public/language/et/recent.json @@ -5,5 +5,14 @@ "month": "Kuu", "year": "Aasta", "alltime": "Kogu aja vältel", - "no_recent_topics": "Hetkel ei ole hiljutisi teemasid." + "no_recent_topics": "Hetkel ei ole hiljutisi teemasid.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/et/search.json b/public/language/et/search.json index adc6fdbaf6..840538a793 100644 --- a/public/language/et/search.json +++ b/public/language/et/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 tulemus(t) mis vastavad otsingule \"%2\", (%3 sekundit)", - "no-matches": "Postitusi ei leitud" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/et/topic.json b/public/language/et/topic.json index 629ea945a2..2fdc0d8bf0 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Sa ei ole postitusi valinud!", "fork_success": "Edukalt ''forkisid'' teema! Vajuta siia, et vaadata loodud teemat.", "composer.title_placeholder": "Sisesta teema pealkiri siia...", + "composer.handle_placeholder": "Name", "composer.discard": "Katkesta", "composer.submit": "Postita", "composer.replying_to": "Vastad %1'le", @@ -92,5 +93,6 @@ "sort_by": "Sorteeri", "oldest_to_newest": "Vanematest uuemateni", "newest_to_oldest": "Uuematest vanemateni", - "most_votes": "Kõige rohkem hääli" + "most_votes": "Kõige rohkem hääli", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/et/user.json b/public/language/et/user.json index 0e171d62ff..ebf69619dc 100644 --- a/public/language/et/user.json +++ b/public/language/et/user.json @@ -2,6 +2,8 @@ "banned": "Banned", "offline": "Väljas", "username": "Kasutajanimi", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Kinnita email", "delete_account": "Kustuta kasutaja", @@ -16,6 +18,7 @@ "profile_views": "Vaatamisi", "reputation": "Reputatsioon", "favourites": "Lemmikud", + "watched": "Watched", "followers": "Jälgijad", "following": "Jälgimised", "signature": "Allkiri", @@ -56,10 +59,12 @@ "digest_weekly": "Iga nädal", "digest_monthly": "Iga kuu", "send_chat_notifications": "Saada mulle email kui mulle saabub uus sõnum ja ma ei ole antud hetkel online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Sellel kasutajal pole ühtegi jälgijat :(", "follows_no_one": "See kasutaja ei jälgi kedagi :(", "has_no_posts": "See kasutaja pole midagi postitanud veel.", "has_no_topics": "See kasutaja pole vele ühtegi teemat postitanud.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Peidetud email", "hidden": "peidetud", "paginate_description": "Nummerda leheküljed ja postitused ning ära kasuta ''lõputut scrolli''.", diff --git a/public/language/et/users.json b/public/language/et/users.json index c56e4f1e63..4782d131f5 100644 --- a/public/language/et/users.json +++ b/public/language/et/users.json @@ -5,5 +5,8 @@ "search": "Otsi", "enter_username": "Sisesta kasutajanimi, keda soovid otsida", "load_more": "Lae veel", - "users-found-search-took": "%1kasutaja(t) leiti! Otsing kestis %2 ms." + "users-found-search-took": "%1kasutaja(t) leiti! Otsing kestis %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/fa_IR/email.json b/public/language/fa_IR/email.json index 8e5bc5c20c..79cf1e91cf 100644 --- a/public/language/fa_IR/email.json +++ b/public/language/fa_IR/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "برای ادامه‌ی گفتگو اینجا کلیک کنید", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "برای ویرایش آن تنظیمات اینجا کلیک کنید", "closing": "سپاس!" diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index 3de8ab77e1..8657d58d7d 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -18,6 +18,7 @@ "username-taken": "این نام کاربری گرفته شده است.", "email-taken": "این رایانامه گرفته شده است.", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "نام کاربری خیلی کوتاه است.", "username-too-long": "Username too long", "user-banned": "کاربر محروم شد.", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!", - "invalid-image-type": "نوع تصویر نامعتبر است.", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "نام گروه خیلی کوتاه است.", "group-already-exists": "این گروه از پیش وجود دارد.", "group-name-change-not-allowed": "تغیر نام گروه نیاز به دسترسی دارد.", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید.", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/fa_IR/global.json b/public/language/fa_IR/global.json index fe840a8495..6ef5ffe217 100644 --- a/public/language/fa_IR/global.json +++ b/public/language/fa_IR/global.json @@ -3,9 +3,10 @@ "search": "جستجو", "buttons.close": "بستن", "403.title": "دسترسی ندارید", - "403.message": "شما برگه‌ای را فراخوانده‌اید که دسترسی به آن ندارید. شاید باید به درون بیایید؟", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "یافت نشد", - "404.message": "شما برگه‌ای را فراخوانده‌اید که وجود ندارد. به برگهٔ خانه برگردید.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "خطای درونی.", "500.message": "اوه! گویا اشتباهی رخ داده!", "register": "نام‌نویسی", @@ -26,6 +27,7 @@ "header.tags": "برچسب‌ها", "header.popular": "دوست‌داشتنی‌ها", "header.users": "کاربران", + "header.groups": "Groups", "header.chats": "گفتگوها", "header.notifications": "آگاه‌سازی‌ها", "header.search": "جستجو", @@ -73,5 +75,7 @@ "updated.title": "انجمن بروزرسانی شد", "updated.message": "این انجمن به آخرین نسخه بروزرسانی شد. برای بارگزاری مجدد صفحه اینجا کلیک کنید.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/fa_IR/groups.json b/public/language/fa_IR/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/fa_IR/groups.json +++ b/public/language/fa_IR/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/fa_IR/recent.json b/public/language/fa_IR/recent.json index 5a07722464..19fff6a7a7 100644 --- a/public/language/fa_IR/recent.json +++ b/public/language/fa_IR/recent.json @@ -5,5 +5,14 @@ "month": "ماه", "year": "سال", "alltime": "All Time", - "no_recent_topics": "There are no recent topics." + "no_recent_topics": "There are no recent topics.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/fa_IR/search.json b/public/language/fa_IR/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/fa_IR/search.json +++ b/public/language/fa_IR/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json index 8026773ca1..793af1e7cb 100644 --- a/public/language/fa_IR/topic.json +++ b/public/language/fa_IR/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "هیچ دیدگاهی انتخاب نشده!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "سرنویس جستارتان را اینجا بنویسید...", + "composer.handle_placeholder": "Name", "composer.discard": "دور بیانداز", "composer.submit": "بفرست", "composer.replying_to": "پاسخ به %1", @@ -92,5 +93,6 @@ "sort_by": "مرتب‌سازی بر اساس", "oldest_to_newest": "قدیمی‌ترین به جدید‌ترین", "newest_to_oldest": "جدید‌ترین به قدیمی‌ترین", - "most_votes": "بیشترین رای‌ها" + "most_votes": "بیشترین رای‌ها", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json index 799f5a71ae..0b2a48667f 100644 --- a/public/language/fa_IR/user.json +++ b/public/language/fa_IR/user.json @@ -2,6 +2,8 @@ "banned": "مسدود", "offline": "آفلاین", "username": "نام کاربری", + "joindate": "Join Date", + "postcount": "Post Count", "email": "رایانامه", "confirm_email": "تأیید رایانامه", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "بازدیدهای نمایه", "reputation": "اعتبار", "favourites": "پسندها", + "watched": "Watched", "followers": "دنبال‌کننده‌ها", "following": "دنبال‌شونده‌ها", "signature": "امضا", @@ -56,10 +59,12 @@ "digest_weekly": "هفتگی", "digest_monthly": "ماهانه", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "این کاربر هیچ دنبال‌کننده‌ای ندارد :(", "follows_no_one": "این کاربر هیچ کسی را دنبال نمی‌کند :(", "has_no_posts": "این کاربر هنوز هیچ دیدگاهی نگذاشته است.", "has_no_topics": "این کاربر هنوز هیچ جستاری نفرستاده است.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "رایانامه پنهان شده", "hidden": "پنهان", "paginate_description": "محدود کردن شمار جستارها و دیدگاه‌ها در هر برگه به جای مرور بی‌پایان برگه‌ها", diff --git a/public/language/fa_IR/users.json b/public/language/fa_IR/users.json index 5b1ea539af..aec64b6020 100644 --- a/public/language/fa_IR/users.json +++ b/public/language/fa_IR/users.json @@ -5,5 +5,8 @@ "search": "جستجو", "enter_username": "یک نام کاربری برای جستجو وارد کنید", "load_more": "بارگذاری بیش‌تر", - "users-found-search-took": "%1 کاربر() در مدت زمان %2 میلی ثانیه یافت شد!" + "users-found-search-took": "%1 کاربر() در مدت زمان %2 میلی ثانیه یافت شد!", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/fi/email.json b/public/language/fi/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/fi/email.json +++ b/public/language/fi/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 0328632c95..0b28c1f98b 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -18,6 +18,7 @@ "username-taken": "Käyttäjänimi varattu", "email-taken": "Sähköpostiosoite varattu", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Käyttäjänimi on liian lyhyt", "username-too-long": "Username too long", "user-banned": "Käyttäjä on estetty", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!", - "invalid-image-type": "Virheellinen kuvatiedosto", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Ryhmän nimi on liian lyhyt", "group-already-exists": "Ryhmä on jo olemassa", "group-name-change-not-allowed": "Et voi vaihtaa ryhmän nimeä", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/fi/global.json b/public/language/fi/global.json index 58ba3a2945..7e0be437c7 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -3,9 +3,10 @@ "search": "Hae", "buttons.close": "Sulje", "403.title": "Pääsy kielletty", - "403.message": "Olet päätynyt sivulle, johon sinulla ei ole tarvittavia oikeuksia. Sinun pitäisi kai kirjautua sisään.", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Ei löydy", - "404.message": "Olet päätynyt sivulle, jota ei ole olemassa. Palaa etusivulle.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Sisäinen virhe.", "500.message": "Oho! Jotain meni pieleen!", "register": "Rekisteröidy", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Suositut", "header.users": "Käyttäjät", + "header.groups": "Groups", "header.chats": "Keskustelut", "header.notifications": "Ilmoitukset", "header.search": "Hae", @@ -73,5 +75,7 @@ "updated.title": "Foorumi päivitetty", "updated.message": "Tämä foorumi on juuri päivitetty uusimpaan versioon. Paina tästä päivittääksesi sivun.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/fi/groups.json b/public/language/fi/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/fi/groups.json +++ b/public/language/fi/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/fi/recent.json b/public/language/fi/recent.json index b2bff39da7..b28b1cddbb 100644 --- a/public/language/fi/recent.json +++ b/public/language/fi/recent.json @@ -5,5 +5,14 @@ "month": "Kuukausi", "year": "Year", "alltime": "All Time", - "no_recent_topics": "Ei viimeisimpiä aiheita." + "no_recent_topics": "Ei viimeisimpiä aiheita.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/fi/search.json b/public/language/fi/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/fi/search.json +++ b/public/language/fi/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index 4417ef2613..194d414e56 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Ei valittuja viestejä!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Syötä aiheesi otsikko tähän...", + "composer.handle_placeholder": "Name", "composer.discard": "Hylkää", "composer.submit": "Lähetä", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/fi/user.json b/public/language/fi/user.json index 75ccdad3e3..4942b2d587 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -2,6 +2,8 @@ "banned": "Bannattu", "offline": "Offline", "username": "Käyttäjän nimi", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Sähköposti", "confirm_email": "Confirm Email", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "Profiilia katsottu", "reputation": "Maine", "favourites": "Suosikit", + "watched": "Watched", "followers": "Seuraajat", "following": "Seuratut", "signature": "Allekirjoitus", @@ -56,10 +59,12 @@ "digest_weekly": "Weekly", "digest_monthly": "Monthly", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Kukaan ei seuraa tätä käyttäjää :(", "follows_no_one": "Tämä käyttäjä ei seuraa ketään :(", "has_no_posts": "Tämä käyttäjä ei ole kirjoittanut vielä mitään.", "has_no_topics": "Tämä käyttäjä ei ole kirjoittanut vielä yhtään aihetta.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Sähköposti piilotettu", "hidden": "piilotettu", "paginate_description": "Sivuta aiheet ja viestit loputtoman vierittämisen sijaan.", diff --git a/public/language/fi/users.json b/public/language/fi/users.json index 2451c1a4dd..67556152ae 100644 --- a/public/language/fi/users.json +++ b/public/language/fi/users.json @@ -5,5 +5,8 @@ "search": "Hae", "enter_username": "Syötä käyttäjätunnus hakeaksesi", "load_more": "Lataa lisää", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/fr/email.json b/public/language/fr/email.json index 03d1face80..1ed4d80cac 100644 --- a/public/language/fr/email.json +++ b/public/language/fr/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Nouveau message de chat reçu de %1", "notif.chat.cta": "Cliquez ici pour continuer la conversation", "notif.chat.unsub.info": "Cette notification de chat a été envoyé en raison de vos paramètres d'abonnement.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Ceci est un email de test pour vérifier que l'emailer est correctement configuré pour NodeBB.", "unsub.cta": "Cliquez ici pour modifier ces paramètres", "closing": "Merci !" diff --git a/public/language/fr/error.json b/public/language/fr/error.json index ed18ca989b..28ab5566f6 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -18,6 +18,7 @@ "username-taken": "Nom d’utilisateur déjà utilisé", "email-taken": "Email déjà utilisé", "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquer ici pour la valider.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Nom d'utilisateur trop court", "username-too-long": "Nom d'utilisateur trop long", "user-banned": "Utilisateur banni", @@ -43,10 +44,13 @@ "already-favourited": "Vous avez déjà mis ce message en favoris", "already-unfavourited": "Vous avez déjà retiré ce message des favoris", "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !", - "invalid-image-type": "Type d’image invalide", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Nom de groupe trop court", "group-already-exists": "Ce groupe existe déjà", "group-name-change-not-allowed": "Modification du nom de groupe non permise", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Message déjà supprimé", "post-already-restored": "Message déjà restauré", "topic-already-deleted": "Sujet déjà supprimé", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message", "not-enough-reputation-to-flag": "Vous n'avez pas une réputation assez élevée pour signaler ce message", "reload-failed": "NodeBB a rencontré un problème lors du rechargement : \"% 1\" . NodeBB continuera de fonctionner côté client, même si vous devez annuler ce que vous avez fait juste avant de recharger .", - "registration-error": "Erreur d'enregistrement" + "registration-error": "Erreur d'enregistrement", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/fr/global.json b/public/language/fr/global.json index ad4008e6b5..1937e5faad 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -3,9 +3,10 @@ "search": "Recherche", "buttons.close": "Fermer", "403.title": "Accès refusé", - "403.message": "Il semble que vous vous soyez retrouvé sur une page à laquelle vous n'avez pas accès. Vous devriez peut-être essayer de vous connecter ?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Introuvable", - "404.message": "Il semble que vous vous soyez retrouvés sur une page qui n'existe pas. Retourner à l'accueil.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Erreur interne.", "500.message": "Oops ! Il semblerait que quelque chose se soit mal passé !", "register": "S'inscrire", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Populaire", "header.users": "Utilisateurs", + "header.groups": "Groups", "header.chats": "Chats", "header.notifications": "Notifications", "header.search": "Recherche", @@ -73,5 +75,7 @@ "updated.title": "Forum mis à jour", "updated.message": "Ce forum a été mis à jour à la dernière version. Cliquez ici pour recharger la page.", "privacy": "Vie privée", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Supprimer Tout" } \ No newline at end of file diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json index 723db5ebb5..c61f42e068 100644 --- a/public/language/fr/groups.json +++ b/public/language/fr/groups.json @@ -1,8 +1,21 @@ { "groups": "Groupes", "view_group": "Voir le groupe", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Informations du groupe", "details.members": "Liste des membres", + "details.pending": "Pending Members", "details.has_no_posts": "Ce membre du groupe n'a envoyé aucun message.", - "details.latest_posts": "Derniers messages" + "details.latest_posts": "Derniers messages", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json index defd933cfb..f244b31c35 100644 --- a/public/language/fr/recent.json +++ b/public/language/fr/recent.json @@ -5,5 +5,14 @@ "month": "Mois", "year": "An", "alltime": "Toujours", - "no_recent_topics": "Il n'y a aucun sujet récent." + "no_recent_topics": "Il n'y a aucun sujet récent.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/fr/search.json b/public/language/fr/search.json index 02179757c4..63e5537663 100644 --- a/public/language/fr/search.json +++ b/public/language/fr/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 résultat(s) correspondant(s) à \"%2\", (%3 secondes)", - "no-matches": "Aucun message trouvé!" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 1473a37136..b20ef314eb 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Aucun post sélectionné !", "fork_success": "Sujet copié avec succès! Cliquez ici pour aller au sujet copié.", "composer.title_placeholder": "Entrer le titre du sujet ici ...", + "composer.handle_placeholder": "Name", "composer.discard": "Abandonner", "composer.submit": "Envoyer", "composer.replying_to": "Réponse à %1", @@ -92,5 +93,6 @@ "sort_by": "Trier", "oldest_to_newest": "Du plus ancien au plus récent", "newest_to_oldest": "Du plus récent au plus ancien", - "most_votes": "Les mieux notés" + "most_votes": "Les mieux notés", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/fr/user.json b/public/language/fr/user.json index 8ac19c92bf..83bb6f5d9e 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -2,6 +2,8 @@ "banned": "Banni", "offline": "Hors-ligne", "username": "Nom d'utilisateur", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Confirmer l'adresse email", "delete_account": "Supprimer le compte", @@ -16,6 +18,7 @@ "profile_views": "Vues", "reputation": "Réputation", "favourites": "Favoris", + "watched": "Watched", "followers": "Abonnés", "following": "Abonnements", "signature": "Signature", @@ -56,10 +59,12 @@ "digest_weekly": "Hebdomadaire", "digest_monthly": "Mensuel", "send_chat_notifications": "Envoyer un e-mail si un nouveau message de chat arrive lorsque je ne suis pas en ligne", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Cet utilisateur n'est suivi par personne :(", "follows_no_one": "Cet utilisateur ne suit personne :(", "has_no_posts": "Ce membre n'a rien posté pour le moment", "has_no_topics": "L’utilisateur n'a pas encore créé de sujet.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email masqué", "hidden": "masqué", "paginate_description": "Utiliser la pagination des sujets et des messages au lieu du défilement infini.", diff --git a/public/language/fr/users.json b/public/language/fr/users.json index e6c64004b4..3cd259f2c5 100644 --- a/public/language/fr/users.json +++ b/public/language/fr/users.json @@ -5,5 +5,8 @@ "search": "Rechercher", "enter_username": "Entrer un nom d'utilisateur pour rechercher", "load_more": "Charger la suite", - "users-found-search-took": "%1 utilisateur(s) trouvé(s) ! Recherche effectuée en %2 ms." + "users-found-search-took": "%1 utilisateur(s) trouvé(s) ! Recherche effectuée en %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/he/email.json b/public/language/he/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/he/email.json +++ b/public/language/he/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/he/error.json b/public/language/he/error.json index 2a57b2e78d..28483df65e 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -18,6 +18,7 @@ "username-taken": "שם משתמש תפוס", "email-taken": "כתובת אימייל תפוסה", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "שם משתמש קצר מדי", "username-too-long": "Username too long", "user-banned": "המשתמש חסום", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!", - "invalid-image-type": "סוג תמונה לא תקין", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "שם הקבוצה קצר מדי", "group-already-exists": "הקבוצה כבר קיימת", "group-name-change-not-allowed": "לא ניתן לשנות את שם הקבוצה", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/he/global.json b/public/language/he/global.json index d916ce7dca..7a5d014492 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -3,9 +3,10 @@ "search": "חיפוש", "buttons.close": "סגור", "403.title": "גישה נדחתה", - "403.message": "נראה שהגעת לעמוד שאין לך הרשאה לצפות בו. נסה להתחבר?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "לא נמצא", - "404.message": "נראה שהגעת לעמוד שאינו קיים. חזור לדף הבית.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "שגיאה פנימית.", "500.message": "אופס! נראה שמשהו השתבש!", "register": "הרשמה", @@ -26,6 +27,7 @@ "header.tags": "תגיות", "header.popular": "פופולרי", "header.users": "משתמשים", + "header.groups": "Groups", "header.chats": "צ'אטים", "header.notifications": "התראות", "header.search": "חיפוש", @@ -73,5 +75,7 @@ "updated.title": "הפורום עודכן", "updated.message": "הפורום עודכן לגרסא האחרונה. נא ללחוץ כאן לעדכון הדף.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/he/groups.json b/public/language/he/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/he/groups.json +++ b/public/language/he/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/he/recent.json b/public/language/he/recent.json index 0a20c6301a..6e1cd5f811 100644 --- a/public/language/he/recent.json +++ b/public/language/he/recent.json @@ -5,5 +5,14 @@ "month": "חודש", "year": "Year", "alltime": "All Time", - "no_recent_topics": "אין נושאים חדשים" + "no_recent_topics": "אין נושאים חדשים", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/he/search.json b/public/language/he/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/he/search.json +++ b/public/language/he/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index d69bb6036b..2e0d4a0d2e 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "לא בחרת אף פוסט!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "הכנס את כותרת הנושא כאן...", + "composer.handle_placeholder": "Name", "composer.discard": "מחק", "composer.submit": "שלח", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/he/user.json b/public/language/he/user.json index 332e6d18b7..ec3d0e5b7a 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -2,6 +2,8 @@ "banned": "מורחק", "offline": "לא מחובר", "username": "שם משתמש", + "joindate": "Join Date", + "postcount": "Post Count", "email": "כתובת אימייל", "confirm_email": "Confirm Email", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "צפיות בפרופיל", "reputation": "מוניטין", "favourites": "מועדפים", + "watched": "Watched", "followers": "עוקבים", "following": "עוקב אחרי", "signature": "חתימה", @@ -56,10 +59,12 @@ "digest_weekly": "שבועי", "digest_monthly": "חודשי", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "למשתמש זה אין עוקבים :(", "follows_no_one": "משתמש זה אינו עוקב אחרי אחרים :(", "has_no_posts": "המשתמש הזה עוד לא פרסם כלום.", "has_no_topics": "המשתמש טרם יצר נושאים כלשהם.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "כתובת אימייל מוסתרת", "hidden": "מוסתר", "paginate_description": "צור עימוד לנושאים במקום לטעון את כל התוכן בעמוד אחד.", diff --git a/public/language/he/users.json b/public/language/he/users.json index f9ec1bad9d..c37d6e3609 100644 --- a/public/language/he/users.json +++ b/public/language/he/users.json @@ -5,5 +5,8 @@ "search": "חיפוש", "enter_username": "הכנס שם משתמש לחיפוש", "load_more": "טען עוד", - "users-found-search-took": "נמצאו %1 משתמש(ים)! החיפוש ארך %2 מילי שניות." + "users-found-search-took": "נמצאו %1 משתמש(ים)! החיפוש ארך %2 מילי שניות.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/hu/email.json b/public/language/hu/email.json index 921ee6218f..eaf8595c79 100644 --- a/public/language/hu/email.json +++ b/public/language/hu/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Új chat üzenet érkezett a következőtől: %1", "notif.chat.cta": "Kattints ide a beszélgetés folytatásához", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Kattintson ide megváltoztatni ezeket a beállításokat", "closing": "Köszönjük!" diff --git a/public/language/hu/error.json b/public/language/hu/error.json index d5819d7aa0..c0bab322ee 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -18,6 +18,7 @@ "username-taken": "Foglalt felhasználónév", "email-taken": "Foglalt e-mail", "email-not-confirmed": "Az e-mail címed még nem lett ellenőrizve, kérlek kattints ide az e-mail címed ellenőrzéséhez!", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Túl rövid felhasználónév", "username-too-long": "Túl hosszú felhasználónév", "user-banned": "Kitiltott felhasználó", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "You can't ban other admins!", - "invalid-image-type": "Érvénytelen kép típus", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "A csoport név túl rövid", "group-already-exists": "A csoport nem létezik", "group-name-change-not-allowed": "A csoport névváltoztatás nem engedélyezett", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Ez a bejegyzés mát törlésre került", "post-already-restored": "Ez a bejegyzés már visszaállításra került", "topic-already-deleted": "Ezt a témakör már törlésre került", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Regisztrációs hiba" + "registration-error": "Regisztrációs hiba", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/hu/global.json b/public/language/hu/global.json index 9e4854b8d4..6f3926d6a5 100644 --- a/public/language/hu/global.json +++ b/public/language/hu/global.json @@ -3,9 +3,10 @@ "search": "Keresés", "buttons.close": "Mégsem", "403.title": "Hozzáférés megtagadva", - "403.message": "Úgy tűnik egy olyan oldalt szeretnénk elérni, amihez nincs hozzáférés. Talán be kellene jelentkezni", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Nincs találat", - "404.message": "Úgy tűnik egy olyan oldalt szeretnénk elérni, ami nem létezik. Visszatérés a kezdőlapra.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Belső hiba.", "500.message": "Hoppá! Úgy tűnik valami hiba történt!", "register": "Regisztráció", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Népszerű", "header.users": "Felhasználók", + "header.groups": "Groups", "header.chats": "Chat", "header.notifications": "Értesítések", "header.search": "Keresés", @@ -73,5 +75,7 @@ "updated.title": "Forum Updated", "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/hu/groups.json b/public/language/hu/groups.json index d1157bd711..3d8cddf1c1 100644 --- a/public/language/hu/groups.json +++ b/public/language/hu/groups.json @@ -1,8 +1,21 @@ { "groups": "Csoportok", "view_group": "Csoport megtekintés", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Csoport részletek", "details.members": "Felhasználók", + "details.pending": "Pending Members", "details.has_no_posts": "A csoport felhasználói nem tettek még közzé bejegyzést.", - "details.latest_posts": "Legújabb bejegyzések" + "details.latest_posts": "Legújabb bejegyzések", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/hu/recent.json b/public/language/hu/recent.json index beecad4e2e..f749b684d9 100644 --- a/public/language/hu/recent.json +++ b/public/language/hu/recent.json @@ -5,5 +5,14 @@ "month": "Hónap", "year": "Év", "alltime": "Minden idők", - "no_recent_topics": "Nincs friss topik." + "no_recent_topics": "Nincs friss topik.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/hu/search.json b/public/language/hu/search.json index 467ff8729e..f5df223660 100644 --- a/public/language/hu/search.json +++ b/public/language/hu/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 eredmény(ek) erre \"%2\" (%3 másodperc alatt)", - "no-matches": "Nincs bejegyzés" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 61c0f40024..0de62def8d 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Nincs hozzászólás kiválasztva!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Írd be a témanevet...", + "composer.handle_placeholder": "Name", "composer.discard": "Elvet", "composer.submit": "Küldés", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/hu/user.json b/public/language/hu/user.json index c4b4cea86a..c673eaee36 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -2,6 +2,8 @@ "banned": "Kitíltva", "offline": "Nem elérhető", "username": "Felhasználónév", + "joindate": "Join Date", + "postcount": "Post Count", "email": "E-mail", "confirm_email": "E-mail megerősítése", "delete_account": "Fiók törlése", @@ -16,6 +18,7 @@ "profile_views": "Megtekintések", "reputation": "Hírnév", "favourites": "Kedvencek", + "watched": "Watched", "followers": "Követők", "following": "Követve", "signature": "Aláírás", @@ -56,10 +59,12 @@ "digest_weekly": "Weekly", "digest_monthly": "Monthly", "send_chat_notifications": "E-mail küldése, amennyiben chat üzenetem érkezett és nem vagyok aktív", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Ezt a felhasználót nem követi senki :(", "follows_no_one": "Ez a felhasználó nem követ senkit :(", "has_no_posts": "Ennek a felhasználónak még nincsen hozzászólása.", "has_no_topics": "This user didn't post any topics yet.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "E-mail rejtett", "hidden": "rejtett", "paginate_description": "Oldalszámok használata a témáknál és hozzászólásoknál a végtelen görgetés helyett.", diff --git a/public/language/hu/users.json b/public/language/hu/users.json index b637800995..2f992c73b2 100644 --- a/public/language/hu/users.json +++ b/public/language/hu/users.json @@ -5,5 +5,8 @@ "search": "Keresés", "enter_username": "Írj be egy nicknevet a kereséshez", "load_more": "Több betöltése", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/id/email.json b/public/language/id/email.json index cddffe26df..86557a5832 100644 --- a/public/language/id/email.json +++ b/public/language/id/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Pesan yang baru diterima dari %1", "notif.chat.cta": "Klik di sini untuk melanjutkan percakapan", "notif.chat.unsub.info": "Sesuai pengaturan langganan anda, notifikasi obrolan ini dikirmkan kepada anda", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Ini hanya email percobaan untuk menverifkasi pengiriman email telah diatur oleh NodeBB secara benar", "unsub.cta": "Klik di sini untuk mengubah pengaturan-pengaturan tersebut.", "closing": "Terima kasih!" diff --git a/public/language/id/error.json b/public/language/id/error.json index 58d37de6cb..7b1413a957 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -18,6 +18,7 @@ "username-taken": "Username sudah terdaftar", "email-taken": "Email sudah terdaftar", "email-not-confirmed": "Email kamu belum dikonfirmasi, klik disini untuk mengkonfirmasi email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Username terlalu pendek", "username-too-long": "Username terlalu panjang", "user-banned": "Pengguna dibanned", @@ -43,10 +44,13 @@ "already-favourited": "Post ini sudah kamu favorit", "already-unfavourited": "Postingan ini sudah kamu unfavorit", "cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!", - "invalid-image-type": "Tipe gambar salah", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Nama grup terlalu pendek", "group-already-exists": "Grup sudah ada", "group-name-change-not-allowed": "Perubahan nama grup tidak dibolehkan", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Postingan ini sudah dihapus", "post-already-restored": "Postingan ini sudah direstore", "topic-already-deleted": "Topik ini sudah dihapus", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Tidak cukup reputation untuk downvote post ini", "not-enough-reputation-to-flag": "Tidak cukup reputation untuk flag post ini", "reload-failed": "NodeBB mengalami masalah saat memuat \"%1\". NodeBB akan melanjutkan pemuatan, kamu harus membatalkan tindakanmu sebelum pemuatan kembali dilakukan.", - "registration-error": "Registrasti Error" + "registration-error": "Registrasti Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/id/global.json b/public/language/id/global.json index de13ab0ca3..738fa81207 100644 --- a/public/language/id/global.json +++ b/public/language/id/global.json @@ -3,9 +3,10 @@ "search": "Cari", "buttons.close": "Tutup", "403.title": "Akses ditolak", - "403.message": "Kamu terlihat masuk ke halaman yang kamu tidak punya akses untuk melakukannya. Coba login terlebih dulu.", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Tidak ditemukan", - "404.message": "Kamu terlihat masuk ke halaman yang sudah tidak ada. Silakan kembali ke Halaman Depan.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Kesalahan internal", "500.message": "Oops! Terjadi kesalahan", "register": "Daftar", @@ -26,6 +27,7 @@ "header.tags": "Tag", "header.popular": "Populer", "header.users": "Pengguna", + "header.groups": "Groups", "header.chats": "Chat", "header.notifications": "Pemberitahuan", "header.search": "Cari", @@ -73,5 +75,7 @@ "updated.title": "Forum telah diupdate", "updated.message": "Forum ini telah diupdate ke versi terbaru. Klik disini untuk memuat halaman.", "privacy": "Privasi", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Hapus Semua" } \ No newline at end of file diff --git a/public/language/id/groups.json b/public/language/id/groups.json index 6b2f27c348..bca990761d 100644 --- a/public/language/id/groups.json +++ b/public/language/id/groups.json @@ -1,8 +1,21 @@ { "groups": "Grup", "view_group": "Tampilkan Grup", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Rincian Grup", "details.members": "Daftar Anggota", + "details.pending": "Pending Members", "details.has_no_posts": "Anggota grup ini belum membuat posting satupun.", - "details.latest_posts": "Posting Terkini" + "details.latest_posts": "Posting Terkini", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/id/recent.json b/public/language/id/recent.json index a68a649504..75c621983d 100644 --- a/public/language/id/recent.json +++ b/public/language/id/recent.json @@ -5,5 +5,14 @@ "month": "Bulan", "year": "Tahun", "alltime": "Sepanjang Waktu", - "no_recent_topics": "Tidak ada topik terbaru." + "no_recent_topics": "Tidak ada topik terbaru.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/id/search.json b/public/language/id/search.json index b296b8ef1b..af974065ab 100644 --- a/public/language/id/search.json +++ b/public/language/id/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 hasil yang sesuai dengan \"%2\", (%3 detik)", - "no-matches": "Hasil pencarian tidak ditemukan" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 9536cbc46c..cd8f9052b2 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Tidak ada posting yang dipilih!", "fork_success": "Topik berhasil dicabangkan! Klik disini untuk menuju topik yang telah dicabangkan.", "composer.title_placeholder": "Masukkan judul topik di sini...", + "composer.handle_placeholder": "Name", "composer.discard": "Buang", "composer.submit": "Kirim", "composer.replying_to": "Membalas ke %1", @@ -92,5 +93,6 @@ "sort_by": "Urutkan berdasakan", "oldest_to_newest": "Terlama ke Terbaru", "newest_to_oldest": "Terbaru ke Terlama", - "most_votes": "Vote terbanyak" + "most_votes": "Vote terbanyak", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/id/user.json b/public/language/id/user.json index 8b5734bc09..ce82e7888f 100644 --- a/public/language/id/user.json +++ b/public/language/id/user.json @@ -2,6 +2,8 @@ "banned": "Banned", "offline": "Offline", "username": "Nama Pengguna", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Konfirmasi Email", "delete_account": "Hapus Akun", @@ -16,6 +18,7 @@ "profile_views": "Tampilan profil", "reputation": "Reputasi", "favourites": "Favorit", + "watched": "Watched", "followers": "Pengikut", "following": "Mengikuti", "signature": "Tanda Pengenal", @@ -56,10 +59,12 @@ "digest_weekly": "Mingguan", "digest_monthly": "Bulanan", "send_chat_notifications": "Kirimkan email jika menerima pesan percakapan dan saya sedang tidak online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "User ini tidak memiliki pengikut :(", "follows_no_one": "User ini tidak mengikuti seorangpun :(", "has_no_posts": "User ini belum pernah membuat posting.", "has_no_topics": "User ini belum pernah membuat topik.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Disembunyikan", "hidden": "disembunyikan", "paginate_description": "Gunakan halaman topik dan posting sebagai ganti penggunaan gulungan tanpa batas.", diff --git a/public/language/id/users.json b/public/language/id/users.json index c313a8760f..4f7636a9c3 100644 --- a/public/language/id/users.json +++ b/public/language/id/users.json @@ -5,5 +5,8 @@ "search": "Pencarian", "enter_username": "Masukkan nama pengguna untuk mencari", "load_more": "Tampilkan Lebih Banyak", - "users-found-search-took": "%1 pengguna ditemukan! Pencarian butuh waktu %2 ms." + "users-found-search-took": "%1 pengguna ditemukan! Pencarian butuh waktu %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/it/email.json b/public/language/it/email.json index 40ab3484a1..8c0a1666c2 100644 --- a/public/language/it/email.json +++ b/public/language/it/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Nuovo messaggio in chat da %1", "notif.chat.cta": "Clicca qui per continuare la conversazione", "notif.chat.unsub.info": "Questa notifica di chat ti è stata inviata perché l'hai scelta nelle impostazioni.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Questa è una email di test per verificare che il servizio di invio email è configurato correttamente sul tuo NodeBB.", "unsub.cta": "Clicca qui per modificare queste impostazioni", "closing": "Grazie!" diff --git a/public/language/it/error.json b/public/language/it/error.json index d81c2c1312..12ebc50080 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -18,6 +18,7 @@ "username-taken": "Nome utente già preso", "email-taken": "Email già esistente", "email-not-confirmed": "La tua Email deve essere ancora confermata, per favore clicca qui per confermare la tua Email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Nome utente troppo corto", "username-too-long": "Nome utente troppo lungo", "user-banned": "Utente bannato", @@ -43,10 +44,13 @@ "already-favourited": "Hai già inserito tra i preferiti questo post", "already-unfavourited": "Hai già inserito tra i Non Preferiti questo post", "cant-ban-other-admins": "Non puoi bannare altri amministratori!", - "invalid-image-type": "Tipo di immagine invalido", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Nome del Gruppo troppo corto", "group-already-exists": "Il Gruppo esiste già", "group-name-change-not-allowed": "Il cambio di nome al Gruppo non è consentito", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Questo Post è già stato cancellato", "post-already-restored": "Questo Post è già stato ripristinato", "topic-already-deleted": "Questo Topic è già stato cancellato", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Non hai i privilegi per votare negativamente questo post", "not-enough-reputation-to-flag": "Tu non hai abbastanza reputazione per segnalare questo Post", "reload-failed": "NodeBB ha incontrato un problema durante il ricaricamento: \"%1\". NodeBB continuerà a servire gli assets esistenti lato client, così puoi annullare quello che hai fatto prima di ricaricare.", - "registration-error": "Errore nella registrazione" + "registration-error": "Errore nella registrazione", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/it/global.json b/public/language/it/global.json index ce0bcbfe31..35d1244d7f 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -3,9 +3,10 @@ "search": "Cerca", "buttons.close": "Chiudi", "403.title": "Accesso Proibito", - "403.message": "Non hai accesso alla pagina che stavi cercando di aprire. Probabilmente devi effettuare il log in?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Non trovato", - "404.message": "La pagina che stavi cercando di aprire non esiste. Ritorna alla pagina iniziale.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Errore interno.", "500.message": "Oops! Qualcosa non funziona come si deve!", "register": "Registrazione", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Popolare", "header.users": "Utenti", + "header.groups": "Groups", "header.chats": "Messaggi", "header.notifications": "Notifiche", "header.search": "Cerca", @@ -73,5 +75,7 @@ "updated.title": "Forum Aggiornato", "updated.message": "Questo forum è stato aggiornato all'ultima versione. Clicca qui per ricaricare la pagina.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Elimina Tutto" } \ No newline at end of file diff --git a/public/language/it/groups.json b/public/language/it/groups.json index 97a2c0cbc6..51f67ec593 100644 --- a/public/language/it/groups.json +++ b/public/language/it/groups.json @@ -1,8 +1,21 @@ { "groups": "Gruppi", "view_group": "Vedi Gruppo", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Dettagli Gruppo", "details.members": "Lista Membri", + "details.pending": "Pending Members", "details.has_no_posts": "I membri di questo gruppo non hanno ancora postato.", - "details.latest_posts": "Ultimi Post" + "details.latest_posts": "Ultimi Post", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/it/recent.json b/public/language/it/recent.json index fb552194e3..f7d5f4d624 100644 --- a/public/language/it/recent.json +++ b/public/language/it/recent.json @@ -5,5 +5,14 @@ "month": "Mese", "year": "Anno", "alltime": "Sempre", - "no_recent_topics": "Non ci sono discussioni recenti." + "no_recent_topics": "Non ci sono discussioni recenti.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/it/search.json b/public/language/it/search.json index 957b7557b1..6b1250cf39 100644 --- a/public/language/it/search.json +++ b/public/language/it/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 risultato(i) corrispondente(i) \"%2\", (%3 secondi)", - "no-matches": "Nessun post trovato" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/it/topic.json b/public/language/it/topic.json index c4c75dd5d8..ba1beedc77 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Nessun post selezionato!", "fork_success": "Topic Diviso con successo ! Clicca qui per andare al Topic Diviso.", "composer.title_placeholder": "Inserisci qui il titolo della discussione...", + "composer.handle_placeholder": "Name", "composer.discard": "Annulla", "composer.submit": "Invia", "composer.replying_to": "Rispondendo a %1", @@ -92,5 +93,6 @@ "sort_by": "Ordina per", "oldest_to_newest": "Da Vecchi a Nuovi", "newest_to_oldest": "Da Nuovi a Vecchi", - "most_votes": "Più votati" + "most_votes": "Più votati", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/it/user.json b/public/language/it/user.json index 032ccea5df..ddbc35be12 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -2,6 +2,8 @@ "banned": "Bannato", "offline": "Non in linea", "username": "Nome Utente", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Conferma Email", "delete_account": "Elimina Account", @@ -16,6 +18,7 @@ "profile_views": "Visite al profilo", "reputation": "Reputazione", "favourites": "Favoriti", + "watched": "Watched", "followers": "Da chi è seguito", "following": "Chi segue", "signature": "Firma", @@ -56,10 +59,12 @@ "digest_weekly": "Settimanale", "digest_monthly": "Mensile", "send_chat_notifications": "Invia una email se arriva un nuovo messaggio di chat e non sono online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Questo utente non è seguito da nessuno :(", "follows_no_one": "Questo utente non segue nessuno :(", "has_no_posts": "Questo utente non ha ancora postato nulla.", "has_no_topics": "Questo utente non ha ancora avviato discussioni.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Nascosta", "hidden": "nascosta", "paginate_description": "Dividi discussioni e post in pagine anziché usare lo scroll infinito.", diff --git a/public/language/it/users.json b/public/language/it/users.json index e8fda0d3a8..3faed8adbb 100644 --- a/public/language/it/users.json +++ b/public/language/it/users.json @@ -5,5 +5,8 @@ "search": "Cerca", "enter_username": "Inserisci il nome utente da cercare", "load_more": "Carica altri", - "users-found-search-took": "%1 utente(i) trovati! La ricerca ha impiegato %2 ms." + "users-found-search-took": "%1 utente(i) trovati! La ricerca ha impiegato %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/ja/email.json b/public/language/ja/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/ja/email.json +++ b/public/language/ja/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/ja/error.json b/public/language/ja/error.json index 62e49edc51..b55c713676 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -18,6 +18,7 @@ "username-taken": "ユーザー名が取られた", "email-taken": "メールアドレスが使用された", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "ユーザーが停止された", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "ほかの管理者を停止することはできません！", - "invalid-image-type": "無効なユーザータイプ", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "グループ名は短すぎます。", "group-already-exists": "グループ名はすでに存在しています", "group-name-change-not-allowed": "グループ名の修正はできません", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/ja/global.json b/public/language/ja/global.json index fa13085f7d..f0f54776bb 100644 --- a/public/language/ja/global.json +++ b/public/language/ja/global.json @@ -3,9 +3,10 @@ "search": "検索", "buttons.close": "閉じる", "403.title": "アクセス拒否", - "403.message": "アクセスが拒否されました.ログインしますか？", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "見つかりません", - "404.message": "アクセスしようとしていたページは存在しません.ホームへ", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "内部エラー", "500.message": "何とも言えない障害が発生しているようです.m(_ _)m", "register": "登録", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "人気", "header.users": "ユーザー", + "header.groups": "Groups", "header.chats": "チャット", "header.notifications": "通知", "header.search": "検索", @@ -73,5 +75,7 @@ "updated.title": "Forum Updated", "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/ja/groups.json b/public/language/ja/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/ja/groups.json +++ b/public/language/ja/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ja/recent.json b/public/language/ja/recent.json index 35cdd2b23f..1aa2f932f3 100644 --- a/public/language/ja/recent.json +++ b/public/language/ja/recent.json @@ -5,5 +5,14 @@ "month": "最近 1 ヶ月", "year": "Year", "alltime": "All Time", - "no_recent_topics": "最近のスレッドはありません。" + "no_recent_topics": "最近のスレッドはありません。", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/ja/search.json b/public/language/ja/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/ja/search.json +++ b/public/language/ja/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index d759a07e46..fd6c7d911b 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "ポストが選択されていません！", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "スレッドのタイトルを入力して...", + "composer.handle_placeholder": "Name", "composer.discard": "破棄する", "composer.submit": "保存する", "composer.replying_to": "%1へ返答中", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/ja/user.json b/public/language/ja/user.json index d73f31b7da..0b2b065a94 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -2,6 +2,8 @@ "banned": "停止された", "offline": "オフライン", "username": "ユーザー名", + "joindate": "Join Date", + "postcount": "Post Count", "email": "メール", "confirm_email": "Confirm Email", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "閲覧数", "reputation": "評価", "favourites": "お気に入り", + "watched": "Watched", "followers": "フォロワー", "following": "フォロー中", "signature": "署名", @@ -56,10 +59,12 @@ "digest_weekly": "ウィークリー", "digest_monthly": "マンスリー", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "フォロワーはまだいません :(", "follows_no_one": "フォロー中のユーザーはまだいません :(", "has_no_posts": "まだポストを投稿したことありません。", "has_no_topics": "まだスレッドを作成したありません。", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "メールアドレスを非表示", "hidden": "非表示", "paginate_description": "スクロールでのページ自動ロードはしない", diff --git a/public/language/ja/users.json b/public/language/ja/users.json index ac5553dbb9..9bf3d7a0d9 100644 --- a/public/language/ja/users.json +++ b/public/language/ja/users.json @@ -5,5 +5,8 @@ "search": "検索", "enter_username": "検索するユーザー名を入力してください", "load_more": "もっと表示", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/ko/email.json b/public/language/ko/email.json index 0142a60205..a7e4ea2cfc 100644 --- a/public/language/ko/email.json +++ b/public/language/ko/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "%1님이 채팅 메시지를 보냈습니다.", "notif.chat.cta": "대화를 계속하려면 여기를 클릭하세요.", "notif.chat.unsub.info": "이 채팅 알림은 사용자 설정에 따라 전송되었습니다.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "이 메일은 NodeBB에 메일러가 정상적으로 설치되었는지 확인할 테스트 용도로 발송되었습니다.", "unsub.cta": "설정을 변경하려면 여기를 클릭하세요.", "closing": "감사합니다!" diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 196a067318..9ce8f5dd42 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -18,6 +18,7 @@ "username-taken": "이미 사용 중인 사용자 이름입니다.", "email-taken": "이미 사용 중인 이메일입니다.", "email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "사용자 이름이 너무 짧습니다.", "username-too-long": "사용자 이름이 너무 깁니다.", "user-banned": "차단된 사용자입니다.", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다.", - "invalid-image-type": "올바르지 않은 이미지입니다.", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "그룹 이름이 너무 짧습니다.", "group-already-exists": "이미 존재하는 그룹입니다.", "group-name-change-not-allowed": "금지된 그룹 이름입니다.", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "이미 삭제된 게시물입니다.", "post-already-restored": "이미 복원된 게시물입니다.", "topic-already-deleted": "이미 삭제된 주제입니다.", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "인기도가 낮아 이 게시물에 반대할 수 없습니다.", "not-enough-reputation-to-flag": "인기도가 낮아 이 게시물을 신고할 수 없습니다.", "reload-failed": "NodeBB를 다시 읽어들이는 중 다음과 같은 문제가 발생했습니다. \"%1\" 다시 읽어들이기 직전에 했던 동작은 되돌리세요. 클라이언트측 자원은 문제없이 계속 전송됩니다.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/ko/global.json b/public/language/ko/global.json index d3659fd163..d5c5787e33 100644 --- a/public/language/ko/global.json +++ b/public/language/ko/global.json @@ -3,9 +3,10 @@ "search": "검색", "buttons.close": "닫기", "403.title": "접근이 거부되었습니다.", - "403.message": "접근 권한이 없는 페이지에 접근하였습니다. 로그인되어 있는지 확인해 주세요.", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "페이지를 찾을 수 없습니다.", - "404.message": "존재하지 않는 페이지에 접근하였습니다. 홈으로 돌아갈 수 있습니다.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "내부 오류가 발생했습니다.", "500.message": "알 수 없는 오류가 발생했습니다.", "register": "회원가입", @@ -26,6 +27,7 @@ "header.tags": "태그", "header.popular": "인기 주제", "header.users": "사용자", + "header.groups": "Groups", "header.chats": "채팅", "header.notifications": "알림", "header.search": "검색", @@ -73,5 +75,7 @@ "updated.title": "포럼이 업데이트 되었습니다.", "updated.message": "이 포럼은 지금 최신 버전으로 업데이트 되었습니다. 여기를 누르면 페이지를 새로고침합니다.", "privacy": "개인정보", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/ko/groups.json b/public/language/ko/groups.json index bf61efd9a0..8a788bebb2 100644 --- a/public/language/ko/groups.json +++ b/public/language/ko/groups.json @@ -1,8 +1,21 @@ { "groups": "그룹", "view_group": "그룹 보기", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "그룹 상세정보", "details.members": "구성원 목록", + "details.pending": "Pending Members", "details.has_no_posts": "이 그룹의 구성원이 작성한 게시물이 없습니다.", - "details.latest_posts": "최근 게시물" + "details.latest_posts": "최근 게시물", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ko/recent.json b/public/language/ko/recent.json index 132e17f5c8..f05f6ff771 100644 --- a/public/language/ko/recent.json +++ b/public/language/ko/recent.json @@ -5,5 +5,14 @@ "month": "월간", "year": "연간", "alltime": "전체", - "no_recent_topics": "최근 생성된 주제가 없습니다." + "no_recent_topics": "최근 생성된 주제가 없습니다.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/ko/search.json b/public/language/ko/search.json index 2a523478a5..391a7477ee 100644 --- a/public/language/ko/search.json +++ b/public/language/ko/search.json @@ -1,4 +1,7 @@ { "results_matching": "\"%2\"와 일치하는 %1개의 결과를 찾았습니다 (검색시간: %3초)", - "no-matches": "게시물이 없습니다." + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index a3cbbdc7e5..ed806c5882 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "게시물이 선택되지 않았습니다.", "fork_success": "주제가 분리되었습니다! 분리된 주제를 보려면 여기를 클릭하세요.", "composer.title_placeholder": "여기에 제목을 입력하세요.", + "composer.handle_placeholder": "Name", "composer.discard": "취소", "composer.submit": "등록", "composer.replying_to": "'%1'에 대한 답글", @@ -92,5 +93,6 @@ "sort_by": "정렬", "oldest_to_newest": "오래된 순으로 정렬", "newest_to_oldest": "최신 순으로 정렬", - "most_votes": "추천수 순으로 정렬" + "most_votes": "추천수 순으로 정렬", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/ko/user.json b/public/language/ko/user.json index c0f0d5d3dd..c656a64242 100644 --- a/public/language/ko/user.json +++ b/public/language/ko/user.json @@ -2,6 +2,8 @@ "banned": "차단됨", "offline": "오프라인", "username": "사용자 이름", + "joindate": "Join Date", + "postcount": "Post Count", "email": "이메일", "confirm_email": "이메일 확인", "delete_account": "계정 삭제", @@ -16,6 +18,7 @@ "profile_views": "프로필 조회 수", "reputation": "인기도", "favourites": "좋아요", + "watched": "Watched", "followers": "이 사용자를 팔로우", "following": "이 사용자가 팔로우", "signature": "서명", @@ -56,10 +59,12 @@ "digest_weekly": "매주", "digest_monthly": "매월", "send_chat_notifications": "오프라인일 때 채팅 메시지가 도착하면 알림 메일을 보냅니다.", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "아무도 이 사용자를 팔로우하지 않습니다.", "follows_no_one": "이 사용자는 아무도 팔로우하지 않습니다.", "has_no_posts": "이 사용자는 게시물을 작성하지 않았습니다.", "has_no_topics": "이 사용자는 주제를 생성하지 않았습니다.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "이메일 비공개", "hidden": "비공개", "paginate_description": "주제와 게시물을 여러 페이지로 나누어 표시", diff --git a/public/language/ko/users.json b/public/language/ko/users.json index 0f0d1bfe91..14f0b96551 100644 --- a/public/language/ko/users.json +++ b/public/language/ko/users.json @@ -5,5 +5,8 @@ "search": "검색", "enter_username": "검색할 사용자 이름을 입력하세요.", "load_more": "더 보기", - "users-found-search-took": "%1명의 사용자를 찾았습니다! 검색에 %2 ms가 소요되었습니다." + "users-found-search-took": "%1명의 사용자를 찾았습니다! 검색에 %2 ms가 소요되었습니다.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/lt/email.json b/public/language/lt/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/lt/email.json +++ b/public/language/lt/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 9b09bb6b87..deb7944e24 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -18,6 +18,7 @@ "username-taken": "Vartotojo vardas jau užimtas", "email-taken": "El. pašto adresas jau užimtas", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Slapyvardis per trumpas", "username-too-long": "Username too long", "user-banned": "Vartotojas užblokuotas", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!", - "invalid-image-type": "Klaidingas paveikslėlio tipas", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Grupės pavadinimas per trumpas", "group-already-exists": "Tokia grupė jau egzistuoja", "group-name-change-not-allowed": "Grupės pavadinimas keitimas neleidžiamas", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/lt/global.json b/public/language/lt/global.json index dab0d48357..c4bf81cf4b 100644 --- a/public/language/lt/global.json +++ b/public/language/lt/global.json @@ -3,9 +3,10 @@ "search": "Ieškoti", "buttons.close": "Uždaryti", "403.title": "Prieiga negalima", - "403.message": "Atrodo, kad jūs bandote patekti į puslapį, kuriame jūsų prieiga negalima. Gal pabandykite prisijungti?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Nerasta", - "404.message": "Atrodo, kad jūs patekote į puslapį, kuris neegzistuoja. Grįžkite į namų puslapį", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Vidinė klaida.", "500.message": "Oops! Atrodo, kad kažkas nutiko!", "register": "Registruotis", @@ -26,6 +27,7 @@ "header.tags": "Žymos", "header.popular": "Populiarūs", "header.users": "Vartotojai", + "header.groups": "Groups", "header.chats": "Susirašinėjimai", "header.notifications": "Pranešimai", "header.search": "Ieškoti", @@ -73,5 +75,7 @@ "updated.title": "Forumas atnaujintas", "updated.message": "Forumas buvo atnaujintas iki naujausios versijos. Paspauskite čia norėdami perkrauti puslapį.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/lt/groups.json b/public/language/lt/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/lt/groups.json +++ b/public/language/lt/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/lt/recent.json b/public/language/lt/recent.json index 0ccdef0f8c..d9257022d6 100644 --- a/public/language/lt/recent.json +++ b/public/language/lt/recent.json @@ -5,5 +5,14 @@ "month": "Mėnesis", "year": "Metai", "alltime": "All Time", - "no_recent_topics": "Paskutinių temų nėra" + "no_recent_topics": "Paskutinių temų nėra", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/lt/search.json b/public/language/lt/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/lt/search.json +++ b/public/language/lt/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index 3ebdac9b97..2df888e5b7 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Nepasirinktas joks įrašas!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Įrašykite temos pavadinimą...", + "composer.handle_placeholder": "Name", "composer.discard": "Atšaukti", "composer.submit": "Patvirtinti", "composer.replying_to": "Atsakymas %1", @@ -92,5 +93,6 @@ "sort_by": "Rūšiuoti pagal", "oldest_to_newest": "Nuo seniausių iki naujausių", "newest_to_oldest": "Nuo naujausių iki seniausių", - "most_votes": "Daugiausiai balsų" + "most_votes": "Daugiausiai balsų", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/lt/user.json b/public/language/lt/user.json index e4f7a27dd2..7ec5d24423 100644 --- a/public/language/lt/user.json +++ b/public/language/lt/user.json @@ -2,6 +2,8 @@ "banned": "Užblokuotas", "offline": "Atsijungęs", "username": "Vartotojo vardas", + "joindate": "Join Date", + "postcount": "Post Count", "email": "El. paštas", "confirm_email": "Patvirtinti el. paštą", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "Profilio peržiūros", "reputation": "Reputacija", "favourites": "Mėgstamiausi", + "watched": "Watched", "followers": "Sekėjai", "following": "Seka", "signature": "Parašas", @@ -56,10 +59,12 @@ "digest_weekly": "Kas savaitę", "digest_monthly": "Kas mėnesį", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Šis vartotojas neturi jokių sekėjų :(", "follows_no_one": "Šis vartotojas nieko neseka :(", "has_no_posts": "Šis vartotojas dar neparašė nė vieno pranešimo.", "has_no_topics": "Šis vartotojas dar nesukūrė nė vienos temos.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "El. paštas paslėptas", "hidden": "paslėptas", "paginate_description": "Temose ir kategorijose naudoti numeraciją puslapiams vietoje begalinės slinkties.", diff --git a/public/language/lt/users.json b/public/language/lt/users.json index 66a9f76b1f..58f5d1793e 100644 --- a/public/language/lt/users.json +++ b/public/language/lt/users.json @@ -5,5 +5,8 @@ "search": "Ieškoti", "enter_username": "Įrašykite vartotojo vardą paieškai", "load_more": "Įkelti daugiau", - "users-found-search-took": "%1 paskyra(-os)! Paieška užtruko %2 ms." + "users-found-search-took": "%1 paskyra(-os)! Paieška užtruko %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/ms/email.json b/public/language/ms/email.json index 85de394b29..6e765e9f0b 100644 --- a/public/language/ms/email.json +++ b/public/language/ms/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Terima Kasih!" diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 6384d68eb1..336f7cd580 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -18,6 +18,7 @@ "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Nama pengunna terlalu pendek", "username-too-long": "Username too long", "user-banned": "User banned", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "You can't ban other admins!", - "invalid-image-type": "Invalid image type", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/ms/global.json b/public/language/ms/global.json index ebda99a05f..438206d7ef 100644 --- a/public/language/ms/global.json +++ b/public/language/ms/global.json @@ -3,9 +3,10 @@ "search": "Cari", "buttons.close": "Tutup", "403.title": "Akses dinafikan", - "403.message": "Anda telah menemui ruangan anda tidak diberikan akses. Munkin anda sepatutnya cuba log masuk semula?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "tidak dijumpai", - "404.message": "Anda telah menemui ruangan yang tidak wujud. kembali kelama utama?", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "ralat dalaman", "500.message": "Oops! ada yang tidak kena", "register": "Daftar", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "popular", "header.users": "pengguna", + "header.groups": "Groups", "header.chats": "chats", "header.notifications": "makluman", "header.search": "Cari", @@ -73,5 +75,7 @@ "updated.title": "Forum Updated", "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/ms/groups.json b/public/language/ms/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/ms/groups.json +++ b/public/language/ms/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ms/recent.json b/public/language/ms/recent.json index bface6de72..237ababd11 100644 --- a/public/language/ms/recent.json +++ b/public/language/ms/recent.json @@ -5,5 +5,14 @@ "month": "Bulan", "year": "Year", "alltime": "All Time", - "no_recent_topics": "Tiada topik terkini" + "no_recent_topics": "Tiada topik terkini", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/ms/search.json b/public/language/ms/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/ms/search.json +++ b/public/language/ms/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index d02259f03c..04be14258d 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Tiada kiriman yang dipilih", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Masukkan tajuk topik disini", + "composer.handle_placeholder": "Name", "composer.discard": "Abaikan", "composer.submit": "Hantar", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/ms/user.json b/public/language/ms/user.json index 90a0baa313..5b44dfc707 100644 --- a/public/language/ms/user.json +++ b/public/language/ms/user.json @@ -2,6 +2,8 @@ "banned": "Diharamkan", "offline": "Tidak ditalian", "username": "Nama pengguna", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Emel", "confirm_email": "Confirm Email", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "Lihat profil", "reputation": "Reputasi", "favourites": "Kegemaran", + "watched": "Watched", "followers": "Pengikut", "following": "Mengikuti", "signature": "Tandatangan", @@ -56,10 +59,12 @@ "digest_weekly": "Mingguan", "digest_monthly": "Bulanan", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Pengguna ini tiada pengikut :(", "follows_no_one": "Pengguna ini tidak mengikuti sesiapa :(", "has_no_posts": "Pengguna ini masih belum mengirim sebarang pos", "has_no_topics": "Pengguna ini masih belum menghantar sebarang kiriman", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Emel disembunyikan", "hidden": "disembunyikan", "paginate_description": "Pecahkan topik dan pesanan adalah lebih baik daripada menggunakan scroll berterusan", diff --git a/public/language/ms/users.json b/public/language/ms/users.json index ddb632d1dc..3e1a3f089b 100644 --- a/public/language/ms/users.json +++ b/public/language/ms/users.json @@ -5,5 +5,8 @@ "search": "Cari", "enter_username": "Masukkan nama pengguna untuk carian", "load_more": "Muat lagi", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/nb/email.json b/public/language/nb/email.json index f9c1377ab0..c3c3e3f474 100644 --- a/public/language/nb/email.json +++ b/public/language/nb/email.json @@ -13,10 +13,12 @@ "digest.latest_topics": "Siste emner fra %1", "digest.cta": "Klikk her for å besøke %1", "digest.unsub.info": "Dette sammendraget er sendt til deg basert på dine innstillinger for abonnering.", - "digest.no_topics": "There have been no active topics in the past %1", + "digest.no_topics": "Det har ikke vært noen aktive tråder i det siste %1", "notif.chat.subject": "Ny chat-melding mottatt fra %1", "notif.chat.cta": "Klikk her for å fortsette samtalen", "notif.chat.unsub.info": "Denne chat-varselen er sendt til deg basert på dine innstillinger for abonnering.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Dette er en test-epost for å verifisere at epostsystemet i NodeBB fungerer som det skal.", "unsub.cta": "Klikk her for å endre disse innstillingene", "closing": "Takk!" diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 45dd6f6853..ef6f1a20b0 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -18,6 +18,7 @@ "username-taken": "Brukernavn opptatt", "email-taken": "E-post opptatt", "email-not-confirmed": "E-posten din har ikke blitt bekreftet enda, vennligst klikk for å bekrefte din e-post.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Brukernavnet er for kort", "username-too-long": "Brukernavnet er for langt", "user-banned": "Bruker utestengt", @@ -43,10 +44,13 @@ "already-favourited": "Du har allerede favorittmerket dette innlegget", "already-unfavourited": "Du har allerede avfavorisert dette innlegget", "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!", - "invalid-image-type": "Ugyldig bildetype", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Gruppenavnet er for kort", "group-already-exists": "Gruppe eksisterer allerede", "group-name-change-not-allowed": "Gruppenavn ikke tillatt", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Dette innlegget har blitt slettet", "post-already-restored": "Dette innlegget har allerede blitt gjenopprettet", "topic-already-deleted": "Dette emnet har allerede blitt slettet", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Du har ikke nok rykte til å nedstemme det innlegget", "not-enough-reputation-to-flag": "Du har ikke nok rykte til å flagge dette innlegget", "reload-failed": "NodeBB støtte på et problem under lasting på nytt: \"%1\". NodeBB vil fortsette å servere eksisterende klientside ressureser, selv om du burde angre endringene du gjorde før du lastet på nytt.", - "registration-error": "Registration Error" + "registration-error": "Feil under registrering", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/nb/global.json b/public/language/nb/global.json index c1f1f40f39..34f3d08cc4 100644 --- a/public/language/nb/global.json +++ b/public/language/nb/global.json @@ -3,9 +3,10 @@ "search": "Søk", "buttons.close": "Steng", "403.title": "Adgang nektet", - "403.message": "Du har funnet en side du ikke har tilgang til. Kanskje du skal prøve å logge inn?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Ikke funnet", - "404.message": "Du har funnet en side som ikke eksisterer. Returner til startsiden?", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Intern feil.", "500.message": "Oops! Ser ut som noe gikk galt!", "register": "Registrer", @@ -26,6 +27,7 @@ "header.tags": "Tagger", "header.popular": "Populære", "header.users": "Brukere", + "header.groups": "Groups", "header.chats": "Chatter", "header.notifications": "Varsler", "header.search": "Søk", @@ -73,5 +75,7 @@ "updated.title": "Forum oppdatert", "updated.message": "Dette forumet har nettopp blitt oppdatert til den nyeste versjonen. Klikk her for å laste siden på nytt.", "privacy": "Personvern", - "delete_all": "Delete All" + "follow": "Follow", + "unfollow": "Unfollow", + "delete_all": "Slett alle" } \ No newline at end of file diff --git a/public/language/nb/groups.json b/public/language/nb/groups.json index 7762e5b3ad..3319bcb9a2 100644 --- a/public/language/nb/groups.json +++ b/public/language/nb/groups.json @@ -1,8 +1,21 @@ { "groups": "Grupper", "view_group": "Vis gruppe", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Gruppedetaljer", "details.members": "Medlemsliste", + "details.pending": "Pending Members", "details.has_no_posts": "Medlemmene i denne gruppen har ikke skrevet noen innlegg.", - "details.latest_posts": "Seneste innlegg" + "details.latest_posts": "Seneste innlegg", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/nb/recent.json b/public/language/nb/recent.json index 4b5611e8a8..4a77aab5ab 100644 --- a/public/language/nb/recent.json +++ b/public/language/nb/recent.json @@ -5,5 +5,14 @@ "month": "Måned", "year": "År", "alltime": "All tid", - "no_recent_topics": "Det er ingen nye tråder." + "no_recent_topics": "Det er ingen nye tråder.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/nb/search.json b/public/language/nb/search.json index d27adb6754..2e9ad3665c 100644 --- a/public/language/nb/search.json +++ b/public/language/nb/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 resultat(er) samsvarer med \"%2\", (%3 sekunder)", - "no-matches": "Ingen innlegg funnet" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 7b0156352c..7690cd7114 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Ingen innlegg valgt!", "fork_success": "Dette emnet ble delt! Klikk for å gå til delt emne.", "composer.title_placeholder": "Skriv din tråd-tittel her", + "composer.handle_placeholder": "Name", "composer.discard": "Forkast", "composer.submit": "Send", "composer.replying_to": "Svarer i %1", @@ -92,5 +93,6 @@ "sort_by": "Sorter etter", "oldest_to_newest": "Eldste til nyeste", "newest_to_oldest": "Nyeste til eldste", - "most_votes": "Flest stemmer" + "most_votes": "Flest stemmer", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/nb/user.json b/public/language/nb/user.json index 565dac3bae..b154436e80 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -2,6 +2,8 @@ "banned": "Utestengt", "offline": "Offline", "username": "Brukernavn", + "joindate": "Join Date", + "postcount": "Post Count", "email": "E-post", "confirm_email": "Bekfreft e-post", "delete_account": "Slett konto", @@ -16,6 +18,7 @@ "profile_views": "Profilvisninger", "reputation": "Rykte", "favourites": "Favoritter", + "watched": "Watched", "followers": "Følgere", "following": "Følger", "signature": "Signatur", @@ -56,10 +59,12 @@ "digest_weekly": "Ukentlig", "digest_monthly": "Månedlig", "send_chat_notifications": "Send en epost hvis jeg mottar en chat-melding når jeg ikke er pålogget", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Denne brukeren har ingen følgere :(", "follows_no_one": "Denne brukeren følger ingen :(", "has_no_posts": "Denne brukeren har ikke skrevet noe enda.", "has_no_topics": "Denne brukeren har ikke skrevet noen emner enda.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "E-post skjult", "hidden": "skjult", "paginate_description": "Paginer tråder og innlegg istedet for å bruke uendelig skrolling.", @@ -68,8 +73,8 @@ "notification_sounds": "Spill av en lyd når du mottar ett varsel.", "browsing": "Surfeinnstillinger", "open_links_in_new_tab": "Åpne utgående linker i en ny fane?", - "enable_topic_searching": "Enable In-Topic Searching", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", + "enable_topic_searching": "Aktiver søk-i-emne", + "topic_search_help": "Hvis aktivert, vil i-emne-søk overstyre nettleseren sin standard sidesøk-oppførsel og tillate deg å søke gjennom hele emnet, i stedet for bare det som vises på skjermen.", "follow_topics_you_reply_to": "Følg emner du svarer i.", "follow_topics_you_create": "Følg emner du oppretter." } \ No newline at end of file diff --git a/public/language/nb/users.json b/public/language/nb/users.json index f5a8de35de..e0f8363a64 100644 --- a/public/language/nb/users.json +++ b/public/language/nb/users.json @@ -5,5 +5,8 @@ "search": "Søk", "enter_username": "Skriv ett brukernavn for å søke", "load_more": "Last flere", - "users-found-search-took": "%1 bruker(e) funnet! Søk tok %2 ms." + "users-found-search-took": "%1 bruker(e) funnet! Søk tok %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/nl/email.json b/public/language/nl/email.json index 0ca1b08ba7..ec4296182c 100644 --- a/public/language/nl/email.json +++ b/public/language/nl/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "U heeft een chatbericht ontvangen van %1", "notif.chat.cta": "Klik hier om het gesprek te hervatten", "notif.chat.unsub.info": "Deze chat notificatie was verzonden naar jou vanwege je abbonement instellingen", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Dit is een test email om te verifiëren dat de email service correct is opgezet voor jou NodeBB", "unsub.cta": "Klik hier om u instellingen te wijzigen", "closing": "Bedankt!" diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 160c838e0d..6e4553687a 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -18,6 +18,7 @@ "username-taken": "Gebruikersnaam is al bezet", "email-taken": "Email adres is al gebruikt", "email-not-confirmed": "U email adres is niet bevestigd, Klik hier om uw email adres te bevestigen", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Gebruikersnaam is te kort", "username-too-long": "Gebruikersnaam is te lang", "user-banned": "Gebruiker verbannen", @@ -43,10 +44,13 @@ "already-favourited": "U heeft al dit bericht in uw favorieten staan", "already-unfavourited": "U heeft al dit bericht uit uw favorieten gehaald", "cant-ban-other-admins": "U kunt niet de andere admins bannen!", - "invalid-image-type": "Ongeldig foto type", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "De groepsnaam is te kort", "group-already-exists": "Deze groep bestaat al", "group-name-change-not-allowed": "Het veranderen van de groepsnaam is niet toegestaan!", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Dit bericht is al verwijderd", "post-already-restored": "Dit bericht is al hersteld", "topic-already-deleted": "Deze topic is al verwijderd", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "U heeft niet de benodigde reputatie om dit bericht te downvoten", "not-enough-reputation-to-flag": "U heeft niet de benodigde reputatie om dit bericht te melden aan de admins", "reload-failed": "NodeBB heeft een probleem geconstateerd tijdens het laden van: \"%1\".\nNodeBB blijft verder draaien. Het is wel verstandig om de actie wat u daarvoor heeft gedaan ongedaan te maken door te herladen.", - "registration-error": "Registratie fout" + "registration-error": "Registratie fout", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/nl/global.json b/public/language/nl/global.json index 74459f5810..84899903b0 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -3,9 +3,10 @@ "search": "Zoeken", "buttons.close": "Sluiten", "403.title": "Toegang Geweigerd", - "403.message": "Het lijkt erop dat je op een pagina beland bent waar je geen toegang tot hebt. Misschien moet je inloggen?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Niet Gevonden", - "404.message": "Het lijkt erop dat je op een pagina beland bent die niet bestaat. Ga terug naar de home pagina.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Interne fout.", "500.message": "Oeps! Het lijkt erop dat iets is fout gegaan!", "register": "Registeren", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Populair", "header.users": "Gebruikers", + "header.groups": "Groups", "header.chats": "Chats", "header.notifications": "Notificaties", "header.search": "Zoeken", @@ -73,5 +75,7 @@ "updated.title": "Forum geüpdatet", "updated.message": "Dit forum is zojuist geüpdatet naar de laatste versie. Klik hier om de pagina te verversen", "privacy": "Privé", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Alles verwijderen" } \ No newline at end of file diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json index b0dccd48be..14a4023b74 100644 --- a/public/language/nl/groups.json +++ b/public/language/nl/groups.json @@ -1,8 +1,21 @@ { "groups": "Groepen", "view_group": "Bekijk Groep", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Groep Details", "details.members": "Ledenlijst", + "details.pending": "Pending Members", "details.has_no_posts": "Deze groepleden hebben nog geen berichten geplaatst", - "details.latest_posts": "Nieuwste Berichten" + "details.latest_posts": "Nieuwste Berichten", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/nl/recent.json b/public/language/nl/recent.json index fbbfaaeb52..56f3ca3288 100644 --- a/public/language/nl/recent.json +++ b/public/language/nl/recent.json @@ -5,5 +5,14 @@ "month": "Maand", "year": "Jaar", "alltime": "Intussen", - "no_recent_topics": "Er zijn geen recente reacties." + "no_recent_topics": "Er zijn geen recente reacties.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/nl/search.json b/public/language/nl/search.json index cb61065a4e..837a109e6f 100644 --- a/public/language/nl/search.json +++ b/public/language/nl/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)", - "no-matches": "Geen berichten gevonden" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index 76f174d10d..c5a7af6b2f 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Geen berichten geselecteerd!", "fork_success": "Met succes het onderwerp gesplitst. klik hier om naar het nieuwe onderwerp te gaan.", "composer.title_placeholder": "Vul de titel voor het onderwerp hier in...", + "composer.handle_placeholder": "Name", "composer.discard": "Annuleren", "composer.submit": "Opslaan", "composer.replying_to": "Reageren op %1", @@ -92,5 +93,6 @@ "sort_by": "gesorteerd op", "oldest_to_newest": "Oud naar Nieuw", "newest_to_oldest": "Nieuw naar Oud", - "most_votes": "Meeste stemmen" + "most_votes": "Meeste stemmen", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/nl/user.json b/public/language/nl/user.json index 6b99ab28c8..fccd6ac057 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -2,6 +2,8 @@ "banned": "Verbannen", "offline": "Offline", "username": "Gebruikersnaam", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Bevestig uw email adres", "delete_account": "Account Verwijderen", @@ -16,6 +18,7 @@ "profile_views": "Profiel weergaven", "reputation": "Reputatie", "favourites": "Favorieten", + "watched": "Watched", "followers": "Volgers", "following": "Volgend", "signature": "Handtekening", @@ -56,10 +59,12 @@ "digest_weekly": "Weekelijks", "digest_monthly": "Maandelijks", "send_chat_notifications": "Verstuur mij een email als iemand een chatbericht stuurt terwijl ik niet online ben", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Deze gebruiker heeft geen volgers :(", "follows_no_one": "Deze gebruiker volgt niemand :(", "has_no_posts": "Deze gebruiker heeft nog geen berichten geplaatst", "has_no_topics": "Deze gebruiker heeft nog geen berichten geplaatst", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Verborgen", "hidden": "verborgen", "paginate_description": "Blader door onderwerpen en berichten in plaats van oneindig scrollen.", diff --git a/public/language/nl/users.json b/public/language/nl/users.json index 7dd347b5c3..3f19d8316f 100644 --- a/public/language/nl/users.json +++ b/public/language/nl/users.json @@ -5,5 +5,8 @@ "search": "Zoeken", "enter_username": "Vul een gebruikersnaam in om te zoeken", "load_more": "Meer Laden", - "users-found-search-took": "%1 gebruiker(s) gevonden! Zoekactie duurde %2 ms." + "users-found-search-took": "%1 gebruiker(s) gevonden! Zoekactie duurde %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/pl/email.json b/public/language/pl/email.json index d6293baa43..04816f6185 100644 --- a/public/language/pl/email.json +++ b/public/language/pl/email.json @@ -13,10 +13,12 @@ "digest.latest_topics": "Ostatnie tematy z %1", "digest.cta": "Kliknij, by odwiedzić %1", "digest.unsub.info": "To podsumowanie zostało wysłane zgodnie z Twoimi ustawieniami.", - "digest.no_topics": "There have been no active topics in the past %1", - "notif.chat.subject": "Nowa wiadomość chatu od %1", + "digest.no_topics": "Nie było żadnych aktywnych wątków %1", + "notif.chat.subject": "Nowa wiadomość czatu od %1", "notif.chat.cta": "Kliknij tutaj, by kontynuować konwersację", - "notif.chat.unsub.info": "To powiadomienie o chacie zostało Ci wysłane zgodnie z ustawieniami Twojego konta.", + "notif.chat.unsub.info": "To powiadomienie o czacie zostało Ci wysłane zgodnie z ustawieniami Twojego konta.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "To jest e-mail testowy, aby sprawdzić, czy poprawnie skonfigurowałeś e-mailer w swoim NodeBB.", "unsub.cta": "Kliknij tutaj, by zmienić te ustawienia", "closing": "Dziękujemy!" diff --git a/public/language/pl/error.json b/public/language/pl/error.json index b2c1c94b7d..d35d020cc6 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -18,6 +18,7 @@ "username-taken": "Login zajęty.", "email-taken": "E-mail zajęty.", "email-not-confirmed": "Twój email nie został jeszcze potwierdzony. Proszę kliknąć tutaj by go potwierdzić.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Nazwa użytkownika za krótka.", "username-too-long": "Zbyt długa nazwa użytkownika", "user-banned": "Użytkownik zbanowany", @@ -43,10 +44,13 @@ "already-favourited": "Już polubiłeś ten post", "already-unfavourited": "Już przestałeś lubić ten post", "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", - "invalid-image-type": "Błędny typ pliku", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Nazwa grupy za krótka", "group-already-exists": "Grupa już istnieje", "group-name-change-not-allowed": "Nie można zmieniać nazwy tej grupy.", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Ten post został już skasowany", "post-already-restored": "Ten post został już przywrócony", "topic-already-deleted": "Ten temat został już skasowany", @@ -56,12 +60,13 @@ "uploads-are-disabled": "Uploadowanie jest wyłączone", "upload-error": "Błąd uploadu: %1", "signature-too-long": "Przepraszamy, ale podpis nie może być dłuższy niż %1 znaków.", - "cant-chat-with-yourself": "Nie możesz czatować ze sobą", + "cant-chat-with-yourself": "Nie możesz rozmawiać ze sobą", "chat-restricted": "Ten użytkownik ograniczył swoje czaty. Musi Cię śledzić, zanim będziesz mógł z nim czatować.", "reputation-system-disabled": "System reputacji został wyłączony", "downvoting-disabled": "Ocena postów jest wyłączona", "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post.", "not-enough-reputation-to-flag": "Nie masz dość reputacji, by flagować ten post", "reload-failed": "NodeBB napotkał problem w czasie ładowania \"%1\". Forum będzie nadal dostarczać zasoby dostępne w kliencie, jednak powinieneś cofnąć ostatnią akcję.", - "registration-error": "Błąd rejestracji" + "registration-error": "Błąd rejestracji", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 38add8afba..a0c76caf7f 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -3,9 +3,10 @@ "search": "Szukaj", "buttons.close": "Zamknij", "403.title": "Dostęp zabroniony", - "403.message": "Natknąłeś się na stronę, do której nie masz dostępu. Może spróbuj się zalogować?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Nie znaleziono", - "404.message": "Natknąłeś się na nieistniejącą stronę. Wróć do strony głównej.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Błąd wewnętrzny", "500.message": "Ups! Coś poszło nie tak.", "register": "Zarejestruj się", @@ -26,6 +27,7 @@ "header.tags": "Tagi", "header.popular": "Popularne", "header.users": "Użytkownicy", + "header.groups": "Groups", "header.chats": "Rozmowy", "header.notifications": "Powiadomienia", "header.search": "Szukaj", @@ -73,5 +75,7 @@ "updated.title": "Forum zaktualizowane", "updated.message": "To forum zostało zaktualizowane do najnowszej wersji. Kliknij tutaj by odświeżyć stronę", "privacy": "Prywatność", - "delete_all": "Delete All" + "follow": "Follow", + "unfollow": "Unfollow", + "delete_all": "Usuń wszystko" } \ No newline at end of file diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json index d618ade34b..9fdd6d6c79 100644 --- a/public/language/pl/groups.json +++ b/public/language/pl/groups.json @@ -1,8 +1,21 @@ { "groups": "Grupy", "view_group": "Obejrzyj grupę", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Szczegóły grupy", "details.members": "Lista członków", + "details.pending": "Pending Members", "details.has_no_posts": "Członkowie tej grupy nie napisali żadnych postów.", - "details.latest_posts": "Ostatnie posty" + "details.latest_posts": "Ostatnie posty", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json index aca4a95c56..af44c3ab51 100644 --- a/public/language/pl/modules.json +++ b/public/language/pl/modules.json @@ -1,16 +1,16 @@ { "chat.chatting_with": "Rozmawiaj z ", - "chat.placeholder": "Wpisz wiadomość czatu tutaj, naciśnij enter by wysłać.", + "chat.placeholder": "Wpisz wiadomość tutaj i naciśnij Enter aby wysłać.", "chat.send": "Wyślij", "chat.no_active": "Nie prowadzisz obecnie żadnych rozmów.", "chat.user_typing": "%1 pisze...", "chat.user_has_messaged_you": "%1 napisał do Ciebie", - "chat.see_all": "Pokaż wszystkie czaty", - "chat.no-messages": "Wybierz odbiorce by zobaczyć historię czatu.", - "chat.recent-chats": "Ostatnie czaty.", + "chat.see_all": "Pokaż wszystkie rozmowy", + "chat.no-messages": "Wybierz odbiorcę, by wyświetlić historię rozmów.", + "chat.recent-chats": "Ostatnie rozmowy", "chat.contacts": "Kontakty", "chat.message-history": "Historia wiadomości", - "chat.pop-out": "Pokaż czat", + "chat.pop-out": "Otwórz rozmowę w nowym oknie", "chat.maximize": "Maksymalizuj", "chat.seven_days": "7 dni", "chat.thirty_days": "30 dni", diff --git a/public/language/pl/recent.json b/public/language/pl/recent.json index 207d22a1d8..382c9d8095 100644 --- a/public/language/pl/recent.json +++ b/public/language/pl/recent.json @@ -5,5 +5,14 @@ "month": "Miesiąc", "year": "Rok", "alltime": "Od początku", - "no_recent_topics": "Brak ostatnich wątków." + "no_recent_topics": "Brak ostatnich wątków.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/pl/search.json b/public/language/pl/search.json index ed42681f15..472b6bf10c 100644 --- a/public/language/pl/search.json +++ b/public/language/pl/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 wyników pasujących do \"%2\", (%3 sekund)", - "no-matches": "Nie znaleziono postów" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/pl/success.json b/public/language/pl/success.json index d8633f5ccd..afef91d9a0 100644 --- a/public/language/pl/success.json +++ b/public/language/pl/success.json @@ -1,6 +1,6 @@ { "success": "Sukces!", - "topic-post": "Wysłałeś posta!", - "authentication-successful": "Autoryzacja przebiegła pomyślnie!", - "settings-saved": "Ustawienia zapisane!" + "topic-post": "Twój post został wysłany.", + "authentication-successful": "Zostałeś pomyślnie zalogowany.", + "settings-saved": "Ustawienia zostały zapisane." } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index ded37cf3db..e5d3a154ae 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -14,7 +14,7 @@ "reply": "Odpowiedz", "edit": "Edytuj", "delete": "Usuń", - "purge": "Wyczyść", + "purge": "Wymaż", "restore": "Przywróć", "move": "Przenieś", "fork": "Skopiuj", @@ -50,8 +50,8 @@ "thread_tools.delete_confirm": "Na pewno chcesz skasować ten wątek?", "thread_tools.restore": "Przywróć wątek", "thread_tools.restore_confirm": "Na pewno chcesz przywrócić ten wątek?", - "thread_tools.purge": "Wyczyść wątek", - "thread_tools.purge_confirm": "Na pewno chcesz wyczyścić ten wątek?", + "thread_tools.purge": "Wymaż wątek", + "thread_tools.purge_confirm": "Na pewno chcesz wymazać ten wątek?", "topic_move_success": "Temat przeniesiono do %1", "post_delete_confirm": "Na pewno chcesz usunąć ten post?", "post_restore_confirm": "Na pewno chcesz przywrócić ten post?", @@ -72,8 +72,9 @@ "topic_will_be_moved_to": "Ten wątek zostanie przeniesiony do kategorii", "fork_topic_instruction": "Zaznacz posty, które chcesz sklonować", "fork_no_pids": "Nie zaznaczyłeś żadnych postów!", - "fork_success": "Successfully forked topic! Click here to go to the forked topic.", + "fork_success": "Udało się skopiować wątek. Kliknij tutaj, aby do niego przejść.", "composer.title_placeholder": "Wpisz tytuł wątku tutaj", + "composer.handle_placeholder": "Name", "composer.discard": "Odrzuć", "composer.submit": "Wyślij", "composer.replying_to": "Odpowiadanie na %1", @@ -89,8 +90,9 @@ "more_users": "%1 więcej użytkownik(ów)", "more_guests": "%1 więcej gośc(i)", "users_and_others": "%1 i %2 innych", - "sort_by": "Sortuj po", + "sort_by": "Sortuj według", "oldest_to_newest": "Najpierw najstarsze", "newest_to_oldest": "Najpierw najnowsze", - "most_votes": "Najwięcej głosów" + "most_votes": "Najwięcej głosów", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/pl/user.json b/public/language/pl/user.json index 8c11d5e145..b031c36d5a 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -2,6 +2,8 @@ "banned": "Zbanowany", "offline": "Offline", "username": "Nazwa użytkownika", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Adres e-mail", "confirm_email": "Potwierdź e-mail", "delete_account": "Skasuj konto", @@ -16,6 +18,7 @@ "profile_views": "wyświetleń", "reputation": "reputacji", "favourites": "Ulubione", + "watched": "Watched", "followers": "Obserwujących", "following": "Obserwowanych", "signature": "Sygnatura", @@ -48,18 +51,20 @@ "settings": "Ustawienia", "show_email": "Wyświetlaj mój adres e-mail", "show_fullname": "Wyświetlaj moją pełną nazwę", - "restrict_chats": "Pozwalaj tylko na czaty od użytkowników, których śledzę", + "restrict_chats": "Pozwalaj tylko na rozmowy z użytkownikami, których śledzę", "digest_label": "Przysyłaj okresowe podsumowanie wiadomości na forum", "digest_description": "Subskrybuj by dostawać maile z tego forum (nowe powiadomienia i tematy) zgodnie z ustalonym harmonogramem.", "digest_off": "Wyłączone", "digest_daily": "Codziennie", "digest_weekly": "Co tydzień", "digest_monthly": "Co miesiąc", - "send_chat_notifications": "Wyślij e-maila, jeśli dostanę nową wiadomość z chatu, a nie jestem on-line", + "send_chat_notifications": "Wyślij e-maila, jeśli dostanę nową wiadomość, a nie jestem on-line", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Ten użytkownik nie ma jeszcze żadnych obserwujących", "follows_no_one": "Użytkownik jeszcze nikogo nie obsweruje.", "has_no_posts": "Użytkownik nie napisał jeszcze żadnych postów.", "has_no_topics": "Ten użytkownik nie napisał jeszcze żadnego wątku.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Adres e-mail ukryty", "hidden": "ukryty", "paginate_description": "Użyj klasycznego trybu paginacji zamiast nieskończonego przewijania.", @@ -68,8 +73,8 @@ "notification_sounds": "Odtwórz dźwięk po otrzymaniu powiadomienia.", "browsing": "Ustawienia szukania", "open_links_in_new_tab": "Otwierać linki zewnętrzne w nowych kartach?", - "enable_topic_searching": "Enable In-Topic Searching", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", + "enable_topic_searching": "Odblokuj szukanie w wątku", + "topic_search_help": "Jeśli odblokowane, szukanie w wątku zastąpi domyślną funkcję szukania przeglądarki, pozwalając na wyszukiwanie fraz tylko w wątku, a nie na całej stronie.", "follow_topics_you_reply_to": "Śledź tematy, w których piszesz.", "follow_topics_you_create": "Śledź swoje tematy." } \ No newline at end of file diff --git a/public/language/pl/users.json b/public/language/pl/users.json index cd1d22696b..38ff75b928 100644 --- a/public/language/pl/users.json +++ b/public/language/pl/users.json @@ -5,5 +5,8 @@ "search": "Szukaj", "enter_username": "Wpisz nazwę użytkownika", "load_more": "Więcej", - "users-found-search-took": "Znaleziono %1 użytkowników. Szukanie zajęło %2 ms." + "users-found-search-took": "Znaleziono %1 użytkowników. Szukanie zajęło %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/pt_BR/email.json b/public/language/pt_BR/email.json index f42a4b4987..4465631a3e 100644 --- a/public/language/pt_BR/email.json +++ b/public/language/pt_BR/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Nova mensagem de chat recebida de %1", "notif.chat.cta": "Clique aqui para continuar a conversa", "notif.chat.unsub.info": "Esta notificação de chat foi enviada a você devido às suas configurações de assinatura.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Este é um e-mail de teste, para verificar que o enviador de emails está corretamente configurado no seu NodeBB.", "unsub.cta": "Clique aqui para alterar estas configurações", "closing": "Obrigado!" diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index e5b637d321..127303d653 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -18,6 +18,7 @@ "username-taken": "Nome de usuário já existe", "email-taken": "Email já cadastrado", "email-not-confirmed": "O seu email ainda não foi confirmado, por favor clique aqui para confirmar seu email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Nome de usuário muito curto", "username-too-long": "Nome de usuário muito longo", "user-banned": "Usuário banido", @@ -43,10 +44,13 @@ "already-favourited": "Você já adicionou este post aos favoritos", "already-unfavourited": "Você já removeu este post dos favoritos", "cant-ban-other-admins": "Você não pode banir outros administradores!", - "invalid-image-type": "Formato inválido de imagem", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Nome do grupo é muito curto", "group-already-exists": "O grupo já existe", "group-name-change-not-allowed": "Sem permissão para alterar nome do grupo", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Este post já foi deletado", "post-already-restored": "Este post já foi restaurado", "topic-already-deleted": "Esté tópico já foi deletado", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post", "not-enough-reputation-to-flag": "Você não possui reputação suficiente para sinalizar este post", "reload-failed": "O NodeBB encontrou um problema ao recarregar: \"%1\". O NodeBB continuará a servir os assets existentes no lado do cliente, apesar de que você deve desfazer o que você fez antes de recarregar.", - "registration-error": "Erro de Cadastro" + "registration-error": "Erro de Cadastro", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/pt_BR/global.json b/public/language/pt_BR/global.json index 898092d10e..88a9d803e6 100644 --- a/public/language/pt_BR/global.json +++ b/public/language/pt_BR/global.json @@ -3,9 +3,10 @@ "search": "Procurar", "buttons.close": "Fechar", "403.title": "Acesso Negado", - "403.message": "Parece que você chegou à uma página que você não pode acessar. Talvez você devesse tentar logar?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Não Encontrado", - "404.message": "Parece que você chegou à uma página que não existe. Retorne para a página principal.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Erro interno.", "500.message": "Oops! Parece que algo deu errado!", "register": "Cadastrar", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Popular", "header.users": "Usuários", + "header.groups": "Groups", "header.chats": "Chats", "header.notifications": "Notificações", "header.search": "Procurar", @@ -73,5 +75,7 @@ "updated.title": "Fórum Atualizado", "updated.message": "Este fórum foi atualizado para sua última versão. Clique aqui para atualizar a página.", "privacy": "Privacidade", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Deletar Tudo" } \ No newline at end of file diff --git a/public/language/pt_BR/groups.json b/public/language/pt_BR/groups.json index 21f637560b..1893fb87a5 100644 --- a/public/language/pt_BR/groups.json +++ b/public/language/pt_BR/groups.json @@ -1,8 +1,21 @@ { "groups": "Grupos", "view_group": "Ver Grupo", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Detalhes do Grupo", "details.members": "Lista de Membros", + "details.pending": "Pending Members", "details.has_no_posts": "Os membros deste grupo não fizeram quaisquer posts.", - "details.latest_posts": "Últimos Posts" + "details.latest_posts": "Últimos Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/pt_BR/recent.json b/public/language/pt_BR/recent.json index 3a90838f01..3c3551e0c1 100644 --- a/public/language/pt_BR/recent.json +++ b/public/language/pt_BR/recent.json @@ -5,5 +5,14 @@ "month": "Mês", "year": "Ano", "alltime": "Todos os Tempos", - "no_recent_topics": "Não há tópicos recentes." + "no_recent_topics": "Não há tópicos recentes.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/pt_BR/search.json b/public/language/pt_BR/search.json index 1b36858f11..9d1e425017 100644 --- a/public/language/pt_BR/search.json +++ b/public/language/pt_BR/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 resultado(s) contendo \"%2\", (%3 segundos)", - "no-matches": "Nenhum post encontrado" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json index 967836a09f..d93e414d45 100644 --- a/public/language/pt_BR/topic.json +++ b/public/language/pt_BR/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Nenhum post selecionado!", "fork_success": "Tópico clonado com sucesso! Clique aqui para ir ao tópico clonado.", "composer.title_placeholder": "Digite aqui o título para o seu tópico...", + "composer.handle_placeholder": "Name", "composer.discard": "Descartar", "composer.submit": "Enviar", "composer.replying_to": "Respondendo para %1", @@ -92,5 +93,6 @@ "sort_by": "Ordenar por", "oldest_to_newest": "Mais Antigo para Mais Recente", "newest_to_oldest": "Mais Recente para Mais Antigo", - "most_votes": "Mais votados" + "most_votes": "Mais votados", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json index 7fc6f2fa22..f4fe0a6602 100644 --- a/public/language/pt_BR/user.json +++ b/public/language/pt_BR/user.json @@ -2,6 +2,8 @@ "banned": "Banido", "offline": "Offline", "username": "Nome de Usuário", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Confirmar Email", "delete_account": "Deletar Conta", @@ -16,6 +18,7 @@ "profile_views": "Visualizações de perfil", "reputation": "Reputação", "favourites": "Favoritos", + "watched": "Watched", "followers": "Seguidores", "following": "Seguindo", "signature": "Assinatura", @@ -56,10 +59,12 @@ "digest_weekly": "Semanalmente", "digest_monthly": "Mensalmente", "send_chat_notifications": "Enviar-me um email se uma nova mensagem de chat chegar quando eu não estiver online.", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Este usuário não possui seguidores :(", "follows_no_one": "Este usuário não está seguindo ninguém :(", "has_no_posts": "Este usuário não postou nada ainda.", "has_no_topics": "Este usuário ainda não criou nenhum tópico.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Escondido", "hidden": "escondido", "paginate_description": "Paginação de tópicos e posts ao invés de usar \"rolagem infinita\".", diff --git a/public/language/pt_BR/users.json b/public/language/pt_BR/users.json index fc4058d07c..66ea217bd6 100644 --- a/public/language/pt_BR/users.json +++ b/public/language/pt_BR/users.json @@ -5,5 +5,8 @@ "search": "Procurar", "enter_username": "Digite um nome de usuário para procurar", "load_more": "Carregar Mais", - "users-found-search-took": "%1 usuário(s) encontrado(s)! A pesquisa demorou %2 ms." + "users-found-search-took": "%1 usuário(s) encontrado(s)! A pesquisa demorou %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/ro/email.json b/public/language/ro/email.json index 568d987407..0e3a1da8ab 100644 --- a/public/language/ro/email.json +++ b/public/language/ro/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Ai primit un mesaj de la %1", "notif.chat.cta": "Apasă aici pentru a continua conversația", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Acesta este un email de test pentru a verica dacă mailul este setat corect pentru NodeBB-ul tău.", "unsub.cta": "Apasă aici pentru a modifica acele setări", "closing": "Mulțumesc!" diff --git a/public/language/ro/error.json b/public/language/ro/error.json index e99d5e5b68..ce47fad775 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -18,6 +18,7 @@ "username-taken": "Numele de utilizator este deja folosit", "email-taken": "Adresa de email este deja folostă", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Numele de utilizator este prea scurt", "username-too-long": "Numele de utilizator este prea lung", "user-banned": "Utilizator banat", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "Nu poți bana alți administratori!", - "invalid-image-type": "Tip de imagine invalid", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Numele grupului este prea scurt", "group-already-exists": "Grupul deja există", "group-name-change-not-allowed": "Schimbarea numelui grupului este interzisă", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post.", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB a întâmpinat o problemă la reîncarcare: \"%1\". NodeBB va continua să servească fișierele existente pentru partea-client, dar tu va trebuie să refaci modificările pe care le-ai facut înainte de reîncarcare.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/ro/global.json b/public/language/ro/global.json index 1a2b9382e7..45939015de 100644 --- a/public/language/ro/global.json +++ b/public/language/ro/global.json @@ -3,9 +3,10 @@ "search": "Căutare", "buttons.close": "Închide", "403.title": "Acces Interzis", - "403.message": "Se pare că ai ajuns pe o pagină la care nu ai acces. Poate ar trebui să te autentifici?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Nu a fost găsit", - "404.message": "Se pare că ai ajuns pe o pagină care nu există. Întoarce-te la prima pagină.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Eroare internă.", "500.message": "Oops! Se pare că ceva a mers greșit!", "register": "Înregistrare", @@ -26,6 +27,7 @@ "header.tags": "Taguri", "header.popular": "Populare", "header.users": "Utilizatori", + "header.groups": "Groups", "header.chats": "Conversații", "header.notifications": "Notificări", "header.search": "Căutare", @@ -73,5 +75,7 @@ "updated.title": "Forumul a fost actualizat", "updated.message": "Acest forum a fost actualizat la ultima version. Apasă aici pentru a reîmprospăta pagina.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/ro/groups.json b/public/language/ro/groups.json index cd8cba493f..816af582ea 100644 --- a/public/language/ro/groups.json +++ b/public/language/ro/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "Vezi Grup", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Detalii Grup", "details.members": "Listă Membrii", + "details.pending": "Pending Members", "details.has_no_posts": "Membrii acestui grup nu au facut nici o postare.", - "details.latest_posts": "Ultimele Mesaje" + "details.latest_posts": "Ultimele Mesaje", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ro/recent.json b/public/language/ro/recent.json index 7c50bdd546..a630ebe91a 100644 --- a/public/language/ro/recent.json +++ b/public/language/ro/recent.json @@ -5,5 +5,14 @@ "month": "Lună", "year": "An", "alltime": "Tot Timpul", - "no_recent_topics": "Nu există subiecte recente." + "no_recent_topics": "Nu există subiecte recente.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/ro/search.json b/public/language/ro/search.json index ad586a1662..35c5b72b74 100644 --- a/public/language/ro/search.json +++ b/public/language/ro/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 rezultat(e) pentru \"%2\", (%3 secunde)", - "no-matches": "Nu a fost găsit nici un mesaj!" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 65e1b8e2cb..49803e1823 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Nu a fost selectat nici un mesaj!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Introdu numele subiectului aici ...", + "composer.handle_placeholder": "Name", "composer.discard": "Renunță", "composer.submit": "Trimite", "composer.replying_to": "Îi raspunde lui %1", @@ -92,5 +93,6 @@ "sort_by": "Sortează de la", "oldest_to_newest": "Vechi la Noi", "newest_to_oldest": "Noi la Vechi", - "most_votes": "Cele mai votate" + "most_votes": "Cele mai votate", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/ro/user.json b/public/language/ro/user.json index 46c7873a7c..3fa30f4836 100644 --- a/public/language/ro/user.json +++ b/public/language/ro/user.json @@ -2,6 +2,8 @@ "banned": "Banat", "offline": "Deconectat", "username": "Nume utilizator", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Adresă Email", "confirm_email": "Confirmă Email", "delete_account": "Șterge Cont", @@ -16,6 +18,7 @@ "profile_views": "Vizualizări", "reputation": "Reputație", "favourites": "Favorite", + "watched": "Watched", "followers": "Urmărit de", "following": "Îi urmărește pe", "signature": "Semnătură", @@ -56,10 +59,12 @@ "digest_weekly": "Săptămânal", "digest_monthly": "Lunar", "send_chat_notifications": "Trimite-mi un email dacă primesc un mesaj în chat si eu nu sunt online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Pe acest utilizator nu îl urmărește nimeni :(", "follows_no_one": "Acest utilizator nu urmărește pe nimeni :(", "has_no_posts": "Acest utilizator nu a postat nici un mesaj până acuma.", "has_no_topics": "Acest utilizator nu a postat nici un subiect.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Adresă de email ascunsă", "hidden": "ascuns", "paginate_description": "Paginează subiectele și mesajele în loc să folosești scrollul interminabil.", diff --git a/public/language/ro/users.json b/public/language/ro/users.json index add3cf8873..065d2b07e2 100644 --- a/public/language/ro/users.json +++ b/public/language/ro/users.json @@ -5,5 +5,8 @@ "search": "Căutare", "enter_username": "Introdu un nume de utilizator pentru a căuta", "load_more": "Încarcă mai multe", - "users-found-search-took": "%1 utilizator(i) găsit! Căutarea a durat %2 ms." + "users-found-search-took": "%1 utilizator(i) găsit! Căutarea a durat %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/ru/email.json b/public/language/ru/email.json index 055a9ffe37..9b070ed2b2 100644 --- a/public/language/ru/email.json +++ b/public/language/ru/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Новое сообщение от %1", "notif.chat.cta": "Нажмите для продолжения диалога", "notif.chat.unsub.info": "Вы получили это уведомление в соответствии с настройками подписок.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Это тестовое сообщение для проверки почтового сервиса NodeBB.", "unsub.cta": "Изменить настройки", "closing": "Спасибо!" diff --git a/public/language/ru/error.json b/public/language/ru/error.json index cf83cf9c38..8570dcc524 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -18,6 +18,7 @@ "username-taken": "Имя пользователя занято", "email-taken": "Email занят", "email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Слишком короткое имя пользователя", "username-too-long": "Имя пользователя слишком длинное", "user-banned": "Пользователь заблокирован", @@ -43,10 +44,13 @@ "already-favourited": "Вы уже добавили этот пост в избранное", "already-unfavourited": "Вы уже удалили этот пост из избранного", "cant-ban-other-admins": "Вы не можете забанить других администраторов!", - "invalid-image-type": "Неверный формат изображения", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Название группы слишком короткое", "group-already-exists": "Группа уже существует", "group-name-change-not-allowed": "Изменение названия группы запрещено", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Этот пост уже удалён", "post-already-restored": "Этот пост уже восстановлен.", "topic-already-deleted": "Тема уже удалена", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки поста", "not-enough-reputation-to-flag": "У Вас недостаточно репутации, чтобы пометить этот пост.", "reload-failed": "NodeBB обнаружил проблему при перезагрузке: \"%1\". NodeBB продолжит работать с существующими ресурсами клиента, но Вы должны отменить то, что сделали перед перезагрузкой.", - "registration-error": "Ошибка при регистрации" + "registration-error": "Ошибка при регистрации", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/ru/global.json b/public/language/ru/global.json index df74718dae..8a4e0ad0ec 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -3,9 +3,10 @@ "search": "Поиск", "buttons.close": "Закрыть", "403.title": "Доступ запрещен", - "403.message": "Похоже, вы наткнулись на страницу, к которой у вас нет доступа. Возможно, вам стоит попробовать войти?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Страница не найдена", - "404.message": "Похоже, вы наткнулись на несуществующую страницу. Вернитесь на главную.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Внутренняя ошибка.", "500.message": "Упс! Похоже, что-то пошло не так!", "register": "Зарегистрироваться", @@ -26,6 +27,7 @@ "header.tags": "Тэги", "header.popular": "Популярные", "header.users": "Пользователи", + "header.groups": "Groups", "header.chats": "Чаты", "header.notifications": "Уведомления", "header.search": "Поиск", @@ -73,5 +75,7 @@ "updated.title": "Форум обновлен", "updated.message": "Форум был обновлен до последней версии. Нажмите здесь, чтобы обновить страницу.", "privacy": "Безопасность", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Удалить все" } \ No newline at end of file diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json index c60c0574a8..15bcdf5caa 100644 --- a/public/language/ru/groups.json +++ b/public/language/ru/groups.json @@ -1,8 +1,21 @@ { "groups": "Группы", "view_group": "Просмотр группы", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Информация о группе", "details.members": "Список пользователей", + "details.pending": "Pending Members", "details.has_no_posts": "Пользователями этой группы не публиковали никаких записей", - "details.latest_posts": "Последние записи" + "details.latest_posts": "Последние записи", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ru/recent.json b/public/language/ru/recent.json index 0843d90a23..3926272aaa 100644 --- a/public/language/ru/recent.json +++ b/public/language/ru/recent.json @@ -5,5 +5,14 @@ "month": "Месяц", "year": "Год", "alltime": "За всё время", - "no_recent_topics": "Нет свежих тем." + "no_recent_topics": "Нет свежих тем.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/ru/search.json b/public/language/ru/search.json index c8c67c246b..aeb1235df2 100644 --- a/public/language/ru/search.json +++ b/public/language/ru/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 результатов по фразе \"%2\", (%3 секунды) ", - "no-matches": "Ничего не найдено" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 4a4361ec62..644b66d9ae 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Сообщения не отмечены!", "fork_success": "Готово! Нажмите для перехода в отделённую тему.", "composer.title_placeholder": "Введите название темы...", + "composer.handle_placeholder": "Name", "composer.discard": "Отменить", "composer.submit": "Подтвердить", "composer.replying_to": "Ответ %1", @@ -92,5 +93,6 @@ "sort_by": "Сортировать", "oldest_to_newest": "От Старых к Новым", "newest_to_oldest": "От Новых к Старым", - "most_votes": "По голосам" + "most_votes": "По голосам", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 5568f00464..d9f2cdc61e 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -2,6 +2,8 @@ "banned": "Заблокирован", "offline": "Не в сети", "username": "Имя пользователя", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Подтвердить Email", "delete_account": "Удалить Аккаунт", @@ -16,6 +18,7 @@ "profile_views": "Просмотров профиля", "reputation": "Репутация", "favourites": "Избранное", + "watched": "Watched", "followers": "Читателей", "following": "Читаемых", "signature": "Подпись", @@ -56,10 +59,12 @@ "digest_weekly": "За Неделю", "digest_monthly": "За Месяц", "send_chat_notifications": "Уведомлять на E-mail при поступлении нового сообщения чата, когда я оффлайн", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Этого пользователя никто не читает :(", "follows_no_one": "Этот пользователь никого не читает :(", "has_no_posts": "Это пользователь еще ничего не написал.", "has_no_topics": "Этот пользователь еще не создал ни одной темы", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Скрыт", "hidden": "скрыто", "paginate_description": "Использовать пагинацию тем и постов вместо бесконечной прокрутки", diff --git a/public/language/ru/users.json b/public/language/ru/users.json index dd06ac4e97..78251703d2 100644 --- a/public/language/ru/users.json +++ b/public/language/ru/users.json @@ -5,5 +5,8 @@ "search": "Поиск", "enter_username": "Введите имя пользователя для поиска", "load_more": "Загрузить еще", - "users-found-search-took": "Нашел %1 пользователя(ей)! Поиск занял %2 мс." + "users-found-search-took": "Нашел %1 пользователя(ей)! Поиск занял %2 мс.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/sc/email.json b/public/language/sc/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/sc/email.json +++ b/public/language/sc/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 27de09631f..a40a628042 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -18,6 +18,7 @@ "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "You can't ban other admins!", - "invalid-image-type": "Invalid image type", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/sc/global.json b/public/language/sc/global.json index 784d271e34..6fa43c2623 100644 --- a/public/language/sc/global.json +++ b/public/language/sc/global.json @@ -3,9 +3,10 @@ "search": "Chirca", "buttons.close": "Serra", "403.title": "Intrada Blocada", - "403.message": "Paret chi ses incapitadu in una pàgina in ue tue non podes intrare. Forsis dias a dèpere provare a intrare?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "No Agatadu", - "404.message": "Paret chi ses imbruchinadu in una pàgina chi non s'agatat. Torra a sa domo.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Faddina interna.", "500.message": "Oops! Paret chi carchi cosa est andada male!", "register": "Registra·ti", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Populare", "header.users": "Impitadores", + "header.groups": "Groups", "header.chats": "Tzarras", "header.notifications": "Notìficas", "header.search": "Chirca", @@ -73,5 +75,7 @@ "updated.title": "Forum Updated", "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/sc/groups.json b/public/language/sc/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/sc/groups.json +++ b/public/language/sc/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sc/recent.json b/public/language/sc/recent.json index 2e2d9401c7..7c7d242a90 100644 --- a/public/language/sc/recent.json +++ b/public/language/sc/recent.json @@ -5,5 +5,14 @@ "month": "Mese", "year": "Year", "alltime": "All Time", - "no_recent_topics": "Non bi sunt ùrtimas arresonadas." + "no_recent_topics": "Non bi sunt ùrtimas arresonadas.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/sc/search.json b/public/language/sc/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/sc/search.json +++ b/public/language/sc/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index 719c1e43d5..e08b8e84ba 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Perunu arresonu seberadu!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Pone su tìtulu de s'arresonada inoghe...", + "composer.handle_placeholder": "Name", "composer.discard": "Lassa a Pèrdere", "composer.submit": "Imbia", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/sc/user.json b/public/language/sc/user.json index 0ba6da8ed1..b083df5e52 100644 --- a/public/language/sc/user.json +++ b/public/language/sc/user.json @@ -2,6 +2,8 @@ "banned": "Blocadu", "offline": "Non in lìnia", "username": "Nùmene de Impitadore", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Confirm Email", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "Bìsitas a su perfilu", "reputation": "Nodidos", "favourites": "Preferidos", + "watched": "Watched", "followers": "Sighidores", "following": "Sighende", "signature": "Firma", @@ -56,10 +59,12 @@ "digest_weekly": "Weekly", "digest_monthly": "Monthly", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Custu impitadore non tenet perunu sighidore :(", "follows_no_one": "Custu impitadore no est sighende nissunu :(", "has_no_posts": "Custu impitadore no at ancora publicadu nudda.", "has_no_topics": "This user didn't post any topics yet.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Email Cuada", "hidden": "cuadu", "paginate_description": "Partzi is arresonadas e arresonos in pàginas a su postu de impreare su iscorrimentu infinidu.", diff --git a/public/language/sc/users.json b/public/language/sc/users.json index bae4caa237..56b67f30f8 100644 --- a/public/language/sc/users.json +++ b/public/language/sc/users.json @@ -5,5 +5,8 @@ "search": "Chirca", "enter_username": "Pone unu nùmene de impitadore de chircare", "load_more": "Càrriga de prus", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/sk/email.json b/public/language/sk/email.json index fdbfb006c6..e3199a9b14 100644 --- a/public/language/sk/email.json +++ b/public/language/sk/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "Click here to continue the conversation", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", "unsub.cta": "Click here to alter those settings", "closing": "Thanks!" diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 40c04517ed..b278526244 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -18,6 +18,7 @@ "username-taken": "Užívateľske meno je obsadené", "email-taken": "Email je obsadený", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "Užívateľ je zakázaný", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "Nemožte zakázať druhých adminov.", - "invalid-image-type": "Neplatný typ obrázku ", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Názov skupiny je príliš krátky", "group-already-exists": "Skupina už existuje", "group-name-change-not-allowed": "Nepovolená zmena mena skupiny", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/sk/global.json b/public/language/sk/global.json index 7f42bd6694..d8d8a87509 100644 --- a/public/language/sk/global.json +++ b/public/language/sk/global.json @@ -3,9 +3,10 @@ "search": "Hľadať", "buttons.close": "Zavrieť", "403.title": "Prístup zamietnutý", - "403.message": "K tejto stránke nemáte prístup. Zkuste sa prihlásiť?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Stránka nenájdená", - "404.message": "Táto stránka bohužiaľ neexistuje. Vráťte sa na domovskú stránku.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Neznámá chyba", "500.message": "Jejda, vyzerá, že sa niečo pokazilo.", "register": "Registrovať", @@ -26,6 +27,7 @@ "header.tags": "tagy", "header.popular": "Populárne", "header.users": "Užívatelia", + "header.groups": "Groups", "header.chats": "Chaty", "header.notifications": "Notifikácie", "header.search": "Hľadať", @@ -73,5 +75,7 @@ "updated.title": "fórum bolo aktualizované", "updated.message": "Toto fórum bolo práve aktualizované k najnovšej verzii. Tu kliknite na aktualizáciu tejto stránky.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/sk/groups.json b/public/language/sk/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/sk/groups.json +++ b/public/language/sk/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sk/recent.json b/public/language/sk/recent.json index 963740ba54..13fb11de81 100644 --- a/public/language/sk/recent.json +++ b/public/language/sk/recent.json @@ -5,5 +5,14 @@ "month": "Mesiac", "year": "Year", "alltime": "All Time", - "no_recent_topics": "Nie sú žiadne posledné témy" + "no_recent_topics": "Nie sú žiadne posledné témy", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/sk/search.json b/public/language/sk/search.json index e9eef4632a..c89241d382 100644 --- a/public/language/sk/search.json +++ b/public/language/sk/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index a645271b1c..05ee94f28e 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Žiadne príspevky neboli vybrané!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Vlož nadpis témy sem...", + "composer.handle_placeholder": "Name", "composer.discard": "Zahodiť", "composer.submit": "Poslať", "composer.replying_to": "Odpovedám užívateľovi %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/sk/user.json b/public/language/sk/user.json index 3606c01233..48aa4ec144 100644 --- a/public/language/sk/user.json +++ b/public/language/sk/user.json @@ -2,6 +2,8 @@ "banned": "Zakázaný", "offline": "Offline", "username": "Uživateľské meno", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Confirm Email", "delete_account": "Delete Account", @@ -16,6 +18,7 @@ "profile_views": "Zobrazenie profilu", "reputation": "Reputácia", "favourites": "Obľúbené", + "watched": "Watched", "followers": "Nasledujú ho", "following": "Nasleduje", "signature": "Podpis", @@ -56,10 +59,12 @@ "digest_weekly": "Týždenne", "digest_monthly": "Mesačne", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Tohoto užívatela nikto nesleduje :(", "follows_no_one": "Tento užívateľ nikoho nesleduje :(", "has_no_posts": "Tento používateľ ešte nespravil príspevok", "has_no_topics": "Tento užívateľ ešte nepublikoval žiadnu tému.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Skrytý email", "hidden": "skrytý", "paginate_description": "Stránkuj témy a príspevky miesto používania nekonečného posúvania.", diff --git a/public/language/sk/users.json b/public/language/sk/users.json index 64e8ea6860..56188b953e 100644 --- a/public/language/sk/users.json +++ b/public/language/sk/users.json @@ -5,5 +5,8 @@ "search": "Vyhľadávať", "enter_username": "Zadaj užívateľské meno k hľadaniu", "load_more": "Načítať dalšie", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/sv/category.json b/public/language/sv/category.json index ff00a051b5..635f2c0ac4 100644 --- a/public/language/sv/category.json +++ b/public/language/sv/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Nytt ämne", - "no_topics": "Det finns inga ämnen i denna kategori.
    Varför inte skapa ett?", + "no_topics": "Det finns inga ämnen i denna kategori.
    Varför skapar inte du ett ämne?", "browsing": "läser", "no_replies": "Ingen har svarat", "share_this_category": "Dela den här kategorin", diff --git a/public/language/sv/email.json b/public/language/sv/email.json index 3b72de3280..b6ef31353f 100644 --- a/public/language/sv/email.json +++ b/public/language/sv/email.json @@ -4,9 +4,9 @@ "greeting_no_name": "Hej", "greeting_with_name": "Hej %1", "welcome.text1": "Tack för att du registerar dig på %1!", - "welcome.text2": "För att slutföra aktivering av ditt konto, behöver vi verifiera att du har tillgång till epostadressen du registererade.", + "welcome.text2": "För att slutföra aktiveringen av ditt konto, behöver vi verifiera att du har tillgång till den epostadress du registrerade dig med.", "welcome.cta": "Klicka här för att bekräfta din epostadress ", - "reset.text1": "Vi fick en förfrågan att återställa ditt lösenord, kanske för att du glömt det. Om det inte är så, så kan du ignorera det här epostmeddelandet. ", + "reset.text1": "Vi fick en förfrågan om att återställa ditt lösenord, möjligen för att du har glömt det. Om detta inte är fallet, så kan du bortse från det här epostmeddelandet. ", "reset.text2": "För att fortsätta med återställning av lösenordet så kan du klicka på följande länk:", "reset.cta": "Klicka här för att återställa ditt lösenord", "digest.notifications": "Du har olästa notiser från %1:", @@ -17,6 +17,8 @@ "notif.chat.subject": "Nytt chatt-meddelande från %1", "notif.chat.cta": "Klicka här för att fortsätta konversationen", "notif.chat.unsub.info": "Denna chatt-notifikation skickades till dig på grund av dina inställningar för prenumerationer.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "\nDet här är ett textmeddelande som verifierar att eposten är korrekt installerat för din NodeBB. ", "unsub.cta": "Klicka här för att ändra dom inställningarna", "closing": "Tack!" diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 506f8f5a83..28e67f55cf 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -18,9 +18,10 @@ "username-taken": "Användarnamn upptaget", "email-taken": "Epostadress upptagen", "email-not-confirmed": "Din epostadress är ännu inte bekräftad. Klicka här för att bekräfta din epostadress.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Användarnamnet är för kort", "username-too-long": "Användarnamnet är för långt", - "user-banned": "Användare bannad", + "user-banned": "Användare bannlyst", "user-too-new": "Tyvärr, du måste vänta %1 sekunder innan du kan skapa ditt första inlägg", "no-category": "Kategorin hittades inte", "no-topic": "Ämnet hittades inte", @@ -39,14 +40,17 @@ "too-many-posts": "Du kan endast skapa inlägg var %1:e sekund - vänta ett tag innan du försöker skapa ett nytt inlägg", "too-many-posts-newbie": "Som en ny användare kan du endast skapa nya inlägg var %1:e sekund tills du har %2 förtroende - vänta ett tag innan du försöker skapa ett nytt inlägg", "file-too-big": "Maximal filstorlek är %1 kbs - var god ladda upp en mindre fil", - "cant-vote-self-post": "Du kan in rösta på ditt eget inlägg.", + "cant-vote-self-post": "Du kan inte rösta på ditt eget inlägg.", "already-favourited": "Du har redan favoriserat det här inlägget", "already-unfavourited": "Du har redan avfavoriserat det här inlägget", - "cant-ban-other-admins": "Du kan inte banna andra administratörer.", - "invalid-image-type": "Ogiltigt bildformat", + "cant-ban-other-admins": "Du kan inte bannlysa andra administratörer.", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Gruppnamnet är för kort", "group-already-exists": "Gruppen existerar redan", "group-name-change-not-allowed": "Gruppnamnet får inte ändras", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Inlägget är redan raderat", "post-already-restored": "Inlägget är redan återställt", "topic-already-deleted": "Ämnet är redan raderat", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet", "not-enough-reputation-to-flag": "Du har inte tillräckligt förtroende för att flagga det här inlägget.", "reload-failed": "NodeBB stötte på problem med att ladda om: \"%1\". NodeBB kommer fortsätta servera den befintliga resurser till klienten, men du borde återställa det du gjorde alldeles innan du försökte ladda om.", - "registration-error": "Registreringsfel" + "registration-error": "Registreringsfel", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/sv/global.json b/public/language/sv/global.json index 43cb2e1e79..ca623c2dbb 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -3,9 +3,10 @@ "search": "Sök", "buttons.close": "Stäng", "403.title": "Tillgång Nekad", - "403.message": "Du verkar ha hittat till en sida du inte har tillgång till. Kanske du ska testa att logga in?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Sidan saknas", - "404.message": "Du verkar ha hamnat på en sida som inte finns. Återgå till första sidan.", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Internt fel.", "500.message": "Hoppsan! Verkar som att något gått snett!", "register": "Registrera", @@ -26,6 +27,7 @@ "header.tags": "Märkningar", "header.popular": "Populära", "header.users": "Användare", + "header.groups": "Groups", "header.chats": "Chattar", "header.notifications": "Notiser", "header.search": "Sök", @@ -38,7 +40,7 @@ "alert.success": "success", "alert.error": "Fel", "alert.banned": "Bannad", - "alert.banned.message": "Du har nu blivit bannad och kommer att loggas ut. ", + "alert.banned.message": "Du har blivit bannlyst och kommer nu att loggas ut. ", "alert.unfollow": "Du följer inte längre %1!", "alert.follow": "Du följer nu %1!", "online": "Online", @@ -73,5 +75,7 @@ "updated.title": "Forum uppdaterades", "updated.message": "Det här forumet har nu uppdaterats till senaste versionen. Klicka här för att ladda om sidan.", "privacy": "Integritet", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Ta bort Alla" } \ No newline at end of file diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json index 03c57199f5..92a4eeb90b 100644 --- a/public/language/sv/groups.json +++ b/public/language/sv/groups.json @@ -1,8 +1,21 @@ { "groups": "Grupper", "view_group": "Visa grupp ", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Detaljer för gruppen ", "details.members": "Medlemmar", + "details.pending": "Pending Members", "details.has_no_posts": "Den här gruppens medlemmar har inte skrivit några inlägg.", - "details.latest_posts": "Senaste inlägg" + "details.latest_posts": "Senaste inlägg", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json index dc59877cf6..17de423337 100644 --- a/public/language/sv/recent.json +++ b/public/language/sv/recent.json @@ -5,5 +5,14 @@ "month": "Månad", "year": "År", "alltime": "Alltid", - "no_recent_topics": "Det finns inga olästa ämnen." + "no_recent_topics": "Det finns inga olästa ämnen.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/sv/search.json b/public/language/sv/search.json index 49e8bde9a0..193ea99480 100644 --- a/public/language/sv/search.json +++ b/public/language/sv/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 resultat matchar \"%2\", (%3 sekunder)", - "no-matches": "Inga inlägg hittades" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index a49071f1b6..9d41afee2b 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Inga inlägg valda!", "fork_success": "Ämnet har blivit förgrenat. Klicka här för att gå till det förgrenade ämnet.", "composer.title_placeholder": "Skriv in ämnets titel här...", + "composer.handle_placeholder": "Name", "composer.discard": "Avbryt", "composer.submit": "Spara", "composer.replying_to": "Svarar till %1", @@ -92,5 +93,6 @@ "sort_by": "Sortera på", "oldest_to_newest": "Äldst till nyaste", "newest_to_oldest": "Nyaste till äldst", - "most_votes": "Mest röster" + "most_votes": "Mest röster", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/sv/user.json b/public/language/sv/user.json index b8727afa48..6a773c45b4 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -2,6 +2,8 @@ "banned": "Bannad", "offline": "Offline", "username": "Användarnamn", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Epost", "confirm_email": "Bekräfta epostadress ", "delete_account": "Ta bort ämne", @@ -16,6 +18,7 @@ "profile_views": "Profil-visningar", "reputation": "Rykte", "favourites": "Favoriter", + "watched": "Watched", "followers": "Följare", "following": "Följer", "signature": "Signatur", @@ -56,10 +59,12 @@ "digest_weekly": "Veckovis", "digest_monthly": "Månadsvis", "send_chat_notifications": "Skicka ett epostmeddelande om nya chatt-meddelanden tas emot när jag inte är online.", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Denna användare har inga följare :(", "follows_no_one": "Denna användare följer ingen :(", "has_no_posts": "Denna användare har inte gjort några inlägg än.", "has_no_topics": "Den här användaren har inte skrivit något inlägg ännu.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Epost dold", "hidden": "dold", "paginate_description": "Gör så att ämnen och inlägg visas som sidor istället för oändlig scroll.", diff --git a/public/language/sv/users.json b/public/language/sv/users.json index cc3a1f3c36..2b370c1146 100644 --- a/public/language/sv/users.json +++ b/public/language/sv/users.json @@ -5,5 +5,8 @@ "search": "Sök", "enter_username": "Ange ett användarnamn för att söka", "load_more": "Ladda fler", - "users-found-search-took": "%1 användare hittades! Sökningen tog %2 ms." + "users-found-search-took": "%1 användare hittades! Sökningen tog %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/th/email.json b/public/language/th/email.json index b211b5d00c..18bf7c5d1f 100644 --- a/public/language/th/email.json +++ b/public/language/th/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "New chat message received from %1", "notif.chat.cta": "กดตรงนี้เพื่อกลับไปยังบทสนทนา", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "นี่คืออีเมลทดสอบเพื่อยืนยันว่าระบบอีเมลมีการตั้งค่าที่ถูกต้องสำหรับ NodeBB ของคุณ", "unsub.cta": "กดตรงนี้เพื่อเปลี่ยนแปลงการตั้งค่า", "closing": "ขอบคุณ!" diff --git a/public/language/th/error.json b/public/language/th/error.json index f40e475c39..f65481696d 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -18,6 +18,7 @@ "username-taken": "ชื่อผู้ใช้นี้มีการใช้แล้ว", "email-taken": "อีเมลนี้มีการใช้แล้ว", "email-not-confirmed": "ยังไม่มีการยืนยันอีเมลของคุณ, โปรดกดยืนยันอีเมลของคุณตรงนี้", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "ชื่อบัญชีผู้ใช้ สั้นเกินไป", "username-too-long": "ชื่อบัญชีผู้ใช้ ยาวเกินไป", "user-banned": "User banned", @@ -43,10 +44,13 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "You can't ban other admins!", - "invalid-image-type": "Invalid image type", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "This post has already been deleted", "post-already-restored": "This post has already been restored", "topic-already-deleted": "This topic has already been deleted", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error" + "registration-error": "Registration Error", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/th/global.json b/public/language/th/global.json index 1700c170b7..af4ff3bfd0 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -3,9 +3,10 @@ "search": "ค้นหา", "buttons.close": "ปิด", "403.title": "คุณถูกปฏิเสธการเข้าใช้", - "403.message": "ดูเหมือนว่าคุณจะสะดุดเข้ากับหน้าเว็บที่คุณไม่ได้มีสิทธิการเข้าถึง เข้าสู่ระบบ ?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "ไม่พบ", - "404.message": "ดูเหมือนว่าคุณจะสะดุดเข้ากับหน้าเว็บที่ไม่มีอยู่ กลับไปที่หน้าแรก", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "มีข้อผิดพลาดภายในระบบ", "500.message": "อุ่ย! มีสิ่งที่ไม่ถูกต้องเกิดขึ้น!", "register": "ลงทะเบียน", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "ฮิต", "header.users": "ผู้ใช้", + "header.groups": "Groups", "header.chats": "สนทนา", "header.notifications": "แจ้งเตือน", "header.search": "ค้นหา", @@ -73,5 +75,7 @@ "updated.title": "Forum Updated", "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.", "privacy": "Privacy", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Delete All" } \ No newline at end of file diff --git a/public/language/th/groups.json b/public/language/th/groups.json index bf69c732b0..6dfd71256b 100644 --- a/public/language/th/groups.json +++ b/public/language/th/groups.json @@ -1,8 +1,21 @@ { "groups": "Groups", "view_group": "View Group", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Group Details", "details.members": "Member List", + "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "details.latest_posts": "Latest Posts", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/th/recent.json b/public/language/th/recent.json index 05eec4d503..369a88a1dc 100644 --- a/public/language/th/recent.json +++ b/public/language/th/recent.json @@ -5,5 +5,14 @@ "month": "เดือน", "year": "Year", "alltime": "All Time", - "no_recent_topics": "ไม่มีกระทู้ล่าสุด" + "no_recent_topics": "ไม่มีกระทู้ล่าสุด", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/th/search.json b/public/language/th/search.json index 965b5b59bf..973ff03e13 100644 --- a/public/language/th/search.json +++ b/public/language/th/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 ผลลัพธ์ ตรงตามที่ระบุ \"%2\", (%3 วินาที)", - "no-matches": "No posts found" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/th/topic.json b/public/language/th/topic.json index 4113fba9af..c7c9f4e944 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "ไม่มีโพสต์ที่เลือก!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "ป้อนชื่อกระทู้ของคุณที่นี่ ...", + "composer.handle_placeholder": "Name", "composer.discard": "ยกเลิก", "composer.submit": "ส่ง", "composer.replying_to": "Replying to %1", @@ -92,5 +93,6 @@ "sort_by": "Sort by", "oldest_to_newest": "Oldest to Newest", "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "most_votes": "Most votes", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/th/user.json b/public/language/th/user.json index c408af39be..aaf5a74424 100644 --- a/public/language/th/user.json +++ b/public/language/th/user.json @@ -2,6 +2,8 @@ "banned": "เเบน", "offline": "ออฟไลน์", "username": "ชื่อผู้ใช้", + "joindate": "Join Date", + "postcount": "Post Count", "email": "อีเมล์", "confirm_email": "ยืนยันอีเมล", "delete_account": "ลบบัญชี", @@ -16,6 +18,7 @@ "profile_views": "ดูข้อมูลส่วนตัว", "reputation": "ชื่อเสียง", "favourites": "ชอบ", + "watched": "Watched", "followers": "คนติดตาม", "following": "ติดตาม", "signature": "ลายเซ็น", @@ -56,10 +59,12 @@ "digest_weekly": "รายสัปดาห์", "digest_monthly": "รายเดือน", "send_chat_notifications": "ส่งอีเมลเมื่อมีข้อความใหม่เข้ามาขณะที่ฉันไม่ได้ออนไลน์", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "ผู้ใช้รายนี้ไม่มีใครติดตาม :(", "follows_no_one": "ผู้ใช้รายนี้ไม่ติดตามใคร :(", "has_no_posts": "ผู้ใช้รายนี้ไม่ได้โพสต์อะไรเลย", "has_no_topics": "สมาชิกรายนี้ยังไม่ได้มีการโพสต์ข้อความ", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "ซ่อนอีเมล์", "hidden": "ซ่อน", "paginate_description": "ให้เลขหน้ากระทู้และโพสต์แทนการใช้สกรอลล์ที่ไม่สิ้นสุด", diff --git a/public/language/th/users.json b/public/language/th/users.json index a45aa14516..a3dddb41fd 100644 --- a/public/language/th/users.json +++ b/public/language/th/users.json @@ -5,5 +5,8 @@ "search": "ค้นหา", "enter_username": "ใส่ชื่อผู้ใช้เพื่อค้นหา", "load_more": "โหลดเพิ่มเติม", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/tr/email.json b/public/language/tr/email.json index d5242db872..c69e7d0c8f 100644 --- a/public/language/tr/email.json +++ b/public/language/tr/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "Okunmamış bazı iletileriniz var", "notif.chat.cta": "Sohbete devam etmek için buraya tıklayın", "notif.chat.unsub.info": "Bu bildirim şectiğiniz ayarlar yüzünden gönderildi.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Bu ileti NodeBB e-posta ayarlarınızın doğru çalışıp çalışmadığını kontrol etmek için gönderildi.", "unsub.cta": "Buraya tıklayarak ayarlarınızı değiştirebilirsiniz.", "closing": "Teşekkürler!" diff --git a/public/language/tr/error.json b/public/language/tr/error.json index bd8a727725..4e509a438d 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -18,6 +18,7 @@ "username-taken": "Kullanıcı İsmi Alınmış", "email-taken": "E-posta Alınmış", "email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Kullanıcı ismi çok kısa", "username-too-long": "Kullanıcı ismi çok uzun.", "user-banned": "Kullanıcı Yasaklı", @@ -43,10 +44,13 @@ "already-favourited": "Bu iletiyi zaten favorilerinize eklediniz", "already-unfavourited": "Bu iletiyi zaten favorilerinizden çıkardınız", "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!", - "invalid-image-type": "Geçersiz resim türü", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Grup ismi çok kısa", "group-already-exists": "Grup zaten var", "group-name-change-not-allowed": "Grup ismini değiştiremezsiniz", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "İleti zaten silinmiş", "post-already-restored": "İleti zaten geri getirilmiş", "topic-already-deleted": "Başlık zaten silinmiş", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok.", "not-enough-reputation-to-flag": "Bu iletiyi bayraklamak için yeterince saygınlığınız yok", "reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.", - "registration-error": "Kayıt Hatası" + "registration-error": "Kayıt Hatası", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/tr/global.json b/public/language/tr/global.json index bf13ffb581..152aba5d0e 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -3,9 +3,10 @@ "search": "Arama", "buttons.close": "Kapat", "403.title": "Erişim Engellendi", - "403.message": "Erişiminiz olmayan bir sayfaya ulaşmaya çalıştınız. Belki de href='/login'> < giriş yapmayı denemelisiniz ?", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Bulunamadı", - "404.message": "Olmayan bir sayfayı ziyaret etmeye çalıştınız. Ana sayfa .", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Dahili hata.", "500.message": "Ups! Bir şeyler ters gitti sanki!", "register": "Kayıt Ol", @@ -26,6 +27,7 @@ "header.tags": "Etiketler", "header.popular": "Popüler", "header.users": "Kullanıcılar", + "header.groups": "Groups", "header.chats": "Sohbetler", "header.notifications": "Bildirimler", "header.search": "Arama", @@ -73,5 +75,7 @@ "updated.title": "Forum güncellendi", "updated.message": "Bu forum şu anda güncellendi. Sayfayı tekrar yüklemek için buraya tıklayın.", "privacy": "Gizlilik", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Hepsini Sil" } \ No newline at end of file diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json index 664fb52509..d2c411228d 100644 --- a/public/language/tr/groups.json +++ b/public/language/tr/groups.json @@ -1,8 +1,21 @@ { "groups": "Guruplar", "view_group": "Grubu Gör", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Grup Detayları", "details.members": "Üye Listesi", + "details.pending": "Pending Members", "details.has_no_posts": "Bu grubun üyeleri henüz bir ileti göndermedi.", - "details.latest_posts": "En son iletiler" + "details.latest_posts": "En son iletiler", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json index 6ed65f7ae7..4773c22dfd 100644 --- a/public/language/tr/recent.json +++ b/public/language/tr/recent.json @@ -5,5 +5,14 @@ "month": "Ay", "year": "Yıl", "alltime": "Hepsi", - "no_recent_topics": "Güncel konular yok." + "no_recent_topics": "Güncel konular yok.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/tr/search.json b/public/language/tr/search.json index 330ae541d7..d3c5da5c91 100644 --- a/public/language/tr/search.json +++ b/public/language/tr/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 tane “%2“ bulundu (%3 saniye)", - "no-matches": "İleti bulunamadı" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index a18769ce96..aa6aa90855 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Hiç bir ileti seçilmedi!", "fork_success": "Başlık başarıyla ayrıldı!", "composer.title_placeholder": "Başlık ismini buraya girin...", + "composer.handle_placeholder": "Name", "composer.discard": "Vazgeç", "composer.submit": "Gönder", "composer.replying_to": "Yanıtlanan Konu %1", @@ -92,5 +93,6 @@ "sort_by": "Sırala", "oldest_to_newest": "En eskiden en yeniye", "newest_to_oldest": "En yeniden en eskiye", - "most_votes": "En çok oy" + "most_votes": "En çok oy", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/tr/user.json b/public/language/tr/user.json index 9feaac81f8..90bd5eb06b 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -2,6 +2,8 @@ "banned": "Yasaklı", "offline": "Çevrimdışı", "username": "Kullanıcı Adı", + "joindate": "Join Date", + "postcount": "Post Count", "email": "E-posta", "confirm_email": "E-posta onayla", "delete_account": "Hesabı Sil", @@ -16,6 +18,7 @@ "profile_views": "Profil Görüntülemeleri", "reputation": "Saygınlık", "favourites": "Favoriler", + "watched": "Watched", "followers": "Takipçiler", "following": "Takip Ediyor", "signature": "İmza", @@ -56,10 +59,12 @@ "digest_weekly": "Haftalık", "digest_monthly": "Aylık", "send_chat_notifications": "Çevrimiçi değilken gelen iletileri e-posta olarak gönder", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Bu kullanıcının hiç takipçisi yok :(", "follows_no_one": "Bu kullanıcı kimseyi takip etmiyor :(", "has_no_posts": "Bu kullanıcı henüz birşey göndermedi.", "has_no_topics": "Bu kullanıcı henüz bir konu yaratmadı.", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "E-posta gizli", "hidden": "gizli", "paginate_description": "Sonsuz yükleme yerine konu ve iletileri sayfalara böl.", diff --git a/public/language/tr/users.json b/public/language/tr/users.json index 74624e0551..8858e75ddd 100644 --- a/public/language/tr/users.json +++ b/public/language/tr/users.json @@ -5,5 +5,8 @@ "search": "Ara", "enter_username": "Aramak için bir kullanıcı adı girin", "load_more": "Daha Fazla Yükle", - "users-found-search-took": "%1 kullanıcı bulundu! Arama %2 ms sürdü." + "users-found-search-took": "%1 kullanıcı bulundu! Arama %2 ms sürdü.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/vi/category.json b/public/language/vi/category.json index 36bb00d89b..6d2efb5e1b 100644 --- a/public/language/vi/category.json +++ b/public/language/vi/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Chủ đề mới", - "no_topics": "Không có bài viết trong danh mục.
    Hãy đăng một bài viết mới?", + "no_topics": "Không có bài viết trong danh mục này.
    Hãy đăng một bài viết mới.", "browsing": "đang xem", "no_replies": "Chưa có bình luận nào", "share_this_category": "Chia sẻ thư mục này", diff --git a/public/language/vi/email.json b/public/language/vi/email.json index 555e20e87e..97bd7549e8 100644 --- a/public/language/vi/email.json +++ b/public/language/vi/email.json @@ -3,11 +3,11 @@ "welcome-to": "Chào mừng đến với %1", "greeting_no_name": "Xin chào", "greeting_with_name": "Xin chào %1", - "welcome.text1": "Cảm ơn bạn đã đăng ký tài khoản tại %1!", + "welcome.text1": "Cảm ơn bạn đã đăng ký tại %1!", "welcome.text2": "Để kích hoạt đầy đủ tính năng của tài khoản, chúng tôi cần xác định bạn là chủ của địa chỉ email mà bạn đã đăng ký.", "welcome.cta": "Nhấn vào đây để xác nhận địa chỉ email", "reset.text1": "Chúng tôi nhận được yêu cầu khởi tạo lại mật khẩu của bạn, rất có thể vì bạn đã quên mất nó. Nếu bạn không gởi yêu cầu, hãy bỏ qua email này.", - "reset.text2": "Để khởi tạo lại mật khẩu, hãy click vào liên kết sau:", + "reset.text2": "Để đặt lại mật khẩu, hãy click vào liên kết sau:", "reset.cta": "Click vào đây để khởi tạo lại mật khẩu", "digest.notifications": "Bạn có thông báo chưa đọc từ %1", "digest.latest_topics": "Chủ đề mới nhất từ %1", @@ -17,7 +17,9 @@ "notif.chat.subject": "Bạn có tin nhắn mới từ %1", "notif.chat.cta": "Nhấn vào đây để tiếp tục cuộc hội thoại", "notif.chat.unsub.info": "Thông báo tin nhắn này được gửi tới dựa theo cài đặt theo dõi của bạn.", - "test.text1": "Đây là email kiểm tra để xác nhận rằng trình gửi email đã được cài đặt một cách chính xác cho NodeBB của bạn.", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "test.text1": "Đây là email kiểm tra xem chức năng gửi mail trên hệ thống NodeBB của bạn có hoạt động tốt hay không.", "unsub.cta": "Nhấn vào đây để thay đổi cài đặt.", "closing": "Xin cảm ơn!" } \ No newline at end of file diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 7c91fcfb85..002f910fc4 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -18,6 +18,7 @@ "username-taken": "Tên đăng nhập đã tồn tại", "email-taken": "Email đã được đăng kí", "email-not-confirmed": "Email của bạn chưa được xác nhận, xin hãy nhấn vào đây để xác nhận địa chỉ này là của bạn", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "Tên đăng nhập quá ngắn", "username-too-long": "Tên đăng nhập quá dài", "user-banned": "Tài khoản bị ban", @@ -43,10 +44,13 @@ "already-favourited": "Bạn đã bấm yêu thích cho bài viết này rồi", "already-unfavourited": "Bạn đã bỏ thích bài này rồi", "cant-ban-other-admins": "Bạn không thể ban được các admin khác", - "invalid-image-type": "Kiểu hình ảnh không hợp lệ", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "Tên nhóm quá ngắn", "group-already-exists": "Nhóm đã tồn tại", "group-name-change-not-allowed": "Không cho phép đổi tên nhóm", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "Bài viết này đã bị xóa", "post-already-restored": "Bài viết này đã được phục hồi", "topic-already-deleted": "Chủ đề này đã bị xóa", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "Bạn không có đủ phiếu tín nhiệm để downvote bài này", "not-enough-reputation-to-flag": "Bạn không đủ tín nhiệm để đánh dấu bài viết này", "reload-failed": "NodeBB gặp lỗi trong khi tải lại: \"%1\". NodeBB sẽ tiếp tục hoạt động với dữ liệu trước đó, tuy nhiên bạn nên tháo gỡ những gì bạn vừa thực hiện trước khi tải lại.", - "registration-error": "Quá trình đăng kí bị lỗi" + "registration-error": "Lỗi đăng kí", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/vi/global.json b/public/language/vi/global.json index 1943d6c722..a7dc6ce134 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -3,9 +3,10 @@ "search": "Tìm kiếm", "buttons.close": "Đóng lại", "403.title": "Từ chối truy cập", - "403.message": "Có vẻ như bạn đang cố vào một trang mà bạn không có quyền truy cập. Bạn nên thử đăng nhập để truy cập ", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "Không tìm thấy", - "404.message": "Có vẻ bạn đang cố vào một trang không tồn tại. Hãy trở lại trang chủ", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Lỗi nội bộ", "500.message": "Úi chà! Có vẻ như có trục trặc rồi!", "register": "Đăng ký", @@ -26,6 +27,7 @@ "header.tags": "Tags", "header.popular": "Nổi bật", "header.users": "Số người dùng", + "header.groups": "Groups", "header.chats": "Phần Chat", "header.notifications": "Thông báo", "header.search": "Tìm kiếm", @@ -73,5 +75,7 @@ "updated.title": "Cập nhật diễn đàn", "updated.message": "Diễn đàn đã được cập nhật bản mới nhất. Click vào đây để tải lại trang.", "privacy": "Quyền riêng tư", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "Xóa hết" } \ No newline at end of file diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json index fcead5ed63..c3a1d060d0 100644 --- a/public/language/vi/groups.json +++ b/public/language/vi/groups.json @@ -1,8 +1,21 @@ { "groups": "Nhóm", "view_group": "Xem nhóm", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "Thông tin nhóm", "details.members": "Danh sách thành viên", + "details.pending": "Pending Members", "details.has_no_posts": "Nhóm thành viên này chưa viết bài viết nào.", - "details.latest_posts": "Bài mới nhất" + "details.latest_posts": "Bài mới nhất", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/vi/recent.json b/public/language/vi/recent.json index 32dc489353..ad679de4e7 100644 --- a/public/language/vi/recent.json +++ b/public/language/vi/recent.json @@ -5,5 +5,14 @@ "month": "Tháng", "year": "Năm", "alltime": "Tất cả thời gian", - "no_recent_topics": "Không có chủ đề nào gần đây" + "no_recent_topics": "Không có chủ đề nào gần đây", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/vi/search.json b/public/language/vi/search.json index 323dea6a5e..254873ed38 100644 --- a/public/language/vi/search.json +++ b/public/language/vi/search.json @@ -1,4 +1,7 @@ { "results_matching": "%1 kết quả(s) trùng với \"%2\", (%3 giây)", - "no-matches": "Không tìm thấy bài viết nào" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index 7b4889c474..2c23893104 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "Chưa chọn bài gửi nào!", "fork_success": "Tạo bản sao thành công! Nhấn vào đây để chuyển tới chủ đề vừa tạo.", "composer.title_placeholder": "Nhập tiêu đề cho chủ đề của bạn tại đây...", + "composer.handle_placeholder": "Name", "composer.discard": "Loại bỏ", "composer.submit": "Gửi", "composer.replying_to": "Đang trả lời %1", @@ -92,5 +93,6 @@ "sort_by": "Sắp xếp theo", "oldest_to_newest": "Cũ đến mới", "newest_to_oldest": "Mới đến cũ", - "most_votes": "Bình chọn nhiều nhất" + "most_votes": "Bình chọn nhiều nhất", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/vi/user.json b/public/language/vi/user.json index 0b02dad0b6..a9ee90df9f 100644 --- a/public/language/vi/user.json +++ b/public/language/vi/user.json @@ -2,6 +2,8 @@ "banned": "Bị cấm", "offline": "Offline", "username": "Tên truy cập", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "Xác nhận email", "delete_account": "Xóa tài khoản", @@ -16,6 +18,7 @@ "profile_views": "Khung hiển thị hồ sơ", "reputation": "Mức uy tín", "favourites": "Yêu thích", + "watched": "Watched", "followers": "Số người theo dõi", "following": "Đang theo dõi", "signature": "Chữ ký", @@ -56,10 +59,12 @@ "digest_weekly": "Hàng tuần", "digest_monthly": "Hàng tháng", "send_chat_notifications": "Gửi một email nếu có tin nhắn chat mới đến và tôi không online", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "Người dùng này hiện chưa có ai theo dõi :(", "follows_no_one": "Người dùng này hiện chưa theo dõi ai :(", "has_no_posts": "Người dùng này chưa viết bài nào", "has_no_topics": "Người dùng này chưa tạo một chủ đề nào", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "Ẩn Email", "hidden": "Đã ẩn", "paginate_description": "Phân trang cho chủ đề và bài viết thay vì cuộn liên tục", diff --git a/public/language/vi/users.json b/public/language/vi/users.json index d75e6a6e01..405c9de32b 100644 --- a/public/language/vi/users.json +++ b/public/language/vi/users.json @@ -5,5 +5,8 @@ "search": "Tìm kiếm", "enter_username": "Gõ tên người dùng để tìm kiếm", "load_more": "Tải thêm", - "users-found-search-took": "%1 tài khoản(s) tìm thấy! Tìm trong %2 mili giây." + "users-found-search-took": "%1 tài khoản(s) tìm thấy! Tìm trong %2 mili giây.", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/zh_CN/email.json b/public/language/zh_CN/email.json index c641c408f0..341874ec67 100644 --- a/public/language/zh_CN/email.json +++ b/public/language/zh_CN/email.json @@ -1,14 +1,14 @@ { - "password-reset-requested": "密码重设申请 - %1!", + "password-reset-requested": "密码重置申请 - %1!", "welcome-to": "欢迎来到 %1", "greeting_no_name": "您好", "greeting_with_name": "%1，您好", - "welcome.text1": "谢谢您使用 %1 注册帐户！", - "welcome.text2": "如需完全激活您的帐户，我们需要校验您注册的电子邮箱地址。", + "welcome.text1": "谢谢您注册 %1 帐户！", + "welcome.text2": "需要在校验您注册时填写的电子邮箱地址后，才能全面激活您的帐户。", "welcome.cta": "点击这里确认您的电子邮箱地址", - "reset.text1": "我们收到了重置您密码的申请，可能因为您忘记了密码。如果不是，请忽略这封邮件。", + "reset.text1": "我们收到了重置您帐户密码的申请，可能是因为您遗忘了密码。如果不是，请忽略这封邮件。", "reset.text2": "如需继续重置密码，请点击下面的链接：", - "reset.cta": "点击这里重设您的密码", + "reset.cta": "点击这里重置您的密码", "digest.notifications": "您有来自 %1 的未读通知：", "digest.latest_topics": "来自 %1 的最新主题", "digest.cta": "点击这里访问 %1", @@ -17,6 +17,8 @@ "notif.chat.subject": "收到来自 %1 的新聊天消息", "notif.chat.cta": "点击这里恢复会话", "notif.chat.unsub.info": "根据您的订阅设置，为您发送此聊天提醒。", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "这是一封测试邮件，用来验证 NodeBB 的邮件配置是否设置正确。", "unsub.cta": "点击这里修改这些设置", "closing": "谢谢！" diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index af566e4dd6..acab3971eb 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -2,7 +2,7 @@ "invalid-data": "无效数据", "not-logged-in": "您还没有登陆。", "account-locked": "您的帐号已被临时锁定", - "search-requires-login": "搜索功能仅限会员使用！请登录或注册！", + "search-requires-login": "搜索功能仅限会员使用！请先登录或者注册！", "invalid-cid": "无效版块 ID", "invalid-tid": "无效主题 ID", "invalid-pid": "无效帖子 ID", @@ -15,9 +15,10 @@ "invalid-username-or-password": "请确认用户名和密码", "invalid-search-term": "无效的搜索关键字", "invalid-pagination-value": "无效页码", - "username-taken": "用户名已注册", - "email-taken": "电子邮箱已注册", + "username-taken": "用户名已被占用", + "email-taken": "电子邮箱已被占用", "email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "用户名太短", "username-too-long": "用户名太长", "user-banned": "用户已禁止", @@ -43,10 +44,13 @@ "already-favourited": "您已收藏该帖", "already-unfavourited": "您已取消收藏此帖", "cant-ban-other-admins": "您不能禁止其他管理员！", - "invalid-image-type": "无效图片类型", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "用户组名称太短", "group-already-exists": "用户组已存在", "group-name-change-not-allowed": "不允许更改用户组名称", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "此帖子已被删除", "post-already-restored": "此帖已经恢复", "topic-already-deleted": "此主题已被删除", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "您还没有足够的威望为此帖扣分", "not-enough-reputation-to-flag": "您没有足够的威望标记此帖", "reload-failed": "NodeBB 重新加载时遇到问题: \"%1\"。NodeBB 会继续给已存在的客户端组件服务，虽然您应该撤销在重新加载前执行的操作。", - "registration-error": "注册错误" + "registration-error": "注册错误", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/zh_CN/global.json b/public/language/zh_CN/global.json index 49076958b2..d8b6b8ea01 100644 --- a/public/language/zh_CN/global.json +++ b/public/language/zh_CN/global.json @@ -3,9 +3,10 @@ "search": "搜索", "buttons.close": "关闭", "403.title": "禁止访问", - "403.message": "您无权访问此页。也许您应该试试登录帐户？", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "未找到", - "404.message": "您似乎打开了一个不存在的页面。返回主页。", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "内部错误。", "500.message": "哎呀！看来是哪里出错了！", "register": "注册", @@ -26,6 +27,7 @@ "header.tags": "话题", "header.popular": "热门", "header.users": "会员", + "header.groups": "Groups", "header.chats": "聊天", "header.notifications": "通知", "header.search": "搜索", @@ -73,5 +75,7 @@ "updated.title": "论坛已更新", "updated.message": "论坛已更新到最新版本。点这里刷新页面。", "privacy": "隐私", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "全部删除" } \ No newline at end of file diff --git a/public/language/zh_CN/groups.json b/public/language/zh_CN/groups.json index 6857f8543a..10a70d94c2 100644 --- a/public/language/zh_CN/groups.json +++ b/public/language/zh_CN/groups.json @@ -1,8 +1,21 @@ { "groups": "用户组", "view_group": "查看用户组", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "用户组详情", "details.members": "会员列表", + "details.pending": "Pending Members", "details.has_no_posts": "此用户组的会员尚未发表任何帖子。", - "details.latest_posts": "最新帖子" + "details.latest_posts": "最新帖子", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json index 6b6df56f05..d3fea3da46 100644 --- a/public/language/zh_CN/recent.json +++ b/public/language/zh_CN/recent.json @@ -1,9 +1,18 @@ { "title": "最新", - "day": "今日", - "week": "本周", - "month": "本月", - "year": "本年", - "alltime": "有史以来", - "no_recent_topics": "无最新主题。" + "day": "24小时新帖热榜", + "week": "7天新帖热榜", + "month": "月度热帖榜", + "year": "年度热帖榜", + "alltime": "总热帖榜", + "no_recent_topics": "暂无主题。", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/zh_CN/search.json b/public/language/zh_CN/search.json index 3d8460e57b..338db4e61b 100644 --- a/public/language/zh_CN/search.json +++ b/public/language/zh_CN/search.json @@ -1,4 +1,7 @@ { "results_matching": "共 %1 条结果匹配 \"%2\"，(耗时 %3 秒)", - "no-matches": "没有找到帖子" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/zh_CN/tags.json b/public/language/zh_CN/tags.json index d237ecc9fb..cfea2abd2c 100644 --- a/public/language/zh_CN/tags.json +++ b/public/language/zh_CN/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "此话题还没有主题帖。", "tags": "话题", - "enter_tags_here": "在此输入话题。每输入一个话题按一次回车。", + "enter_tags_here": "在此输入话题。每输入一个话题后，按回车确认。", "enter_tags_here_short": "输入话题...", "no_tags": "尚无话题。" } \ No newline at end of file diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json index 2c53daa026..8dc93ec5f5 100644 --- a/public/language/zh_CN/topic.json +++ b/public/language/zh_CN/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "未选中帖子！", "fork_success": "成功分割主题! 点这里跳转到分割后的主题。", "composer.title_placeholder": "在此输入您主题的标题...", + "composer.handle_placeholder": "Name", "composer.discard": "撤销", "composer.submit": "提交", "composer.replying_to": "正在回复 %1", @@ -92,5 +93,6 @@ "sort_by": "排序", "oldest_to_newest": "从旧到新", "newest_to_oldest": "从新到旧", - "most_votes": "最多投票" + "most_votes": "最多投票", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json index 5871c8d4bb..9379b69e38 100644 --- a/public/language/zh_CN/user.json +++ b/public/language/zh_CN/user.json @@ -2,6 +2,8 @@ "banned": "禁止", "offline": "离线", "username": "用户名", + "joindate": "Join Date", + "postcount": "Post Count", "email": "电子邮件", "confirm_email": "确认电子邮箱", "delete_account": "删除帐号", @@ -16,6 +18,7 @@ "profile_views": "资料浏览", "reputation": "威望", "favourites": "收藏的帖子", + "watched": "Watched", "followers": "粉丝", "following": "关注", "signature": "签名档", @@ -46,7 +49,7 @@ "image_spec": "您只能上传 PNG, JPG 或者 GIF 图片文件", "max": "最大", "settings": "设置", - "show_email": "公开我的电子邮箱", + "show_email": "显示我的电子邮箱", "show_fullname": "显示我的全名", "restrict_chats": "只允许我关注的用户给我发送聊天消息", "digest_label": "订阅摘要", @@ -56,10 +59,12 @@ "digest_weekly": "每周", "digest_monthly": "每月", "send_chat_notifications": "当我不在线，并受到新的聊天消息时给我发邮件", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "此用户还没有粉丝 :(", "follows_no_one": "此用户尚未关注任何人 :(", "has_no_posts": "此用户尚未发布任何帖子。", "has_no_topics": "此用户还未发布任何主题。", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "电子邮箱已隐藏", "hidden": "隐藏", "paginate_description": "分页展示主题和帖子，替代滚动展示。", diff --git a/public/language/zh_CN/users.json b/public/language/zh_CN/users.json index 8ff23a16a0..bd19c53fa9 100644 --- a/public/language/zh_CN/users.json +++ b/public/language/zh_CN/users.json @@ -5,5 +5,8 @@ "search": "搜索", "enter_username": "输入用户名搜索", "load_more": "加载更多", - "users-found-search-took": "找到 %1 位用户！搜索耗时 %2 毫秒。" + "users-found-search-took": "找到 %1 位用户！搜索耗时 %2 毫秒。", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/zh_TW/email.json b/public/language/zh_TW/email.json index 24615b384e..6a5e3ef124 100644 --- a/public/language/zh_TW/email.json +++ b/public/language/zh_TW/email.json @@ -17,6 +17,8 @@ "notif.chat.subject": "收到來自$1的聊天消息", "notif.chat.cta": "點擊此處繼續對話", "notif.chat.unsub.info": "本聊天通知按您的訂閱設置發送給您。", + "notif.post.cta": "Click here to read the full topic", + "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "這是一個測試電郵，以確認您的NodeBB郵件器設置正確。", "unsub.cta": "點擊這裡更改這些設置", "closing": "謝謝！" diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json index 7dd02dd9f6..32fdfd6f7f 100644 --- a/public/language/zh_TW/error.json +++ b/public/language/zh_TW/error.json @@ -18,6 +18,7 @@ "username-taken": "該使用者名稱已被使用", "email-taken": "該信箱已被使用", "email-not-confirmed": "您的電郵尚未得到確認，請點擊此處確認您的電子郵件。", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", "username-too-short": "用戶名太短", "username-too-long": "用戶名太長", "user-banned": "該使用者已被停用", @@ -43,10 +44,13 @@ "already-favourited": "你已經收藏了這篇文章", "already-unfavourited": "你已放棄收藏這篇文章", "cant-ban-other-admins": "你不能禁用其他管理員！", - "invalid-image-type": "無效的圖像類型", + "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-extension": "Invalid image extension", "group-name-too-short": "群組名稱太短了", "group-already-exists": "群組名稱已存在", "group-name-change-not-allowed": "變更群組名稱不被允許", + "group-already-member": "You are already part of this group", + "group-needs-owner": "This group requires at least one owner", "post-already-deleted": "此文章已經被刪除", "post-already-restored": "此文章已還原", "topic-already-deleted": "此主題已經被刪除", @@ -63,5 +67,6 @@ "not-enough-reputation-to-downvote": "你沒有足夠的信譽downvote這個帖子", "not-enough-reputation-to-flag": "你沒有足夠的信譽來舉報這個帖子", "reload-failed": "NodeBB重載\"%1\"時遇到了問題。 NodeBB將繼續提供現有的客戶端資源，但請你撤消重載前的動作。", - "registration-error": "註冊錯誤" + "registration-error": "註冊錯誤", + "parse-error": "Something went wrong while parsing server response" } \ No newline at end of file diff --git a/public/language/zh_TW/global.json b/public/language/zh_TW/global.json index 6b3d22cdda..3dc23be905 100644 --- a/public/language/zh_TW/global.json +++ b/public/language/zh_TW/global.json @@ -3,9 +3,10 @@ "search": "搜索", "buttons.close": "關閉", "403.title": "禁止存取", - "403.message": "你沒有該頁面的存取權限，可能是因為你尚未登錄。", + "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.login": "Perhaps you should try logging in?", "404.title": "無法找到該頁", - "404.message": "你所查找的頁面並不存在，返回主頁。", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "內部錯誤", "500.message": "不好！看來是哪裡出錯了！", "register": "注冊", @@ -26,6 +27,7 @@ "header.tags": "標籤", "header.popular": "熱門", "header.users": "用戶", + "header.groups": "Groups", "header.chats": "聊天", "header.notifications": "通知", "header.search": "搜索", @@ -73,5 +75,7 @@ "updated.title": "討論區更新完畢", "updated.message": "這個討論區最近被更新至最新的版本. 按此來重整這個頁面", "privacy": "隱私", + "follow": "Follow", + "unfollow": "Unfollow", "delete_all": "全部刪除" } \ No newline at end of file diff --git a/public/language/zh_TW/groups.json b/public/language/zh_TW/groups.json index 83ea1f5e9b..7e9ba9f239 100644 --- a/public/language/zh_TW/groups.json +++ b/public/language/zh_TW/groups.json @@ -1,8 +1,21 @@ { "groups": "群組", "view_group": "查看群組", + "owner": "Group Owner", + "new_group": "Create New Group", + "no_groups_found": "There are no groups to see", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-change": "Change", + "cover-save": "Save", + "cover-saving": "Saving", "details.title": "群組詳細信息", "details.members": "成員列表", + "details.pending": "Pending Members", "details.has_no_posts": "這個群組的成員還未發出任何帖子。", - "details.latest_posts": "最新帖子" + "details.latest_posts": "最新帖子", + "details.private": "Private Group", + "details.public": "Public Group", + "details.owner_options": "Group Administration", + "event.updated": "Group details have been updated", + "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/zh_TW/recent.json b/public/language/zh_TW/recent.json index 295c9fea8d..3234bb7376 100644 --- a/public/language/zh_TW/recent.json +++ b/public/language/zh_TW/recent.json @@ -5,5 +5,14 @@ "month": "本月", "year": "全年", "alltime": "所有時間", - "no_recent_topics": "最近沒新主題." + "no_recent_topics": "最近沒新主題.", + "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", + "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", + "there-are-new-topics": "There are %1 new topics.", + "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", + "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", + "there-is-a-new-post": "There is a new post.", + "there-are-new-posts": "There are %1 new posts.", + "click-here-to-reload": "Click here to reload." } \ No newline at end of file diff --git a/public/language/zh_TW/search.json b/public/language/zh_TW/search.json index 31d8078405..426fa932b4 100644 --- a/public/language/zh_TW/search.json +++ b/public/language/zh_TW/search.json @@ -1,4 +1,7 @@ { "results_matching": "有%1個跟\"%2\"匹配的結果（%3秒）", - "no-matches": "沒有發現帖子" + "no-matches": "No matches found", + "in": "In", + "by": "By", + "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json index 65ca02fb5a..04787766fa 100644 --- a/public/language/zh_TW/topic.json +++ b/public/language/zh_TW/topic.json @@ -74,6 +74,7 @@ "fork_no_pids": "尚未選擇文章！", "fork_success": "成功分叉成新的主題！點擊這裡進入新的主題。", "composer.title_placeholder": "輸入標題...", + "composer.handle_placeholder": "Name", "composer.discard": "放棄", "composer.submit": "發表", "composer.replying_to": "回覆給 %1", @@ -92,5 +93,6 @@ "sort_by": "排序方式", "oldest_to_newest": "從舊到新", "newest_to_oldest": "從新到舊", - "most_votes": "得票最多" + "most_votes": "得票最多", + "most_posts": "Most posts" } \ No newline at end of file diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json index 54ac9405a4..1752a45979 100644 --- a/public/language/zh_TW/user.json +++ b/public/language/zh_TW/user.json @@ -2,6 +2,8 @@ "banned": "封鎖", "offline": "下線", "username": "使用者名稱", + "joindate": "Join Date", + "postcount": "Post Count", "email": "Email", "confirm_email": "確認電郵", "delete_account": "刪除帳戶", @@ -16,6 +18,7 @@ "profile_views": "資料被查看", "reputation": "聲望", "favourites": "我的最愛", + "watched": "Watched", "followers": "跟隨者", "following": "正在關注", "signature": "簽名", @@ -56,10 +59,12 @@ "digest_weekly": "每週", "digest_monthly": "每月", "send_chat_notifications": "如果有新的聊天消息而我不在線，發送郵件給我", + "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", "has_no_follower": "該用戶還沒有被任何人關注。", "follows_no_one": "該用戶還沒有關注過任何人。", "has_no_posts": "尚未有任何貼文.", "has_no_topics": "這位使用者尚未發表任何主題。", + "has_no_watched_topics": "This user didn't watch any topics yet.", "email_hidden": "郵箱被隱藏", "hidden": "隱藏", "paginate_description": "使用分頁取代瀏覽載入文章模式.", diff --git a/public/language/zh_TW/users.json b/public/language/zh_TW/users.json index e90a437fe5..249b34d36f 100644 --- a/public/language/zh_TW/users.json +++ b/public/language/zh_TW/users.json @@ -5,5 +5,8 @@ "search": "搜尋", "enter_username": "輸入想找的使用者帳號", "load_more": "載入更多", - "users-found-search-took": "找到%1個用戶！搜索時間%2毫秒。" + "users-found-search-took": "找到%1個用戶！搜索時間%2毫秒。", + "filter-by": "Filter By", + "online-only": "Online only", + "picture-only": "Picture only" } \ No newline at end of file From a7a4edfd373ec0f53e4d67658e7aa7f61d1b9b4f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 29 Jan 2015 19:18:18 -0500 Subject: [PATCH 265/897] administrators group no longer shows up in group searches --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index bd832a9178..cb29a9a2d1 100644 --- a/src/groups.js +++ b/src/groups.js @@ -926,7 +926,7 @@ var async = require('async'), async.apply(db.getObjectValues, 'groupslug:groupname'), function(groupNames, next) { groupNames = groupNames.filter(function(name) { - return name.match(new RegExp(query, 'i')); + return name.match(new RegExp(query, 'i')) && name !== 'administrators'; }); async.mapLimit(groupNames, 5, function(groupName, next) { From f3f3ca8e5008a7d5303c6e02660384ad7ba6fcce Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 29 Jan 2015 19:25:01 -0500 Subject: [PATCH 266/897] if key isn't found dont error --- src/database/redis/main.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/database/redis/main.js b/src/database/redis/main.js index efe1b7958a..ebad6ae8e6 100644 --- a/src/database/redis/main.js +++ b/src/database/redis/main.js @@ -105,13 +105,8 @@ module.exports = function(redisClient, module) { module.rename = function(oldKey, newKey, callback) { callback = callback || function() {}; - redisClient.exists(oldKey, function(err, exists) { - if (err || !exists) { - return callback(err); - } - redisClient.rename(oldKey, newKey, function(err, res) { - callback(err); - }); + redisClient.rename(oldKey, newKey, function(err, res) { + callback(err && err.message !== 'ERR no such key' ? err : null); }); }; From 39cac43b96227425bfc74367fffa57f76a62c545 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 29 Jan 2015 19:25:01 -0500 Subject: [PATCH 267/897] if key isn't found dont error Conflicts: src/database/redis/main.js --- src/database/redis/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database/redis/main.js b/src/database/redis/main.js index 9b08e4af65..ebad6ae8e6 100644 --- a/src/database/redis/main.js +++ b/src/database/redis/main.js @@ -106,7 +106,7 @@ module.exports = function(redisClient, module) { module.rename = function(oldKey, newKey, callback) { callback = callback || function() {}; redisClient.rename(oldKey, newKey, function(err, res) { - callback(err); + callback(err && err.message !== 'ERR no such key' ? err : null); }); }; From 939e6235476920bf6940c6e6b5435b1948419eea Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 29 Jan 2015 19:49:32 -0500 Subject: [PATCH 268/897] collapsing a bunch of whitespace using async.apply, and also fixed #2672 as well --- src/groups.js | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/src/groups.js b/src/groups.js index cb29a9a2d1..4a7611c531 100644 --- a/src/groups.js +++ b/src/groups.js @@ -532,18 +532,10 @@ var async = require('async'), } async.series([ - function(next) { - db.setObjectField('group:' + oldName, 'name', newName, next); - }, - function(next) { - db.setObjectField('group:' + oldName, 'slug', utils.slugify(newName), next); - }, - function(next) { - db.deleteObjectField('groupslug:groupname', group.slug, next); - }, - function(next) { - db.setObjectField('groupslug:groupname', utils.slugify(newName), newName, next); - }, + async.apply(db.setObjectField, 'group:' + oldName, 'name', newName), + async.apply(db.setObjectField, 'group:' + oldName, 'slug', utils.slugify(newName)), + async.apply(db.deleteObjectField, 'groupslug:groupname', group.slug), + async.apply(db.setObjectField, 'groupslug:groupname', utils.slugify(newName), newName), function(next) { db.getSortedSetRange('groups:createtime', 0, -1, function(err, groups) { if (err) { @@ -554,24 +546,11 @@ var async = require('async'), }, next); }); }, - function(next) { - db.rename('group:' + oldName, 'group:' + newName, next); - }, - function(next) { - db.exists('group:' + oldName + ':members', function(err, exists) { - if (err) { - return next(err); - } - if (exists) { - db.rename('group:' + oldName + ':members', 'group:' + newName + ':members', next); - } else { - next(); - } - }); - }, - function(next) { - renameGroupMember('groups:createtime', oldName, newName, next); - }, + async.apply(db.rename, 'group:' + oldName, 'group:' + newName), + async.apply(db.rename, 'group:' + oldName + ':members', 'group:' + newName + ':members'), + async.apply(db.rename, 'group:' + oldName + ':owners', 'group:' + newName + ':owners'), + async.apply(db.rename, 'group:' + oldName + ':pending', 'group:' + newName + ':pending'), + async.apply(renameGroupMember, 'groups:createtime', oldName, newName), function(next) { plugins.fireHook('action:group.rename', { old: oldName, From 66b6e12aa338382f0c4b347b87c17b603ff17108 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 30 Jan 2015 12:21:00 -0500 Subject: [PATCH 269/897] added grunt deps --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c46f966b43..500543de16 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,10 @@ "xregexp": "~2.0.0" }, "devDependencies": { - "mocha": "~1.13.0" + "mocha": "~1.13.0", + "grunt": "~0.4.5", + "grunt-supervisor": "^0.2.4", + "grunt-express-server": "^0.4.19" }, "bugs": { "url": "https://github.com/NodeBB/NodeBB/issues" From 3bb9c9531fb761e654953f2802292d4cdc0279be Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 30 Jan 2015 12:25:07 -0500 Subject: [PATCH 270/897] catch errors from static hook --- src/plugins/hooks.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js index 6a2751545a..1d6c6f8e7b 100644 --- a/src/plugins/hooks.js +++ b/src/plugins/hooks.js @@ -123,12 +123,18 @@ module.exports = function(Plugins) { next(); }, 5000); - hookObj.method(params, function() { + try { + hookObj.method(params, function() { + clearTimeout(timeoutId); + if (!timedOut) { + next.apply(null, arguments); + } + }); + } catch(err) { + winston.error('[plugins] Error executing \'' + hook + '\' in plugin \'' + hookObj.id + '\''); clearTimeout(timeoutId); - if (!timedOut) { - next.apply(null, arguments); - } - }); + next(); + } } else { next(); } From 60e052e788294d798f73f991ac7965da1290e579 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 30 Jan 2015 12:28:29 -0500 Subject: [PATCH 271/897] closes #2674 --- public/src/client/topic/threadTools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 41a3d532bf..b401a850ed 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -61,7 +61,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func fork.init(); $('.posts').on('click', '.follow', function() { - socket.emit('topics.follow', tid, function(err, state) { + socket.emit('topics.toggleFollow', tid, function(err, state) { if(err) { return app.alert({ type: 'danger', From f5ef3cf86634a9709f81a3059a30526bb14a3f15 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 30 Jan 2015 13:06:04 -0500 Subject: [PATCH 272/897] Gruntfile.js --- Gruntfile.js | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 Gruntfile.js diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000000..19b0af68d0 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,53 @@ +module.exports = function(grunt) { + grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), + execute: { + dev: { + src: 'a.js', + options: { + args: ['arg'] + } + }, + minifyJS: { + src: 'app.js', + options: { + args: ['from-file'] + } + }, + minifyCSS: { + src: 'app.js', + options: { + args: ['from-file'] + } + }, + }, + watch: { + clientScripts: { + files: ['public/src/**/*.js'], + tasks: ['execute:minifyJS'], + options: { + spawn: false + } + }, + serverScripts: { + files: ['*.js', 'src/**/*.js', 'node_modules/**/*.js'], + tasks: ['execute:minifyCSS'], + options: { + spawn: false + } + }, + less: { + files: ['**/*.less'], + tasks: ['execute:minifyCSS'], + options: { + spawn: false + } + } + } + }); + + grunt.loadNpmTasks('grunt-contrib-watch'); + grunt.loadNpmTasks('grunt-execute'); + + grunt.registerTask('default', ['watch', 'execute:minifyCSS']); +}; \ No newline at end of file From 7639bff0fef697e6b326b7a6c4eb6d8b80db888e Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 30 Jan 2015 13:06:17 -0500 Subject: [PATCH 273/897] updated package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 500543de16..c8583eaf64 100644 --- a/package.json +++ b/package.json @@ -69,8 +69,8 @@ "devDependencies": { "mocha": "~1.13.0", "grunt": "~0.4.5", - "grunt-supervisor": "^0.2.4", - "grunt-express-server": "^0.4.19" + "grunt-contrib-watch": "^0.6.1", + "grunt-execute": "^0.2.2" }, "bugs": { "url": "https://github.com/NodeBB/NodeBB/issues" From 4f5918390a87fe9d13b8f1e30065364d210ceab5 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 30 Jan 2015 14:19:15 -0500 Subject: [PATCH 274/897] if user search is blank, return all users --- public/src/client/users.js | 5 ----- src/user/search.js | 4 ---- 2 files changed, 9 deletions(-) diff --git a/public/src/client/users.js b/public/src/client/users.js index b96f3f5501..c3f374c4ff 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -115,11 +115,6 @@ define('forum/users', function() { var username = $('#search-user').val(); var notify = $('#user-notfound-notify'); page = page || 1; - if (!username) { - notify.html(''); - notify.parent().removeClass('btn-warning label-warning btn-success label-success'); - return; - } notify.html(''); var filters = []; diff --git a/src/user/search.js b/src/user/search.js index 9df346f6ec..34140005e1 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -16,10 +16,6 @@ module.exports = function(User) { var page = data.page || 1; var uid = data.uid || 0; - if (!query) { - return callback(null, {timing: 0, users: [], matchCount: 0, pages: []}); - } - if (searchBy.indexOf('ip') !== -1) { return searchByIP(query, uid, callback); } From 4a7ec3ccc6b0b00b76c0996fa19148a957d6e163 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 30 Jan 2015 15:48:17 -0500 Subject: [PATCH 275/897] added groups page to user profile --- public/src/client/groups/list.js | 4 ++-- src/controllers/accounts.js | 23 +++++++++++++++++++++++ src/routes/index.js | 1 + src/views/config.json | 1 + 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 0410a9fa17..d0b4c69b50 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -8,9 +8,9 @@ define('forum/groups/list', function() { var groupsEl = $('#groups-list'); groupsEl.on('click', '.list-cover', function() { - var groupName = $(this).parents('[data-group]').attr('data-group'); + var groupSlug = $(this).parents('[data-slug]').attr('data-slug'); - ajaxify.go('groups/' + utils.slugify(groupName)); + ajaxify.go('groups/' + groupSlug); }); // Group creation diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 741de9a626..c55977a351 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -233,6 +233,29 @@ accountsController.getTopics = function(req, res, next) { getFromUserSet('account/topics', 'topics', topics.getTopicsFromSet, 'topics', req, res, next); }; +accountsController.getGroups = function(req, res, next) { + var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; + + getBaseUser(req.params.userslug, callerUID, function(err, userData) { + if (err) { + return next(err); + } + + if (!userData) { + return helpers.notFound(req, res); + } + + groups.getUserGroups([userData.uid], function(err, groups) { + if (err) { + return next(err); + } + + userData.groups = groups[0]; + + res.render('account/groups', userData); + }); + }); +}; function getFromUserSet(tpl, set, method, type, req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; diff --git a/src/routes/index.js b/src/routes/index.js index 1af03e0930..f8012c9456 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -68,6 +68,7 @@ function accountRoutes(app, middleware, controllers) { setupPageRoute(app, '/user/:userslug/followers', middleware, middlewares, controllers.accounts.getFollowers); setupPageRoute(app, '/user/:userslug/posts', middleware, middlewares, controllers.accounts.getPosts); setupPageRoute(app, '/user/:userslug/topics', middleware, middlewares, controllers.accounts.getTopics); + setupPageRoute(app, '/user/:userslug/groups', middleware, middlewares, controllers.accounts.getGroups); setupPageRoute(app, '/user/:userslug/favourites', middleware, accountMiddlewares, controllers.accounts.getFavourites); setupPageRoute(app, '/user/:userslug/watched', middleware, accountMiddlewares, controllers.accounts.getWatchedTopics); diff --git a/src/views/config.json b/src/views/config.json index 70997cf4a8..26ae7b692c 100644 --- a/src/views/config.json +++ b/src/views/config.json @@ -14,6 +14,7 @@ "^user/.*/watched": "account/watched", "^user/.*/posts": "account/posts", "^user/.*/topics": "account/topics", + "^user/.*/groups": "account/groups", "^user/[^\/]+": "account/profile", "^reset/.*": "reset_code", "^tags/.*": "tag", From c8f87e5d363678477fa5ef33b28544dccc59adf8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 30 Jan 2015 16:16:49 -0500 Subject: [PATCH 276/897] removed console.log --- public/src/client/account/watched.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/src/client/account/watched.js b/public/src/client/account/watched.js index bd0e8282dd..9a502b1ee8 100644 --- a/public/src/client/account/watched.js +++ b/public/src/client/account/watched.js @@ -11,7 +11,6 @@ define('forum/account/watched', ['forum/account/header', 'forum/infinitescroll'] }; function loadMore(direction) { - console.log(direction); if (direction < 0) { return; } From da0b2c84e675ec03fc4f73568c65d97afa23036e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 30 Jan 2015 16:24:57 -0500 Subject: [PATCH 277/897] passing memberCount and createTime into getUserGroups --- src/groups.js | 54 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/src/groups.js b/src/groups.js index 4a7611c531..4eca55c05d 100644 --- a/src/groups.js +++ b/src/groups.js @@ -781,35 +781,51 @@ var async = require('async'), groupData = groupData.filter(function(group) { return parseInt(group.hidden, 10) !== 1 && !!group.userTitle; + }).map(function(group) { + group.createtimeISO = utils.toISOString(group.createtime); + return group; }); - var groupSets = groupData.map(function(group) { - group.labelColor = group.labelColor || '#000000'; + async.map(groupData, function(groupObj, next) { + Groups.getMemberCount(groupObj.name, function(err, memberCount) { + if (err) { return next(err); } - if (!group['cover:url']) { - group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; - group['cover:position'] = '50% 50%'; + groupObj.memberCount = memberCount; + next(err, groupObj); + }); + }, function(err, groupData) { + if (err) { + return callback(err); } - return 'group:' + group.name + ':members'; - }); + var groupSets = groupData.map(function(group) { + group.labelColor = group.labelColor || '#000000'; - async.map(uids, function(uid, next) { - db.isMemberOfSortedSets(groupSets, uid, function(err, isMembers) { - if (err) { - return next(err); + if (!group['cover:url']) { + group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; + group['cover:position'] = '50% 50%'; } - var memberOf = []; - isMembers.forEach(function(isMember, index) { - if (isMember) { - memberOf.push(groupData[index]); + return 'group:' + group.name + ':members'; + }); + + async.map(uids, function(uid, next) { + db.isMemberOfSortedSets(groupSets, uid, function(err, isMembers) { + if (err) { + return next(err); } - }); - next(null, memberOf); - }); - }, callback); + var memberOf = []; + isMembers.forEach(function(isMember, index) { + if (isMember) { + memberOf.push(groupData[index]); + } + }); + + next(null, memberOf); + }); + }, callback); + }); }); }); }; From b62337b0b90e124c9f444a54b08d2e6c10ef2921 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 30 Jan 2015 16:27:29 -0500 Subject: [PATCH 278/897] fixed browser title in user groups page --- public/language/en_GB/pages.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/language/en_GB/pages.json b/public/language/en_GB/pages.json index 8b231f8a94..4095ae38a3 100644 --- a/public/language/en_GB/pages.json +++ b/public/language/en_GB/pages.json @@ -11,6 +11,7 @@ "user.followers": "People who Follow %1", "user.posts": "Posts made by %1", "user.topics": "Topics created by %1", + "user.groups": "%1's Groups", "user.favourites": "%1's Favourite Posts", "user.settings": "User Settings", From e4e9020e1f4f058f16f68de0c0de813ce406c184 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 30 Jan 2015 15:48:17 -0500 Subject: [PATCH 279/897] added groups page to user profile --- public/src/client/groups/list.js | 4 ++-- src/controllers/accounts.js | 23 +++++++++++++++++++++++ src/routes/index.js | 1 + src/views/config.json | 1 + 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 0410a9fa17..d0b4c69b50 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -8,9 +8,9 @@ define('forum/groups/list', function() { var groupsEl = $('#groups-list'); groupsEl.on('click', '.list-cover', function() { - var groupName = $(this).parents('[data-group]').attr('data-group'); + var groupSlug = $(this).parents('[data-slug]').attr('data-slug'); - ajaxify.go('groups/' + utils.slugify(groupName)); + ajaxify.go('groups/' + groupSlug); }); // Group creation diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 741de9a626..c55977a351 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -233,6 +233,29 @@ accountsController.getTopics = function(req, res, next) { getFromUserSet('account/topics', 'topics', topics.getTopicsFromSet, 'topics', req, res, next); }; +accountsController.getGroups = function(req, res, next) { + var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; + + getBaseUser(req.params.userslug, callerUID, function(err, userData) { + if (err) { + return next(err); + } + + if (!userData) { + return helpers.notFound(req, res); + } + + groups.getUserGroups([userData.uid], function(err, groups) { + if (err) { + return next(err); + } + + userData.groups = groups[0]; + + res.render('account/groups', userData); + }); + }); +}; function getFromUserSet(tpl, set, method, type, req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; diff --git a/src/routes/index.js b/src/routes/index.js index 1af03e0930..f8012c9456 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -68,6 +68,7 @@ function accountRoutes(app, middleware, controllers) { setupPageRoute(app, '/user/:userslug/followers', middleware, middlewares, controllers.accounts.getFollowers); setupPageRoute(app, '/user/:userslug/posts', middleware, middlewares, controllers.accounts.getPosts); setupPageRoute(app, '/user/:userslug/topics', middleware, middlewares, controllers.accounts.getTopics); + setupPageRoute(app, '/user/:userslug/groups', middleware, middlewares, controllers.accounts.getGroups); setupPageRoute(app, '/user/:userslug/favourites', middleware, accountMiddlewares, controllers.accounts.getFavourites); setupPageRoute(app, '/user/:userslug/watched', middleware, accountMiddlewares, controllers.accounts.getWatchedTopics); diff --git a/src/views/config.json b/src/views/config.json index 70997cf4a8..26ae7b692c 100644 --- a/src/views/config.json +++ b/src/views/config.json @@ -14,6 +14,7 @@ "^user/.*/watched": "account/watched", "^user/.*/posts": "account/posts", "^user/.*/topics": "account/topics", + "^user/.*/groups": "account/groups", "^user/[^\/]+": "account/profile", "^reset/.*": "reset_code", "^tags/.*": "tag", From ecfa8f7a7df276085c0b8a6d100c46f99bc202ef Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 30 Jan 2015 16:24:57 -0500 Subject: [PATCH 280/897] passing memberCount and createTime into getUserGroups --- src/groups.js | 54 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/src/groups.js b/src/groups.js index 4a7611c531..4eca55c05d 100644 --- a/src/groups.js +++ b/src/groups.js @@ -781,35 +781,51 @@ var async = require('async'), groupData = groupData.filter(function(group) { return parseInt(group.hidden, 10) !== 1 && !!group.userTitle; + }).map(function(group) { + group.createtimeISO = utils.toISOString(group.createtime); + return group; }); - var groupSets = groupData.map(function(group) { - group.labelColor = group.labelColor || '#000000'; + async.map(groupData, function(groupObj, next) { + Groups.getMemberCount(groupObj.name, function(err, memberCount) { + if (err) { return next(err); } - if (!group['cover:url']) { - group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; - group['cover:position'] = '50% 50%'; + groupObj.memberCount = memberCount; + next(err, groupObj); + }); + }, function(err, groupData) { + if (err) { + return callback(err); } - return 'group:' + group.name + ':members'; - }); + var groupSets = groupData.map(function(group) { + group.labelColor = group.labelColor || '#000000'; - async.map(uids, function(uid, next) { - db.isMemberOfSortedSets(groupSets, uid, function(err, isMembers) { - if (err) { - return next(err); + if (!group['cover:url']) { + group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; + group['cover:position'] = '50% 50%'; } - var memberOf = []; - isMembers.forEach(function(isMember, index) { - if (isMember) { - memberOf.push(groupData[index]); + return 'group:' + group.name + ':members'; + }); + + async.map(uids, function(uid, next) { + db.isMemberOfSortedSets(groupSets, uid, function(err, isMembers) { + if (err) { + return next(err); } - }); - next(null, memberOf); - }); - }, callback); + var memberOf = []; + isMembers.forEach(function(isMember, index) { + if (isMember) { + memberOf.push(groupData[index]); + } + }); + + next(null, memberOf); + }); + }, callback); + }); }); }); }; From 607e88b3c3ad28740c49b53105e39c82934db7ff Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 30 Jan 2015 16:27:29 -0500 Subject: [PATCH 281/897] fixed browser title in user groups page --- public/language/en_GB/pages.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/language/en_GB/pages.json b/public/language/en_GB/pages.json index 8b231f8a94..4095ae38a3 100644 --- a/public/language/en_GB/pages.json +++ b/public/language/en_GB/pages.json @@ -11,6 +11,7 @@ "user.followers": "People who Follow %1", "user.posts": "Posts made by %1", "user.topics": "Topics created by %1", + "user.groups": "%1's Groups", "user.favourites": "%1's Favourite Posts", "user.settings": "User Settings", From dc2a2aa98ec372c7c114dedf2904411e3c40efec Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 30 Jan 2015 22:38:42 -0500 Subject: [PATCH 282/897] store group member count in group hash yet another upgrade script --- src/groups.js | 140 ++++++++++++++++++++++++------------------------- src/upgrade.js | 37 ++++++++++++- 2 files changed, 104 insertions(+), 73 deletions(-) diff --git a/src/groups.js b/src/groups.js index 4eca55c05d..7e41b94b02 100644 --- a/src/groups.js +++ b/src/groups.js @@ -299,7 +299,7 @@ var async = require('async'), }; Groups.getMemberCount = function(groupName, callback) { - db.sortedSetCard('group:' + groupName + ':members', callback); + db.getObjectField('group:' + groupName, 'memberCount', callback); }; Groups.isMemberOfGroupList = function(uid, groupListKey, callback) { @@ -611,46 +611,56 @@ var async = require('async'), }; Groups.join = function(groupName, uid, callback) { - callback = callback || function() {}; - - Groups.exists(groupName, function(err, exists) { - if (exists) { - var tasks = [ - async.apply(db.sortedSetAdd, 'group:' + groupName + ':members', Date.now(), uid) - ]; + function join() { + var tasks = [ + async.apply(db.sortedSetAdd, 'group:' + groupName + ':members', Date.now(), uid), + async.apply(db.incrObjectField, 'group:' + groupName, 'memberCount') + ]; - user.isAdministrator(uid, function(err, isAdmin) { + async.waterfall([ + function(next) { + user.isAdministrator(uid, next); + }, + function(isAdmin, next) { if (isAdmin) { tasks.push(async.apply(db.setAdd, 'group:' + groupName + ':owners', uid)); } + async.parallel(tasks, next); + } + ], function(err, results) { + if (err) { + return callback(err); + } + plugins.fireHook('action:group.join', { + groupName: groupName, + uid: uid + }); + callback(); + }); + } - async.parallel(tasks, function(err) { - plugins.fireHook('action:group.join', { - groupName: groupName, - uid: uid - }); + callback = callback || function() {}; - callback(); - }); - }); - } else { - Groups.create({ - name: groupName, - description: '', - hidden: 1 - }, function(err) { - if (err && err.message !== '[[error:group-already-exists]]') { - winston.error('[groups.join] Could not create new hidden group: ' + err.message); - return callback(err); - } + Groups.exists(groupName, function(err, exists) { + if (err) { + return callback(err); + } - db.sortedSetAdd('group:' + groupName + ':members', Date.now(), uid, callback); - plugins.fireHook('action:group.join', { - groupName: groupName, - uid: uid - }); - }); + if (exists) { + return join(); } + + Groups.create({ + name: groupName, + description: '', + hidden: 1 + }, function(err) { + if (err && err.message !== '[[error:group-already-exists]]') { + winston.error('[groups.join] Could not create new hidden group: ' + err.message); + return callback(err); + } + join(); + }); }); }; @@ -692,9 +702,10 @@ var async = require('async'), callback = callback || function() {}; var tasks = [ - async.apply(db.sortedSetRemove, 'group:' + groupName + ':members', uid), - async.apply(db.setRemove, 'group:' + groupName + ':owners', uid) - ]; + async.apply(db.sortedSetRemove, 'group:' + groupName + ':members', uid), + async.apply(db.setRemove, 'group:' + groupName + ':owners', uid), + async.apply(db.decrObjectField, 'group:' + groupName, 'memberCount') + ]; async.parallel(tasks, function(err) { if (err) { @@ -715,7 +726,7 @@ var async = require('async'), if (group.hidden && group.memberCount === 0) { Groups.destroy(groupName, callback); } else { - return callback(); + callback(); } }); }); @@ -781,51 +792,36 @@ var async = require('async'), groupData = groupData.filter(function(group) { return parseInt(group.hidden, 10) !== 1 && !!group.userTitle; - }).map(function(group) { - group.createtimeISO = utils.toISOString(group.createtime); - return group; }); - async.map(groupData, function(groupObj, next) { - Groups.getMemberCount(groupObj.name, function(err, memberCount) { - if (err) { return next(err); } + var groupSets = groupData.map(function(group) { + group.labelColor = group.labelColor || '#000000'; + group.createtimeISO = utils.toISOString(group.createtime); - groupObj.memberCount = memberCount; - next(err, groupObj); - }); - }, function(err, groupData) { - if (err) { - return callback(err); + if (!group['cover:url']) { + group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; + group['cover:position'] = '50% 50%'; } - var groupSets = groupData.map(function(group) { - group.labelColor = group.labelColor || '#000000'; + return 'group:' + group.name + ':members'; + }); - if (!group['cover:url']) { - group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; - group['cover:position'] = '50% 50%'; + async.map(uids, function(uid, next) { + db.isMemberOfSortedSets(groupSets, uid, function(err, isMembers) { + if (err) { + return next(err); } - return 'group:' + group.name + ':members'; - }); - - async.map(uids, function(uid, next) { - db.isMemberOfSortedSets(groupSets, uid, function(err, isMembers) { - if (err) { - return next(err); + var memberOf = []; + isMembers.forEach(function(isMember, index) { + if (isMember) { + memberOf.push(groupData[index]); } - - var memberOf = []; - isMembers.forEach(function(isMember, index) { - if (isMember) { - memberOf.push(groupData[index]); - } - }); - - next(null, memberOf); }); - }, callback); - }); + + next(null, memberOf); + }); + }, callback); }); }); }; diff --git a/src/upgrade.js b/src/upgrade.js index d433c9c06f..05a186ea69 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 0, 21); + latestSchema = Date.UTC(2015, 0, 30); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -773,6 +773,41 @@ Upgrade.upgrade = function(callback) { winston.info('[2015/01/21] Upgrading groups to sorted set skipped'); next(); } + }, + function(next) { + thisSchemaDate = Date.UTC(2015, 0, 30); + if (schemaDate < thisSchemaDate) { + updatesMade = true; + winston.info('[2015/01/30] Adding group member counts'); + + db.getSortedSetRange('groups:createtime', 0, -1, function(err, groupNames) { + if (err) { + return next(err); + } + + var now = Date.now(); + async.each(groupNames, function(groupName, next) { + db.sortedSetCard('group:' + groupName + ':members', function(err, memberCount) { + console.log(groupName, memberCount); + if (err) { + return next(err); + } + + if (parseInt(memberCount, 10)) { + db.setObjectField('group:' + groupName, 'memberCount', memberCount, next); + } else { + next(); + } + }); + }, function(err) { + winston.info('[2015/01/30] Adding group member counts done'); + Upgrade.update(thisSchemaDate, next); + }); + }); + } else { + winston.info('[2015/01/30] Adding group member counts skipped'); + next(); + } } // Add new schema updates here From 2c033bf286eef35c1885b4da92cdde50c496e948 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 31 Jan 2015 00:00:02 -0500 Subject: [PATCH 283/897] set memberCount to 0 on creation --- src/groups.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/groups.js b/src/groups.js index 7e41b94b02..462a0854a8 100644 --- a/src/groups.js +++ b/src/groups.js @@ -448,6 +448,7 @@ var async = require('async'), createtime: now, userTitle: data.name, description: data.description || '', + memberCount: 0, deleted: '0', hidden: data.hidden || '0', system: system ? '1' : '0', From c16689503d2eee42ecff5418a98457b5d7c4a1e5 Mon Sep 17 00:00:00 2001 From: Mega Date: Sat, 31 Jan 2015 15:34:40 +0300 Subject: [PATCH 284/897] Added as argument post id in action:posts.edited --- public/src/client/topic/events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 90f54ec064..0990be01c6 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -111,7 +111,7 @@ define('forum/topic/events', [ app.replaceSelfLinks(editedPostEl.find('a')); editedPostEl.fadeIn(250); - $(window).trigger('action:posts.edited'); + $(window).trigger('action:posts.edited', data.pid); }); if (data.tags && tagsUpdated(data.tags)) { From 2e1d1ac665471cd106d73cd160de0d48ae3901aa Mon Sep 17 00:00:00 2001 From: Mega Date: Sat, 31 Jan 2015 18:06:54 +0300 Subject: [PATCH 285/897] Uploading avatar causes crash on 0.6.1-dev --- src/user.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/user.js b/src/user.js index ccb30fecfb..79060f020b 100644 --- a/src/user.js +++ b/src/user.js @@ -162,6 +162,7 @@ var async = require('async'), }; User.setUserField = function(uid, field, value, callback) { + callback = callback || function() {}; db.setObjectField('user:' + uid, field, value, function(err) { if (err) { return callback(err) @@ -172,6 +173,7 @@ var async = require('async'), }; User.setUserFields = function(uid, data, callback) { + callback = callback || function() {}; db.setObject('user:' + uid, data, function(err) { if (err) { return callback(err); From dc0229fc73e4b53898689ea14dfd2b2ed89358fd Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 31 Jan 2015 13:10:43 -0500 Subject: [PATCH 286/897] closes #2677 --- public/src/admin/settings.js | 19 ++++++++++++------- src/sitemap.js | 5 +++++ src/socket.io/admin.js | 5 +++++ src/views/admin/settings/web-crawler.tpl | 8 ++++++-- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index 3dca037514..98ab422b14 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -86,14 +86,19 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) { $('button[data-action="email.test"]').off('click').on('click', function() { socket.emit('admin.email.test', function(err) { - app.alert({ - alert_id: 'test_email_sent', - type: !err ? 'info' : 'danger', - title: 'Test Email Sent', - message: err ? err.message : '', - timeout: 2500 - }); + if (err) { + return app.alertError(err.message); + } + app.alertSuccess('Test Email Sent'); + }); + return false; + }); + + $('#clear-sitemap-cache').off('click').on('click', function() { + socket.emit('admin.settings.clearSitemapCache', function() { + app.alertSuccess('Sitemap Cache Cleared!'); }); + return false; }); if (typeof callback === 'function') { diff --git a/src/sitemap.js b/src/sitemap.js index ffc072b871..16452a8f30 100644 --- a/src/sitemap.js +++ b/src/sitemap.js @@ -107,6 +107,11 @@ var path = require('path'), sitemap.obj.toXML(callback); }); + }, + clearCache: function() { + if (sitemap.obj) { + sitemap.obj.clearCache(); + } } }; diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index b659397220..36efef49f9 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -175,6 +175,11 @@ SocketAdmin.settings.set = function(socket, data, callback) { meta.settings.set(data.hash, data.values, callback); }; +SocketAdmin.settings.clearSitemapCache = function(socket, data, callback) { + require('../sitemap').clearCache(); + callback(); +}; + SocketAdmin.email.test = function(socket, data, callback) { if (plugins.hasListeners('action:email.send')) { emailer.send('test', socket.uid, { diff --git a/src/views/admin/settings/web-crawler.tpl b/src/views/admin/settings/web-crawler.tpl index c8fb03b0ff..349b5f6664 100644 --- a/src/views/admin/settings/web-crawler.tpl +++ b/src/views/admin/settings/web-crawler.tpl @@ -26,8 +26,12 @@
    - - +
    + + +
    + +
    From 7363c711809f3e326e7fb29b8e5a3be391b2b018 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 31 Jan 2015 13:37:31 -0500 Subject: [PATCH 287/897] sitemap style --- src/sitemap.js | 200 ++++++++++++++++++++++++++----------------------- 1 file changed, 106 insertions(+), 94 deletions(-) diff --git a/src/sitemap.js b/src/sitemap.js index 16452a8f30..aab7451a61 100644 --- a/src/sitemap.js +++ b/src/sitemap.js @@ -10,109 +10,121 @@ var path = require('path'), topics = require('./topics'), privileges = require('./privileges'), meta = require('./meta'), - utils = require('../public/src/utils'), - sitemap = { - obj: undefined, - getStaticUrls: function(callback) { - callback(null, [{ - url: '', - changefreq: 'weekly', - priority: '0.6' - }, { - url: '/recent', - changefreq: 'daily', - priority: '0.4' - }, { - url: '/users', - changefreq: 'daily', - priority: '0.4' - }]); - }, - getDynamicUrls: function(callback) { - var returnUrls = []; - - async.parallel({ - categoryUrls: function(next) { - var categoryUrls = []; - categories.getCategoriesByPrivilege(0, 'find', function(err, categoriesData) { - if (err) { - return next(err); - } - - categoriesData.forEach(function(category) { - if (category) { - categoryUrls.push({ - url: '/category/' + category.cid + '/' + encodeURIComponent(utils.slugify(category.name)), - changefreq: 'weekly', - priority: '0.4' - }); - } - }); + utils = require('../public/src/utils'); - next(null, categoryUrls); - }); - }, - topicUrls: function(next) { - var topicUrls = []; - - async.waterfall([ - function(next) { - db.getSortedSetRevRange('topics:recent', 0, parseInt(meta.config.sitemapTopics, 10) || -1, next); - }, - function(tids, next) { - privileges.topics.filter('read', tids, 0, next); - }, - function(tids, next) { - topics.getTopicsFields(tids, ['tid', 'title', 'lastposttime'], next); - } - ], function(err, topics) { - if (err) { - return next(err); - } - - topics.forEach(function(topic) { - if (topic) { - topicUrls.push({ - url: '/topic/' + topic.tid + '/' + encodeURIComponent(utils.slugify(topic.title)), - lastmodISO: utils.toISOString(topic.lastposttime), - changefreq: 'daily', - priority: '0.6' - }); - } - }); +var sitemap = {}; - next(null, topicUrls); - }); - } - }, function(err, data) { - if (!err) { - returnUrls = data.categoryUrls.concat(data.topicUrls); +sitemap.render = function(callback) { + if (sitemap.obj && sitemap.obj.cache.length) { + return sitemap.obj.toXML(callback); + } + + async.parallel([ + sitemap.getStaticUrls, + sitemap.getDynamicUrls + ], function(err, urls) { + if (err) { + return callback(err); + } + + urls = urls[0].concat(urls[1]); + + sitemap.obj = sm.createSitemap({ + hostname: nconf.get('url'), + cacheTime: 1000 * 60 * 60, // Cached for 1 hour + urls: urls + }); + + sitemap.obj.toXML(callback); + }); +}; + +sitemap.getStaticUrls = function(callback) { + callback(null, [{ + url: '', + changefreq: 'weekly', + priority: '0.6' + }, { + url: '/recent', + changefreq: 'daily', + priority: '0.4' + }, { + url: '/users', + changefreq: 'daily', + priority: '0.4' + }]); +}; + +sitemap.getDynamicUrls = function(callback) { + var returnUrls = []; + + async.parallel({ + categoryUrls: function(next) { + var categoryUrls = []; + categories.getCategoriesByPrivilege(0, 'find', function(err, categoriesData) { + if (err) { + return next(err); } - callback(err, returnUrls); + categoriesData.forEach(function(category) { + if (category) { + categoryUrls.push({ + url: '/category/' + category.cid + '/' + encodeURIComponent(utils.slugify(category.name)), + changefreq: 'weekly', + priority: '0.4' + }); + } + }); + + next(null, categoryUrls); }); }, - render: function(callback) { - if (sitemap.obj !== undefined && sitemap.obj.cache.length) { - return sitemap.obj.toXML(callback); - } - - async.parallel([sitemap.getStaticUrls, sitemap.getDynamicUrls], function(err, urls) { - urls = urls[0].concat(urls[1]); - sitemap.obj = sm.createSitemap({ - hostname: nconf.get('url'), - cacheTime: 1000 * 60 * 60, // Cached for 1 hour - urls: urls + topicUrls: function(next) { + var topicUrls = []; + + async.waterfall([ + function(next) { + db.getSortedSetRevRange('topics:recent', 0, parseInt(meta.config.sitemapTopics, 10) || -1, next); + }, + function(tids, next) { + privileges.topics.filter('read', tids, 0, next); + }, + function(tids, next) { + topics.getTopicsFields(tids, ['tid', 'title', 'lastposttime'], next); + } + ], function(err, topics) { + if (err) { + return next(err); + } + + topics.forEach(function(topic) { + if (topic) { + topicUrls.push({ + url: '/topic/' + topic.tid + '/' + encodeURIComponent(utils.slugify(topic.title)), + lastmodISO: utils.toISOString(topic.lastposttime), + changefreq: 'daily', + priority: '0.6' + }); + } }); - sitemap.obj.toXML(callback); + next(null, topicUrls); }); - }, - clearCache: function() { - if (sitemap.obj) { - sitemap.obj.clearCache(); - } } - }; + }, function(err, data) { + if (!err) { + returnUrls = data.categoryUrls.concat(data.topicUrls); + } + + callback(err, returnUrls); + }); +}; + + +sitemap.clearCache = function() { + if (sitemap.obj) { + sitemap.obj.clearCache(); + } +}; module.exports = sitemap; From 4d9e7fce22d7f7a5cc446941765088a663ed6be0 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 31 Jan 2015 15:42:10 -0500 Subject: [PATCH 288/897] notifyOnlineUsers helper --- src/socket.io/posts.js | 45 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 71e5577178..d0f5b3b589 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -47,29 +47,34 @@ SocketPosts.reply = function(socket, data, callback) { socket.emit('event:new_post', result); - async.waterfall([ - function(next) { - user.getUidsFromSet('users:online', 0, -1, next); - }, - function(uids, next) { - privileges.categories.filterUids('read', postData.topic.cid, uids, next); - }, - function(uids, next) { - plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: data.uid, type: 'newPost'}, next); - } - ], function(err, data) { - if (err) { - return winston.error(err.stack); - } + SocketPosts.notifyOnlineUsers(socket.uid, result); + }); +}; + +SocketPosts.notifyOnlineUsers = function(uid, result) { + var cid = result.posts[0].topic.cid; + async.waterfall([ + function(next) { + user.getUidsFromSet('users:online', 0, -1, next); + }, + function(uids, next) { + privileges.categories.filterUids('read', cid, uids, next); + }, + function(uids, next) { + plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: uid, type: 'newPost'}, next); + } + ], function(err, data) { + if (err) { + return winston.error(err.stack); + } - var uids = data.uidsTo; + var uids = data.uidsTo; - for(var i=0; i Date: Sun, 1 Feb 2015 17:22:08 -0500 Subject: [PATCH 289/897] removed console log from upgrade script --- src/upgrade.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/upgrade.js b/src/upgrade.js index 05a186ea69..ed82dcd20a 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -788,7 +788,6 @@ Upgrade.upgrade = function(callback) { var now = Date.now(); async.each(groupNames, function(groupName, next) { db.sortedSetCard('group:' + groupName + ':members', function(err, memberCount) { - console.log(groupName, memberCount); if (err) { return next(err); } From 79083004e41056790ac5a04f5c2fe5280f3be36c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 1 Feb 2015 17:22:40 -0500 Subject: [PATCH 290/897] added missing file --- public/src/client/account/groups.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 public/src/client/account/groups.js diff --git a/public/src/client/account/groups.js b/public/src/client/account/groups.js new file mode 100644 index 0000000000..ea70433de3 --- /dev/null +++ b/public/src/client/account/groups.js @@ -0,0 +1,21 @@ +'use strict'; + +/* globals define, app, socket, utils */ + +define('forum/account/groups', ['forum/account/header'], function(header) { + var AccountTopics = {}; + + AccountTopics.init = function() { + header.init(); + + var groupsEl = $('#groups-list'); + + groupsEl.on('click', '.list-cover', function() { + var groupSlug = $(this).parents('[data-slug]').attr('data-slug'); + + ajaxify.go('groups/' + groupSlug); + }); + }; + + return AccountTopics; +}); From 2f19f4106a626bbf4969c4803ccd433813038fec Mon Sep 17 00:00:00 2001 From: Mega Date: Mon, 2 Feb 2015 02:36:17 +0300 Subject: [PATCH 291/897] Added data argument to action:posts.edited hook --- public/src/client/topic/events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 0990be01c6..281c63fb1e 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -111,7 +111,7 @@ define('forum/topic/events', [ app.replaceSelfLinks(editedPostEl.find('a')); editedPostEl.fadeIn(250); - $(window).trigger('action:posts.edited', data.pid); + $(window).trigger('action:posts.edited', data); }); if (data.tags && tagsUpdated(data.tags)) { From 2c8e8a1f1c6069bf3036fcb099c2b4b9d1aa5e76 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 1 Feb 2015 19:11:58 -0500 Subject: [PATCH 292/897] closes #2550, closes #2518 --- public/src/admin/advanced/events.js | 43 ++++++ src/controllers/admin.js | 8 +- src/events.js | 224 ++++++++++++---------------- src/favourites.js | 21 --- src/notifications.js | 2 - src/postTools.js | 5 +- src/routes/authentication.js | 6 +- src/socket.io/admin.js | 27 +++- src/socket.io/admin/user.js | 9 +- src/socket.io/posts.js | 50 ++++++- src/socket.io/topics.js | 17 ++- src/socket.io/user.js | 92 ++++++++++-- src/threadTools.js | 4 - src/user/auth.js | 13 +- src/user/profile.js | 43 ++---- src/user/reset.js | 1 - src/views/admin/advanced/events.tpl | 45 +++--- 17 files changed, 365 insertions(+), 245 deletions(-) create mode 100644 public/src/admin/advanced/events.js diff --git a/public/src/admin/advanced/events.js b/public/src/admin/advanced/events.js new file mode 100644 index 0000000000..039b105bcb --- /dev/null +++ b/public/src/admin/advanced/events.js @@ -0,0 +1,43 @@ +"use strict"; +/* global define, socket, app, templates */ + + +define('admin/advanced/events', ['forum/infinitescroll'], function(infinitescroll) { + var Events = {}; + + Events.init = function() { + + $('[data-action="clear"]').on('click', function() { + socket.emit('admin.deleteAllEvents', function(err) { + if (err) { + return app.alertError(err.message); + } + $('.events-list').empty(); + }); + }); + + infinitescroll.init(function(direction) { + if (direction < 0 || !$('.events').length) { + return; + } + + infinitescroll.loadMore('admin.getMoreEvents', $('[data-next]').attr('data-next'), function(data, done) { + console.log(data.events); + if (data.events && data.events.length) { + templates.parse('admin/advanced/events', 'events', {events: data.events}, function(html) { + console.log(html); + $('.events-list').append(html); + done(); + }); + + $('[data-next]').attr('data-next', data.next); + } else { + done(); + } + }); + }); + + }; + + return Events; +}); diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 5ccfa3a6df..6779185f0a 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -174,14 +174,14 @@ adminController.database.get = function(req, res, next) { }; adminController.events.get = function(req, res, next) { - events.getLog(-1, 5000, function(err, data) { - if(err || !data) { + events.getEvents(0, 19, function(err, events) { + if(err || !events) { return next(err); } res.render('admin/advanced/events', { - eventdata: data.data, - next: data.next + events: events, + next: 20 }); }); }; diff --git a/src/events.js b/src/events.js index bab042f28e..682e9549db 100644 --- a/src/events.js +++ b/src/events.js @@ -1,154 +1,128 @@ 'use strict'; -var fs = require('fs'), - winston = require('winston'), - path = require('path'), - nconf = require('nconf'), - user = require('./user'); +var async = require('async'), + db = require('./database'), + batch = require('./batch'), + user = require('./user'), + utils = require('../public/src/utils'); -(function(events) { - var logFileName = 'logs/events.log'; - - events.logPasswordChange = function(uid) { - events.logWithUser(uid, 'changed password'); - }; - - events.logAdminChangeUserPassword = function(adminUid, theirUid, callback) { - logAdminEvent(adminUid, theirUid, 'changed password of', callback); - }; - - events.logAdminUserDelete = function(adminUid, theirUid, callback) { - logAdminEvent(adminUid, theirUid, 'deleted', callback); - }; - function logAdminEvent(adminUid, theirUid, message, callback) { - user.getMultipleUserFields([adminUid, theirUid], ['username'], function(err, userData) { - if(err) { - return winston.error('Error logging event. ' + err.message); +(function(events) { + events.log = function(data, callback) { + callback = callback || function() {}; + + async.waterfall([ + function(next) { + db.incrObjectField('global', 'nextEid', next); + }, + function(eid, next) { + data.timestamp = Date.now(); + data.eid = eid; + + async.parallel([ + function(next) { + db.sortedSetAdd('events:time', data.timestamp, eid, next); + }, + function(next) { + db.setObject('event:' + eid, data, next); + } + ], next); } - - var msg = userData[0].username + '(uid ' + adminUid + ') ' + message + ' ' + userData[1].username + '(uid ' + theirUid + ')'; - events.log(msg, callback); + ], function(err, result) { + callback(err); }); - } - - events.logPasswordReset = function(uid) { - events.logWithUser(uid, 'reset password'); - }; - - events.logEmailChange = function(uid, oldEmail, newEmail) { - events.logWithUser(uid,'changed email from "' + oldEmail + '" to "' + newEmail +'"'); - }; - - events.logUsernameChange = function(uid, oldUsername, newUsername) { - events.logWithUser(uid,'changed username from "' + oldUsername + '" to "' + newUsername +'"'); - }; - - events.logAdminLogin = function(uid) { - events.logWithUser(uid, 'logged into admin panel'); - }; - - events.logPostEdit = function(uid, pid) { - events.logWithUser(uid, 'edited post (pid ' + pid + ')'); - }; - - events.logPostDelete = function(uid, pid) { - events.logWithUser(uid, 'deleted post (pid ' + pid + ')'); - }; - - events.logPostRestore = function(uid, pid) { - events.logWithUser(uid, 'restored post (pid ' + pid + ')'); - }; - - events.logPostPurge = function(uid, pid) { - events.logWithUser(uid, 'purged post (pid ' + pid + ')'); - }; - - events.logTopicMove = function(uid, tid) { - events.logWithUser(uid, 'moved topic (tid ' + tid + ')'); }; - events.logTopicDelete = function(uid, tid) { - events.logWithUser(uid, 'deleted topic (tid ' + tid + ')'); - }; - - events.logTopicRestore = function(uid, tid) { - events.logWithUser(uid, 'restored topic (tid ' + tid + ')'); - }; - - events.logAccountLock = function(uid, until) { - var date = new Date(); - date.setTime(date.getTime() + until); - - events.logWithUser(uid, 'locked out until ' + date.toString()); - }; - - events.logWithUser = function(uid, string) { - user.getUserField(uid, 'username', function(err, username) { - if(err) { - return winston.error('Error logging event. ' + err.message); + events.getEvents = function(start, stop, callback) { + async.waterfall([ + function(next) { + db.getSortedSetRevRange('events:time', start, stop, next); + }, + function(eids, next) { + var keys = eids.map(function(eid) { + return 'event:' + eid; + }); + db.getObjects(keys, next); + }, + function(eventsData, next) { + eventsData.forEach(function(event) { + var e = utils.merge(event); + e.eid = e.uid = e.type = e.ip = undefined; + event.jsonString = JSON.stringify(e, null, 4); + event.timestampISO = new Date(parseInt(event.timestamp, 10)).toUTCString(); + }); + addUserData(eventsData, 'uid', 'user', next); + }, + function(eventsData, next) { + addUserData(eventsData, 'targetUid', 'targetUser', next); } - - var msg = username + '(uid ' + uid + ') ' + string; - events.log(msg); - }); + ], callback); }; - events.log = function(msg, callback) { - var logFile = path.join(nconf.get('base_dir'), logFileName); - - msg = '[' + new Date().toUTCString() + '] - ' + msg; - - fs.appendFile(logFile, msg + '\n', function(err) { - if(err) { - winston.error('Error logging event. ' + err.message); - if (typeof callback === 'function') { - callback(err); - } - return; - } - - if (typeof callback === 'function') { - callback(); - } + function addUserData(eventsData, field, objectName, callback) { + var uids = eventsData.map(function(event) { + return event && event[field]; + }).filter(function(uid, index, array) { + return uid && array.indexOf(uid) === index; }); - }; - events.getLog = function(end, len, callback) { - var logFile = path.join(nconf.get('base_dir'), logFileName); + if (!uids.length) { + return callback(null, eventsData); + } - fs.stat(logFile, function(err, stat) { - if (err) { - return callback(null, 'No logs found!'); + async.parallel({ + isAdmin: function(next) { + user.isAdministrator(uids, next); + }, + userData: function(next) { + user.getMultipleUserFields(uids, ['username', 'userslug', 'picture'], next); } - - var buffer = ''; - var size = stat.size; - if (end === -1) { - end = size; + }, function(err, results) { + if (err) { + return callback(err); } - end = parseInt(end, 10); - var start = Math.max(0, end - len); + var userData = results.userData; - var rs = fs.createReadStream(logFile, {start: start, end: end}); - rs.addListener('data', function(lines) { - buffer += lines.toString(); + var map = {}; + userData.forEach(function(user, index) { + user.isAdmin = results.isAdmin[index]; + map[user.uid] = user; }); - rs.addListener('end', function() { - var firstNewline = buffer.indexOf('\n'); - if (firstNewline !== -1) { - buffer = buffer.slice(firstNewline); - buffer = buffer.split('\n').reverse().join('\n'); + eventsData.forEach(function(event) { + if (map[event[field]]) { + event[objectName] = map[event[field]]; } - - callback(null, {data: buffer, next: end - buffer.length}); }); + callback(null, eventsData); }); + } + + events.deleteEvents = function(eids, callback) { + callback = callback || function() {}; + async.parallel([ + function(next) { + var keys = eids.map(function(eid) { + return 'event:' + eid; + }); + db.deleteAll(keys, next); + }, + function(next) { + db.sortedSetRemove('events:time', eids, next); + } + ], callback); + }; + + events.deleteAll = function(callback) { + callback = callback || function() {}; + batch.processSortedSet('events:time', function(eids, next) { + events.deleteEvents(eids, callback); + }, {alwaysStartAt: 0}, callback); }; + }(module.exports)); diff --git a/src/favourites.js b/src/favourites.js index 0673626f51..6de70d33f3 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -43,10 +43,6 @@ var async = require('async'), db.sortedSetAdd('users:reputation', newreputation, postData.uid); - if (type === 'downvote') { - banUserForLowReputation(postData.uid, newreputation); - } - adjustPostVotes(pid, uid, type, unvote, function(err, votes) { postData.votes = votes; callback(err, { @@ -62,23 +58,6 @@ var async = require('async'), }); } - function banUserForLowReputation(uid, newreputation) { - if (parseInt(meta.config['autoban:downvote'], 10) === 1 && newreputation < parseInt(meta.config['autoban:downvote:threshold'], 10)) { - user.getUserField(uid, 'banned', function(err, banned) { - if (err || parseInt(banned, 10) === 1) { - return; - } - var adminUser = require('./socket.io/admin/user'); - adminUser.banUser(uid, function(err) { - if (err) { - return winston.error(err.message); - } - winston.info('uid ' + uid + ' was banned for reaching ' + newreputation + ' reputation'); - }); - }); - } - } - function adjustPostVotes(pid, uid, type, unvote, callback) { var notType = (type === 'upvote' ? 'downvote' : 'upvote'); diff --git a/src/notifications.js b/src/notifications.js index 2de4ec1709..96502508f7 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -311,8 +311,6 @@ var async = require('async'), if (process.env.NODE_ENV === 'development') { winston.info('[notifications.prune] Notification pruning completed. ' + numPruned + ' expired notification' + (numPruned !== 1 ? 's' : '') + ' removed.'); } - var diff = process.hrtime(start); - events.log('Pruning '+ numPruned + ' notifications took : ' + (diff[0] * 1e3 + diff[1] / 1e6) + ' ms'); }); }); }; diff --git a/src/postTools.js b/src/postTools.js index 692878734a..c00a8a4b9c 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -106,7 +106,7 @@ var winston = require('winston'), return callback(err); } results.content = results.postData.content; - //events.logPostEdit(uid, pid); + plugins.fireHook('action:post.edit', postData); callback(null, results); }); @@ -146,7 +146,6 @@ var winston = require('winston'), return callback(err); } - events[isDelete ? 'logPostDelete' : 'logPostRestore'](uid, pid); if (isDelete) { posts.delete(pid, callback); } else { @@ -165,7 +164,7 @@ var winston = require('winston'), if (err || !canEdit) { return callback(err || new Error('[[error:no-privileges]]')); } - events.logPostPurge(uid, pid); + posts.purge(pid, callback); }); }; diff --git a/src/routes/authentication.js b/src/routes/authentication.js index 5754ee3353..649d6d87dd 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -68,7 +68,7 @@ }); }; - Auth.login = function(username, password, next) { + Auth.login = function(req, username, password, next) { if (!username || !password) { return next(new Error('[[error:invalid-password]]')); } @@ -85,7 +85,7 @@ return next(new Error('[[error:no-user]]')); } uid = _uid; - user.auth.logAttempt(uid, next); + user.auth.logAttempt(uid, req.ip, next); }, function(next) { db.getObjectFields('user:' + uid, ['password', 'banned'], next); @@ -109,7 +109,7 @@ ], next); }; - passport.use(new passportLocal(Auth.login)); + passport.use(new passportLocal({passReqToCallback: true}, Auth.login)); passport.serializeUser(function(user, done) { done(null, user.uid); diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index 36efef49f9..a770af5c53 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -49,7 +49,11 @@ SocketAdmin.before = function(socket, method, next) { }; SocketAdmin.reload = function(socket, data, callback) { - events.logWithUser(socket.uid, ' is reloading NodeBB'); + events.log({ + type: 'reload', + uid: socket.uid, + ip: socket.ip + }); if (process.send) { process.send({ action: 'reload' @@ -60,7 +64,11 @@ SocketAdmin.reload = function(socket, data, callback) { }; SocketAdmin.restart = function(socket, data, callback) { - events.logWithUser(socket.uid, ' is restarting NodeBB'); + events.log({ + type: 'restart', + uid: socket.uid, + ip: socket.ip + }); meta.restart(); }; @@ -274,10 +282,21 @@ function getMonthlyPageViews(callback) { } SocketAdmin.getMoreEvents = function(socket, next, callback) { - if (parseInt(next, 10) < 0) { + var start = parseInt(next, 10); + if (start < 0) { return callback(null, {data: [], next: next}); } - events.getLog(next, 5000, callback); + var end = next + 10; + events.getEvents(start, end, function(err, events) { + if (err) { + return callback(err); + } + callback(null, {events: events, next: end + 1}); + }); +}; + +SocketAdmin.deleteAllEvents = function(socket, data, callback) { + events.deleteAll(callback); }; SocketAdmin.dismissFlag = function(socket, pid, callback) { diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js index 9189727fbb..3a194044ea 100644 --- a/src/socket.io/admin/user.js +++ b/src/socket.io/admin/user.js @@ -157,7 +157,7 @@ User.deleteUsers = function(socket, uids, callback) { async.each(uids, function(uid, next) { user.isAdministrator(uid, function(err, isAdmin) { if (err || isAdmin) { - return callback(err || new Error('[[error:cant-ban-other-admins]]')); + return callback(err || new Error('[[error:cant-delete-other-admins]]')); } user.delete(uid, function(err) { @@ -165,7 +165,12 @@ User.deleteUsers = function(socket, uids, callback) { return next(err); } - events.logAdminUserDelete(socket.uid, uid); + events.log({ + type: 'user-delete', + uid: socket.uid, + targetUid: uid, + ip: socket.ip + }); websockets.logoutUser(uid); next(); diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index d0f5b3b589..590b10da0f 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -16,6 +16,7 @@ var async = require('async'), groups = require('../groups'), user = require('../user'), websockets = require('./index'), + events = require('../events'), utils = require('../../public/src/utils'), SocketPosts = {}; @@ -138,7 +139,38 @@ SocketPosts.upvote = function(socket, data, callback) { }; SocketPosts.downvote = function(socket, data, callback) { - favouriteCommand(socket, 'downvote', 'voted', '', data, callback); + function banUserForLowReputation(uid, callback) { + if (parseInt(meta.config['autoban:downvote'], 10) === 1) { + user.getUserFields(uid, ['reputation', 'banned'], function(err, userData) { + if (err || parseInt(userData.banned, 10) === 1 || parseInt(userData.reputation) >= parseInt(meta.config['autoban:downvote:threshold'], 10)) { + return callback(err); + } + + var adminUser = require('./admin/user'); + adminUser.banUser(uid, function(err) { + if (err) { + return callback(err); + } + events.log({ + type: 'banned', + reason: 'low-reputation', + uid: socket.uid, + ip: socket.ip, + targetUid: data.uid, + reputation: userData.reputation + }); + callback(); + }); + }); + } + } + + favouriteCommand(socket, 'downvote', 'voted', '', data, function(err) { + if (err) { + return callback(err); + } + banUserForLowReputation(data.uid, callback); + }); }; SocketPosts.unvote = function(socket, data, callback) { @@ -309,9 +341,16 @@ function deleteOrRestore(command, socket, data, callback) { return callback(err); } - var eventName = command === 'restore' ? 'event:post_restored' : 'event:post_deleted'; + var eventName = command === 'delete' ? 'event:post_deleted' : 'event:post_restored'; websockets.in('topic_' + data.tid).emit(eventName, postData); + events.log({ + type: command === 'delete' ? 'post-delete' : 'post-restore', + uid: socket.uid, + pid: data.pid, + ip: socket.ip + }); + callback(); }); } @@ -327,6 +366,13 @@ SocketPosts.purge = function(socket, data, callback) { websockets.in('topic_' + data.tid).emit('event:post_purged', data.pid); + events.log({ + type: 'post-purge', + uid: socket.uid, + pid: data.pid, + ip: socket.ip + }); + callback(); }); }; diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 9f96f17f29..687a7361a5 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -15,6 +15,7 @@ var nconf = require('nconf'), user = require('../user'), db = require('../database'), meta = require('../meta'), + events = require('../events'), utils = require('../../public/src/utils'), SocketPosts = require('./posts'), @@ -259,7 +260,21 @@ function doTopicAction(action, socket, data, callback) { } if(typeof threadTools[action] === 'function') { - threadTools[action](tid, socket.uid, next); + threadTools[action](tid, socket.uid, function(err) { + if (err) { + return next(err); + } + + if (action === 'delete' || action === 'restore' || action === 'purge') { + events.log({ + type: 'topic-' + action, + uid: socket.uid, + ip: socket.ip, + tid: tid + }); + } + next(); + }); } }); }, callback); diff --git a/src/socket.io/user.js b/src/socket.io/user.js index d28421c383..d879813bae 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -12,6 +12,7 @@ var async = require('async'), utils = require('../../public/src/utils'), websockets = require('./index'), meta = require('../meta'), + events = require('../events'), SocketUser = {}; SocketUser.exists = function(socket, data, callback) { @@ -56,7 +57,7 @@ SocketUser.emailConfirm = function(socket, data, callback) { SocketUser.search = function(socket, data, callback) { if (!data) { - return callback(new Error('[[error:invalid-data]]')) + return callback(new Error('[[error:invalid-data]]')); } if (!socket.uid) { return callback(new Error('[[error:not-logged-in]]')); @@ -87,7 +88,16 @@ SocketUser.reset.valid = function(socket, code, callback) { SocketUser.reset.commit = function(socket, data, callback) { if(data && data.code && data.password) { - user.reset.commit(data.code, data.password, callback); + user.reset.commit(data.code, data.password, function(err) { + if (err) { + return callback(err); + } + events.log({ + type: 'password-reset', + uid: socket.uid, + ip: socket.ip + }); + }); } }; @@ -109,12 +119,74 @@ SocketUser.checkStatus = function(socket, uid, callback) { }; SocketUser.changePassword = function(socket, data, callback) { - if (data && socket.uid) { - user.changePassword(socket.uid, data, callback); + if (!data || !data.uid) { + return callback(new Error('[[error:invalid-data]]')); + } + if (!socket.uid) { + return callback('[[error:invalid-uid]]'); } + + user.changePassword(socket.uid, data, function(err) { + if (err) { + return callback(err); + } + + events.log({ + type: 'password-change', + uid: socket.uid, + targetUid: data.uid, + ip: socket.ip + }); + }); }; SocketUser.updateProfile = function(socket, data, callback) { + function update(oldUserData) { + function done(err, userData) { + if (err) { + return callback(err); + } + + if (userData.email !== oldUserData.email) { + events.log({ + type: 'email-change', + uid: socket.uid, + targetUid: data.uid, + ip: socket.ip, + oldEmail: oldUserData.email, + newEmail: userData.email + }); + } + + if (userData.username !== oldUserData.username) { + events.log({ + type: 'username-change', + uid: socket.uid, + targetUid: data.uid, + ip: socket.ip, + oldUsername: oldUserData.username, + newUsername: userData.username + }); + } + } + + if (socket.uid === parseInt(data.uid, 10)) { + return user.updateProfile(socket.uid, data, done); + } + + user.isAdministrator(socket.uid, function(err, isAdmin) { + if (err) { + return callback(err); + } + + if (!isAdmin) { + return callback(new Error('[[error:no-privileges]]')); + } + + user.updateProfile(data.uid, data, done); + }); + } + if (!socket.uid) { return callback('[[error:invalid-uid]]'); } @@ -123,20 +195,12 @@ SocketUser.updateProfile = function(socket, data, callback) { return callback(new Error('[[error:invalid-data]]')); } - if (socket.uid === parseInt(data.uid, 10)) { - return user.updateProfile(socket.uid, data, callback); - } - - user.isAdministrator(socket.uid, function(err, isAdmin) { + user.getUserFields(data.uid, ['email', 'username'], function(err, oldUserData) { if (err) { return callback(err); } - if (!isAdmin) { - return callback(new Error('[[error:no-privileges]]')); - } - - user.updateProfile(data.uid, data, callback); + update(oldUserData, callback); }); }; diff --git a/src/threadTools.js b/src/threadTools.js index 1fe1369d35..077abc54e6 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -56,8 +56,6 @@ var winston = require('winston'), plugins.fireHook('action:topic.restore', topicData); } - events[isDelete ? 'logTopicDelete' : 'logTopicRestore'](uid, tid); - emitTo('topic_' + tid); emitTo('category_' + topicData.cid); @@ -214,8 +212,6 @@ var winston = require('winston'), topics.setTopicField(tid, 'cid', cid, callback); - events.logTopicMove(uid, tid); - plugins.fireHook('action:topic.move', { tid: tid, fromCid: oldCid, diff --git a/src/user/auth.js b/src/user/auth.js index b275882cf1..48f0c8fc2c 100644 --- a/src/user/auth.js +++ b/src/user/auth.js @@ -8,7 +8,7 @@ var async = require('async'), module.exports = function(User) { User.auth = {}; - User.auth.logAttempt = function(uid, callback) { + User.auth.logAttempt = function(uid, ip, callback) { db.exists('lockout:' + uid, function(err, exists) { if (err) { return callback(err); @@ -30,12 +30,15 @@ module.exports = function(User) { return callback(err); } var duration = 1000 * 60 * (meta.config.lockoutDuration || 60); - + db.delete('loginAttempts:' + uid); db.pexpire('lockout:' + uid, duration); - - events.logAccountLock(uid, duration); - callback(new Error('account-locked')); + events.log({ + type: 'account-locked', + uid: uid, + ip: ip + }); + callback(new Error('[[error:account-locked]]')); }); } else { db.pexpire('loginAttempts:' + uid, 1000 * 60 * 60); diff --git a/src/user/profile.js b/src/user/profile.js index 8c44b86a6f..461f1d9bb8 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -148,8 +148,6 @@ module.exports = function(User) { return callback(err); } - events.logEmailChange(uid, userData.email, newEmail); - var gravatarpicture = User.createGravatarURLFromEmail(newEmail); async.parallel([ function(next) { @@ -183,9 +181,13 @@ module.exports = function(User) { if (!newUsername) { return callback(); } + User.getUserFields(uid, ['username', 'userslug'], function(err, userData) { function update(field, object, value, callback) { - async.parallel([ + async.series([ + function(next) { + db.deleteObjectField(field + ':uid', userData[field], next); + }, function(next) { User.setUserField(uid, field, value, next); }, @@ -198,7 +200,6 @@ module.exports = function(User) { if (err) { return callback(err); } - var userslug = utils.slugify(newUsername); async.parallel([ function(next) { @@ -206,25 +207,15 @@ module.exports = function(User) { return next(); } - db.deleteObjectField('username:uid', userData.username, function(err) { - if (err) { - return next(err); - } - events.logUsernameChange(uid, userData.username, newUsername); - update('username', 'username:uid', newUsername, next); - }); + update('username', 'username:uid', newUsername, next); }, function(next) { - if (userslug === userData.userslug) { + var newUserslug = utils.slugify(newUsername); + if (newUserslug === userData.userslug) { return next(); } - db.deleteObjectField('userslug:uid', userData.userslug, function(err) { - if (err) { - return next(err); - } - update('userslug', 'userslug:uid', userslug, next); - }); + update('userslug', 'userslug:uid', newUserslug, next); } ], callback); }); @@ -261,23 +252,11 @@ module.exports = function(User) { function hashAndSetPassword(callback) { User.hashPassword(data.newPassword, function(err, hash) { - if(err) { + if (err) { return callback(err); } - User.setUserField(data.uid, 'password', hash, function(err) { - if(err) { - return callback(err); - } - - if(parseInt(uid, 10) === parseInt(data.uid, 10)) { - events.logPasswordChange(data.uid); - } else { - events.logAdminChangeUserPassword(uid, data.uid); - } - - callback(); - }); + User.setUserField(data.uid, 'password', hash, callback); }); } diff --git a/src/user/reset.js b/src/user/reset.js index 2e1a7ab80e..c65e77a570 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -83,7 +83,6 @@ var async = require('async'), return callback(err); } user.setUserField(uid, 'password', hash); - events.logPasswordReset(uid); db.deleteObjectField('reset:uid', code); db.deleteObjectField('reset:expiry', code); diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index 03e3b7f4eb..e3231b0099 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -1,31 +1,32 @@
    -
    +
    Events
    - 
    {eventdata}
    + +
    There are no events
    + +
    + +
    + #{events.eid} {events.type} + {events.user.username} (uid {events.user.uid}) (IP {events.ip}) + {events.timestampISO} +

    + 
    {events.jsonString}
    +
    + +
    +
    +
    +
    +
    +
    +
    Events Control Panel
    +
    +
    - - \ No newline at end of file From 0bfa8d337a7942458f6bd6c39ac9b2a178781d13 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 1 Feb 2015 19:13:27 -0500 Subject: [PATCH 293/897] removed console.logs --- public/src/admin/advanced/events.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/src/admin/advanced/events.js b/public/src/admin/advanced/events.js index 039b105bcb..9075947d60 100644 --- a/public/src/admin/advanced/events.js +++ b/public/src/admin/advanced/events.js @@ -22,10 +22,8 @@ define('admin/advanced/events', ['forum/infinitescroll'], function(infinitescrol } infinitescroll.loadMore('admin.getMoreEvents', $('[data-next]').attr('data-next'), function(data, done) { - console.log(data.events); if (data.events && data.events.length) { templates.parse('admin/advanced/events', 'events', {events: data.events}, function(html) { - console.log(html); $('.events-list').append(html); done(); }); From df0e92471499645239800b511fd0ea5e62aa1d96 Mon Sep 17 00:00:00 2001 From: Mega Date: Mon, 2 Feb 2015 03:27:25 +0300 Subject: [PATCH 294/897] Change argument in action:posts.loaded --- public/src/client/home.js | 2 +- public/src/client/topic/posts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/home.js b/public/src/client/home.js index 23049af741..f3b4e65acc 100644 --- a/public/src/client/home.js +++ b/public/src/client/home.js @@ -59,7 +59,7 @@ define('forum/home', function() { recentPosts.last().remove(); } - $(window).trigger('action:posts.loaded'); + $(window).trigger('action:posts.loaded', {pids: [post.pid]}); }); } diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index ec566d9812..1f49c6fdd0 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -130,7 +130,7 @@ define('forum/topic/posts', [ pids.push(data.posts[i].pid); } - $(window).trigger('action:posts.loaded', pids); + $(window).trigger('action:posts.loaded', {pids: pids}); onNewPostsLoaded(html, pids); callback(true); }); From 59da48dee5056fe07c7fe6163926643786b2059e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 1 Feb 2015 19:35:41 -0500 Subject: [PATCH 295/897] added too-many-messages language key --- public/language/en_GB/error.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 7e21a1290a..47b0bf8938 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -83,6 +83,7 @@ "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", From d284e89d6cf19738d71b86eb53e570b29cbc6c3a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 1 Feb 2015 19:35:41 -0500 Subject: [PATCH 296/897] added too-many-messages language key --- public/language/en_GB/error.json | 1 + 1 file changed, 1 insertion(+) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 7e21a1290a..47b0bf8938 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -83,6 +83,7 @@ "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", From 5c2a70254f8799f15ecae0890ddad455a0b804a9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 1 Feb 2015 19:37:19 -0500 Subject: [PATCH 297/897] latest translations and fallbacks --- public/language/ar/error.json | 1 + public/language/bn/error.json | 1 + public/language/cs/error.json | 1 + public/language/de/email.json | 4 ++-- public/language/de/error.json | 1 + public/language/de/groups.json | 24 ++++++++++++------------ public/language/de/topic.json | 2 +- public/language/el/error.json | 1 + public/language/en@pirate/error.json | 1 + public/language/en_US/error.json | 1 + public/language/es/email.json | 4 ++-- public/language/es/error.json | 13 +++++++------ public/language/es/global.json | 12 ++++++------ public/language/es/groups.json | 26 +++++++++++++------------- public/language/es/recent.json | 18 +++++++++--------- public/language/es/search.json | 8 ++++---- public/language/es/topic.json | 4 ++-- public/language/es/user.json | 10 +++++----- public/language/es/users.json | 6 +++--- public/language/et/error.json | 1 + public/language/fa_IR/error.json | 1 + public/language/fi/error.json | 1 + public/language/fr/email.json | 4 ++-- public/language/fr/error.json | 13 +++++++------ public/language/fr/global.json | 12 ++++++------ public/language/fr/groups.json | 28 ++++++++++++++-------------- public/language/fr/recent.json | 18 +++++++++--------- public/language/fr/search.json | 8 ++++---- public/language/fr/topic.json | 4 ++-- public/language/fr/user.json | 10 +++++----- public/language/fr/users.json | 6 +++--- public/language/he/error.json | 1 + public/language/hu/error.json | 1 + public/language/id/error.json | 1 + public/language/it/error.json | 1 + public/language/ja/error.json | 1 + public/language/ko/error.json | 1 + public/language/lt/error.json | 1 + public/language/ms/error.json | 1 + public/language/nb/email.json | 4 ++-- public/language/nb/error.json | 13 +++++++------ public/language/nb/global.json | 12 ++++++------ public/language/nb/groups.json | 26 +++++++++++++------------- public/language/nb/recent.json | 18 +++++++++--------- public/language/nb/search.json | 8 ++++---- public/language/nb/topic.json | 4 ++-- public/language/nb/user.json | 8 ++++---- public/language/nb/users.json | 6 +++--- public/language/nl/error.json | 1 + public/language/nl/groups.json | 8 ++++---- public/language/nl/recent.json | 6 +++--- public/language/nl/search.json | 6 +++--- public/language/nl/topic.json | 4 ++-- public/language/nl/user.json | 2 +- public/language/nl/users.json | 6 +++--- public/language/pl/error.json | 1 + public/language/pt_BR/email.json | 4 ++-- public/language/pt_BR/error.json | 13 +++++++------ public/language/pt_BR/global.json | 12 ++++++------ public/language/pt_BR/groups.json | 26 +++++++++++++------------- public/language/pt_BR/recent.json | 18 +++++++++--------- public/language/pt_BR/search.json | 8 ++++---- public/language/pt_BR/topic.json | 4 ++-- public/language/pt_BR/user.json | 10 +++++----- public/language/pt_BR/users.json | 6 +++--- public/language/ro/error.json | 1 + public/language/ru/error.json | 9 +++++---- public/language/ru/global.json | 4 ++-- public/language/ru/groups.json | 22 +++++++++++----------- public/language/sc/error.json | 1 + public/language/sk/error.json | 1 + public/language/sv/error.json | 1 + public/language/th/error.json | 1 + public/language/tr/error.json | 1 + public/language/vi/error.json | 1 + public/language/zh_CN/error.json | 1 + public/language/zh_TW/error.json | 1 + 77 files changed, 282 insertions(+), 248 deletions(-) diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 592d7365e4..26d90ae89e 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -62,6 +62,7 @@ "signature-too-long": "عذرا، توقيعك يجب ألا يتجاوز %1 حرفًا", "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك", "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "نظام السمعة معطل", "downvoting-disabled": "التصويتات السلبية معطلة", "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 83aa15b6b5..ea1240c0ad 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -62,6 +62,7 @@ "signature-too-long": "দুঃখিত, আপনার সাক্ষর %1 অক্ষরের বেশী হতে পারবে না। ", "cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!", "chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "সম্মাননা ব্যাবস্থা নিস্ক্রীয় রাখা হয়েছে", "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।", "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index d9d20cdf64..c5ae30c511 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Pardon, ale váš podpis nemůže být delší, než-li %1 znaků.", "cant-chat-with-yourself": "Nemůžete chatovat sami se sebou!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Systém reputací je zakázán.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/de/email.json b/public/language/de/email.json index 408c511c84..4236feca0b 100644 --- a/public/language/de/email.json +++ b/public/language/de/email.json @@ -17,8 +17,8 @@ "notif.chat.subject": "Neue Chatnachricht von %1 erhalten", "notif.chat.cta": "Klicke hier, um die Unterhaltung fortzusetzen", "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Hier klicken, um das gesamte Thema zu lesen", + "notif.post.unsub.info": "Diese Mitteilung wurde wegen ihrer Abonnement-Einstellung gesendet.", "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.", "unsub.cta": "Klicke hier, um diese Einstellungen zu ändern.", "closing": "Danke!" diff --git a/public/language/de/error.json b/public/language/de/error.json index 67cf44ca9c..ea63e414c4 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Entschuldigung, deine Signatur darf maximal %1 Zeichen enthalten.", "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!", "chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Das Reputationssystem ist deaktiviert.", "downvoting-disabled": "Downvotes sind deaktiviert.", "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.", diff --git a/public/language/de/groups.json b/public/language/de/groups.json index 28138f6426..7da599f146 100644 --- a/public/language/de/groups.json +++ b/public/language/de/groups.json @@ -1,21 +1,21 @@ { "groups": "Gruppen", "view_group": "Gruppe betrachten", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", + "owner": "Gruppenbesitzer", + "new_group": "Neue Gruppe erstellen", + "no_groups_found": "Es sind keine Gruppen vorhanden", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "cover-change": "Ändern", + "cover-save": "Speichern", + "cover-saving": "Am speichern", "details.title": "Gruppendetails", "details.members": "Mitgliederliste", - "details.pending": "Pending Members", + "details.pending": "Ausstehende Mitglieder", "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.", "details.latest_posts": "Aktuelle Beiträge", - "details.private": "Private Group", - "details.public": "Public Group", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "Private Gruppe", + "details.public": "Öffentliche Gruppe", + "details.owner_options": "Gruppenadministration", + "event.updated": "Gruppendetails wurden aktualisiert", + "event.deleted": "Die Gruppe \"% 1\" wurde gelöscht" } \ No newline at end of file diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 23d6b0771e..e2e47d83c1 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -94,5 +94,5 @@ "oldest_to_newest": "Älteste zuerst", "newest_to_oldest": "Neuster zuerst", "most_votes": "Die meisten Stimmen", - "most_posts": "Most posts" + "most_posts": "Die meisten Beiträge" } \ No newline at end of file diff --git a/public/language/el/error.json b/public/language/el/error.json index ce1173a11d..e072c910f8 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Δεν μπορείς να συνομιλήσεις με τον εαυτό σου!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Το σύστημα φήμης έχει απενεργοποιηθεί.", "downvoting-disabled": "Η καταψήφιση έχει απενεργοποιηθεί", "not-enough-reputation-to-downvote": "Δεν έχεις αρκετή φήμη για να καταψηφίσεις αυτή την δημοσίευση", diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json index a40a628042..6079502fae 100644 --- a/public/language/en@pirate/error.json +++ b/public/language/en@pirate/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json index a40a628042..6079502fae 100644 --- a/public/language/en_US/error.json +++ b/public/language/en_US/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/es/email.json b/public/language/es/email.json index cff3a5d025..870687c4e6 100644 --- a/public/language/es/email.json +++ b/public/language/es/email.json @@ -17,8 +17,8 @@ "notif.chat.subject": "Nuevo mensaje de chat recibido de %1", "notif.chat.cta": "Haz click aquí para continuar la conversación", "notif.chat.unsub.info": "Esta notificación de chat se te envió debido a tus ajustes de suscripción.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Cliquea aquí para leer la publicación completa", + "notif.post.unsub.info": "La notificación de este mensaje se te ha enviado debido a tus ajustes de subscripción.", "test.text1": "Este es un email de prueba para verificar que el envío de email está ajustado correctamente para tu NodeBB", "unsub.cta": "Haz click aquí para modificar los ajustes.", "closing": "¡Gracias!" diff --git a/public/language/es/error.json b/public/language/es/error.json index d656a309f6..70fcf2f2a8 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -18,7 +18,7 @@ "username-taken": "Nombre de usuario ocupado", "email-taken": "Correo electrónico ocupado", "email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "No puedes hacer uso del chat hasta que confirmes tu email", "username-too-short": "Nombre de usuario es demasiado corto", "username-too-long": "Nombre de usuario demasiado largo", "user-banned": "Usuario baneado", @@ -44,13 +44,13 @@ "already-favourited": "Ya ha marcado esta publicación como favorita", "already-unfavourited": "Ya ha desmarcado esta publicación como favorita", "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1", + "invalid-image-extension": "Extensión de imagen inválida", "group-name-too-short": "Nombre del grupo es demasiado corto.", "group-already-exists": "El grupo ya existe.", "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Ya formas parte de este grupo", + "group-needs-owner": "Este grupo requiere al menos un propietario", "post-already-deleted": "Este publicación ya ha sido borrada", "post-already-restored": "Esta publicación ya ha sido restaurada", "topic-already-deleted": "Este tema ya ha sido borrado", @@ -62,11 +62,12 @@ "signature-too-long": "Lo sentimos, pero tu firma no puede ser más larga de %1 caracteres.", "cant-chat-with-yourself": "¡No puedes conversar contigo mismo!", "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirte antes de que pueda charlar con ellos", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "El sistema de reputación está deshabilitado.", "downvoting-disabled": "La votación negativa está deshabilitada.", "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post", "not-enough-reputation-to-flag": "No tiene suficiente reputación para poner reportar esta publicación", "reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.", "registration-error": "Error de registro", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Algo ha ido mal mientras se parseaba la respuesta del servidor" } \ No newline at end of file diff --git a/public/language/es/global.json b/public/language/es/global.json index b452d2a26f..4e2b07be05 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -3,10 +3,10 @@ "search": "Buscar", "buttons.close": "Cerrar", "403.title": "Acceso denegado", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Al parecer has llegado a una página a la cual no tienes permisos para acceder.", + "403.login": "¿Quizás deberías intentar acceder?", "404.title": "No encontrado", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Al parecer has llegado a una página a la cual no tienes permisos para acceder. Volver a la página de inicio .", "500.title": "Error Interno.", "500.message": "¡Ooops! ¡Parece que algo salió mal! No te preocupes, ¡nuestros simios hiperinteligentes lo solucionarán!", "register": "Registrarse", @@ -27,7 +27,7 @@ "header.tags": "Etiquetas", "header.popular": "Popular", "header.users": "Usuarios", - "header.groups": "Groups", + "header.groups": "Grupos", "header.chats": "Chats", "header.notifications": "Notificaciones", "header.search": "Buscar", @@ -75,7 +75,7 @@ "updated.title": "Foro actualizado", "updated.message": "El foro acaba de ser actualizado a la última versión. Haz click aquí para refrescar la página.", "privacy": "Privacidad", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "Seguir", + "unfollow": "Dejar de Seguir", "delete_all": "Eliminar todo" } \ No newline at end of file diff --git a/public/language/es/groups.json b/public/language/es/groups.json index 92be20f80a..bc91648d60 100644 --- a/public/language/es/groups.json +++ b/public/language/es/groups.json @@ -1,21 +1,21 @@ { "groups": "Grupos", "view_group": "Ver Grupo", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "Propietario del Grupo", + "new_group": "Crear Nuevo Grupo", + "no_groups_found": "No hay grupos que ver", + "cover-instructions": "Arrastra y suelta una foto, arrastra a la posición, y pulsa Guardar ", + "cover-change": "Cambiar", + "cover-save": "Guardar", + "cover-saving": "Guardando", "details.title": "Detalles de Grupo", "details.members": "Lista de Miembros", - "details.pending": "Pending Members", + "details.pending": "Miembros Pendientes", "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.", "details.latest_posts": "Últimas Publicaciones", - "details.private": "Private Group", - "details.public": "Public Group", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "Grupo Privado", + "details.public": "Grupo Público", + "details.owner_options": "Administración De Grupo", + "event.updated": "Los detalles del grupo han sido actualizados", + "event.deleted": "El grupo \"%1\" ha sido eliminado" } \ No newline at end of file diff --git a/public/language/es/recent.json b/public/language/es/recent.json index 6c8600afec..ea473a2b51 100644 --- a/public/language/es/recent.json +++ b/public/language/es/recent.json @@ -6,13 +6,13 @@ "year": "Año", "alltime": "Siempre", "no_recent_topics": "No hay publicaciones recientes.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "Hay una nueva publicación.", + "there-is-a-new-topic-and-a-new-post": "hay una nueva publicación y un nuevo mensaje.", + "there-is-a-new-topic-and-new-posts": "Hay una nueva publicación y %1 nuevos mensajes.", + "there-are-new-topics": "Hay %1 nuevos mensajes.", + "there-are-new-topics-and-a-new-post": "Hay %1 nuevas publicaciones y un nuevo mensaje.", + "there-are-new-topics-and-new-posts": "Hay %1 nuevas publicaciones y %2 nuevos mensajes.", + "there-is-a-new-post": "Hay un nuevo mensaje.", + "there-are-new-posts": "Hay %1 nuevos mensajes.", + "click-here-to-reload": "Cliquea aquí para recargar." } \ No newline at end of file diff --git a/public/language/es/search.json b/public/language/es/search.json index add13e50c1..769c91f354 100644 --- a/public/language/es/search.json +++ b/public/language/es/search.json @@ -1,7 +1,7 @@ { "results_matching": "%1 resuldado(s) coinciden con \"%2\". (%3 segundos)", - "no-matches": "No matches found", - "in": "In", - "by": "By", - "posted-by": "Posted by" + "no-matches": "No se encontraron coincidencias", + "in": "En", + "by": "Por", + "posted-by": "Publicado por" } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index 30563b67ae..f1a3f4221c 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -74,7 +74,7 @@ "fork_no_pids": "¡No has seleccionado ningún mensaje!", "fork_success": "¡Se ha creado un nuevo tema a partir del original! Haz click aquí para ir al nuevo tema.", "composer.title_placeholder": "Ingresa el título de tu tema...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Nombre", "composer.discard": "Descartar", "composer.submit": "Enviar", "composer.replying_to": "En respuesta a %1", @@ -94,5 +94,5 @@ "oldest_to_newest": "Más antiguo a más nuevo", "newest_to_oldest": "Más nuevo a más antiguo", "most_votes": "Mayor número de votos", - "most_posts": "Most posts" + "most_posts": "Mayor número de mensajes" } \ No newline at end of file diff --git a/public/language/es/user.json b/public/language/es/user.json index 23976718fb..add6981c5f 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -2,8 +2,8 @@ "banned": "Baneado", "offline": "Desconectado", "username": "Nombre de usuario", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Fecha de Registro", + "postcount": "Número De Publicaciones", "email": "Correo electrónico", "confirm_email": "Confirmar correo electrónico", "delete_account": "Eliminar cuenta", @@ -18,7 +18,7 @@ "profile_views": "Visitas", "reputation": "Reputación", "favourites": "Favoritos", - "watched": "Watched", + "watched": "Visto", "followers": "Seguidores", "following": "Siguiendo", "signature": "Firma", @@ -59,12 +59,12 @@ "digest_weekly": "Semanalmente", "digest_monthly": "Mensualmente", "send_chat_notifications": "Enviar un email si recibo un mensaje de chat cuando no esté en línea.", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "Enviarme un email cuando se realicen contestaciones en los temas en los que estoy subscrito", "has_no_follower": "Este usuario no tiene seguidores :(", "follows_no_one": "Este miembro no sigue a nadie :(", "has_no_posts": "Este usuario aún no ha publicado nada.", "has_no_topics": "Este usuario aún no ha publicado nada.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Este usuario todavía no ha visto ninguna publicación.", "email_hidden": "Correo electrónico oculto", "hidden": "oculto", "paginate_description": "Paginar hilos y mensajes en lugar de usar desplazamiento infinito.", diff --git a/public/language/es/users.json b/public/language/es/users.json index 18b783a6c1..529a6accb5 100644 --- a/public/language/es/users.json +++ b/public/language/es/users.json @@ -6,7 +6,7 @@ "enter_username": "Ingresa el nombre de usuario que quieres buscar", "load_more": "Cargar más", "users-found-search-took": "¡%1 usuario(s) encontrados! La búsqueda tardó %2 ms.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "filter-by": "Filtrar Por", + "online-only": "Sólo en línea", + "picture-only": "Sólo imagen" } \ No newline at end of file diff --git a/public/language/et/error.json b/public/language/et/error.json index 0cbb8ea85f..ea2c2e9ff4 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Sa ei saa endaga vestelda!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.", diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index 8657d58d7d..61736c18c4 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "شما نمی‌توانید با خودتان گفتگو کنید!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید.", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 0b28c1f98b..a9f843b34a 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/fr/email.json b/public/language/fr/email.json index 1ed4d80cac..0e4f57d601 100644 --- a/public/language/fr/email.json +++ b/public/language/fr/email.json @@ -17,8 +17,8 @@ "notif.chat.subject": "Nouveau message de chat reçu de %1", "notif.chat.cta": "Cliquez ici pour continuer la conversation", "notif.chat.unsub.info": "Cette notification de chat a été envoyé en raison de vos paramètres d'abonnement.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Cliquer ici pour lire le sujet complet", + "notif.post.unsub.info": "La notification de ce message vous a été envoyé en raison de vos paramètres d'abonnement.", "test.text1": "Ceci est un email de test pour vérifier que l'emailer est correctement configuré pour NodeBB.", "unsub.cta": "Cliquez ici pour modifier ces paramètres", "closing": "Merci !" diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 28ab5566f6..6354f0e6d9 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -18,7 +18,7 @@ "username-taken": "Nom d’utilisateur déjà utilisé", "email-taken": "Email déjà utilisé", "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquer ici pour la valider.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Vous ne pouver discuter tant que votre email n'est pas confirmé", "username-too-short": "Nom d'utilisateur trop court", "username-too-long": "Nom d'utilisateur trop long", "user-banned": "Utilisateur banni", @@ -44,13 +44,13 @@ "already-favourited": "Vous avez déjà mis ce message en favoris", "already-unfavourited": "Vous avez déjà retiré ce message des favoris", "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1", + "invalid-image-extension": "Extension d'image invalide", "group-name-too-short": "Nom de groupe trop court", "group-already-exists": "Ce groupe existe déjà", "group-name-change-not-allowed": "Modification du nom de groupe non permise", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Vous faites déjà parti de ce groupe", + "group-needs-owner": "Ce groupe nécessite au moins un propriétaire", "post-already-deleted": "Message déjà supprimé", "post-already-restored": "Message déjà restauré", "topic-already-deleted": "Sujet déjà supprimé", @@ -62,11 +62,12 @@ "signature-too-long": "La signature ne peut dépasser %1 caractères !", "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !", "chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord vous suivre avant de pouvoir discuter avec lui.", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Le système de réputation est désactivé", "downvoting-disabled": "Les votes négatifs ne sont pas autorisés", "not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message", "not-enough-reputation-to-flag": "Vous n'avez pas une réputation assez élevée pour signaler ce message", "reload-failed": "NodeBB a rencontré un problème lors du rechargement : \"% 1\" . NodeBB continuera de fonctionner côté client, même si vous devez annuler ce que vous avez fait juste avant de recharger .", "registration-error": "Erreur d'enregistrement", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Une erreur est survenue en analysant la réponse du serveur" } \ No newline at end of file diff --git a/public/language/fr/global.json b/public/language/fr/global.json index 1937e5faad..bb53439c13 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -3,10 +3,10 @@ "search": "Recherche", "buttons.close": "Fermer", "403.title": "Accès refusé", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Il semble que vous ayez atteint une page dont vous n'avez pas accès.", + "403.login": "Peut-être deviez vous essayer de vous connecter?", "404.title": "Introuvable", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Il semble que vous ayez atteint une page qui n'existe pas. Retourner à la page d'accueil.", "500.title": "Erreur interne.", "500.message": "Oops ! Il semblerait que quelque chose se soit mal passé !", "register": "S'inscrire", @@ -27,7 +27,7 @@ "header.tags": "Tags", "header.popular": "Populaire", "header.users": "Utilisateurs", - "header.groups": "Groups", + "header.groups": "Groupes", "header.chats": "Chats", "header.notifications": "Notifications", "header.search": "Recherche", @@ -75,7 +75,7 @@ "updated.title": "Forum mis à jour", "updated.message": "Ce forum a été mis à jour à la dernière version. Cliquez ici pour recharger la page.", "privacy": "Vie privée", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "S'abonner", + "unfollow": "Se désabonner", "delete_all": "Supprimer Tout" } \ No newline at end of file diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json index c61f42e068..e786d08dd0 100644 --- a/public/language/fr/groups.json +++ b/public/language/fr/groups.json @@ -1,21 +1,21 @@ { "groups": "Groupes", "view_group": "Voir le groupe", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "Propriétaire du Groupe", + "new_group": "Créer un Nouveau Groupe", + "no_groups_found": "Il n'y a aucun groupe", + "cover-instructions": "Glisser et Coller une image, ajuster la position, et cliquer sur Enregistrer", + "cover-change": "Modifier", + "cover-save": "Enregistrer", + "cover-saving": "Enregistrement", "details.title": "Informations du groupe", "details.members": "Liste des membres", - "details.pending": "Pending Members", - "details.has_no_posts": "Ce membre du groupe n'a envoyé aucun message.", + "details.pending": "Membres en attente", + "details.has_no_posts": "Les membres de ce groupe n'ont envoyé aucun message.", "details.latest_posts": "Derniers messages", - "details.private": "Private Group", - "details.public": "Public Group", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "Groupe Privé", + "details.public": "Groupe Public", + "details.owner_options": "Administration du Groupe", + "event.updated": "Les détails du groupe ont été mis à jour", + "event.deleted": "Le groupe é%1\" a été supprimé" } \ No newline at end of file diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json index f244b31c35..d2ee95b1b6 100644 --- a/public/language/fr/recent.json +++ b/public/language/fr/recent.json @@ -6,13 +6,13 @@ "year": "An", "alltime": "Toujours", "no_recent_topics": "Il n'y a aucun sujet récent.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "Il y a un nouveau sujet.", + "there-is-a-new-topic-and-a-new-post": "Il y a un nouveau sujet et un nouveau message.", + "there-is-a-new-topic-and-new-posts": "Il y a un nouveau sujet et %1 nouveaux messages.", + "there-are-new-topics": "Il y a %1 nouveaux sujets.", + "there-are-new-topics-and-a-new-post": "Il y a %1 nouveaux sujets et un nouveau message.", + "there-are-new-topics-and-new-posts": "Il y a %1 nouveaux sujets et %2 nouveaux messages.", + "there-is-a-new-post": "Il y a un nouveau message.", + "there-are-new-posts": "Il y a %1 nouveaux messages.", + "click-here-to-reload": "Cliquer ici pour recharger." } \ No newline at end of file diff --git a/public/language/fr/search.json b/public/language/fr/search.json index 63e5537663..b8cdfc8d2a 100644 --- a/public/language/fr/search.json +++ b/public/language/fr/search.json @@ -1,7 +1,7 @@ { "results_matching": "%1 résultat(s) correspondant(s) à \"%2\", (%3 secondes)", - "no-matches": "No matches found", - "in": "In", - "by": "By", - "posted-by": "Posted by" + "no-matches": "Aucune réponse trouvée", + "in": "Dans", + "by": "Par", + "posted-by": "Posté par" } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index b20ef314eb..135efce878 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -74,7 +74,7 @@ "fork_no_pids": "Aucun post sélectionné !", "fork_success": "Sujet copié avec succès! Cliquez ici pour aller au sujet copié.", "composer.title_placeholder": "Entrer le titre du sujet ici ...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Nom", "composer.discard": "Abandonner", "composer.submit": "Envoyer", "composer.replying_to": "Réponse à %1", @@ -94,5 +94,5 @@ "oldest_to_newest": "Du plus ancien au plus récent", "newest_to_oldest": "Du plus récent au plus ancien", "most_votes": "Les mieux notés", - "most_posts": "Most posts" + "most_posts": "Nombre de messages" } \ No newline at end of file diff --git a/public/language/fr/user.json b/public/language/fr/user.json index 83bb6f5d9e..d2cf37feec 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -2,8 +2,8 @@ "banned": "Banni", "offline": "Hors-ligne", "username": "Nom d'utilisateur", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Date d'Adhésion", + "postcount": "Nombre de Messages", "email": "Email", "confirm_email": "Confirmer l'adresse email", "delete_account": "Supprimer le compte", @@ -18,7 +18,7 @@ "profile_views": "Vues", "reputation": "Réputation", "favourites": "Favoris", - "watched": "Watched", + "watched": "Suivis", "followers": "Abonnés", "following": "Abonnements", "signature": "Signature", @@ -59,12 +59,12 @@ "digest_weekly": "Hebdomadaire", "digest_monthly": "Mensuel", "send_chat_notifications": "Envoyer un e-mail si un nouveau message de chat arrive lorsque je ne suis pas en ligne", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "Envoyer un email lors de réponses envoyées aux sujets auxquels je suis abonné.", "has_no_follower": "Cet utilisateur n'est suivi par personne :(", "follows_no_one": "Cet utilisateur ne suit personne :(", "has_no_posts": "Ce membre n'a rien posté pour le moment", "has_no_topics": "L’utilisateur n'a pas encore créé de sujet.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Cet utilisateur ne suis encore aucun sujet.", "email_hidden": "Email masqué", "hidden": "masqué", "paginate_description": "Utiliser la pagination des sujets et des messages au lieu du défilement infini.", diff --git a/public/language/fr/users.json b/public/language/fr/users.json index 3cd259f2c5..8d2c4481ea 100644 --- a/public/language/fr/users.json +++ b/public/language/fr/users.json @@ -6,7 +6,7 @@ "enter_username": "Entrer un nom d'utilisateur pour rechercher", "load_more": "Charger la suite", "users-found-search-took": "%1 utilisateur(s) trouvé(s) ! Recherche effectuée en %2 ms.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "filter-by": "Filtrer Par", + "online-only": "En Ligne uniquement", + "picture-only": "Avec Image uniquement" } \ No newline at end of file diff --git a/public/language/he/error.json b/public/language/he/error.json index 28483df65e..28a5461705 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index c0bab322ee..705be11958 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sajnáljuk, az aláírás nem lehet hosszabb %1 karakternél.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/id/error.json b/public/language/id/error.json index 7b1413a957..dcce92a9bf 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Maaf, tanda pengenalmu tidak dapat melebihi %1 karakter.", "cant-chat-with-yourself": "Kamu tidak dapat chat dengan akun sendiri", "chat-restricted": "Pengguna ini telah membatasi percakapa mereka. Mereka harus mengikutimu sebelum kamu dapat melakukan percakapan dengan mereka ", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Sistem reputasi ditiadakan.", "downvoting-disabled": "Downvoting ditiadakan", "not-enough-reputation-to-downvote": "Tidak cukup reputation untuk downvote post ini", diff --git a/public/language/it/error.json b/public/language/it/error.json index 12ebc50080..241f9d90ea 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Spiacenti, la tua firma non può essere lunga %1 caratteri.", "cant-chat-with-yourself": "Non puoi chattare con te stesso!", "chat-restricted": "Questo utente ha ristretto i suoi messaggi in chat alle persone che segue. Per poter chattare con te ti deve prima seguire.", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Il sistema di reputazione è disabilitato.", "downvoting-disabled": "Il Downvoting è disabilitato", "not-enough-reputation-to-downvote": "Non hai i privilegi per votare negativamente questo post", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index b55c713676..a7b4c90a77 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "自分にチャットすることはできません！", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 9ce8f5dd42..88c01be5d7 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -62,6 +62,7 @@ "signature-too-long": "죄송합니다. 서명은 최대 %1자로 제한됩니다.", "cant-chat-with-yourself": "자신과는 채팅할 수 없습니다.", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "인기도 시스템을 사용하지 않습니다.", "downvoting-disabled": "비추천 기능을 사용하지 않습니다.", "not-enough-reputation-to-downvote": "인기도가 낮아 이 게시물에 반대할 수 없습니다.", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index deb7944e24..91f17b67bc 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 336f7cd580..9c50886310 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/nb/email.json b/public/language/nb/email.json index c3c3e3f474..69fa94dcca 100644 --- a/public/language/nb/email.json +++ b/public/language/nb/email.json @@ -17,8 +17,8 @@ "notif.chat.subject": "Ny chat-melding mottatt fra %1", "notif.chat.cta": "Klikk her for å fortsette samtalen", "notif.chat.unsub.info": "Denne chat-varselen er sendt til deg basert på dine innstillinger for abonnering.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Trykk for å lese hele emnet", + "notif.post.unsub.info": "Dette postvarselet ble sendt til deg på grunn av dine abonnementsinnstillinger.", "test.text1": "Dette er en test-epost for å verifisere at epostsystemet i NodeBB fungerer som det skal.", "unsub.cta": "Klikk her for å endre disse innstillingene", "closing": "Takk!" diff --git a/public/language/nb/error.json b/public/language/nb/error.json index ef6f1a20b0..3703ca393c 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -18,7 +18,7 @@ "username-taken": "Brukernavn opptatt", "email-taken": "E-post opptatt", "email-not-confirmed": "E-posten din har ikke blitt bekreftet enda, vennligst klikk for å bekrefte din e-post.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Du kan ikke chatte før e-posten din har blitt bekreftet", "username-too-short": "Brukernavnet er for kort", "username-too-long": "Brukernavnet er for langt", "user-banned": "Bruker utestengt", @@ -44,13 +44,13 @@ "already-favourited": "Du har allerede favorittmerket dette innlegget", "already-unfavourited": "Du har allerede avfavorisert dette innlegget", "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "Ugyldig bildetype. Tilatte typer er: %1", + "invalid-image-extension": "Ugyldig bildefiltype", "group-name-too-short": "Gruppenavnet er for kort", "group-already-exists": "Gruppe eksisterer allerede", "group-name-change-not-allowed": "Gruppenavn ikke tillatt", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Du er allerede en del av denne gruppen", + "group-needs-owner": "Denne gruppen kreves minst en eier", "post-already-deleted": "Dette innlegget har blitt slettet", "post-already-restored": "Dette innlegget har allerede blitt gjenopprettet", "topic-already-deleted": "Dette emnet har allerede blitt slettet", @@ -62,11 +62,12 @@ "signature-too-long": "Beklager, signaturen din kan ikke være lengre en %1 tegn.", "cant-chat-with-yourself": "Du kan ikke chatte med deg selv!", "chat-restricted": "Denne brukeren har begrenset sine chat-meldinger. De må følge deg før du kan chatte med dem", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Ryktesystem er deaktivert.", "downvoting-disabled": "Nedstemming av deaktivert", "not-enough-reputation-to-downvote": "Du har ikke nok rykte til å nedstemme det innlegget", "not-enough-reputation-to-flag": "Du har ikke nok rykte til å flagge dette innlegget", "reload-failed": "NodeBB støtte på et problem under lasting på nytt: \"%1\". NodeBB vil fortsette å servere eksisterende klientside ressureser, selv om du burde angre endringene du gjorde før du lastet på nytt.", "registration-error": "Feil under registrering", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Noe gikk feil under analysering av serversvar" } \ No newline at end of file diff --git a/public/language/nb/global.json b/public/language/nb/global.json index 34f3d08cc4..9528d360c5 100644 --- a/public/language/nb/global.json +++ b/public/language/nb/global.json @@ -3,10 +3,10 @@ "search": "Søk", "buttons.close": "Steng", "403.title": "Adgang nektet", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Du har funnet en side du ikke har tilgang til.", + "403.login": "Kanskje du skal prøve å logge inn?", "404.title": "Ikke funnet", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Du har funnet en side som ikke eksisterer. Returner til startsiden?", "500.title": "Intern feil.", "500.message": "Oops! Ser ut som noe gikk galt!", "register": "Registrer", @@ -27,7 +27,7 @@ "header.tags": "Tagger", "header.popular": "Populære", "header.users": "Brukere", - "header.groups": "Groups", + "header.groups": "Grupper", "header.chats": "Chatter", "header.notifications": "Varsler", "header.search": "Søk", @@ -75,7 +75,7 @@ "updated.title": "Forum oppdatert", "updated.message": "Dette forumet har nettopp blitt oppdatert til den nyeste versjonen. Klikk her for å laste siden på nytt.", "privacy": "Personvern", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "Følg", + "unfollow": "Avfølg", "delete_all": "Slett alle" } \ No newline at end of file diff --git a/public/language/nb/groups.json b/public/language/nb/groups.json index 3319bcb9a2..7578e96072 100644 --- a/public/language/nb/groups.json +++ b/public/language/nb/groups.json @@ -1,21 +1,21 @@ { "groups": "Grupper", "view_group": "Vis gruppe", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "Gruppe-eier", + "new_group": "Opprett ny gruppe", + "no_groups_found": "Det er ingen grupper å se", + "cover-instructions": "Dra og slipp et bilde, dra til posisjon, og trykk Lagre", + "cover-change": "Endre", + "cover-save": "Lagre", + "cover-saving": "Lagrer", "details.title": "Gruppedetaljer", "details.members": "Medlemsliste", - "details.pending": "Pending Members", + "details.pending": "Ventende meldemmer", "details.has_no_posts": "Medlemmene i denne gruppen har ikke skrevet noen innlegg.", "details.latest_posts": "Seneste innlegg", - "details.private": "Private Group", - "details.public": "Public Group", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "Privat grup", + "details.public": "Offentlig grup", + "details.owner_options": "Gruppeadministrasjon", + "event.updated": "Gruppedetaljer har blitt oppgradert", + "event.deleted": "Gruppen \"%1\" har blitt slettet" } \ No newline at end of file diff --git a/public/language/nb/recent.json b/public/language/nb/recent.json index 4a77aab5ab..24ece53c70 100644 --- a/public/language/nb/recent.json +++ b/public/language/nb/recent.json @@ -6,13 +6,13 @@ "year": "År", "alltime": "All tid", "no_recent_topics": "Det er ingen nye tråder.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "Det finnes et nytt emne.", + "there-is-a-new-topic-and-a-new-post": "Det finnes et nytt emne og et nytt innlegg.", + "there-is-a-new-topic-and-new-posts": "Det finnes et nytt emne og %1 nye innlegg.", + "there-are-new-topics": "Det finnes %1 nye emner.", + "there-are-new-topics-and-a-new-post": "Det finnes %1 nye emner og et nytt innlegg.", + "there-are-new-topics-and-new-posts": "Det finnes %1 nye emner og %2 nye innlegg", + "there-is-a-new-post": "Det finnes et nytt innlegg.", + "there-are-new-posts": "Det finnes %1 nye innlegg.", + "click-here-to-reload": "Trykk her for å laste på nytt." } \ No newline at end of file diff --git a/public/language/nb/search.json b/public/language/nb/search.json index 2e9ad3665c..8daeddcb06 100644 --- a/public/language/nb/search.json +++ b/public/language/nb/search.json @@ -1,7 +1,7 @@ { "results_matching": "%1 resultat(er) samsvarer med \"%2\", (%3 sekunder)", - "no-matches": "No matches found", - "in": "In", - "by": "By", - "posted-by": "Posted by" + "no-matches": "Ingen matcher funnet", + "in": "I", + "by": "Av", + "posted-by": "Skapt av" } \ No newline at end of file diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 7690cd7114..49096d9f6f 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -74,7 +74,7 @@ "fork_no_pids": "Ingen innlegg valgt!", "fork_success": "Dette emnet ble delt! Klikk for å gå til delt emne.", "composer.title_placeholder": "Skriv din tråd-tittel her", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Navn", "composer.discard": "Forkast", "composer.submit": "Send", "composer.replying_to": "Svarer i %1", @@ -94,5 +94,5 @@ "oldest_to_newest": "Eldste til nyeste", "newest_to_oldest": "Nyeste til eldste", "most_votes": "Flest stemmer", - "most_posts": "Most posts" + "most_posts": "Flest innlegg" } \ No newline at end of file diff --git a/public/language/nb/user.json b/public/language/nb/user.json index b154436e80..f3e6523e25 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -2,8 +2,8 @@ "banned": "Utestengt", "offline": "Offline", "username": "Brukernavn", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Registereringsdato", + "postcount": "Antall innlegg", "email": "E-post", "confirm_email": "Bekfreft e-post", "delete_account": "Slett konto", @@ -18,7 +18,7 @@ "profile_views": "Profilvisninger", "reputation": "Rykte", "favourites": "Favoritter", - "watched": "Watched", + "watched": "Overvåkede", "followers": "Følgere", "following": "Følger", "signature": "Signatur", @@ -64,7 +64,7 @@ "follows_no_one": "Denne brukeren følger ingen :(", "has_no_posts": "Denne brukeren har ikke skrevet noe enda.", "has_no_topics": "Denne brukeren har ikke skrevet noen emner enda.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Denne brukeren overvåker ingen innlegg foreløpig.", "email_hidden": "E-post skjult", "hidden": "skjult", "paginate_description": "Paginer tråder og innlegg istedet for å bruke uendelig skrolling.", diff --git a/public/language/nb/users.json b/public/language/nb/users.json index e0f8363a64..a2038667ab 100644 --- a/public/language/nb/users.json +++ b/public/language/nb/users.json @@ -6,7 +6,7 @@ "enter_username": "Skriv ett brukernavn for å søke", "load_more": "Last flere", "users-found-search-took": "%1 bruker(e) funnet! Søk tok %2 ms.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "filter-by": "Filtrer etter", + "online-only": "Bare påloggede", + "picture-only": "Bare bilde" } \ No newline at end of file diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 6e4553687a..7fa4a2f24e 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, maar deze handtekening kan niet groter zijn dan %1 karakters!", "cant-chat-with-yourself": "Je kan niet met jezelf chatten!", "chat-restricted": "Deze gebruiker heeft beperkingen gelegd op chatfunctie. Hun moeten jouw volgen voordat je met hun kan chatten", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputatie systeem is uitgeschakeld", "downvoting-disabled": "Downvoten is uitgeschakeld", "not-enough-reputation-to-downvote": "U heeft niet de benodigde reputatie om dit bericht te downvoten", diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json index 14a4023b74..a1d2ca868d 100644 --- a/public/language/nl/groups.json +++ b/public/language/nl/groups.json @@ -1,13 +1,13 @@ { "groups": "Groepen", "view_group": "Bekijk Groep", - "owner": "Group Owner", - "new_group": "Create New Group", + "owner": "Groep eigenaar", + "new_group": "Maak een nieuwe groep", "no_groups_found": "There are no groups to see", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "cover-save": "Opslaan", + "cover-saving": "Bezig met opslaan", "details.title": "Groep Details", "details.members": "Ledenlijst", "details.pending": "Pending Members", diff --git a/public/language/nl/recent.json b/public/language/nl/recent.json index 56f3ca3288..2b1b292298 100644 --- a/public/language/nl/recent.json +++ b/public/language/nl/recent.json @@ -6,10 +6,10 @@ "year": "Jaar", "alltime": "Intussen", "no_recent_topics": "Er zijn geen recente reacties.", - "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic": "Er is een nieuw onderwerp", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", + "there-is-a-new-topic-and-new-posts": "Er is een nieuwe onderwerp en %1 nieuwe berichten", + "there-are-new-topics": "Er zijn %1 nieuwe onderwerpen", "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", "there-is-a-new-post": "There is a new post.", diff --git a/public/language/nl/search.json b/public/language/nl/search.json index 837a109e6f..60193a06b7 100644 --- a/public/language/nl/search.json +++ b/public/language/nl/search.json @@ -1,7 +1,7 @@ { "results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)", - "no-matches": "No matches found", - "in": "In", - "by": "By", + "no-matches": "Geen matches gevonden", + "in": "in", + "by": "door", "posted-by": "Posted by" } \ No newline at end of file diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index c5a7af6b2f..8ab45e30d3 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -74,7 +74,7 @@ "fork_no_pids": "Geen berichten geselecteerd!", "fork_success": "Met succes het onderwerp gesplitst. klik hier om naar het nieuwe onderwerp te gaan.", "composer.title_placeholder": "Vul de titel voor het onderwerp hier in...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Naam", "composer.discard": "Annuleren", "composer.submit": "Opslaan", "composer.replying_to": "Reageren op %1", @@ -94,5 +94,5 @@ "oldest_to_newest": "Oud naar Nieuw", "newest_to_oldest": "Nieuw naar Oud", "most_votes": "Meeste stemmen", - "most_posts": "Most posts" + "most_posts": "Meeste berichten" } \ No newline at end of file diff --git a/public/language/nl/user.json b/public/language/nl/user.json index fccd6ac057..0cc9df6cbe 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -2,7 +2,7 @@ "banned": "Verbannen", "offline": "Offline", "username": "Gebruikersnaam", - "joindate": "Join Date", + "joindate": "Datum van registratie", "postcount": "Post Count", "email": "Email", "confirm_email": "Bevestig uw email adres", diff --git a/public/language/nl/users.json b/public/language/nl/users.json index 3f19d8316f..4df6bda6f1 100644 --- a/public/language/nl/users.json +++ b/public/language/nl/users.json @@ -6,7 +6,7 @@ "enter_username": "Vul een gebruikersnaam in om te zoeken", "load_more": "Meer Laden", "users-found-search-took": "%1 gebruiker(s) gevonden! Zoekactie duurde %2 ms.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "filter-by": "Filter op", + "online-only": "Online ", + "picture-only": "Alleen een afbeelding" } \ No newline at end of file diff --git a/public/language/pl/error.json b/public/language/pl/error.json index d35d020cc6..8929f25bfa 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Przepraszamy, ale podpis nie może być dłuższy niż %1 znaków.", "cant-chat-with-yourself": "Nie możesz rozmawiać ze sobą", "chat-restricted": "Ten użytkownik ograniczył swoje czaty. Musi Cię śledzić, zanim będziesz mógł z nim czatować.", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "System reputacji został wyłączony", "downvoting-disabled": "Ocena postów jest wyłączona", "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post.", diff --git a/public/language/pt_BR/email.json b/public/language/pt_BR/email.json index 4465631a3e..04e7f76246 100644 --- a/public/language/pt_BR/email.json +++ b/public/language/pt_BR/email.json @@ -17,8 +17,8 @@ "notif.chat.subject": "Nova mensagem de chat recebida de %1", "notif.chat.cta": "Clique aqui para continuar a conversa", "notif.chat.unsub.info": "Esta notificação de chat foi enviada a você devido às suas configurações de assinatura.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Clique aqui para ler o tópico completo", + "notif.post.unsub.info": "Esta notificação de postagem foi enviada para você devido as suas configurações de assinatura.", "test.text1": "Este é um e-mail de teste, para verificar que o enviador de emails está corretamente configurado no seu NodeBB.", "unsub.cta": "Clique aqui para alterar estas configurações", "closing": "Obrigado!" diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index 127303d653..912e6b8210 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -18,7 +18,7 @@ "username-taken": "Nome de usuário já existe", "email-taken": "Email já cadastrado", "email-not-confirmed": "O seu email ainda não foi confirmado, por favor clique aqui para confirmar seu email.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Você não pode usar o chat até que seu email seja confirmado", "username-too-short": "Nome de usuário muito curto", "username-too-long": "Nome de usuário muito longo", "user-banned": "Usuário banido", @@ -44,13 +44,13 @@ "already-favourited": "Você já adicionou este post aos favoritos", "already-unfavourited": "Você já removeu este post dos favoritos", "cant-ban-other-admins": "Você não pode banir outros administradores!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "Tipo inválido de imagem. Os tipos permitidos são: %1", + "invalid-image-extension": "Extensão de imagem inválida", "group-name-too-short": "Nome do grupo é muito curto", "group-already-exists": "O grupo já existe", "group-name-change-not-allowed": "Sem permissão para alterar nome do grupo", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Você já faz parte deste grupo", + "group-needs-owner": "Este grupo requer ao menos um dono", "post-already-deleted": "Este post já foi deletado", "post-already-restored": "Este post já foi restaurado", "topic-already-deleted": "Esté tópico já foi deletado", @@ -62,11 +62,12 @@ "signature-too-long": "Desculpe, sua assinatura não pode ser maior que %1 caracteres.", "cant-chat-with-yourself": "Você não pode iniciar um chat consigo mesmo!", "chat-restricted": "Este usuário restringiu suas mensagens de chat. Eles devem seguir você antes que você possa conversar com eles", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "O sistema de reputação está desabilitado.", "downvoting-disabled": "Negativação está desabilitada", "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post", "not-enough-reputation-to-flag": "Você não possui reputação suficiente para sinalizar este post", "reload-failed": "O NodeBB encontrou um problema ao recarregar: \"%1\". O NodeBB continuará a servir os assets existentes no lado do cliente, apesar de que você deve desfazer o que você fez antes de recarregar.", "registration-error": "Erro de Cadastro", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Algo deu errado ao conseguir resposta do servidor" } \ No newline at end of file diff --git a/public/language/pt_BR/global.json b/public/language/pt_BR/global.json index 88a9d803e6..d9bb14a846 100644 --- a/public/language/pt_BR/global.json +++ b/public/language/pt_BR/global.json @@ -3,10 +3,10 @@ "search": "Procurar", "buttons.close": "Fechar", "403.title": "Acesso Negado", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Parece que você chegou à uma página à qual você não tem acesso.", + "403.login": "Talvez você deveria tentar logar?", "404.title": "Não Encontrado", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Parece que você chegou à uma página que não existe. Voltar para a página inicial.", "500.title": "Erro interno.", "500.message": "Oops! Parece que algo deu errado!", "register": "Cadastrar", @@ -27,7 +27,7 @@ "header.tags": "Tags", "header.popular": "Popular", "header.users": "Usuários", - "header.groups": "Groups", + "header.groups": "Grupos", "header.chats": "Chats", "header.notifications": "Notificações", "header.search": "Procurar", @@ -75,7 +75,7 @@ "updated.title": "Fórum Atualizado", "updated.message": "Este fórum foi atualizado para sua última versão. Clique aqui para atualizar a página.", "privacy": "Privacidade", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "Seguir", + "unfollow": "Deixar de seguir", "delete_all": "Deletar Tudo" } \ No newline at end of file diff --git a/public/language/pt_BR/groups.json b/public/language/pt_BR/groups.json index 1893fb87a5..09abeb8bcd 100644 --- a/public/language/pt_BR/groups.json +++ b/public/language/pt_BR/groups.json @@ -1,21 +1,21 @@ { "groups": "Grupos", "view_group": "Ver Grupo", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "Dono do Grupo", + "new_group": "Criar Novo Grupo", + "no_groups_found": "Não há grupos para ver", + "cover-instructions": "Arraste uma foto, arraste para a posição correta e clique em Salvar", + "cover-change": "Alterar", + "cover-save": "Salvar", + "cover-saving": "Salvando", "details.title": "Detalhes do Grupo", "details.members": "Lista de Membros", - "details.pending": "Pending Members", + "details.pending": "Membros Pendentes", "details.has_no_posts": "Os membros deste grupo não fizeram quaisquer posts.", "details.latest_posts": "Últimos Posts", - "details.private": "Private Group", - "details.public": "Public Group", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "Grupo Privado", + "details.public": "Grupo Público.", + "details.owner_options": "Administração do Grupo", + "event.updated": "Os detalhes do grupo foram atualizados", + "event.deleted": "O grupo \"%1\" foi deletado" } \ No newline at end of file diff --git a/public/language/pt_BR/recent.json b/public/language/pt_BR/recent.json index 3c3551e0c1..b0dd732602 100644 --- a/public/language/pt_BR/recent.json +++ b/public/language/pt_BR/recent.json @@ -6,13 +6,13 @@ "year": "Ano", "alltime": "Todos os Tempos", "no_recent_topics": "Não há tópicos recentes.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "Há um novo tópico.", + "there-is-a-new-topic-and-a-new-post": "Há um novo tópico e um novo post.", + "there-is-a-new-topic-and-new-posts": "Há um novo tópico e %1 novos posts.", + "there-are-new-topics": "Há %1 novos tópicos.", + "there-are-new-topics-and-a-new-post": "Há %1 novos tópicos e um novo post.", + "there-are-new-topics-and-new-posts": "Há %1 novos tópicos e %2 novos posts.", + "there-is-a-new-post": "Há um novo post.", + "there-are-new-posts": "Há %1 novos posts.", + "click-here-to-reload": "Clique aqui para recarregar." } \ No newline at end of file diff --git a/public/language/pt_BR/search.json b/public/language/pt_BR/search.json index 9d1e425017..f4d633ffd7 100644 --- a/public/language/pt_BR/search.json +++ b/public/language/pt_BR/search.json @@ -1,7 +1,7 @@ { "results_matching": "%1 resultado(s) contendo \"%2\", (%3 segundos)", - "no-matches": "No matches found", - "in": "In", - "by": "By", - "posted-by": "Posted by" + "no-matches": "Nenhum resultado encontrado", + "in": "Em", + "by": "Por", + "posted-by": "Postado por" } \ No newline at end of file diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json index d93e414d45..df49f8cb20 100644 --- a/public/language/pt_BR/topic.json +++ b/public/language/pt_BR/topic.json @@ -74,7 +74,7 @@ "fork_no_pids": "Nenhum post selecionado!", "fork_success": "Tópico clonado com sucesso! Clique aqui para ir ao tópico clonado.", "composer.title_placeholder": "Digite aqui o título para o seu tópico...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Nome", "composer.discard": "Descartar", "composer.submit": "Enviar", "composer.replying_to": "Respondendo para %1", @@ -94,5 +94,5 @@ "oldest_to_newest": "Mais Antigo para Mais Recente", "newest_to_oldest": "Mais Recente para Mais Antigo", "most_votes": "Mais votados", - "most_posts": "Most posts" + "most_posts": "Mais posts" } \ No newline at end of file diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json index f4fe0a6602..86412afd5c 100644 --- a/public/language/pt_BR/user.json +++ b/public/language/pt_BR/user.json @@ -2,8 +2,8 @@ "banned": "Banido", "offline": "Offline", "username": "Nome de Usuário", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Data de Entrada", + "postcount": "Número de Posts", "email": "Email", "confirm_email": "Confirmar Email", "delete_account": "Deletar Conta", @@ -18,7 +18,7 @@ "profile_views": "Visualizações de perfil", "reputation": "Reputação", "favourites": "Favoritos", - "watched": "Watched", + "watched": "Acompanhado", "followers": "Seguidores", "following": "Seguindo", "signature": "Assinatura", @@ -59,12 +59,12 @@ "digest_weekly": "Semanalmente", "digest_monthly": "Mensalmente", "send_chat_notifications": "Enviar-me um email se uma nova mensagem de chat chegar quando eu não estiver online.", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "Enviar um email quando respostas forem dadas à tópicos que eu assino", "has_no_follower": "Este usuário não possui seguidores :(", "follows_no_one": "Este usuário não está seguindo ninguém :(", "has_no_posts": "Este usuário não postou nada ainda.", "has_no_topics": "Este usuário ainda não criou nenhum tópico.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Este usuário ainda não acompanhou quaisquer tópicos.", "email_hidden": "Email Escondido", "hidden": "escondido", "paginate_description": "Paginação de tópicos e posts ao invés de usar \"rolagem infinita\".", diff --git a/public/language/pt_BR/users.json b/public/language/pt_BR/users.json index 66ea217bd6..dc447048a0 100644 --- a/public/language/pt_BR/users.json +++ b/public/language/pt_BR/users.json @@ -6,7 +6,7 @@ "enter_username": "Digite um nome de usuário para procurar", "load_more": "Carregar Mais", "users-found-search-took": "%1 usuário(s) encontrado(s)! A pesquisa demorou %2 ms.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "filter-by": "Filtrar Por", + "online-only": "Apenas Online", + "picture-only": "Apenas foto" } \ No newline at end of file diff --git a/public/language/ro/error.json b/public/language/ro/error.json index ce47fad775..06cad8ebe8 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Nu poți conversa cu tine!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Sistemul de reputație este dezactivat.", "downvoting-disabled": "Votarea negativă este dezactivată", "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post.", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 8570dcc524..d23bdef9b6 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -18,7 +18,7 @@ "username-taken": "Имя пользователя занято", "email-taken": "Email занят", "email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Вы не можете оставлять сообщения, пока Ваш email не подтверждён", "username-too-short": "Слишком короткое имя пользователя", "username-too-long": "Имя пользователя слишком длинное", "user-banned": "Пользователь заблокирован", @@ -45,12 +45,12 @@ "already-unfavourited": "Вы уже удалили этот пост из избранного", "cant-ban-other-admins": "Вы не можете забанить других администраторов!", "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-extension": "Недопустимое расширение файла", "group-name-too-short": "Название группы слишком короткое", "group-already-exists": "Группа уже существует", "group-name-change-not-allowed": "Изменение названия группы запрещено", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Вы уже состоите в этой группе", + "group-needs-owner": "У группы должен быть как минимум один владелец", "post-already-deleted": "Этот пост уже удалён", "post-already-restored": "Этот пост уже восстановлен.", "topic-already-deleted": "Тема уже удалена", @@ -62,6 +62,7 @@ "signature-too-long": "Ваша подпись не может быть длиннее %1 симв.", "cant-chat-with-yourself": "Вы не можете общаться с самим собой", "chat-restricted": "Пользователь ограничил прием сообщений. Он должен подписаться на Вас, чтобы Вы могли вести переписку с ним.", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Система репутации отключена.", "downvoting-disabled": "Понижение оценки отключено", "not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки поста", diff --git a/public/language/ru/global.json b/public/language/ru/global.json index 8a4e0ad0ec..1983e9f1ab 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -4,7 +4,7 @@ "buttons.close": "Закрыть", "403.title": "Доступ запрещен", "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.login": "Возможно Вам следует войти под своим аккаунтом?", "404.title": "Страница не найдена", "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "500.title": "Внутренняя ошибка.", @@ -27,7 +27,7 @@ "header.tags": "Тэги", "header.popular": "Популярные", "header.users": "Пользователи", - "header.groups": "Groups", + "header.groups": "Группы", "header.chats": "Чаты", "header.notifications": "Уведомления", "header.search": "Поиск", diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json index 15bcdf5caa..55a2f35561 100644 --- a/public/language/ru/groups.json +++ b/public/language/ru/groups.json @@ -1,21 +1,21 @@ { "groups": "Группы", "view_group": "Просмотр группы", - "owner": "Group Owner", - "new_group": "Create New Group", + "owner": "Владелец группы", + "new_group": "Создать группу", "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "cover-instructions": "Перетяните сюда изображение, переместите на нужную позицию и нажмите Сохранить", "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "cover-save": "Сохранить", + "cover-saving": "Сохраняем", "details.title": "Информация о группе", "details.members": "Список пользователей", - "details.pending": "Pending Members", + "details.pending": "Заявки в группу", "details.has_no_posts": "Пользователями этой группы не публиковали никаких записей", "details.latest_posts": "Последние записи", - "details.private": "Private Group", - "details.public": "Public Group", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "Приватная группа", + "details.public": "Открытая группа", + "details.owner_options": "Настройки группы", + "event.updated": "Настройки группы обновлены", + "event.deleted": "Группа \"%1\" удалена" } \ No newline at end of file diff --git a/public/language/sc/error.json b/public/language/sc/error.json index a40a628042..6079502fae 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index b278526244..92f07fce4c 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Nemôžete chatovat so samým sebou.", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 28e67f55cf..d1d82a2f0d 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Signaturer kan tyvärr inte vara längre än %1 tecken.", "cant-chat-with-yourself": "Du kan inte chatta med dig själv.", "chat-restricted": "Denna användaren har begränsat sina chatt-meddelanden. Användaren måste följa dig innan ni kan chatta med varann", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Ryktessystemet är inaktiverat.", "downvoting-disabled": "Nedröstning är inaktiverat", "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet", diff --git a/public/language/th/error.json b/public/language/th/error.json index f65481696d..55dc809071 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Reputation system is disabled.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 4e509a438d..4ab34132fc 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -62,6 +62,7 @@ "signature-too-long": "İmza en fazla %1 karakter olabilir!", "cant-chat-with-yourself": "Kendinizle sohbet edemezsiniz!", "chat-restricted": "Bu kullanıcı sohbet ayarlarını kısıtlamış. Bu kişiye mesaj gönderebilmeniz için sizi takip etmeleri gerekiyor", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Saygınlık sistemi kapatılmış.", "downvoting-disabled": "Aşagı oylama kapatılmış", "not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok.", diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 002f910fc4..8dd065f637 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -62,6 +62,7 @@ "signature-too-long": "Chứ ký không được dài quá %1 ký tự", "cant-chat-with-yourself": "Bạn không thể chat với chính bạn!", "chat-restricted": "Người dùng này đã bật chế độ hạn chế tin nhắn chat. Bạn phải được anh/cô ta follow thì mới có thể gởi tin nhắn đến họ được.", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "Hệ thống tín nhiệm đã bị vô hiệu hóa.", "downvoting-disabled": "Downvote đã bị tắt", "not-enough-reputation-to-downvote": "Bạn không có đủ phiếu tín nhiệm để downvote bài này", diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index acab3971eb..eef3088946 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -62,6 +62,7 @@ "signature-too-long": "抱歉，您的签名不能超过 %1 个字符。", "cant-chat-with-yourself": "您不能和自己聊天！", "chat-restricted": "此用户限制了他的聊天消息。必须他先关注您，您才能和他聊天。", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "威望系统已禁用。", "downvoting-disabled": "反对功能已禁用", "not-enough-reputation-to-downvote": "您还没有足够的威望为此帖扣分", diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json index 32fdfd6f7f..5342050972 100644 --- a/public/language/zh_TW/error.json +++ b/public/language/zh_TW/error.json @@ -62,6 +62,7 @@ "signature-too-long": "對不起，簽名檔長度不能超過 %1 字元！", "cant-chat-with-yourself": "你不能與自己聊天！", "chat-restricted": "此用戶已限制了他的聊天功能。你要在他關注你之後，才能跟他聊天", + "too-many-messages": "You have sent too many messages, please wait awhile.", "reputation-system-disabled": "信譽系統已停用。", "downvoting-disabled": "Downvoting已停用", "not-enough-reputation-to-downvote": "你沒有足夠的信譽downvote這個帖子", From a46aaf2c8752e0fd05f01d2ed67dd4e9b9786908 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 1 Feb 2015 20:01:41 -0500 Subject: [PATCH 298/897] fixed #2681 --- src/file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.js b/src/file.js index 9433dfb40b..bf8aa05c02 100644 --- a/src/file.js +++ b/src/file.js @@ -18,7 +18,7 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) { is.on('end', function () { callback(null, { - url: nconf.get('upload_url') + folder + '/' + filename + url: nconf.get('url') + '/uploads/' + folder + '/' + filename }); }); From cfcfc8e0b15fcf1848bac28692b03f3d86910f78 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 1 Feb 2015 20:03:48 -0500 Subject: [PATCH 299/897] Revert "fixed #2681" This reverts commit a46aaf2c8752e0fd05f01d2ed67dd4e9b9786908. --- src/file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.js b/src/file.js index bf8aa05c02..9433dfb40b 100644 --- a/src/file.js +++ b/src/file.js @@ -18,7 +18,7 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) { is.on('end', function () { callback(null, { - url: nconf.get('url') + '/uploads/' + folder + '/' + filename + url: nconf.get('upload_url') + folder + '/' + filename }); }); From 6a837632fa37d01304dbdbaff8935013b7fe2136 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 1 Feb 2015 20:10:51 -0500 Subject: [PATCH 300/897] fix first post loading when pagination is enabled --- public/src/client/topic/posts.js | 17 +++++++---------- src/controllers/topics.js | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index ec566d9812..7bd7b714ae 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -14,11 +14,11 @@ define('forum/topic/posts', [ Posts.onNewPost = function(data) { var tid = ajaxify.variables.get('topic_id'); - if(data && data.posts && data.posts.length && parseInt(data.posts[0].tid, 10) !== parseInt(tid, 10)) { + if (data && data.posts && data.posts.length && parseInt(data.posts[0].tid, 10) !== parseInt(tid, 10)) { return; } - if(config.usePagination) { + if (config.usePagination) { return onNewPostPagination(data); } @@ -32,14 +32,11 @@ define('forum/topic/posts', [ function onNewPostPagination(data) { var posts = data.posts; - socket.emit('topics.getPageCount', ajaxify.variables.get('topic_id'), function(err, newPageCount) { - - if (pagination.currentPage === pagination.pageCount) { - createNewPosts(data); - } else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) { - pagination.loadPage(pagination.pageCount); - } - }); + if (pagination.currentPage === pagination.pageCount) { + createNewPosts(data); + } else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) { + pagination.loadPage(pagination.pageCount); + } } function createNewPosts(data, callback) { diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 6b3b42ab93..ffcca5ab46 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -54,7 +54,7 @@ topicsController.get = function(req, res, next) { var settings = results.settings; var postCount = parseInt(results.topic.postcount, 10); - var pageCount = Math.ceil((postCount - 1) / settings.postsPerPage); + var pageCount = Math.max(1, Math.ceil((postCount - 1) / settings.postsPerPage)); if (utils.isNumber(req.params.post_index)) { var url = ''; From b3278cf8e851f0ecd79d97b35f97d3e386529450 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 1 Feb 2015 20:21:18 -0500 Subject: [PATCH 301/897] fixed #2681 --- src/user/digest.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/user/digest.js b/src/user/digest.js index 62c8a11ae8..06ea1aa967 100644 --- a/src/user/digest.js +++ b/src/user/digest.js @@ -9,7 +9,8 @@ var async = require('async'), user = require('../user'), topics = require('../topics'), batch = require('../batch'), - emailer = require('../emailer'); + emailer = require('../emailer'), + utils = require('../../public/src/utils'); (function(Digest) { Digest.execute = function(interval) { @@ -31,6 +32,22 @@ var async = require('async'), return winston.error('[user/jobs] Could not send digests (' + interval + '): ' + err.message); } + // Fix relative paths in topic data + data.topics.topics = data.topics.topics.map(function(topicObj) { + if (topicObj.hasOwnProperty('teaser') && topicObj.teaser !== undefined) { + if (utils.isRelativeUrl(topicObj.teaser.user.picture)) { + topicObj.teaser.user.picture = nconf.get('url') + topicObj.teaser.user.picture; + } + } else { + if (utils.isRelativeUrl(topicObj.user.picture)) { + topicObj.user.picture = nconf.get('url') + topicObj.user.picture; + } + } + + return topicObj; + }); + return; + data.interval = interval; if (data.subscribers.length) { From 1b00d0f739ef627f3ca5811071c33d9fc05beb61 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 1 Feb 2015 20:29:57 -0500 Subject: [PATCH 302/897] fixed #2670 --- public/src/client/chats.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 56cba8c16e..607b84d4f3 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -18,10 +18,13 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S, } Chats.addEventListeners(); - Chats.resizeMainWindow(); - Chats.scrollToBottom(containerEl); Chats.setActive(); + $(window).on('action:ajaxify.end', function() { + Chats.resizeMainWindow(); + Chats.scrollToBottom(containerEl); + }); + Chats.initialised = true; }; From cc2ab12f299b0fa8ddc0833e590e07e00b455602 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 1 Feb 2015 21:38:10 -0500 Subject: [PATCH 303/897] removed bans from downvotes and flags cleanup thread tools emits --- public/src/client/categoryTools.js | 9 +--- public/src/client/topic/events.js | 2 +- src/socket.io/posts.js | 51 +------------------ src/socket.io/topics.js | 73 +++++++++++++-------------- src/threadTools.js | 79 +++++++++++------------------- src/views/admin/settings/user.tpl | 20 -------- 6 files changed, 71 insertions(+), 163 deletions(-) diff --git a/public/src/client/categoryTools.js b/public/src/client/categoryTools.js index b94954626a..0e9bae608b 100644 --- a/public/src/client/categoryTools.js +++ b/public/src/client/categoryTools.js @@ -199,13 +199,8 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect'], function(move getTopicEl(data.tid).remove(); } - function onTopicPurged(tids) { - if (!tids) { - return; - } - for(var i=0; i= parseInt(meta.config['autoban:downvote:threshold'], 10)) { - return callback(err); - } - - var adminUser = require('./admin/user'); - adminUser.banUser(uid, function(err) { - if (err) { - return callback(err); - } - events.log({ - type: 'banned', - reason: 'low-reputation', - uid: socket.uid, - ip: socket.ip, - targetUid: data.uid, - reputation: userData.reputation - }); - callback(); - }); - }); - } - } - - favouriteCommand(socket, 'downvote', 'voted', '', data, function(err) { - if (err) { - return callback(err); - } - banUserForLowReputation(data.uid, callback); - }); + favouriteCommand(socket, 'downvote', 'voted', '', data, callback); }; SocketPosts.unvote = function(socket, data, callback) { @@ -480,23 +449,7 @@ SocketPosts.flag = function(socket, pid, callback) { return next(); } - db.setAdd('uid:' + post.uid + ':flagged_by', socket.uid, function(err) { - if (err) { - return next(err); - } - db.setCount('uid:' + post.uid + ':flagged_by', function(err, count) { - if (err) { - return next(err); - } - - if (count >= (meta.config.flagsForBan || 3) && parseInt(meta.config.flagsForBan, 10) !== 0) { - var adminUser = require('./admin/user'); - adminUser.banUser(post.uid, next); - return; - } - next(); - }); - }); + db.setAdd('uid:' + post.uid + ':flagged_by', socket.uid, next); } ], callback); }; diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 687a7361a5..5cc6cb3bad 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -21,6 +21,7 @@ var nconf = require('nconf'), SocketTopics = {}; + SocketTopics.post = function(socket, data, callback) { if(!data) { return callback(new Error('[[error:invalid-data]]')); @@ -204,44 +205,34 @@ SocketTopics.markAsUnreadForAll = function(socket, tids, callback) { }; SocketTopics.delete = function(socket, data, callback) { - doTopicAction('delete', socket, data, callback); + doTopicAction('delete', 'event:topic_deleted', socket, data, callback); }; SocketTopics.restore = function(socket, data, callback) { - doTopicAction('restore', socket, data, callback); + doTopicAction('restore', 'event:topic_restored', socket, data, callback); }; SocketTopics.purge = function(socket, data, callback) { - doTopicAction('purge', socket, data, function(err) { - if (err) { - return callback(err); - } - - websockets.in('category_' + data.cid).emit('event:topic_purged', data.tids); - async.each(data.tids, function(tid, next) { - websockets.in('topic_' + tid).emit('event:topic_purged', tid); - next(); - }, callback); - }); + doTopicAction('purge', 'event:topic_purged', socket, data, callback); }; SocketTopics.lock = function(socket, data, callback) { - doTopicAction('lock', socket, data, callback); + doTopicAction('lock', 'event:topic_locked', socket, data, callback); }; SocketTopics.unlock = function(socket, data, callback) { - doTopicAction('unlock', socket, data, callback); + doTopicAction('unlock', 'event:topic_unlocked', socket, data, callback); }; SocketTopics.pin = function(socket, data, callback) { - doTopicAction('pin', socket, data, callback); + doTopicAction('pin', 'event:topic_pinned', socket, data, callback); }; SocketTopics.unpin = function(socket, data, callback) { - doTopicAction('unpin', socket, data, callback); + doTopicAction('unpin', 'event:topic_unpinned', socket, data, callback); }; -function doTopicAction(action, socket, data, callback) { +function doTopicAction(action, event, socket, data, callback) { if (!socket.uid) { return; } @@ -251,35 +242,45 @@ function doTopicAction(action, socket, data, callback) { async.each(data.tids, function(tid, next) { privileges.topics.canEdit(tid, socket.uid, function(err, canEdit) { - if(err) { + if (err) { return next(err); } - if(!canEdit) { + if (!canEdit) { return next(new Error('[[error:no-privileges]]')); } - if(typeof threadTools[action] === 'function') { - threadTools[action](tid, socket.uid, function(err) { - if (err) { - return next(err); - } - - if (action === 'delete' || action === 'restore' || action === 'purge') { - events.log({ - type: 'topic-' + action, - uid: socket.uid, - ip: socket.ip, - tid: tid - }); - } - next(); - }); + if (typeof threadTools[action] !== 'function') { + return next(); } + + threadTools[action](tid, socket.uid, function(err, data) { + if (err) { + return next(err); + } + + emitToTopicAndCategory(event, data); + + if (action === 'delete' || action === 'restore' || action === 'purge') { + events.log({ + type: 'topic-' + action, + uid: socket.uid, + ip: socket.ip, + tid: tid + }); + } + + next(); + }); }); }, callback); } +function emitToTopicAndCategory(event, data) { + websockets.in('topic_' + data.tid).emit(event, data); + websockets.in('category_' + data.cid).emit(event, data); +} + SocketTopics.createTopicFromPosts = function(socket, data, callback) { if(!socket.uid) { return callback(new Error('[[error:not-logged-in]]')); diff --git a/src/threadTools.js b/src/threadTools.js index 077abc54e6..1a62564434 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -11,7 +11,6 @@ var winston = require('winston'), notifications = require('./notifications'), posts = require('./posts'), meta = require('./meta'), - websockets = require('./socket.io'), events = require('./events'), plugins = require('./plugins'), batch = require('./batch'); @@ -39,12 +38,6 @@ var winston = require('winston'), } topics[isDelete ? 'delete' : 'restore'](tid, function(err) { - function emitTo(room) { - websockets.in(room).emit(isDelete ? 'event:topic_deleted' : 'event:topic_restored', { - tid: tid, - isDelete: isDelete - }); - } if (err) { return callback(err); } @@ -56,17 +49,20 @@ var winston = require('winston'), plugins.fireHook('action:topic.restore', topicData); } - emitTo('topic_' + tid); - emitTo('category_' + topicData.cid); + var data = { + tid: tid, + cid: topicData.cid, + isDelete: isDelete, + uid: uid + }; - callback(null, { - tid: tid - }); + callback(null, data); }); }); } ThreadTools.purge = function(tid, uid, callback) { + var topic; async.waterfall([ function(next) { topics.exists(tid, next); @@ -80,13 +76,17 @@ var winston = require('winston'), }, {alwaysStartAt: 0}, next); }, function(next) { - topics.getTopicField(tid, 'mainPid', next); + topics.getTopicFields(tid, ['mainPid', 'cid'], next); }, - function(mainPid, next) { - posts.purge(mainPid, next); + function(_topic, next) { + topic = _topic; + posts.purge(topic.mainPid, next); }, function(next) { topics.purge(tid, next); + }, + function(next) { + next(null, {tid: tid, cid: topic.cid, uid: uid}); } ], callback); }; @@ -100,35 +100,24 @@ var winston = require('winston'), }; function toggleLock(tid, uid, lock, callback) { + callback = callback || function() {}; topics.getTopicField(tid, 'cid', function(err, cid) { - function emitTo(room) { - websockets.in(room).emit(lock ? 'event:topic_locked' : 'event:topic_unlocked', { - tid: tid, - isLocked: lock - }); - } - - if (err && typeof callback === 'function') { + if (err) { return callback(err); } topics.setTopicField(tid, 'locked', lock ? 1 : 0); - plugins.fireHook('action:topic.lock', { + var data = { tid: tid, isLocked: lock, - uid: uid - }); + uid: uid, + cid: cid + }; - emitTo('topic_' + tid); - emitTo('category_' + cid); + plugins.fireHook('action:topic.lock', data); - if (typeof callback === 'function') { - callback(null, { - tid: tid, - isLocked: lock - }); - } + callback(null, data); }); } @@ -142,13 +131,6 @@ var winston = require('winston'), function togglePin(tid, uid, pin, callback) { topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) { - function emitTo(room) { - websockets.in(room).emit(pin ? 'event:topic_pinned' : 'event:topic_unpinned', { - tid: tid, - isPinned: pin - }); - } - if (err) { return callback(err); } @@ -156,19 +138,16 @@ var winston = require('winston'), topics.setTopicField(tid, 'pinned', pin ? 1 : 0); db.sortedSetAdd('cid:' + topicData.cid + ':tids', pin ? Math.pow(2, 53) : topicData.lastposttime, tid); - plugins.fireHook('action:topic.pin', { + var data = { tid: tid, isPinned: pin, - uid: uid - }); + uid: uid, + cid: topicData.cid + }; - emitTo('topic_' + tid); - emitTo('category_' + topicData.cid); + plugins.fireHook('action:topic.pin', data); - callback(null, { - tid: tid, - isPinned: pin - }); + callback(null, data); }); } diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl index 5f1bfd11f9..b44884ae81 100644 --- a/src/views/admin/settings/user.tpl +++ b/src/views/admin/settings/user.tpl @@ -97,26 +97,6 @@
    -
    -
    User Bans
    -
    -
    -
    - - -
    -
    -
    - -
    - - -
    -
    -
    -
    User Registration
    From 28c57b6635bbdf8a5270f651e2465ee070bcf965 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 2 Feb 2015 15:56:29 -0500 Subject: [PATCH 304/897] removed unused requires --- src/threadTools.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/threadTools.js b/src/threadTools.js index 1a62564434..96d8198291 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -1,17 +1,11 @@ 'use strict'; -var winston = require('winston'), - nconf = require('nconf'), - async = require('async'), +var async = require('async'), db = require('./database'), topics = require('./topics'), categories = require('./categories'), - user = require('./user'), - notifications = require('./notifications'), posts = require('./posts'), - meta = require('./meta'), - events = require('./events'), plugins = require('./plugins'), batch = require('./batch'); From 255f50343c50717f93e821a3fdec7661b757f9dc Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 3 Feb 2015 16:13:09 -0500 Subject: [PATCH 305/897] closes #2685 --- install/data/defaults.json | 4 ++++ public/language/en_GB/error.json | 1 + public/src/modules/composer.js | 2 ++ src/controllers/api.js | 1 + src/socket.io/posts.js | 2 ++ src/topics/create.js | 2 ++ src/views/admin/settings/post.tpl | 4 ++++ 7 files changed, 16 insertions(+) diff --git a/install/data/defaults.json b/install/data/defaults.json index 5507ad0822..778dee3838 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -27,6 +27,10 @@ "field": "minimumPostLength", "value": 8 }, + { + "field": "maximumPostLength", + "value": 32767 + }, { "field": "allowGuestSearching", "value": 0 diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 47b0bf8938..0258b28154 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -46,6 +46,7 @@ "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "invalid-title": "Invalid title!", diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 5a80616517..2836967416 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -406,6 +406,8 @@ define('composer', [ return composerAlert('[[error:invalid-title]]'); } else if (bodyEl.val().length < parseInt(config.minimumPostLength, 10)) { return composerAlert('[[error:content-too-short, ' + config.minimumPostLength + ']]'); + } else if (bodyEl.val().length > parseInt(config.maximumPostLength, 10)) { + return composerAlert('[[error:content-too-long, ' + config.maximumPostLength + ']]'); } var composerData = {}, action; diff --git a/src/controllers/api.js b/src/controllers/api.js index be4d8b2347..a3412e0d1d 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -23,6 +23,7 @@ apiController.getConfig = function(req, res, next) { config.minimumTitleLength = meta.config.minimumTitleLength; config.maximumTitleLength = meta.config.maximumTitleLength; config.minimumPostLength = meta.config.minimumPostLength; + config.minimumPostLength = meta.config.maximumPostLength; config.hasImageUploadPlugin = plugins.hasListeners('filter:uploadImage'); config.maximumProfileImageSize = meta.config.maximumProfileImageSize; config.minimumUsernameLength = meta.config.minimumUsernameLength; diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index d9f673067c..5baa38e9cb 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -261,6 +261,8 @@ SocketPosts.edit = function(socket, data, callback) { return callback(new Error('[[error:title-too-long, ' + meta.config.maximumTitleLength + ']]')); } else if (!data.content || data.content.length < parseInt(meta.config.minimumPostLength, 10)) { return callback(new Error('[[error:content-too-short, ' + meta.config.minimumPostLength + ']]')); + } else if (data.content.length > parseInt(meta.config.maximumPostLength, 10)) { + return callback(new Error('[[error:content-too-long, ' + meta.config.maximumPostLength + ']]')); } // uid, pid, title, content, options diff --git a/src/topics/create.js b/src/topics/create.js index b3038911c1..2eb882da80 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -289,6 +289,8 @@ module.exports = function(Topics) { function checkContentLength(content, callback) { if (!content || content.length < parseInt(meta.config.miminumPostLength, 10)) { return callback(new Error('[[error:content-too-short, ' + meta.config.minimumPostLength + ']]')); + } else if (content.length > parseInt(meta.config.maximumPostLength, 10)) { + return callback(new Error('[[error:content-too-long, ' + meta.config.maximumPostLength + ']]')); } callback(); } diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index 15f65ef531..3cb55eac0e 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -49,6 +49,10 @@
    +
    + + +
    + +
    + +
    From d3aa353d73d474ca26d5592e0451107f4360fc7f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 5 Feb 2015 20:38:43 -0500 Subject: [PATCH 328/897] dont crash if html is not string --- src/widgets.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/widgets.js b/src/widgets.js index 047befa8c2..c0234b2a28 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -44,6 +44,10 @@ var async = require('async'), return next(err); } + if (typeof html !== 'string') { + html = ''; + } + if (widget.data.container && widget.data.container.match('{body}')) { html = templates.parse(widget.data.container, { title: widget.data.title, From 9487f3a028843dd04310d4a790d763e93feadb35 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 5 Feb 2015 20:51:25 -0500 Subject: [PATCH 329/897] qs module changes categories param --- public/src/client/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index e832e6f6c6..974d9f1ab0 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -19,8 +19,8 @@ define('forum/search', ['search'], function(searchModule) { $('#posted-by-user').val(params.by); } - if (params && params['categories[]']) { - $('#posted-in-categories').val(params['categories[]']); + if (params && (params['categories[]'] || params.categories)) { + $('#posted-in-categories').val((params['categories[]'] || params.categories)); } if (params && params.searchChildren) { From d65546a34dc88b6901cc70e1387c86fa599db04a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 5 Feb 2015 21:08:52 -0500 Subject: [PATCH 330/897] search form fix --- public/src/client/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index 974d9f1ab0..7350d0b068 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -13,6 +13,7 @@ define('forum/search', ['search'], function(searchModule) { var searchIn = $('#advanced-search #search-in'); if (params && params.in) { searchIn.val(params.in); + $('.post-search-item').toggleClass('hide', params.in !== 'posts'); } if (params && params.by) { @@ -20,7 +21,7 @@ define('forum/search', ['search'], function(searchModule) { } if (params && (params['categories[]'] || params.categories)) { - $('#posted-in-categories').val((params['categories[]'] || params.categories)); + $('#posted-in-categories').val(params['categories[]'] || params.categories); } if (params && params.searchChildren) { @@ -34,7 +35,6 @@ define('forum/search', ['search'], function(searchModule) { searchIn.on('change', function() { $('.post-search-item').toggleClass('hide', searchIn.val() !== 'posts'); - }); highlightMatches(searchQuery); From 92c869e8861d47bddc810480b94bd3e10a71aaa5 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 5 Feb 2015 23:18:53 -0500 Subject: [PATCH 331/897] try to get ip from x-forwarded-for first --- src/socket.io/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 9274f72222..8144fbc835 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -40,7 +40,7 @@ Sockets.init = function(server) { }; function onConnection(socket) { - socket.ip = socket.request.connection.remoteAddress; + socket.ip = socket.request.headers['x-forwarded-for'] || socket.request.connection.remoteAddress; logger.io_one(socket, socket.uid); From 652e247d1bc7b4ee12155c01267afa8de1f00c71 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 5 Feb 2015 23:21:31 -0500 Subject: [PATCH 332/897] fix username change event log --- src/user/profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/profile.js b/src/user/profile.js index 461f1d9bb8..829c143505 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -100,7 +100,7 @@ module.exports = function(User) { return callback(err); } plugins.fireHook('action:user.updateProfile', {data: data, uid: uid}); - User.getUserFields(uid, ['email', 'userslug', 'picture', 'gravatarpicture'], callback); + User.getUserFields(uid, ['email', 'username', 'userslug', 'picture', 'gravatarpicture'], callback); }); }); From ba6af71150ad8c8192f144f85c688f2f67bd0019 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 5 Feb 2015 23:37:11 -0500 Subject: [PATCH 333/897] fix profile update --- src/socket.io/user.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/socket.io/user.js b/src/socket.io/user.js index d879813bae..b1e1512526 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -168,6 +168,7 @@ SocketUser.updateProfile = function(socket, data, callback) { newUsername: userData.username }); } + callback(null, userData); } if (socket.uid === parseInt(data.uid, 10)) { @@ -175,12 +176,8 @@ SocketUser.updateProfile = function(socket, data, callback) { } user.isAdministrator(socket.uid, function(err, isAdmin) { - if (err) { - return callback(err); - } - - if (!isAdmin) { - return callback(new Error('[[error:no-privileges]]')); + if (err || !isAdmin) { + return callback(err || new Error('[[error:no-privileges]]')); } user.updateProfile(data.uid, data, done); From 722b6295725e088309ad1c352e305b691290e92f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 6 Feb 2015 14:16:33 -0500 Subject: [PATCH 334/897] closes #2703 --- src/plugins/hooks.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js index 1d6c6f8e7b..00f6cc9f00 100644 --- a/src/plugins/hooks.js +++ b/src/plugins/hooks.js @@ -132,6 +132,7 @@ module.exports = function(Plugins) { }); } catch(err) { winston.error('[plugins] Error executing \'' + hook + '\' in plugin \'' + hookObj.id + '\''); + winston.error(err); clearTimeout(timeoutId); next(); } From 38dd3d428192e63ebb3202bef7c83fce0b2d8741 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 6 Feb 2015 19:47:27 -0500 Subject: [PATCH 335/897] search newer/older than and better pagination --- public/language/en_GB/search.json | 13 ++- public/src/client/search.js | 59 ++++++---- public/src/modules/search.js | 5 + src/controllers/categories.js | 3 +- src/controllers/search.js | 12 +- src/controllers/topics.js | 7 +- src/pagination.js | 13 +-- src/search.js | 175 +++++++++++++++++++++++++++--- src/user/search.js | 2 +- 9 files changed, 229 insertions(+), 60 deletions(-) diff --git a/public/language/en_GB/search.json b/public/language/en_GB/search.json index c68ead290b..4f099ef554 100644 --- a/public/language/en_GB/search.json +++ b/public/language/en_GB/search.json @@ -8,5 +8,16 @@ "search-child-categories": "Search child categories", "reply-count": "Reply Count", "at-least": "At least", - "at-most": "At most" + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year" } diff --git a/public/src/client/search.js b/public/src/client/search.js index 7350d0b068..029f7b811a 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -9,29 +9,10 @@ define('forum/search', ['search'], function(searchModule) { var searchQuery = $('#results').attr('data-search-query'); $('#advanced-search #search-input').val(searchQuery); - var params = utils.params(); - var searchIn = $('#advanced-search #search-in'); - if (params && params.in) { - searchIn.val(params.in); - $('.post-search-item').toggleClass('hide', params.in !== 'posts'); - } - - if (params && params.by) { - $('#posted-by-user').val(params.by); - } - - if (params && (params['categories[]'] || params.categories)) { - $('#posted-in-categories').val(params['categories[]'] || params.categories); - } - if (params && params.searchChildren) { - $('#search-children').prop('checked', true); - } + var searchIn = $('#advanced-search #search-in'); - if (params && params.replies) { - $('#reply-count').val(params.replies); - $('#reply-count-filter').val(params.repliesFilter); - } + fillOutFormFromQueryParams(); searchIn.on('change', function() { $('.post-search-item').toggleClass('hide', searchIn.val() !== 'posts'); @@ -50,7 +31,9 @@ define('forum/search', ['search'], function(searchModule) { categories: $(this).find('#posted-in-categories').val(), searchChildren: $(this).find('#search-children').is(':checked'), replies: $(this).find('#reply-count').val(), - repliesFilter: $(this).find('#reply-count-filter').val() + repliesFilter: $(this).find('#reply-count-filter').val(), + timeFilter: $(this).find('#post-time-filter').val(), + timeRange: $(this).find('#post-time-range').val() }, function() { input.val(''); }); @@ -59,6 +42,38 @@ define('forum/search', ['search'], function(searchModule) { enableAutoComplete(); }; + function fillOutFormFromQueryParams() { + var params = utils.params(); + if (params) { + if (params.in) { + $('#search-in').val(params.in); + $('.post-search-item').toggleClass('hide', params.in !== 'posts'); + } + + if (params.by) { + $('#posted-by-user').val(params.by); + } + + if ((params['categories[]'] || params.categories)) { + $('#posted-in-categories').val(params['categories[]'] || params.categories); + } + + if (params.searchChildren) { + $('#search-children').prop('checked', true); + } + + if (params.replies) { + $('#reply-count').val(params.replies); + $('#reply-count-filter').val(params.repliesFilter); + } + + if (params.timeRange) { + $('#post-time-range').val(params.timeRange); + $('#post-time-filter').val(params.timeFilter); + } + } + } + function highlightMatches(searchQuery) { var searchTerms = searchQuery.split(' '); var regexes = []; diff --git a/public/src/modules/search.js b/public/src/modules/search.js index b8f4eb6607..2b90ab290a 100644 --- a/public/src/modules/search.js +++ b/public/src/modules/search.js @@ -40,6 +40,11 @@ define('search', ['navigator'], function(nav) { query.repliesFilter = data.repliesFilter || 'atleast'; } + if (data.timeRange) { + query.timeRange = data.timeRange; + query.timeFilter = data.timeFilter || 'newer'; + } + ajaxify.go('search/' + term + '?' + decodeURIComponent($.param(query))); callback(); } else { diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 1783fd69b3..25690a6810 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -260,8 +260,7 @@ categoriesController.get = function(req, res, next) { data.currentPage = page; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; data['rssFeedUrl'] = nconf.get('relative_path') + '/category/' + data.cid + '.rss'; - - pagination.create(data.currentPage, data.pageCount, data); + data.pagination = pagination.create(data.currentPage, data.pageCount); data.pagination.rel.forEach(function(rel) { res.locals.linkTags.push(rel); diff --git a/src/controllers/search.js b/src/controllers/search.js index d21977b69d..2c0222a6b3 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -37,6 +37,7 @@ searchController.search = function(req, res, next) { } req.params.term = validator.escape(req.params.term); + var page = Math.max(1, parseInt(req.query.page, 10)) || 1; search.search({ query: req.params.term, @@ -46,18 +47,17 @@ searchController.search = function(req, res, next) { searchChildren: req.query.searchChildren, replies: req.query.replies, repliesFilter: req.query.repliesFilter, + timeRange: req.query.timeRange, + timeFilter: req.query.timeFilter, + page: page, uid: uid }, function(err, results) { if (err) { return next(err); } - var currentPage = Math.max(1, parseInt(req.query.page, 10)) || 1; - var pageCount = Math.max(1, Math.ceil(results.matchCount / 10)); - var searchIn = req.query.in || 'posts'; - var start = Math.max(0, (currentPage - 1)) * 10; - results[searchIn] = results[searchIn].slice(start, start + 10); - pagination.create(currentPage, pageCount, results, req.query); + var pageCount = Math.max(1, Math.ceil(results.matchCount / 10)); + results.pagination = pagination.create(page, pageCount, req.query); results.breadcrumbs = breadcrumbs; results.categories = categories; diff --git a/src/controllers/topics.js b/src/controllers/topics.js index ffcca5ab46..f470cfc6d1 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -256,15 +256,12 @@ topicsController.get = function(req, res, next) { data['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; data['rssFeedUrl'] = nconf.get('relative_path') + '/topic/' + data.tid + '.rss'; - - topics.increaseViewCount(tid); - - pagination.create(data.currentPage, data.pageCount, data); - + data.pagination = pagination.create(data.currentPage, data.pageCount); data.pagination.rel.forEach(function(rel) { res.locals.linkTags.push(rel); }); + topics.increaseViewCount(tid); res.render('topic', data); }); }; diff --git a/src/pagination.js b/src/pagination.js index 9fadfceab4..d3a3ca9dd9 100644 --- a/src/pagination.js +++ b/src/pagination.js @@ -4,15 +4,14 @@ var qs = require('querystring'); var pagination = {}; -pagination.create = function(currentPage, pageCount, data, queryObj) { +pagination.create = function(currentPage, pageCount, queryObj) { if (pageCount <= 1) { - data.pagination = { + return { prev: {page: 1, active: currentPage > 1}, next: {page: 1, active: currentPage < pageCount}, rel: [], pages: [] }; - return; } var pagesToShow = [1]; @@ -43,7 +42,7 @@ pagination.create = function(currentPage, pageCount, data, queryObj) { return {page: page, active: page === currentPage, qs: qs.stringify(queryObj)}; }); - data.pagination = { + var data = { prev: {page: previous, active: currentPage > 1}, next: {page: next, active: currentPage < pageCount}, rel: [], @@ -51,19 +50,19 @@ pagination.create = function(currentPage, pageCount, data, queryObj) { }; if (currentPage < pageCount) { - data.pagination.rel.push({ + data.rel.push({ rel: 'next', href: '?page=' + next }); } if (currentPage > 1) { - data.pagination.rel.push({ + data.rel.push({ rel: 'prev', href: '?page=' + previous }); } - + return data; }; diff --git a/src/search.js b/src/search.js index 9f260cd7cc..86f39f6b52 100644 --- a/src/search.js +++ b/src/search.js @@ -1,6 +1,8 @@ 'use strict'; var async = require('async'), + + db = require('./database'), posts = require('./posts'), topics = require('./topics'), categories = require('./categories'), @@ -19,8 +21,8 @@ search.search = function(data, callback) { } result.search_query = query; - result[searchIn] = data; - result.matchCount = data.length; + result[searchIn] = data.matches; + result.matchCount = data.matchCount; result.hidePostedBy = searchIn !== 'posts'; result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2); callback(null, result); @@ -65,8 +67,9 @@ function searchInPosts(query, data, callback) { return callback(err); } + var matchCount = 0; if (!results || (!results.pids.length && !results.tids.length)) { - return callback(null, []); + return callback(null, {matches: [], matchCount: matchCount}); } async.waterfall([ @@ -82,31 +85,162 @@ function searchInPosts(query, data, callback) { privileges.posts.filter('read', mainPids, data.uid, next); }, function(pids, next) { + filterAndSort(pids, data, results.searchCategories, next); + }, + function(pids, next) { + matchCount = pids.length; + if (data.page) { + var start = Math.max(0, (data.page - 1)) * 10; + pids = pids.slice(start, start + 10); + } + posts.getPostSummaryByPids(pids, data.uid, {stripTags: true, parse: false}, next); }, function(posts, next) { - posts = filterPosts(data, results.searchCategories, posts); - next(null, posts); + next(null, {matches: posts, matchCount: matchCount}); } ], callback); }); } -function filterPosts(data, searchCategories, posts) { - var postedBy = data.postedBy; - var isAtLeast = data.repliesFilter === 'atleast'; - data.replies = parseInt(data.replies, 10); - if (postedBy || searchCategories.length || data.replies) { +function filterAndSort(pids, data, searchCategories, callback) { + var postFields = ['pid', 'tid', 'timestamp']; + var topicFields = []; + + if (data.postedBy) { + postFields.push('uid'); + } + + if (searchCategories.length) { + topicFields.push('cid'); + } + + if (data.replies) { + topicFields.push('postcount'); + } + + async.parallel({ + posts: function(next) { + getMatchedPosts(pids, postFields, topicFields, next); + }, + postedByUid: function(next) { + if (data.postedBy) { + user.getUidByUsername(data.postedBy, next); + } else { + next(); + } + } + }, function(err, results) { + if (err) { + return callback(err); + } + if (!results.posts) { + return callback(null, pids); + } + var posts = results.posts.filter(Boolean); + + posts = filterByUser(posts, results.postedByUid); + posts = filterByCategories(posts, searchCategories); + posts = filterByPostcount(posts, data.replies, data.repliesFilter); + posts = filterByTimerange(posts, data.timeRange, data.timeFilter); + + sortPosts(posts, data); + + pids = posts.map(function(post) { + return post && post.pid; + }); + + callback(null, pids); + }); +} + +function getMatchedPosts(pids, postFields, topicFields, callback) { + var keys = pids.map(function(pid) { + return 'post:' + pid; + }); + var posts; + async.waterfall([ + function(next) { + db.getObjectsFields(keys, postFields, next); + }, + function(_posts, next) { + posts = _posts; + if (!topicFields.length) { + return callback(null, posts); + } + var topicKeys = posts.map(function(post) { + return 'topic:' + post.tid; + }); + db.getObjectsFields(topicKeys, topicFields, next); + }, + function(topics, next) { + posts.forEach(function(post, index) { + post.topic = topics[index]; + }); + + next(null, posts); + } + ], callback); +} + +function filterByUser(posts, postedByUid) { + if (postedByUid) { + postedByUid = parseInt(postedByUid, 10); + posts = posts.filter(function(post) { + return parseInt(post.uid, 10) === postedByUid; + }); + } + return posts; +} + +function filterByCategories(posts, searchCategories) { + if (searchCategories.length) { posts = posts.filter(function(post) { - return post && - (postedBy ? post.user && (post.user.username === postedBy) : true) && - (searchCategories.length ? (post.category && searchCategories.indexOf(post.category.cid) !== -1) : true) && - (data.replies ? (isAtLeast ? post.topic.postcount >= data.replies : post.topic.postcount <= data.replies) : true); + return post.topic && searchCategories.indexOf(post.topic.cid) !== -1; }); } return posts; } +function filterByPostcount(posts, postCount, repliesFilter) { + postCount = parseInt(postCount, 10); + if (postCount) { + if (repliesFilter === 'atleast') { + posts = posts.filter(function(post) { + return post.topic && post.topic.postcount >= postCount; + }); + } else { + posts = posts.filter(function(post) { + return post.topic && post.topic.postcount <= postCount; + }); + } + } + return posts; +} + +function filterByTimerange(posts, timeRange, timeFilter) { + timeRange = parseInt(timeRange) * 1000; + if (timeRange) { + var time = Date.now() - timeRange; + if (timeFilter === 'newer') { + posts = posts.filter(function(post) { + return post.timestamp >= time; + }); + } else { + posts = posts.filter(function(post) { + return post.timestamp <= time; + }); + } + } + return posts; +} + +function sortPosts(posts, data) { + posts.sort(function(p1, p2) { + return p2.timestamp - p1.timestamp; + }); +} + function getSearchCategories(data, callback) { if (!Array.isArray(data.categories) || !data.categories.length || data.categories.indexOf('all') !== -1) { return callback(null, []); @@ -159,12 +293,21 @@ function getChildrenCids(cids, uid, callback) { function searchInUsers(query, callback) { user.search({query: query}, function(err, results) { - callback(err, results ? results.users : null); + if (err) { + return callback(err); + } + callback(null, {matches: results.users, matchCount: results.matchCount}); }); } function searchInTags(query, callback) { - topics.searchAndLoadTags({query: query}, callback); + topics.searchAndLoadTags({query: query}, function(err, tags) { + if (err) { + return callback(err); + } + + callback(null, {matches: tags, matchCount: tags.length}); + }); } function getMainPids(tids, callback) { diff --git a/src/user/search.js b/src/user/search.js index 95130bf68f..ebfb08551f 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -60,7 +60,7 @@ module.exports = function(User) { var currentPage = Math.max(1, Math.ceil((start + 1) / resultsPerPage)); pageCount = Math.ceil(matchCount / resultsPerPage); - pagination.create(currentPage, pageCount, data); + data.pagination = pagination.create(currentPage, pageCount); next(null, data); } From ff5eeb3a853e5e6b10280e33de4268f0a39ba35c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 6 Feb 2015 20:42:20 -0500 Subject: [PATCH 336/897] fixed #2704 --- src/controllers/groups.js | 42 ++++++++++++++++++++++----------------- src/groups.js | 4 ++++ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/controllers/groups.js b/src/controllers/groups.js index c5d430b28d..de8af88e07 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -27,26 +27,32 @@ groupsController.list = function(req, res, next) { groupsController.details = function(req, res, next) { var uid = req.user ? parseInt(req.user.uid, 10) : 0; - async.parallel({ - group: function(next) { - groups.getByGroupslug(req.params.slug, { - expand: true, - uid: uid - }, next); - }, - posts: function(next) { - groups.getLatestMemberPosts(req.params.slug, 10, uid, next); - } - }, function(err, results) { - if (err) { - return next(err); - } + groups.existsBySlug(req.params.slug, function(err, exists) { + if (exists) { + async.parallel({ + group: function(next) { + groups.getByGroupslug(req.params.slug, { + expand: true, + uid: uid + }, next); + }, + posts: function(next) { + groups.getLatestMemberPosts(req.params.slug, 10, uid, next); + } + }, function(err, results) { + if (err) { + return next(err); + } - if (!results.group) { - return helpers.notFound(req, res); - } + if (!results.group) { + return helpers.notFound(req, res); + } - res.render('groups/details', results); + res.render('groups/details', results); + }); + } else { + return res.locals.isAPI ? res.status(302).json('/groups') : res.redirect('/groups'); + } }); }; diff --git a/src/groups.js b/src/groups.js index 38c8704813..54b1332a4b 100644 --- a/src/groups.js +++ b/src/groups.js @@ -422,6 +422,10 @@ var async = require('async'), } }; + Groups.existsBySlug = function(slug, callback) { + db.isObjectField('groupslug:groupname', slug, callback); + }; + Groups.create = function(data, callback) { if (data.name.length === 0) { return callback(new Error('[[error:group-name-too-short]]')); From c85958626990ab0e1cf9795e9697f9ef7d63df55 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 00:12:47 -0500 Subject: [PATCH 337/897] calculate topic post indices instead of querying db --- src/controllers/topics.js | 8 +++----- src/topics.js | 30 ++++++++++-------------------- src/topics/posts.js | 36 +++++++++++++++++++++++++++++------- 3 files changed, 42 insertions(+), 32 deletions(-) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index f470cfc6d1..83d873b583 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -116,15 +116,13 @@ topicsController.get = function(req, res, next) { } topicData.pageCount = pageCount; - topicData.currentPage = page; - if(page > 1) { + + if (page > 1) { topicData.posts.splice(0, 1); } - plugins.fireHook('filter:controllers.topic.get', topicData, function(err, topicData) { - next(null, topicData); - }); + plugins.fireHook('filter:controllers.topic.get', topicData, next); }); }, function (topicData, next) { diff --git a/src/topics.js b/src/topics.js index 1e9df9958f..692088ec52 100644 --- a/src/topics.js +++ b/src/topics.js @@ -215,25 +215,11 @@ var async = require('async'), } async.parallel({ + mainPost: function(next) { + Topics.getMainPost(tid, uid, next); + }, posts: function(next) { - posts.getPidsFromSet(set, start, end, reverse, function(err, pids) { - if (err) { - return next(err); - } - - pids = topicData.mainPid ? [topicData.mainPid].concat(pids) : pids; - - if (!pids.length) { - return next(null, []); - } - posts.getPostsByPids(pids, uid, function(err, posts) { - if (err) { - return next(err); - } - - Topics.addPostData(posts, uid, next); - }); - }); + Topics.getTopicPosts(tid, set, start, end, uid, reverse, next); }, category: async.apply(Topics.getCategoryData, tid), threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', []), @@ -244,7 +230,7 @@ var async = require('async'), return callback(err); } - topicData.posts = results.posts; + topicData.posts = results.mainPost ? [results.mainPost].concat(results.posts) : results.posts; topicData.category = results.category; topicData.thread_tools = results.threadTools; topicData.tags = results.tags; @@ -280,7 +266,11 @@ var async = require('async'), if (err) { return callback(err); } - + postData.forEach(function(post) { + if (post) { + post.index = 0; + } + }); Topics.addPostData(postData, uid, callback); }); }); diff --git a/src/topics/posts.js b/src/topics/posts.js index d4809f2a79..6d4cd9be8f 100644 --- a/src/topics/posts.js +++ b/src/topics/posts.js @@ -29,15 +29,28 @@ module.exports = function(Topics) { ], callback); }; - Topics.getTopicPosts = function(tid, set, start, end, uid, reverse, callback) { callback = callback || function() {}; - posts.getPostsByTid(tid, set, start, end, uid, reverse, function(err, postData) { + async.parallel({ + posts: function(next) { + posts.getPostsByTid(tid, set, start, end, uid, reverse, next); + }, + postCount: function(next) { + Topics.getTopicField(tid, 'postcount', next); + } + }, function(err, results) { if (err) { return callback(err); } - Topics.addPostData(postData, uid, callback); + var indices = Topics.calculatePostIndices(start, end, results.postCount, reverse); + results.posts.forEach(function(post, index) { + if (post) { + post.index = indices[index]; + } + }); + + Topics.addPostData(results.posts, uid, callback); }); }; @@ -103,9 +116,6 @@ module.exports = function(Topics) { }, privileges: function(next) { privileges.posts.get(pids, uid, next); - }, - indices: function(next) { - posts.getPostIndices(postData, uid, next); } }, function(err, results) { if (err) { @@ -114,7 +124,6 @@ module.exports = function(Topics) { postData.forEach(function(postObj, i) { if (postObj) { - postObj.index = results.indices[i]; postObj.deleted = parseInt(postObj.deleted, 10) === 1; postObj.user = parseInt(postObj.uid, 10) ? results.userData[postObj.uid] : _.clone(results.userData[postObj.uid]); postObj.editor = postObj.editor ? results.editors[postObj.editor] : null; @@ -141,6 +150,19 @@ module.exports = function(Topics) { }); }; + Topics.calculatePostIndices = function(start, end, postCount, reverse) { + var indices = []; + var count = end - start + 1; + for(var i=0; i Date: Sat, 7 Feb 2015 00:19:22 -0500 Subject: [PATCH 338/897] pass on mainPid --- src/topics.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/topics.js b/src/topics.js index 692088ec52..a0aeed33db 100644 --- a/src/topics.js +++ b/src/topics.js @@ -216,7 +216,7 @@ var async = require('async'), async.parallel({ mainPost: function(next) { - Topics.getMainPost(tid, uid, next); + getMainPosts([topicData.mainPid], uid, next); }, posts: function(next) { Topics.getTopicPosts(tid, set, start, end, uid, reverse, next); @@ -230,7 +230,7 @@ var async = require('async'), return callback(err); } - topicData.posts = results.mainPost ? [results.mainPost].concat(results.posts) : results.posts; + topicData.posts = Array.isArray(results.mainPost) && results.mainPost.length ? [results.mainPost[0]].concat(results.posts) : results.posts; topicData.category = results.category; topicData.thread_tools = results.threadTools; topicData.tags = results.tags; @@ -262,19 +262,23 @@ var async = require('async'), return topic ? topic.mainPid : null; }); - posts.getPostsByPids(mainPids, uid, function(err, postData) { - if (err) { - return callback(err); + getMainPosts(mainPids, uid, callback); + }); + }; + + function getMainPosts(mainPids, uid, callback) { + posts.getPostsByPids(mainPids, uid, function(err, postData) { + if (err) { + return callback(err); + } + postData.forEach(function(post) { + if (post) { + post.index = 0; } - postData.forEach(function(post) { - if (post) { - post.index = 0; - } - }); - Topics.addPostData(postData, uid, callback); }); + Topics.addPostData(postData, uid, callback); }); - }; + } Topics.getTopicField = function(tid, field, callback) { db.getObjectField('topic:' + tid, field, callback); From 8bbd7d971b83371c1d61d7e9f47c1a4b41c99f7c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 00:52:53 -0500 Subject: [PATCH 339/897] fix index to post if sorting is by votes and pagination is used --- src/controllers/topics.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 83d873b583..498a3d81db 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -89,17 +89,23 @@ topicsController.get = function(req, res, next) { var postIndex = 0; page = parseInt(req.query.page, 10) || 1; req.params.post_index = parseInt(req.params.post_index, 10) || 0; + if (reverse && req.params.post_index === 1) { + req.params.post_index = 0; + } if (!settings.usePagination) { if (reverse) { - if (req.params.post_index === 1) { - req.params.post_index = 0; - } - postIndex = Math.max(postCount - (req.params.post_index || postCount) - (settings.postsPerPage - 1), 0); + postIndex = Math.max(0, postCount - (req.params.post_index || postCount) - (settings.postsPerPage - 1)); } else { - postIndex = Math.max((req.params.post_index || 1) - (settings.postsPerPage + 1), 0); + postIndex = Math.max(0, (req.params.post_index || 1) - (settings.postsPerPage + 1)); } } else if (!req.query.page) { - var index = Math.max(req.params.post_index - 1, 0) || 0; + var index = 0; + if (reverse) { + index = Math.max(0, postCount - (req.params.post_index || postCount)); + } else { + index = Math.max(0, req.params.post_index - 1) || 0; + } + page = Math.max(1, Math.ceil(index / settings.postsPerPage)); } From eff1256dfbde2e2721766e661fe386593e87928a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 20:00:07 -0500 Subject: [PATCH 340/897] search sort, search in posts, titles, posts& titles --- public/language/en_GB/search.json | 15 +- public/src/app.js | 2 +- public/src/client/search.js | 41 +++-- public/src/modules/search.js | 58 ++++--- src/controllers/search.js | 3 +- src/search.js | 244 +++++++++++++++++++++++++----- 6 files changed, 286 insertions(+), 77 deletions(-) diff --git a/public/language/en_GB/search.json b/public/language/en_GB/search.json index 4f099ef554..b8a970d6a9 100644 --- a/public/language/en_GB/search.json +++ b/public/language/en_GB/search.json @@ -3,6 +3,8 @@ "no-matches": "No matches found", "in": "In", "by": "By", + "titles": "Titles", + "titles-posts": "Titles and Posts", "posted-by": "Posted by", "in-categories": "In Categories", "search-child-categories": "Search child categories", @@ -19,5 +21,16 @@ "one-month": "One month", "three-months": "Three months", "six-months": "Six months", - "one-year": "One year" + "one-year": "One year", + "sort-by": "Sort by", + "post-time": "Post time", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } diff --git a/public/src/app.js b/public/src/app.js index 35037c8033..1e5b92cf4d 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -436,7 +436,7 @@ app.uid = null; e.preventDefault(); var input = $(this).find('input'); - search.query({term: input.val(), in: 'posts'}, function() { + search.query({term: input.val()}, function() { input.val(''); }); }); diff --git a/public/src/client/search.js b/public/src/client/search.js index 029f7b811a..691ab51281 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -15,26 +15,31 @@ define('forum/search', ['search'], function(searchModule) { fillOutFormFromQueryParams(); searchIn.on('change', function() { - $('.post-search-item').toggleClass('hide', searchIn.val() !== 'posts'); + updateFormItemVisiblity(searchIn.val()); }); highlightMatches(searchQuery); $('#advanced-search').off('submit').on('submit', function(e) { e.preventDefault(); - var input = $(this).find('#search-input'); + var $this = $(this) + var input = $this.find('#search-input'); - searchModule.query({ + var searchData = { term: input.val(), - in: $(this).find('#search-in').val(), - by: $(this).find('#posted-by-user').val(), - categories: $(this).find('#posted-in-categories').val(), - searchChildren: $(this).find('#search-children').is(':checked'), - replies: $(this).find('#reply-count').val(), - repliesFilter: $(this).find('#reply-count-filter').val(), - timeFilter: $(this).find('#post-time-filter').val(), - timeRange: $(this).find('#post-time-range').val() - }, function() { + in: $this.find('#search-in').val(), + by: $this.find('#posted-by-user').val(), + categories: $this.find('#posted-in-categories').val(), + searchChildren: $this.find('#search-children').is(':checked'), + replies: $this.find('#reply-count').val(), + repliesFilter: $this.find('#reply-count-filter').val(), + timeFilter: $this.find('#post-time-filter').val(), + timeRange: $this.find('#post-time-range').val(), + sortBy: $this.find('#post-sort-by').val(), + sortDirection: $this.find('#post-sort-direction').val() + }; + + searchModule.query(searchData, function() { input.val(''); }); }); @@ -42,12 +47,17 @@ define('forum/search', ['search'], function(searchModule) { enableAutoComplete(); }; + function updateFormItemVisiblity(searchIn) { + var hide = searchIn.indexOf('posts') === -1 && searchIn.indexOf('titles') === -1; + $('.post-search-item').toggleClass('hide', hide); + } + function fillOutFormFromQueryParams() { var params = utils.params(); if (params) { if (params.in) { $('#search-in').val(params.in); - $('.post-search-item').toggleClass('hide', params.in !== 'posts'); + updateFormItemVisiblity(params.in); } if (params.by) { @@ -71,6 +81,11 @@ define('forum/search', ['search'], function(searchModule) { $('#post-time-range').val(params.timeRange); $('#post-time-filter').val(params.timeFilter); } + + if (params.sortBy) { + $('#post-sort-by').val(params.sortBy); + $('#post-sort-direction').val(params.sortDirection); + } } } diff --git a/public/src/modules/search.js b/public/src/modules/search.js index 2b90ab290a..9b896b0394 100644 --- a/public/src/modules/search.js +++ b/public/src/modules/search.js @@ -9,8 +9,6 @@ define('search', ['navigator'], function(nav) { Search.query = function(data, callback) { var term = data.term; - var searchIn = data.in || 'posts'; - var postedBy = data.by || ''; // Detect if a tid was specified var topicSearch = term.match(/in:topic-([\d]+)/); @@ -23,29 +21,8 @@ define('search', ['navigator'], function(nav) { } catch(e) { return app.alertError('[[error:invalid-search-term]]'); } - var query = {in: searchIn}; - if (postedBy && searchIn === 'posts') { - query.by = postedBy; - } - - if (data.categories && data.categories.length) { - query.categories = data.categories; - if (data.searchChildren) { - query.searchChildren = data.searchChildren; - } - } - - if (parseInt(data.replies, 10) > 0) { - query.replies = data.replies; - query.repliesFilter = data.repliesFilter || 'atleast'; - } - if (data.timeRange) { - query.timeRange = data.timeRange; - query.timeFilter = data.timeFilter || 'newer'; - } - - ajaxify.go('search/' + term + '?' + decodeURIComponent($.param(query))); + ajaxify.go('search/' + term + '?' + createQueryString(data)); callback(); } else { var cleanedTerm = term.replace(topicSearch[0], ''), @@ -55,6 +32,39 @@ define('search', ['navigator'], function(nav) { } }; + function createQueryString(data) { + var searchIn = data.in || 'titlesposts'; + var postedBy = data.by || ''; + var query = {in: searchIn}; + + if (postedBy && (searchIn === 'posts' || searchIn === 'titles' || searchIn === 'titlesposts')) { + query.by = postedBy; + } + + if (data.categories && data.categories.length) { + query.categories = data.categories; + if (data.searchChildren) { + query.searchChildren = data.searchChildren; + } + } + + if (parseInt(data.replies, 10) > 0) { + query.replies = data.replies; + query.repliesFilter = data.repliesFilter || 'atleast'; + } + + if (data.timeRange) { + query.timeRange = data.timeRange; + query.timeFilter = data.timeFilter || 'newer'; + } + + if (data.sortBy) { + query.sortBy = data.sortBy; + query.sortDirection = data.sortDirection; + } + return decodeURIComponent($.param(query)); + } + Search.queryTopic = function(tid, term, callback) { socket.emit('topics.search', { tid: tid, diff --git a/src/controllers/search.js b/src/controllers/search.js index 2c0222a6b3..f5f93f6874 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -28,7 +28,6 @@ searchController.search = function(req, res, next) { time: 0, search_query: '', posts: [], - topics: [], users: [], tags: [], categories: categories, @@ -49,6 +48,8 @@ searchController.search = function(req, res, next) { repliesFilter: req.query.repliesFilter, timeRange: req.query.timeRange, timeFilter: req.query.timeFilter, + sortBy: req.query.sortBy, + sortDirection: req.query.sortDirection, page: page, uid: uid }, function(err, results) { diff --git a/src/search.js b/src/search.js index b8f8ffa849..6e70cfa1bc 100644 --- a/src/search.js +++ b/src/search.js @@ -8,7 +8,8 @@ var async = require('async'), categories = require('./categories'), user = require('./user'), plugins = require('./plugins'), - privileges = require('./privileges'); + privileges = require('./privileges'), + utils = require('../public/src/utils'); var search = {}; @@ -21,6 +22,9 @@ search.search = function(data, callback) { } result.search_query = query; + if (searchIn === 'titles' || searchIn === 'titlesposts') { + searchIn = 'posts'; + } result[searchIn] = data.matches; result.matchCount = data.matchCount; result.hidePostedBy = searchIn !== 'posts'; @@ -31,7 +35,7 @@ search.search = function(data, callback) { var start = process.hrtime(); var query = data.query; - var searchIn = data.searchIn || 'posts'; + var searchIn = data.searchIn || 'titlesposts'; var result = { posts: [], @@ -39,8 +43,8 @@ search.search = function(data, callback) { tags: [] }; - if (searchIn === 'posts') { - searchInPosts(query, data, done); + if (searchIn === 'posts' || searchIn === 'titles' || searchIn === 'titlesposts') { + searchInContent(query, data, done); } else if (searchIn === 'users') { searchInUsers(query, data.uid, done); } else if (searchIn === 'tags') { @@ -50,14 +54,22 @@ search.search = function(data, callback) { } }; -function searchInPosts(query, data, callback) { +function searchInContent(query, data, callback) { data.uid = data.uid || 0; async.parallel({ pids: function(next) { - searchQuery('post', query, next); + if (data.searchIn === 'posts' || data.searchIn === 'titlesposts') { + searchQuery('post', query, next); + } else { + next(null, []); + } }, tids: function(next) { - searchQuery('topic', query, next); + if (data.searchIn === 'titles' || data.searchIn === 'titlesposts') { + searchQuery('topic', query, next); + } else { + next(null, []); + } }, searchCategories: function(next) { getSearchCategories(data, next); @@ -104,24 +116,9 @@ function searchInPosts(query, data, callback) { } function filterAndSort(pids, data, searchCategories, callback) { - var postFields = ['pid', 'tid', 'timestamp']; - var topicFields = []; - - if (data.postedBy) { - postFields.push('uid'); - } - - if (searchCategories.length) { - topicFields.push('cid'); - } - - if (data.replies) { - topicFields.push('postcount'); - } - async.parallel({ posts: function(next) { - getMatchedPosts(pids, postFields, topicFields, next); + getMatchedPosts(pids, data, searchCategories, next); }, postedByUid: function(next) { if (data.postedBy) { @@ -154,28 +151,130 @@ function filterAndSort(pids, data, searchCategories, callback) { }); } -function getMatchedPosts(pids, postFields, topicFields, callback) { - var keys = pids.map(function(pid) { - return 'post:' + pid; - }); +function getMatchedPosts(pids, data, searchCategories, callback) { + var postFields = ['pid', 'tid', 'timestamp']; + var topicFields = []; + var categoryFields = []; + + if (data.postedBy) { + postFields.push('uid'); + } + + if (searchCategories.length || (data.sortBy && data.sortBy.startsWith('category.'))) { + topicFields.push('cid'); + } + + if (data.replies) { + topicFields.push('postcount'); + } + + if (data.sortBy) { + if (data.sortBy.startsWith('topic.')) { + topicFields.push(data.sortBy.split('.')[1]); + } else if (data.sortBy.startsWith('user.')) { + postFields.push('uid'); + } else if (data.sortBy.startsWith('category.')) { + categoryFields.push(data.sortBy.split('.')[1]); + } else if (data.sortBy.startsWith('teaser')) { + topicFields.push('teaserPid'); + } + } + var posts; async.waterfall([ function(next) { + var keys = pids.map(function(pid) { + return 'post:' + pid; + }); db.getObjectsFields(keys, postFields, next); }, function(_posts, next) { posts = _posts; - if (!topicFields.length) { - return callback(null, posts); - } - var topicKeys = posts.map(function(post) { - return 'topic:' + post.tid; - }); - db.getObjectsFields(topicKeys, topicFields, next); + + async.parallel({ + users: function(next) { + if (data.sortBy && data.sortBy.startsWith('user')) { + var uids = posts.map(function(post) { + return post.uid; + }); + user.getMultipleUserFields(uids, ['username'], next); + } else { + next(); + } + }, + topics: function(next) { + if (!topicFields.length) { + return next(); + } + + var topics; + async.waterfall([ + function(next) { + var topicKeys = posts.map(function(post) { + return 'topic:' + post.tid; + }); + db.getObjectsFields(topicKeys, topicFields, next); + }, + function(_topics, next) { + topics = _topics; + + async.parallel({ + teasers: function(next) { + if (topicFields.indexOf('teaserPid') !== -1) { + var teaserKeys = topics.map(function(topic) { + return 'post:' + topic.teaserPid; + }); + db.getObjectsFields(teaserKeys, ['timestamp'], next); + } else { + next(); + } + }, + categories: function(next) { + if (!categoryFields.length) { + return next(); + } + var cids = topics.map(function(topic) { + return 'category:' + topic.cid; + }); + db.getObjectsFields(cids, categoryFields, next); + } + }, next); + } + ], function(err, results) { + if (err) { + return next(err); + } + + topics.forEach(function(topic, index) { + if (topic && results.categories && results.categories[index]) { + topic.category = results.categories[index]; + } + if (topic && results.teasers && results.teasers[index]) { + topic.teaser = results.teasers[index]; + } + }); + + next(null, topics); + }); + } + }, next); }, - function(topics, next) { + function(results, next) { + posts.forEach(function(post, index) { - post.topic = topics[index]; + if (results.topics && results.topics[index]) { + post.topic = results.topics[index]; + if (results.topics[index].category) { + post.category = results.topics[index].category; + } + if (results.topics[index].teaser) { + post.teaser = results.topics[index].teaser; + } + } + + if (results.users && results.users[index]) { + post.user = results.users[index]; + } }); next(null, posts); @@ -236,8 +335,75 @@ function filterByTimerange(posts, timeRange, timeFilter) { } function sortPosts(posts, data) { + if (!posts.length) { + return; + } + data.sortBy = data.sortBy || 'timestamp'; + data.sortDirection = data.sortDirection || 'desc'; + if (data.sortBy === 'timestamp') { + if (data.sortDirection === 'desc') { + posts.sort(function(p1, p2) { + return p2.timestamp - p1.timestamp; + }); + } else { + posts.sort(function(p1, p2) { + return p1.timestamp - p2.timestamp; + }); + } + + return; + } + + var firstPost = posts[0]; + var fields = data.sortBy.split('.'); + + if (!fields || fields.length !== 2 || !firstPost[fields[0]] || !firstPost[fields[0]][fields[1]]) { + return; + } + + var value = firstPost[fields[0]][fields[1]]; + var isNumeric = utils.isNumber(value); + + if (isNumeric) { + if (data.sortDirection === 'desc') { + sortDescendingNumeric(posts, fields); + } else { + sortAscendingNumeric(posts, fields); + } + } else { + if (data.sortDirection === 'desc') { + sortDescendingAlpha(posts, fields); + } else { + sortAscendingAlpha(posts, fields); + } + } +} + +function sortAscendingNumeric(posts, fields) { + posts.sort(function(p1, p2) { + return p1[fields[0]][fields[1]] - p2[fields[0]][fields[1]]; + }); +} + +function sortDescendingNumeric(posts, fields) { posts.sort(function(p1, p2) { - return p2.timestamp - p1.timestamp; + return p2[fields[0]][fields[1]] - p1[fields[0]][fields[1]]; + }); +} + +function sortAscendingAlpha(posts, fields) { + posts.sort(function(p1, p2) { + if (p1[fields[0]][fields[1]] > p2[fields[0]][fields[1]]) return -1; + if (p1[fields[0]][fields[1]] < p2[fields[0]][fields[1]]) return 1; + return 0; + }); +} + +function sortDescendingAlpha(posts, fields) { + posts.sort(function(p1, p2) { + if (p1[fields[0]][fields[1]] < p2[fields[0]][fields[1]]) return -1; + if (p1[fields[0]][fields[1]] > p2[fields[0]][fields[1]]) return 1; + return 0; }); } @@ -311,6 +477,10 @@ function searchInTags(query, callback) { } function getMainPids(tids, callback) { + if (!Array.isArray(tids) || !tids.length) { + return callback(null, []); + } + topics.getTopicsFields(tids, ['mainPid'], function(err, topics) { if (err) { return callback(err); From 4d342410728a305a77607b71009f7f94774eaab0 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 20:02:21 -0500 Subject: [PATCH 341/897] missing semicolon --- public/src/client/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index 691ab51281..c1761b20cd 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -22,7 +22,7 @@ define('forum/search', ['search'], function(searchModule) { $('#advanced-search').off('submit').on('submit', function(e) { e.preventDefault(); - var $this = $(this) + var $this = $(this); var input = $this.find('#search-input'); var searchData = { From d96e4ec22af83638a663abe7aeaf4ec8c3d6f014 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 20:30:03 -0500 Subject: [PATCH 342/897] fix category filter and pagination, strip marquee --- public/src/utils.js | 10 +++++++++- src/controllers/search.js | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/public/src/utils.js b/public/src/utils.js index b58984a20e..3b82573c9b 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -204,7 +204,15 @@ tags : ['a', 'abbr', 'acronym', 'address', 'applet', 'area', 'article', 'aside', 'audio', 'b', 'base', 'basefont', 'bdi', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'command', 'datalist', 'dd', 'del', 'details', 'dfn', 'dialog', 'dir', 'div', 'dl', 'dt', 'em', 'embed', 'fieldset', 'figcaption', 'figure', 'font', 'footer', 'form', 'frame', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hr', 'html', 'i', 'iframe', 'img', 'input', 'ins', 'kbd', 'keygen', 'label', 'legend', 'li', 'link', 'map', 'mark', 'menu', 'meta', 'meter', 'nav', 'noframes', 'noscript', 'object', 'ol', 'optgroup', 'option', 'output', 'p', 'param', 'pre', 'progress', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'script', 'section', 'select', 'small', 'source', 'span', 'strike', 'strong', 'style', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'time', 'title', 'tr', 'track', 'tt', 'u', 'ul', 'var', 'video', 'wbr'], - stripTags : ['abbr', 'acronym', 'address', 'applet', 'area', 'article', 'aside', 'audio', 'base', 'basefont', 'bdi', 'bdo', 'big', 'body', 'button', 'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'command', 'datalist', 'dd', 'del', 'details', 'dfn', 'dialog', 'dir', 'div', 'dl', 'dt', 'em', 'embed', 'fieldset', 'figcaption', 'figure', 'font', 'footer', 'form', 'frame', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hr', 'html', 'iframe', 'input', 'ins', 'kbd', 'keygen', 'label', 'legend', 'li', 'link', 'map', 'mark', 'menu', 'meta', 'meter', 'nav', 'noframes', 'noscript', 'object', 'ol', 'optgroup', 'option', 'output', 'param', 'pre', 'progress', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'script', 'section', 'select', 'source', 'span', 'strike', 'style', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'time', 'title', 'tr', 'track', 'tt', 'u', 'ul', 'var', 'video', 'wbr'], + stripTags : ['abbr', 'acronym', 'address', 'applet', 'area', 'article', 'aside', 'audio', 'base', 'basefont', + 'bdi', 'bdo', 'big', 'blink', 'body', 'button', 'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', + 'command', 'datalist', 'dd', 'del', 'details', 'dfn', 'dialog', 'dir', 'div', 'dl', 'dt', 'em', 'embed', + 'fieldset', 'figcaption', 'figure', 'font', 'footer', 'form', 'frame', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', + 'head', 'header', 'hr', 'html', 'iframe', 'input', 'ins', 'kbd', 'keygen', 'label', 'legend', 'li', 'link', + 'map', 'mark', 'marquee', 'menu', 'meta', 'meter', 'nav', 'noframes', 'noscript', 'object', 'ol', 'optgroup', 'option', + 'output', 'param', 'pre', 'progress', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'script', 'section', 'select', + 'source', 'span', 'strike', 'style', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', + 'th', 'thead', 'time', 'title', 'tr', 'track', 'tt', 'u', 'ul', 'var', 'video', 'wbr'], escapeRegexChars: function(text) { return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); diff --git a/src/controllers/search.js b/src/controllers/search.js index f5f93f6874..d9e6bc9f3a 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -37,6 +37,9 @@ searchController.search = function(req, res, next) { req.params.term = validator.escape(req.params.term); var page = Math.max(1, parseInt(req.query.page, 10)) || 1; + if (req.query.categories && !Array.isArray(req.query.categories)) { + req.query.categories = [req.query.categories]; + } search.search({ query: req.params.term, From 5cc728994b0cc300dbcd39b0fb45f4f10371c9b4 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 20:55:57 -0500 Subject: [PATCH 343/897] dont need hidePostedBy --- src/search.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/search.js b/src/search.js index 6e70cfa1bc..e26cb75f70 100644 --- a/src/search.js +++ b/src/search.js @@ -27,7 +27,6 @@ search.search = function(data, callback) { } result[searchIn] = data.matches; result.matchCount = data.matchCount; - result.hidePostedBy = searchIn !== 'posts'; result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2); callback(null, result); } From 4d63a7c0206e9459734c699e1b7b0e4f9904d00c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 23:00:58 -0500 Subject: [PATCH 344/897] closes ##2705 --- src/topics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/topics.js b/src/topics.js index 8ad164df1f..a9514dabba 100644 --- a/src/topics.js +++ b/src/topics.js @@ -222,7 +222,7 @@ var async = require('async'), Topics.getTopicPosts(tid, set, start, end, uid, reverse, next); }, category: async.apply(Topics.getCategoryData, tid), - threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', []), + threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}), tags: async.apply(Topics.getTopicTagsObjects, tid), isFollowing: async.apply(Topics.isFollowing, [tid], uid) }, function(err, results) { @@ -232,7 +232,7 @@ var async = require('async'), topicData.posts = Array.isArray(results.mainPost) && results.mainPost.length ? [results.mainPost[0]].concat(results.posts) : results.posts; topicData.category = results.category; - topicData.thread_tools = results.threadTools; + topicData.thread_tools = results.threadTools.tools; topicData.tags = results.tags; topicData.isFollowing = results.isFollowing[0]; From 138a13f1b25060d7b3fbc1cd20a6f2d3e8cab7c6 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 23:10:54 -0500 Subject: [PATCH 345/897] dont crash if searchQuery is falsy --- public/src/client/search.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/src/client/search.js b/public/src/client/search.js index c1761b20cd..42bf7dd4fe 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -90,6 +90,9 @@ define('forum/search', ['search'], function(searchModule) { } function highlightMatches(searchQuery) { + if (!searchQuery) { + return; + } var searchTerms = searchQuery.split(' '); var regexes = []; for (var i=0; i Date: Sat, 7 Feb 2015 23:32:42 -0500 Subject: [PATCH 346/897] show seconds like search page --- public/language/en_GB/users.json | 2 +- src/notifications.js | 10 ---------- src/user/search.js | 5 +---- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/public/language/en_GB/users.json b/public/language/en_GB/users.json index 683ad7e155..0f3687c9ed 100644 --- a/public/language/en_GB/users.json +++ b/public/language/en_GB/users.json @@ -5,7 +5,7 @@ "search": "Search", "enter_username": "Enter a username to search", "load_more": "Load More", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/src/notifications.js b/src/notifications.js index 96502508f7..5d10686212 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -270,12 +270,6 @@ var async = require('async'), }; Notifications.prune = function() { - var start = process.hrtime(); - - if (process.env.NODE_ENV === 'development') { - winston.info('[notifications.prune] Removing expired notifications from the database.'); - } - var week = 604800000, numPruned = 0; @@ -307,10 +301,6 @@ var async = require('async'), if (err) { return winston.error('Encountered error pruning notifications: ' + err.message); } - - if (process.env.NODE_ENV === 'development') { - winston.info('[notifications.prune] Notification pruning completed. ' + numPruned + ' expired notification' + (numPruned !== 1 ? 's' : '') + ' removed.'); - } }); }); }; diff --git a/src/user/search.js b/src/user/search.js index a593258f11..20bbec2258 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -46,11 +46,8 @@ module.exports = function(User) { User.getUsers(uids, uid, next); }, function(userData, next) { - - var diff = process.hrtime(startTime); - var timing = (diff[0] * 1e3 + diff[1] / 1e6).toFixed(1); var data = { - timing: timing, + timing: (process.elapsedTimeSince(startTime) / 1000).toFixed(2), users: userData, matchCount: matchCount }; From 10928ed11b9eb431da72987f484fe2b0db7d946e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Feb 2015 23:51:25 -0500 Subject: [PATCH 347/897] escape post content --- src/posts/summary.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/posts/summary.js b/src/posts/summary.js index dd537ce8d6..962a51aaa6 100644 --- a/src/posts/summary.js +++ b/src/posts/summary.js @@ -82,6 +82,7 @@ module.exports = function(Posts) { if (options.stripTags) { post.content = stripTags(post.content); } + post.content = post.content ? validator.escape(post.content) : post.content; return next(null, post); } From a63c67993579ffec60a89cce61010c0457e77cc9 Mon Sep 17 00:00:00 2001 From: acardinale Date: Sun, 8 Feb 2015 11:58:01 +0100 Subject: [PATCH 348/897] Add hook "filter:topic.build" Same behavior as "filter:register.build" --- src/controllers/topics.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 498a3d81db..4c7708c2ba 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -266,7 +266,14 @@ topicsController.get = function(req, res, next) { }); topics.increaseViewCount(tid); - res.render('topic', data); + + plugins.fireHook('filter:topic.build', {req: req, res: res, templateData: data}, function(err, data) { + if (err && process.env === 'development') { + winston.warn(JSON.stringify(err)); + return next(err); + } + res.render('topic', data.templateData); + }); }); }; From 612acc41ba310d78d74c38daeef03adc32886988 Mon Sep 17 00:00:00 2001 From: acardinale Date: Sun, 8 Feb 2015 12:05:26 +0100 Subject: [PATCH 349/897] Add hook "filter:category.build" Same behavior as "filter:register.build" --- src/controllers/categories.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 25690a6810..7ea49453f5 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -266,7 +266,13 @@ categoriesController.get = function(req, res, next) { res.locals.linkTags.push(rel); }); - res.render('category', data); + plugins.fireHook('filter:category.build', {req: req, res: res, templateData: data}, function(err, data) { + if (err && process.env === 'development') { + winston.warn(JSON.stringify(err)); + return next(err); + } + res.render('category', data.templateData); + }); }); }; From 7f6518e4a60797e2747ac0aaff520177e845ace4 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 8 Feb 2015 13:38:42 -0500 Subject: [PATCH 350/897] private plugin link fix --- public/src/client/account/header.js | 12 ++++++++---- src/middleware/middleware.js | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js index f0a0c112fa..6dcc0b27e4 100644 --- a/public/src/client/account/header.js +++ b/public/src/client/account/header.js @@ -1,3 +1,6 @@ +'use strict'; +/* globals define, app, ajaxify */ + define('forum/account/header', function() { var AccountHeader = {}; @@ -7,10 +10,11 @@ define('forum/account/header', function() { }; function displayAccountMenus() { - $('.account-sub-links .plugin-link').each(function() { - var $this = $(this); - $this.toggleClass('hide', $this.hasClass('private')); - }); + if (!app.user.uid || app.user.uid !== parseInt(ajaxify.variables.get('theirid'), 10)) { + $('.account-sub-links .plugin-link.private').each(function() { + $(this).addClass('hide'); + }); + } } function selectActivePill() { diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 111b0b1ceb..f95c70e3ac 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -340,6 +340,7 @@ middleware.renderHeader = function(req, res, callback) { return; } results.user.isAdmin = results.isAdmin || false; + results.user.uid = parseInt(results.user.uid, 10); results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1; templateValues.browserTitle = results.title; From 1843d0364e586eae05bd1ea8723175d1b6eda3e8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 8 Feb 2015 21:06:38 -0500 Subject: [PATCH 351/897] closed #2708 --- public/language/en_GB/email.json | 4 ++ public/language/en_GB/reset_password.json | 4 +- public/src/client/reset_code.js | 47 +++++++++------------ src/controllers/index.js | 9 ++-- src/socket.io/user.js | 27 +++++++++--- src/upgrade.js | 22 +++++++++- src/user/reset.js | 17 +++----- src/views/emails/reset_notify.tpl | 10 +++++ src/views/emails/reset_notify_plaintext.tpl | 8 ++++ 9 files changed, 98 insertions(+), 50 deletions(-) create mode 100644 src/views/emails/reset_notify.tpl create mode 100644 src/views/emails/reset_notify_plaintext.tpl diff --git a/public/language/en_GB/email.json b/public/language/en_GB/email.json index efee400748..33fd28377b 100644 --- a/public/language/en_GB/email.json +++ b/public/language/en_GB/email.json @@ -13,6 +13,10 @@ "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/en_GB/reset_password.json b/public/language/en_GB/reset_password.json index 27537ffdf2..96ba318a8a 100644 --- a/public/language/en_GB/reset_password.json +++ b/public/language/en_GB/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Please enter your email address and we will send you an email with instructions on how to reset your account.", "enter_email_address": "Enter Email Address", "password_reset_sent": "Password Reset Sent", - "invalid_email": "Invalid Email / Email does not exist!" + "invalid_email": "Invalid Email / Email does not exist!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } diff --git a/public/src/client/reset_code.js b/public/src/client/reset_code.js index 9a7fc80075..f690a2b152 100644 --- a/public/src/client/reset_code.js +++ b/public/src/client/reset_code.js @@ -11,44 +11,39 @@ define('forum/reset_code', function() { resetEl.on('click', function() { if (password.val().length < 6) { - $('#error').addClass('hide').hide(); - noticeEl.find('strong').html('Invalid Password'); - noticeEl.find('p').html('The password entered is too short, please pick a different password.'); - noticeEl.removeClass('hide').css({display: 'block'}); - } else if (password.value !== repeat.value) { - $('#error').hide(); - noticeEl.find('strong').html('Invalid Password'); - noticeEl.find('p').html('The two passwords you\'ve entered do not match.'); - noticeEl.removeClass('hide').css({display: 'block'}); + app.alertError('[[reset_password:password_too_short]]'); + } else if (password.val() !== repeat.val()) { + app.alertError('[[reset_password:passwords_do_not_match]]'); } else { + resetEl.prop('disabled', true).html(' Changing Password'); socket.emit('user.reset.commit', { code: reset_code, password: password.val() }, function(err) { - if(err) { + if (err) { + ajaxify.refresh(); return app.alertError(err.message); } - $('#error').addClass('hide').hide(); - $('#notice').addClass('hide').hide(); - $('#success').removeClass('hide').addClass('show').show(); + + window.location.href = RELATIVE_PATH + '/login'; }); } }); - socket.emit('user.reset.valid', reset_code, function(err, valid) { - if(err) { - return app.alertError(err.message); - } + // socket.emit('user.reset.valid', reset_code, function(err, valid) { + // if(err) { + // return app.alertError(err.message); + // } - if (valid) { - resetEl.prop('disabled', false); - } else { - var formEl = $('#reset-form'); - // Show error message - $('#error').show(); - formEl.remove(); - } - }); + // if (valid) { + // resetEl.prop('disabled', false); + // } else { + // var formEl = $('#reset-form'); + // // Show error message + // $('#error').show(); + // formEl.remove(); + // } + // }); }; return ResetCode; diff --git a/src/controllers/index.js b/src/controllers/index.js index 797d30e22d..ff337250f4 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -106,9 +106,12 @@ Controllers.home = function(req, res, next) { Controllers.reset = function(req, res, next) { if (req.params.code) { - res.render('reset_code', { - reset_code: req.params.code ? req.params.code : null, - breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}]) + user.reset.validate(req.params.code, function(err, valid) { + res.render('reset_code', { + valid: valid, + reset_code: req.params.code ? req.params.code : null, + breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}]) + }); }); } else { res.render('reset', { diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 28feb5616f..4df8915994 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -13,6 +13,8 @@ var async = require('async'), websockets = require('./index'), meta = require('../meta'), events = require('../events'), + emailer = require('../emailer'), + db = require('../database'), SocketUser = {}; SocketUser.exists = function(socket, data, callback) { @@ -81,23 +83,34 @@ SocketUser.reset.send = function(socket, email, callback) { } }; -SocketUser.reset.valid = function(socket, code, callback) { - if (code) { - user.reset.validate(code, callback); - } -}; - SocketUser.reset.commit = function(socket, data, callback) { if(data && data.code && data.password) { - user.reset.commit(data.code, data.password, function(err) { + async.series([ + async.apply(db.getObjectField, 'reset:uid', data.code), + async.apply(user.reset.commit, data.code, data.password) + ], function(err, data) { if (err) { return callback(err); } + + var uid = data[0], + now = new Date(), + parsedDate = now.getFullYear() + '/' + (now.getMonth()+1) + '/' + now.getDate(); + + user.getUserField(uid, 'username', function(err, username) { + emailer.send('reset_notify', uid, { + username: username, + date: parsedDate, + site_title: meta.config.title || 'NodeBB', + subject: '[[email:reset.notify.subject]]' + }); + }); events.log({ type: 'password-reset', uid: socket.uid, ip: socket.ip }); + callback(); }); } }; diff --git a/src/upgrade.js b/src/upgrade.js index ed82dcd20a..52347bcb40 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 0, 30); + latestSchema = Date.UTC(2015, 1, 8); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -807,6 +807,26 @@ Upgrade.upgrade = function(callback) { winston.info('[2015/01/30] Adding group member counts skipped'); next(); } + }, + function(next) { + thisSchemaDate = Date.UTC(2015, 1, 8); + if (schemaDate < thisSchemaDate) { + updatesMade = true; + winston.info('[2015/02/08] Clearing reset tokens'); + + db.deleteAll(['reset:expiry', 'reset:uid'], function(err) { + if (err) { + winston.error('[2015/02/08] Error encountered while Clearing reset tokens'); + return next(err); + } + + winston.info('[2015/02/08] Clearing reset tokens done'); + Upgrade.update(thisSchemaDate, next); + }); + } else { + winston.info('[2015/02/08] Clearing reset tokens skipped'); + next(); + } } // Add new schema updates here diff --git a/src/user/reset.js b/src/user/reset.js index c65e77a570..e49c077180 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -1,4 +1,3 @@ - 'use strict'; var async = require('async'), @@ -21,19 +20,13 @@ var async = require('async'), return callback(err, false); } - db.getObjectField('reset:expiry', code, function(err, expiry) { + db.sortedSetScore('reset:issueDate', code, function(err, issueDate) { + // db.getObjectField('reset:expiry', code, function(err, expiry) { if (err) { return callback(err); } - if (parseInt(expiry, 10) >= Date.now() / 1000) { - callback(null, true); - } else { - // Expired, delete from db - db.deleteObjectField('reset:uid', code); - db.deleteObjectField('reset:expiry', code); - callback(null, false); - } + callback(null, parseInt(issueDate, 10) > (Date.now() - (1000*60*120))); }); }); }; @@ -46,7 +39,7 @@ var async = require('async'), var reset_code = utils.generateUUID(); db.setObjectField('reset:uid', reset_code, uid); - db.setObjectField('reset:expiry', reset_code, (60 * 60) + Math.floor(Date.now() / 1000)); + db.sortedSetAdd('reset:issueDate', Date.now(), reset_code); var reset_link = nconf.get('url') + '/reset/' + reset_code; @@ -85,7 +78,7 @@ var async = require('async'), user.setUserField(uid, 'password', hash); db.deleteObjectField('reset:uid', code); - db.deleteObjectField('reset:expiry', code); + db.sortedSetRemove('reset:issueDate', code); user.auth.resetLockout(uid, callback); }); diff --git a/src/views/emails/reset_notify.tpl b/src/views/emails/reset_notify.tpl new file mode 100644 index 0000000000..34c26aa481 --- /dev/null +++ b/src/views/emails/reset_notify.tpl @@ -0,0 +1,10 @@ +

    [[email:greeting_with_name, {username}]],

    + +

    [[email:reset.notify.text1, {date}]]

    + +

    [[email:reset.notify.text2]]

    + +

    + [[email:closing]]
    + {site_title} +

    \ No newline at end of file diff --git a/src/views/emails/reset_notify_plaintext.tpl b/src/views/emails/reset_notify_plaintext.tpl new file mode 100644 index 0000000000..788618f9d5 --- /dev/null +++ b/src/views/emails/reset_notify_plaintext.tpl @@ -0,0 +1,8 @@ +[[email:greeting_with_name, {username}]], + +[[email:reset.notify.text1, {date}]] + +[[email:reset.notify.text2]] + +[[email:closing]] +{site_title} \ No newline at end of file From c35126116522ed753a164879001d5f69d2528cf7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 8 Feb 2015 22:02:13 -0500 Subject: [PATCH 352/897] added daily cleaning of reset tokens #2708 --- src/notifications.js | 4 +--- src/user/jobs.js | 3 ++- src/user/reset.js | 18 +++++++++++++++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/notifications.js b/src/notifications.js index 5d10686212..dc3aae7ea2 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -18,9 +18,7 @@ var async = require('async'), (function(Notifications) { Notifications.init = function() { - if (process.env.NODE_ENV === 'development') { - winston.verbose('[notifications.init] Registering jobs.'); - } + winston.verbose('[notifications.init] Registering jobs.'); new cron('*/30 * * * *', Notifications.prune, null, true); }; diff --git a/src/user/jobs.js b/src/user/jobs.js index 506f0d388b..16f6bd4ce8 100644 --- a/src/user/jobs.js +++ b/src/user/jobs.js @@ -4,7 +4,6 @@ var winston = require('winston'), cronJob = require('cron').CronJob, - user = require('../user'), meta = require('../meta'); module.exports = function(User) { @@ -23,6 +22,8 @@ module.exports = function(User) { winston.verbose('[user.startJobs] Digest job (monthly) started.'); User.digest.execute('month'); }, null, true); + + new cronJob('0 0 0 * * *', User.reset.clean, null, true); }; }; diff --git a/src/user/reset.js b/src/user/reset.js index e49c077180..3ce2f86cf8 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -2,6 +2,7 @@ var async = require('async'), nconf = require('nconf'), + winston = require('winston'), user = require('../user'), utils = require('../../public/src/utils'), @@ -13,7 +14,6 @@ var async = require('async'), emailer = require('../emailer'); (function(UserReset) { - UserReset.validate = function(code, callback) { db.getObjectField('reset:uid', code, function(err, uid) { if (err || !uid) { @@ -86,4 +86,20 @@ var async = require('async'), }); }; + UserReset.clean = function(callback) { + // Locate all codes that have expired, and remove them from the set/hash + async.waterfall([ + async.apply(db.getSortedSetRangeByScore, 'reset:issueDate', 0, -1, -1, +new Date()-(1000*60*120)), + function(tokens, next) { + if (!tokens.length) { return next(); } + + winston.verbose('[UserReset.clean] Removing ' + tokens.length + ' reset tokens from database'); + async.parallel([ + async.apply(db.deleteObjectField, 'reset:uid', tokens), + async.apply(db.sortedSetRemove, 'reset:issueDate', tokens) + ], next); + } + ], callback); + }; + }(exports)); From b1340b74c631edec1b33be3e0f2ca494cf7e8575 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 9 Feb 2015 13:41:21 -0500 Subject: [PATCH 353/897] updating vanilla minver --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22c2570b1a..b5812a425d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", "nodebb-theme-lavender": "^0.2.0", - "nodebb-theme-vanilla": "^0.2.0", + "nodebb-theme-vanilla": "^1.0.0", "nodebb-widget-essentials": "~0.2.0", "npm": "^2.1.4", "passport": "^0.2.1", From 9b451093498f0781fdcb69eb146c73ad354783b8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 9 Feb 2015 14:49:43 -0500 Subject: [PATCH 354/897] updating development version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5812a425d..cb00f143cc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPLv3 or later", "description": "NodeBB Forum", - "version": "0.6.1-dev", + "version": "0.7.0-dev", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From be92f07ab929a050df635d048499b2fd3165f684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 9 Feb 2015 15:32:35 -0500 Subject: [PATCH 355/897] save/clear search preferences --- public/language/en_GB/search.json | 6 ++- public/src/client/search.js | 68 +++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 19 deletions(-) diff --git a/public/language/en_GB/search.json b/public/language/en_GB/search.json index b8a970d6a9..75749d4e06 100644 --- a/public/language/en_GB/search.json +++ b/public/language/en_GB/search.json @@ -32,5 +32,9 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared" } diff --git a/public/src/client/search.js b/public/src/client/search.js index 42bf7dd4fe..01637dd429 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -12,7 +12,7 @@ define('forum/search', ['search'], function(searchModule) { var searchIn = $('#advanced-search #search-in'); - fillOutFormFromQueryParams(); + fillOutForm(); searchIn.on('change', function() { updateFormItemVisiblity(searchIn.val()); @@ -22,38 +22,49 @@ define('forum/search', ['search'], function(searchModule) { $('#advanced-search').off('submit').on('submit', function(e) { e.preventDefault(); - var $this = $(this); - var input = $this.find('#search-input'); - - var searchData = { - term: input.val(), - in: $this.find('#search-in').val(), - by: $this.find('#posted-by-user').val(), - categories: $this.find('#posted-in-categories').val(), - searchChildren: $this.find('#search-children').is(':checked'), - replies: $this.find('#reply-count').val(), - repliesFilter: $this.find('#reply-count-filter').val(), - timeFilter: $this.find('#post-time-filter').val(), - timeRange: $this.find('#post-time-range').val(), - sortBy: $this.find('#post-sort-by').val(), - sortDirection: $this.find('#post-sort-direction').val() - }; + + var input = $(this).find('#search-input'); + + var searchData = getSearchData(); + searchData.term = input.val(); searchModule.query(searchData, function() { input.val(''); }); }); + handleSavePreferences(); + enableAutoComplete(); }; + function getSearchData() { + var form = $('#advanced-search'); + var searchData = { + in: form.find('#search-in').val(), + by: form.find('#posted-by-user').val(), + categories: form.find('#posted-in-categories').val(), + searchChildren: form.find('#search-children').is(':checked'), + replies: form.find('#reply-count').val(), + repliesFilter: form.find('#reply-count-filter').val(), + timeFilter: form.find('#post-time-filter').val(), + timeRange: form.find('#post-time-range').val(), + sortBy: form.find('#post-sort-by').val(), + sortDirection: form.find('#post-sort-direction').val() + }; + return searchData; + } + function updateFormItemVisiblity(searchIn) { var hide = searchIn.indexOf('posts') === -1 && searchIn.indexOf('titles') === -1; $('.post-search-item').toggleClass('hide', hide); } - function fillOutFormFromQueryParams() { + function fillOutForm() { var params = utils.params(); + var searchData = getSearchPreferences(); + params = utils.merge(searchData, params); + if (params) { if (params.in) { $('#search-in').val(params.in); @@ -110,6 +121,27 @@ define('forum/search', ['search'], function(searchModule) { }); } + function handleSavePreferences() { + $('#save-preferences').on('click', function() { + localStorage.setItem('search-preferences', JSON.stringify(getSearchData())); + app.alertSuccess('[[search:search-preferences-saved]]'); + return false; + }); + + $('#clear-preferences').on('click', function() { + localStorage.removeItem('search-preferences'); + app.alertSuccess('[[search:search-preferences-cleared]]'); + return false; + }); + } + + function getSearchPreferences() { + try { + return JSON.parse(localStorage.getItem('search-preferences')); + } catch(e) { + return {}; + } + } function enableAutoComplete() { var input = $('#posted-by-user'); From c98720ee4c3461da46fe846f4ac21533ecad3c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 9 Feb 2015 17:02:47 -0500 Subject: [PATCH 356/897] show results as WIP --- public/language/en_GB/search.json | 3 ++- public/src/client/search.js | 10 +++++++++- public/src/modules/search.js | 4 ++++ src/controllers/search.js | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/public/language/en_GB/search.json b/public/language/en_GB/search.json index 75749d4e06..8c73511bda 100644 --- a/public/language/en_GB/search.json +++ b/public/language/en_GB/search.json @@ -36,5 +36,6 @@ "save-preferences": "Save preferences", "clear-preferences": "Clear preferences", "search-preferences-saved": "Search preferences saved", - "search-preferences-cleared": "Search preferences cleared" + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } diff --git a/public/src/client/search.js b/public/src/client/search.js index 01637dd429..96f2640ca0 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -50,7 +50,8 @@ define('forum/search', ['search'], function(searchModule) { timeFilter: form.find('#post-time-filter').val(), timeRange: form.find('#post-time-range').val(), sortBy: form.find('#post-sort-by').val(), - sortDirection: form.find('#post-sort-direction').val() + sortDirection: form.find('#post-sort-direction').val(), + showAs: form.find('#show-as-topics').is(':checked') ? 'topics' : 'posts' }; return searchData; } @@ -97,6 +98,13 @@ define('forum/search', ['search'], function(searchModule) { $('#post-sort-by').val(params.sortBy); $('#post-sort-direction').val(params.sortDirection); } + + if (params.showAs) { + var isTopic = params.showAs === 'topics'; + var ispost = params.showAs === 'posts'; + $('#show-as-topics').prop('checked', isTopic).parent().toggleClass('active', isTopic); + $('#show-as-posts').prop('checked', isPost).parent().toggleClass('active', isPost); + } } } diff --git a/public/src/modules/search.js b/public/src/modules/search.js index 9b896b0394..eedf0b76b9 100644 --- a/public/src/modules/search.js +++ b/public/src/modules/search.js @@ -62,6 +62,10 @@ define('search', ['navigator'], function(nav) { query.sortBy = data.sortBy; query.sortDirection = data.sortDirection; } + + if (data.showAs) { + query.showAs = data.showAs; + } return decodeURIComponent($.param(query)); } diff --git a/src/controllers/search.js b/src/controllers/search.js index d9e6bc9f3a..5c38c3f79b 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -62,7 +62,8 @@ searchController.search = function(req, res, next) { var pageCount = Math.max(1, Math.ceil(results.matchCount / 10)); results.pagination = pagination.create(page, pageCount, req.query); - + results.showAsPosts = !req.query.showAs || req.query.showAs === 'posts'; + results.showAsTopics = req.query.showAs === 'topics'; results.breadcrumbs = breadcrumbs; results.categories = categories; res.render('search', results); From 6cd615ee45aa814758022e1e6be05e4b0f2e2807 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 9 Feb 2015 17:45:35 -0500 Subject: [PATCH 357/897] dont add post/topic query params if searching for users/tags --- public/src/client/search.js | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index 96f2640ca0..a8924ce8f9 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -22,7 +22,7 @@ define('forum/search', ['search'], function(searchModule) { $('#advanced-search').off('submit').on('submit', function(e) { e.preventDefault(); - + var input = $(this).find('#search-input'); var searchData = getSearchData(); @@ -41,18 +41,22 @@ define('forum/search', ['search'], function(searchModule) { function getSearchData() { var form = $('#advanced-search'); var searchData = { - in: form.find('#search-in').val(), - by: form.find('#posted-by-user').val(), - categories: form.find('#posted-in-categories').val(), - searchChildren: form.find('#search-children').is(':checked'), - replies: form.find('#reply-count').val(), - repliesFilter: form.find('#reply-count-filter').val(), - timeFilter: form.find('#post-time-filter').val(), - timeRange: form.find('#post-time-range').val(), - sortBy: form.find('#post-sort-by').val(), - sortDirection: form.find('#post-sort-direction').val(), - showAs: form.find('#show-as-topics').is(':checked') ? 'topics' : 'posts' + in: form.find('#search-in').val() }; + + if (searchData.in === 'posts' || searchData.in === 'titlespost' || searchData.in === 'titles') { + searchData.by = form.find('#posted-by-user').val(); + searchData.categories = form.find('#posted-in-categories').val(); + searchData.searchChildren = form.find('#search-children').is(':checked'); + searchData.replies = form.find('#reply-count').val(); + searchData.repliesFilter = form.find('#reply-count-filter').val(); + searchData.timeFilter = form.find('#post-time-filter').val(); + searchData.timeRange = form.find('#post-time-range').val(); + searchData.sortBy = form.find('#post-sort-by').val(); + searchData.sortDirection = form.find('#post-sort-direction').val(); + searchData.showAs = form.find('#show-as-topics').is(':checked') ? 'topics' : 'posts'; + } + return searchData; } @@ -65,7 +69,7 @@ define('forum/search', ['search'], function(searchModule) { var params = utils.params(); var searchData = getSearchPreferences(); params = utils.merge(searchData, params); - + if (params) { if (params.in) { $('#search-in').val(params.in); @@ -101,8 +105,8 @@ define('forum/search', ['search'], function(searchModule) { if (params.showAs) { var isTopic = params.showAs === 'topics'; - var ispost = params.showAs === 'posts'; - $('#show-as-topics').prop('checked', isTopic).parent().toggleClass('active', isTopic); + var isPost = params.showAs === 'posts'; + $('#show-as-topics').prop('checked', isTopic).parent().toggleClass('active', isTopic); $('#show-as-posts').prop('checked', isPost).parent().toggleClass('active', isPost); } } @@ -130,7 +134,7 @@ define('forum/search', ['search'], function(searchModule) { } function handleSavePreferences() { - $('#save-preferences').on('click', function() { + $('#save-preferences').on('click', function() { localStorage.setItem('search-preferences', JSON.stringify(getSearchData())); app.alertSuccess('[[search:search-preferences-saved]]'); return false; From 5e7bf7a27245a6bf160a9a4a1390205e5bbb71e9 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 9 Feb 2015 17:50:19 -0500 Subject: [PATCH 358/897] default search in posts --- src/controllers/search.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/search.js b/src/controllers/search.js index 5c38c3f79b..0a26822699 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -41,6 +41,7 @@ searchController.search = function(req, res, next) { req.query.categories = [req.query.categories]; } + req.query.in = req.query.in || 'posts'; search.search({ query: req.params.term, searchIn: req.query.in, From b6125b1674d0ae8de7b8368497c05513dbe43cae Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 9 Feb 2015 18:00:02 -0500 Subject: [PATCH 359/897] toString pid --- src/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/search.js b/src/search.js index e26cb75f70..5cab307a98 100644 --- a/src/search.js +++ b/src/search.js @@ -89,7 +89,7 @@ function searchInContent(query, data, callback) { }, function(mainPids, next) { results.pids.forEach(function(pid) { - if (mainPids.indexOf(pid) === -1) { + if (mainPids.indexOf(pid.toString()) === -1) { mainPids.push(pid); } }); @@ -485,7 +485,7 @@ function getMainPids(tids, callback) { return callback(err); } topics = topics.map(function(topic) { - return topic && topic.mainPid; + return topic && topic.mainPid && topic.mainPid.toString(); }).filter(Boolean); callback(null, topics); }); From 15e6c5154147ffc3b1d3db43df950e97c64b4671 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 10 Feb 2015 10:53:19 -0500 Subject: [PATCH 360/897] latest translations --- public/language/ar/email.json | 3 + public/language/ar/error.json | 1 + public/language/ar/pages.json | 1 + public/language/ar/reset_password.json | 4 +- public/language/ar/search.json | 30 +++++- public/language/ar/users.json | 2 +- public/language/bn/email.json | 3 + public/language/bn/error.json | 1 + public/language/bn/pages.json | 1 + public/language/bn/reset_password.json | 4 +- public/language/bn/search.json | 30 +++++- public/language/bn/users.json | 2 +- public/language/cs/email.json | 3 + public/language/cs/error.json | 1 + public/language/cs/pages.json | 1 + public/language/cs/reset_password.json | 4 +- public/language/cs/search.json | 30 +++++- public/language/cs/users.json | 2 +- public/language/de/category.json | 2 +- public/language/de/email.json | 3 + public/language/de/error.json | 3 +- public/language/de/pages.json | 1 + public/language/de/reset_password.json | 4 +- public/language/de/search.json | 30 +++++- public/language/el/email.json | 3 + public/language/el/error.json | 1 + public/language/el/pages.json | 1 + public/language/el/reset_password.json | 4 +- public/language/el/search.json | 30 +++++- public/language/el/users.json | 2 +- public/language/en@pirate/email.json | 3 + public/language/en@pirate/error.json | 1 + public/language/en@pirate/pages.json | 1 + public/language/en@pirate/reset_password.json | 4 +- public/language/en@pirate/search.json | 30 +++++- public/language/en@pirate/users.json | 2 +- public/language/en_US/email.json | 3 + public/language/en_US/error.json | 1 + public/language/en_US/pages.json | 1 + public/language/en_US/reset_password.json | 4 +- public/language/en_US/search.json | 30 +++++- public/language/en_US/users.json | 2 +- public/language/es/email.json | 3 + public/language/es/error.json | 1 + public/language/es/pages.json | 1 + public/language/es/reset_password.json | 4 +- public/language/es/search.json | 30 +++++- public/language/es/users.json | 2 +- public/language/et/email.json | 3 + public/language/et/error.json | 1 + public/language/et/pages.json | 1 + public/language/et/reset_password.json | 4 +- public/language/et/search.json | 30 +++++- public/language/et/users.json | 2 +- public/language/fa_IR/email.json | 3 + public/language/fa_IR/error.json | 1 + public/language/fa_IR/pages.json | 1 + public/language/fa_IR/reset_password.json | 4 +- public/language/fa_IR/search.json | 30 +++++- public/language/fa_IR/users.json | 2 +- public/language/fi/email.json | 3 + public/language/fi/error.json | 1 + public/language/fi/pages.json | 1 + public/language/fi/reset_password.json | 4 +- public/language/fi/search.json | 30 +++++- public/language/fi/users.json | 2 +- public/language/fr/email.json | 3 + public/language/fr/error.json | 1 + public/language/fr/pages.json | 1 + public/language/fr/reset_password.json | 4 +- public/language/fr/search.json | 30 +++++- public/language/fr/users.json | 2 +- public/language/he/category.json | 2 +- public/language/he/email.json | 49 +++++----- public/language/he/error.json | 77 ++++++++-------- public/language/he/global.json | 16 ++-- public/language/he/groups.json | 38 ++++---- public/language/he/modules.json | 20 ++-- public/language/he/notifications.json | 42 ++++----- public/language/he/pages.json | 7 +- public/language/he/recent.json | 22 ++--- public/language/he/reset_password.json | 4 +- public/language/he/search.json | 38 +++++++- public/language/he/tags.json | 2 +- public/language/he/topic.json | 92 +++++++++---------- public/language/he/user.json | 42 ++++----- public/language/he/users.json | 8 +- public/language/hu/email.json | 3 + public/language/hu/error.json | 1 + public/language/hu/pages.json | 1 + public/language/hu/reset_password.json | 4 +- public/language/hu/search.json | 30 +++++- public/language/hu/users.json | 2 +- public/language/id/email.json | 3 + public/language/id/error.json | 1 + public/language/id/pages.json | 1 + public/language/id/reset_password.json | 4 +- public/language/id/search.json | 30 +++++- public/language/id/users.json | 2 +- public/language/it/email.json | 3 + public/language/it/error.json | 1 + public/language/it/pages.json | 1 + public/language/it/reset_password.json | 4 +- public/language/it/search.json | 30 +++++- public/language/it/users.json | 2 +- public/language/ja/email.json | 3 + public/language/ja/error.json | 1 + public/language/ja/pages.json | 1 + public/language/ja/reset_password.json | 4 +- public/language/ja/search.json | 30 +++++- public/language/ja/users.json | 2 +- public/language/ko/email.json | 3 + public/language/ko/error.json | 1 + public/language/ko/pages.json | 1 + public/language/ko/reset_password.json | 4 +- public/language/ko/search.json | 30 +++++- public/language/ko/users.json | 2 +- public/language/lt/email.json | 3 + public/language/lt/error.json | 1 + public/language/lt/pages.json | 1 + public/language/lt/reset_password.json | 4 +- public/language/lt/search.json | 30 +++++- public/language/lt/users.json | 2 +- public/language/ms/email.json | 3 + public/language/ms/error.json | 1 + public/language/ms/pages.json | 1 + public/language/ms/reset_password.json | 4 +- public/language/ms/search.json | 30 +++++- public/language/ms/users.json | 2 +- public/language/nb/email.json | 3 + public/language/nb/error.json | 1 + public/language/nb/pages.json | 1 + public/language/nb/reset_password.json | 4 +- public/language/nb/search.json | 30 +++++- public/language/nb/users.json | 2 +- public/language/nl/email.json | 3 + public/language/nl/error.json | 1 + public/language/nl/pages.json | 1 + public/language/nl/reset_password.json | 4 +- public/language/nl/search.json | 30 +++++- public/language/nl/users.json | 2 +- public/language/pl/email.json | 3 + public/language/pl/error.json | 1 + public/language/pl/pages.json | 1 + public/language/pl/reset_password.json | 4 +- public/language/pl/search.json | 30 +++++- public/language/pl/users.json | 2 +- public/language/pt_BR/email.json | 3 + public/language/pt_BR/error.json | 1 + public/language/pt_BR/pages.json | 1 + public/language/pt_BR/reset_password.json | 4 +- public/language/pt_BR/search.json | 30 +++++- public/language/pt_BR/users.json | 2 +- public/language/ro/email.json | 3 + public/language/ro/error.json | 1 + public/language/ro/pages.json | 1 + public/language/ro/reset_password.json | 4 +- public/language/ro/search.json | 30 +++++- public/language/ro/users.json | 2 +- public/language/ru/email.json | 3 + public/language/ru/error.json | 1 + public/language/ru/pages.json | 1 + public/language/ru/reset_password.json | 4 +- public/language/ru/search.json | 32 ++++++- public/language/ru/users.json | 2 +- public/language/sc/email.json | 3 + public/language/sc/error.json | 1 + public/language/sc/pages.json | 1 + public/language/sc/reset_password.json | 4 +- public/language/sc/search.json | 30 +++++- public/language/sc/users.json | 2 +- public/language/sk/email.json | 3 + public/language/sk/error.json | 1 + public/language/sk/pages.json | 1 + public/language/sk/reset_password.json | 4 +- public/language/sk/search.json | 30 +++++- public/language/sk/users.json | 2 +- public/language/sv/email.json | 3 + public/language/sv/error.json | 1 + public/language/sv/pages.json | 1 + public/language/sv/reset_password.json | 4 +- public/language/sv/search.json | 30 +++++- public/language/sv/users.json | 2 +- public/language/th/email.json | 3 + public/language/th/error.json | 1 + public/language/th/pages.json | 1 + public/language/th/reset_password.json | 4 +- public/language/th/search.json | 30 +++++- public/language/th/users.json | 2 +- public/language/tr/category.json | 2 +- public/language/tr/email.json | 7 +- public/language/tr/error.json | 15 +-- public/language/tr/global.json | 12 +-- public/language/tr/groups.json | 26 +++--- public/language/tr/pages.json | 1 + public/language/tr/recent.json | 18 ++-- public/language/tr/reset_password.json | 4 +- public/language/tr/search.json | 36 +++++++- public/language/tr/topic.json | 4 +- public/language/tr/user.json | 10 +- public/language/tr/users.json | 8 +- public/language/vi/email.json | 3 + public/language/vi/error.json | 1 + public/language/vi/pages.json | 1 + public/language/vi/reset_password.json | 4 +- public/language/vi/search.json | 30 +++++- public/language/vi/users.json | 2 +- public/language/zh_CN/email.json | 3 + public/language/zh_CN/error.json | 1 + public/language/zh_CN/pages.json | 1 + public/language/zh_CN/reset_password.json | 4 +- public/language/zh_CN/search.json | 30 +++++- public/language/zh_CN/users.json | 2 +- public/language/zh_TW/email.json | 3 + public/language/zh_TW/error.json | 1 + public/language/zh_TW/pages.json | 1 + public/language/zh_TW/reset_password.json | 4 +- public/language/zh_TW/search.json | 32 ++++++- public/language/zh_TW/users.json | 2 +- 219 files changed, 1555 insertions(+), 365 deletions(-) diff --git a/public/language/ar/email.json b/public/language/ar/email.json index f2820e0600..98cb9c0b0d 100644 --- a/public/language/ar/email.json +++ b/public/language/ar/email.json @@ -9,6 +9,9 @@ "reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة السرالخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.", "reset.text2": "لمواصلة طلب إعاة تعيين كلمة السر، المرجو تتبع هذا الرابط.", "reset.cta": "انقر هنا لإعادة تعيين كلمة السر الخاصة بك.", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "لديك تنبيهات غير مقروءة من طرف %1:", "digest.latest_topics": "آخر المستجدات من %1", "digest.cta": "انقر هنا لمشاهدة %1", diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 26d90ae89e..73eb289378 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -35,6 +35,7 @@ "topic-locked": "الموضوع مقفول", "still-uploading": "الرجاء انتظار الرفع", "content-too-short": "المرجو إدخال موضوع أطول من هذا. يجب أن تتوفر المواضيع على %1 حروف على الأقل.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "المرجو إدخال عنوان أطول من هذا. يجب أن تتوفر العناوين على %1 حروف على الأقل.", "title-too-long": "المرجو إدخال عنوان أقصر من هذا. يجب ألا تتجاوز العناوين %1 حرفًا.", "too-many-posts": "يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية - المرجو الانتظار قليلا.", diff --git a/public/language/ar/pages.json b/public/language/ar/pages.json index 0dc17e025a..15e8209928 100644 --- a/public/language/ar/pages.json +++ b/public/language/ar/pages.json @@ -11,6 +11,7 @@ "user.followers": "المستخدمون الذين يتبعون %1", "user.posts": "ردود %1", "user.topics": "مواضيع %1", + "user.groups": "%1's Groups", "user.favourites": "مفضلات %1", "user.settings": "خيارات المستخدم", "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.", diff --git a/public/language/ar/reset_password.json b/public/language/ar/reset_password.json index 603f117b7e..b4f95dd780 100644 --- a/public/language/ar/reset_password.json +++ b/public/language/ar/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "يرجى إدخال عنوان البريد الإلكتروني الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.", "enter_email_address": "ادخل عنوان البريد الإلكتروني", "password_reset_sent": "إعادة تعيين كلمة السر أرسلت", - "invalid_email": "بريد إلكتروني غير صالح أو غير موجود" + "invalid_email": "بريد إلكتروني غير صالح أو غير موجود", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/ar/search.json b/public/language/ar/search.json index 581a791905..50b985d452 100644 --- a/public/language/ar/search.json +++ b/public/language/ar/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/ar/users.json b/public/language/ar/users.json index b37bca619f..a842def62b 100644 --- a/public/language/ar/users.json +++ b/public/language/ar/users.json @@ -5,7 +5,7 @@ "search": "بحث", "enter_username": "أدخل اسم مستخدم للبحث", "load_more": "حمل المزيد", - "users-found-search-took": "تم إيجاد %1 مستخدمـ(ين)! استغرق البحث %2 ميليثانية.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/bn/email.json b/public/language/bn/email.json index b151164f2f..91169e5549 100644 --- a/public/language/bn/email.json +++ b/public/language/bn/email.json @@ -9,6 +9,9 @@ "reset.text1": "আমরা আপনার পাসওয়ার্ড রিসেট করার অনুরোধ পেয়েছি, সম্ভবত আপনি আপনার পাসওয়ার্ড ভুলে গিয়েছেন বলেই। তবে যদি তা না হয়ে থাকে, তাহলে এই মেইলকে উপেক্ষা করতে পারেন।", "reset.text2": "পাসওয়ার্ড রিসেট করতে নিচের লিংকে ক্লিক করুন", "reset.cta": "পাসওয়ার্ড রিসেট করতে এখানে ক্লিক করুন", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "%1 থেকে আনরিড নোটিফিকেশন আছে।", "digest.latest_topics": "%1 এর সর্বশেষ টপিকসমূহ", "digest.cta": "%1 ভিজিট করতে এখানে ক্লিক করুন", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index ea1240c0ad..d1abf066d9 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -35,6 +35,7 @@ "topic-locked": "টপিক বন্ধ", "still-uploading": "আপলোড সম্পূর্ণ জন্য অনুগ্রহ করে অপেক্ষা করুন", "content-too-short": "অনুগ্রহকরে অপেক্ষকৃত বড় পোষ্ট করুন। একটি পোষ্টে নূন্যতম %1 অক্ষর থাকতে হবে।", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "অনুগ্রহপূর্বক বড় শিরোনাম ব্যাবহার করুন। শিরোনামের জন্য নূন্যতম %1 অক্ষর ব্যাবহার করতে হবে।", "title-too-long": "অনুগ্রহ করে সংক্ষিপ্ত শিরোনাম লিখুন। শিরোনাম %1 অক্ষরের বেশি হতে পারবে না।", "too-many-posts": "আপনি প্রতি %1 সেকেন্ডে একবার পোষ্ট করতে পারবেন। পরবর্তী পোষ্ট করার জন্য অপেক্ষা করুন। ", diff --git a/public/language/bn/pages.json b/public/language/bn/pages.json index 1e28db3a2d..4ab90a11a2 100644 --- a/public/language/bn/pages.json +++ b/public/language/bn/pages.json @@ -11,6 +11,7 @@ "user.followers": "যারা %1 কে অনুসরণ করেন", "user.posts": "%1 এর পোস্ট সমুহ", "user.topics": "%1 এর টপিক সমুহ", + "user.groups": "%1's Groups", "user.favourites": "%1'র প্রিয় পোস্টগুলো", "user.settings": "সদস্য সেটিংস", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/bn/reset_password.json b/public/language/bn/reset_password.json index d4aa6415c1..5643e1c427 100644 --- a/public/language/bn/reset_password.json +++ b/public/language/bn/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "অনুগ্রহপূর্বক আপনার ইমেইল এড্রেস প্রদান করুন, আমরা আপনাকে আপনার পাসওয়ার্ড রিসেট সম্পর্কিত তথ্যাবলী ইমেইলে পাঠিয়ে দিবো। ", "enter_email_address": "আপনার ইমেইল এড্রেস", "password_reset_sent": "পাসওয়ার্ড রিসেট মেইল পাঠানো হয়েছে", - "invalid_email": "ভুল ইমেইল / ইমেইল ডেটাবেইজে নেই" + "invalid_email": "ভুল ইমেইল / ইমেইল ডেটাবেইজে নেই", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/bn/search.json b/public/language/bn/search.json index eafce184ec..0038567599 100644 --- a/public/language/bn/search.json +++ b/public/language/bn/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/bn/users.json b/public/language/bn/users.json index 5d7dbd5cec..402aa33c27 100644 --- a/public/language/bn/users.json +++ b/public/language/bn/users.json @@ -5,7 +5,7 @@ "search": "খুঁজুন", "enter_username": "ইউজারনেম এর ভিত্তিতে সার্চ করুন", "load_more": "আরো লোড করুন", - "users-found-search-took": "%1 সদস্য(দের) খুঁজে পাওয়া গিয়েছে! সময় লেগেছে %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/cs/email.json b/public/language/cs/email.json index 27a2f06198..a259648e70 100644 --- a/public/language/cs/email.json +++ b/public/language/cs/email.json @@ -9,6 +9,9 @@ "reset.text1": "Obdrželi jsme požadavek na obnovu hesla, pravděpodobně kvůli tomu, že jste ho zapomněli. Pokud to není tento případ, ignorujte, prosím, tento email.", "reset.text2": "Přejete-li si pokračovat v obnově vašeho hesla, klikněte, prosím, na následující odkaz:", "reset.cta": "Klikněte zde, chcete-li obnovit vaše heslo", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Máte tu nepřečtená oznámení od %1:", "digest.latest_topics": "Nejnovější témata od %1", "digest.cta": "Kliknutím zde navštívíte %1", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index c5ae30c511..f858b2b15f 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -35,6 +35,7 @@ "topic-locked": "Téma uzamčeno", "still-uploading": "Vyčkejte, prosím, nežli se vše kompletně nahraje.", "content-too-short": "Vložte, prosím, delší příspěvek. Příspěvky by měly obsahovat nejméně %1 znaků.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Vložte, prosím, delší titulek. Titulky by měly obsahovat nejméně %1 znaků.", "title-too-long": "Vložte, prosím, kratší titulek. Titulky by neměly být delší, než-li %1 znaků.", "too-many-posts": "Své příspěvky můžete odesílat po %1 sekundách - vyčkejte, prosím, před dalším odesláním", diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json index b77b6411ba..15386435af 100644 --- a/public/language/cs/pages.json +++ b/public/language/cs/pages.json @@ -11,6 +11,7 @@ "user.followers": "People who Follow %1", "user.posts": "Posts made by %1", "user.topics": "Topics created by %1", + "user.groups": "%1's Groups", "user.favourites": "%1's Favourite Posts", "user.settings": "User Settings", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/cs/reset_password.json b/public/language/cs/reset_password.json index 41dce1549f..ba87244661 100644 --- a/public/language/cs/reset_password.json +++ b/public/language/cs/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Zadejte svou emailovou adresu a my Vám pošleme informace, jak můžete obnovit své heslo.", "enter_email_address": "Zadejte emailovou adresu", "password_reset_sent": "Obnova hesla odeslána", - "invalid_email": "Špatný email / Email neexistuje!" + "invalid_email": "Špatný email / Email neexistuje!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/cs/search.json b/public/language/cs/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/cs/search.json +++ b/public/language/cs/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/cs/users.json b/public/language/cs/users.json index fe3e7cb9b7..22b698a8c0 100644 --- a/public/language/cs/users.json +++ b/public/language/cs/users.json @@ -5,7 +5,7 @@ "search": "Vyhledávat", "enter_username": "Zadej uživatelské jméno k hledání", "load_more": "Načíst další", - "users-found-search-took": "Nazelezeno: %1 uživetel(ů)! Vyhledání trvalo %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/de/category.json b/public/language/de/category.json index f455b1604b..e3d45d3af8 100644 --- a/public/language/de/category.json +++ b/public/language/de/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Neues Thema", - "no_topics": "Es gibt noch keine Themen in dieser Kategorie.
    Warum beginnst du nicht das erste?", + "no_topics": "Es gibt noch keine Themen in dieser Kategorie.
    Warum beginnst du nicht eins?", "browsing": "Aktiv", "no_replies": "Niemand hat geantwortet", "share_this_category": "Teile diese Kategorie", diff --git a/public/language/de/email.json b/public/language/de/email.json index 4236feca0b..b60e620dd8 100644 --- a/public/language/de/email.json +++ b/public/language/de/email.json @@ -9,6 +9,9 @@ "reset.text1": "Wir haben eine Anfrage auf Zurücksetzung deines Passworts erhalten, wahrscheinlich, weil du es vergessen hast. Falls dies nicht der Fall ist, ignoriere bitte diese E-Mail.", "reset.text2": "Klicke bitte auf den folgenden Link, um mit der Zurücksetzung deines Passworts fortzufahren:", "reset.cta": "Klicke hier, um dein Passwort zurückzusetzen", + "reset.notify.subject": "Passwort erfolgreich geändert", + "reset.notify.text1": "Wir benachrichtigen dich das am %1, dein Passwort erfolgreich geändert wurde.", + "reset.notify.text2": "Wenn du das nicht autorisiert hast, bitte benachrichtige umgehend einen Administrator.", "digest.notifications": "Du hast ungelesene Benachrichtigungen von %1:", "digest.latest_topics": "Aktuellste Themen vom %1", "digest.cta": "Klicke hier, um %1 zu besuchen", diff --git a/public/language/de/error.json b/public/language/de/error.json index 376b75f62d..b2deb8a2d3 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -2,7 +2,7 @@ "invalid-data": "Daten ungültig", "not-logged-in": "Du bist nicht angemeldet.", "account-locked": "Dein Account wurde vorübergehend gesperrt.", - "search-requires-login": "Die Suche erfordert ein Konto! Bitte log dich ein oder registrieren dich!", + "search-requires-login": "Die Suche erfordert ein Konto! Bitte log dich ein oder registriere dich!", "invalid-cid": "Ungültige Kategorie-ID", "invalid-tid": "Ungültige Themen-ID", "invalid-pid": "Ungültige Beitrags-ID", @@ -35,6 +35,7 @@ "topic-locked": "Thema ist gesperrt", "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.", "content-too-short": "Bitte gib einen längeren Beitrag ein. Beiträge sollten mindestens %1 Zeichen enthalten.", + "content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht mehr als %1 Zeichen enthalten.", "title-too-short": "Bitte gib einen längeren Titel ein. Titel sollten mindestens %1 Zeichen enthalten.", "title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.", "too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen - bitte warte, bevor du einen neuen Beitrag erstellst", diff --git a/public/language/de/pages.json b/public/language/de/pages.json index 277678114f..78b7c7469d 100644 --- a/public/language/de/pages.json +++ b/public/language/de/pages.json @@ -11,6 +11,7 @@ "user.followers": "Nutzer, die %1 folgen", "user.posts": "Beiträge von %1", "user.topics": "Themen von %1", + "user.groups": "%1's Gruppen", "user.favourites": "Von %1 favorisierte Beiträge", "user.settings": "Benutzer-Einstellungen", "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.", diff --git a/public/language/de/reset_password.json b/public/language/de/reset_password.json index bbbfae1249..02d9329f7d 100644 --- a/public/language/de/reset_password.json +++ b/public/language/de/reset_password.json @@ -10,5 +10,7 @@ "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": "E-Mail Adresse eingeben", "password_reset_sent": "Passwortzurücksetzung beantragt.", - "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!" + "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!", + "password_too_short": "Das eingegebene Passwort ist zu kurz, bitte wähle ein anderes Passwort.", + "passwords_do_not_match": "Die eingegebenen Passwörter stimmen nicht überein." } \ No newline at end of file diff --git a/public/language/de/search.json b/public/language/de/search.json index 80f5d100a7..d817f2aa7f 100644 --- a/public/language/de/search.json +++ b/public/language/de/search.json @@ -3,5 +3,33 @@ "no-matches": "Keine Ergebnisse gefunden", "in": "In", "by": "Bei", - "posted-by": "Geschrieben von" + "titles": "Titel", + "titles-posts": "Titel und Beiträge", + "posted-by": "Geschrieben von", + "in-categories": "In Kategorien", + "search-child-categories": "Suche in Unterkategorien", + "reply-count": "Antwort Anzahl", + "at-least": "Mindestens", + "at-most": "Höchstens", + "post-time": "Beitrags Zeit", + "newer-than": "Neuer als", + "older-than": "Älter als", + "any-date": "Jeder Zeitpunkt", + "yesterday": "Gestern", + "one-week": "Eine Woche", + "two-weeks": "Zwei Wochen", + "one-month": "Ein Monat", + "three-months": "Drei Monate", + "six-months": "Sechs Monate", + "one-year": "Ein Jahr", + "sort-by": "Sortieren nach", + "last-reply-time": "Letzter Antwort Zeitpunkt", + "topic-title": "Thementitel", + "number-of-replies": "Anzahl von Antworten", + "number-of-views": "Anzahl der Aufrufe", + "topic-start-date": "Thema Startdatum", + "username": "Benutzername", + "category": "Kategorie", + "descending": "In absteigender Reihenfolge", + "ascending": "In aufsteigender Reihenfolge" } \ No newline at end of file diff --git a/public/language/el/email.json b/public/language/el/email.json index 6563d675d5..c4a52f1ffa 100644 --- a/public/language/el/email.json +++ b/public/language/el/email.json @@ -9,6 +9,9 @@ "reset.text1": "Λάβαμε ένα αίτημα για επαναφορά του κωδικού σου, πιθανότατα γιατί τον ξέχασες. Αν δεν έκανες εσύ αυτό το αίτημα, αγνόησε αυτό το email.", "reset.text2": "Για να κάνεις την επαναφορά του κωδικού σου, παρακαλώ πάτα στο παρακάτω σύνδεσμο:", "reset.cta": "Κάνε κλικ εδώ για να επαναφέρεις τον κωδικό σου", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Πρόσφατα θέματα στο %1", "digest.cta": "Κάνε κλικ εδώ για να επισκεφτείς το %1", diff --git a/public/language/el/error.json b/public/language/el/error.json index e072c910f8..9cadac2731 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -35,6 +35,7 @@ "topic-locked": "Το θέμα έχει κλειδωθεί", "still-uploading": "Παρακαλώ περίμενε να τελειώσει το ανέβασμα των αρχείων.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Παρακαλώ γράψε έναν μικρότερο τίτλο. Δεν μπορεί να είναι μεγαλύτερος από %1 χαρακτήρες.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/el/pages.json b/public/language/el/pages.json index 04301ee967..0b9a89746e 100644 --- a/public/language/el/pages.json +++ b/public/language/el/pages.json @@ -11,6 +11,7 @@ "user.followers": "Άτομα που ακολουθούν τον/την %1", "user.posts": "Δημοσιεύσεις από τον/την %1", "user.topics": "Θέματα από τον/την %1", + "user.groups": "%1's Groups", "user.favourites": "Οι αγαπημένες δημοσιεύσεις του/της %1", "user.settings": "Επιλογές Χρήστη", "maintenance.text": "Το %1 αυτή την στιγμή συντηρείται. Παρακαλώ έλα αργότερα.", diff --git a/public/language/el/reset_password.json b/public/language/el/reset_password.json index e088a5bd9f..1ceecfd014 100644 --- a/public/language/el/reset_password.json +++ b/public/language/el/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Παρακαλώ γράψε την διεύθυνση email σου και θα σου στείλουμε ένα email με οδηγίες για το πως να επαναφέρεις τον λογαριασμό σου.", "enter_email_address": "Εισαγωγή Διεύθυνσης Email", "password_reset_sent": "Η Επαναφορά Κωδικού Εστάλη", - "invalid_email": "Άκυρο Email / Το email δεν υπάρχει!" + "invalid_email": "Άκυρο Email / Το email δεν υπάρχει!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/el/search.json b/public/language/el/search.json index fd5d9fa97e..eb08d6b538 100644 --- a/public/language/el/search.json +++ b/public/language/el/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/el/users.json b/public/language/el/users.json index 7a668b12a8..aae33e825c 100644 --- a/public/language/el/users.json +++ b/public/language/el/users.json @@ -5,7 +5,7 @@ "search": "Αναζήτηση", "enter_username": "Γράψε ένα όνομα χρήστη προς αναζήτηση", "load_more": "Φόρτωση περισσότερων", - "users-found-search-took": "%1 χρήστης(ες) βρέθηκαν! Η αναζήτηση πήρε %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/en@pirate/email.json b/public/language/en@pirate/email.json index e3199a9b14..f290435e75 100644 --- a/public/language/en@pirate/email.json +++ b/public/language/en@pirate/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json index 6079502fae..9bbcf03247 100644 --- a/public/language/en@pirate/error.json +++ b/public/language/en@pirate/error.json @@ -35,6 +35,7 @@ "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/en@pirate/pages.json b/public/language/en@pirate/pages.json index b77b6411ba..15386435af 100644 --- a/public/language/en@pirate/pages.json +++ b/public/language/en@pirate/pages.json @@ -11,6 +11,7 @@ "user.followers": "People who Follow %1", "user.posts": "Posts made by %1", "user.topics": "Topics created by %1", + "user.groups": "%1's Groups", "user.favourites": "%1's Favourite Posts", "user.settings": "User Settings", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/en@pirate/reset_password.json b/public/language/en@pirate/reset_password.json index dcdf4e76b6..ba9f012ea6 100644 --- a/public/language/en@pirate/reset_password.json +++ b/public/language/en@pirate/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Please enter your email address and we will send you an email with instructions on how to reset your account.", "enter_email_address": "Enter Email Address", "password_reset_sent": "Password Reset Sent", - "invalid_email": "Invalid Email / Email does not exist!" + "invalid_email": "Invalid Email / Email does not exist!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/en@pirate/search.json b/public/language/en@pirate/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/en@pirate/search.json +++ b/public/language/en@pirate/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/en@pirate/users.json b/public/language/en@pirate/users.json index adbfee83cc..daabbb899c 100644 --- a/public/language/en@pirate/users.json +++ b/public/language/en@pirate/users.json @@ -5,7 +5,7 @@ "search": "Search", "enter_username": "Gimme y'er handle", "load_more": "Load More", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/en_US/email.json b/public/language/en_US/email.json index e3199a9b14..f290435e75 100644 --- a/public/language/en_US/email.json +++ b/public/language/en_US/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json index 6079502fae..9bbcf03247 100644 --- a/public/language/en_US/error.json +++ b/public/language/en_US/error.json @@ -35,6 +35,7 @@ "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/en_US/pages.json b/public/language/en_US/pages.json index d96ee1a8e6..c6d577d2f5 100644 --- a/public/language/en_US/pages.json +++ b/public/language/en_US/pages.json @@ -11,6 +11,7 @@ "user.followers": "People who Follow %1", "user.posts": "Posts made by %1", "user.topics": "Topics created by %1", + "user.groups": "%1's Groups", "user.favourites": "%1's Favorite Posts", "user.settings": "User Settings", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/en_US/reset_password.json b/public/language/en_US/reset_password.json index dcdf4e76b6..ba9f012ea6 100644 --- a/public/language/en_US/reset_password.json +++ b/public/language/en_US/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Please enter your email address and we will send you an email with instructions on how to reset your account.", "enter_email_address": "Enter Email Address", "password_reset_sent": "Password Reset Sent", - "invalid_email": "Invalid Email / Email does not exist!" + "invalid_email": "Invalid Email / Email does not exist!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/en_US/search.json b/public/language/en_US/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/en_US/search.json +++ b/public/language/en_US/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/en_US/users.json b/public/language/en_US/users.json index a06aee2734..0038dcffc4 100644 --- a/public/language/en_US/users.json +++ b/public/language/en_US/users.json @@ -5,7 +5,7 @@ "search": "Search", "enter_username": "Enter a username to search", "load_more": "Load More", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/es/email.json b/public/language/es/email.json index 870687c4e6..fd42293e1b 100644 --- a/public/language/es/email.json +++ b/public/language/es/email.json @@ -9,6 +9,9 @@ "reset.text1": "Recibimos una solicitud para reiniciar tu contraseña, posiblemente porque la olvidaste. Si no es así, por favor ignora este email.", "reset.text2": "Para continuar con el reinicio de contraseña, por favor cliquea en el siguiente vínculo:", "reset.cta": "Cliquea aquí para reiniciar tu contraseña", + "reset.notify.subject": "Se ha modificado correctamente la contraseña.", + "reset.notify.text1": "Te estamos notificando que a a %1, tu contraseña ha sido cambiado correctamente.", + "reset.notify.text2": "Si no has sido tu, por favor notifica al administrador inmediatamente.", "digest.notifications": "Tiene notificaciones sin leer de %1:", "digest.latest_topics": "Últimos temas de %1", "digest.cta": "Cliquea aquí para visitar %1", diff --git a/public/language/es/error.json b/public/language/es/error.json index 1c4f54397b..7a79b28ba4 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -35,6 +35,7 @@ "topic-locked": "Tema bloqueado", "still-uploading": "Por favor, espera a que terminen las subidas.", "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caracteres.", + "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caracteres.", "title-too-short": "Por favor introduzca un título más largo. Los títulos deben contener al menos %1 caracteres.", "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.", "too-many-posts": "Solo puedes publicar una vez cada %1 segundos - por favor espere antes de volver a publicar", diff --git a/public/language/es/pages.json b/public/language/es/pages.json index 27d9ca8f67..4cd102fdf0 100644 --- a/public/language/es/pages.json +++ b/public/language/es/pages.json @@ -11,6 +11,7 @@ "user.followers": "Seguidores de %1", "user.posts": "Mensajes de %1", "user.topics": "Temas creados por %1", + "user.groups": "%1's Grupos", "user.favourites": "Publicaciones favoritas de %1 ", "user.settings": "Preferencias de usuario", "maintenance.text": "%1 está en mantenimiento actualmente. Por favor vuelva en otro momento.", diff --git a/public/language/es/reset_password.json b/public/language/es/reset_password.json index ea8e2b1fac..da269f5448 100644 --- a/public/language/es/reset_password.json +++ b/public/language/es/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Por favor ingresa tu correo electrónico y te enviaremos un mensaje con indicaciones para restablecer tu cuenta.", "enter_email_address": "Introduce tu correo electrónico", "password_reset_sent": "Restablecimiento de contraseña enviado", - "invalid_email": "¡Correo electrónico no válido o inexistente!" + "invalid_email": "¡Correo electrónico no válido o inexistente!", + "password_too_short": "La contraseña introducida es demasiado corta, por favor introduzca una contraseña diferente.", + "passwords_do_not_match": "Las dos contraseñas introducidas no concuerdan." } \ No newline at end of file diff --git a/public/language/es/search.json b/public/language/es/search.json index 769c91f354..e23eea6ba8 100644 --- a/public/language/es/search.json +++ b/public/language/es/search.json @@ -3,5 +3,33 @@ "no-matches": "No se encontraron coincidencias", "in": "En", "by": "Por", - "posted-by": "Publicado por" + "titles": "Títulos", + "titles-posts": "Títulos y publicaciones", + "posted-by": "Publicado por", + "in-categories": "En categorías", + "search-child-categories": "Buscar categorías hijas", + "reply-count": "Número de Respuestas", + "at-least": "De mínimo", + "at-most": "De máximo", + "post-time": "Fecha de publicación", + "newer-than": "Más reciente que", + "older-than": "Más antiguo que", + "any-date": "Cualquier fecha", + "yesterday": "Ayer", + "one-week": "Una semana", + "two-weeks": "Dos semanas", + "one-month": "Un mes", + "three-months": "Tres meses", + "six-months": "Seis meses", + "one-year": "Un año", + "sort-by": "Ordenar por", + "last-reply-time": "Fecha de última respuesta", + "topic-title": "Título de tema", + "number-of-replies": "Número de respuestas", + "number-of-views": "Número de visualizaciones", + "topic-start-date": "Fecha de inicio del tema", + "username": "Usuario", + "category": "Categoría", + "descending": "En orden descendente", + "ascending": "En orden ascendente" } \ No newline at end of file diff --git a/public/language/es/users.json b/public/language/es/users.json index 529a6accb5..81668516cf 100644 --- a/public/language/es/users.json +++ b/public/language/es/users.json @@ -5,7 +5,7 @@ "search": "Buscar", "enter_username": "Ingresa el nombre de usuario que quieres buscar", "load_more": "Cargar más", - "users-found-search-took": "¡%1 usuario(s) encontrados! La búsqueda tardó %2 ms.", + "users-found-search-took": "¡%1 usuario(s) encontrado! La búsqueda ha llevado %2 segundos.", "filter-by": "Filtrar Por", "online-only": "Sólo en línea", "picture-only": "Sólo imagen" diff --git a/public/language/et/email.json b/public/language/et/email.json index e3199a9b14..f290435e75 100644 --- a/public/language/et/email.json +++ b/public/language/et/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/et/error.json b/public/language/et/error.json index ea2c2e9ff4..277568c591 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -35,6 +35,7 @@ "topic-locked": "Teema lukustatud", "still-uploading": "Palun oota, kuni üleslaadimised on laetud.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Palun sisesta lühem pealkiri. Pealkirjad ei saa olla pikemad kui %1 tähemärki.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/et/pages.json b/public/language/et/pages.json index be7537527b..4a8ef6408f 100644 --- a/public/language/et/pages.json +++ b/public/language/et/pages.json @@ -11,6 +11,7 @@ "user.followers": "Kasutajad, kes jälgivad %1", "user.posts": "Postitused, mis on tehtud kasutaja %1 poolt", "user.topics": "Teemad on kirjutanud %1", + "user.groups": "%1's Groups", "user.favourites": "%1's lemmikud postitused", "user.settings": "Kasutaja sätted", "maintenance.text": "%1 foorumil on käimas hooldustööd. Palun külastage meid mõne aja pärast uuesti.", diff --git a/public/language/et/reset_password.json b/public/language/et/reset_password.json index c504ed9296..98e4fe4fae 100644 --- a/public/language/et/reset_password.json +++ b/public/language/et/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Palun sisesta oma emaili aadress ja me saadame sulle emaili koos õpetusega, kuidas oma parooli vahetada.", "enter_email_address": "Sisesta emaili aadress", "password_reset_sent": "Saadetud", - "invalid_email": "Vigane emaili aadress / emaili aadressi ei ekisteeri!" + "invalid_email": "Vigane emaili aadress / emaili aadressi ei ekisteeri!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/et/search.json b/public/language/et/search.json index 840538a793..448f45b055 100644 --- a/public/language/et/search.json +++ b/public/language/et/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/et/users.json b/public/language/et/users.json index 4782d131f5..ac83e6b160 100644 --- a/public/language/et/users.json +++ b/public/language/et/users.json @@ -5,7 +5,7 @@ "search": "Otsi", "enter_username": "Sisesta kasutajanimi, keda soovid otsida", "load_more": "Lae veel", - "users-found-search-took": "%1kasutaja(t) leiti! Otsing kestis %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/fa_IR/email.json b/public/language/fa_IR/email.json index 79cf1e91cf..206fe1823b 100644 --- a/public/language/fa_IR/email.json +++ b/public/language/fa_IR/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "برای تنظیم مجدد گذرواژه‌ی خود اینجا کلیک کنید", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "برای دیدن 1% اینجا کلیک کنید", diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index 61736c18c4..e99118134c 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -35,6 +35,7 @@ "topic-locked": "جستار بسته شد.", "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "خواهشمندیم عنوان کوتاه‌تری بنویسید. عنوان‌ها نمی‌توانند بیش‌تر از %1 نویسه داشته باشند.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/fa_IR/pages.json b/public/language/fa_IR/pages.json index ec3b4e6800..42dacfa193 100644 --- a/public/language/fa_IR/pages.json +++ b/public/language/fa_IR/pages.json @@ -11,6 +11,7 @@ "user.followers": "کاربرانی که %1 را دنبال می‌کنند", "user.posts": "دیدگاه‌های %1", "user.topics": "%1 این جستار را ساخت.", + "user.groups": "%1's Groups", "user.favourites": "دیدگاه‌های پسندیدهٔ %1", "user.settings": "تنظیمات کاربر", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/fa_IR/reset_password.json b/public/language/fa_IR/reset_password.json index a0171f831c..5e6ea61461 100644 --- a/public/language/fa_IR/reset_password.json +++ b/public/language/fa_IR/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "لطفا نشانی رایانامهٔ خود را بنویسید و ما دستورکار بازیابی شناسه‌تان را به این رایانامه می‌فرستیم.", "enter_email_address": "نوشتن نشانی رایانامه", "password_reset_sent": "رایانامهٔ بازیابی گذرواژه فرستاده شد", - "invalid_email": "رایانامهٔ نامعتبر / رایانامه وجود ندارد!" + "invalid_email": "رایانامهٔ نامعتبر / رایانامه وجود ندارد!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/fa_IR/search.json b/public/language/fa_IR/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/fa_IR/search.json +++ b/public/language/fa_IR/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/fa_IR/users.json b/public/language/fa_IR/users.json index aec64b6020..b164bd0839 100644 --- a/public/language/fa_IR/users.json +++ b/public/language/fa_IR/users.json @@ -5,7 +5,7 @@ "search": "جستجو", "enter_username": "یک نام کاربری برای جستجو وارد کنید", "load_more": "بارگذاری بیش‌تر", - "users-found-search-took": "%1 کاربر() در مدت زمان %2 میلی ثانیه یافت شد!", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/fi/email.json b/public/language/fi/email.json index e3199a9b14..f290435e75 100644 --- a/public/language/fi/email.json +++ b/public/language/fi/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index a9f843b34a..813f7896e2 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -35,6 +35,7 @@ "topic-locked": "Aihe lukittu", "still-uploading": "Ole hyvä ja odota tiedostojen lähettämisen valmistumista.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Otsikkosi on liian pitkä. Otsikoiden pituuden tulee olla enintään %1 merkkiä.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json index 22b1b20306..07d941a4dc 100644 --- a/public/language/fi/pages.json +++ b/public/language/fi/pages.json @@ -11,6 +11,7 @@ "user.followers": "Käyttäjät, jotka seuraavat käyttäjää %1", "user.posts": "Käyttäjän %1 kirjoittamat viestit", "user.topics": "Käyttäjän %1 aloittamat aiheet", + "user.groups": "%1's Groups", "user.favourites": "Käyttäjän %1 suosikkiviestit", "user.settings": "Käyttäjän asetukset", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/fi/reset_password.json b/public/language/fi/reset_password.json index 071287708d..9d78c5f372 100644 --- a/public/language/fi/reset_password.json +++ b/public/language/fi/reset_password.json @@ -10,5 +10,7 @@ "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": "Syötä sähköpostiosoite", "password_reset_sent": "Salasanan palautuskoodi lähetetty", - "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!" + "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/fi/search.json b/public/language/fi/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/fi/search.json +++ b/public/language/fi/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/fi/users.json b/public/language/fi/users.json index 67556152ae..f1cca4ea56 100644 --- a/public/language/fi/users.json +++ b/public/language/fi/users.json @@ -5,7 +5,7 @@ "search": "Hae", "enter_username": "Syötä käyttäjätunnus hakeaksesi", "load_more": "Lataa lisää", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/fr/email.json b/public/language/fr/email.json index 0e4f57d601..a3b80ecd21 100644 --- a/public/language/fr/email.json +++ b/public/language/fr/email.json @@ -9,6 +9,9 @@ "reset.text1": "Nous avons reçu une demande de réinitialisation de votre mot de passe, probablement parce que vous l'avez oublié. Si ce n'est pas le cas, veuillez ignorer cet email.", "reset.text2": "Pour confirmer la réinitialisation de votre mot de passe, veuillez cliquer sur le lien suivant :", "reset.cta": "Cliquez ici pour réinitialiser votre mot de passe", + "reset.notify.subject": "Mot de Passe modifié", + "reset.notify.text1": "Nous vous informons que le %1, votre mot de passe a été modifié.", + "reset.notify.text2": "Si vous n'avez pas autorisé ceci, veuillez contacter immédiatement un administrateur.", "digest.notifications": "Vous avez des notifications non-lues de %1 :", "digest.latest_topics": "Derniers sujets de %1 :", "digest.cta": "Cliquez ici pour aller sur %1", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 50507ebd02..bfa70c579c 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -35,6 +35,7 @@ "topic-locked": "Sujet verrouillé", "still-uploading": "Veuillez patienter pendant le téléchargement.", "content-too-short": "Veuillez entrer un message plus long. %1 caractères minimum.", + "content-too-long": "Veuillez poster un message plus cours. Les messages ne peuvent être plus long que %1 caractères.", "title-too-short": "Veuillez entrer un titre plus long. %1 caractères minimum.", "title-too-long": "Veuillez entrer un titre plus court. Les titres ne peuvent excéder %1 caractères.", "too-many-posts": "Vous ne pouvez poster que toutes les %1 secondes.", diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json index 1085bcfc21..7698a55986 100644 --- a/public/language/fr/pages.json +++ b/public/language/fr/pages.json @@ -11,6 +11,7 @@ "user.followers": "Personnes qui suivent %1", "user.posts": "Message écrit par %1", "user.topics": "Sujets créés par %1", + "user.groups": "Les Groupes de %1", "user.favourites": "Messages favoris de %1", "user.settings": "Préférences utilisateur", "maintenance.text": "%1 est en maintenance. Veuillez revenir un peu plus tard.", diff --git a/public/language/fr/reset_password.json b/public/language/fr/reset_password.json index 00e531a9c4..f21186c870 100644 --- a/public/language/fr/reset_password.json +++ b/public/language/fr/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Veuillez entrer votre adresse email pour recevoir un email contenant les instructions permettant de réinitialiser votre compte.", "enter_email_address": "Entrer votre adresse email", "password_reset_sent": "La demande de réinitialisation du mot de passe a bien été envoyée", - "invalid_email": "Email invalide / L'email n'existe pas !" + "invalid_email": "Email invalide / L'email n'existe pas !", + "password_too_short": "Le mot de passe est trop court, veuillez entre un mot de passe différent.", + "passwords_do_not_match": "Les deux mots de passe saisient ne correspondent pas." } \ No newline at end of file diff --git a/public/language/fr/search.json b/public/language/fr/search.json index b8cdfc8d2a..20e22d2fa0 100644 --- a/public/language/fr/search.json +++ b/public/language/fr/search.json @@ -3,5 +3,33 @@ "no-matches": "Aucune réponse trouvée", "in": "Dans", "by": "Par", - "posted-by": "Posté par" + "titles": "Titres", + "titles-posts": "Titres et Messages", + "posted-by": "Posté par", + "in-categories": "Dans les catégories", + "search-child-categories": "Chercher les sous catégories", + "reply-count": "Nombre de réponses", + "at-least": "Au moins", + "at-most": "Au plus", + "post-time": "Date de message", + "newer-than": "Plus récent que", + "older-than": "Plus vieux que", + "any-date": "Toute date", + "yesterday": "Hier", + "one-week": "Une semaine", + "two-weeks": "Deux semaines", + "one-month": "Un mois", + "three-months": "Trois mois", + "six-months": "Six mois", + "one-year": "Un an", + "sort-by": "Trier par", + "last-reply-time": "Date de dernière réponse", + "topic-title": "Titre de sujet", + "number-of-replies": "Nombre de réponses", + "number-of-views": "Nombre de vues", + "topic-start-date": "Date de création du sujet", + "username": "Nom d'utilisateur", + "category": "Catgorie", + "descending": "Par ordre décroissant", + "ascending": "Par ordre croissant" } \ No newline at end of file diff --git a/public/language/fr/users.json b/public/language/fr/users.json index 8d2c4481ea..1028292a9b 100644 --- a/public/language/fr/users.json +++ b/public/language/fr/users.json @@ -5,7 +5,7 @@ "search": "Rechercher", "enter_username": "Entrer un nom d'utilisateur pour rechercher", "load_more": "Charger la suite", - "users-found-search-took": "%1 utilisateur(s) trouvé(s) ! Recherche effectuée en %2 ms.", + "users-found-search-took": "%1 utilisateur(s) trouvé(s)! La recherche a pris %2 secondes.", "filter-by": "Filtrer Par", "online-only": "En Ligne uniquement", "picture-only": "Avec Image uniquement" diff --git a/public/language/he/category.json b/public/language/he/category.json index bc5e530729..86292076b6 100644 --- a/public/language/he/category.json +++ b/public/language/he/category.json @@ -4,5 +4,5 @@ "browsing": "צופים בנושא זה כעת", "no_replies": "אין תגובות", "share_this_category": "שתף קטגוריה זו", - "ignore": "Ignore" + "ignore": "התעלם" } \ No newline at end of file diff --git a/public/language/he/email.json b/public/language/he/email.json index e3199a9b14..8743ba21d8 100644 --- a/public/language/he/email.json +++ b/public/language/he/email.json @@ -1,25 +1,28 @@ { - "password-reset-requested": "Password Reset Requested - %1!", - "welcome-to": "Welcome to %1", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", - "welcome.text1": "Thank you for registering with %1!", - "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", - "welcome.cta": "Click here to confirm your email address", - "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", - "reset.text2": "To continue with the password reset, please click on the following link:", - "reset.cta": "Click here to reset your password", - "digest.notifications": "You have unread notifications from %1:", - "digest.latest_topics": "Latest topics from %1", - "digest.cta": "Click here to visit %1", - "digest.unsub.info": "This digest was sent to you due to your subscription settings.", - "digest.no_topics": "There have been no active topics in the past %1", - "notif.chat.subject": "New chat message received from %1", - "notif.chat.cta": "Click here to continue the conversation", - "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", - "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", - "unsub.cta": "Click here to alter those settings", - "closing": "Thanks!" + "password-reset-requested": "בקשת איפוס הסיסמה נשלחה - %1!", + "welcome-to": "ברוכים הבאים ל%1", + "greeting_no_name": "שלום", + "greeting_with_name": "שלום %1", + "welcome.text1": "תודה שנרשמת ל%1!", + "welcome.text2": "על מנת להפעיל את החשבון שלך, אנו צריכים לוודא שאתה בעל חשבון המייל שנרשמת איתו.", + "welcome.cta": "לחץ כאן על מנת לאשר את כתובת המייל שלך.", + "reset.text1": "קיבלנו בקשה לאפס את הסיסמה לחשבון שלך, כנראה מפני ששכחת אותה. אם לא ביקשת לאפס את הסיסמה, אנא התעלם ממייל זה.", + "reset.text2": "על מנת להמשיך עם תהליך איפוס הסיסמה, אנא לחץ על הלינק הבא:", + "reset.cta": "לחץ כאן לאפס את הסיסמה שלך.", + "reset.notify.subject": "הסיסמה שונתה בהצלחה.", + "reset.notify.text1": "אנו מודיעים לך שב%1, סיסמתך שונתה בהצלחה.", + "reset.notify.text2": "אם לא אישרת בקשה זו, אנא הודע למנהל מיד.", + "digest.notifications": "יש לך התראה שלא נקראה מ%1:", + "digest.latest_topics": "נושאים אחרונים מ%1", + "digest.cta": "לחץ כאן כדי לבקר ב %1", + "digest.unsub.info": "תקציר זה נשלח אליך על-פי הגדרות החשבון שלך.", + "digest.no_topics": "אין נושאים פעילים ב%1 האחרון/ים", + "notif.chat.subject": "הודעת צ'אט חדשה התקבלה מ%1", + "notif.chat.cta": "לחץ כאן כדי להמשיך את השיחה", + "notif.chat.unsub.info": "התראה הצ'אט הזו נשלחה אליך על-פי הגדרות החשבון שלך.", + "notif.post.cta": "לחץ כאן בשביל לקרוא את כל הנושא", + "notif.post.unsub.info": "התראת הפוסט הזו נשלחה אליך על-פי הגדרות החשבון שלך.", + "test.text1": "זהו אימייל ניסיון על מנת לוודא שהגדרות המייל בוצעו כהלכה בהגדרות NodeBB.", + "unsub.cta": "לחץ כאן לשנות הגדרות אלו", + "closing": "תודה!" } \ No newline at end of file diff --git a/public/language/he/error.json b/public/language/he/error.json index 28a5461705..23d21ee1ae 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -12,62 +12,63 @@ "invalid-title": "כותרת שגויה", "invalid-user-data": "מידע משתמש שגוי", "invalid-password": "סיסמא שגויה", - "invalid-username-or-password": "Please specify both a username and password", - "invalid-search-term": "Invalid search term", + "invalid-username-or-password": "אנא הגדר שם משתמש וסיסמה", + "invalid-search-term": "מילת חיפוש לא תקינה", "invalid-pagination-value": "ערך דפדוף שגוי", "username-taken": "שם משתמש תפוס", "email-taken": "כתובת אימייל תפוסה", - "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed": "כתובת המייל שלך עוד לא אושרה, לחץ כאן על-מנת לאשר את המייל שלך.", + "email-not-confirmed-chat": "לא תוכל לדבר בצ'אט עד שלא תאשר את כתובת המייל שלך", "username-too-short": "שם משתמש קצר מדי", - "username-too-long": "Username too long", + "username-too-long": "שם משתמש ארוך מדי", "user-banned": "המשתמש חסום", - "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post", - "no-category": "Category does not exist", - "no-topic": "Topic does not exist", - "no-post": "Post does not exist", - "no-group": "Group does not exist", - "no-user": "User does not exist", - "no-teaser": "Teaser does not exist", - "no-privileges": "You do not have enough privileges for this action.", - "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", + "user-too-new": "מצטערים, אתה צריך לחכות %1 שניות לפני שתוכל לפרסם את הפוסט הראשון שלך", + "no-category": "קטגוריה אינה קיימת", + "no-topic": "נושא אינו קיים", + "no-post": "פוסט אינו קיים", + "no-group": "קבוצה אינה קיימת", + "no-user": "משתמש אינו קיים", + "no-teaser": "תקציר אינו קיים", + "no-privileges": "ההרשאות שלך אינן מספיקות לביצוע פעולה זו", + "no-emailers-configured": "לא נמצאו פלאגינים למייל, לכן אין אפשרות לשלוח מייל ניסיון.", "category-disabled": "קטגוריה לא פעילה", "topic-locked": "נושא נעול", "still-uploading": "אנא המתן לסיום ההעלאות", - "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", - "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", + "content-too-short": "יש להכניס פוסט ארוך יותר. פוסטים חייבים להכיל לפחות %1 תווים.", + "content-too-long": "יש לקצר את הפוסט. פוסטים אינם יכולים להיות ארוכים מ %1 תווים.", + "title-too-short": "יש להכניס כותרת ארוכה יותר. כותרות חייבות להכיל לפחות %1 תווים.", "title-too-long": "יש לקצר את הכותרת. כותרות אינן יכולות להיות ארוכות מ %1 תווים.", - "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", - "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", - "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", + "too-many-posts": "אתה יכול להעלות פוסט כל %1 שניות בלבד - אנא המתן.", + "too-many-posts-newbie": "כמשתמש חדש, אתה יכול להעלות פוסט כל %1 שניות עד שצברת %2 מוניטין - אנא המתן.", + "file-too-big": "גודל קובץ מקסימלי הינו %1 קילובייט - אנא העלה קובץ קטן יותר.", "cant-vote-self-post": "לא ניתן להצביע לפוסט שלך", - "already-favourited": "You have already favourited this post", - "already-unfavourited": "You have already unfavourited this post", + "already-favourited": "כבר הוספת פוסט זה למועדפים", + "already-unfavourited": "כבר הסרת פוסט זה מהמועדפים", "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1", + "invalid-image-extension": "פורמט תמונה לא תקין", "group-name-too-short": "שם הקבוצה קצר מדי", "group-already-exists": "הקבוצה כבר קיימת", "group-name-change-not-allowed": "לא ניתן לשנות את שם הקבוצה", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", - "post-already-deleted": "This post has already been deleted", - "post-already-restored": "This post has already been restored", - "topic-already-deleted": "This topic has already been deleted", - "topic-already-restored": "This topic has already been restored", + "group-already-member": "אתה כבר חבר בקבוצה זו", + "group-needs-owner": "קבוצה זו חייבת לפחות מנהל אחד", + "post-already-deleted": "פוסט זה כבר נמחק", + "post-already-restored": "פוסט זה כבר שוחזר", + "topic-already-deleted": "נושא זה כבר נמחק", + "topic-already-restored": "נושא זה כבר שוחזר", "topic-thumbnails-are-disabled": "תמונות ממוזערות לנושא אינן מאופשרות.", "invalid-file": "קובץ לא תקין", "uploads-are-disabled": "העלאת קבצים אינה מאופשרת", "upload-error": "שגיאה בהעלאה : %1", - "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", + "signature-too-long": "מצטערים, אורך החתימה המקסימלי הוא %1 תווים.", "cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!", - "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", - "too-many-messages": "You have sent too many messages, please wait awhile.", - "reputation-system-disabled": "Reputation system is disabled.", - "downvoting-disabled": "Downvoting is disabled", + "chat-restricted": "משתמש זה חסם את הודעות הצ'אט שלו ממשתמשים זרים. המשתמש חייב לעקוב אחריך לפני שתוכל לשוחח איתו בצ'אט", + "too-many-messages": "שלחת יותר מדי הודעות, אנא המתן לזמן מה.", + "reputation-system-disabled": "מערכת המוניטין לא פעילה.", + "downvoting-disabled": "היכולת להצביע נגד לא פעילה", "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה", - "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", - "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "not-enough-reputation-to-flag": "אין לך מוניטין מספק על מנת לסמן את הפוסט הזה", + "reload-failed": "אירעה תקלה ב NodeBB בזמן הטעינה של: \"%1\". המערכת תמשיך להגיש דפים קיימים, אבל כדאי שתשחזר את הפעולות שלך מהפעם האחרונה שהמערכת עבדה כראוי.", + "registration-error": "שגיאה בהרשמה", + "parse-error": "אירעה שגיאה בעת בעת ניתוח תגובת השרת" } \ No newline at end of file diff --git a/public/language/he/global.json b/public/language/he/global.json index 7a5d014492..da7f284644 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -3,10 +3,10 @@ "search": "חיפוש", "buttons.close": "סגור", "403.title": "גישה נדחתה", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "נראה שהגעת לעמוד שאין לך הרשאה לצפות בו", + "403.login": "נסה להתחבר.", "404.title": "לא נמצא", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "נראה שהגעת לעמוד שלא קיים. חזור לעמוד הבית", "500.title": "שגיאה פנימית.", "500.message": "אופס! נראה שמשהו השתבש!", "register": "הרשמה", @@ -27,7 +27,7 @@ "header.tags": "תגיות", "header.popular": "פופולרי", "header.users": "משתמשים", - "header.groups": "Groups", + "header.groups": "קבוצות", "header.chats": "צ'אטים", "header.notifications": "התראות", "header.search": "חיפוש", @@ -74,8 +74,8 @@ "guests": "אורחים", "updated.title": "הפורום עודכן", "updated.message": "הפורום עודכן לגרסא האחרונה. נא ללחוץ כאן לעדכון הדף.", - "privacy": "Privacy", - "follow": "Follow", - "unfollow": "Unfollow", - "delete_all": "Delete All" + "privacy": "פרטיות", + "follow": "עקוב", + "unfollow": "הפסק לעקוב", + "delete_all": "מחק הכל" } \ No newline at end of file diff --git a/public/language/he/groups.json b/public/language/he/groups.json index 6dfd71256b..54f7936c08 100644 --- a/public/language/he/groups.json +++ b/public/language/he/groups.json @@ -1,21 +1,21 @@ { - "groups": "Groups", - "view_group": "View Group", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", - "details.title": "Group Details", - "details.members": "Member List", - "details.pending": "Pending Members", - "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "groups": "קבוצות", + "view_group": "צפה בקבוצה", + "owner": "מנהל הקבוצה", + "new_group": "צור קבוצה חדשה", + "no_groups_found": "אין קבוצות לצפייה", + "cover-instructions": "גרור תמונה, הזז למיקום הרצוי ואז לחץ על שמור", + "cover-change": "שנה", + "cover-save": "שמור", + "cover-saving": "שומר", + "details.title": "פרטי הקבוצה", + "details.members": "רשימת חברי הקבוצה", + "details.pending": "חברי קבוצה הממתינים לאישור", + "details.has_no_posts": "חברי הקבוצה הזו לא העלו אף פוסט.", + "details.latest_posts": "פוסטים אחרונים", + "details.private": "קבוצה פרטית", + "details.public": "קבוצה פומבית", + "details.owner_options": "ניהול הקבוצה", + "event.updated": "פרטי הקבוצה עודכנו", + "event.deleted": "קבוצת \"%1\" נמחקה" } \ No newline at end of file diff --git a/public/language/he/modules.json b/public/language/he/modules.json index 521915ec96..43bf264e7b 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -1,20 +1,20 @@ { "chat.chatting_with": "שוחח עם ", - "chat.placeholder": "Type chat message here, press enter to send", + "chat.placeholder": "הקלד את הודעת הצ'אט כאן, לחץ אנטר לשליחה", "chat.send": "שלח", "chat.no_active": "אין לך צ'אטים פעילים", "chat.user_typing": "%1 מקליד ...", "chat.user_has_messaged_you": "ל%1 יש הודעה עבורך.", "chat.see_all": "צפה בכל הצ'אטים", - "chat.no-messages": "Please select a recipient to view chat message history", - "chat.recent-chats": "Recent Chats", - "chat.contacts": "Contacts", - "chat.message-history": "Message History", - "chat.pop-out": "Pop out chat", - "chat.maximize": "Maximize", - "chat.seven_days": "7 Days", - "chat.thirty_days": "30 Days", - "chat.three_months": "3 Months", + "chat.no-messages": "אנא בחר נמען על מנת לראות את היסטוריית הצ'אט איתו", + "chat.recent-chats": "צ'אטים אחרונים", + "chat.contacts": "אנשי קשר", + "chat.message-history": "היסטוריית הודעות", + "chat.pop-out": "הוצא את חלון הצ'אט", + "chat.maximize": "הרחב", + "chat.seven_days": "7 ימים", + "chat.thirty_days": "30 ימים", + "chat.three_months": "3 חודשים", "composer.user_said_in": "%1 אמר ב%2:", "composer.user_said": "%1 אמר:", "composer.discard": "האם למחוק פוסט זה?" diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 9bc2d9c5d8..515b890810 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -2,26 +2,26 @@ "title": "התראות", "no_notifs": "אין התראות", "see_all": "צפה בכל ההתראות", - "back_to_home": "Back to %1", + "back_to_home": "חזרה ל%1", "outgoing_link": "לינק", - "outgoing_link_message": "You are now leaving %1.", - "continue_to": "Continue to %1", - "return_to": "Return to %1", - "new_notification": "New Notification", - "you_have_unread_notifications": "You have unread notifications.", - "new_message_from": "New message from %1", - "upvoted_your_post_in": "%1 has upvoted your post in %2.", - "moved_your_post": "%1 has moved your post.", - "moved_your_topic": "%1 has moved your topic.", - "favourited_your_post_in": "%1 has favourited your post in %2.", - "user_flagged_post_in": "%1 flagged a post in %2", - "user_posted_to": "%1 has posted a reply to: %2", - "user_posted_topic": "%1 has posted a new topic: %2", - "user_mentioned_you_in": "%1 mentioned you in %2", - "user_started_following_you": "%1 started following you.", - "email-confirmed": "Email Confirmed", - "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", - "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", - "email-confirm-sent": "Confirmation email sent." + "outgoing_link_message": "אתה כעת עוזב את %1.", + "continue_to": "המשך ל %1", + "return_to": "חזור ל %1", + "new_notification": "התראה חדשה", + "you_have_unread_notifications": "יש לך התראות שלא נקראו.", + "new_message_from": "הודעה חדשה מ %1", + "upvoted_your_post_in": "%1 הצביע בעד הפוסט שלך ב %2", + "moved_your_post": "%1 העביר את הפוסט שלך.", + "moved_your_topic": "%1 הזיז את הנושא שלך.", + "favourited_your_post_in": "%1 הוסיף את הפוסט שלך ב %2 למועדפים שלו.", + "user_flagged_post_in": "%1 דיווח על פוסט ב %2", + "user_posted_to": "%1 פרסם תגובה ל: %2", + "user_posted_topic": "%1 העלה נושא חדש: %2", + "user_mentioned_you_in": "%1 הזכיר אותך ב %2", + "user_started_following_you": "%1 התחיל לעקוב אחריך.", + "email-confirmed": "כתובת המייל אושרה", + "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.", + "email-confirm-error": "אירעה שגיאה...", + "email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.", + "email-confirm-sent": "מייל אישור נשלח." } \ No newline at end of file diff --git a/public/language/he/pages.json b/public/language/he/pages.json index 46544cf924..aaeb1fcac5 100644 --- a/public/language/he/pages.json +++ b/public/language/he/pages.json @@ -5,14 +5,15 @@ "recent": "נושאים אחרונים", "users": "משתמשים רשומים", "notifications": "התראות", - "tags": "Topics tagged under \"%1\"", + "tags": "נושאים שתויגו תחת \"%1\"", "user.edit": "עורך את %1", "user.following": "אנשים ש%1 עוקב אחריהם", "user.followers": "אנשים שעוקבים אחרי %1", "user.posts": "פוסטים שהועלו על ידי %1", "user.topics": "נושאים שנוצרו על ידי %1", + "user.groups": "הקבוצות של %1", "user.favourites": "הפוסטים המועדפים על %1", "user.settings": "הגדרות משתמש", - "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", - "maintenance.messageIntro": "Additionally, the administrator has left this message:" + "maintenance.text": "%1 כרגע תחת עבודות תחזוקה. אנא חזור בזמן מאוחר יותר.", + "maintenance.messageIntro": "בנוסף, המנהל השאיר את ההודעה הזו:" } \ No newline at end of file diff --git a/public/language/he/recent.json b/public/language/he/recent.json index 6e1cd5f811..44960c78f7 100644 --- a/public/language/he/recent.json +++ b/public/language/he/recent.json @@ -3,16 +3,16 @@ "day": "יום", "week": "שבוע", "month": "חודש", - "year": "Year", - "alltime": "All Time", + "year": "שנה", + "alltime": "כל הזמן", "no_recent_topics": "אין נושאים חדשים", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "יש נושא חדש.", + "there-is-a-new-topic-and-a-new-post": "יש נושא ופוסט חדש.", + "there-is-a-new-topic-and-new-posts": "יש נושא ו%1 פוסטים חדשים.", + "there-are-new-topics": "יש %1 נושאים חדשים.", + "there-are-new-topics-and-a-new-post": "יש %1 נושאים ופוסט חדש.", + "there-are-new-topics-and-new-posts": "יש %1 נושאים ו %2 פוסטים חדשים.", + "there-is-a-new-post": "יש פוסט חדש.", + "there-are-new-posts": "יש %1 פוסטים חדשים.", + "click-here-to-reload": "לחץ כאן על מנת לטעון מחדש." } \ No newline at end of file diff --git a/public/language/he/reset_password.json b/public/language/he/reset_password.json index 7aa44652cd..2ed1435b18 100644 --- a/public/language/he/reset_password.json +++ b/public/language/he/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "אנא הקלד את כתובת האימייל שלך ואנו נשלח לך הוראות כיצד לאפס את חשבונך", "enter_email_address": "הכנס כתובת אימייל", "password_reset_sent": "קוד איפוס סיסמה נשלח", - "invalid_email": "מייל שגוי / כתובת מייל לא נמצאה" + "invalid_email": "מייל שגוי / כתובת מייל לא נמצאה", + "password_too_short": "הסיסמה שבחרת קצרה מדי, אנא בחר סיסמה שונה.", + "passwords_do_not_match": "הסיסמאות שהזנת אינן תואמות." } \ No newline at end of file diff --git a/public/language/he/search.json b/public/language/he/search.json index c89241d382..fec789c3be 100644 --- a/public/language/he/search.json +++ b/public/language/he/search.json @@ -1,7 +1,35 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No matches found", - "in": "In", - "by": "By", - "posted-by": "Posted by" + "results_matching": "נמצאו %1 תוצאות עבור החיפוש \"%2\", (%3 שניות)", + "no-matches": "לא נמצאו תוצאות", + "in": "ב", + "by": "על ידי", + "titles": "כותרות", + "titles-posts": "כותרות ופוסטים", + "posted-by": "פורסם על-ידי", + "in-categories": "בקטגוריות", + "search-child-categories": "חפש בתת קטגוריות", + "reply-count": "כמות תגובות", + "at-least": "לפחות", + "at-most": "לכל היותר", + "post-time": "זמן הפוסט", + "newer-than": "חדש מ", + "older-than": "ישן מ", + "any-date": "כל תאריך", + "yesterday": "אתמול", + "one-week": "שבוע אחד", + "two-weeks": "שבועיים", + "one-month": "חודש אחד", + "three-months": "שלושה חודשים", + "six-months": "שישה חודשים", + "one-year": "שנה אחת", + "sort-by": "סדר על-פי", + "last-reply-time": "תאריך תגובה אחרון", + "topic-title": "כותרת הנושא", + "number-of-replies": "מספר התגובות", + "number-of-views": "מספר הצפיות", + "topic-start-date": "זמן תחילת הנושא", + "username": "שם משתמש", + "category": "קטגוריה", + "descending": "בסדר יורד", + "ascending": "בסדר עולה" } \ No newline at end of file diff --git a/public/language/he/tags.json b/public/language/he/tags.json index 94d002603f..13912500cb 100644 --- a/public/language/he/tags.json +++ b/public/language/he/tags.json @@ -2,6 +2,6 @@ "no_tag_topics": "אין פוסטים עם תגית זו.", "tags": "תגיות", "enter_tags_here": "יש להכניס כאן את התגיות. לחץ אנטר אחרי כל תגית.", - "enter_tags_here_short": "Enter tags...", + "enter_tags_here_short": "הכנס תגיות", "no_tags": "אין עדיין תגיות." } \ No newline at end of file diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 2e0d4a0d2e..e16ebc08cf 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -1,61 +1,61 @@ { "topic": "נושא", - "topic_id": "Topic ID", - "topic_id_placeholder": "Enter topic ID", + "topic_id": "מזהה נושא", + "topic_id_placeholder": "הכנס מזהה נושא", "no_topics_found": "לא נמצאו נושאים!", "no_posts_found": "לא נמצאו פוסטים!", - "post_is_deleted": "This post is deleted!", + "post_is_deleted": "פוסט זה נמחק!", "profile": "פרופיל", "posted_by": "הפוסט הועלה על ידי %1", - "posted_by_guest": "Posted by Guest", + "posted_by_guest": "פורסם על-ידי אורח", "chat": "צ'אט", "notify_me": "קבל התראה כאשר יש תגובות חדשות בנושא זה", "quote": "ציטוט", "reply": "תגובה", "edit": "עריכה", "delete": "מחק", - "purge": "Purge", - "restore": "Restore", + "purge": "מחק הכל", + "restore": "שחזר", "move": "הזז", "fork": "פורק", "link": "לינק", "share": "Share", "tools": "כלים", "flag": "דווח", - "locked": "Locked", - "bookmark_instructions": "Click here to return to your last position or close to discard.", + "locked": "נעול", + "bookmark_instructions": "לחץ כאן על-מנת לחזור למיקום האחרון או סגור למחיקה.", "flag_title": "דווח על פוסט זה למנהל", - "flag_confirm": "Are you sure you want to flag this post?", - "flag_success": "This post has been flagged for moderation.", - "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", + "flag_confirm": "אתה בטוח שאתה רוצה לדווח על הפוסט הזה?", + "flag_success": "התקבל דיווח על פוסט זה.", + "deleted_message": "נושא זה נמחק. רק משתמשים עם ההרשאות המתאימות יכולים לצפות בו.", "following_topic.message": "מעתה, תקבל הודעות כאשר מישהו יעלה פוסט לנושא זה.", "not_following_topic.message": "לא תקבל הודעות נוספות בנושא זה.", - "login_to_subscribe": "Please register or log in in order to subscribe to this topic.", - "markAsUnreadForAll.success": "Topic marked as unread for all.", + "login_to_subscribe": "אנא הרשם או התחבר על-מנת לעקוב אחר נושא זה.", + "markAsUnreadForAll.success": "נושא זה סומן כלא נקרא לכולם.", "watch": "עקוב", - "unwatch": "Unwatch", - "watch.title": "Be notified of new replies in this topic", - "unwatch.title": "Stop watching this topic", + "unwatch": "הפסק לעקוב", + "watch.title": "קבל התראה כאשר יש תגובות חדשות בנושא זה", + "unwatch.title": "הפסק לעקוב אחר נושא זה", "share_this_post": "שתף פוסט זה", - "thread_tools.title": "Topic Tools", + "thread_tools.title": "כלי נושא", "thread_tools.markAsUnreadForAll": "סמן כלא נקרא", "thread_tools.pin": "נעץ נושא", "thread_tools.unpin": "הסר נעץ", "thread_tools.lock": "נעל נושא", "thread_tools.unlock": "הסר נעילה", "thread_tools.move": "הזז נושא", - "thread_tools.move_all": "Move All", + "thread_tools.move_all": "הזז הכל", "thread_tools.fork": "שכפל נושא", "thread_tools.delete": "מחק נושא", - "thread_tools.delete_confirm": "Are you sure you want to delete this topic?", + "thread_tools.delete_confirm": "אתה בטוח שאתה רוצה למחוק את הנושא הזה?", "thread_tools.restore": "שחזר נושא", - "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", - "thread_tools.purge": "Purge Topic", - "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", - "topic_move_success": "This topic has been successfully moved to %1", - "post_delete_confirm": "Are you sure you want to delete this post?", - "post_restore_confirm": "Are you sure you want to restore this post?", - "post_purge_confirm": "Are you sure you want to purge this post?", + "thread_tools.restore_confirm": "אתה בטוח שאתה רוצה לשחזר את הנושא הזה?", + "thread_tools.purge": "מחק נושא", + "thread_tools.purge_confirm": "אתה בטוח שאתה רוצה למחוק את הנושא הזה?", + "topic_move_success": "נושא זה הועבר בהצלחה ל %1", + "post_delete_confirm": "אתה בטוח שאתה רוצה למחוק את הפוסט הזה?", + "post_restore_confirm": "אתה בטוח שאתה רוצה לשחזר את הפוסט הזה?", + "post_purge_confirm": "אתה בטוח שאתה רוצה למחוק את הפוסט הזה?", "load_categories": "טוען קטגוריות", "disabled_categories_note": "קטגוריות מבוטלות צבועות באפור", "confirm_move": "הזז", @@ -65,34 +65,34 @@ "favourites.has_no_favourites": "אין לך כרגע פוסטים מועדפים, סמן מספר פוסטים כמועדפים על מנת לראות אותם כאן!", "loading_more_posts": "טוען פוסטים נוספים", "move_topic": "הזז נושא", - "move_topics": "Move Topics", + "move_topics": "הזז נושאים", "move_post": "הזז פוסט", - "post_moved": "Post moved!", + "post_moved": "הפוסט הועבר!", "fork_topic": "שכפל נושא", "topic_will_be_moved_to": "נושא זה יועבר לקטגוריה", "fork_topic_instruction": "לחץ על הפוסטים שברצונך לשכפל", "fork_no_pids": "לא בחרת אף פוסט!", - "fork_success": "Successfully forked topic! Click here to go to the forked topic.", + "fork_success": "הפוסט שוכפל בהצלחה! לחץ כאן על מנת לעבור לפוסט המשוכפל.", "composer.title_placeholder": "הכנס את כותרת הנושא כאן...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "שם", "composer.discard": "מחק", "composer.submit": "שלח", - "composer.replying_to": "Replying to %1", + "composer.replying_to": "מגיב ל %1", "composer.new_topic": "נושא חדש", - "composer.uploading": "uploading...", - "composer.thumb_url_label": "Paste a topic thumbnail URL", - "composer.thumb_title": "Add a thumbnail to this topic", + "composer.uploading": "מעלה...", + "composer.thumb_url_label": "הדבק את כתובת ה URL לתמונה המוקטנת עבור הנושא", + "composer.thumb_title": "הוסף תמונה מוקטנת לנושא זה", "composer.thumb_url_placeholder": "http://example.com/thumb.png", - "composer.thumb_file_label": "Or upload a file", - "composer.thumb_remove": "Clear fields", - "composer.drag_and_drop_images": "Drag and Drop Images Here", - "more_users_and_guests": "%1 more user(s) and %2 guest(s)", - "more_users": "%1 more user(s)", - "more_guests": "%1 more guest(s)", - "users_and_others": "%1 and %2 others", - "sort_by": "Sort by", - "oldest_to_newest": "Oldest to Newest", - "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes", - "most_posts": "Most posts" + "composer.thumb_file_label": "או העלה קובץ", + "composer.thumb_remove": "נקה שדות", + "composer.drag_and_drop_images": "גרור תמונות לכאן", + "more_users_and_guests": "%1 משתמשים ו%2 אורחים נוספים", + "more_users": "%1 משתמשים נוספים", + "more_guests": "%1 אורחים נוספים", + "users_and_others": "%1 ו%2 אחרים", + "sort_by": "סדר על-פי", + "oldest_to_newest": "מהישן לחדש", + "newest_to_oldest": "מהחדש לישן", + "most_votes": "הכי הרבה הצבעות", + "most_posts": "הכי הרבה פוסטים" } \ No newline at end of file diff --git a/public/language/he/user.json b/public/language/he/user.json index ec3d0e5b7a..e8b3a5d3a7 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -2,12 +2,12 @@ "banned": "מורחק", "offline": "לא מחובר", "username": "שם משתמש", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "תאריך הצטרפות", + "postcount": "כמות פוסטים", "email": "כתובת אימייל", - "confirm_email": "Confirm Email", - "delete_account": "Delete Account", - "delete_account_confirm": "Are you sure you want to delete your account?
    This action is irreversible and you will not be able to recover any of your data

    Enter your username to confirm that you wish to destroy this account.", + "confirm_email": "אשר מייל", + "delete_account": "מחק חשבון", + "delete_account_confirm": "אתה בטוח שאתה רוצה למחוק את חשבונך?
    פעולה זו לא ניתנת לשחזור ולא תוכל לגשת למידע שלך

    הזן את שם המשתמש שלך על מנת לאשר שברצונך למחוק את חשבונך.", "fullname": "שם מלא", "website": "אתר", "location": "מיקום", @@ -18,7 +18,7 @@ "profile_views": "צפיות בפרופיל", "reputation": "מוניטין", "favourites": "מועדפים", - "watched": "Watched", + "watched": "נצפה", "followers": "עוקבים", "following": "עוקב אחרי", "signature": "חתימה", @@ -32,7 +32,7 @@ "edit": "ערוך", "uploaded_picture": "התמונה הועלתה", "upload_new_picture": "העלה תמונה חדשה", - "upload_new_picture_from_url": "Upload New Picture From URL", + "upload_new_picture_from_url": "העלה תמונה חדשה מ URL", "current_password": "סיסמה נוכחית", "change_password": "שנה סיסמה", "change_password_error": "סיסמה אינה תקינה!", @@ -43,28 +43,28 @@ "change_password_success": "הסיסמה שלך עודכנה!", "confirm_password": "אמת סיסמה", "password": "סיסמה", - "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1", + "username_taken_workaround": "שם המשתמש שבחרת כבר תפוס, אז שינינו אותו מעט. שם המשתמש שלך כעת הוא %1", "upload_picture": "העלה תמונה", "upload_a_picture": "העלה תמונה", "image_spec": "ניתן להעלות תמונות בפורמט PNG, JPG או GIF בלבד", "max": "מקסימום", "settings": "הגדרות", "show_email": "פרסם את כתובת האימייל שלי", - "show_fullname": "Show My Full Name", - "restrict_chats": "Only allow chat messages from users I follow", - "digest_label": "Subscribe to Digest", - "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule", - "digest_off": "Off", + "show_fullname": "הצג את שמי המלא", + "restrict_chats": "אשר הודעות צ'אט ממשתמשים שאני עוקב אחריהם בלבד", + "digest_label": "הרשם לקבלת תקציר", + "digest_description": "הרשם לקבלת עדכונים מפורום זה (התראות ונושאים חדשים) על-פי לוח זמנים קבוע מראש.", + "digest_off": "כבוי", "digest_daily": "יומי", "digest_weekly": "שבועי", "digest_monthly": "חודשי", - "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_chat_notifications": "שלח לי הודעה למייל כאשר הודעת צ'אט נשלחה אלי בזמן שאיני מחובר", + "send_post_notifications": "שלח לי הודעה למייל כאשר תגובות חדשות פורסמו לנושאים שאני עוקב אחריהם", "has_no_follower": "למשתמש זה אין עוקבים :(", "follows_no_one": "משתמש זה אינו עוקב אחרי אחרים :(", "has_no_posts": "המשתמש הזה עוד לא פרסם כלום.", "has_no_topics": "המשתמש טרם יצר נושאים כלשהם.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "משתמש זה לא עקב אחרי אף נושא עדיין.", "email_hidden": "כתובת אימייל מוסתרת", "hidden": "מוסתר", "paginate_description": "צור עימוד לנושאים במקום לטעון את כל התוכן בעמוד אחד.", @@ -72,9 +72,9 @@ "posts_per_page": "כמות פוסטים בעמוד", "notification_sounds": "השמע צליל כאשר מתקבלת הודעה עבורך.", "browsing": "הגדרות צפייה", - "open_links_in_new_tab": "Open outgoing links in new tab?", - "enable_topic_searching": "Enable In-Topic Searching", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", - "follow_topics_you_reply_to": "Follow topics that you reply to.", - "follow_topics_you_create": "Follow topics you create." + "open_links_in_new_tab": "פתח לינקים חיצוניים בטאב חדש?", + "enable_topic_searching": "הפעל חיפוש בתוך נושא", + "topic_search_help": "אם מופעל, חיפוש בתוך נושא יעקוף את מנגנון החיפוש הרגיל של הדפדפן שלך על מנת לאפשר לך לחפש בתוך כל הנושא ולא רק מה שמוצג כרגע בעמוד.", + "follow_topics_you_reply_to": "עקוב אחר נושאים שהגבת עליהם.", + "follow_topics_you_create": "עקוב אחר נושאים שיצרת." } \ No newline at end of file diff --git a/public/language/he/users.json b/public/language/he/users.json index c37d6e3609..5b996d5f5d 100644 --- a/public/language/he/users.json +++ b/public/language/he/users.json @@ -5,8 +5,8 @@ "search": "חיפוש", "enter_username": "הכנס שם משתמש לחיפוש", "load_more": "טען עוד", - "users-found-search-took": "נמצאו %1 משתמש(ים)! החיפוש ארך %2 מילי שניות.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "users-found-search-took": "%1 משתמשים נמצאו! החיפוש ערך %2 שניות.", + "filter-by": "פלטר על-פי", + "online-only": "אונליין בלבד", + "picture-only": "תמונה בלבד" } \ No newline at end of file diff --git a/public/language/hu/email.json b/public/language/hu/email.json index eaf8595c79..8430b8ff27 100644 --- a/public/language/hu/email.json +++ b/public/language/hu/email.json @@ -9,6 +9,9 @@ "reset.text1": "Kaptunk egy kérést jelszava visszaállításához, valószínűleg azért, mert elfelejtette azt. Ha ez nem így van, hagyja figyelmen kívül ezt a levelet.", "reset.text2": "Ha szeretné, hogy továbbra alaphelyzetbe a jelszavát, kérjük kattintson az alábbi linkre:", "reset.cta": "Kattints ide a jelszavad visszaállításához", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Olvasatlan értesítéseid vannak a következőtől: %1", "digest.latest_topics": "Legutóbbi témák a következőből: %1", "digest.cta": "Kattints ide, hogy meglátogasd a következőt: %1", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 705be11958..821145775e 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -35,6 +35,7 @@ "topic-locked": "Téma lezárva", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json index 9dfa18ac9a..f8d1c20484 100644 --- a/public/language/hu/pages.json +++ b/public/language/hu/pages.json @@ -11,6 +11,7 @@ "user.followers": "Tagok akik követik %1 -t", "user.posts": "Hozzászólások által %1", "user.topics": "%1 által létrehozott témák", + "user.groups": "%1's Groups", "user.favourites": "%1 Kedvenc Hozzászólásai", "user.settings": "Felhasználói Beállítások", "maintenance.text": "%1 jelenleg karbantartás alatt van. Kérlek nézz vissza késöbb!", diff --git a/public/language/hu/reset_password.json b/public/language/hu/reset_password.json index d0efcfda44..3f5721d6d6 100644 --- a/public/language/hu/reset_password.json +++ b/public/language/hu/reset_password.json @@ -10,5 +10,7 @@ "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": "Email cím megadása", "password_reset_sent": "Jelszó-visszaállítás elküldve", - "invalid_email": "Helytelen E-mail cím / Nem létező E-mail cím!" + "invalid_email": "Helytelen E-mail cím / Nem létező E-mail cím!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/hu/search.json b/public/language/hu/search.json index f5df223660..6cae8bb926 100644 --- a/public/language/hu/search.json +++ b/public/language/hu/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/hu/users.json b/public/language/hu/users.json index 2f992c73b2..95e721a4d7 100644 --- a/public/language/hu/users.json +++ b/public/language/hu/users.json @@ -5,7 +5,7 @@ "search": "Keresés", "enter_username": "Írj be egy nicknevet a kereséshez", "load_more": "Több betöltése", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/id/email.json b/public/language/id/email.json index 86557a5832..481f412f23 100644 --- a/public/language/id/email.json +++ b/public/language/id/email.json @@ -9,6 +9,9 @@ "reset.text1": "Kami menerima permintan untuk mengatur ulang kata sandi anda, Ini dikarenakan anda telah lupa akan kata sandi anda. Tolong abaikan email ini jika sebaliknya.", "reset.text2": "Mohon klik link berikut untuk mengatur ulang kata sandi anda.", "reset.cta": "Klik di sini untuk mengatur ulang kata sandi anda", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Anda mempunyai notifikasi yang belum terbaca dari %1:", "digest.latest_topics": "Topik-topik terbaru dari %1", "digest.cta": "Klik di sini untuk mengunjungi %1", diff --git a/public/language/id/error.json b/public/language/id/error.json index dcce92a9bf..ce802296e2 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -35,6 +35,7 @@ "topic-locked": "Topik dikunci", "still-uploading": "Tunggu proses upload sampai selesai", "content-too-short": "Mohon masukkan posting yang lebih panjang. Posting harus memuat setidaknya %1 karakter.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Mohon masukkan judul yang lebih panjang. Judul harus memuat setidaknya %1 karakter.", "title-too-long": "Mohon masukkan judul yang lebih pendek. Judul tidak dapat melebihi %1 karakter.", "too-many-posts": "Kamu hanya dapat melakukan posting satu kali setiap %1 detik - mohon tunggu beberapa saat sebelum melakukan posting kembali", diff --git a/public/language/id/pages.json b/public/language/id/pages.json index bfedbfaa27..83b55a2b22 100644 --- a/public/language/id/pages.json +++ b/public/language/id/pages.json @@ -11,6 +11,7 @@ "user.followers": "Pengguna yang mengikuti %1", "user.posts": "Posting dibuat oleh %1", "user.topics": "Topik dibuat oleh %1", + "user.groups": "%1's Groups", "user.favourites": "Posting Favorit %1", "user.settings": "Pengaturan Pengguna", "maintenance.text": "%1 saat ini sedang dalam masa pemeliharaan. Silahkan kembali lain waktu.", diff --git a/public/language/id/reset_password.json b/public/language/id/reset_password.json index 7ae5b9e8d7..ec65c5ca68 100644 --- a/public/language/id/reset_password.json +++ b/public/language/id/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Mohon masukkan alamat emailmu dan kami akan mengirimkan mu sebuah email dengan instruksi mengenai cara pengaturan ulang akunmu.", "enter_email_address": "Masukkan Alamat Email", "password_reset_sent": "Pengaturan Kembali Kata Sandi telah DIkirim", - "invalid_email": "Email Salah / Email tidak ada!" + "invalid_email": "Email Salah / Email tidak ada!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/id/search.json b/public/language/id/search.json index af974065ab..5eb7f1f851 100644 --- a/public/language/id/search.json +++ b/public/language/id/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/id/users.json b/public/language/id/users.json index 4f7636a9c3..783d9478f3 100644 --- a/public/language/id/users.json +++ b/public/language/id/users.json @@ -5,7 +5,7 @@ "search": "Pencarian", "enter_username": "Masukkan nama pengguna untuk mencari", "load_more": "Tampilkan Lebih Banyak", - "users-found-search-took": "%1 pengguna ditemukan! Pencarian butuh waktu %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/it/email.json b/public/language/it/email.json index 8c0a1666c2..d54cf8c4cd 100644 --- a/public/language/it/email.json +++ b/public/language/it/email.json @@ -9,6 +9,9 @@ "reset.text1": "Abbiamo ricevuto una richiesta di reset della tua password, probabilmente perché l'hai dimenticata. Se non è così si prega di ignorare questa email.", "reset.text2": "Per confermare il reset della password per favore clicca il seguente link:", "reset.cta": "Clicca qui per resettare la tua password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Hai una notifica non letta da %1:", "digest.latest_topics": "Ultimi argomenti su %1", "digest.cta": "Clicca qui per visitare %1", diff --git a/public/language/it/error.json b/public/language/it/error.json index 241f9d90ea..fe207d0502 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -35,6 +35,7 @@ "topic-locked": "Discussione Bloccata", "still-uploading": "Per favore attendere il completamento degli uploads.", "content-too-short": "Inserisci un post più lungo. Il Messaggio deve contenere almeno %1 caratteri.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Inserisci un titolo più lungo. I titoli devono contenere almeno %1 caratteri.", "title-too-long": "Per favore inserire un titolo più corto, non può essere più lungo di %1 caratteri.", "too-many-posts": "È possibile inserire un Post ogni %1 secondi - si prega di attendere prima di postare di nuovo", diff --git a/public/language/it/pages.json b/public/language/it/pages.json index 38c22f82b7..72d2a3e042 100644 --- a/public/language/it/pages.json +++ b/public/language/it/pages.json @@ -11,6 +11,7 @@ "user.followers": "Persone che seguono %1", "user.posts": "Post creati da %1", "user.topics": "Discussioni create da %1", + "user.groups": "%1's Groups", "user.favourites": "Post Favoriti da %1", "user.settings": "Impostazioni Utente", "maintenance.text": "%1 è attualmente in manutenzione. Per favore ritorna più tardi.", diff --git a/public/language/it/reset_password.json b/public/language/it/reset_password.json index 9340714167..4789b7f1c1 100644 --- a/public/language/it/reset_password.json +++ b/public/language/it/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Inserisci il tuo indirizzo email e ti invieremo un'email con le istruzioni per resettare il tuo account.", "enter_email_address": "Inserisci l'Indirizzo Email", "password_reset_sent": "Password Reset Inviata", - "invalid_email": "Email invalida / L'email non esiste!" + "invalid_email": "Email invalida / L'email non esiste!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/it/search.json b/public/language/it/search.json index 6b1250cf39..9d021ec7c5 100644 --- a/public/language/it/search.json +++ b/public/language/it/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/it/users.json b/public/language/it/users.json index 3faed8adbb..44f4b4f916 100644 --- a/public/language/it/users.json +++ b/public/language/it/users.json @@ -5,7 +5,7 @@ "search": "Cerca", "enter_username": "Inserisci il nome utente da cercare", "load_more": "Carica altri", - "users-found-search-took": "%1 utente(i) trovati! La ricerca ha impiegato %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/ja/email.json b/public/language/ja/email.json index e3199a9b14..f290435e75 100644 --- a/public/language/ja/email.json +++ b/public/language/ja/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index a7b4c90a77..2a4a1ebac9 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -35,6 +35,7 @@ "topic-locked": "スレッドがロックされた", "still-uploading": "アップロードが完成するまでお待ちください。", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "タイトルに最大 %1 文字の制限があります。", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json index e4534d567d..eb5274c6f1 100644 --- a/public/language/ja/pages.json +++ b/public/language/ja/pages.json @@ -11,6 +11,7 @@ "user.followers": "%1のフォロワー", "user.posts": "%1が作成したポスト", "user.topics": "%1が作成したスレッド", + "user.groups": "%1's Groups", "user.favourites": "%1のお気に入りポスト", "user.settings": "ユーザー設定", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/ja/reset_password.json b/public/language/ja/reset_password.json index c732e9e159..7e31c22720 100644 --- a/public/language/ja/reset_password.json +++ b/public/language/ja/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "メールアドレスを入力してください.パスワードリセットの指示をメールでご送付します。", "enter_email_address": "メールアドレスを入力してください", "password_reset_sent": "パスワードリセットのメールを送信しました", - "invalid_email": "このメールアドレスは存在しません" + "invalid_email": "このメールアドレスは存在しません", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/ja/search.json b/public/language/ja/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/ja/search.json +++ b/public/language/ja/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/ja/users.json b/public/language/ja/users.json index 9bf3d7a0d9..6d73cf0513 100644 --- a/public/language/ja/users.json +++ b/public/language/ja/users.json @@ -5,7 +5,7 @@ "search": "検索", "enter_username": "検索するユーザー名を入力してください", "load_more": "もっと表示", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/ko/email.json b/public/language/ko/email.json index a7e4ea2cfc..1c5032db35 100644 --- a/public/language/ko/email.json +++ b/public/language/ko/email.json @@ -9,6 +9,9 @@ "reset.text1": "패스워드 재설정 요청을 받았습니다. 패스워드를 분실해서 요청한 것이 아니라면 이 메일을 무시하셔도 좋습니다.", "reset.text2": "패스워드를 재설정하려면 다음 링크를 클릭하세요.", "reset.cta": "패스워드를 재설정하려면 여기를 클릭하세요.", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "%1에 읽지 않은 게시물이 있습니다.", "digest.latest_topics": "%1의 최근 주제", "digest.cta": "%1에 방문하시려면 클릭하세요.", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 88c01be5d7..fcca053185 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -35,6 +35,7 @@ "topic-locked": "잠긴 주제입니다.", "still-uploading": "업로드가 끝날 때까지 기다려 주세요.", "content-too-short": "게시물의 내용이 너무 짧습니다. 최소 %1자 이상이어야 합니다.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "제목이 너무 짧습니다. 최소 %1자 이상이어야 합니다.", "title-too-long": "제목은 최대 %1자로 제한됩니다.", "too-many-posts": "새 게시물 작성은 %1초 간격으로 제한됩니다 - 잠시 기다렸다가 작성해주세요.", diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json index 570f5b22f5..ce1f9e5a05 100644 --- a/public/language/ko/pages.json +++ b/public/language/ko/pages.json @@ -11,6 +11,7 @@ "user.followers": "%1님을 팔로우하는 사용자", "user.posts": "%1님이 작성한 게시물", "user.topics": "%1님이 생성한 주제", + "user.groups": "%1's Groups", "user.favourites": "%1님이 좋아하는 게시물", "user.settings": "설정", "maintenance.text": "%1 사이트는 현재 점검 중입니다. 나중에 다시 방문해주세요.", diff --git a/public/language/ko/reset_password.json b/public/language/ko/reset_password.json index d229a5a931..60fe18c8e5 100644 --- a/public/language/ko/reset_password.json +++ b/public/language/ko/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "이메일 주소를 입력하면 비밀번호를 초기화하는 방법을 메일로 알려드립니다.", "enter_email_address": "여기에 이메일 주소를 입력하세요.", "password_reset_sent": "이메일이 발송되었습니다.", - "invalid_email": "올바르지 않거나 가입되지 않은 이메일입니다." + "invalid_email": "올바르지 않거나 가입되지 않은 이메일입니다.", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/ko/search.json b/public/language/ko/search.json index 391a7477ee..3905534515 100644 --- a/public/language/ko/search.json +++ b/public/language/ko/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/ko/users.json b/public/language/ko/users.json index 14f0b96551..9135621eb6 100644 --- a/public/language/ko/users.json +++ b/public/language/ko/users.json @@ -5,7 +5,7 @@ "search": "검색", "enter_username": "검색할 사용자 이름을 입력하세요.", "load_more": "더 보기", - "users-found-search-took": "%1명의 사용자를 찾았습니다! 검색에 %2 ms가 소요되었습니다.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/lt/email.json b/public/language/lt/email.json index e3199a9b14..f290435e75 100644 --- a/public/language/lt/email.json +++ b/public/language/lt/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 91f17b67bc..1951d21778 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -35,6 +35,7 @@ "topic-locked": "Tema užrakinta", "still-uploading": "Prašome palaukti kol bus baigti visi kėlimai į serverį", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Pavadinimas turėtų būti trumpesnis. Maksimalus leistinas ilgis- %1 simbolių.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json index 1551e325f2..338cd346f5 100644 --- a/public/language/lt/pages.json +++ b/public/language/lt/pages.json @@ -11,6 +11,7 @@ "user.followers": "Žmonės, kurie seka %1", "user.posts": "Pranešimai, kuriuos parašė %1", "user.topics": "Temos, kurias sukūrė %1", + "user.groups": "%1's Groups", "user.favourites": "Vartotojo %1 mėgstami pranešimai", "user.settings": "Vartotojo nustatymai", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/lt/reset_password.json b/public/language/lt/reset_password.json index 66192d423f..104f75e6e3 100644 --- a/public/language/lt/reset_password.json +++ b/public/language/lt/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Prašome įrašyti el. pašto adresą ir mes atsiųsime jums instrukciją, kaip atstatyti jūsų paskyrą.", "enter_email_address": "Įrašykite el. pašto adresą", "password_reset_sent": "Slaptažodžio atstatymas išsiųstas", - "invalid_email": "Klaidingas arba neegzistuojantis el. pašto adresas!" + "invalid_email": "Klaidingas arba neegzistuojantis el. pašto adresas!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/lt/search.json b/public/language/lt/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/lt/search.json +++ b/public/language/lt/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/lt/users.json b/public/language/lt/users.json index 58f5d1793e..043ca55bcc 100644 --- a/public/language/lt/users.json +++ b/public/language/lt/users.json @@ -5,7 +5,7 @@ "search": "Ieškoti", "enter_username": "Įrašykite vartotojo vardą paieškai", "load_more": "Įkelti daugiau", - "users-found-search-took": "%1 paskyra(-os)! Paieška užtruko %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/ms/email.json b/public/language/ms/email.json index 6e765e9f0b..4c5ca1adde 100644 --- a/public/language/ms/email.json +++ b/public/language/ms/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 9c50886310..3c68a1d7e5 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -35,6 +35,7 @@ "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json index 6ce4a94980..dc7c0385e9 100644 --- a/public/language/ms/pages.json +++ b/public/language/ms/pages.json @@ -11,6 +11,7 @@ "user.followers": "Pengguna yang Mengikuti %1", "user.posts": "Kiriman dibuat oleh %1", "user.topics": "Topik dibuat oleh %1", + "user.groups": "%1's Groups", "user.favourites": "Mesej Kegemaran %1", "user.settings": "Tetapan pengguna", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/ms/reset_password.json b/public/language/ms/reset_password.json index 20c519aa55..2951ed5007 100644 --- a/public/language/ms/reset_password.json +++ b/public/language/ms/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Sila masukkan alamat emel dan kami akan menghantar arahan untuk penetapan semula akaun anda", "enter_email_address": "Masukkan alamat emel", "password_reset_sent": "Penetapan semula password telah dihantar", - "invalid_email": "Emel yang tidak sah / Emel tidak wujud" + "invalid_email": "Emel yang tidak sah / Emel tidak wujud", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/ms/search.json b/public/language/ms/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/ms/search.json +++ b/public/language/ms/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/ms/users.json b/public/language/ms/users.json index 3e1a3f089b..26475bd746 100644 --- a/public/language/ms/users.json +++ b/public/language/ms/users.json @@ -5,7 +5,7 @@ "search": "Cari", "enter_username": "Masukkan nama pengguna untuk carian", "load_more": "Muat lagi", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/nb/email.json b/public/language/nb/email.json index 69fa94dcca..65e1accaee 100644 --- a/public/language/nb/email.json +++ b/public/language/nb/email.json @@ -9,6 +9,9 @@ "reset.text1": "Vi har blir bedt om å tilbakestille passordet ditt, muligens fordi du har glemt det. Hvis dette ikke stemmer kan du ignorere denne eposten.", "reset.text2": "For å fortsette med tilbakestillingen, vennligst klikk på følgende lenke:", "reset.cta": "Klikk her for å tilbakestille passordet ditt", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Du har uleste varsler fra %1:", "digest.latest_topics": "Siste emner fra %1", "digest.cta": "Klikk her for å besøke %1", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 3703ca393c..a19bdad64d 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -35,6 +35,7 @@ "topic-locked": "Emne låst", "still-uploading": "Vennligst vent til opplastingene blir fullført.", "content-too-short": "Vennligst skriv et lengere innlegg. Innlegg må inneholde minst %1 tegn.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Vennligst skriv en lengere tittel. Titler må inneholde minst %1 tegn.", "title-too-long": "Vennligst skriv en kortere tittel. Titler må inneholde minst %1 tegn.", "too-many-posts": "Du kan bare poste et innlegg hvert %1 sekund - vennligst vent før du poster igjen", diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json index 151b1c7a79..1d657bd759 100644 --- a/public/language/nb/pages.json +++ b/public/language/nb/pages.json @@ -11,6 +11,7 @@ "user.followers": "Personer som følger %1", "user.posts": "Innlegg laget av %1", "user.topics": "Emner opprettet av %1", + "user.groups": "%1's Groups", "user.favourites": "%1 sine favoritt-innlegg", "user.settings": "Brukerinnstillinger", "maintenance.text": "%1 er for tiden under vedlikehold. Kom tilbake en annen gang.", diff --git a/public/language/nb/reset_password.json b/public/language/nb/reset_password.json index d8aab92154..ed6659abdf 100644 --- a/public/language/nb/reset_password.json +++ b/public/language/nb/reset_password.json @@ -10,5 +10,7 @@ "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": "Skriv e-post", "password_reset_sent": "Passord-tilbakestilling sendt", - "invalid_email": "Ugyldig e-post / e-post eksisterer ikke" + "invalid_email": "Ugyldig e-post / e-post eksisterer ikke", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/nb/search.json b/public/language/nb/search.json index 8daeddcb06..053950fd9e 100644 --- a/public/language/nb/search.json +++ b/public/language/nb/search.json @@ -3,5 +3,33 @@ "no-matches": "Ingen matcher funnet", "in": "I", "by": "Av", - "posted-by": "Skapt av" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Skapt av", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/nb/users.json b/public/language/nb/users.json index a2038667ab..661479fbf1 100644 --- a/public/language/nb/users.json +++ b/public/language/nb/users.json @@ -5,7 +5,7 @@ "search": "Søk", "enter_username": "Skriv ett brukernavn for å søke", "load_more": "Last flere", - "users-found-search-took": "%1 bruker(e) funnet! Søk tok %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filtrer etter", "online-only": "Bare påloggede", "picture-only": "Bare bilde" diff --git a/public/language/nl/email.json b/public/language/nl/email.json index ec4296182c..a1f26cd2ea 100644 --- a/public/language/nl/email.json +++ b/public/language/nl/email.json @@ -9,6 +9,9 @@ "reset.text1": "Wij ontvingen een verzoek van u om uw wachtwoord te resetten. Als dat niet het geval is, kunt u deze mail negeren ", "reset.text2": "Om uw wachtwoord te resetten, klik op de volgende link", "reset.cta": "Klik hier om u wachtwoord te resetten", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "U heeft ongelezen notificaties van %1:", "digest.latest_topics": "De laatste onderwerpen van %1", "digest.cta": "Klik hier om deze website te bezoeken %1 ", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 7fa4a2f24e..8b2c37d5a1 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -35,6 +35,7 @@ "topic-locked": "Onderwerp gesloten", "still-uploading": "Heb even geduld totdat de alle bestanden geüpload zijn", "content-too-short": "Maak de bericht alsjeblieft wat langer. Op z'n minst %1 karakters", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Maak de titel wat langer. Op z'n minst %1 karakters", "title-too-long": "Maak de titel wat korter. Het kan niet langer zijn dan %1 karakters", "too-many-posts": "Je kan eens in de %1 seconden een bericht aanmaken. Wacht alstublieft.", diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json index b567e526d1..09cda815b9 100644 --- a/public/language/nl/pages.json +++ b/public/language/nl/pages.json @@ -11,6 +11,7 @@ "user.followers": "Mensen die %1 Volgen", "user.posts": "Berichten geplaatst door %1", "user.topics": "Topics gecreëerd door %1", + "user.groups": "%1's Groups", "user.favourites": "%1's Favoriete Berichten", "user.settings": "Gebruikersinstellingen", "maintenance.text": "%1 is momenteel in onderhoud modus. Probeer later opnieuw", diff --git a/public/language/nl/reset_password.json b/public/language/nl/reset_password.json index a529b6b8f8..2bac7d3849 100644 --- a/public/language/nl/reset_password.json +++ b/public/language/nl/reset_password.json @@ -10,5 +10,7 @@ "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": "Vul uw Email Adres in", "password_reset_sent": "Wachtwoord Reset Verzonden", - "invalid_email": "Fout Email Adres / Email Adres bestaat niet!" + "invalid_email": "Fout Email Adres / Email Adres bestaat niet!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/nl/search.json b/public/language/nl/search.json index 60193a06b7..168dde5142 100644 --- a/public/language/nl/search.json +++ b/public/language/nl/search.json @@ -3,5 +3,33 @@ "no-matches": "Geen matches gevonden", "in": "in", "by": "door", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/nl/users.json b/public/language/nl/users.json index 4df6bda6f1..315b86fe31 100644 --- a/public/language/nl/users.json +++ b/public/language/nl/users.json @@ -5,7 +5,7 @@ "search": "Zoeken", "enter_username": "Vul een gebruikersnaam in om te zoeken", "load_more": "Meer Laden", - "users-found-search-took": "%1 gebruiker(s) gevonden! Zoekactie duurde %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter op", "online-only": "Online ", "picture-only": "Alleen een afbeelding" diff --git a/public/language/pl/email.json b/public/language/pl/email.json index 04816f6185..d1f327d90a 100644 --- a/public/language/pl/email.json +++ b/public/language/pl/email.json @@ -9,6 +9,9 @@ "reset.text1": "Otrzymaliśmy żądanie przywrócenia Twojego hasła. Jeśli nie żądałeś przywrócenia hasła, zignoruj ten e-mail.", "reset.text2": "Aby przywrócić swoje hasło, skorzystaj z poniższego linku:", "reset.cta": "Kliknij tu, by przywrócić swoje hasło", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Masz nowe powiadomienia od %1:", "digest.latest_topics": "Ostatnie tematy z %1", "digest.cta": "Kliknij, by odwiedzić %1", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 8929f25bfa..119a9ca553 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -35,6 +35,7 @@ "topic-locked": "Temat zamknięty", "still-uploading": "Poczekaj na pełne załadowanie", "content-too-short": "Proszę wpisać dłuższy post. Posty powinny zawierać co najmniej %1 znaków.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Proszę podać dłuższy tytuł. Tytuły powinny zawierać co najmniej %1 znaków.", "title-too-long": "Wpisz krótszy tytuł, nie może być dłuższy niż %1 znaków.", "too-many-posts": "Możesz wysyłać posty co %1 sekund - proszę poczekać", diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json index f8afb878f5..4aad8f6c6d 100644 --- a/public/language/pl/pages.json +++ b/public/language/pl/pages.json @@ -11,6 +11,7 @@ "user.followers": "Obserwujący %1", "user.posts": "Posty napisane przez %1", "user.topics": "Wątki stworzone przez %1", + "user.groups": "%1's Groups", "user.favourites": "Ulubione posty %1", "user.settings": "Ustawienia użytkownika", "maintenance.text": "Obecnie trwają prace konserwacyjne nad %1. Proszę wrócić później.", diff --git a/public/language/pl/reset_password.json b/public/language/pl/reset_password.json index fa0affeab6..99b7518a97 100644 --- a/public/language/pl/reset_password.json +++ b/public/language/pl/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Podaj swój adres e-mail i wyślemy ci wiadomość z instrukcjami jak zresetować hasło.", "enter_email_address": "Wpisz swój adres e-mail", "password_reset_sent": "Instrukcje zostały wysłane", - "invalid_email": "Niepoprawny adres e-mail." + "invalid_email": "Niepoprawny adres e-mail.", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/pl/search.json b/public/language/pl/search.json index 472b6bf10c..c8775e8c66 100644 --- a/public/language/pl/search.json +++ b/public/language/pl/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/pl/users.json b/public/language/pl/users.json index 38ff75b928..2df9600a30 100644 --- a/public/language/pl/users.json +++ b/public/language/pl/users.json @@ -5,7 +5,7 @@ "search": "Szukaj", "enter_username": "Wpisz nazwę użytkownika", "load_more": "Więcej", - "users-found-search-took": "Znaleziono %1 użytkowników. Szukanie zajęło %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/pt_BR/email.json b/public/language/pt_BR/email.json index 04e7f76246..250bf39788 100644 --- a/public/language/pt_BR/email.json +++ b/public/language/pt_BR/email.json @@ -9,6 +9,9 @@ "reset.text1": "Nós recebemos um pedido para reconfigurar sua senha, possivelmente porque você a esqueceu. Se este não é o caso, por favor ignore este email.", "reset.text2": "Para continuar com a reconfiguração de senha, por favor clique no seguinte link:", "reset.cta": "Clique aqui para reconfigurar sua senha", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Você tem notificações não lidas de %1:", "digest.latest_topics": "Últimos tópicos de %1", "digest.cta": "Clique aqui para visitar %1", diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index c1ab421cb3..51d9f13502 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -35,6 +35,7 @@ "topic-locked": "Tópico Trancado", "still-uploading": "Aguarde a conclusão dos uploads.", "content-too-short": "Por favor digite um post mais longo. Posts devem conter no mínimo %1 caracteres.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Por favor digite um título mais longo. Títulos devem conter no mínimo %1 caracteres.", "title-too-long": "Por favor entre com um título mais curto; Títulos não podem ser maiores que %1 caracteres.", "too-many-posts": "Você pode postar apenas uma vez a cada %1 segundos - por favor aguarde antes de postar novamente", diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json index a65c95781b..ae42c35f0f 100644 --- a/public/language/pt_BR/pages.json +++ b/public/language/pt_BR/pages.json @@ -11,6 +11,7 @@ "user.followers": "Pessoas que Seguem %1", "user.posts": "Posts feitos por %1", "user.topics": "Tópicos criados por %1", + "user.groups": "%1's Groups", "user.favourites": "Posts Favoritos de %1", "user.settings": "Configurações de Usuário", "maintenance.text": "%1 está atualmente sob manutenção. Por favor retorne em outro momento.", diff --git a/public/language/pt_BR/reset_password.json b/public/language/pt_BR/reset_password.json index 7646899cd1..bf96416678 100644 --- a/public/language/pt_BR/reset_password.json +++ b/public/language/pt_BR/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Por favor digite seu endereço de email e nós iremos lhe enviar em email com instruções de como reconfigurar a sua conta.", "enter_email_address": "Digite seu Email", "password_reset_sent": "Reconfiguração de Senha Enviada", - "invalid_email": "Email Inválido / Email não existe!" + "invalid_email": "Email Inválido / Email não existe!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/pt_BR/search.json b/public/language/pt_BR/search.json index f4d633ffd7..9f10c0970b 100644 --- a/public/language/pt_BR/search.json +++ b/public/language/pt_BR/search.json @@ -3,5 +3,33 @@ "no-matches": "Nenhum resultado encontrado", "in": "Em", "by": "Por", - "posted-by": "Postado por" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Postado por", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/pt_BR/users.json b/public/language/pt_BR/users.json index dc447048a0..32edc568f5 100644 --- a/public/language/pt_BR/users.json +++ b/public/language/pt_BR/users.json @@ -5,7 +5,7 @@ "search": "Procurar", "enter_username": "Digite um nome de usuário para procurar", "load_more": "Carregar Mais", - "users-found-search-took": "%1 usuário(s) encontrado(s)! A pesquisa demorou %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filtrar Por", "online-only": "Apenas Online", "picture-only": "Apenas foto" diff --git a/public/language/ro/email.json b/public/language/ro/email.json index 0e3a1da8ab..25f9723466 100644 --- a/public/language/ro/email.json +++ b/public/language/ro/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "Pentru a continua cu resetarea parolei, te rugăm sa apeși pe următorul link:", "reset.cta": "Apasă aici pentru a-ți reseta parola", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Ultimele mesaje de la %1", "digest.cta": "Apasă aici pentru a vizita %1", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 06cad8ebe8..1e7de8b50b 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -35,6 +35,7 @@ "topic-locked": "Subiect Închis", "still-uploading": "Te rugăm să aștepți până se termină uploadul.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Te rugăm să introduci un titlu mai scurt. Titlurile nu pot fi mai lungi de %1 caractere.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/ro/pages.json b/public/language/ro/pages.json index c3b65dfd23..141c5fb1df 100644 --- a/public/language/ro/pages.json +++ b/public/language/ro/pages.json @@ -11,6 +11,7 @@ "user.followers": "Utilizatori care îl urmăresc pe %1", "user.posts": "Mesaje postate de %1", "user.topics": "Subiecte create de %1", + "user.groups": "%1's Groups", "user.favourites": "Mesajele favorite ale lui %1", "user.settings": "Setări Utilizator", "maintenance.text": "%1 este momentan în mentenanță. Întoarce-te în curând!", diff --git a/public/language/ro/reset_password.json b/public/language/ro/reset_password.json index b4ae4564f8..d9edc5c856 100644 --- a/public/language/ro/reset_password.json +++ b/public/language/ro/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Te rugăm sa introduci adresa ta de email și îți vom trimite un email cu instrucțiuni pentru a îți reseta contul tău de utilizator.", "enter_email_address": "Introdu adresă de email", "password_reset_sent": "Emailul pentru resetarea parolei a fost trimis", - "invalid_email": "Adresă de email invalidă / Adresa de email nu există!" + "invalid_email": "Adresă de email invalidă / Adresa de email nu există!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/ro/search.json b/public/language/ro/search.json index 35c5b72b74..cdae3636ce 100644 --- a/public/language/ro/search.json +++ b/public/language/ro/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/ro/users.json b/public/language/ro/users.json index 065d2b07e2..4ef70026a8 100644 --- a/public/language/ro/users.json +++ b/public/language/ro/users.json @@ -5,7 +5,7 @@ "search": "Căutare", "enter_username": "Introdu un nume de utilizator pentru a căuta", "load_more": "Încarcă mai multe", - "users-found-search-took": "%1 utilizator(i) găsit! Căutarea a durat %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/ru/email.json b/public/language/ru/email.json index 9b070ed2b2..eed54608d0 100644 --- a/public/language/ru/email.json +++ b/public/language/ru/email.json @@ -9,6 +9,9 @@ "reset.text1": "Мы получили запрос на сброс Вашего пароля. Если Вы не подавали запрос, пожалуйста, проигнорируйте это сообщение.", "reset.text2": "Для продолжения процедуры изменения пароля, пожалуйста, перейдите по ссылке:", "reset.cta": "Кликните здесь для изменения пароля", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "У Вас непрочитанные уведомления от %1:", "digest.latest_topics": "Последние темы %1", "digest.cta": "Кликните здесь для просмотра %1", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index d6ac5e2d25..5683d863d1 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -35,6 +35,7 @@ "topic-locked": "Тема закрыта", "still-uploading": "Пожалуйста, подождите завершения загрузки.", "content-too-short": "Пост должен содержать минимум %1 симв.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Заголовок должен содержать минимум %1 симв.", "title-too-long": "Заголовок не может быть длиннее %1 символов.", "too-many-posts": "Вы можете делать пост один раз в %1 сек.", diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json index 85348af836..f8a014193b 100644 --- a/public/language/ru/pages.json +++ b/public/language/ru/pages.json @@ -11,6 +11,7 @@ "user.followers": "Читают %1", "user.posts": "Пост написан %1", "user.topics": "Темы созданы %1", + "user.groups": "%1's Groups", "user.favourites": "Избранные сообщения %1", "user.settings": "Настройки", "maintenance.text": "%1 в настоящее время на обслуживании. Пожалуйста, возвращайтесь позже.", diff --git a/public/language/ru/reset_password.json b/public/language/ru/reset_password.json index fdcb497d10..c9b523cf2e 100644 --- a/public/language/ru/reset_password.json +++ b/public/language/ru/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Пожалуйста введите ваш email адрес и мы отправим Вам письмо с инструкцией восстановления пароля.", "enter_email_address": "Введите Email адрес", "password_reset_sent": "Пароль Отправлен", - "invalid_email": "Неверный Email / Email не существует!" + "invalid_email": "Неверный Email / Email не существует!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/ru/search.json b/public/language/ru/search.json index aeb1235df2..f6ecb8d611 100644 --- a/public/language/ru/search.json +++ b/public/language/ru/search.json @@ -1,7 +1,35 @@ { "results_matching": "%1 результатов по фразе \"%2\", (%3 секунды) ", - "no-matches": "No matches found", + "no-matches": "Совпадений не найдено", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/ru/users.json b/public/language/ru/users.json index 78251703d2..e4253bcf62 100644 --- a/public/language/ru/users.json +++ b/public/language/ru/users.json @@ -5,7 +5,7 @@ "search": "Поиск", "enter_username": "Введите имя пользователя для поиска", "load_more": "Загрузить еще", - "users-found-search-took": "Нашел %1 пользователя(ей)! Поиск занял %2 мс.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/sc/email.json b/public/language/sc/email.json index e3199a9b14..f290435e75 100644 --- a/public/language/sc/email.json +++ b/public/language/sc/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 6079502fae..9bbcf03247 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -35,6 +35,7 @@ "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/sc/pages.json b/public/language/sc/pages.json index 4ccd57cfd2..0f846179c3 100644 --- a/public/language/sc/pages.json +++ b/public/language/sc/pages.json @@ -11,6 +11,7 @@ "user.followers": "Gente chi Sighit %1", "user.posts": "Arresonos fatos dae %1", "user.topics": "Topics created by %1", + "user.groups": "%1's Groups", "user.favourites": "Arresonos Preferidos de %1", "user.settings": "Sèberos de Impitadore", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/sc/reset_password.json b/public/language/sc/reset_password.json index 877f9c716e..d86b716c31 100644 --- a/public/language/sc/reset_password.json +++ b/public/language/sc/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Pro praghere pone s'indiritzu email tuo e t'amus a imbiare un'email cun is istrutziones pro torrare a assentare s'intrada tua.", "enter_email_address": "Pone s'Indiritzu Email", "password_reset_sent": "Còdighe pro Torrare a Assentare sa Password Imbiadu", - "invalid_email": "Email Non Bàlida / Email chi no esistit!" + "invalid_email": "Email Non Bàlida / Email chi no esistit!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/sc/search.json b/public/language/sc/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/sc/search.json +++ b/public/language/sc/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/sc/users.json b/public/language/sc/users.json index 56b67f30f8..19e6cfe95f 100644 --- a/public/language/sc/users.json +++ b/public/language/sc/users.json @@ -5,7 +5,7 @@ "search": "Chirca", "enter_username": "Pone unu nùmene de impitadore de chircare", "load_more": "Càrriga de prus", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/sk/email.json b/public/language/sk/email.json index e3199a9b14..f290435e75 100644 --- a/public/language/sk/email.json +++ b/public/language/sk/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "You have unread notifications from %1:", "digest.latest_topics": "Latest topics from %1", "digest.cta": "Click here to visit %1", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 92f07fce4c..0ca1924e76 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -35,6 +35,7 @@ "topic-locked": "Uzamknutá téma", "still-uploading": "Prosím čakajte na dokončenie nahrávania", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Prosím uvedťe kratší názov. Názov nesmie byť dlhší ako 1 % znakov", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json index bcc524ed0d..c54ac7e71f 100644 --- a/public/language/sk/pages.json +++ b/public/language/sk/pages.json @@ -11,6 +11,7 @@ "user.followers": "Užívatelia následujúci %1", "user.posts": "Príspevky od %1", "user.topics": "Téma vytvorená %1\n", + "user.groups": "%1's Groups", "user.favourites": "%1's obľubených príspevkov", "user.settings": "Užívatelské nadstavenie", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/sk/reset_password.json b/public/language/sk/reset_password.json index bceaea8148..2391c09cae 100644 --- a/public/language/sk/reset_password.json +++ b/public/language/sk/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Zadajte svoju emailovú adresu a my Vám pošleme informácie, ako môžete obnoviť svoje heslo.", "enter_email_address": "Zadajte e-mail", "password_reset_sent": "Obnova hesla odoslaná", - "invalid_email": "Zlý email / Email neexistuje!" + "invalid_email": "Zlý email / Email neexistuje!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/sk/search.json b/public/language/sk/search.json index c89241d382..a04eb4fc1e 100644 --- a/public/language/sk/search.json +++ b/public/language/sk/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/sk/users.json b/public/language/sk/users.json index 56188b953e..819f861de7 100644 --- a/public/language/sk/users.json +++ b/public/language/sk/users.json @@ -5,7 +5,7 @@ "search": "Vyhľadávať", "enter_username": "Zadaj užívateľské meno k hľadaniu", "load_more": "Načítať dalšie", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/sv/email.json b/public/language/sv/email.json index b6ef31353f..808c73caa8 100644 --- a/public/language/sv/email.json +++ b/public/language/sv/email.json @@ -9,6 +9,9 @@ "reset.text1": "Vi fick en förfrågan om att återställa ditt lösenord, möjligen för att du har glömt det. Om detta inte är fallet, så kan du bortse från det här epostmeddelandet. ", "reset.text2": "För att fortsätta med återställning av lösenordet så kan du klicka på följande länk:", "reset.cta": "Klicka här för att återställa ditt lösenord", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Du har olästa notiser från %1:", "digest.latest_topics": "Senaste ämnen från %1", "digest.cta": "Klicka här för att besöka %1", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index d1d82a2f0d..bf9769aa41 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -35,6 +35,7 @@ "topic-locked": "Ämnet låst", "still-uploading": "Vänta medan uppladdningen slutförs.", "content-too-short": "Skriv ett längre inlägg. Inlägget måste ha minst %1 tecken.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Skriv en längre rubrik. Rubriken måste ha minst %1 tecken.", "title-too-long": "Skriv in en kortare rubrik. Rubriker får inte vara längre än %1 tecken.", "too-many-posts": "Du kan endast skapa inlägg var %1:e sekund - vänta ett tag innan du försöker skapa ett nytt inlägg", diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json index 2082249d8c..f7a4904a84 100644 --- a/public/language/sv/pages.json +++ b/public/language/sv/pages.json @@ -11,6 +11,7 @@ "user.followers": "Personer som följer %1", "user.posts": "Inlägg skapat av %1", "user.topics": "Ämnen skapade av %1", + "user.groups": "%1's Groups", "user.favourites": "%1's favorit-inlägg", "user.settings": "Avnändarinställningar", "maintenance.text": "%1 genomgår underhåll just nu. Vänligen kom tillbaka lite senare.", diff --git a/public/language/sv/reset_password.json b/public/language/sv/reset_password.json index 03682d812e..a3771a31b4 100644 --- a/public/language/sv/reset_password.json +++ b/public/language/sv/reset_password.json @@ -10,5 +10,7 @@ "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": "Skriv in epostadress", "password_reset_sent": "Lösenordsåterställning skickad", - "invalid_email": "Felaktig epost / Epost finns inte!" + "invalid_email": "Felaktig epost / Epost finns inte!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/sv/search.json b/public/language/sv/search.json index 193ea99480..0e4e831f93 100644 --- a/public/language/sv/search.json +++ b/public/language/sv/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/sv/users.json b/public/language/sv/users.json index 2b370c1146..591a32c344 100644 --- a/public/language/sv/users.json +++ b/public/language/sv/users.json @@ -5,7 +5,7 @@ "search": "Sök", "enter_username": "Ange ett användarnamn för att söka", "load_more": "Ladda fler", - "users-found-search-took": "%1 användare hittades! Sökningen tog %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/th/email.json b/public/language/th/email.json index 18bf7c5d1f..d91ba43963 100644 --- a/public/language/th/email.json +++ b/public/language/th/email.json @@ -9,6 +9,9 @@ "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "เพื่อดำเนินการตั้งรหัสผ่านใหม่ต่อไป, โปรดกดที่ลิ้งค์นี้:", "reset.cta": "กดตรงนี้เพื่อตั้งรหัสผ่านใหม่", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "คุณมีข้อความแจ้งเตือนที่ยังไม่ได้อ่านจาก %1:", "digest.latest_topics": "หัวข้อสนทนาล่าสุดจาก %1", "digest.cta": "กดตรงนี้เพื่อเข้าดู %1", diff --git a/public/language/th/error.json b/public/language/th/error.json index 55dc809071..05985e9b49 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -35,6 +35,7 @@ "topic-locked": "Topic Locked", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.", "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", diff --git a/public/language/th/pages.json b/public/language/th/pages.json index a227f62340..44f8b127e1 100644 --- a/public/language/th/pages.json +++ b/public/language/th/pages.json @@ -11,6 +11,7 @@ "user.followers": "ผู้ใช้ที่ติดตาม %1", "user.posts": "กระทู้โดย %1", "user.topics": "Topics created by %1", + "user.groups": "%1's Groups", "user.favourites": "กระทู้ที่ %1 ชอบ", "user.settings": "ตั้งค่าผู้ใช้", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", diff --git a/public/language/th/reset_password.json b/public/language/th/reset_password.json index 2b12834604..499f2f7136 100644 --- a/public/language/th/reset_password.json +++ b/public/language/th/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "กรุณาใส่อีเมลของคุณ เราจะส่งอีเมลให้คุณพร้อมคำแนะนำเกี่ยวกับวิธีการรีเซ็ตบัญชีของคุณ", "enter_email_address": "ใส่อีเมล์", "password_reset_sent": "รหัสรีเซ็ตถูกส่งออกไปแล้ว", - "invalid_email": "อีเมล์ไม่ถูกต้อง / อีเมล์ไม่มีอยู่!" + "invalid_email": "อีเมล์ไม่ถูกต้อง / อีเมล์ไม่มีอยู่!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/th/search.json b/public/language/th/search.json index 973ff03e13..4e865998e1 100644 --- a/public/language/th/search.json +++ b/public/language/th/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/th/users.json b/public/language/th/users.json index a3dddb41fd..542689e182 100644 --- a/public/language/th/users.json +++ b/public/language/th/users.json @@ -5,7 +5,7 @@ "search": "ค้นหา", "enter_username": "ใส่ชื่อผู้ใช้เพื่อค้นหา", "load_more": "โหลดเพิ่มเติม", - "users-found-search-took": "%1 user(s) found! Search took %2 ms.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/tr/category.json b/public/language/tr/category.json index f29f0c81d0..ba1c4f34ef 100644 --- a/public/language/tr/category.json +++ b/public/language/tr/category.json @@ -1,7 +1,7 @@ { "new_topic_button": "Yeni Başlık", "no_topics": " Bu kategoride hiç konu yok.
    Yeni bir konu açmak istemez misiniz?", - "browsing": "dolaşıyor", + "browsing": "gözden geçiriliyor", "no_replies": "Kimse yanıtlamadı", "share_this_category": "Bu kategoriyi paylaş", "ignore": "Yoksay" diff --git a/public/language/tr/email.json b/public/language/tr/email.json index c69e7d0c8f..350df09f81 100644 --- a/public/language/tr/email.json +++ b/public/language/tr/email.json @@ -9,6 +9,9 @@ "reset.text1": "Şifrenizi değiştirmek istediğinize dair bir ileti aldık. Eğer böyle bir istek göndermediyseniz, lütfen bu e-postayı görmezden gelin.", "reset.text2": "Parola değiştirme işlemine devam etmek için aşağıdaki bağlantıya tıklayın:", "reset.cta": "Parolanızı değiştirmek için buraya tıklayın", + "reset.notify.subject": "Şifre başarıyla değiştirildi", + "reset.notify.text1": "Şifrenizin %1 zamanında başarı ile değiştirildiğini bildirmek isteriz.", + "reset.notify.text2": "Bunu siz yetkilendirmediyseniz, lütfen hiç vakit kaybetmeden site yöneticisine bu durumu bildiriniz.", "digest.notifications": "Okunmamış bazı bildirimleriniz var", "digest.latest_topics": "En güncel konular", "digest.cta": "Ziyaret etmek için buraya tıklayın", @@ -17,8 +20,8 @@ "notif.chat.subject": "Okunmamış bazı iletileriniz var", "notif.chat.cta": "Sohbete devam etmek için buraya tıklayın", "notif.chat.unsub.info": "Bu bildirim şectiğiniz ayarlar yüzünden gönderildi.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Konunun tamamını okumak için buraya tıklayın", + "notif.post.unsub.info": "Bu yazı bildirimi size abonelik ayarlarınız nedeni ile gönderilmiştir.", "test.text1": "Bu ileti NodeBB e-posta ayarlarınızın doğru çalışıp çalışmadığını kontrol etmek için gönderildi.", "unsub.cta": "Buraya tıklayarak ayarlarınızı değiştirebilirsiniz.", "closing": "Teşekkürler!" diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 4ab34132fc..a18f42652b 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -18,7 +18,7 @@ "username-taken": "Kullanıcı İsmi Alınmış", "email-taken": "E-posta Alınmış", "email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Email adresiniz doğrulanmadan sohbet edemezsiniz.", "username-too-short": "Kullanıcı ismi çok kısa", "username-too-long": "Kullanıcı ismi çok uzun.", "user-banned": "Kullanıcı Yasaklı", @@ -35,6 +35,7 @@ "topic-locked": "Başlık Kilitli", "still-uploading": "Lütfen yüklemelerin bitmesini bekleyin.", "content-too-short": "Lütfen daha uzun bir ileti girin. En az %1 karakter.", + "content-too-long": "Lütfen daha kısa bir yayın girin. Yayınlar %1 karakterden uzun olamaz.", "title-too-short": "Lütfen daha uzun bir başlık girin. En az %1 karakter.", "title-too-long": "Lütfen daha kısa bir başlık girin. Başlıklar %1 karakterden uzun olamaz.", "too-many-posts": "Sadece %1 saniyede bir ileti gönderebilirsiniz.", @@ -44,13 +45,13 @@ "already-favourited": "Bu iletiyi zaten favorilerinize eklediniz", "already-unfavourited": "Bu iletiyi zaten favorilerinizden çıkardınız", "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "Geçersiz resim uzantısı. Izin verilen uzantılar: %1", + "invalid-image-extension": "Geçersiz resim uzantısı", "group-name-too-short": "Grup ismi çok kısa", "group-already-exists": "Grup zaten var", "group-name-change-not-allowed": "Grup ismini değiştiremezsiniz", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Bu grubun zaten bir parçasısınız.", + "group-needs-owner": "Bu grubu en az bir kişi sahiplenmesi gerekiyor", "post-already-deleted": "İleti zaten silinmiş", "post-already-restored": "İleti zaten geri getirilmiş", "topic-already-deleted": "Başlık zaten silinmiş", @@ -62,12 +63,12 @@ "signature-too-long": "İmza en fazla %1 karakter olabilir!", "cant-chat-with-yourself": "Kendinizle sohbet edemezsiniz!", "chat-restricted": "Bu kullanıcı sohbet ayarlarını kısıtlamış. Bu kişiye mesaj gönderebilmeniz için sizi takip etmeleri gerekiyor", - "too-many-messages": "You have sent too many messages, please wait awhile.", + "too-many-messages": "Ardı ardına çok fazla mesaj yolladınız, lütfen biraz bekleyiniz.", "reputation-system-disabled": "Saygınlık sistemi kapatılmış.", "downvoting-disabled": "Aşagı oylama kapatılmış", "not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok.", "not-enough-reputation-to-flag": "Bu iletiyi bayraklamak için yeterince saygınlığınız yok", "reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.", "registration-error": "Kayıt Hatası", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Sunucu yanıtı çözümlemesi sırasında bir şeyler ters gitti" } \ No newline at end of file diff --git a/public/language/tr/global.json b/public/language/tr/global.json index 152aba5d0e..cd2e8e18c9 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -3,10 +3,10 @@ "search": "Arama", "buttons.close": "Kapat", "403.title": "Erişim Engellendi", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Erişim izniniz olmayan bir sayfaya denk gelmiş gibisiniz.", + "403.login": "Belki de tekrar giriş yapmayı denersiniz?", "404.title": "Bulunamadı", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Erişim izniniz olmayan bir sayfaya denk gelmiş gibisiniz.Anasayfaya geri dönün.", "500.title": "Dahili hata.", "500.message": "Ups! Bir şeyler ters gitti sanki!", "register": "Kayıt Ol", @@ -27,7 +27,7 @@ "header.tags": "Etiketler", "header.popular": "Popüler", "header.users": "Kullanıcılar", - "header.groups": "Groups", + "header.groups": "Gruplar", "header.chats": "Sohbetler", "header.notifications": "Bildirimler", "header.search": "Arama", @@ -75,7 +75,7 @@ "updated.title": "Forum güncellendi", "updated.message": "Bu forum şu anda güncellendi. Sayfayı tekrar yüklemek için buraya tıklayın.", "privacy": "Gizlilik", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "Takip et", + "unfollow": "Takip etmeyi bırak", "delete_all": "Hepsini Sil" } \ No newline at end of file diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json index d2c411228d..e174ef10ab 100644 --- a/public/language/tr/groups.json +++ b/public/language/tr/groups.json @@ -1,21 +1,21 @@ { "groups": "Guruplar", "view_group": "Grubu Gör", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "Grup Kurucusu", + "new_group": "Yeni Grup Oluştur", + "no_groups_found": "Henüz hiç grup yok", + "cover-instructions": "Bir fotoğrafı Sürükleyin ve Bırakın, uygun yere sürükleyip Kaydet'e tıklayın.", + "cover-change": "Değiştir", + "cover-save": "Kaydet", + "cover-saving": "Kaydediliyor", "details.title": "Grup Detayları", "details.members": "Üye Listesi", - "details.pending": "Pending Members", + "details.pending": "Üyeler bekleniyor", "details.has_no_posts": "Bu grubun üyeleri henüz bir ileti göndermedi.", "details.latest_posts": "En son iletiler", - "details.private": "Private Group", - "details.public": "Public Group", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "Özel Grup", + "details.public": "Herkese Açık Grup", + "details.owner_options": "Grup Yöneticisi", + "event.updated": "Grup detayları güncellenmiştir", + "event.deleted": "\"%1\" grubu silinmiş" } \ No newline at end of file diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json index e3d1cf9cf8..5171f4232f 100644 --- a/public/language/tr/pages.json +++ b/public/language/tr/pages.json @@ -11,6 +11,7 @@ "user.followers": "%1 takip edenler", "user.posts": "%1 tarafından gönderilen iletiler", "user.topics": "%1 tarafından gönderilen başlıklar", + "user.groups": "%1 Kişisine Ait Gruplar", "user.favourites": "%1'in Favori İletileri", "user.settings": "Kullanıcı Ayarları", "maintenance.text": "%1 şu anda bakımda. Lütfen bir süre sonra tekrar deneyin.", diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json index 4773c22dfd..a1af8adb56 100644 --- a/public/language/tr/recent.json +++ b/public/language/tr/recent.json @@ -6,13 +6,13 @@ "year": "Yıl", "alltime": "Hepsi", "no_recent_topics": "Güncel konular yok.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "Yeni bir konu mevcut.", + "there-is-a-new-topic-and-a-new-post": "Yeni bir konu ve yayın mevcut.", + "there-is-a-new-topic-and-new-posts": "Bir adet yeni konu ve %1 adet yeni yayın var.", + "there-are-new-topics": "%1 adet yeni konu mevcut.", + "there-are-new-topics-and-a-new-post": "%1 adet yeni konu ve bir adet yeni yayın mevcut.", + "there-are-new-topics-and-new-posts": "%1 adet yeni konu %2 adet yeni yayın mevcut.", + "there-is-a-new-post": "Yeni bir yayın mevcut.", + "there-are-new-posts": "%1 adet yeni yayın mevcut.", + "click-here-to-reload": "Yenilemek için buraya tıklayın." } \ No newline at end of file diff --git a/public/language/tr/reset_password.json b/public/language/tr/reset_password.json index 0eb0497ee3..60f0346516 100644 --- a/public/language/tr/reset_password.json +++ b/public/language/tr/reset_password.json @@ -10,5 +10,7 @@ "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": "E-posta Adresinizi girin", "password_reset_sent": "Şifre Yenilemesi Gönderildi", - "invalid_email": "Geçersiz E-posta / E-posta mevcut değil!" + "invalid_email": "Geçersiz E-posta / E-posta mevcut değil!", + "password_too_short": "Girdiğiniz şifre çok kısa, lütfen farklı bir şifre seçiniz.", + "passwords_do_not_match": "Girdiğiniz iki şifre birbirine uymuyor." } \ No newline at end of file diff --git a/public/language/tr/search.json b/public/language/tr/search.json index d3c5da5c91..0d079ffe4a 100644 --- a/public/language/tr/search.json +++ b/public/language/tr/search.json @@ -1,7 +1,35 @@ { "results_matching": "%1 tane “%2“ bulundu (%3 saniye)", - "no-matches": "No matches found", - "in": "In", - "by": "By", - "posted-by": "Posted by" + "no-matches": "Hiç eşleşme bulunamadı", + "in": "Konum:", + "by": "Kim Tarafından :", + "titles": "Başlıklar", + "titles-posts": "Başlıklar ve Yayınlar", + "posted-by": "Gönderen", + "in-categories": "Kategorilerde", + "search-child-categories": "Alt kategorilerde arat", + "reply-count": "Cevap Sayısı", + "at-least": "En az", + "at-most": "En fazla", + "post-time": "Yayınlama zamanı", + "newer-than": "Daha yeni", + "older-than": "Daha eski", + "any-date": "Herhangi bir tarih", + "yesterday": "Dün", + "one-week": "Bir hafta", + "two-weeks": "İki hafta", + "one-month": "Bir ay", + "three-months": "Üç ay", + "six-months": "Altı ay", + "one-year": "Bir yıl", + "sort-by": "Şuna göre filtrele", + "last-reply-time": "En son cevaplama süresi", + "topic-title": "Konu başlığı", + "number-of-replies": "Cevap sayısı", + "number-of-views": "Görüntüleme sayısı", + "topic-start-date": "Başlık açılma tarihi", + "username": "Kullanıcı Adı", + "category": "Kategori", + "descending": "Azalan düzene göre", + "ascending": "Artan düzene göre" } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index aa6aa90855..6cd2424e0f 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -74,7 +74,7 @@ "fork_no_pids": "Hiç bir ileti seçilmedi!", "fork_success": "Başlık başarıyla ayrıldı!", "composer.title_placeholder": "Başlık ismini buraya girin...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "İsim", "composer.discard": "Vazgeç", "composer.submit": "Gönder", "composer.replying_to": "Yanıtlanan Konu %1", @@ -94,5 +94,5 @@ "oldest_to_newest": "En eskiden en yeniye", "newest_to_oldest": "En yeniden en eskiye", "most_votes": "En çok oy", - "most_posts": "Most posts" + "most_posts": "En sık yayın" } \ No newline at end of file diff --git a/public/language/tr/user.json b/public/language/tr/user.json index 90bd5eb06b..8fa7b4c5c9 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -2,8 +2,8 @@ "banned": "Yasaklı", "offline": "Çevrimdışı", "username": "Kullanıcı Adı", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Katılım Tarihi", + "postcount": "Yayın Sayısı", "email": "E-posta", "confirm_email": "E-posta onayla", "delete_account": "Hesabı Sil", @@ -18,7 +18,7 @@ "profile_views": "Profil Görüntülemeleri", "reputation": "Saygınlık", "favourites": "Favoriler", - "watched": "Watched", + "watched": "İzlendi", "followers": "Takipçiler", "following": "Takip Ediyor", "signature": "İmza", @@ -59,12 +59,12 @@ "digest_weekly": "Haftalık", "digest_monthly": "Aylık", "send_chat_notifications": "Çevrimiçi değilken gelen iletileri e-posta olarak gönder", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "Abone olduğum konulara cevap gelince bana eposta yolla", "has_no_follower": "Bu kullanıcının hiç takipçisi yok :(", "follows_no_one": "Bu kullanıcı kimseyi takip etmiyor :(", "has_no_posts": "Bu kullanıcı henüz birşey göndermedi.", "has_no_topics": "Bu kullanıcı henüz bir konu yaratmadı.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Bu kullanıcı henüz hiçbir konuyu izlemedi.", "email_hidden": "E-posta gizli", "hidden": "gizli", "paginate_description": "Sonsuz yükleme yerine konu ve iletileri sayfalara böl.", diff --git a/public/language/tr/users.json b/public/language/tr/users.json index 8858e75ddd..9e38f04530 100644 --- a/public/language/tr/users.json +++ b/public/language/tr/users.json @@ -5,8 +5,8 @@ "search": "Ara", "enter_username": "Aramak için bir kullanıcı adı girin", "load_more": "Daha Fazla Yükle", - "users-found-search-took": "%1 kullanıcı bulundu! Arama %2 ms sürdü.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", + "filter-by": "Şu şekilde filtrele", + "online-only": "Sadece çevrimiçi", + "picture-only": "Sadece resim" } \ No newline at end of file diff --git a/public/language/vi/email.json b/public/language/vi/email.json index 97bd7549e8..d0d376eb34 100644 --- a/public/language/vi/email.json +++ b/public/language/vi/email.json @@ -9,6 +9,9 @@ "reset.text1": "Chúng tôi nhận được yêu cầu khởi tạo lại mật khẩu của bạn, rất có thể vì bạn đã quên mất nó. Nếu bạn không gởi yêu cầu, hãy bỏ qua email này.", "reset.text2": "Để đặt lại mật khẩu, hãy click vào liên kết sau:", "reset.cta": "Click vào đây để khởi tạo lại mật khẩu", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Bạn có thông báo chưa đọc từ %1", "digest.latest_topics": "Chủ đề mới nhất từ %1", "digest.cta": "Click vào đây để truy cập %1", diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 8dd065f637..e8da82c330 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -35,6 +35,7 @@ "topic-locked": "Chủ đề bị khóa", "still-uploading": "Vui lòng chờ upload", "content-too-short": "Vui lòng tạo bài viết dài hơn. Bài viết phải có ít nhất %1 ký tự.", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "Vui lòng nhập tiêu đề dài hơn. Tiêu đề phải có ít nhất %1 ký tự", "title-too-long": "Yêu cầu tiêu đề ngắn hơn. Không dài quá %1 ký tự", "too-many-posts": "Bạn chỉ có thể gửi một bài viết mỗi %1 giây - Xin chờ trong giây lát trước khi gửi lại.", diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json index 697490930b..153a1f31d8 100644 --- a/public/language/vi/pages.json +++ b/public/language/vi/pages.json @@ -11,6 +11,7 @@ "user.followers": "Người đang theo dõi %1", "user.posts": "Các bài được %1 viết", "user.topics": "Các chủ đề được %1 tạo", + "user.groups": "%1's Groups", "user.favourites": "Các bài gửi yêu thích của %1", "user.settings": "Thiết lập cho người dùng", "maintenance.text": "%1 đang được bảo trì. Xin vui lòng quay lại sau.", diff --git a/public/language/vi/reset_password.json b/public/language/vi/reset_password.json index edc196ba6c..32db56aab3 100644 --- a/public/language/vi/reset_password.json +++ b/public/language/vi/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "Xin hãy nhập địa chỉ email của bạn và chúng tôi sẽ gửi một email hướng dẫn cách thiết lập lại tài khoản cho bạn", "enter_email_address": "Nhập địa chỉ Email", "password_reset_sent": "Đã gửi mật khẩu được thiết lập lại", - "invalid_email": "Email không đúng / Email không tồn tại!" + "invalid_email": "Email không đúng / Email không tồn tại!", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/vi/search.json b/public/language/vi/search.json index 254873ed38..a6450e408b 100644 --- a/public/language/vi/search.json +++ b/public/language/vi/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/vi/users.json b/public/language/vi/users.json index 405c9de32b..5e08193fd4 100644 --- a/public/language/vi/users.json +++ b/public/language/vi/users.json @@ -5,7 +5,7 @@ "search": "Tìm kiếm", "enter_username": "Gõ tên người dùng để tìm kiếm", "load_more": "Tải thêm", - "users-found-search-took": "%1 tài khoản(s) tìm thấy! Tìm trong %2 mili giây.", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/zh_CN/email.json b/public/language/zh_CN/email.json index 341874ec67..e81b810a9a 100644 --- a/public/language/zh_CN/email.json +++ b/public/language/zh_CN/email.json @@ -9,6 +9,9 @@ "reset.text1": "我们收到了重置您帐户密码的申请，可能是因为您遗忘了密码。如果不是，请忽略这封邮件。", "reset.text2": "如需继续重置密码，请点击下面的链接：", "reset.cta": "点击这里重置您的密码", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "您有来自 %1 的未读通知：", "digest.latest_topics": "来自 %1 的最新主题", "digest.cta": "点击这里访问 %1", diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index eef3088946..cfcb33aee8 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -35,6 +35,7 @@ "topic-locked": "主题已锁定", "still-uploading": "请等待上传完成", "content-too-short": "请再输入一些内容，帖子至少要有 %1 个字符。", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "请再输入一些内容，标题至少要有 %1 个字符。", "title-too-long": "请输入更短的标题。不超过 %1 字。", "too-many-posts": "发帖间隔至少要 %1 秒 - 请稍候再发帖", diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json index 924e8bdfa4..36d10c1cb3 100644 --- a/public/language/zh_CN/pages.json +++ b/public/language/zh_CN/pages.json @@ -11,6 +11,7 @@ "user.followers": "关注 %1 的人", "user.posts": "%1 发布的帖子", "user.topics": "%1 创建的主题", + "user.groups": "%1's Groups", "user.favourites": "%1 收藏的帖子", "user.settings": "用户设置", "maintenance.text": "%1 正在进行维护。请稍后再来。", diff --git a/public/language/zh_CN/reset_password.json b/public/language/zh_CN/reset_password.json index 701651dfb6..ca294f9dc7 100644 --- a/public/language/zh_CN/reset_password.json +++ b/public/language/zh_CN/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "请输入您的电子邮箱地址，我们会发送一份邮件指导您重置密码。", "enter_email_address": "输入邮箱地址", "password_reset_sent": "密码重置邮件已发送。", - "invalid_email": "无效的电子邮箱/电子邮箱不存在！" + "invalid_email": "无效的电子邮箱/电子邮箱不存在！", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/zh_CN/search.json b/public/language/zh_CN/search.json index 338db4e61b..25cc3605e5 100644 --- a/public/language/zh_CN/search.json +++ b/public/language/zh_CN/search.json @@ -3,5 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/zh_CN/users.json b/public/language/zh_CN/users.json index bd19c53fa9..f56a4fb88e 100644 --- a/public/language/zh_CN/users.json +++ b/public/language/zh_CN/users.json @@ -5,7 +5,7 @@ "search": "搜索", "enter_username": "输入用户名搜索", "load_more": "加载更多", - "users-found-search-took": "找到 %1 位用户！搜索耗时 %2 毫秒。", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" diff --git a/public/language/zh_TW/email.json b/public/language/zh_TW/email.json index 6a5e3ef124..1062070b96 100644 --- a/public/language/zh_TW/email.json +++ b/public/language/zh_TW/email.json @@ -9,6 +9,9 @@ "reset.text1": "我們收到一個重設密碼的請求，你忘掉了密碼嗎？如果不是，請忽略這封郵件。", "reset.text2": "要繼續重置密碼，請點擊以下鏈接：", "reset.cta": "點擊這裡重置密碼", + "reset.notify.subject": "Password successfully changed", + "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "你有來自$1的未讀通知：", "digest.latest_topics": "來自%1的最新話題", "digest.cta": "點擊這裡訪問%1", diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json index 5342050972..cb254c35aa 100644 --- a/public/language/zh_TW/error.json +++ b/public/language/zh_TW/error.json @@ -35,6 +35,7 @@ "topic-locked": "該主題已被鎖定", "still-uploading": "請等待上傳完成。", "content-too-short": "請輸入一個較長的帖子。 帖子需至少有 %1 個字。", + "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", "title-too-short": "請輸入一個較長的標題。 標題需至少有 %1 個字。", "title-too-long": "請輸入一個較短的主題名稱。 標題不能超過 %1 個字元。", "too-many-posts": "你必須間隔 %1 秒後才能發表文章－請稍後", diff --git a/public/language/zh_TW/pages.json b/public/language/zh_TW/pages.json index deaa502ffe..bcb655c3e2 100644 --- a/public/language/zh_TW/pages.json +++ b/public/language/zh_TW/pages.json @@ -11,6 +11,7 @@ "user.followers": "People who Follow %1", "user.posts": "文章由 %1 所張貼", "user.topics": "主題由 %1 所創建", + "user.groups": "%1's Groups", "user.favourites": "%1's 最喜愛的文章", "user.settings": "使用者設定", "maintenance.text": "%1目前正在進行維修。請稍後再來。", diff --git a/public/language/zh_TW/reset_password.json b/public/language/zh_TW/reset_password.json index b4c454d4da..9f0ab67aa1 100644 --- a/public/language/zh_TW/reset_password.json +++ b/public/language/zh_TW/reset_password.json @@ -10,5 +10,7 @@ "enter_email": "請輸入您的Email地址，我們會發送郵件告訴您如何重設密碼。", "enter_email_address": "輸入郵箱地址", "password_reset_sent": "密碼重設郵件已發送。", - "invalid_email": "非法的郵箱地址/郵箱不存在！" + "invalid_email": "非法的郵箱地址/郵箱不存在！", + "password_too_short": "The password entered is too short, please pick a different password.", + "passwords_do_not_match": "The two passwords you've entered do not match." } \ No newline at end of file diff --git a/public/language/zh_TW/search.json b/public/language/zh_TW/search.json index 426fa932b4..9fa8e84f2a 100644 --- a/public/language/zh_TW/search.json +++ b/public/language/zh_TW/search.json @@ -1,7 +1,35 @@ { "results_matching": "有%1個跟\"%2\"匹配的結果（%3秒）", - "no-matches": "No matches found", + "no-matches": "沒有找到匹配的主題", "in": "In", "by": "By", - "posted-by": "Posted by" + "titles": "Titles", + "titles-posts": "Titles and Posts", + "posted-by": "Posted by", + "in-categories": "In Categories", + "search-child-categories": "Search child categories", + "reply-count": "Reply Count", + "at-least": "At least", + "at-most": "At most", + "post-time": "Post time", + "newer-than": "Newer than", + "older-than": "Older than", + "any-date": "Any date", + "yesterday": "Yesterday", + "one-week": "One week", + "two-weeks": "Two weeks", + "one-month": "One month", + "three-months": "Three months", + "six-months": "Six months", + "one-year": "One year", + "sort-by": "Sort by", + "last-reply-time": "Last reply time", + "topic-title": "Topic title", + "number-of-replies": "Number of replies", + "number-of-views": "Number of views", + "topic-start-date": "Topic start date", + "username": "Username", + "category": "Category", + "descending": "In descending order", + "ascending": "In ascending order" } \ No newline at end of file diff --git a/public/language/zh_TW/users.json b/public/language/zh_TW/users.json index 249b34d36f..b3c22fb165 100644 --- a/public/language/zh_TW/users.json +++ b/public/language/zh_TW/users.json @@ -5,7 +5,7 @@ "search": "搜尋", "enter_username": "輸入想找的使用者帳號", "load_more": "載入更多", - "users-found-search-took": "找到%1個用戶！搜索時間%2毫秒。", + "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", "filter-by": "Filter By", "online-only": "Online only", "picture-only": "Picture only" From 57d45518bdc71e50654802116e189680ac478d16 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 10 Feb 2015 11:16:24 -0500 Subject: [PATCH 361/897] added a preventDefault when href="#" or data-ajaxify="false", so page doesn't send user back to top (which is kind of annoying), but not sure if this may introduce side-effects. @barisusakli @psychobunny --- 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 cc7c0cbff1..d2af431176 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -276,7 +276,7 @@ $(document).ready(function() { // Enhancing all anchors to ajaxify... $(document.body).on('click', 'a', function (e) { if (hrefEmpty(this.href) || this.target !== '' || this.protocol === 'javascript:' || $(this).attr('data-ajaxify') === 'false') { - return; + return e.preventDefault(); } if (!window.location.pathname.match(/\/(403|404)$/g)) { From f16c37eeaf84a22ed27fbdbc929e5ddcc83f80b3 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 10 Feb 2015 11:17:25 -0500 Subject: [PATCH 362/897] #2692 --- public/src/client/groups/details.js | 13 +++++++++++++ src/socket.io/groups.js | 20 +++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 09826fb673..b40957af8a 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -39,6 +39,19 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', }); break; + case 'kick': + socket.emit('groups.kick', { + uid: uid, + groupName: ajaxify.variables.get('group_name') + }, function(err) { + if (!err) { + userRow.slideUp().remove(); + } else { + app.alertError(err.message); + } + }); + break; + case 'update': Details.update(); break; diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index a99112eded..ba35e128c4 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -102,7 +102,7 @@ SocketGroups.reject = function(socket, data, callback) { }; SocketGroups.update = function(socket, data, callback) { - if(!data) { + if (!data) { return callback(new Error('[[error:invalid-data]]')); } @@ -130,7 +130,7 @@ SocketGroups.create = function(socket, data, callback) { }; SocketGroups.delete = function(socket, data, callback) { - if(!data) { + if (!data) { return callback(new Error('[[error:invalid-data]]')); } @@ -156,6 +156,20 @@ SocketGroups.search = function(socket, data, callback) { groups.search(data.query || '', data.options || {}, callback); }; +SocketGroups.kick = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) { + if (!isOwner) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.leave(data.groupName, data.uid, callback); + }); +}; + SocketGroups.cover = {}; SocketGroups.cover.get = function(socket, data, callback) { @@ -163,7 +177,7 @@ SocketGroups.cover.get = function(socket, data, callback) { }; SocketGroups.cover.update = function(socket, data, callback) { - if(!data) { + if (!data) { return callback(new Error('[[error:invalid-data]]')); } else if (socket.uid === 0) { return callback(new Error('[[error:no-privileges]]')); From 9bfb7585ee9451f71e21f4ab6770dfaa630bc81c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 10 Feb 2015 11:21:14 -0500 Subject: [PATCH 363/897] bundling emoji-extended with all installs, @frissdiegurke --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index cb00f143cc..013480d14d 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "morgan": "^1.3.2", "nconf": "~0.7.1", "nodebb-plugin-dbsearch": "^0.1.0", + "nodebb-plugin-emoji-extended": "^0.4.1-4", "nodebb-plugin-markdown": "^0.8.0", "nodebb-plugin-mentions": "^0.9.0", "nodebb-plugin-soundpack-default": "~0.1.1", From 0d9d9bf110d5a0a3f625261ac38cd56c74c57361 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 10 Feb 2015 11:24:11 -0500 Subject: [PATCH 364/897] added two new language strings --- public/language/en_GB/groups.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index eb9a45f994..964b5f42c6 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -17,6 +17,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", From 47964e8ff4408f6f66faa3133197ac05cf20ab95 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 10 Feb 2015 11:24:44 -0500 Subject: [PATCH 365/897] latest fallbacks --- public/language/ar/groups.json | 2 ++ public/language/bn/groups.json | 2 ++ public/language/cs/groups.json | 2 ++ public/language/de/groups.json | 2 ++ public/language/el/groups.json | 2 ++ public/language/en@pirate/groups.json | 2 ++ public/language/en_US/groups.json | 2 ++ public/language/es/groups.json | 2 ++ public/language/et/groups.json | 2 ++ public/language/fa_IR/groups.json | 2 ++ public/language/fi/groups.json | 2 ++ public/language/fr/groups.json | 2 ++ public/language/he/groups.json | 2 ++ public/language/hu/groups.json | 2 ++ public/language/id/groups.json | 2 ++ public/language/it/groups.json | 2 ++ public/language/ja/groups.json | 2 ++ public/language/ko/groups.json | 2 ++ public/language/lt/groups.json | 2 ++ public/language/ms/groups.json | 2 ++ public/language/nb/groups.json | 2 ++ public/language/nl/groups.json | 2 ++ public/language/pl/groups.json | 2 ++ public/language/pt_BR/groups.json | 2 ++ public/language/ro/groups.json | 2 ++ public/language/ru/groups.json | 2 ++ public/language/sc/groups.json | 2 ++ public/language/sk/groups.json | 2 ++ public/language/sv/groups.json | 2 ++ public/language/th/groups.json | 2 ++ public/language/tr/groups.json | 2 ++ public/language/vi/groups.json | 2 ++ public/language/zh_CN/groups.json | 2 ++ public/language/zh_TW/groups.json | 2 ++ 34 files changed, 68 insertions(+) diff --git a/public/language/ar/groups.json b/public/language/ar/groups.json index 5ca494a696..b006f74391 100644 --- a/public/language/ar/groups.json +++ b/public/language/ar/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "آخر المشاركات", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/bn/groups.json b/public/language/bn/groups.json index a9f9207a2f..fe8c9fed1d 100644 --- a/public/language/bn/groups.json +++ b/public/language/bn/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "সর্বশেষ পোষ্টসমূহ", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/cs/groups.json b/public/language/cs/groups.json index 980b41e1b7..95d083451f 100644 --- a/public/language/cs/groups.json +++ b/public/language/cs/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Nejnovější příspěvky", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/de/groups.json b/public/language/de/groups.json index 812b309dc3..375e09d9b5 100644 --- a/public/language/de/groups.json +++ b/public/language/de/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Aktuelle Beiträge", "details.private": "Private Gruppe", "details.public": "Öffentliche Gruppe", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Gruppenadministration", "event.updated": "Gruppendetails wurden aktualisiert", "event.deleted": "Die Gruppe \"% 1\" wurde gelöscht" diff --git a/public/language/el/groups.json b/public/language/el/groups.json index 5fa5a25877..9ad8583476 100644 --- a/public/language/el/groups.json +++ b/public/language/el/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Τελευταίες δημοσιεύσεις.", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/en@pirate/groups.json b/public/language/en@pirate/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/en@pirate/groups.json +++ b/public/language/en@pirate/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/en_US/groups.json b/public/language/en_US/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/en_US/groups.json +++ b/public/language/en_US/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/es/groups.json b/public/language/es/groups.json index bc91648d60..999550b671 100644 --- a/public/language/es/groups.json +++ b/public/language/es/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Últimas Publicaciones", "details.private": "Grupo Privado", "details.public": "Grupo Público", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Administración De Grupo", "event.updated": "Los detalles del grupo han sido actualizados", "event.deleted": "El grupo \"%1\" ha sido eliminado" diff --git a/public/language/et/groups.json b/public/language/et/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/et/groups.json +++ b/public/language/et/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/fa_IR/groups.json b/public/language/fa_IR/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/fa_IR/groups.json +++ b/public/language/fa_IR/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/fi/groups.json b/public/language/fi/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/fi/groups.json +++ b/public/language/fi/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json index e786d08dd0..d8c81570df 100644 --- a/public/language/fr/groups.json +++ b/public/language/fr/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Derniers messages", "details.private": "Groupe Privé", "details.public": "Groupe Public", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Administration du Groupe", "event.updated": "Les détails du groupe ont été mis à jour", "event.deleted": "Le groupe é%1\" a été supprimé" diff --git a/public/language/he/groups.json b/public/language/he/groups.json index 54f7936c08..6754a5611c 100644 --- a/public/language/he/groups.json +++ b/public/language/he/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "פוסטים אחרונים", "details.private": "קבוצה פרטית", "details.public": "קבוצה פומבית", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "ניהול הקבוצה", "event.updated": "פרטי הקבוצה עודכנו", "event.deleted": "קבוצת \"%1\" נמחקה" diff --git a/public/language/hu/groups.json b/public/language/hu/groups.json index 3d8cddf1c1..09324055a0 100644 --- a/public/language/hu/groups.json +++ b/public/language/hu/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Legújabb bejegyzések", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/id/groups.json b/public/language/id/groups.json index bca990761d..3bae971661 100644 --- a/public/language/id/groups.json +++ b/public/language/id/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Posting Terkini", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/it/groups.json b/public/language/it/groups.json index 51f67ec593..f4e5f32787 100644 --- a/public/language/it/groups.json +++ b/public/language/it/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Ultimi Post", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/ja/groups.json b/public/language/ja/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/ja/groups.json +++ b/public/language/ja/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/ko/groups.json b/public/language/ko/groups.json index 8a788bebb2..344c35078b 100644 --- a/public/language/ko/groups.json +++ b/public/language/ko/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "최근 게시물", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/lt/groups.json b/public/language/lt/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/lt/groups.json +++ b/public/language/lt/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/ms/groups.json b/public/language/ms/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/ms/groups.json +++ b/public/language/ms/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/nb/groups.json b/public/language/nb/groups.json index 7578e96072..894bbc0a12 100644 --- a/public/language/nb/groups.json +++ b/public/language/nb/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Seneste innlegg", "details.private": "Privat grup", "details.public": "Offentlig grup", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Gruppeadministrasjon", "event.updated": "Gruppedetaljer har blitt oppgradert", "event.deleted": "Gruppen \"%1\" har blitt slettet" diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json index a1d2ca868d..59681475d1 100644 --- a/public/language/nl/groups.json +++ b/public/language/nl/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Nieuwste Berichten", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json index 9fdd6d6c79..0cd285b938 100644 --- a/public/language/pl/groups.json +++ b/public/language/pl/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Ostatnie posty", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/pt_BR/groups.json b/public/language/pt_BR/groups.json index 09abeb8bcd..4095f4c3ce 100644 --- a/public/language/pt_BR/groups.json +++ b/public/language/pt_BR/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Últimos Posts", "details.private": "Grupo Privado", "details.public": "Grupo Público.", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Administração do Grupo", "event.updated": "Os detalhes do grupo foram atualizados", "event.deleted": "O grupo \"%1\" foi deletado" diff --git a/public/language/ro/groups.json b/public/language/ro/groups.json index 816af582ea..03cacf8b36 100644 --- a/public/language/ro/groups.json +++ b/public/language/ro/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Ultimele Mesaje", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json index 55a2f35561..4b86076056 100644 --- a/public/language/ru/groups.json +++ b/public/language/ru/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Последние записи", "details.private": "Приватная группа", "details.public": "Открытая группа", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Настройки группы", "event.updated": "Настройки группы обновлены", "event.deleted": "Группа \"%1\" удалена" diff --git a/public/language/sc/groups.json b/public/language/sc/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/sc/groups.json +++ b/public/language/sc/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/sk/groups.json b/public/language/sk/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/sk/groups.json +++ b/public/language/sk/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json index 92a4eeb90b..fdba1db1b1 100644 --- a/public/language/sv/groups.json +++ b/public/language/sv/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Senaste inlägg", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/th/groups.json b/public/language/th/groups.json index 6dfd71256b..950fe6dca3 100644 --- a/public/language/th/groups.json +++ b/public/language/th/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Latest Posts", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json index e174ef10ab..3b765a2f7b 100644 --- a/public/language/tr/groups.json +++ b/public/language/tr/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "En son iletiler", "details.private": "Özel Grup", "details.public": "Herkese Açık Grup", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Grup Yöneticisi", "event.updated": "Grup detayları güncellenmiştir", "event.deleted": "\"%1\" grubu silinmiş" diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json index c3a1d060d0..b649073d9b 100644 --- a/public/language/vi/groups.json +++ b/public/language/vi/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "Bài mới nhất", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/zh_CN/groups.json b/public/language/zh_CN/groups.json index 10a70d94c2..5a4bdd5b1f 100644 --- a/public/language/zh_CN/groups.json +++ b/public/language/zh_CN/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "最新帖子", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/zh_TW/groups.json b/public/language/zh_TW/groups.json index 7e9ba9f239..a6c0d93c19 100644 --- a/public/language/zh_TW/groups.json +++ b/public/language/zh_TW/groups.json @@ -15,6 +15,8 @@ "details.latest_posts": "最新帖子", "details.private": "Private Group", "details.public": "Public Group", + "details.grant": "Grant/Rescind Ownership", + "details.kick": "Kick", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" From 34c1d69ed33fcc843f06291c4029c995667e1209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Feb 2015 13:12:08 -0500 Subject: [PATCH 366/897] added filter:tags.search --- src/topics/tags.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/topics/tags.js b/src/topics/tags.js index be01380ef5..14982b4e1e 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -271,8 +271,10 @@ module.exports = function(Topics) { matches = matches.slice(0, 20).sort(function(a, b) { return a > b; }); - - callback(null, matches); + + plugins.fireHook('filter:tags.search', {data: data, matches: matches}, function(err, data) { + callback(err, data ? data.matches : []); + }); }); }; From b40b87dd360c28d7df0e6f49274a36cfdda7d0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Feb 2015 13:45:29 -0500 Subject: [PATCH 367/897] dont add relative_path to uploads it is added on the way out --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index acb1a3baca..dcdf8e1819 100644 --- a/app.js +++ b/app.js @@ -116,7 +116,7 @@ function start() { nconf.set('use_port', !!urlObject.port); nconf.set('relative_path', relativePath); nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567); - nconf.set('upload_url', relativePath + '/uploads/'); + nconf.set('upload_url', '/uploads/'); if (nconf.get('isPrimary') === 'true') { winston.info('Time: %s', (new Date()).toString()); From 57d6bb3b4c2a52668757ca3a067b0fd98e851cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Feb 2015 14:30:01 -0500 Subject: [PATCH 368/897] filter:search.build hook --- src/controllers/search.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/controllers/search.js b/src/controllers/search.js index 0a26822699..93a7eccdc5 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -41,10 +41,9 @@ searchController.search = function(req, res, next) { req.query.categories = [req.query.categories]; } - req.query.in = req.query.in || 'posts'; - search.search({ + var data = { query: req.params.term, - searchIn: req.query.in, + searchIn: req.query.in || 'posts', postedBy: req.query.by, categories: req.query.categories, searchChildren: req.query.searchChildren, @@ -56,7 +55,9 @@ searchController.search = function(req, res, next) { sortDirection: req.query.sortDirection, page: page, uid: uid - }, function(err, results) { + }; + + search.search(data, function(err, results) { if (err) { return next(err); } @@ -67,7 +68,13 @@ searchController.search = function(req, res, next) { results.showAsTopics = req.query.showAs === 'topics'; results.breadcrumbs = breadcrumbs; results.categories = categories; - res.render('search', results); + + plugins.fireHook('filter:search.build', {data: data, results: results}, function(err, data) { + if (err) { + return next(err); + } + res.render('search', data.results); + }); }); }); }; From 6a55cdfbaf8b552e60cba21c6eb3a00a6f5fea06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Feb 2015 14:47:01 -0500 Subject: [PATCH 369/897] fix relative_path image url for sub installs --- src/controllers/accounts.js | 2 +- src/user.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 84b0f96ad5..77cbe1008b 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -438,7 +438,7 @@ accountsController.uploadPicture = function (req, res, next) { user.setUserFields(updateUid, {uploadedpicture: image.url, picture: image.url}); - res.json([{name: userPhoto.name, url: image.url}]); + res.json([{name: userPhoto.name, url: nconf.get('relative_path') + image.url}]); } if (err) { diff --git a/src/user.js b/src/user.js index bd781432a0..035933154a 100644 --- a/src/user.js +++ b/src/user.js @@ -119,7 +119,7 @@ var async = require('async'), if (user.picture) { if (user.picture === user.uploadedpicture) { - user.picture = user.picture.indexOf('http') === -1 ? nconf.get('relative_path') + user.picture : user.picture; + user.picture = user.uploadedpicture = user.picture.indexOf('http') === -1 ? nconf.get('relative_path') + user.picture : user.picture; } else { user.picture = User.createGravatarURLFromEmail(user.email); } From 2c86ca59e6c75c7107b6d5c768cbb89987051f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Feb 2015 15:23:11 -0500 Subject: [PATCH 370/897] fire filter:serch.build if query is empty --- src/controllers/search.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/controllers/search.js b/src/controllers/search.js index 93a7eccdc5..2020612094 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -24,7 +24,7 @@ searchController.search = function(req, res, next) { } if (!req.params.term) { - return res.render('search', { + var results = { time: 0, search_query: '', posts: [], @@ -32,7 +32,14 @@ searchController.search = function(req, res, next) { tags: [], categories: categories, breadcrumbs: breadcrumbs + }; + plugins.fireHook('filter:search.build', {data: {}, results: results}, function(err, data) { + if (err) { + return next(err); + } + res.render('search', data.results); }); + return; } req.params.term = validator.escape(req.params.term); From a0e98d5957e162bcec84fdbbe7d5368ac6386974 Mon Sep 17 00:00:00 2001 From: Timothy Fike Date: Tue, 10 Feb 2015 19:47:06 -0500 Subject: [PATCH 371/897] Make widget headers clickable anywhere. --- public/src/admin/extend/widgets.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 1bf4a043ec..9632bbfa68 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -46,8 +46,6 @@ define('admin/extend/widgets', function() { appendToggle(ui.item); }, connectWith: "div" - }).on('click', '.toggle-widget', function() { - $(this).parents('.widget-panel').children('.panel-body').toggleClass('hidden'); }).on('click', '.delete-widget', function() { var panel = $(this).parents('.widget-panel'); @@ -56,8 +54,10 @@ define('admin/extend/widgets', function() { panel.remove(); } }); - }).on('dblclick', '.panel-heading', function() { - $(this).parents('.widget-panel').children('.panel-body').toggleClass('hidden'); + }).on('mouseup', '.panel-heading', function(evt) { + if ( !( $(this).parents('.widget-panel').is('.ui-sortable-helper') || $(evt.target).closest('.delete-widget').length ) ) { + $(this).parents('.widget-panel').children('.panel-body').toggleClass('hidden'); + } }); $('#widgets .save').on('click', saveWidgets); From a5029d148ccd8ca45223a06c189a5c5c649d1e0a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 10 Feb 2015 20:20:52 -0500 Subject: [PATCH 372/897] open user links in new tab --- src/views/admin/advanced/events.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index e3231b0099..7eb2997ba5 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -10,7 +10,7 @@
    #{events.eid} {events.type} - {events.user.username} (uid {events.user.uid}) (IP {events.ip}) + {events.user.username} (uid {events.user.uid}) (IP {events.ip}) {events.timestampISO} 

    {events.jsonString}
    From 104393f5f7df13e6f0b178ccd411748c6f5e8c53 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 10 Feb 2015 21:54:35 -0500 Subject: [PATCH 373/897] closes #2712 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 013480d14d..8de4dbc58c 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "nodebb-plugin-mentions": "^0.9.0", "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", - "nodebb-theme-lavender": "^0.2.0", + "nodebb-theme-lavender": "^1.0.0", "nodebb-theme-vanilla": "^1.0.0", "nodebb-widget-essentials": "~0.2.0", "npm": "^2.1.4", From 1142f7700f2c1337fefaa417f65fb67843e5802f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 10 Feb 2015 23:34:06 -0500 Subject: [PATCH 374/897] closes #2714 --- src/plugins.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index bd00bb8b0a..0c8a4ba394 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -343,16 +343,18 @@ var fs = require('fs'), }).reduce(function(prev, cur) { return prev.concat(cur); }); - next(null, paths); - } - ], function(err, paths) { - for (var x=0,numPaths=paths.length;x Date: Tue, 10 Feb 2015 21:34:19 -0700 Subject: [PATCH 375/897] Make ACP sidebar fixed If you want to implement some kind of replacement for the CSS calc I used, go ahead and do it yourself. I'm hoping webmasters can either deal with a tad bit of overlap or have a modern browser. --- public/less/admin/admin.less | 12 +++++++++++- src/views/admin/advanced/events.tpl | 3 +-- src/views/admin/advanced/logs.tpl | 2 +- src/views/admin/appearance/skins.tpl | 4 ++-- src/views/admin/development/logger.tpl | 2 +- src/views/admin/extend/plugins.tpl | 4 ++-- src/views/admin/general/languages.tpl | 4 ++-- src/views/admin/general/sounds.tpl | 4 ++-- src/views/admin/manage/categories.tpl | 4 ++-- src/views/admin/manage/flags.tpl | 4 +--- src/views/admin/manage/groups.tpl | 2 +- src/views/admin/manage/tags.tpl | 14 +++++++------- src/views/admin/manage/users.tpl | 4 ++-- src/views/admin/settings/footer.tpl | 4 ++-- 14 files changed, 37 insertions(+), 30 deletions(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 2e5b868048..6beb1525fd 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -266,4 +266,14 @@ // See: https://github.com/twbs/bootstrap/commit/8e2348e9eda51296eb680192379ab37f10355ca3 .navbar-brand > img { display: inline-block; -} \ No newline at end of file +} + +@media (min-width: 768px) { + .acp-sidebar { + position: fixed; + top: 70px; + right: 15px; + width: initial; + max-width: calc( ~"(100% - 200px)/4" ); + } +} diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index e3231b0099..eb22fb13db 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -20,7 +20,7 @@
    -
    +
    Events Control Panel
    @@ -29,4 +29,3 @@
    - diff --git a/src/views/admin/advanced/logs.tpl b/src/views/admin/advanced/logs.tpl index 0311573d25..24f91ce60b 100644 --- a/src/views/admin/advanced/logs.tpl +++ b/src/views/admin/advanced/logs.tpl @@ -7,7 +7,7 @@
    -
    +
    Logs Control Panel
    diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl index e3e91680af..10211893f5 100644 --- a/src/views/admin/appearance/skins.tpl +++ b/src/views/admin/appearance/skins.tpl @@ -12,7 +12,7 @@
    -
    +
    Revert to Default
    @@ -29,4 +29,4 @@ t.render(data); }); }; - \ No newline at end of file + diff --git a/src/views/admin/development/logger.tpl b/src/views/admin/development/logger.tpl index 826f9e5bcc..6e9a932230 100644 --- a/src/views/admin/development/logger.tpl +++ b/src/views/admin/development/logger.tpl @@ -40,7 +40,7 @@
    -
    +
    Logger Control Panel
    diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index eb709885a2..b44c2461bc 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -79,7 +79,7 @@
    -
    +
    Plugin Search
    @@ -96,4 +96,4 @@
    -
    \ No newline at end of file +
    diff --git a/src/views/admin/general/languages.tpl b/src/views/admin/general/languages.tpl index bc75b2fee4..b2365e91a3 100644 --- a/src/views/admin/general/languages.tpl +++ b/src/views/admin/general/languages.tpl @@ -25,7 +25,7 @@
    -
    +
    Languages Control Panel
    @@ -37,4 +37,4 @@ \ No newline at end of file + diff --git a/src/views/admin/general/sounds.tpl b/src/views/admin/general/sounds.tpl index 3556bcbb7d..fb43c138aa 100644 --- a/src/views/admin/general/sounds.tpl +++ b/src/views/admin/general/sounds.tpl @@ -58,7 +58,7 @@
    -
    +
    Sounds Control Panel
    @@ -66,4 +66,4 @@
    -
    \ No newline at end of file +
    diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index 2c0dcf48da..711cdbce72 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -132,7 +132,7 @@
    -
    +
    Categories Control Panel
    @@ -153,4 +153,4 @@
    -
    \ No newline at end of file +
    diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl index 929fd6674d..23a5d6f796 100644 --- a/src/views/admin/manage/flags.tpl +++ b/src/views/admin/manage/flags.tpl @@ -41,7 +41,7 @@
    -
    +
    Flags Control Panel
    @@ -52,5 +52,3 @@
    - - diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index 69f8bad37b..26fe157dac 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -37,7 +37,7 @@
    -
    +
    Groups Control Panel
    diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl index afacffb2d4..1b8c687b00 100644 --- a/src/views/admin/manage/tags.tpl +++ b/src/views/admin/manage/tags.tpl @@ -1,11 +1,11 @@
    - -
    - Your forum does not have any topics with tags yet! -
    -
    + +
    + Your forum does not have any topics with tags yet! +
    +
    Tag Management
    @@ -34,7 +34,7 @@
    -
    +
    Modify Tag
    @@ -52,4 +52,4 @@
    -
    \ No newline at end of file +
    diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 1e034474b8..e68cef75ee 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -123,7 +123,7 @@
    -
    +
    Users Control Panel
    @@ -132,4 +132,4 @@
    -
    \ No newline at end of file +
    diff --git a/src/views/admin/settings/footer.tpl b/src/views/admin/settings/footer.tpl index 77b495e33c..78e62335c5 100644 --- a/src/views/admin/settings/footer.tpl +++ b/src/views/admin/settings/footer.tpl @@ -1,6 +1,6 @@
    -
    +
    Save Settings
    @@ -14,4 +14,4 @@ require(['admin/settings'], function(Settings) { Settings.prepare(); }); - \ No newline at end of file + From 081462983a2bb82452a15127b87bf70d4dd5c2fe Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 11 Feb 2015 11:34:33 -0500 Subject: [PATCH 376/897] refactored the groups update method a bit, and now if a group has pending members and it becomes a public group, those users become members --- src/groups.js | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/groups.js b/src/groups.js index 7567c662f5..f82e452b96 100644 --- a/src/groups.js +++ b/src/groups.js @@ -503,7 +503,11 @@ var async = require('async'), 'private': values.private === false ? '0' : '1' }; - db.setObject('group:' + groupName, payload, function(err) { + async.series([ + async.apply(updatePrivacy, groupName, values.private), + async.apply(db.setObject, 'group:' + groupName, payload), + async.apply(renameGroup, groupName, values.name) + ], function(err) { if (err) { return callback(err); } @@ -512,11 +516,37 @@ var async = require('async'), name: groupName, values: values }); - renameGroup(groupName, values.name, callback); + callback(); }); }); }; + function updatePrivacy(groupName, newValue, callback) { + // Grab the group's current privacy value + Groups.getGroupFields(groupName, ['private'], function(err, currentValue) { + currentValue = currentValue.private === '1'; // Now a Boolean + + if (currentValue !== newValue && currentValue === true) { + // Group is now public, so all pending users are automatically considered members + db.getSetMembers('group:' + groupName + ':pending', function(err, uids) { + if (err) { return callback(err); } + else if (!uids) { return callback(); } // No pending users, we're good to go + + var now = Date.now(), + scores = uids.map(function() { return now; }); // There's probably a better way to initialise an Array of size x with the same value... + + winston.verbose('[groups.update] Group is now public, automatically adding ' + uids.length + ' new members, who were pending prior.'); + async.series([ + async.apply(db.sortedSetAdd, 'group:' + groupName + ':members', scores, uids), + async.apply(db.delete, 'group:' + groupName + ':pending') + ], callback); + }); + } else { + callback(); + } + }); + } + function renameGroup(oldName, newName, callback) { if (oldName === newName || !newName || newName.length === 0) { return callback(); From 749ce5f8e5a9848c9fb462679a689f0da66df431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Feb 2015 12:01:46 -0500 Subject: [PATCH 377/897] dont crash if callback isnt supplied to list methods --- src/database/redis/list.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/database/redis/list.js b/src/database/redis/list.js index 115a56a767..7ebc068d53 100644 --- a/src/database/redis/list.js +++ b/src/database/redis/list.js @@ -2,34 +2,40 @@ module.exports = function(redisClient, module) { module.listPrepend = function(key, value, callback) { + callback = callback || function() {}; redisClient.lpush(key, value, function(err, res) { callback(err); }); }; module.listAppend = function(key, value, callback) { + callback = callback || function() {}; redisClient.rpush(key, value, function(err, res) { callback(err); }); }; module.listRemoveLast = function(key, callback) { + callback = callback || function() {}; redisClient.rpop(key, callback); }; module.listRemoveAll = function(key, value, callback) { + callback = callback || function() {}; redisClient.lrem(key, 0, value, function(err, res) { callback(err); }); }; module.listTrim = function(key, start, stop, callback) { + callback = callback || function() {}; redisClient.ltrim(key, start, stop, function(err, res) { callback(err); }); }; module.getListRange = function(key, start, stop, callback) { + callback = callback || function() {}; redisClient.lrange(key, start, stop, callback); }; }; \ No newline at end of file From f3d1e96c24554e04710a46cc462a9c010a5f8830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Feb 2015 12:12:37 -0500 Subject: [PATCH 378/897] filter deleted topics on popular --- src/topics/popular.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/topics/popular.js b/src/topics/popular.js index ce2182cabf..a1149914fc 100644 --- a/src/topics/popular.js +++ b/src/topics/popular.js @@ -34,10 +34,12 @@ module.exports = function(Topics) { function getTopics(tids, uid, count, callback) { async.waterfall([ function(next) { - Topics.getTopicsFields(tids, ['tid', 'postcount'], next); + Topics.getTopicsFields(tids, ['tid', 'postcount', 'deleted'], next); }, function(topics, next) { - tids = topics.sort(function(a, b) { + tids = topics.filter(function(topic) { + return topic && parseInt(topic.deleted, 10) !== 1; + }).sort(function(a, b) { return b.postcount - a.postcount; }).slice(0, count).map(function(topic) { return topic.tid; From 0c5c0bf08ab46d0a4de435c204f6fbda28bfe955 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 11 Feb 2015 12:23:11 -0500 Subject: [PATCH 379/897] making userRow selector less specific, in group details.js --- public/src/client/groups/details.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index b40957af8a..1d651fad27 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -19,7 +19,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', detailsPage.on('click', '[data-action]', function() { var btnEl = $(this), - userRow = btnEl.parents('tr'), + userRow = btnEl.parents('[data-uid]'), ownerFlagEl = userRow.find('.member-name i'), isOwner = !ownerFlagEl.hasClass('invisible') ? true : false, uid = userRow.attr('data-uid'), From 8a581ed1ddce50872b9d6f70be6603127f9c2ebc Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 11 Feb 2015 12:30:48 -0500 Subject: [PATCH 380/897] fixes #2711 :rage2: --- public/src/ajaxify.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index d2af431176..cd87159420 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -275,7 +275,9 @@ $(document).ready(function() { // Enhancing all anchors to ajaxify... $(document.body).on('click', 'a', function (e) { - if (hrefEmpty(this.href) || this.target !== '' || this.protocol === 'javascript:' || $(this).attr('data-ajaxify') === 'false') { + if (this.target !== '') { + return; + } else if (hrefEmpty(this.href) || this.protocol === 'javascript:' || $(this).attr('data-ajaxify') === 'false') { return e.preventDefault(); } From d20628a8d4458e3dbde79c24fac82f7c15d452e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Feb 2015 12:54:54 -0500 Subject: [PATCH 381/897] closes #2539 --- public/src/app.js | 29 ++++++++------------------ public/src/client/account/edit.js | 4 ++-- public/src/client/account/settings.js | 2 +- public/src/client/chats.js | 2 +- public/src/client/footer.js | 2 +- public/src/client/topic.js | 2 +- public/src/client/topic/browsing.js | 2 +- public/src/client/topic/events.js | 2 +- public/src/client/topic/posts.js | 10 ++++----- public/src/client/topic/threadTools.js | 2 +- public/src/modules/chat.js | 2 +- public/src/modules/composer.js | 14 ++++++------- src/socket.io/index.js | 27 +++++++----------------- 13 files changed, 38 insertions(+), 62 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 1e5b92cf4d..5010ead25d 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -10,10 +10,6 @@ app.currentRoom = null; app.widgets = {}; app.cacheBuster = null; -// TODO: deprecate in 0.7.0, use app.user -app.username = null; -app.uid = null; - (function () { var showWelcomeMessage = false; var reconnecting = false; @@ -29,14 +25,7 @@ app.uid = null; socket = io.connect(config.websocketAddress, ioParams); reconnecting = false; - socket.on('event:connect', function (data) { - // TODO : deprecate in 0.7.0, use app.user - app.username = data.username; - app.userslug = data.userslug; - app.picture = data.picture; - app.uid = data.uid; - app.isAdmin = data.isAdmin; - + socket.on('event:connect', function () { app.showLoginMessage(); app.replaceSelfLinks(); $(window).trigger('action:connected'); @@ -182,9 +171,9 @@ app.uid = null; socket.emit('meta.rooms.enter', { enter: room, - username: app.username, - userslug: app.userslug, - picture: app.picture + username: app.user.username, + userslug: app.user.userslug, + picture: app.user.picture }); app.currentRoom = room; @@ -232,8 +221,8 @@ app.uid = null; selector = selector || $('a'); selector.each(function() { var href = $(this).attr('href'); - if (href && app.userslug && href.indexOf('user/_self_') !== -1) { - $(this).attr('href', href.replace(/user\/_self_/g, 'user/' + app.userslug)); + if (href && app.user.userslug && href.indexOf('user/_self_') !== -1) { + $(this).attr('href', href.replace(/user\/_self_/g, 'user/' + app.user.userslug)); } }); }; @@ -261,7 +250,7 @@ app.uid = null; function showAlert() { app.alert({ type: 'success', - title: '[[global:welcome_back]] ' + app.username + '!', + title: '[[global:welcome_back]] ' + app.user.username + '!', message: '[[global:you_have_successfully_logged_in]]', timeout: 5000 }); @@ -278,11 +267,11 @@ app.uid = null; }; app.openChat = function (username, touid) { - if (username === app.username) { + if (username === app.user.username) { return app.alertError('[[error:cant-chat-with-yourself]]'); } - if (!app.uid) { + if (!app.user.uid) { return app.alertError('[[error:not-logged-in]]'); } diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index f85e00951c..dc8bfaeaf1 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -152,7 +152,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader'], function(head return; } - if ($('#confirm-username').val() !== app.username) { + if ($('#confirm-username').val() !== app.user.username) { app.alertError('[[error:invalid-username]]'); return false; } else { @@ -266,7 +266,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader'], function(head password_confirm.on('blur', onPasswordConfirmChanged); $('#changePasswordBtn').on('click', function() { - if ((passwordvalid && passwordsmatch) || app.isAdmin) { + if ((passwordvalid && passwordsmatch) || app.user.isAdmin) { socket.emit('user.changePassword', { 'currentPassword': currentPassword.val(), 'newPassword': password.val(), diff --git a/public/src/client/account/settings.js b/public/src/client/account/settings.js index 0b4bbbd00f..fef95fc495 100644 --- a/public/src/client/account/settings.js +++ b/public/src/client/account/settings.js @@ -44,7 +44,7 @@ define('forum/account/settings', ['forum/account/header'], function(header) { } app.exposeConfigToTemplates(); - if (parseInt(app.uid, 10) === parseInt(ajaxify.variables.get('theirid'), 10)) { + if (parseInt(app.user.uid, 10) === parseInt(ajaxify.variables.get('theirid'), 10)) { ajaxify.refresh(); } }); diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 607b84d4f3..994ddeb47a 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -193,7 +193,7 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S, Chats.notifyTyping = function(toUid, typing) { socket.emit('modules.chats.user' + (typing ? 'Start' : 'Stop') + 'Typing', { touid: toUid, - fromUid: app.uid + fromUid: app.user.uid }); }; diff --git a/public/src/client/footer.js b/public/src/client/footer.js index 775686aaa2..ff44f25e1e 100644 --- a/public/src/client/footer.js +++ b/public/src/client/footer.js @@ -31,7 +31,7 @@ define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) if (data && data.posts && data.posts.length) { var post = data.posts[0]; - if (parseInt(post.uid, 10) !== parseInt(app.uid, 10) && !unreadTopics[post.topic.tid]) { + if (parseInt(post.uid, 10) !== parseInt(app.user.uid, 10) && !unreadTopics[post.topic.tid]) { increaseUnreadCount(); markTopicsUnread(post.topic.tid); unreadTopics[post.topic.tid] = true; diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 621521eaed..f5627a02d5 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -59,7 +59,7 @@ define('forum/topic', [ $(window).trigger('action:topic.loaded'); - if (app.uid) { + if (app.user.uid) { socket.emit('topics.enter', tid, function(err, data) { if (err) { return app.alertError(err.message); diff --git a/public/src/client/topic/browsing.js b/public/src/client/topic/browsing.js index 6541cdf68a..dd768391e1 100644 --- a/public/src/client/topic/browsing.js +++ b/public/src/client/topic/browsing.js @@ -74,7 +74,7 @@ define('forum/topic/browsing', function() { } var activeEl = $('.thread_active_users'); var userEl = createUserIcon(user.uid, user.picture, user.userslug, user.username); - var isSelf = parseInt(user.uid, 10) === parseInt(app.uid, 10); + var isSelf = parseInt(user.uid, 10) === parseInt(app.user.uid, 10); if (isSelf) { activeEl.prepend(userEl); } else { diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index f4c69a121e..c90dd149b5 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -156,7 +156,7 @@ define('forum/topic/events', [ var isDeleted = postEl.hasClass('deleted'); postTools.toggle(data.pid, isDeleted); - if (!app.isAdmin && parseInt(data.uid, 10) !== parseInt(app.uid, 10)) { + if (!app.user.isAdmin && parseInt(data.uid, 10) !== parseInt(app.user.uid, 10)) { if (isDeleted) { postEl.find('.post-content').translateHtml('[[topic:post_is_deleted]]'); } else { diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 05bc505ae2..57bf5a1e15 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -34,7 +34,7 @@ define('forum/topic/posts', [ var posts = data.posts; if (pagination.currentPage === pagination.pageCount) { createNewPosts(data); - } else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.uid, 10)) { + } else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.user.uid, 10)) { pagination.loadPage(pagination.pageCount); } } @@ -134,7 +134,7 @@ define('forum/topic/posts', [ } function onNewPostsLoaded(html, pids) { - if (app.uid) { + if (app.user.uid) { socket.emit('posts.getPrivileges', pids, function(err, privileges) { if(err) { return app.alertError(err.message); @@ -163,8 +163,8 @@ define('forum/topic/posts', [ postEl.find('.move').remove(); } postEl.find('.reply, .quote').toggleClass('hidden', !$('.post_reply').length); - var isSelfPost = parseInt(postEl.attr('data-uid'), 10) === parseInt(app.uid, 10); - postEl.find('.chat, .flag').toggleClass('hidden', isSelfPost || !app.uid); + var isSelfPost = parseInt(postEl.attr('data-uid'), 10) === parseInt(app.user.uid, 10); + postEl.find('.chat, .flag').toggleClass('hidden', isSelfPost || !app.user.uid); } Posts.loadMorePosts = function(direction) { @@ -202,7 +202,7 @@ define('forum/topic/posts', [ done(); }); } else { - if (app.uid) { + if (app.user.uid) { socket.emit('topics.markAsRead', [tid]); } navigator.update(); diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index b401a850ed..c3923e2720 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -99,7 +99,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func ThreadTools.setLockedState = function(data) { var threadEl = $('#post-container'); if (parseInt(data.tid, 10) === parseInt(threadEl.attr('data-tid'), 10)) { - var isLocked = data.isLocked && !app.isAdmin; + var isLocked = data.isLocked && !app.user.isAdmin; $('.lock_thread').translateHtml(' [[topic:thread_tools.' + (data.isLocked ? 'un': '') + 'lock]]'); diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 02fcbba02e..06e8c75c7d 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -74,7 +74,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, } var username = data.message.fromUser.username; - var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.uid, 10); + var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.user.uid, 10); data.message.self = data.self; if (isSelf) { username = data.message.toUser.username; diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 2836967416..088cafe260 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -68,13 +68,13 @@ define('composer', [ }); // Construct a save_id - if (0 !== parseInt(app.uid, 10)) { + if (0 !== parseInt(app.user.uid, 10)) { if (post.hasOwnProperty('cid')) { - post.save_id = ['composer', app.uid, 'cid', post.cid].join(':'); + post.save_id = ['composer', app.user.uid, 'cid', post.cid].join(':'); } else if (post.hasOwnProperty('tid')) { - post.save_id = ['composer', app.uid, 'tid', post.tid].join(':'); + post.save_id = ['composer', app.user.uid, 'tid', post.tid].join(':'); } else if (post.hasOwnProperty('pid')) { - post.save_id = ['composer', app.uid, 'pid', post.pid].join(':'); + post.save_id = ['composer', app.user.uid, 'pid', post.pid].join(':'); } } @@ -183,7 +183,7 @@ define('composer', [ function emit() { socket.emit('modules.composer.notifyTyping', { tid: postData.tid, - uid: app.uid + uid: app.user.uid }); } @@ -203,7 +203,7 @@ define('composer', [ } socket.emit('modules.composer.stopNotifyTyping', { tid: postData.tid, - uid: app.uid + uid: app.user.uid }); } @@ -219,7 +219,7 @@ define('composer', [ isTopic = composer.posts[post_uuid] ? !!composer.posts[post_uuid].cid : false, isMain = composer.posts[post_uuid] ? !!composer.posts[post_uuid].isMain : false, isEditing = composer.posts[post_uuid] ? !!composer.posts[post_uuid].pid : false, - isGuestPost = composer.posts[post_uuid] ? composer.posts[post_uuid].uid === '0' : null; + isGuestPost = composer.posts[post_uuid] ? parseInt(composer.posts[post_uuid].uid, 10) === 0 : null; composer.bsEnvironment = utils.findBootstrapEnvironment(); diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 8144fbc835..98d1d6e2e8 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -66,32 +66,19 @@ function onConnect(socket) { socket.join('uid_' + socket.uid); socket.join('online_users'); - async.parallel({ - user: function(next) { - user.getUserFields(socket.uid, ['username', 'userslug', 'picture', 'status', 'email:confirmed'], next); - }, - isAdmin: function(next) { - user.isAdministrator(socket.uid, next); - } - }, function(err, userData) { - if (err || !userData.user) { + user.getUserFields(socket.uid, ['status'], function(err, userData) { + if (err || !userData) { return; } - userData.user.uid = socket.uid; - userData.user.isAdmin = userData.isAdmin; - userData.user['email:confirmed'] = parseInt(userData.user['email:confirmed'], 10) === 1; - socket.emit('event:connect', userData.user); - if (userData.user.status !== 'offline') { - socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.user.status || 'online'}); + + socket.emit('event:connect'); + if (userData.status !== 'offline') { + socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.status || 'online'}); } }); } else { socket.join('online_guests'); - socket.emit('event:connect', { - username: '[[global:guest]]', - isAdmin: false, - uid: 0 - }); + socket.emit('event:connect'); } } From 7d963e52cf4fcf45c7aa737942c8e9ad06385632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Feb 2015 13:44:54 -0500 Subject: [PATCH 382/897] closes #2686 --- public/src/client/account/profile.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js index 421fc006ef..89a555a702 100644 --- a/public/src/client/account/profile.js +++ b/public/src/client/account/profile.js @@ -41,6 +41,9 @@ define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll'] function processPage() { $('.user-recent-posts img, .post-signature img').addClass('img-responsive'); + + $('.user-recent-posts blockquote').prev('p').remove(); + $('.user-recent-posts blockquote').remove(); } function updateButtons() { From 329343686752d501dd18e735aa8cb2acc47b09e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Feb 2015 14:44:56 -0500 Subject: [PATCH 383/897] closes #2640 --- public/src/admin/manage/users.js | 13 +++++++++++++ src/emailer.js | 1 + src/socket.io/admin/user.js | 29 +++++++++++++++++++++++++++-- src/user/email.js | 15 ++++++++++++--- src/views/admin/manage/users.tpl | 1 + 5 files changed, 54 insertions(+), 5 deletions(-) diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index fdd63556e4..dad64e35af 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -134,6 +134,19 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable) return false; }); + $('.send-validation-email').on('click', function() { + var uids = getSelectedUids(); + if (!uids.length) { + return; + } + socket.emit('admin.user.sendValidationEmail', uids, function(err) { + if (err) { + return app.alertError(err.message); + } + app.alertSuccess('[[notifications:email-confirm-sent]]'); + }); + }) + $('.password-reset-email').on('click', function() { var uids = getSelectedUids(); if (!uids.length) { diff --git a/src/emailer.js b/src/emailer.js index e7c92fa812..557de96f6e 100644 --- a/src/emailer.js +++ b/src/emailer.js @@ -64,6 +64,7 @@ var fs = require('fs'), uid: uid, pid: params.pid }); + callback(); } else { winston.warn('[emailer] No active email plugin found!'); callback(); diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js index aab9eb02e8..0fa583d742 100644 --- a/src/socket.io/admin/user.js +++ b/src/socket.io/admin/user.js @@ -1,12 +1,13 @@ "use strict"; -var db = require('../../database'), +var async = require('async'), + db = require('../../database'), groups = require('../../groups'), user = require('../../user'), events = require('../../events'), + meta = require('../../meta'), websockets = require('../index'), - async = require('async'), User = {}; @@ -127,6 +128,30 @@ User.validateEmail = function(socket, uids, callback) { }, callback); }; +User.sendValidationEmail = function(socket, uids, callback) { + if (!Array.isArray(uids)) { + return callback(new Error('[[error:invalid-data]]')); + } + + if (parseInt(meta.config.requireEmailConfirmation, 10) !== 1) { + return callback(new Error('[[error:email-confirmations-are-disabled]]')); + } + + user.getMultipleUserFields(uids, ['uid', 'email'], function(err, usersData) { + if (err) { + return callback(err); + } + + async.eachLimit(usersData, 50, function(userData, next) { + if (userData.email && userData.uid) { + user.email.verify(userData.uid, userData.email, next); + } else { + next(); + } + }, callback); + }); +}; + User.sendPasswordResetEmail = function(socket, uids, callback) { if (!Array.isArray(uids)) { return callback(new Error('[[error:invalid-data]]')); diff --git a/src/user/email.js b/src/user/email.js index 9a4fd2cd73..74b86c0cfe 100644 --- a/src/user/email.js +++ b/src/user/email.js @@ -27,11 +27,16 @@ var async = require('async'), }); }; - UserEmail.verify = function(uid, email) { + UserEmail.verify = function(uid, email, callback) { + callback = callback || function() {}; var confirm_code = utils.generateUUID(), confirm_link = nconf.get('url') + '/confirm/' + confirm_code; plugins.fireHook('filter:user.verify.code', confirm_code, function(err, confirm_code) { + if (err) { + return callback(err); + } + async.series([ function(next) { db.setObject('confirm:' + confirm_code, { @@ -43,7 +48,9 @@ var async = require('async'), db.expireAt('confirm:' + confirm_code, Math.floor(Date.now() / 1000 + 60 * 60 * 2), next); } ], function(err) { - + if (err) { + return callback(err); + } user.getUserField(uid, 'username', function(err, username) { if (err) { return winston.error(err.stack); @@ -64,10 +71,12 @@ var async = require('async'), if (plugins.hasListeners('action:user.verify')) { plugins.fireHook('action:user.verify', {uid: uid, data: data}); + callback(); } else if (plugins.hasListeners('action:email.send')) { - emailer.send('welcome', uid, data); + emailer.send('welcome', uid, data, callback); } else { winston.warn('No emailer to send verification email!'); + callback(); } }); }); diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 1e034474b8..13aa80caa4 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -18,6 +18,7 @@
  • Remove Admin
  • Validate Email
    • +
  • Send Validation Email
  • Send Password Reset Email
  • Ban User
    • From 3f31098144c278b2834a2e7389f0e0c98a327dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Feb 2015 16:16:32 -0500 Subject: [PATCH 384/897] closes #2619 --- src/controllers/accounts.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 77cbe1008b..13055ca852 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -521,9 +521,10 @@ accountsController.getChats = function(req, res, next) { async.waterfall([ async.apply(user.getUidByUserslug, req.params.userslug), function(toUid, next) { - if (!toUid) { + if (!toUid || parseInt(toUid, 10) === parseInt(req.user.uid, 10)) { return helpers.notFound(req, res); } + async.parallel({ toUser: async.apply(user.getUserFields, toUid, ['uid', 'username']), messages: async.apply(messaging.getMessages, req.user.uid, toUid, 'recent', false), From a583f9d77adf1e666cc6bd56e82a51ff3a2e83c3 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 11 Feb 2015 14:56:57 -0700 Subject: [PATCH 385/897] Fixed sidebar overlay issue on window width Had the wrong `min-width` --- public/less/admin/admin.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 6beb1525fd..8a508db2e0 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -268,7 +268,7 @@ display: inline-block; } -@media (min-width: 768px) { +@media (min-width: 1200px) { .acp-sidebar { position: fixed; top: 70px; From 2b9d1ee3dd638092df8fc9e5d07895a888488985 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 11 Feb 2015 16:05:05 -0700 Subject: [PATCH 386/897] Translate ACP pages I fixed it --- src/middleware/middleware.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 111b0b1ceb..b8b5885424 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -409,7 +409,10 @@ middleware.processRender = function(req, res, next) { }); } else if (res.locals.adminHeader) { str = res.locals.adminHeader + str; - fn(err, str); + var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB'; + translator.translate(str, language, function(translated) { + fn(err, translated); + }); } else { fn(err, str); } From 06b2a6ff68d55200dec66d050f3ad49deb83c917 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Feb 2015 21:09:43 -0500 Subject: [PATCH 387/897] closes #2717 --- public/src/widgets.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/public/src/widgets.js b/public/src/widgets.js index 2200f58d5e..936ce9cd95 100644 --- a/public/src/widgets.js +++ b/public/src/widgets.js @@ -53,8 +53,7 @@ if (location === 'footer' && !$('#content [widget-area="footer"]').length) { $('#content').append($('
    ')); } else if (location === 'sidebar' && !$('#content [widget-area="sidebar"]').length) { - $('#content > *').wrapAll($('
    ')); - $('#content').append($('
    ')); + $('#content > *').wrapAll($('
    ')); } else if (location === 'header' && !$('#content [widget-area="header"]').length) { $('#content').prepend($('
    ')); } @@ -69,11 +68,11 @@ ajaxify.widgets.reposition(location); } - $('#content [widget-area] img:not(.user-img)').addClass('img-responsive'); + $('#content [widget-area] img:not(.user-img)').addClass('img-responsive'); } - + $(window).trigger('action:widgets.loaded', {}); - + if (typeof callback === 'function') { callback(); } From 5dfafff421ab377f466ac10056ea919b62c7e0db Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Feb 2015 21:26:26 -0500 Subject: [PATCH 388/897] call callback on password update --- public/src/client/account/edit.js | 3 +++ src/socket.io/user.js | 1 + 2 files changed, 4 insertions(+) diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index dc8bfaeaf1..86e5d1f66d 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -266,12 +266,15 @@ define('forum/account/edit', ['forum/account/header', 'uploader'], function(head password_confirm.on('blur', onPasswordConfirmChanged); $('#changePasswordBtn').on('click', function() { + var btn = $(this); if ((passwordvalid && passwordsmatch) || app.user.isAdmin) { + btn.addClass('disabled').find('i').removeClass('hide'); socket.emit('user.changePassword', { 'currentPassword': currentPassword.val(), 'newPassword': password.val(), 'uid': ajaxify.variables.get('theirid') }, function(err) { + btn.removeClass('disabled').find('i').addClass('hide'); currentPassword.val(''); password.val(''); password_confirm.val(''); diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 4df8915994..5f844650a6 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -151,6 +151,7 @@ SocketUser.changePassword = function(socket, data, callback) { targetUid: data.uid, ip: socket.ip }); + callback(); }); }; From a62a3647a0bf74eabb5d7a64fcbe0ce3ca66575a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Feb 2015 21:53:53 -0500 Subject: [PATCH 389/897] use uid, socket.uid is always 0 here --- src/socket.io/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 5f844650a6..f2af4eeccd 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -107,7 +107,7 @@ SocketUser.reset.commit = function(socket, data, callback) { }); events.log({ type: 'password-reset', - uid: socket.uid, + uid: uid, ip: socket.ip }); callback(); From f99c3a310dc0074abd2c26575e6669d93340f9ad Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Feb 2015 21:54:20 -0500 Subject: [PATCH 390/897] use uid instead of socket.uid --- src/socket.io/user.js | 53 +++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 5f844650a6..fd23405758 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -84,35 +84,38 @@ SocketUser.reset.send = function(socket, email, callback) { }; SocketUser.reset.commit = function(socket, data, callback) { - if(data && data.code && data.password) { - async.series([ - async.apply(db.getObjectField, 'reset:uid', data.code), - async.apply(user.reset.commit, data.code, data.password) - ], function(err, data) { - if (err) { - return callback(err); - } + if (!data || !data.code || !data.password) { + return callback(new Error('[[error:invalid-data]]')); + } - var uid = data[0], - now = new Date(), - parsedDate = now.getFullYear() + '/' + (now.getMonth()+1) + '/' + now.getDate(); + async.parallel({ + uid: async.apply(db.getObjectField, 'reset:uid', data.code), + reset: async.apply(user.reset.commit, data.code, data.password) + }, function(err, results) { + if (err) { + return callback(err); + } - user.getUserField(uid, 'username', function(err, username) { - emailer.send('reset_notify', uid, { - username: username, - date: parsedDate, - site_title: meta.config.title || 'NodeBB', - subject: '[[email:reset.notify.subject]]' - }); - }); - events.log({ - type: 'password-reset', - uid: socket.uid, - ip: socket.ip + var uid = results.uid, + now = new Date(), + parsedDate = now.getFullYear() + '/' + (now.getMonth()+1) + '/' + now.getDate(); + + user.getUserField(uid, 'username', function(err, username) { + emailer.send('reset_notify', uid, { + username: username, + date: parsedDate, + site_title: meta.config.title || 'NodeBB', + subject: '[[email:reset.notify.subject]]' }); - callback(); }); - } + + events.log({ + type: 'password-reset', + uid: uid, + ip: socket.ip + }); + callback(); + }); }; SocketUser.checkStatus = function(socket, uid, callback) { From 5cebcfba7a341f2d79e014aa23557d4f6c9e305a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Feb 2015 11:49:26 -0500 Subject: [PATCH 391/897] update validator ver --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8de4dbc58c..a7907757e8 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "templates.js": "^0.1.15", "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git", "underscore": "~1.7.0", - "validator": "~3.28.0", + "validator": "^3.30.0", "winston": "^0.9.0", "xregexp": "~2.0.0" }, From cdd5847b399c1f51d36c5d447c75e9177efad897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Feb 2015 12:23:13 -0500 Subject: [PATCH 392/897] closes #2664 --- src/user.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/user.js b/src/user.js index 035933154a..109e67a3f0 100644 --- a/src/user.js +++ b/src/user.js @@ -7,6 +7,7 @@ var async = require('async'), plugins = require('./plugins'), db = require('./database'), meta = require('./meta'), + topics = require('./topics'), groups = require('./groups'), Password = require('./password'); @@ -147,25 +148,31 @@ var async = require('async'), User.updateOnlineUsers = function(uid, callback) { callback = callback || function() {}; - db.sortedSetScore('users:online', uid, function(err, score) { - var now = Date.now(); - if (err || now - parseInt(score, 10) < 300000) { - return callback(err); - } - db.sortedSetAdd('users:online', now, uid, function(err) { - if (err) { - return callback(err); + + var now = Date.now(); + async.waterfall([ + function(next) { + db.sortedSetScore('users:online', uid, next); + }, + function(userOnlineTime, next) { + if (now - parseInt(userOnlineTime, 10) < 300000) { + return callback(); } + db.sortedSetAdd('users:online', now, uid, next); + }, + function(next) { + topics.pushUnreadCount(uid); plugins.fireHook('action:user.online', {uid: uid, timestamp: now}); - }); - }); + next(); + } + ], callback); }; User.setUserField = function(uid, field, value, callback) { callback = callback || function() {}; db.setObjectField('user:' + uid, field, value, function(err) { if (err) { - return callback(err) + return callback(err); } plugins.fireHook('action:user.set', {uid: uid, field: field, value: value, type: 'set'}); callback(); From 0421b6ef06dc01daaa8949d8cb421b53df4fa5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Feb 2015 13:04:49 -0500 Subject: [PATCH 393/897] closes #2639 --- public/language/en_GB/error.json | 2 + public/language/en_GB/tags.json | 2 +- public/src/modules/composer.js | 2 + public/src/modules/composer/tags.js | 12 +- .../bootstrap-tagsinput.css | 1 + .../bootstrap-tagsinput.min.js | 511 +----------------- .../bootstrap-tagsinput.min.js.map | 1 + src/controllers/api.js | 2 + 8 files changed, 26 insertions(+), 507 deletions(-) create mode 100644 public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 0258b28154..bf4e7229fd 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -52,6 +52,8 @@ "invalid-title": "Invalid title!", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", diff --git a/public/language/en_GB/tags.json b/public/language/en_GB/tags.json index f67b2ca7b5..a3f75bb2e6 100644 --- a/public/language/en_GB/tags.json +++ b/public/language/en_GB/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 088cafe260..29154d1523 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -228,6 +228,8 @@ define('composer', [ var data = { allowTopicsThumbnail: allowTopicsThumbnail, showTags: isTopic || isMain, + minimumTagLength: config.minimumTagLength, + maximumTagLength: config.maximumTagLength, isTopic: isTopic, showHandleInput: (app.user.uid === 0 || (isEditing && isGuestPost && app.user.isAdmin)) && config.allowGuestHandles, handle: composer.posts[post_uuid] ? composer.posts[post_uuid].handle || '' : undefined diff --git a/public/src/modules/composer/tags.js b/public/src/modules/composer/tags.js index 93b33fbb38..f074a5abc2 100644 --- a/public/src/modules/composer/tags.js +++ b/public/src/modules/composer/tags.js @@ -14,7 +14,17 @@ define('composer/tags', function() { tagEl.tagsinput({ maxTags: config.tagsPerTopic, - confirmKeys: [13, 44] + confirmKeys: [13, 44], + trimValue: true + }); + + tagEl.on('beforeItemAdd', function(event) { + event.cancel = event.item.length < config.minimumTagLength || event.item.length > config.maximumTagLength; + if (event.item.length < config.minimumTagLength) { + app.alertError('[[error:tag-too-short, ' + config.minimumTagLength + ']]'); + } else if (event.item.length > config.maximumTagLength) { + app.alertError('[[error:tag-too-long, ' + config.maximumTagLength + ']]'); + } }); tagEl.on('itemAdded', function(event) { diff --git a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css index 98cfa7f3c1..55f7c09df0 100644 --- a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css +++ b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css @@ -10,6 +10,7 @@ border-radius: 4px; max-width: 100%; line-height: 22px; + cursor: text; } .bootstrap-tagsinput input { border: none; diff --git a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js index aff7ea6cb8..16be0abb93 100644 --- a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js +++ b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js @@ -1,506 +1,7 @@ -(function ($) { - "use strict"; +/* + * bootstrap-tagsinput v0.4.2 by Tim Schlechter + * + */ - var defaultOptions = { - tagClass: function(item) { - return 'label label-info'; - }, - itemValue: function(item) { - return item ? item.toString() : item; - }, - itemText: function(item) { - return this.itemValue(item); - }, - freeInput: true, - maxTags: undefined, - confirmKeys: [13], - onTagExists: function(item, $tag) { - $tag.hide().fadeIn(); - } - }; - - /** - * Constructor function - */ - function TagsInput(element, options) { - this.itemsArray = []; - - this.$element = $(element); - this.$element.hide(); - - this.isSelect = (element.tagName === 'SELECT'); - this.multiple = (this.isSelect && element.hasAttribute('multiple')); - this.objectItems = options && options.itemValue; - this.placeholderText = element.hasAttribute('placeholder') ? this.$element.attr('placeholder') : ''; - this.inputSize = Math.max(1, this.placeholderText.length); - - this.$container = $('
    '); - this.$input = $('').appendTo(this.$container); - - this.$element.after(this.$container); - - this.build(options); - } - - TagsInput.prototype = { - constructor: TagsInput, - - /** - * Adds the given item as a new tag. Pass true to dontPushVal to prevent - * updating the elements val() - */ - add: function(item, dontPushVal) { - var self = this; - - if (self.options.maxTags && self.itemsArray.length >= self.options.maxTags) - return; - - // Ignore falsey values, except false - if (item !== false && !item) - return; - - // Throw an error when trying to add an object while the itemValue option was not set - if (typeof item === "object" && !self.objectItems) - throw("Can't add objects when itemValue option is not set"); - - // Ignore strings only containg whitespace - if (item.toString().match(/^\s*$/)) - return; - - // If SELECT but not multiple, remove current tag - if (self.isSelect && !self.multiple && self.itemsArray.length > 0) - self.remove(self.itemsArray[0]); - - if (typeof item === "string" && this.$element[0].tagName === 'INPUT') { - var items = item.split(','); - if (items.length > 1) { - for (var i = 0; i < items.length; i++) { - this.add(items[i], true); - } - - if (!dontPushVal) - self.pushVal(); - return; - } - } - - var itemValue = self.options.itemValue(item), - itemText = self.options.itemText(item), - tagClass = self.options.tagClass(item); - - // Ignore items allready added - var existing = $.grep(self.itemsArray, function(item) { return self.options.itemValue(item) === itemValue; } )[0]; - if (existing) { - // Invoke onTagExists - if (self.options.onTagExists) { - var $existingTag = $(".tag", self.$container).filter(function() { return $(this).data("item") === existing; }); - self.options.onTagExists(item, $existingTag); - } - return; - } - - // register item in internal array and map - self.itemsArray.push(item); - - // add a tag element - var $tag = $('' + htmlEncode(itemText) + ''); - $tag.data('item', item); - self.findInputWrapper().before($tag); - $tag.after(' '); - - // add     ")}}))}if(e.options.typeaheadjs){var j=e.options.typeaheadjs||{};e.$input.typeahead(null,j).on("typeahead:selected",a.proxy(function(a,b){e.add(j.valueKey?b[j.valueKey]:b),e.$input.typeahead("val","")},e))}e.$container.on("click",a.proxy(function(){e.$element.attr("disabled")||e.$input.removeAttr("disabled"),e.$input.focus()},e)),e.options.addOnBlur&&e.options.freeInput&&e.$input.on("focusout",a.proxy(function(){0===a(".typeahead, .twitter-typeahead",e.$container).length&&(e.add(e.$input.val()),e.$input.val(""))},e)),e.$container.on("keydown","input",a.proxy(function(b){var c=a(b.target),d=e.findInputWrapper();if(e.$element.attr("disabled"))return void e.$input.attr("disabled","disabled");switch(b.which){case 8:if(0===f(c[0])){var g=d.prev();g&&e.remove(g.data("item"))}break;case 46:if(0===f(c[0])){var h=d.next();h&&e.remove(h.data("item"))}break;case 37:var i=d.prev();0===c.val().length&&i[0]&&(i.before(d),c.focus());break;case 39:var j=d.next();0===c.val().length&&j[0]&&(j.after(d),c.focus())}{var k=c.val().length;Math.ceil(k/5)}c.attr("size",Math.max(this.inputSize,c.val().length))},e)),e.$container.on("keypress","input",a.proxy(function(b){var c=a(b.target);if(e.$element.attr("disabled"))return void e.$input.attr("disabled","disabled");var d=c.val(),f=e.options.maxChars&&d.length>=e.options.maxChars;e.options.freeInput&&(g(b,e.options.confirmKeys)||f)&&(e.add(f?d.substr(0,e.options.maxChars):d),c.val(""),b.preventDefault());{var h=c.val().length;Math.ceil(h/5)}c.attr("size",Math.max(this.inputSize,c.val().length))},e)),e.$container.on("click","[data-role=remove]",a.proxy(function(b){e.$element.attr("disabled")||e.remove(a(b.target).closest(".tag").data("item"))},e)),e.options.itemValue===h.itemValue&&("INPUT"===e.$element[0].tagName?e.add(e.$element.val()):a("option",e.$element).each(function(){e.add(a(this).attr("value"),!0)}))},destroy:function(){var a=this;a.$container.off("keypress","input"),a.$container.off("click","[role=remove]"),a.$container.remove(),a.$element.removeData("tagsinput"),a.$element.show()},focus:function(){this.$input.focus()},input:function(){return this.$input},findInputWrapper:function(){for(var b=this.$input[0],c=this.$container[0];b&&b.parentNode!==c;)b=b.parentNode;return a(b)}},a.fn.tagsinput=function(c,d){var e=[];return this.each(function(){var f=a(this).data("tagsinput");if(f)if(c||d){if(void 0!==f[c]){var g=f[c](d);void 0!==g&&e.push(g)}}else e.push(f);else f=new b(this,c),a(this).data("tagsinput",f),e.push(f),"SELECT"===this.tagName&&a("option",a(this)).attr("selected","selected"),a(this).val(a(this).val())}),"string"==typeof c?e.length>1?e:e[0]:e},a.fn.tagsinput.Constructor=b;var i=a("
    ");a(function(){a("input[data-role=tagsinput], select[multiple][data-role=tagsinput]").tagsinput()})}(window.jQuery); +//# sourceMappingURL=bootstrap-tagsinput.min.js.map \ No newline at end of file diff --git a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map new file mode 100644 index 0000000000..a0d198d16b --- /dev/null +++ b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map @@ -0,0 +1 @@ +{"version":3,"file":"dist/bootstrap-tagsinput-angular.min.js","sources":["src/bootstrap-tagsinput-angular.js"],"names":["angular","module","directive","getItemProperty","scope","property","isFunction","$parent","item","undefined","restrict","model","template","replace","link","element","attrs","$","isArray","select","typeaheadSourceArray","typeaheadSource","split","length","tagsinput","options","typeahead","source","itemValue","itemvalue","itemText","itemtext","confirmKeys","confirmkeys","JSON","parse","tagClass","tagclass","i","on","event","indexOf","push","idx","splice","prev","slice","$watch","added","filter","removed"],"mappings":";;;;;AAAAA,QAAQC,OAAO,0BACdC,UAAU,sBAAuB,WAEhC,QAASC,GAAgBC,EAAOC,GAC9B,MAAKA,GAGDL,QAAQM,WAAWF,EAAMG,QAAQF,IAC5BD,EAAMG,QAAQF,GAEhB,SAASG,GACd,MAAOA,GAAKH,IANLI,OAUX,OACEC,SAAU,KACVN,OACEO,MAAO,YAETC,SAAU,6BACVC,SAAS,EACTC,KAAM,SAASV,EAAOW,EAASC,GAC7BC,EAAE,WACKjB,QAAQkB,QAAQd,EAAMO,SACzBP,EAAMO,SAER,IAAIQ,GAASF,EAAE,SAAUF,GACrBK,EAAuBJ,EAAMK,gBAAkBL,EAAMK,gBAAgBC,MAAM,KAAO,KAClFD,EAAkBD,EACjBA,EAAqBG,OAAS,EAC3BnB,EAAMG,QAAQa,EAAqB,IAAIA,EAAqB,IAC1DhB,EAAMG,QAAQa,EAAqB,IACvC,IAEND,GAAOK,UAAUpB,EAAMG,QAAQS,EAAMS,SAAW,MAC9CC,WACEC,OAAW3B,QAAQM,WAAWe,GAAmBA,EAAkB,MAErEO,UAAWzB,EAAgBC,EAAOY,EAAMa,WACxCC,SAAW3B,EAAgBC,EAAOY,EAAMe,UACxCC,YAAc7B,EAAgBC,EAAOY,EAAMiB,aAAeC,KAAKC,MAAMnB,EAAMiB,cAAgB,IAC3FG,SAAWpC,QAAQM,WAAWF,EAAMG,QAAQS,EAAMqB,WAAajC,EAAMG,QAAQS,EAAMqB,UAAY,WAAiB,MAAOrB,GAAMqB,WAG/H,KAAK,GAAIC,GAAI,EAAGA,EAAIlC,EAAMO,MAAMY,OAAQe,IACtCnB,EAAOK,UAAU,MAAOpB,EAAMO,MAAM2B,GAGtCnB,GAAOoB,GAAG,YAAa,SAASC,GACU,KAApCpC,EAAMO,MAAM8B,QAAQD,EAAMhC,OAC5BJ,EAAMO,MAAM+B,KAAKF,EAAMhC,QAG3BW,EAAOoB,GAAG,cAAe,SAASC,GAChC,GAAIG,GAAMvC,EAAMO,MAAM8B,QAAQD,EAAMhC,KACxB,MAARmC,GACFvC,EAAMO,MAAMiC,OAAOD,EAAK,IAK5B,IAAIE,GAAOzC,EAAMO,MAAMmC,OACvB1C,GAAM2C,OAAO,QAAS,WACpB,GAEIT,GAFAU,EAAQ5C,EAAMO,MAAMsC,OAAO,SAASX,GAAI,MAA2B,KAApBO,EAAKJ,QAAQH,KAC5DY,EAAUL,EAAKI,OAAO,SAASX,GAAI,MAAkC,KAA3BlC,EAAMO,MAAM8B,QAAQH,IAMlE,KAHAO,EAAOzC,EAAMO,MAAMmC,QAGdR,EAAI,EAAGA,EAAIY,EAAQ3B,OAAQe,IAC9BnB,EAAOK,UAAU,SAAU0B,EAAQZ,GAOrC,KAHAnB,EAAOK,UAAU,WAGZc,EAAI,EAAGA,EAAIU,EAAMzB,OAAQe,IAC5BnB,EAAOK,UAAU,MAAOwB,EAAMV,MAE/B"} \ No newline at end of file diff --git a/src/controllers/api.js b/src/controllers/api.js index ae112b9bd6..c335cdf272 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -43,6 +43,8 @@ apiController.getConfig = function(req, res, next) { config.maxReconnectionAttempts = meta.config.maxReconnectionAttempts || 5; config.reconnectionDelay = meta.config.reconnectionDelay || 200; config.tagsPerTopic = meta.config.tagsPerTopic || 5; + config.minimumTagLength = meta.config.minimumTagLength || 3; + config.maximumTagLength = meta.config.maximumTagLength || 15; config.topicsPerPage = meta.config.topicsPerPage || 20; config.postsPerPage = meta.config.postsPerPage || 20; config.maximumFileSize = meta.config.maximumFileSize; From f4c587c530fd42a40cae5b1cf80dc74c894be250 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 12 Feb 2015 13:10:09 -0500 Subject: [PATCH 394/897] move hardcoded initial welcome text into welcome.md --- install/data/welcome.md | 10 ++++++++++ src/install.js | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 install/data/welcome.md diff --git a/install/data/welcome.md b/install/data/welcome.md new file mode 100644 index 0000000000..399850e6e2 --- /dev/null +++ b/install/data/welcome.md @@ -0,0 +1,10 @@ +# Welcome to your brand new NodeBB forum! + +This is what a topic and post looks like. As an administator, you can edit the post\'s title and content. +To customise your forum, go to the [Administrator Control Panel](../../admin). You can modify all aspects of your forum there, including installation of third-party plugins. + +## Additional Resources + +* [NodeBB Documentation](https://docs.nodebb.org) +* [Community Support Forum](https://community.nodebb.org) +* [Project repository](https://github.com/nodebb/nodebb) \ No newline at end of file diff --git a/src/install.js b/src/install.js index 54fb075ced..61f4bc56c0 100644 --- a/src/install.js +++ b/src/install.js @@ -389,13 +389,23 @@ function createWelcomePost(next) { var db = require('./database'), Topics = require('./topics'); - db.sortedSetCard('topics:tid', function(err, numTopics) { + async.parallel([ + function(next) { + fs.readFile(path.join(__dirname, '../', 'install/data/welcome.md'), next); + }, + function(next) { + db.sortedSetCard('topics:tid', next); + } + ], function(err, results) { + var content = results[0], + numTopics = results[1]; + if (numTopics === 0) { Topics.post({ uid: 1, cid: 2, title: 'Welcome to your NodeBB!', - content: '# Welcome to your brand new NodeBB forum!\n\nThis is what a topic and post looks like. As an administator, you can edit the post\'s title and content.\n\nTo customise your forum, go to the [Administrator Control Panel](../../admin). You can modify all aspects of your forum there, including installation of third-party plugins.\n\n## Additional Resources\n\n* [NodeBB Documentation](https://docs.nodebb.org)\n* [Community Support Forum](https://community.nodebb.org)\n* [Project repository](https://github.com/nodebb/nodebb)' + content: content.toString() }, next); } else { next(); From 429d7cbfa25f15a77bc670ab3dcb3f5cdced0a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Feb 2015 13:23:12 -0500 Subject: [PATCH 395/897] added filter:category.get --- src/categories.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/categories.js b/src/categories.js index 22c7807c96..a4b6ce2092 100644 --- a/src/categories.js +++ b/src/categories.js @@ -64,7 +64,9 @@ var async = require('async'), category.isIgnored = results.isIgnored[0]; category.topic_row_size = 'col-md-9'; - callback(null, category); + plugins.fireHook('filter:category.get', {category: category, uid: data.uid}, function(err, data) { + callback(err, data ? data.category : null); + }); }); }); }; From 0d84486187b9475af47128bb2e6e2cb0b17d9a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Feb 2015 13:38:19 -0500 Subject: [PATCH 396/897] closes #2585 --- src/postTools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/postTools.js b/src/postTools.js index c00a8a4b9c..fc18277912 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -34,7 +34,7 @@ var winston = require('winston'), }, function(postData, next) { postData.content = data.content; - plugins.fireHook('filter:post.save', postData, next); + plugins.fireHook('filter:post.edit', {post: postData, uid: data.uid}, next); } ], function(err, postData) { if (err) { From 8cbb9aa3108488cc58c534b429c3918abd75b3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Feb 2015 13:42:45 -0500 Subject: [PATCH 397/897] #2585 --- src/postTools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/postTools.js b/src/postTools.js index fc18277912..09fa75330a 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -36,11 +36,11 @@ var winston = require('winston'), postData.content = data.content; plugins.fireHook('filter:post.edit', {post: postData, uid: data.uid}, next); } - ], function(err, postData) { + ], function(err, data) { if (err) { return callback(err); } - + var postData = data.post; async.parallel({ post: function(next) { var d = { From 09b26bc950689e45db9d89f5e681a35db5dbe907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Feb 2015 14:37:01 -0500 Subject: [PATCH 398/897] if code isnt validated return error --- src/user/reset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/user/reset.js b/src/user/reset.js index 3ce2f86cf8..60ff820dbf 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -63,7 +63,7 @@ var async = require('async'), } if (!validated) { - return; + return callback(new Error('[[error:reset-code-not-valid]]')); } db.getObjectField('reset:uid', code, function(err, uid) { From d09a53197ecbefe3655ae57847920a195cba0bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 Feb 2015 15:03:46 -0500 Subject: [PATCH 399/897] closes #2570 --- install/data/footer.json | 10 ++++++++++ src/install.js | 26 +++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 install/data/footer.json diff --git a/install/data/footer.json b/install/data/footer.json new file mode 100644 index 0000000000..69d55448ac --- /dev/null +++ b/install/data/footer.json @@ -0,0 +1,10 @@ +[ + { + "widget": "html", + "data" : { + "html": "", + "title":"", + "container":"" + } + } +] \ No newline at end of file diff --git a/src/install.js b/src/install.js index 61f4bc56c0..45d44d75ad 100644 --- a/src/install.js +++ b/src/install.js @@ -394,13 +394,13 @@ function createWelcomePost(next) { fs.readFile(path.join(__dirname, '../', 'install/data/welcome.md'), next); }, function(next) { - db.sortedSetCard('topics:tid', next); + db.getObjectField('global', 'topicCount', next); } ], function(err, results) { var content = results[0], numTopics = results[1]; - if (numTopics === 0) { + if (!parseInt(numTopics, 10)) { Topics.post({ uid: 1, cid: 2, @@ -430,12 +430,24 @@ function enableDefaultPlugins(next) { function setCopyrightWidget(next) { var db = require('./database'); - - db.init(function(err) { - if (!err) { - db.setObjectField('widgets:global', 'footer', "[{\"widget\":\"html\",\"data\":{\"html\":\"\",\"title\":\"\",\"container\":\"\"}}]", next); + async.parallel({ + footerJSON: function(next) { + fs.readFile(path.join(__dirname, '../', 'install/data/footer.json'), next); + }, + footer: function(next) { + db.getObjectField('widgets:global', 'footer', next); } - }); + }, function(err, results) { + if (err) { + return next(err); + } + + if (!results.footer && results.footerJSON) { + db.setObjectField('widgets:global', 'footer', results.footerJSON.toString(), next); + } else { + next(); + } + }); } install.setup = function (callback) { From 1029b6c2f327db2c48e5f5353bc93598fa1e2c34 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 12 Feb 2015 16:15:28 -0500 Subject: [PATCH 400/897] some prep for #2499 --- src/plugins.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index 0c8a4ba394..730377c673 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -6,6 +6,7 @@ var fs = require('fs'), winston = require('winston'), semver = require('semver'), express = require('express'), + nconf = require('nconf'), db = require('./database'), emitter = require('./emitter'), @@ -13,6 +14,7 @@ var fs = require('fs'), translator = require('../public/src/translator'), utils = require('../public/src/utils'), hotswap = require('./hotswap'), + pkg = require('../package.json'), controllers = require('./controllers'), app, middleware; @@ -169,7 +171,7 @@ var fs = require('fs'), Plugins.getAll = function(callback) { var request = require('request'); - request('https://packages.nodebb.org/api/v1/plugins', function(err, res, body) { + request((nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins/' + pkg.version, function(err, res, body) { var plugins = []; try { @@ -184,8 +186,9 @@ var fs = require('fs'), plugins[i].id = plugins[i].name; plugins[i].installed = false; plugins[i].active = false; - plugins[i].url = plugins[i].repository ? plugins[i].repository.url : ''; + plugins[i].url = plugins[i].url ? plugins[i].url : plugins[i].repository ? plugins[i].repository.url : ''; plugins[i].latest = getLatestVersion(plugins[i].versions); + // plugins[i].latest = plugins[i].latest; pluginMap[plugins[i].name] = plugins[i]; } @@ -261,7 +264,7 @@ var fs = require('fs'), function(dirs, next) { dirs = dirs.filter(function(dir){ - return dir.substr(0, 14) === 'nodebb-plugin-' || dir.substr(0, 14) === 'nodebb-widget-'; + return dir.startsWith('nodebb-plugin-') || dir.startsWith('nodebb-widget-') || dir.startsWith('nodebb-theme-') }).map(function(dir){ return path.join(npmPluginPath, dir); }); From c4509928828de1dabb9c293a2d76ac7bc94f1854 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Feb 2015 15:13:16 -0500 Subject: [PATCH 401/897] closes #2722 --- src/postTools.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/postTools.js b/src/postTools.js index 09fa75330a..0fe8be23f8 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -36,11 +36,12 @@ var winston = require('winston'), postData.content = data.content; plugins.fireHook('filter:post.edit', {post: postData, uid: data.uid}, next); } - ], function(err, data) { + ], function(err, result) { if (err) { return callback(err); } - var postData = data.post; + + var postData = result.post; async.parallel({ post: function(next) { var d = { From b2fc4d5dc4855d7ef0d74b49044a76d3ed00c80d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Feb 2015 18:16:36 -0500 Subject: [PATCH 402/897] #2002 --- src/controllers/categories.js | 71 +++++++++++++++++- src/controllers/index.js | 108 ++++++--------------------- src/controllers/templates.js | 90 ++++++++++++++++++++++ src/routes/api.js | 64 +--------------- src/routes/index.js | 1 + src/views/admin/settings/general.tpl | 14 ++++ 6 files changed, 200 insertions(+), 148 deletions(-) create mode 100644 src/controllers/templates.js diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 25690a6810..9ef288272c 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -3,6 +3,7 @@ var categoriesController = {}, async = require('async'), nconf = require('nconf'), + validator = require('validator'), privileges = require('../privileges'), user = require('../user'), categories = require('../categories'), @@ -22,7 +23,7 @@ categoriesController.recent = function(req, res, next) { } data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; - data['rssFeedUrl'] = nconf.get('relative_path') + '/recent.rss'; + data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss'; data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[recent:title]]'}]); res.render('recent', data); }); @@ -92,6 +93,72 @@ categoriesController.unreadTotal = function(req, res, next) { }); }; +categoriesController.list = function(req, res, next) { + async.parallel({ + header: function (next) { + res.locals.metaTags = [{ + name: "title", + content: validator.escape(meta.config.title || 'NodeBB') + }, { + name: "description", + content: validator.escape(meta.config.description || '') + }, { + property: 'og:title', + content: 'Index | ' + validator.escape(meta.config.title || 'NodeBB') + }, { + property: 'og:type', + content: 'website' + }]; + + if(meta.config['brand:logo']) { + res.locals.metaTags.push({ + property: 'og:image', + content: meta.config['brand:logo'] + }); + } + + next(null); + }, + categories: function (next) { + var uid = req.user ? req.user.uid : 0; + categories.getCategoriesByPrivilege(uid, 'find', function (err, categoryData) { + if (err) { + return next(err); + } + var childCategories = []; + + for(var i=categoryData.length - 1; i>=0; --i) { + + if (Array.isArray(categoryData[i].children) && categoryData[i].children.length) { + childCategories.push.apply(childCategories, categoryData[i].children); + } + + if (categoryData[i].parent && categoryData[i].parent.cid) { + categoryData.splice(i, 1); + } + } + + async.parallel([ + function(next) { + categories.getRecentTopicReplies(categoryData, uid, next); + }, + function(next) { + categories.getRecentTopicReplies(childCategories, uid, next); + } + ], function(err) { + next(err, categoryData); + }); + }); + } + }, function (err, data) { + if (err) { + return next(err); + } + // TODO: template should be called categories.tpl + res.render('home', data); + }); +}; + categoriesController.get = function(req, res, next) { var cid = req.params.category_id, page = req.query.page || 1, @@ -259,7 +326,7 @@ categoriesController.get = function(req, res, next) { data.currentPage = page; data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; - data['rssFeedUrl'] = nconf.get('relative_path') + '/category/' + data.cid + '.rss'; + data.rssFeedUrl = nconf.get('relative_path') + '/category/' + data.cid + '.rss'; data.pagination = pagination.create(data.currentPage, data.pageCount); data.pagination.rel.forEach(function(rel) { diff --git a/src/controllers/index.js b/src/controllers/index.js index ff337250f4..805ba52d20 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -1,21 +1,10 @@ "use strict"; -var topicsController = require('./topics'), - categoriesController = require('./categories'), - tagsController = require('./tags'), - searchController = require('./search'), - usersController = require('./users'), - groupsController = require('./groups'), - accountsController = require('./accounts'), - staticController = require('./static'), - apiController = require('./api'), - adminController = require('./admin'), - helpers = require('./helpers'), - - async = require('async'), +var async = require('async'), nconf = require('nconf'), validator = require('validator'), winston = require('winston'), + auth = require('../routes/authentication'), meta = require('../meta'), user = require('../user'), @@ -23,85 +12,32 @@ var topicsController = require('./topics'), topics = require('../topics'), plugins = require('../plugins'), categories = require('../categories'), - privileges = require('../privileges'); + privileges = require('../privileges'), + helpers = require('./helpers'); var Controllers = { - topics: topicsController, - categories: categoriesController, - tags: tagsController, - search: searchController, - users: usersController, - groups: groupsController, - accounts: accountsController, - static: staticController, - api: apiController, - admin: adminController + topics: require('./topics'), + categories: require('./categories'), + tags: require('./tags'), + search: require('./search'), + users: require('./users'), + groups: require('./groups'), + accounts: require('./accounts'), + static: require('./static'), + api: require('./api'), + admin: require('./admin'), }; Controllers.home = function(req, res, next) { - async.parallel({ - header: function (next) { - res.locals.metaTags = [{ - name: "title", - content: validator.escape(meta.config.title || 'NodeBB') - }, { - name: "description", - content: validator.escape(meta.config.description || '') - }, { - property: 'og:title', - content: 'Index | ' + validator.escape(meta.config.title || 'NodeBB') - }, { - property: 'og:type', - content: 'website' - }]; - - if(meta.config['brand:logo']) { - res.locals.metaTags.push({ - property: 'og:image', - content: meta.config['brand:logo'] - }); - } - - next(null); - }, - categories: function (next) { - var uid = req.user ? req.user.uid : 0; - categories.getCategoriesByPrivilege(uid, 'find', function (err, categoryData) { - if (err) { - return next(err); - } - var childCategories = []; - - for(var i=categoryData.length - 1; i>=0; --i) { - - if (Array.isArray(categoryData[i].children) && categoryData[i].children.length) { - childCategories.push.apply(childCategories, categoryData[i].children); - } - - if (categoryData[i].parent && categoryData[i].parent.cid) { - categoryData.splice(i, 1); - } - } - - async.parallel([ - function(next) { - categories.getRecentTopicReplies(categoryData, uid, next); - }, - function(next) { - categories.getRecentTopicReplies(childCategories, uid, next); - } - ], function(err) { - next(err, categoryData); - }); - }); - } - }, function (err, data) { - if (err) { - return next(err); - } - res.render('home', data); - }); + var route = meta.config.homePageRoute || 'home'; + if (route === 'home') { + return Controllers.categories.list(req, res, next); + } else if (route === 'recent') { + Controllers.categories.recent(req, res, next); + } else if (route === 'popular') { + Controllers.categories.popular(req, res, next); + } }; Controllers.reset = function(req, res, next) { diff --git a/src/controllers/templates.js b/src/controllers/templates.js new file mode 100644 index 0000000000..311f1d37a7 --- /dev/null +++ b/src/controllers/templates.js @@ -0,0 +1,90 @@ +"use strict"; + +var async = require('async'), + nconf = require('nconf'), + fs = require('fs'), + path = require('path'), + meta = require('../meta'), + plugins = require('../plugins'), + utils = require('../../public/src/utils'), + templatesController = {}; + + +var availableTemplatesCache = null; +var configCache = null; + +templatesController.getTemplatesListing = function(req, res, next) { + async.parallel({ + availableTemplates: function(next) { + getAvailableTemplates(next); + }, + templatesConfig: function(next) { + async.waterfall([ + function(next) { + readConfigFile(next); + }, + function(config, next) { + config.custom_mapping['^/?$'] = meta.config.homePageRoute || 'home'; + + plugins.fireHook('filter:templates.get_config', config, next); + } + ], next); + }, + }, function(err, results) { + if (err) { + return next(err); + } + + res.json(results); + }); +}; + +function readConfigFile(callback) { + if (configCache) { + return callback(null, configCache); + } + fs.readFile(path.join(nconf.get('views_dir'), 'config.json'), function(err, config) { + if (err) { + return callback(err); + } + try { + config = JSON.parse(config.toString()); + } catch (err) { + return callback(err); + } + configCache = config; + callback(null, config); + }); +} + +function getAvailableTemplates(callback) { + if (availableTemplatesCache) { + return callback(null, availableTemplatesCache); + } + + async.parallel({ + views: function(next) { + utils.walk(nconf.get('views_dir'), next); + }, + extended: function(next) { + plugins.fireHook('filter:templates.get_virtual', [], next); + } + }, function(err, results) { + if (err) { + return callback(err); + } + var availableTemplates = results.views.filter(function(value, index, self) { + return value && self.indexOf(value) === index; + }).map(function(el) { + return el && el.replace(nconf.get('views_dir') + '/', ''); + }); + + availableTemplatesCache = availableTemplates = availableTemplates.concat(results.extended); + callback(null, availableTemplates) + }); + +} + + + +module.exports = templatesController; diff --git a/src/routes/api.js b/src/routes/api.js index da281280cc..47632ccce7 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -1,17 +1,11 @@ "use strict"; -var path = require('path'), - async = require('async'), - fs = require('fs'), - nconf = require('nconf'), - express = require('express'), +var express = require('express'), posts = require('../posts'), categories = require('../categories'), - plugins = require('../plugins'), - utils = require('../../public/src/utils'), - uploadsController = require('../controllers/uploads'); - + uploadsController = require('../controllers/uploads'), + templatesController = require('../controllers/templates'); module.exports = function(app, middleware, controllers) { @@ -22,7 +16,7 @@ module.exports = function(app, middleware, controllers) { router.get('/widgets/render', controllers.api.renderWidgets); router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID); - router.get('/get_templates_listing', getTemplatesListing); + router.get('/get_templates_listing', templatesController.getTemplatesListing); router.get('/categories/:cid/moderators', getModerators); router.get('/recent/posts/:term?', getRecentPosts); @@ -40,56 +34,6 @@ function getModerators(req, res, next) { }); } -var templatesListingCache = {}; - -function getTemplatesListing(req, res, next) { - if (templatesListingCache.availableTemplates && templatesListingCache.templatesConfig) { - return res.json(templatesListingCache); - } - - async.parallel({ - views: function(next) { - utils.walk(nconf.get('views_dir'), next); - }, - extended: function(next) { - plugins.fireHook('filter:templates.get_virtual', [], next); - }, - config: function(next) { - fs.readFile(path.join(nconf.get('views_dir'), 'config.json'), function(err, config) { - if (err) { - return next(err); - } - - try { - config = JSON.parse(config.toString()); - } catch (err) { - return next(err); - } - - plugins.fireHook('filter:templates.get_config', config, next); - }); - }, - }, function(err, results) { - if (err) { - return next(err); - } - - var data = results.views.filter(function(value, index, self) { - return value && self.indexOf(value) === index; - }).map(function(el) { - return el && el.replace(nconf.get('views_dir') + '/', ''); - }); - - data = data.concat(results.extended); - - templatesListingCache = { - availableTemplates: data, - templatesConfig: results.config - }; - - res.json(templatesListingCache); - }); -} function getRecentPosts(req, res, next) { var uid = (req.user) ? req.user.uid : 0; diff --git a/src/routes/index.js b/src/routes/index.js index f8012c9456..94767dcc36 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -50,6 +50,7 @@ function tagRoutes(app, middleware, controllers) { } function categoryRoutes(app, middleware, controllers) { + setupPageRoute(app, '/categories', middleware, [], controllers.categories.list); setupPageRoute(app, '/popular/:term?', middleware, [], controllers.categories.popular); setupPageRoute(app, '/recent', middleware, [], controllers.categories.recent); setupPageRoute(app, '/unread', middleware, [middleware.authenticate], controllers.categories.unread); diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl index 5c35ea8542..66a27dee61 100644 --- a/src/views/admin/settings/general.tpl +++ b/src/views/admin/settings/general.tpl @@ -28,6 +28,20 @@
    +
    +
    Home Page
    +
    +
    + + +
    +
    +
    +
    Site Logo
    From d152254bcb5018f7a9d5190be2a41e68f30b03a2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Feb 2015 18:26:25 -0500 Subject: [PATCH 403/897] removed availableTemplates assign --- src/controllers/templates.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/templates.js b/src/controllers/templates.js index 311f1d37a7..0d686a1455 100644 --- a/src/controllers/templates.js +++ b/src/controllers/templates.js @@ -79,8 +79,8 @@ function getAvailableTemplates(callback) { return el && el.replace(nconf.get('views_dir') + '/', ''); }); - availableTemplatesCache = availableTemplates = availableTemplates.concat(results.extended); - callback(null, availableTemplates) + availableTemplatesCache = availableTemplates.concat(results.extended); + callback(null, availableTemplatesCache); }); } From 16be6d33822e116c2c9e1b12039e9ffa63769bae Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Feb 2015 18:34:03 -0500 Subject: [PATCH 404/897] increase group search results to 20 items --- public/src/admin/manage/groups.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index 7b8f8cb5b4..b2ae0c0afb 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -154,8 +154,8 @@ define('admin/manage/groups', [ socket.emit('admin.user.search', {query: searchText}, function(err, results) { if (!err && results && results.users.length > 0) { var numResults = results.users.length, x; - if (numResults > 4) { - numResults = 4; + if (numResults > 20) { + numResults = 20; } groupDetailsSearchResults.empty(); From e3ba6716d16c81554ccd3b0565f41638c7ec2dd2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Feb 2015 20:28:37 -0500 Subject: [PATCH 405/897] closes #2723 --- .../jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js | 3 +-- .../jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map diff --git a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js index 16be0abb93..d9047ac1ec 100644 --- a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js +++ b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js @@ -1,7 +1,6 @@ /* * bootstrap-tagsinput v0.4.2 by Tim Schlechter - * + * */ !function(a){"use strict";function b(b,c){this.itemsArray=[],this.$element=a(b),this.$element.hide(),this.isSelect="SELECT"===b.tagName,this.multiple=this.isSelect&&b.hasAttribute("multiple"),this.objectItems=c&&c.itemValue,this.placeholderText=b.hasAttribute("placeholder")?this.$element.attr("placeholder"):"",this.inputSize=Math.max(1,this.placeholderText.length),this.$container=a('
    '),this.$input=a('').appendTo(this.$container),this.$element.after(this.$container);var d=(this.inputSize<3?3:this.inputSize)+"em";this.$input.get(0).style.cssText="width: "+d+" !important;",this.build(c)}function c(a,b){if("function"!=typeof a[b]){var c=a[b];a[b]=function(a){return a[c]}}}function d(a,b){if("function"!=typeof a[b]){var c=a[b];a[b]=function(){return c}}}function e(a){return a?i.text(a).html():""}function f(a){var b=0;if(document.selection){a.focus();var c=document.selection.createRange();c.moveStart("character",-a.value.length),b=c.text.length}else(a.selectionStart||"0"==a.selectionStart)&&(b=a.selectionStart);return b}function g(b,c){var d=!1;return a.each(c,function(a,c){if("number"==typeof c&&b.which===c)return d=!0,!1;if(b.which===c.which){var e=!c.hasOwnProperty("altKey")||b.altKey===c.altKey,f=!c.hasOwnProperty("shiftKey")||b.shiftKey===c.shiftKey,g=!c.hasOwnProperty("ctrlKey")||b.ctrlKey===c.ctrlKey;if(e&&f&&g)return d=!0,!1}}),d}var h={tagClass:function(){return"label label-info"},itemValue:function(a){return a?a.toString():a},itemText:function(a){return this.itemValue(a)},freeInput:!0,addOnBlur:!0,maxTags:void 0,maxChars:void 0,confirmKeys:[13,44],onTagExists:function(a,b){b.hide().fadeIn()},trimValue:!1,allowDuplicates:!1};b.prototype={constructor:b,add:function(b,c){var d=this;if(!(d.options.maxTags&&d.itemsArray.length>=d.options.maxTags||b!==!1&&!b)){if("string"==typeof b&&d.options.trimValue&&(b=a.trim(b)),"object"==typeof b&&!d.objectItems)throw"Can't add objects when itemValue option is not set";if(!b.toString().match(/^\s*$/)){if(d.isSelect&&!d.multiple&&d.itemsArray.length>0&&d.remove(d.itemsArray[0]),"string"==typeof b&&"INPUT"===this.$element[0].tagName){var f=b.split(",");if(f.length>1){for(var g=0;gd.options.maxInputLength)){var l=a.Event("beforeItemAdd",{item:b,cancel:!1});if(d.$element.trigger(l),!l.cancel){d.itemsArray.push(b);var m=a(''+e(i)+'');if(m.data("item",b),d.findInputWrapper().before(m),m.after(" "),d.isSelect&&!a('option[value="'+encodeURIComponent(h)+'"]',d.$element)[0]){var n=a("");n.data("item",b),n.attr("value",h),d.$element.append(n)}c||d.pushVal(),(d.options.maxTags===d.itemsArray.length||d.items().toString().length===d.options.maxInputLength)&&d.$container.addClass("bootstrap-tagsinput-max"),d.$element.trigger(a.Event("itemAdded",{item:b}))}}}else if(d.options.onTagExists){var o=a(".tag",d.$container).filter(function(){return a(this).data("item")===k});d.options.onTagExists(b,o)}}}},remove:function(b,c){var d=this;if(d.objectItems&&(b="object"==typeof b?a.grep(d.itemsArray,function(a){return d.options.itemValue(a)==d.options.itemValue(b)}):a.grep(d.itemsArray,function(a){return d.options.itemValue(a)==b}),b=b[b.length-1]),b){var e=a.Event("beforeItemRemove",{item:b,cancel:!1});if(d.$element.trigger(e),e.cancel)return;a(".tag",d.$container).filter(function(){return a(this).data("item")===b}).remove(),a("option",d.$element).filter(function(){return a(this).data("item")===b}).remove(),-1!==a.inArray(b,d.itemsArray)&&d.itemsArray.splice(a.inArray(b,d.itemsArray),1)}c||d.pushVal(),d.options.maxTags>d.itemsArray.length&&d.$container.removeClass("bootstrap-tagsinput-max"),d.$element.trigger(a.Event("itemRemoved",{item:b}))},removeAll:function(){var b=this;for(a(".tag",b.$container).remove(),a("option",b.$element).remove();b.itemsArray.length>0;)b.itemsArray.pop();b.pushVal()},refresh:function(){var b=this;a(".tag",b.$container).each(function(){var c=a(this),d=c.data("item"),f=b.options.itemValue(d),g=b.options.itemText(d),h=b.options.tagClass(d);if(c.attr("class",null),c.addClass("tag "+e(h)),c.contents().filter(function(){return 3==this.nodeType})[0].nodeValue=e(g),b.isSelect){var i=a("option",b.$element).filter(function(){return a(this).data("item")===d});i.attr("value",f)}})},items:function(){return this.itemsArray},pushVal:function(){var b=this,c=a.map(b.items(),function(a){return b.options.itemValue(a).toString()});b.$element.val(c,!0).trigger("change")},build:function(b){var e=this;if(e.options=a.extend({},h,b),e.objectItems&&(e.options.freeInput=!1),c(e.options,"itemValue"),c(e.options,"itemText"),d(e.options,"tagClass"),e.options.typeahead){var i=e.options.typeahead||{};d(i,"source"),e.$input.typeahead(a.extend({},i,{source:function(b,c){function d(a){for(var b=[],d=0;d$1    ")}}))}if(e.options.typeaheadjs){var j=e.options.typeaheadjs||{};e.$input.typeahead(null,j).on("typeahead:selected",a.proxy(function(a,b){e.add(j.valueKey?b[j.valueKey]:b),e.$input.typeahead("val","")},e))}e.$container.on("click",a.proxy(function(){e.$element.attr("disabled")||e.$input.removeAttr("disabled"),e.$input.focus()},e)),e.options.addOnBlur&&e.options.freeInput&&e.$input.on("focusout",a.proxy(function(){0===a(".typeahead, .twitter-typeahead",e.$container).length&&(e.add(e.$input.val()),e.$input.val(""))},e)),e.$container.on("keydown","input",a.proxy(function(b){var c=a(b.target),d=e.findInputWrapper();if(e.$element.attr("disabled"))return void e.$input.attr("disabled","disabled");switch(b.which){case 8:if(0===f(c[0])){var g=d.prev();g&&e.remove(g.data("item"))}break;case 46:if(0===f(c[0])){var h=d.next();h&&e.remove(h.data("item"))}break;case 37:var i=d.prev();0===c.val().length&&i[0]&&(i.before(d),c.focus());break;case 39:var j=d.next();0===c.val().length&&j[0]&&(j.after(d),c.focus())}{var k=c.val().length;Math.ceil(k/5)}c.attr("size",Math.max(this.inputSize,c.val().length))},e)),e.$container.on("keypress","input",a.proxy(function(b){var c=a(b.target);if(e.$element.attr("disabled"))return void e.$input.attr("disabled","disabled");var d=c.val(),f=e.options.maxChars&&d.length>=e.options.maxChars;e.options.freeInput&&(g(b,e.options.confirmKeys)||f)&&(e.add(f?d.substr(0,e.options.maxChars):d),c.val(""),b.preventDefault());{var h=c.val().length;Math.ceil(h/5)}c.attr("size",Math.max(this.inputSize,c.val().length))},e)),e.$container.on("click","[data-role=remove]",a.proxy(function(b){e.$element.attr("disabled")||e.remove(a(b.target).closest(".tag").data("item"))},e)),e.options.itemValue===h.itemValue&&("INPUT"===e.$element[0].tagName?e.add(e.$element.val()):a("option",e.$element).each(function(){e.add(a(this).attr("value"),!0)}))},destroy:function(){var a=this;a.$container.off("keypress","input"),a.$container.off("click","[role=remove]"),a.$container.remove(),a.$element.removeData("tagsinput"),a.$element.show()},focus:function(){this.$input.focus()},input:function(){return this.$input},findInputWrapper:function(){for(var b=this.$input[0],c=this.$container[0];b&&b.parentNode!==c;)b=b.parentNode;return a(b)}},a.fn.tagsinput=function(c,d){var e=[];return this.each(function(){var f=a(this).data("tagsinput");if(f)if(c||d){if(void 0!==f[c]){var g=f[c](d);void 0!==g&&e.push(g)}}else e.push(f);else f=new b(this,c),a(this).data("tagsinput",f),e.push(f),"SELECT"===this.tagName&&a("option",a(this)).attr("selected","selected"),a(this).val(a(this).val())}),"string"==typeof c?e.length>1?e:e[0]:e},a.fn.tagsinput.Constructor=b;var i=a("
    ");a(function(){a("input[data-role=tagsinput], select[multiple][data-role=tagsinput]").tagsinput()})}(window.jQuery); -//# sourceMappingURL=bootstrap-tagsinput.min.js.map \ No newline at end of file diff --git a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map deleted file mode 100644 index a0d198d16b..0000000000 --- a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"dist/bootstrap-tagsinput-angular.min.js","sources":["src/bootstrap-tagsinput-angular.js"],"names":["angular","module","directive","getItemProperty","scope","property","isFunction","$parent","item","undefined","restrict","model","template","replace","link","element","attrs","$","isArray","select","typeaheadSourceArray","typeaheadSource","split","length","tagsinput","options","typeahead","source","itemValue","itemvalue","itemText","itemtext","confirmKeys","confirmkeys","JSON","parse","tagClass","tagclass","i","on","event","indexOf","push","idx","splice","prev","slice","$watch","added","filter","removed"],"mappings":";;;;;AAAAA,QAAQC,OAAO,0BACdC,UAAU,sBAAuB,WAEhC,QAASC,GAAgBC,EAAOC,GAC9B,MAAKA,GAGDL,QAAQM,WAAWF,EAAMG,QAAQF,IAC5BD,EAAMG,QAAQF,GAEhB,SAASG,GACd,MAAOA,GAAKH,IANLI,OAUX,OACEC,SAAU,KACVN,OACEO,MAAO,YAETC,SAAU,6BACVC,SAAS,EACTC,KAAM,SAASV,EAAOW,EAASC,GAC7BC,EAAE,WACKjB,QAAQkB,QAAQd,EAAMO,SACzBP,EAAMO,SAER,IAAIQ,GAASF,EAAE,SAAUF,GACrBK,EAAuBJ,EAAMK,gBAAkBL,EAAMK,gBAAgBC,MAAM,KAAO,KAClFD,EAAkBD,EACjBA,EAAqBG,OAAS,EAC3BnB,EAAMG,QAAQa,EAAqB,IAAIA,EAAqB,IAC1DhB,EAAMG,QAAQa,EAAqB,IACvC,IAEND,GAAOK,UAAUpB,EAAMG,QAAQS,EAAMS,SAAW,MAC9CC,WACEC,OAAW3B,QAAQM,WAAWe,GAAmBA,EAAkB,MAErEO,UAAWzB,EAAgBC,EAAOY,EAAMa,WACxCC,SAAW3B,EAAgBC,EAAOY,EAAMe,UACxCC,YAAc7B,EAAgBC,EAAOY,EAAMiB,aAAeC,KAAKC,MAAMnB,EAAMiB,cAAgB,IAC3FG,SAAWpC,QAAQM,WAAWF,EAAMG,QAAQS,EAAMqB,WAAajC,EAAMG,QAAQS,EAAMqB,UAAY,WAAiB,MAAOrB,GAAMqB,WAG/H,KAAK,GAAIC,GAAI,EAAGA,EAAIlC,EAAMO,MAAMY,OAAQe,IACtCnB,EAAOK,UAAU,MAAOpB,EAAMO,MAAM2B,GAGtCnB,GAAOoB,GAAG,YAAa,SAASC,GACU,KAApCpC,EAAMO,MAAM8B,QAAQD,EAAMhC,OAC5BJ,EAAMO,MAAM+B,KAAKF,EAAMhC,QAG3BW,EAAOoB,GAAG,cAAe,SAASC,GAChC,GAAIG,GAAMvC,EAAMO,MAAM8B,QAAQD,EAAMhC,KACxB,MAARmC,GACFvC,EAAMO,MAAMiC,OAAOD,EAAK,IAK5B,IAAIE,GAAOzC,EAAMO,MAAMmC,OACvB1C,GAAM2C,OAAO,QAAS,WACpB,GAEIT,GAFAU,EAAQ5C,EAAMO,MAAMsC,OAAO,SAASX,GAAI,MAA2B,KAApBO,EAAKJ,QAAQH,KAC5DY,EAAUL,EAAKI,OAAO,SAASX,GAAI,MAAkC,KAA3BlC,EAAMO,MAAM8B,QAAQH,IAMlE,KAHAO,EAAOzC,EAAMO,MAAMmC,QAGdR,EAAI,EAAGA,EAAIY,EAAQ3B,OAAQe,IAC9BnB,EAAOK,UAAU,SAAU0B,EAAQZ,GAOrC,KAHAnB,EAAOK,UAAU,WAGZc,EAAI,EAAGA,EAAIU,EAAMzB,OAAQe,IAC5BnB,EAAOK,UAAU,MAAOwB,EAAMV,MAE/B"} \ No newline at end of file From c3f0f527578e629f5e237a70aa32795f448b3642 Mon Sep 17 00:00:00 2001 From: yariplus Date: Sun, 15 Feb 2015 01:53:18 -0500 Subject: [PATCH 406/897] Fix select and select multiple loading/saving on widget ACP. --- public/src/admin/extend/widgets.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 9632bbfa68..43f70de05a 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -80,7 +80,14 @@ define('admin/extend/widgets', function() { for (var d in data) { if (data.hasOwnProperty(d)) { if (data[d].name) { - widgetData[data[d].name] = data[d].value; + if (widgetData[data[d].name]) { + if(!Array.isArray(widgetData[data[d].name])) { + widgetData[data[d].name] = [ widgetData[data[d].name] ]; + } + widgetData[data[d].name].push(data[d].value); + }else{ + widgetData[data[d].name] = data[d].value; + } } } } @@ -162,7 +169,7 @@ define('admin/extend/widgets', function() { title.text(title.text() + ' - ' + data.title); } - widget.find('input, textarea').each(function() { + widget.find('input, textarea, select').each(function() { var input = $(this), value = data[input.attr('name')]; From 16c5c18165d75c9030f9b361a4d25ff0d0153497 Mon Sep 17 00:00:00 2001 From: Mega Date: Mon, 16 Feb 2015 10:43:56 +0300 Subject: [PATCH 407/897] Update arguments in action:posts.loaded --- public/src/client/home.js | 2 +- public/src/client/topic/posts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/home.js b/public/src/client/home.js index f3b4e65acc..9b1a1862cb 100644 --- a/public/src/client/home.js +++ b/public/src/client/home.js @@ -59,7 +59,7 @@ define('forum/home', function() { recentPosts.last().remove(); } - $(window).trigger('action:posts.loaded', {pids: [post.pid]}); + $(window).trigger('action:posts.loaded', {posts: [post]}); }); } diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 1f49c6fdd0..8137cdb8ab 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -130,7 +130,7 @@ define('forum/topic/posts', [ pids.push(data.posts[i].pid); } - $(window).trigger('action:posts.loaded', {pids: pids}); + $(window).trigger('action:posts.loaded', {posts: data.posts}); onNewPostsLoaded(html, pids); callback(true); }); From bd553eb05d6fe34ddc00ea47768bc3c7b1c09034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 17 Feb 2015 13:25:13 -0500 Subject: [PATCH 408/897] closes #2002 --- public/src/client/{home.js => categories.js} | 27 ++++++++++---------- src/controllers/categories.js | 4 +-- src/controllers/index.js | 6 +++-- src/controllers/templates.js | 3 ++- src/views/admin/settings/general.tpl | 2 +- src/views/config.json | 2 +- 6 files changed, 23 insertions(+), 21 deletions(-) rename public/src/client/{home.js => categories.js} (70%) diff --git a/public/src/client/home.js b/public/src/client/categories.js similarity index 70% rename from public/src/client/home.js rename to public/src/client/categories.js index 9b1a1862cb..6840f69e89 100644 --- a/public/src/client/home.js +++ b/public/src/client/categories.js @@ -2,35 +2,34 @@ /* globals define, socket, app, templates, translator, ajaxify*/ -define('forum/home', function() { - var home = {}; +define('forum/categories', function() { + var categories = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if (data.tpl_url !== 'home') { - socket.removeListener('event:new_post', home.onNewPost); + if (data.tpl_url !== 'categories') { + socket.removeListener('event:new_post', categories.onNewPost); } }); + categories.init = function() { + app.enterRoom('categories'); - home.init = function() { - app.enterRoom('home'); + socket.removeListener('event:new_post', categories.onNewPost); + socket.on('event:new_post', categories.onNewPost); - socket.removeListener('event:new_post', home.onNewPost); - socket.on('event:new_post', home.onNewPost); - - $('.home .category-header').tooltip({ + $('.category-header').tooltip({ placement: 'bottom' }); }; - home.onNewPost = function(data) { + categories.onNewPost = function(data) { if (data && data.posts && data.posts.length && data.posts[0].topic) { renderNewPost(data.posts[0].topic.cid, data.posts[0]); } }; function renderNewPost(cid, post) { - var category = $('.home .category-item[data-cid="' + cid + '"]'); + var category = $('.category-item[data-cid="' + cid + '"]'); if (!category.length) { return; } @@ -64,7 +63,7 @@ define('forum/home', function() { } function parseAndTranslate(posts, callback) { - templates.parse('home', 'posts', {categories: {posts: posts}}, function(html) { + templates.parse('categories', 'posts', {categories: {posts: posts}}, function(html) { translator.translate(html, function(translatedHTML) { translatedHTML = $(translatedHTML); translatedHTML.find('img').addClass('img-responsive'); @@ -74,5 +73,5 @@ define('forum/home', function() { }); } - return home; + return categories; }); diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 9ef288272c..187653268d 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -154,8 +154,8 @@ categoriesController.list = function(req, res, next) { if (err) { return next(err); } - // TODO: template should be called categories.tpl - res.render('home', data); + + res.render('categories', data); }); }; diff --git a/src/controllers/index.js b/src/controllers/index.js index 805ba52d20..c8511c7c61 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -30,13 +30,15 @@ var Controllers = { Controllers.home = function(req, res, next) { - var route = meta.config.homePageRoute || 'home'; - if (route === 'home') { + var route = meta.config.homePageRoute || 'categories'; + if (route === 'categories') { return Controllers.categories.list(req, res, next); } else if (route === 'recent') { Controllers.categories.recent(req, res, next); } else if (route === 'popular') { Controllers.categories.popular(req, res, next); + } else { + next(); } }; diff --git a/src/controllers/templates.js b/src/controllers/templates.js index 0d686a1455..7cbe6728e9 100644 --- a/src/controllers/templates.js +++ b/src/controllers/templates.js @@ -24,7 +24,8 @@ templatesController.getTemplatesListing = function(req, res, next) { readConfigFile(next); }, function(config, next) { - config.custom_mapping['^/?$'] = meta.config.homePageRoute || 'home'; + console.log(meta.config.homePageRoute); + config.custom_mapping['^/?$'] = meta.config.homePageRoute || 'categories'; plugins.fireHook('filter:templates.get_config', config, next); } diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl index 66a27dee61..b403835994 100644 --- a/src/views/admin/settings/general.tpl +++ b/src/views/admin/settings/general.tpl @@ -34,7 +34,7 @@
    diff --git a/src/views/config.json b/src/views/config.json index 26ae7b692c..f8a04fa620 100644 --- a/src/views/config.json +++ b/src/views/config.json @@ -1,6 +1,6 @@ { "custom_mapping": { - "^\/?$": "home", + "^\/?$": "categories", "^admin?$": "admin/general/dashboard", "^users/sort-posts": "users", "^users/latest": "users", From 8f6b577bad5e82ed54ec3147b9522146112b12aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 17 Feb 2015 14:50:08 -0500 Subject: [PATCH 409/897] Update package.json --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a7907757e8..b6a70902e4 100644 --- a/package.json +++ b/package.json @@ -42,9 +42,9 @@ "nodebb-plugin-mentions": "^0.9.0", "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", - "nodebb-theme-lavender": "^1.0.0", - "nodebb-theme-vanilla": "^1.0.0", - "nodebb-widget-essentials": "~0.2.0", + "nodebb-theme-lavender": "^1.0.4", + "nodebb-theme-vanilla": "^1.0.5", + "nodebb-widget-essentials": "~0.2.11", "npm": "^2.1.4", "passport": "^0.2.1", "passport-local": "1.0.0", From 0611b7e1eac8e25228bcd58fd78ffdbb5fde5787 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Feb 2015 15:12:31 -0500 Subject: [PATCH 410/897] closes #2733 --- src/controllers/admin/uploads.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js index 9ba3ad049c..81a98ed151 100644 --- a/src/controllers/admin/uploads.js +++ b/src/controllers/admin/uploads.js @@ -30,7 +30,7 @@ uploadsController.uploadFavicon = function(req, res, next) { var uploadedFile = req.files.files[0]; var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon']; - if (validateUpload(res, req, next, uploadedFile, allowedTypes)) { + if (validateUpload(req, res, next, uploadedFile, allowedTypes)) { file.saveFileToLocal('favicon.ico', 'files', uploadedFile.path, function(err, image) { fs.unlink(uploadedFile.path); if (err) { @@ -63,7 +63,7 @@ function validateUpload(req, res, next, uploadedFile, allowedTypes) { if (allowedTypes.indexOf(uploadedFile.type) === -1) { fs.unlink(uploadedFile.path); - next(new Error('[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]')); + res.json({error: '[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]'}); return false; } From 276cd51836fbba54187f948fab31ec18279e3f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 17 Feb 2015 15:13:58 -0500 Subject: [PATCH 411/897] closes #2467 --- public/language/en_GB/notifications.json | 1 + public/src/client/notifications.js | 2 +- public/src/modules/notifications.js | 79 ++++++++++-------------- src/controllers/templates.js | 1 - src/socket.io/modules.js | 10 --- src/socket.io/notifications.js | 10 ++- 6 files changed, 45 insertions(+), 58 deletions(-) diff --git a/public/language/en_GB/notifications.json b/public/language/en_GB/notifications.json index 54c926a597..96aef60183 100644 --- a/public/language/en_GB/notifications.json +++ b/public/language/en_GB/notifications.json @@ -2,6 +2,7 @@ "title": "Notifications", "no_notifs": "You have no new notifications", "see_all": "See all Notifications", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Outgoing Link", diff --git a/public/src/client/notifications.js b/public/src/client/notifications.js index b0fbb4619f..024fe6715c 100644 --- a/public/src/client/notifications.js +++ b/public/src/client/notifications.js @@ -10,7 +10,7 @@ define('forum/notifications', function() { $('span.timeago').timeago(); $('.notifications .delete').on('click', function() { - socket.emit('notifications.deleteAll', function(err) { + socket.emit('notifications.markAllRead', function(err) { if (err) { return app.alertError(err.message); } diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 319d88041f..8ce107f20a 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -2,7 +2,6 @@ /* globals define, socket, translator, utils, config, app, ajaxify, Tinycon*/ - define('notifications', ['sounds'], function(sound) { var Notifications = {}; @@ -14,54 +13,44 @@ define('notifications', ['sounds'], function(sound) { notifTrigger.on('click', function(e) { e.preventDefault(); - if (!notifContainer.hasClass('open')) { - - socket.emit('notifications.get', null, function(err, data) { - - function createNotification(notification, callback) { - if (notification.image) { - image = ''; - } else { - image = ''; - } - - return '
  • ' + image + '' + $.timeago(new Date(parseInt(notification.datetime, 10))) + '' + notification.bodyShort + '
    • '; - } - - var x, html = ''; - - // Switch to shorthand - translator.toggleTimeagoShorthand(); - - if (!err && (data.read.length + data.unread.length) > 0) { - var image = ''; - for (x = 0; x < data.unread.length; x++) { - html += createNotification(data.unread[x]); - } - - for (x = 0; x < data.read.length; x++) { - html += createNotification(data.read[x]); - } - } else { - html += '
  • [[notifications:no_notifs]]
    • '; - } - - // Switch back to original timeago strings - translator.toggleTimeagoShorthand(); - - html += '
  • [[notifications:see_all]]
    • '; + if (notifContainer.hasClass('open')) { + return; + } + socket.emit('notifications.get', null, function(err, data) { + if (err) { + return app.alertError(err.message); + } + + var notifs = data.unread.concat(data.read); + + translator.toggleTimeagoShorthand(); + for(var i=0; i Date: Tue, 17 Feb 2015 16:01:49 -0500 Subject: [PATCH 412/897] querying via qs now --- src/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins.js b/src/plugins.js index 730377c673..cc8220f84f 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -171,7 +171,7 @@ var fs = require('fs'), Plugins.getAll = function(callback) { var request = require('request'); - request((nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins/' + pkg.version, function(err, res, body) { + request((nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins?version=' + pkg.version, function(err, res, body) { var plugins = []; try { From df7c48c47479437e0a16d741208814ad90842e7f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Feb 2015 16:09:25 -0500 Subject: [PATCH 413/897] restoring latest plugin version in plugins ACP --- src/plugins.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index cc8220f84f..b33fe46ac7 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -187,8 +187,7 @@ var fs = require('fs'), plugins[i].installed = false; plugins[i].active = false; plugins[i].url = plugins[i].url ? plugins[i].url : plugins[i].repository ? plugins[i].repository.url : ''; - plugins[i].latest = getLatestVersion(plugins[i].versions); - // plugins[i].latest = plugins[i].latest; + plugins[i].latest = plugins[i].latest; pluginMap[plugins[i].name] = plugins[i]; } From 150d33eb92af05924d8c62d09c675994b7c84546 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 17 Feb 2015 17:55:15 -0500 Subject: [PATCH 414/897] upgrade script to rename widgets:home.tpl to widgets:categories.tpl --- src/upgrade.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/upgrade.js b/src/upgrade.js index 52347bcb40..977854ab01 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 1, 8); + latestSchema = Date.UTC(2015, 1, 17); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -827,6 +827,25 @@ Upgrade.upgrade = function(callback) { winston.info('[2015/02/08] Clearing reset tokens skipped'); next(); } + }, + function(next) { + thisSchemaDate = Date.UTC(2015, 1, 17); + if (schemaDate < thisSchemaDate) { + updatesMade = true; + winston.info('[2015/02/17] renaming home.tpl to categories.tpl'); + + db.rename('widgets:home.tpl', 'widgets:categories.tpl', function(err) { + if (err) { + return next(err); + } + + winston.info('[2015/02/17] renaming home.tpl to categories.tpl done'); + Upgrade.update(thisSchemaDate, next); + }); + } else { + winston.info('[2015/02/17] renaming home.tpl to categories.tpl skipped'); + next(); + } } // Add new schema updates here From 0096d74cfad73b56c98a38bef840e773ab44d09c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 17 Feb 2015 18:11:30 -0500 Subject: [PATCH 415/897] user password reset test --- src/user/reset.js | 2 +- tests/user.js | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/user/reset.js b/src/user/reset.js index 60ff820dbf..e010a1448e 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -51,7 +51,7 @@ var async = require('async'), template: 'reset', uid: uid }); - callback(); + callback(null, reset_code); }); }); }; diff --git a/tests/user.js b/tests/user.js index 466379c6e8..5c2f5bfd62 100644 --- a/tests/user.js +++ b/tests/user.js @@ -14,7 +14,8 @@ var assert = require('assert'), var User = require('../src/user'), Topics = require('../src/topics'), Categories = require('../src/categories'), - Meta = require('../src/meta'); + Meta = require('../src/meta'), + Password = require('../src/password'); describe('User', function() { var userData, @@ -193,6 +194,37 @@ describe('User', function() { }); }); + describe('passwordReset', function() { + var uid; + before(function(done) { + User.create({username: 'resetuser', password: '123456', email: 'reset@me.com'}, function(err, newUid) { + assert.ifError(err); + uid = newUid; + done(); + }); + }); + + it('should create a new reset code and reset password', function(done) { + User.reset.send('reset@me.com', function(err, code) { + assert.ifError(err); + assert(code); + + User.reset.commit(code, 'newpassword', function(err) { + assert.ifError(err); + + db.getObjectField('user:' + uid, 'password', function(err, newPassword) { + assert.ifError(err); + Password.compare('newpassword', newPassword, function(err, match) { + assert.ifError(err); + assert(match); + done(); + }); + }); + }); + }); + }); + }); + after(function() { db.flushdb(); }); From c305cd8220212519e8ee450deebb6ba138b0f20a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 17 Feb 2015 18:14:29 -0500 Subject: [PATCH 416/897] removed commented out code --- src/user/reset.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/user/reset.js b/src/user/reset.js index e010a1448e..069ab4dd62 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -21,7 +21,6 @@ var async = require('async'), } db.sortedSetScore('reset:issueDate', code, function(err, issueDate) { - // db.getObjectField('reset:expiry', code, function(err, expiry) { if (err) { return callback(err); } From fbcc7c4bc374a5a0f98c342a720fcc1e88557b67 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 17 Feb 2015 18:52:54 -0500 Subject: [PATCH 417/897] closes #2634 --- public/src/client/pagination.js | 12 +++++------- public/src/client/topic/posts.js | 13 ++++++++++--- src/topics/create.js | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/public/src/client/pagination.js b/public/src/client/pagination.js index 3d306e9f65..e2df0a6ebe 100644 --- a/public/src/client/pagination.js +++ b/public/src/client/pagination.js @@ -20,16 +20,14 @@ define('forum/pagination', function() { }; pagination.loadPage = function(page, callback) { + callback = callback || function() {}; page = parseInt(page, 10); - if(!utils.isNumber(page) || page < 1 || page > pagination.pageCount) { + if (!utils.isNumber(page) || page < 1 || page > pagination.pageCount) { + callback(false); return false; } - - ajaxify.go(window.location.pathname.slice(1) + '?page=' + page, function() { - if (typeof callback === 'function') { - callback(); - } - }); + var url = window.location.pathname.slice(1).split('/').slice(0, 3).join('/') + '?page=' + page; + ajaxify.go(url, callback); return true; }; diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 7d3933b8de..d95a015c9e 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -31,11 +31,18 @@ define('forum/topic/posts', [ }; function onNewPostPagination(data) { + function scrollToPost() { + navigator.scrollBottom(data.posts[0].index); + } + var posts = data.posts; + + pagination.pageCount = Math.max(1, Math.ceil((posts[0].topic.postcount - 1) / config.postsPerPage)); + if (pagination.currentPage === pagination.pageCount) { - createNewPosts(data); - } else if(data.posts && data.posts.length && parseInt(data.posts[0].uid, 10) === parseInt(app.user.uid, 10)) { - pagination.loadPage(pagination.pageCount); + createNewPosts(data, scrollToPost); + } else if (parseInt(posts[0].uid, 10) === parseInt(app.user.uid, 10)) { + pagination.loadPage(pagination.pageCount, scrollToPost); } } diff --git a/src/topics/create.js b/src/topics/create.js index 2eb882da80..1e9336fedc 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -243,7 +243,7 @@ module.exports = function(Topics) { posts.getUserInfoForPosts([postData.uid], uid, next); }, topicInfo: function(next) { - Topics.getTopicFields(tid, ['tid', 'title', 'slug', 'cid'], next); + Topics.getTopicFields(tid, ['tid', 'title', 'slug', 'cid', 'postcount'], next); }, settings: function(next) { user.getSettings(uid, next); From 75657605ad27972cbcf605db4acf8ba3bb75bfec Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 17 Feb 2015 18:57:24 -0500 Subject: [PATCH 418/897] fix typo in search --- public/src/client/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index a8924ce8f9..95f49b60f8 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -44,7 +44,7 @@ define('forum/search', ['search'], function(searchModule) { in: form.find('#search-in').val() }; - if (searchData.in === 'posts' || searchData.in === 'titlespost' || searchData.in === 'titles') { + if (searchData.in === 'posts' || searchData.in === 'titlesposts' || searchData.in === 'titles') { searchData.by = form.find('#posted-by-user').val(); searchData.categories = form.find('#posted-in-categories').val(); searchData.searchChildren = form.find('#search-children').is(':checked'); From 540facaaab2757ea6b30535d9e25c5253e7c0e24 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Feb 2015 19:18:55 -0500 Subject: [PATCH 419/897] try #2 (I give up, grunt-watch seems so unpredictable... on windows anyways) --- Gruntfile.js | 61 +++++++++++++----------- bcrypt.js | 1 + package.json | 4 +- public/less/admin/advanced/database.less | 19 +++++++- public/src/overrides.js | 1 + src/webserver.js | 4 +- 6 files changed, 57 insertions(+), 33 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 19b0af68d0..4db400bf83 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,53 +1,56 @@ module.exports = function(grunt) { grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), - execute: { + express: { dev: { - src: 'a.js', options: { - args: ['arg'] + script: 'app.js', + node_env: 'development', + args: ['dev', 'from-file'], + output: "NodeBB Ready" } }, minifyJS: { - src: 'app.js', options: { - args: ['from-file'] + script: 'app.js', + node_env: 'development', + args: ['dev', 'minify-js'], + output: "NodeBB Ready" } }, - minifyCSS: { - src: 'app.js', + compileLESS: { options: { - args: ['from-file'] + script: 'app.js', + node_env: 'development', + args: ['dev', 'compile-less'], + output: "NodeBB Ready" } - }, + } }, - watch: { - clientScripts: { - files: ['public/src/**/*.js'], - tasks: ['execute:minifyJS'], - options: { - spawn: false - } - }, - serverScripts: { - files: ['*.js', 'src/**/*.js', 'node_modules/**/*.js'], - tasks: ['execute:minifyCSS'], - options: { - spawn: false + less: { + development: { + files: { + "public/bin/manifest.css": "source/manifest.less" } - }, - less: { - files: ['**/*.less'], - tasks: ['execute:minifyCSS'], + } + }, + watch: { + compileLESS: { + files: "**/*.less", + tasks: ['express:compileLESS'], options: { - spawn: false + livereload: true, } } } }); grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.loadNpmTasks('grunt-execute'); + grunt.loadNpmTasks('grunt-express-server'); + + grunt.registerTask('default', ['express:dev', 'watch']); - grunt.registerTask('default', ['watch', 'execute:minifyCSS']); + grunt.event.on('watch', function(action, filepath, target) { + grunt.log.writeln(target + ': ' + filepath + ' has ' + action); + }); }; \ No newline at end of file diff --git a/bcrypt.js b/bcrypt.js index 7611ab61a9..1445999a8a 100644 --- a/bcrypt.js +++ b/bcrypt.js @@ -13,6 +13,7 @@ process.on('message', function(msg) { } }); + function hashPassword(password, rounds) { async.waterfall([ function(next) { diff --git a/package.json b/package.json index 6d3525778c..cf4289efbf 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,9 @@ "mocha": "~1.13.0", "grunt": "~0.4.5", "grunt-contrib-watch": "^0.6.1", - "grunt-execute": "^0.2.2" + "grunt-execute": "^0.2.2", + "grunt-express-server": "^0.4.19", + "grunt-contrib-less": "^1.0.0" }, "bugs": { "url": "https://github.com/NodeBB/NodeBB/issues" diff --git a/public/less/admin/advanced/database.less b/public/less/admin/advanced/database.less index c81ef613cc..3799ced20a 100644 --- a/public/less/admin/advanced/database.less +++ b/public/less/admin/advanced/database.less @@ -3,4 +3,21 @@ display:inline-block; width:220px; } -} \ No newline at end of file +} + + + + + + + + + + + + + + + + + diff --git a/public/src/overrides.js b/public/src/overrides.js index 978dea0720..913a5abf3f 100644 --- a/public/src/overrides.js +++ b/public/src/overrides.js @@ -1,5 +1,6 @@ 'use strict'; + if ('undefined' !== typeof window) { (function ($, undefined) { diff --git a/src/webserver.js b/src/webserver.js index 01dee2b91c..5512c84e40 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -39,8 +39,8 @@ if(nconf.get('ssl')) { // Preparation dependent on plugins plugins.ready(function() { async.parallel([ - async.apply(!nconf.get('from-file') ? meta.js.minify : meta.js.getFromFile, app.enabled('minification')), - async.apply(!nconf.get('from-file') ? meta.css.minify : meta.css.getFromFile), + async.apply((!nconf.get('minify-js') && !nconf.get('from-file')) ? meta.js.minify : meta.js.getFromFile, app.enabled('minification')), + async.apply((!nconf.get('compile-less') && !nconf.get('from-file')) ? meta.css.minify : meta.css.getFromFile), async.apply(meta.sounds.init) ]); }); From 3bcd8aefb0490a4faa59bc154fd9e3173698b3b7 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 17 Feb 2015 22:22:06 -0500 Subject: [PATCH 420/897] deleteObjectFields method cleaned up user reset --- src/database/mongo/hash.js | 13 +++- src/database/redis/hash.js | 6 ++ src/user/reset.js | 132 +++++++++++++++++++++---------------- tests/database/hash.js | 18 ++++- 4 files changed, 108 insertions(+), 61 deletions(-) diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index f40a756600..5c5970f1d9 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -200,13 +200,20 @@ module.exports = function(db, module) { }; module.deleteObjectField = function(key, field, callback) { + module.deleteObjectFields(key, [field], callback); + }; + + module.deleteObjectFields = function(key, fields, callback) { callback = callback || helpers.noop; - if (!key || !field) { + if (!key || !Array.isArray(fields) || !fields.length) { return callback(); } var data = {}; - field = helpers.fieldToString(field); - data[field] = ''; + fields.forEach(function(field) { + field = helpers.fieldToString(field); + data[field] = ''; + }); + db.collection('objects').update({_key: key}, {$unset : data}, function(err, res) { callback(err); }); diff --git a/src/database/redis/hash.js b/src/database/redis/hash.js index 92ae7017c0..ce79d0bc6f 100644 --- a/src/database/redis/hash.js +++ b/src/database/redis/hash.js @@ -94,6 +94,12 @@ module.exports = function(redisClient, module) { }); }; + module.deleteObjectFields = function(key, fields, callback) { + helpers.multiKeyValues(redisClient, 'hdel', key, fields, function(err, results) { + callback(err); + }); + }; + module.incrObjectField = function(key, field, callback) { redisClient.hincrby(key, field, 1, callback); }; diff --git a/src/user/reset.js b/src/user/reset.js index 069ab4dd62..7434c4fc30 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -10,91 +10,109 @@ var async = require('async'), db = require('../database'), meta = require('../meta'), - events = require('../events'), emailer = require('../emailer'); (function(UserReset) { - UserReset.validate = function(code, callback) { - db.getObjectField('reset:uid', code, function(err, uid) { - if (err || !uid) { - return callback(err, false); - } + var twoHours = 7200000; - db.sortedSetScore('reset:issueDate', code, function(err, issueDate) { - if (err) { - return callback(err); + UserReset.validate = function(code, callback) { + async.waterfall([ + function(next) { + db.getObjectField('reset:uid', code, next); + }, + function(uid, next) { + if (!uid) { + return callback(null, false); } - - callback(null, parseInt(issueDate, 10) > (Date.now() - (1000*60*120))); - }); - }); + db.sortedSetScore('reset:issueDate', code, next); + }, + function(issueDate, next) { + next(null, parseInt(issueDate, 10) > Date.now() - twoHours); + } + ], callback); }; UserReset.send = function(email, callback) { - user.getUidByEmail(email, function(err, uid) { - if (err || !uid) { - return callback(err || new Error('[[error:invalid-email]]')); - } - - var reset_code = utils.generateUUID(); - db.setObjectField('reset:uid', reset_code, uid); - db.sortedSetAdd('reset:issueDate', Date.now(), reset_code); - - var reset_link = nconf.get('url') + '/reset/' + reset_code; + var reset_code = utils.generateUUID(); + var uid; + async.waterfall([ + function(next) { + user.getUidByEmail(email, next); + }, + function(_uid, next) { + if (!_uid) { + return next(new Error('[[error:invalid-email]]')); + } - translator.translate('[[email:password-reset-requested, ' + (meta.config.title || 'NodeBB') + ']]', meta.config.defaultLang, function(subject) { + uid = _uid; + async.parallel([ + async.apply(db.setObjectField, 'reset:uid', reset_code, uid), + async.apply(db.sortedSetAdd, 'reset:issueDate', Date.now(), reset_code) + ], next); + }, + function(results, next) { + translator.translate('[[email:password-reset-requested, ' + (meta.config.title || 'NodeBB') + ']]', meta.config.defaultLang, function(subject) { + next(null, subject); + }); + }, + function(subject, next) { + var reset_link = nconf.get('url') + '/reset/' + reset_code; emailer.send('reset', uid, { site_title: (meta.config.title || 'NodeBB'), reset_link: reset_link, subject: subject, template: 'reset', uid: uid - }); - callback(null, reset_code); - }); - }); + }, next); + }, + function(next) { + next(null, reset_code); + } + ], callback); }; UserReset.commit = function(code, password, callback) { - UserReset.validate(code, function(err, validated) { - if(err) { - return callback(err); - } - - if (!validated) { - return callback(new Error('[[error:reset-code-not-valid]]')); - } - - db.getObjectField('reset:uid', code, function(err, uid) { - if (err) { - return callback(err); + var uid; + async.waterfall([ + function(next) { + UserReset.validate(code, next); + }, + function(validated, next) { + if (!validated) { + return next(new Error('[[error:reset-code-not-valid]]')); + } + db.getObjectField('reset:uid', code, next); + }, + function(_uid, next) { + uid = _uid; + if (!uid) { + return next(new Error('[[error:reset-code-not-valid]]')); } - user.hashPassword(password, function(err, hash) { - if (err) { - return callback(err); - } - user.setUserField(uid, 'password', hash); - - db.deleteObjectField('reset:uid', code); - db.sortedSetRemove('reset:issueDate', code); - - user.auth.resetLockout(uid, callback); - }); - }); - }); + user.hashPassword(password, next); + }, + function(hash, next) { + async.parallel([ + async.apply(user.setUserField, uid, 'password', hash), + async.apply(db.deleteObjectField, 'reset:uid', code), + async.apply(db.sortedSetRemove, 'reset:issueDate', code), + async.apply(user.auth.resetLockout, uid) + ], next); + } + ], callback); }; UserReset.clean = function(callback) { - // Locate all codes that have expired, and remove them from the set/hash async.waterfall([ - async.apply(db.getSortedSetRangeByScore, 'reset:issueDate', 0, -1, -1, +new Date()-(1000*60*120)), + async.apply(db.getSortedSetRangeByScore, 'reset:issueDate', 0, -1, 0, Date.now() - twoHours), function(tokens, next) { - if (!tokens.length) { return next(); } + if (!tokens.length) { + return next(); + } winston.verbose('[UserReset.clean] Removing ' + tokens.length + ' reset tokens from database'); async.parallel([ - async.apply(db.deleteObjectField, 'reset:uid', tokens), + async.apply(db.deleteObjectFields, 'reset:uid', tokens), async.apply(db.sortedSetRemove, 'reset:issueDate', tokens) ], next); } diff --git a/tests/database/hash.js b/tests/database/hash.js index 5d1d002c3b..5e294f3c4b 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -263,7 +263,7 @@ describe('Hash methods', function() { describe('deleteObjectField()', function() { before(function(done) { - db.setObject('testObject10', {foo: 'bar', delete: 'this'}, done); + db.setObject('testObject10', {foo: 'bar', delete: 'this', delete1: 'this', delete2: 'this'}, done); }); it('should delete an objects field', function(done) { @@ -277,6 +277,22 @@ describe('Hash methods', function() { }); }); }); + + it('should delete multiple fields of the object', function(done) { + db.deleteObjectFields('testObject10', ['delete1', 'delete2'], function(err) { + assert.ifError(err); + assert.equal(arguments.length, 1); + async.parallel({ + delete1: async.apply(db.isObjectField, 'testObject10', 'delete1'), + delete2: async.apply(db.isObjectField, 'testObject10', 'delete2') + }, function(err, results) { + assert.ifError(err); + assert.equal(results.delete1, false); + assert.equal(results.delete2, false); + done(); + }); + }); + }); }); describe('incrObjectField()', function() { From 31a44a9982c9293dc9d8f2a2c7667e2ec7b28924 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Feb 2015 00:04:55 -0500 Subject: [PATCH 421/897] dont use fa icon --- public/src/modules/topicSelect.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/topicSelect.js b/public/src/modules/topicSelect.js index 842cf7f8b6..75f32f80be 100644 --- a/public/src/modules/topicSelect.js +++ b/public/src/modules/topicSelect.js @@ -23,7 +23,7 @@ define('topicSelect', function() { return false; } - var isSelected = select.hasClass('fa-check-square-o'); + var isSelected = select.parents('[data-tid]').hasClass('selected'); toggleSelect(select, !isSelected); lastSelected = select; if (typeof onSelect === 'function') { From 60efeb8561e3d0dc06ba30fe2439c85bbcb5c314 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Feb 2015 07:28:53 -0500 Subject: [PATCH 422/897] fix nid --- public/src/modules/notifications.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 8ce107f20a..4d9fffcde0 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -21,7 +21,7 @@ define('notifications', ['sounds'], function(sound) { if (err) { return app.alertError(err.message); } - + var notifs = data.unread.concat(data.read); translator.toggleTimeagoShorthand(); @@ -29,14 +29,15 @@ define('notifications', ['sounds'], function(sound) { notifs[i].timeago = $.timeago(new Date(parseInt(notifs[i].datetime, 10))); } translator.toggleTimeagoShorthand(); - + templates.parse('partials/notifications_list', {notifications: notifs}, function(html) { notifList.translateHtml(html); }); - }); + }); }); notifList.on('click', '[data-nid]', function() { + var nid = $(this).attr('data-nid'); socket.emit('notifications.markRead', nid, function(err) { if (err) { app.alertError(err.message); From 0dca86f255440e28d01c8fdd5c64fd1490c2f031 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Feb 2015 07:36:49 -0500 Subject: [PATCH 423/897] fix tests --- src/database/mongo/hash.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index 5c5970f1d9..800bd6525c 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -210,8 +210,10 @@ module.exports = function(db, module) { } var data = {}; fields.forEach(function(field) { - field = helpers.fieldToString(field); - data[field] = ''; + if (field) { + field = helpers.fieldToString(field); + data[field] = ''; + } }); db.collection('objects').update({_key: key}, {$unset : data}, function(err, res) { From d577371a51adefe89179185c364d325bba3a2692 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Feb 2015 07:41:35 -0500 Subject: [PATCH 424/897] fix test --- src/database/mongo/hash.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index 800bd6525c..da1d2483d9 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -208,12 +208,15 @@ module.exports = function(db, module) { if (!key || !Array.isArray(fields) || !fields.length) { return callback(); } + fields = fields.filter(Boolean); + if (!fields.length) { + return callback(); + } + var data = {}; fields.forEach(function(field) { - if (field) { - field = helpers.fieldToString(field); - data[field] = ''; - } + field = helpers.fieldToString(field); + data[field] = ''; }); db.collection('objects').update({_key: key}, {$unset : data}, function(err, res) { From 8975a0962ea9a229004f52769dc7ce8380c33e44 Mon Sep 17 00:00:00 2001 From: acardinale Date: Wed, 18 Feb 2015 15:26:05 +0100 Subject: [PATCH 425/897] Update topics.js --- src/controllers/topics.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 4c7708c2ba..1d756b4189 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -268,8 +268,7 @@ topicsController.get = function(req, res, next) { topics.increaseViewCount(tid); plugins.fireHook('filter:topic.build', {req: req, res: res, templateData: data}, function(err, data) { - if (err && process.env === 'development') { - winston.warn(JSON.stringify(err)); + if (err) { return next(err); } res.render('topic', data.templateData); From 6607dfc4c9947a4201813f8e71520b79b322e2ad Mon Sep 17 00:00:00 2001 From: acardinale Date: Wed, 18 Feb 2015 15:27:14 +0100 Subject: [PATCH 426/897] Update categories.js --- src/controllers/categories.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 7ea49453f5..64c5d8c61a 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -267,8 +267,7 @@ categoriesController.get = function(req, res, next) { }); plugins.fireHook('filter:category.build', {req: req, res: res, templateData: data}, function(err, data) { - if (err && process.env === 'development') { - winston.warn(JSON.stringify(err)); + if (err) { return next(err); } res.render('category', data.templateData); From a2f4cda7159c1fbbcabd35e50dbea3e4a11c5441 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 18 Feb 2015 13:26:13 -0700 Subject: [PATCH 427/897] Fixed sidebar positioning --- src/views/admin/advanced/logs.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/advanced/logs.tpl b/src/views/admin/advanced/logs.tpl index 24f91ce60b..9eda8fc383 100644 --- a/src/views/admin/advanced/logs.tpl +++ b/src/views/admin/advanced/logs.tpl @@ -8,7 +8,7 @@
    -
    +
    Logs Control Panel
    From 1ce0073cb6a40a499479fbe40e98cd949cd7b3e3 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 18 Feb 2015 13:30:06 -0700 Subject: [PATCH 428/897] Fixed events sidebar positioning --- src/views/admin/advanced/events.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index 7aec71b6f2..d5942f4225 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -21,7 +21,7 @@
    -
    +
    Events Control Panel
    From 502e806f88acefe4a7d85658771c0eadd53c6595 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 18 Feb 2015 15:33:21 -0500 Subject: [PATCH 429/897] fixed #2732 -- group creation now using language keys, and no longer succeeds if a group by the name of 'guest' is created. --- public/src/admin/manage/groups.js | 20 ++++++--------- public/src/utils.js | 5 ++++ src/groups.js | 41 +++++++++++++++++-------------- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index b2ae0c0afb..ed8cc59683 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -1,5 +1,5 @@ "use strict"; -/*global define, templates, socket, ajaxify, app, admin, bootbox*/ +/*global define, templates, socket, ajaxify, app, admin, bootbox, utils, config, translator */ define('admin/manage/groups', [ 'iconSelect', @@ -50,19 +50,13 @@ define('admin/manage/groups', [ socket.emit('admin.groups.create', submitObj, function(err) { if (err) { - switch (err) { - case 'group-exists': - errorText = 'Please choose another name

    There seems to be a group with this name already.

    '; - break; - case 'name-too-short': - errorText = 'Please specify a group name

    A group name is required for administrative purposes.

    '; - break; - default: - errorText = 'Uh-Oh

    There was a problem creating your group. Please try again later!

    '; - break; + if (err.hasOwnProperty('message') && utils.hasLanguageKey(err.message)) { + translator.translate(err.message, config.defaultLang, function(translated) { + createModalError.html(translated).removeClass('hide'); + }); + } else { + createModalError.html('Uh-Oh

    There was a problem creating your group. Please try again later!

    ').removeClass('hide'); } - - createModalError.html(errorText).removeClass('hide'); } else { createModalError.addClass('hide'); createGroupName.val(''); diff --git a/public/src/utils.js b/public/src/utils.js index 3b82573c9b..e0fef6151b 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -71,6 +71,7 @@ trimTrailingDash: /-$/g, trimLeadingDash: /^-/g, isLatin: /^[\w]+$/, + languageKeyRegex: /\[\[[\w]+:.+\]\]/, //http://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/ slugify: function(str) { @@ -108,6 +109,10 @@ return !isNaN(parseFloat(n)) && isFinite(n); }, + hasLanguageKey: function(input) { + return utils.languageKeyRegex.test(input); + }, + // shallow objects merge merge: function() { var result = {}, obj, keys; diff --git a/src/groups.js b/src/groups.js index f82e452b96..2c0015d75a 100644 --- a/src/groups.js +++ b/src/groups.js @@ -43,20 +43,14 @@ var async = require('async'), return groups; } }, - getEphemeralGroup: function(groupName, options, callback) { - Groups.exists(groupName, function(err, exists) { - if (!err && exists) { - Groups.get.apply(null, arguments); - } else { - callback(null, { - name: groupName, - description: '', - deleted: '0', - hidden: '0', - system: '1' - }); - } - }); + getEphemeralGroup: function(groupName) { + return { + name: groupName, + description: '', + deleted: '0', + hidden: '0', + system: '1' + }; }, removeEphemeralGroups: function(groups) { var x = groups.length; @@ -95,6 +89,9 @@ var async = require('async'), }; Groups.get = function(groupName, options, callback) { + if (!arguments[0]) { + console.log(new Error.stack); + } var truncated = false, numUsers; @@ -103,7 +100,7 @@ var async = require('async'), if (ephemeralGroups.indexOf(groupName) === -1) { db.getObject('group:' + groupName, next); } else { - internals.getEphemeralGroup(groupName, options, next); + next(null, internals.getEphemeralGroup(groupName)); } }, users: function (next) { @@ -400,6 +397,11 @@ var async = require('async'), return utils.slugify(groupName); }); async.parallel([ + function(next) { + callback(null, slugs.map(function(slug) { + return ephemeralGroups.indexOf(slug) !== -1; + })); + }, async.apply(db.isObjectFields, 'groupslug:groupname', slugs), async.apply(db.isSortedSetMembers, 'groups:createtime', name) ], function(err, results) { @@ -407,17 +409,20 @@ var async = require('async'), return callback(err); } - callback(null, results.map(function(pair) { - return pair[0] || pair[1]; + callback(null, results.map(function(result) { + return result[0] || result[1] || result[2]; })); }); } else { var slug = utils.slugify(name); async.parallel([ + function(next) { + next(null, ephemeralGroups.indexOf(slug) !== -1); + }, async.apply(db.isObjectField, 'groupslug:groupname', slug), async.apply(db.isSortedSetMember, 'groups:createtime', name) ], function(err, results) { - callback(err, !err ? (results[0] || results[1]) : null); + callback(err, !err ? (results[0] || results[1] || results[2]) : null); }); } }; From 6a69fcd4cd9e062d4365dbdeec802fa1ad7b19b4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 18 Feb 2015 15:41:44 -0500 Subject: [PATCH 430/897] fixes #2665 --- public/src/admin/appearance/skins.js | 3 ++- src/views/admin/partials/theme_list.tpl | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js index 8fd9208c7e..df21cb5b0a 100644 --- a/public/src/admin/appearance/skins.js +++ b/public/src/admin/appearance/skins.js @@ -58,7 +58,8 @@ define('admin/appearance/skins', function() { url: theme.preview, css: theme.cssCdn }; - }) + }), + showRevert: true }, function(html) { themeContainer.html(html); }); diff --git a/src/views/admin/partials/theme_list.tpl b/src/views/admin/partials/theme_list.tpl index 5eb085bce4..cc3d0243fb 100644 --- a/src/views/admin/partials/theme_list.tpl +++ b/src/views/admin/partials/theme_list.tpl @@ -16,10 +16,12 @@
    +

  • No Skin

    Remove applied skin and revert back to the base colours

    -
    • \ No newline at end of file + + \ No newline at end of file From 1337924afbc04f0b863d046900584d0ab1476fd5 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 18 Feb 2015 16:04:40 -0500 Subject: [PATCH 431/897] test commit - testing docgen --- tests/.jshintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/.jshintrc b/tests/.jshintrc index 3bc176b7f6..7658a260ad 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -6,4 +6,4 @@ "it": false, "describe": false } -} \ No newline at end of file +} From eb88d2fbd89dfb31350525a880d85315b3a21950 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 18 Feb 2015 16:19:23 -0500 Subject: [PATCH 432/897] testing docgen again --- tests/.jshintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/.jshintrc b/tests/.jshintrc index 7658a260ad..3bc176b7f6 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -6,4 +6,4 @@ "it": false, "describe": false } -} +} \ No newline at end of file From aa94dafac16810ab6763dc6271e8e79747adbd7a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Feb 2015 21:09:33 -0500 Subject: [PATCH 433/897] closes #725 --- package.json | 2 + public/language/en_GB/error.json | 2 +- public/src/modules/composer/uploads.js | 3 +- public/src/utils.js | 65 +++++++++++++------------- src/controllers/accounts.js | 34 ++++++-------- src/controllers/uploads.js | 63 +++++++++++++++---------- src/file.js | 43 ++++++++++++++++- src/views/admin/settings/post.tpl | 5 +- 8 files changed, 133 insertions(+), 84 deletions(-) diff --git a/package.json b/package.json index b6a70902e4..8561984d0d 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,9 @@ "heapdump": "^0.3.0", "less": "^2.0.0", "logrotate-stream": "^0.2.3", + "mime": "^1.3.4", "mkdirp": "~0.5.0", + "mmmagic": "^0.3.13", "morgan": "^1.3.2", "nconf": "~0.7.1", "nodebb-plugin-dbsearch": "^0.1.0", diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index bf4e7229fd..8c2fadce8d 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -64,6 +64,7 @@ "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", @@ -80,7 +81,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long" : "Sorry, your signature cannot be longer than %1 characters.", diff --git a/public/src/modules/composer/uploads.js b/public/src/modules/composer/uploads.js index e7bc473cb5..2a6833c604 100644 --- a/public/src/modules/composer/uploads.js +++ b/public/src/modules/composer/uploads.js @@ -316,8 +316,7 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf) function onUploadError(xhr) { xhr = maybeParse(xhr); - - app.alertError('[[error:upload-error, ' + xhr.responseText + ']]'); + app.alertError(xhr.responseText); } return uploads; diff --git a/public/src/utils.js b/public/src/utils.js index e0fef6151b..9c46e3fb6a 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -130,38 +130,39 @@ return ('' + path).split('.').pop(); }, - fileMimeType: (function () { - // we only care about images, for now - var map = { - "bmp": "image/bmp", - "cmx": "image/x-cmx", - "cod": "image/cis-cod", - "gif": "image/gif", - "ico": "image/x-icon", - "ief": "image/ief", - "jfif": "image/pipeg", - "jpe": "image/jpeg", - "jpeg": "image/jpeg", - "jpg": "image/jpeg", - "pbm": "image/x-portable-bitmap", - "pgm": "image/x-portable-graymap", - "pnm": "image/x-portable-anymap", - "ppm": "image/x-portable-pixmap", - "ras": "image/x-cmu-raster", - "rgb": "image/x-rgb", - "svg": "image/svg+xml", - "tif": "image/tiff", - "tiff": "image/tiff", - "xbm": "image/x-xbitmap", - "xpm": "image/x-xpixmap", - "xwd": "image/x-xwindowdump" - }; - - return function (path) { - var extension = utils.fileExtension(path); - return map[extension] || '*'; - }; - })(), + extensionMimeTypeMap: { + "bmp": "image/bmp", + "cmx": "image/x-cmx", + "cod": "image/cis-cod", + "gif": "image/gif", + "ico": "image/x-icon", + "ief": "image/ief", + "jfif": "image/pipeg", + "jpe": "image/jpeg", + "jpeg": "image/jpeg", + "jpg": "image/jpeg", + "png": "image/png", + "pbm": "image/x-portable-bitmap", + "pgm": "image/x-portable-graymap", + "pnm": "image/x-portable-anymap", + "ppm": "image/x-portable-pixmap", + "ras": "image/x-cmu-raster", + "rgb": "image/x-rgb", + "svg": "image/svg+xml", + "tif": "image/tiff", + "tiff": "image/tiff", + "xbm": "image/x-xbitmap", + "xpm": "image/x-xpixmap", + "xwd": "image/x-xwindowdump" + }, + + fileMimeType: function (path) { + utils.extensionToMimeType(utils.fileExtension(path)); + }, + + extensionToMimeType: function(extension) { + return utils.extensionMimeTypeMap[extension] || '*'; + }, isRelativeUrl: function(url) { var firstChar = url.slice(0, 1); diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 13055ca852..600c6a2347 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -376,33 +376,26 @@ accountsController.accountSettings = function(req, res, next) { accountsController.uploadPicture = function (req, res, next) { var userPhoto = req.files.files[0]; var uploadSize = parseInt(meta.config.maximumProfileImageSize, 10) || 256; - - if (userPhoto.size > uploadSize * 1024) { - fs.unlink(userPhoto.path); - return next(new Error('[[error:file-too-big, ' + uploadSize + ']]')); - } - - var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif']; - if (allowedTypes.indexOf(userPhoto.type) === -1) { - fs.unlink(userPhoto.path); - return next(new Error('[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]')); - } - var extension = path.extname(userPhoto.name); - if (!extension) { - fs.unlink(userPhoto.path); - return next(new Error('[[error:invalid-image-extension]]')); - } - var updateUid = req.user ? req.user.uid : 0; var imageDimension = parseInt(meta.config.profileImageDimension, 10) || 128; + var convertToPNG = parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1; async.waterfall([ + function(next) { + next(userPhoto.size > uploadSize * 1024 ? new Error('[[error:file-too-big, ' + uploadSize + ']]') : null); + }, + function(next) { + next(!extension ? new Error('[[error:invalid-image-extension]]') : null); + }, + function(next) { + file.isFileTypeAllowed(userPhoto.path, ['png', 'jpeg', 'jpg', 'gif'], next); + }, function(next) { image.resizeImage(userPhoto.path, extension, imageDimension, imageDimension, next); }, function(next) { - if (parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1) { + if (convertToPNG) { image.convertImageToPng(userPhoto.path, extension, next); } else { next(); @@ -412,7 +405,7 @@ accountsController.uploadPicture = function (req, res, next) { user.getUidByUserslug(req.params.userslug, next); }, function(uid, next) { - if(parseInt(updateUid, 10) === parseInt(uid, 10)) { + if (parseInt(updateUid, 10) === parseInt(uid, 10)) { return next(); } @@ -450,7 +443,6 @@ accountsController.uploadPicture = function (req, res, next) { return plugins.fireHook('filter:uploadImage', {image: userPhoto, uid: updateUid}, done); } - var convertToPNG = parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1; var filename = updateUid + '-profileimg' + (convertToPNG ? '.png' : extension); user.getUserField(updateUid, 'uploadedpicture', function (err, oldpicture) { @@ -524,7 +516,7 @@ accountsController.getChats = function(req, res, next) { if (!toUid || parseInt(toUid, 10) === parseInt(req.user.uid, 10)) { return helpers.notFound(req, res); } - + async.parallel({ toUser: async.apply(user.getUserFields, toUid, ['uid', 'username']), messages: async.apply(messaging.getMessages, req.user.uid, toUid, 'recent', false), diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js index b7e590b6bf..dc0db0591d 100644 --- a/src/controllers/uploads.js +++ b/src/controllers/uploads.js @@ -7,6 +7,7 @@ var uploadsController = {}, async = require('async'), meta = require('../meta'), + file = require('../file'), plugins = require('../plugins'), utils = require('../../public/src/utils'), image = require('../image'); @@ -42,12 +43,18 @@ uploadsController.upload = function(req, res, filesIterator, next) { }; uploadsController.uploadPost = function(req, res, next) { - uploadsController.upload(req, res, function(file, next) { - if (file.type.match(/image./)) { - uploadImage(req.user.uid, file, next); - } else { - uploadFile(req.user.uid, file, next); - } + uploadsController.upload(req, res, function(uploadedFile, next) { + file.isFileTypeAllowed(uploadedFile.path, file.allowedExtensions(), function(err) { + if (err) { + return next(err); + } + + if (uploadedFile.type.match(/image./)) { + uploadImage(req.user.uid, uploadedFile, next); + } else { + uploadFile(req.user.uid, uploadedFile, next); + } + }); }, next); }; @@ -57,18 +64,24 @@ uploadsController.uploadThumb = function(req, res, next) { return next(new Error('[[error:topic-thumbnails-are-disabled]]')); } - uploadsController.upload(req, res, function(file, next) { - if(file.type.match(/image./)) { - var size = meta.config.topicThumbSize || 120; - image.resizeImage(file.path, path.extname(file.name), size, size, function(err) { - if (err) { - return next(err); - } - uploadImage(req.user.uid, file, next); - }); - } else { - next(new Error('[[error:invalid-file]]')); - } + uploadsController.upload(req, res, function(uploadedFile, next) { + file.isFileTypeAllowed(uploadedFile.path, file.allowedExtensions(), function(err) { + if (err) { + return next(err); + } + + if (uploadedFile.type.match(/image./)) { + var size = meta.config.topicThumbSize || 120; + image.resizeImage(uploadedFile.path, path.extname(uploadedFile.name), size, size, function(err) { + if (err) { + return next(err); + } + uploadImage(req.user.uid, uploadedFile, next); + }); + } else { + next(new Error('[[error:invalid-file]]')); + } + }); }, next); }; @@ -88,32 +101,32 @@ function uploadImage(uid, image, callback) { } } -function uploadFile(uid, file, callback) { +function uploadFile(uid, uploadedFile, callback) { if (plugins.hasListeners('filter:uploadFile')) { - return plugins.fireHook('filter:uploadFile', {file: file, uid: uid}, callback); + return plugins.fireHook('filter:uploadFile', {file: uploadedFile, uid: uid}, callback); } if (parseInt(meta.config.allowFileUploads, 10) !== 1) { return callback(new Error('[[error:uploads-are-disabled]]')); } - if (!file) { + if (!uploadedFile) { return callback(new Error('[[error:invalid-file]]')); } - if (file.size > parseInt(meta.config.maximumFileSize, 10) * 1024) { + if (uploadedFile.size > parseInt(meta.config.maximumFileSize, 10) * 1024) { return callback(new Error('[[error:file-too-big, ' + meta.config.maximumFileSize + ']]')); } - var filename = 'upload-' + utils.generateUUID() + path.extname(file.name); - require('../file').saveFileToLocal(filename, 'files', file.path, function(err, upload) { + var filename = 'upload-' + utils.generateUUID() + path.extname(uploadedFile.name); + file.saveFileToLocal(filename, 'files', uploadedFile.path, function(err, upload) { if (err) { return callback(err); } callback(null, { url: upload.url, - name: file.name + name: uploadedFile.name }); }); } diff --git a/src/file.js b/src/file.js index 9433dfb40b..a3b594f326 100644 --- a/src/file.js +++ b/src/file.js @@ -3,7 +3,12 @@ var fs = require('fs'), nconf = require('nconf'), path = require('path'), - winston = require('winston'); + winston = require('winston'), + mmmagic = require('mmmagic'), + Magic = mmmagic.Magic, + mime = require('mime'), + + meta= require('./meta'); var file = {}; @@ -11,7 +16,7 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) { var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), folder, filename); - winston.info('Saving file '+ filename +' to : ' + uploadPath); + winston.verbose('Saving file '+ filename +' to : ' + uploadPath); var is = fs.createReadStream(tempPath); var os = fs.createWriteStream(uploadPath); @@ -30,4 +35,38 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) { is.pipe(os); }; +file.isFileTypeAllowed = function(path, allowedExtensions, callback) { + if (!Array.isArray(allowedExtensions) || !allowedExtensions.length) { + return callback(); + } + + allowedExtensions = allowedExtensions.filter(Boolean).map(function(extension) { + return extension.trim(); + }); + + var magic = new Magic(mmmagic.MAGIC_MIME_TYPE); + magic.detectFile(path, function(err, mimeType) { + if (err) { + return callback(err); + } + + var uploadedFileExtension = mime.extension(mimeType); + + if (allowedExtensions.indexOf(uploadedFileExtension) === -1) { + return callback(new Error('[[error:invalid-file-type, ' + allowedExtensions.join('-') + ']]')); + } + + callback(); + }); +}; + +file.allowedExtensions = function() { + var allowedExtensions = (meta.config.allowedFileExtensions || '').trim(); + if (!allowedExtensions) { + return []; + } + allowedExtensions = allowedExtensions.split(','); + return allowedExtensions; +}; + module.exports = file; \ No newline at end of file diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index 3cb55eac0e..98b99f3973 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -119,7 +119,10 @@ Allow users to upload topic thumbnails
    - Topic Thumb Size
    + Topic Thumb Size

    + + Allowed file types, (ie png, pdf, zip). Leave empty to allow all.

    +
    From 364ed641ddc2ad5a4806c8af6f1683966ed24b98 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Feb 2015 21:27:09 -0500 Subject: [PATCH 434/897] truncateUserList on search --- public/src/client/groups/list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index d0b4c69b50..2fe5caab95 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -47,6 +47,7 @@ define('forum/groups/list', function() { query: queryEl.val(), options: { expand: true, + truncateUserList: true, sort: sortEl.val() } }, function(err, groups) { From 268981f6dba5ed0f5951cd7e9721c507fc1174a0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 18 Feb 2015 23:00:29 -0500 Subject: [PATCH 435/897] latest translations --- public/language/de/groups.json | 2 +- public/language/fr/groups.json | 4 +- public/language/hu/pages.json | 2 +- public/language/hu/user.json | 6 +-- public/language/pl/email.json | 10 ++-- public/language/pl/error.json | 16 +++--- public/language/pl/global.json | 12 ++--- public/language/pl/groups.json | 30 +++++------ public/language/pl/pages.json | 2 +- public/language/pl/recent.json | 18 +++---- public/language/pl/reset_password.json | 4 +- public/language/pl/search.json | 64 +++++++++++------------ public/language/pl/topic.json | 4 +- public/language/pl/user.json | 10 ++-- public/language/pl/users.json | 8 +-- public/language/pt_BR/email.json | 6 +-- public/language/pt_BR/error.json | 2 +- public/language/pt_BR/groups.json | 4 +- public/language/pt_BR/pages.json | 2 +- public/language/pt_BR/reset_password.json | 4 +- public/language/pt_BR/search.json | 56 ++++++++++---------- public/language/pt_BR/users.json | 2 +- public/language/ru/groups.json | 6 +-- public/language/zh_CN/email.json | 10 ++-- public/language/zh_CN/error.json | 16 +++--- public/language/zh_CN/global.json | 12 ++--- public/language/zh_CN/groups.json | 30 +++++------ public/language/zh_CN/pages.json | 2 +- public/language/zh_CN/recent.json | 4 +- public/language/zh_CN/reset_password.json | 4 +- public/language/zh_CN/search.json | 64 +++++++++++------------ public/language/zh_CN/topic.json | 4 +- public/language/zh_CN/user.json | 10 ++-- public/language/zh_CN/users.json | 8 +-- 34 files changed, 219 insertions(+), 219 deletions(-) diff --git a/public/language/de/groups.json b/public/language/de/groups.json index 375e09d9b5..92b805dd6a 100644 --- a/public/language/de/groups.json +++ b/public/language/de/groups.json @@ -15,7 +15,7 @@ "details.latest_posts": "Aktuelle Beiträge", "details.private": "Private Gruppe", "details.public": "Öffentliche Gruppe", - "details.grant": "Grant/Rescind Ownership", + "details.grant": "Gewähre/Widerrufe Besitz", "details.kick": "Kick", "details.owner_options": "Gruppenadministration", "event.updated": "Gruppendetails wurden aktualisiert", diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json index d8c81570df..abbca27470 100644 --- a/public/language/fr/groups.json +++ b/public/language/fr/groups.json @@ -15,8 +15,8 @@ "details.latest_posts": "Derniers messages", "details.private": "Groupe Privé", "details.public": "Groupe Public", - "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", + "details.grant": "Accorder/Résilier Propriétaire", + "details.kick": "Retirer", "details.owner_options": "Administration du Groupe", "event.updated": "Les détails du groupe ont été mis à jour", "event.deleted": "Le groupe é%1\" a été supprimé" diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json index f8d1c20484..53b98e8562 100644 --- a/public/language/hu/pages.json +++ b/public/language/hu/pages.json @@ -11,7 +11,7 @@ "user.followers": "Tagok akik követik %1 -t", "user.posts": "Hozzászólások által %1", "user.topics": "%1 által létrehozott témák", - "user.groups": "%1's Groups", + "user.groups": "%1's csoport", "user.favourites": "%1 Kedvenc Hozzászólásai", "user.settings": "Felhasználói Beállítások", "maintenance.text": "%1 jelenleg karbantartás alatt van. Kérlek nézz vissza késöbb!", diff --git a/public/language/hu/user.json b/public/language/hu/user.json index c673eaee36..bacce74415 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -2,8 +2,8 @@ "banned": "Kitíltva", "offline": "Nem elérhető", "username": "Felhasználónév", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Regisztráció dátum", + "postcount": "Bejegyzés megtekintés", "email": "E-mail", "confirm_email": "E-mail megerősítése", "delete_account": "Fiók törlése", @@ -18,7 +18,7 @@ "profile_views": "Megtekintések", "reputation": "Hírnév", "favourites": "Kedvencek", - "watched": "Watched", + "watched": "Megtekintve", "followers": "Követők", "following": "Követve", "signature": "Aláírás", diff --git a/public/language/pl/email.json b/public/language/pl/email.json index d1f327d90a..da76caf73c 100644 --- a/public/language/pl/email.json +++ b/public/language/pl/email.json @@ -9,9 +9,9 @@ "reset.text1": "Otrzymaliśmy żądanie przywrócenia Twojego hasła. Jeśli nie żądałeś przywrócenia hasła, zignoruj ten e-mail.", "reset.text2": "Aby przywrócić swoje hasło, skorzystaj z poniższego linku:", "reset.cta": "Kliknij tu, by przywrócić swoje hasło", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", - "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "reset.notify.subject": "Hasło pomyślnie zmienione", + "reset.notify.text1": "Informujemy, że %1, twoje hasło zostało pomyślnie zmienione.", + "reset.notify.text2": "Jeśli nie wyraziłeś na to zgody, proszę niezwłocznie poinformuj administratora.", "digest.notifications": "Masz nowe powiadomienia od %1:", "digest.latest_topics": "Ostatnie tematy z %1", "digest.cta": "Kliknij, by odwiedzić %1", @@ -20,8 +20,8 @@ "notif.chat.subject": "Nowa wiadomość czatu od %1", "notif.chat.cta": "Kliknij tutaj, by kontynuować konwersację", "notif.chat.unsub.info": "To powiadomienie o czacie zostało Ci wysłane zgodnie z ustawieniami Twojego konta.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Kliknij tutaj, aby przeczytać cały wątek.", + "notif.post.unsub.info": "To powiadomienie o poście zostało Ci wysłane zgodnie z ustawieniami Twojego konta.", "test.text1": "To jest e-mail testowy, aby sprawdzić, czy poprawnie skonfigurowałeś e-mailer w swoim NodeBB.", "unsub.cta": "Kliknij tutaj, by zmienić te ustawienia", "closing": "Dziękujemy!" diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 119a9ca553..eaebbb6fcd 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -18,7 +18,7 @@ "username-taken": "Login zajęty.", "email-taken": "E-mail zajęty.", "email-not-confirmed": "Twój email nie został jeszcze potwierdzony. Proszę kliknąć tutaj by go potwierdzić.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Nie możesz rozmawiać do czasu, gdy twój email zostanie potwierdzony.", "username-too-short": "Nazwa użytkownika za krótka.", "username-too-long": "Zbyt długa nazwa użytkownika", "user-banned": "Użytkownik zbanowany", @@ -35,7 +35,7 @@ "topic-locked": "Temat zamknięty", "still-uploading": "Poczekaj na pełne załadowanie", "content-too-short": "Proszę wpisać dłuższy post. Posty powinny zawierać co najmniej %1 znaków.", - "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", + "content-too-long": "Proszę wpisać krótszy post. Posty nie mogą zawierać więcej niż %1 znaków.", "title-too-short": "Proszę podać dłuższy tytuł. Tytuły powinny zawierać co najmniej %1 znaków.", "title-too-long": "Wpisz krótszy tytuł, nie może być dłuższy niż %1 znaków.", "too-many-posts": "Możesz wysyłać posty co %1 sekund - proszę poczekać", @@ -45,13 +45,13 @@ "already-favourited": "Już polubiłeś ten post", "already-unfavourited": "Już przestałeś lubić ten post", "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "Błędny typ pliku. Dozwolone typy to: %1", + "invalid-image-extension": "Błędne rozszerzenie pliku", "group-name-too-short": "Nazwa grupy za krótka", "group-already-exists": "Grupa już istnieje", "group-name-change-not-allowed": "Nie można zmieniać nazwy tej grupy.", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Już należysz do tej grupy", + "group-needs-owner": "Ta grupa musi mieć przynajmniej jednego właściciela", "post-already-deleted": "Ten post został już skasowany", "post-already-restored": "Ten post został już przywrócony", "topic-already-deleted": "Ten temat został już skasowany", @@ -63,12 +63,12 @@ "signature-too-long": "Przepraszamy, ale podpis nie może być dłuższy niż %1 znaków.", "cant-chat-with-yourself": "Nie możesz rozmawiać ze sobą", "chat-restricted": "Ten użytkownik ograniczył swoje czaty. Musi Cię śledzić, zanim będziesz mógł z nim czatować.", - "too-many-messages": "You have sent too many messages, please wait awhile.", + "too-many-messages": "Wysłałeś zbyt wiele wiadomości, proszę poczekaj chwilę.", "reputation-system-disabled": "System reputacji został wyłączony", "downvoting-disabled": "Ocena postów jest wyłączona", "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post.", "not-enough-reputation-to-flag": "Nie masz dość reputacji, by flagować ten post", "reload-failed": "NodeBB napotkał problem w czasie ładowania \"%1\". Forum będzie nadal dostarczać zasoby dostępne w kliencie, jednak powinieneś cofnąć ostatnią akcję.", "registration-error": "Błąd rejestracji", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Coś poszło nie tak podczas parsingu odpowiedzi serwera" } \ No newline at end of file diff --git a/public/language/pl/global.json b/public/language/pl/global.json index a0c76caf7f..a12b45bcdf 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -3,10 +3,10 @@ "search": "Szukaj", "buttons.close": "Zamknij", "403.title": "Dostęp zabroniony", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Wygląda na to, że trafiłeś na stronę, do której nie masz dostępu.", + "403.login": "Może powinieneś się zalogować?", "404.title": "Nie znaleziono", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Wygląda na to, że trafiłeś na stronę, która nie istnieje. Wróć do strony głównej.", "500.title": "Błąd wewnętrzny", "500.message": "Ups! Coś poszło nie tak.", "register": "Zarejestruj się", @@ -27,7 +27,7 @@ "header.tags": "Tagi", "header.popular": "Popularne", "header.users": "Użytkownicy", - "header.groups": "Groups", + "header.groups": "Grupy", "header.chats": "Rozmowy", "header.notifications": "Powiadomienia", "header.search": "Szukaj", @@ -75,7 +75,7 @@ "updated.title": "Forum zaktualizowane", "updated.message": "To forum zostało zaktualizowane do najnowszej wersji. Kliknij tutaj by odświeżyć stronę", "privacy": "Prywatność", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "Obserwuj", + "unfollow": "Przestań śledzić", "delete_all": "Usuń wszystko" } \ No newline at end of file diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json index 0cd285b938..ca279d4b90 100644 --- a/public/language/pl/groups.json +++ b/public/language/pl/groups.json @@ -1,23 +1,23 @@ { "groups": "Grupy", "view_group": "Obejrzyj grupę", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "Właściciel grupy", + "new_group": "Stwórz nową grupę", + "no_groups_found": "Brak grup do wyświetlenia", + "cover-instructions": "Przeciągnij i upuść zdjęcie, ustaw w odpowiedniej pozycji i kliknij Zapisz", + "cover-change": "Zmień", + "cover-save": "Zapisz", + "cover-saving": "Zapisuję", "details.title": "Szczegóły grupy", "details.members": "Lista członków", - "details.pending": "Pending Members", + "details.pending": "Członkowie oczekujący", "details.has_no_posts": "Członkowie tej grupy nie napisali żadnych postów.", "details.latest_posts": "Ostatnie posty", - "details.private": "Private Group", - "details.public": "Public Group", - "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "Grupa prywatna", + "details.public": "Grupa publiczna", + "details.grant": "Nadaj/Cofnij prawa Właściciela", + "details.kick": "Wykop", + "details.owner_options": "Administracja grupy", + "event.updated": "Dane grupy zostały zaktualizowane", + "event.deleted": "Grupa \"%1\" została skasowana" } \ No newline at end of file diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json index 4aad8f6c6d..7f71ba388a 100644 --- a/public/language/pl/pages.json +++ b/public/language/pl/pages.json @@ -11,7 +11,7 @@ "user.followers": "Obserwujący %1", "user.posts": "Posty napisane przez %1", "user.topics": "Wątki stworzone przez %1", - "user.groups": "%1's Groups", + "user.groups": "Grupy %1", "user.favourites": "Ulubione posty %1", "user.settings": "Ustawienia użytkownika", "maintenance.text": "Obecnie trwają prace konserwacyjne nad %1. Proszę wrócić później.", diff --git a/public/language/pl/recent.json b/public/language/pl/recent.json index 382c9d8095..3a5ed0fa33 100644 --- a/public/language/pl/recent.json +++ b/public/language/pl/recent.json @@ -6,13 +6,13 @@ "year": "Rok", "alltime": "Od początku", "no_recent_topics": "Brak ostatnich wątków.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "Masz nowy wątek.", + "there-is-a-new-topic-and-a-new-post": "Masz nowy wątek i nowy post.", + "there-is-a-new-topic-and-new-posts": "Masz nowy wątek i %1 nowych postów.", + "there-are-new-topics": "Masz %1 nowych wątków.", + "there-are-new-topics-and-a-new-post": "Masz %1 nowych wątków i nowy post.", + "there-are-new-topics-and-new-posts": "Masz %1 nowych wątków i %2 nowych postów.", + "there-is-a-new-post": "Masz nowy post.", + "there-are-new-posts": "Masz %1 nowych postów.", + "click-here-to-reload": "Kliknij tutaj, aby przeładować." } \ No newline at end of file diff --git a/public/language/pl/reset_password.json b/public/language/pl/reset_password.json index 99b7518a97..57b58f35e3 100644 --- a/public/language/pl/reset_password.json +++ b/public/language/pl/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "Wpisz swój adres e-mail", "password_reset_sent": "Instrukcje zostały wysłane", "invalid_email": "Niepoprawny adres e-mail.", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "Wprowadzone hasło jest zbyt krótkie, proszę wybierz inne hasło.", + "passwords_do_not_match": "Wprowadzone hasła nie pasują do siebie" } \ No newline at end of file diff --git a/public/language/pl/search.json b/public/language/pl/search.json index c8775e8c66..6f2afda91d 100644 --- a/public/language/pl/search.json +++ b/public/language/pl/search.json @@ -1,35 +1,35 @@ { "results_matching": "%1 wyników pasujących do \"%2\", (%3 sekund)", - "no-matches": "No matches found", - "in": "In", - "by": "By", - "titles": "Titles", - "titles-posts": "Titles and Posts", - "posted-by": "Posted by", - "in-categories": "In Categories", - "search-child-categories": "Search child categories", - "reply-count": "Reply Count", - "at-least": "At least", - "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", - "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", - "descending": "In descending order", - "ascending": "In ascending order" + "no-matches": "Nie znaleziono pasujących wyników", + "in": "W", + "by": "Przez", + "titles": "Tytuły", + "titles-posts": "Tytuły i posty", + "posted-by": "Napisane przez", + "in-categories": "W kategoriach", + "search-child-categories": "Przeszukaj podkategorie", + "reply-count": "Ilość odpowiedzi", + "at-least": "Przynajmniej", + "at-most": "Co najwyżej", + "post-time": "Napisano", + "newer-than": "Nowsze niż", + "older-than": "Starsze niż", + "any-date": "Kiedykolwiek", + "yesterday": "Wczoraj", + "one-week": "Jeden tydzień", + "two-weeks": "Dwa tygodnie", + "one-month": "Jeden miesiąc", + "three-months": "Trzy miesiące", + "six-months": "Sześć miesięcy", + "one-year": "Jeden rok", + "sort-by": "Sortuj po", + "last-reply-time": "Odpowiedziano ostatnio", + "topic-title": "Tytuł wątku", + "number-of-replies": "Ilość odpowiedzi", + "number-of-views": "Ilość wyświetleń", + "topic-start-date": "Data utworzenia wątku", + "username": "Nazwa użytkownika", + "category": "Kategoria", + "descending": "W kolejności malejącej", + "ascending": "W kolejności rosnącej" } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index e5d3a154ae..354da37ef3 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -74,7 +74,7 @@ "fork_no_pids": "Nie zaznaczyłeś żadnych postów!", "fork_success": "Udało się skopiować wątek. Kliknij tutaj, aby do niego przejść.", "composer.title_placeholder": "Wpisz tytuł wątku tutaj", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Nazwa", "composer.discard": "Odrzuć", "composer.submit": "Wyślij", "composer.replying_to": "Odpowiadanie na %1", @@ -94,5 +94,5 @@ "oldest_to_newest": "Najpierw najstarsze", "newest_to_oldest": "Najpierw najnowsze", "most_votes": "Najwięcej głosów", - "most_posts": "Most posts" + "most_posts": "Najwięcej postów" } \ No newline at end of file diff --git a/public/language/pl/user.json b/public/language/pl/user.json index b031c36d5a..e28e3f637f 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -2,8 +2,8 @@ "banned": "Zbanowany", "offline": "Offline", "username": "Nazwa użytkownika", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Data rejestracji", + "postcount": "Liczba postów", "email": "Adres e-mail", "confirm_email": "Potwierdź e-mail", "delete_account": "Skasuj konto", @@ -18,7 +18,7 @@ "profile_views": "wyświetleń", "reputation": "reputacji", "favourites": "Ulubione", - "watched": "Watched", + "watched": "Obserwowane", "followers": "Obserwujących", "following": "Obserwowanych", "signature": "Sygnatura", @@ -59,12 +59,12 @@ "digest_weekly": "Co tydzień", "digest_monthly": "Co miesiąc", "send_chat_notifications": "Wyślij e-maila, jeśli dostanę nową wiadomość, a nie jestem on-line", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "Wyślij e-maila, kiedy wątki, które subskrybuję otrzymają odpowiedź", "has_no_follower": "Ten użytkownik nie ma jeszcze żadnych obserwujących", "follows_no_one": "Użytkownik jeszcze nikogo nie obsweruje.", "has_no_posts": "Użytkownik nie napisał jeszcze żadnych postów.", "has_no_topics": "Ten użytkownik nie napisał jeszcze żadnego wątku.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Ten użytkownik nie obserwował jeszcze żadnego wątku.", "email_hidden": "Adres e-mail ukryty", "hidden": "ukryty", "paginate_description": "Użyj klasycznego trybu paginacji zamiast nieskończonego przewijania.", diff --git a/public/language/pl/users.json b/public/language/pl/users.json index 2df9600a30..b41b99309a 100644 --- a/public/language/pl/users.json +++ b/public/language/pl/users.json @@ -5,8 +5,8 @@ "search": "Szukaj", "enter_username": "Wpisz nazwę użytkownika", "load_more": "Więcej", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "users-found-search-took": "Znaleziono %1 użytkownik(ów). Szukanie zajęło %2 sek.", + "filter-by": "Filtruj", + "online-only": "Tylko dostępny", + "picture-only": "Tylko ze zdjęciem" } \ No newline at end of file diff --git a/public/language/pt_BR/email.json b/public/language/pt_BR/email.json index 250bf39788..cca995c0a5 100644 --- a/public/language/pt_BR/email.json +++ b/public/language/pt_BR/email.json @@ -9,9 +9,9 @@ "reset.text1": "Nós recebemos um pedido para reconfigurar sua senha, possivelmente porque você a esqueceu. Se este não é o caso, por favor ignore este email.", "reset.text2": "Para continuar com a reconfiguração de senha, por favor clique no seguinte link:", "reset.cta": "Clique aqui para reconfigurar sua senha", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", - "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "reset.notify.subject": "Senha alterada com sucesso", + "reset.notify.text1": "Nós estamos notificando você que em %1, sua senha foi alterada com sucesso.", + "reset.notify.text2": "Se você não autorizou isso, por favor notifique um administrador imediatamente.", "digest.notifications": "Você tem notificações não lidas de %1:", "digest.latest_topics": "Últimos tópicos de %1", "digest.cta": "Clique aqui para visitar %1", diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index 51d9f13502..e0ad9b1e67 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -35,7 +35,7 @@ "topic-locked": "Tópico Trancado", "still-uploading": "Aguarde a conclusão dos uploads.", "content-too-short": "Por favor digite um post mais longo. Posts devem conter no mínimo %1 caracteres.", - "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", + "content-too-long": "Por favor entre com um post mais curto. Posts não podem ser maiores do que %1 caracteres.", "title-too-short": "Por favor digite um título mais longo. Títulos devem conter no mínimo %1 caracteres.", "title-too-long": "Por favor entre com um título mais curto; Títulos não podem ser maiores que %1 caracteres.", "too-many-posts": "Você pode postar apenas uma vez a cada %1 segundos - por favor aguarde antes de postar novamente", diff --git a/public/language/pt_BR/groups.json b/public/language/pt_BR/groups.json index 4095f4c3ce..f3a19ea8ef 100644 --- a/public/language/pt_BR/groups.json +++ b/public/language/pt_BR/groups.json @@ -15,8 +15,8 @@ "details.latest_posts": "Últimos Posts", "details.private": "Grupo Privado", "details.public": "Grupo Público.", - "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", + "details.grant": "Conceder/Retomar a Posse", + "details.kick": "Chutar", "details.owner_options": "Administração do Grupo", "event.updated": "Os detalhes do grupo foram atualizados", "event.deleted": "O grupo \"%1\" foi deletado" diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json index ae42c35f0f..415f50c0fd 100644 --- a/public/language/pt_BR/pages.json +++ b/public/language/pt_BR/pages.json @@ -11,7 +11,7 @@ "user.followers": "Pessoas que Seguem %1", "user.posts": "Posts feitos por %1", "user.topics": "Tópicos criados por %1", - "user.groups": "%1's Groups", + "user.groups": "%1's Grupos", "user.favourites": "Posts Favoritos de %1", "user.settings": "Configurações de Usuário", "maintenance.text": "%1 está atualmente sob manutenção. Por favor retorne em outro momento.", diff --git a/public/language/pt_BR/reset_password.json b/public/language/pt_BR/reset_password.json index bf96416678..3aa6f341b4 100644 --- a/public/language/pt_BR/reset_password.json +++ b/public/language/pt_BR/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "Digite seu Email", "password_reset_sent": "Reconfiguração de Senha Enviada", "invalid_email": "Email Inválido / Email não existe!", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "A senha entrada é muito curta, por favor escolha uma senha diferente.", + "passwords_do_not_match": "As duas senhas que você digitou não combinam." } \ No newline at end of file diff --git a/public/language/pt_BR/search.json b/public/language/pt_BR/search.json index 9f10c0970b..f1b47b737e 100644 --- a/public/language/pt_BR/search.json +++ b/public/language/pt_BR/search.json @@ -3,33 +3,33 @@ "no-matches": "Nenhum resultado encontrado", "in": "Em", "by": "Por", - "titles": "Titles", - "titles-posts": "Titles and Posts", + "titles": "Títulos", + "titles-posts": "Títulos e Posts", "posted-by": "Postado por", - "in-categories": "In Categories", - "search-child-categories": "Search child categories", - "reply-count": "Reply Count", - "at-least": "At least", - "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", - "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", - "descending": "In descending order", - "ascending": "In ascending order" + "in-categories": "Nas Categorias", + "search-child-categories": "Buscar categorias filhas", + "reply-count": "Contagem de Respostas", + "at-least": "No mínimo", + "at-most": "No máximo", + "post-time": "Hora da Postagem", + "newer-than": "Mais novo que", + "older-than": "Mais velho que", + "any-date": "Qualquer data", + "yesterday": "Ontem", + "one-week": "Uma semana", + "two-weeks": "Duas semanas", + "one-month": "Um mês", + "three-months": "Três meses", + "six-months": "Seis meses", + "one-year": "Um ano", + "sort-by": "Ordenar por", + "last-reply-time": "Tempo da última resposta", + "topic-title": "Título do tópico", + "number-of-replies": "Número de respostas", + "number-of-views": "Número de visualizações", + "topic-start-date": "Data do início do tópico", + "username": "Nome de usuário", + "category": "Categoria", + "descending": "Em ordem descendente", + "ascending": "Em ordem ascendente" } \ No newline at end of file diff --git a/public/language/pt_BR/users.json b/public/language/pt_BR/users.json index 32edc568f5..cc49b0fe57 100644 --- a/public/language/pt_BR/users.json +++ b/public/language/pt_BR/users.json @@ -5,7 +5,7 @@ "search": "Procurar", "enter_username": "Digite um nome de usuário para procurar", "load_more": "Carregar Mais", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", + "users-found-search-took": "%1 usuário(s) encontrado(s)! A busca levou %2 segundos.", "filter-by": "Filtrar Por", "online-only": "Apenas Online", "picture-only": "Apenas foto" diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json index 4b86076056..20a4c0b01c 100644 --- a/public/language/ru/groups.json +++ b/public/language/ru/groups.json @@ -1,7 +1,7 @@ { "groups": "Группы", "view_group": "Просмотр группы", - "owner": "Владелец группы", + "owner": "Администратор группы", "new_group": "Создать группу", "no_groups_found": "There are no groups to see", "cover-instructions": "Перетяните сюда изображение, переместите на нужную позицию и нажмите Сохранить", @@ -15,8 +15,8 @@ "details.latest_posts": "Последние записи", "details.private": "Приватная группа", "details.public": "Открытая группа", - "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", + "details.grant": "Выдать/забрать администратора", + "details.kick": "Исключить", "details.owner_options": "Настройки группы", "event.updated": "Настройки группы обновлены", "event.deleted": "Группа \"%1\" удалена" diff --git a/public/language/zh_CN/email.json b/public/language/zh_CN/email.json index e81b810a9a..9f0316ce3b 100644 --- a/public/language/zh_CN/email.json +++ b/public/language/zh_CN/email.json @@ -9,9 +9,9 @@ "reset.text1": "我们收到了重置您帐户密码的申请，可能是因为您遗忘了密码。如果不是，请忽略这封邮件。", "reset.text2": "如需继续重置密码，请点击下面的链接：", "reset.cta": "点击这里重置您的密码", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", - "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "reset.notify.subject": "更改密码成功", + "reset.notify.text1": "我们注意到你在 %1 上，成功修改了你的密码。", + "reset.notify.text2": "如果你没有授权此操作，请立即联系管理员。", "digest.notifications": "您有来自 %1 的未读通知：", "digest.latest_topics": "来自 %1 的最新主题", "digest.cta": "点击这里访问 %1", @@ -20,8 +20,8 @@ "notif.chat.subject": "收到来自 %1 的新聊天消息", "notif.chat.cta": "点击这里恢复会话", "notif.chat.unsub.info": "根据您的订阅设置，为您发送此聊天提醒。", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "点击这里阅读全主题。", + "notif.post.unsub.info": "根据您的订阅设置，为您发送此回帖提醒。", "test.text1": "这是一封测试邮件，用来验证 NodeBB 的邮件配置是否设置正确。", "unsub.cta": "点击这里修改这些设置", "closing": "谢谢！" diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index cfcb33aee8..2511027169 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -18,7 +18,7 @@ "username-taken": "用户名已被占用", "email-taken": "电子邮箱已被占用", "email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "在确认您的邮箱之前，您不能使用聊天功能", "username-too-short": "用户名太短", "username-too-long": "用户名太长", "user-banned": "用户已禁止", @@ -35,7 +35,7 @@ "topic-locked": "主题已锁定", "still-uploading": "请等待上传完成", "content-too-short": "请再输入一些内容，帖子至少要有 %1 个字符。", - "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", + "content-too-long": "请输入更短的发帖。发帖字数不能超过 %1 个字符。", "title-too-short": "请再输入一些内容，标题至少要有 %1 个字符。", "title-too-long": "请输入更短的标题。不超过 %1 字。", "too-many-posts": "发帖间隔至少要 %1 秒 - 请稍候再发帖", @@ -45,13 +45,13 @@ "already-favourited": "您已收藏该帖", "already-unfavourited": "您已取消收藏此帖", "cant-ban-other-admins": "您不能禁止其他管理员！", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "无效的图像类型。允许的类型有：%1", + "invalid-image-extension": "无效的图像扩展", "group-name-too-short": "用户组名称太短", "group-already-exists": "用户组已存在", "group-name-change-not-allowed": "不允许更改用户组名称", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "您已是此小组成员", + "group-needs-owner": "此小组需要至少一名组长", "post-already-deleted": "此帖子已被删除", "post-already-restored": "此帖已经恢复", "topic-already-deleted": "此主题已被删除", @@ -63,12 +63,12 @@ "signature-too-long": "抱歉，您的签名不能超过 %1 个字符。", "cant-chat-with-yourself": "您不能和自己聊天！", "chat-restricted": "此用户限制了他的聊天消息。必须他先关注您，您才能和他聊天。", - "too-many-messages": "You have sent too many messages, please wait awhile.", + "too-many-messages": "您发送了太多消息，请稍等片刻。", "reputation-system-disabled": "威望系统已禁用。", "downvoting-disabled": "反对功能已禁用", "not-enough-reputation-to-downvote": "您还没有足够的威望为此帖扣分", "not-enough-reputation-to-flag": "您没有足够的威望标记此帖", "reload-failed": "NodeBB 重新加载时遇到问题: \"%1\"。NodeBB 会继续给已存在的客户端组件服务，虽然您应该撤销在重新加载前执行的操作。", "registration-error": "注册错误", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "解析服务器响应时出错" } \ No newline at end of file diff --git a/public/language/zh_CN/global.json b/public/language/zh_CN/global.json index d8b6b8ea01..ede930cbbf 100644 --- a/public/language/zh_CN/global.json +++ b/public/language/zh_CN/global.json @@ -3,10 +3,10 @@ "search": "搜索", "buttons.close": "关闭", "403.title": "禁止访问", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "您遇到了没有权限访问的页面。", + "403.login": "或许您应该 试试登入?", "404.title": "未找到", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "您遇到了不存在的页面。返回首页。", "500.title": "内部错误。", "500.message": "哎呀！看来是哪里出错了！", "register": "注册", @@ -27,7 +27,7 @@ "header.tags": "话题", "header.popular": "热门", "header.users": "会员", - "header.groups": "Groups", + "header.groups": "小组", "header.chats": "聊天", "header.notifications": "通知", "header.search": "搜索", @@ -75,7 +75,7 @@ "updated.title": "论坛已更新", "updated.message": "论坛已更新到最新版本。点这里刷新页面。", "privacy": "隐私", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "关注", + "unfollow": "取消关注", "delete_all": "全部删除" } \ No newline at end of file diff --git a/public/language/zh_CN/groups.json b/public/language/zh_CN/groups.json index 5a4bdd5b1f..bd0abbbf67 100644 --- a/public/language/zh_CN/groups.json +++ b/public/language/zh_CN/groups.json @@ -1,23 +1,23 @@ { "groups": "用户组", "view_group": "查看用户组", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "用户组组长", + "new_group": "创建新用户组", + "no_groups_found": "还没有用户组", + "cover-instructions": "拖放照片，拖动位置，然后点击 保存", + "cover-change": "变更", + "cover-save": "保存", + "cover-saving": "正在保存", "details.title": "用户组详情", "details.members": "会员列表", - "details.pending": "Pending Members", + "details.pending": "预备成员", "details.has_no_posts": "此用户组的会员尚未发表任何帖子。", "details.latest_posts": "最新帖子", - "details.private": "Private Group", - "details.public": "Public Group", - "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "私有组", + "details.public": "公共组", + "details.grant": "授予/取消所有权", + "details.kick": "踢", + "details.owner_options": "用户组管理", + "event.updated": "用户组信息已更新", + "event.deleted": "用户组 \"%1\" 已被删除" } \ No newline at end of file diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json index 36d10c1cb3..6fde75dfe5 100644 --- a/public/language/zh_CN/pages.json +++ b/public/language/zh_CN/pages.json @@ -11,7 +11,7 @@ "user.followers": "关注 %1 的人", "user.posts": "%1 发布的帖子", "user.topics": "%1 创建的主题", - "user.groups": "%1's Groups", + "user.groups": "%1 的用户组", "user.favourites": "%1 收藏的帖子", "user.settings": "用户设置", "maintenance.text": "%1 正在进行维护。请稍后再来。", diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json index d3fea3da46..8aa1e96ab2 100644 --- a/public/language/zh_CN/recent.json +++ b/public/language/zh_CN/recent.json @@ -6,7 +6,7 @@ "year": "年度热帖榜", "alltime": "总热帖榜", "no_recent_topics": "暂无主题。", - "there-is-a-new-topic": "There is a new topic.", + "there-is-a-new-topic": "这是个新主题。", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", "there-are-new-topics": "There are %1 new topics.", @@ -14,5 +14,5 @@ "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", "there-is-a-new-post": "There is a new post.", "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "click-here-to-reload": "点击这里重新加载" } \ 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 ca294f9dc7..9b0ca29dbe 100644 --- a/public/language/zh_CN/reset_password.json +++ b/public/language/zh_CN/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "输入邮箱地址", "password_reset_sent": "密码重置邮件已发送。", "invalid_email": "无效的电子邮箱/电子邮箱不存在！", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "密码太短，请选择其他密码。", + "passwords_do_not_match": "您输入两个密码不一致。" } \ No newline at end of file diff --git a/public/language/zh_CN/search.json b/public/language/zh_CN/search.json index 25cc3605e5..1b1096b667 100644 --- a/public/language/zh_CN/search.json +++ b/public/language/zh_CN/search.json @@ -1,35 +1,35 @@ { "results_matching": "共 %1 条结果匹配 \"%2\"，(耗时 %3 秒)", - "no-matches": "No matches found", - "in": "In", - "by": "By", - "titles": "Titles", - "titles-posts": "Titles and Posts", - "posted-by": "Posted by", - "in-categories": "In Categories", - "search-child-categories": "Search child categories", - "reply-count": "Reply Count", - "at-least": "At least", - "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", - "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", - "descending": "In descending order", - "ascending": "In ascending order" + "no-matches": "无匹配结果", + "in": "在", + "by": "-", + "titles": "标题", + "titles-posts": "标题和回帖", + "posted-by": "发表", + "in-categories": "在版面", + "search-child-categories": "搜索子版面", + "reply-count": "回复数", + "at-least": "至少", + "at-most": "至多", + "post-time": "发帖时间", + "newer-than": "晚于", + "older-than": "早于", + "any-date": "任何日期", + "yesterday": "昨天", + "one-week": "一周", + "two-weeks": "两周", + "one-month": "一个月", + "three-months": "三个月", + "six-months": "六个月", + "one-year": "一年", + "sort-by": "排序", + "last-reply-time": "最后回复时间", + "topic-title": "主题标题", + "number-of-replies": "回帖数", + "number-of-views": "查看数", + "topic-start-date": "主题开始日期", + "username": "用户名", + "category": "版面", + "descending": "逆序", + "ascending": "顺序" } \ No newline at end of file diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json index 8dc93ec5f5..0cd68a3250 100644 --- a/public/language/zh_CN/topic.json +++ b/public/language/zh_CN/topic.json @@ -74,7 +74,7 @@ "fork_no_pids": "未选中帖子！", "fork_success": "成功分割主题! 点这里跳转到分割后的主题。", "composer.title_placeholder": "在此输入您主题的标题...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "姓名", "composer.discard": "撤销", "composer.submit": "提交", "composer.replying_to": "正在回复 %1", @@ -94,5 +94,5 @@ "oldest_to_newest": "从旧到新", "newest_to_oldest": "从新到旧", "most_votes": "最多投票", - "most_posts": "Most posts" + "most_posts": "最多发表" } \ No newline at end of file diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json index 9379b69e38..6c360a4d4e 100644 --- a/public/language/zh_CN/user.json +++ b/public/language/zh_CN/user.json @@ -2,8 +2,8 @@ "banned": "禁止", "offline": "离线", "username": "用户名", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "注册日期", + "postcount": "发帖数", "email": "电子邮件", "confirm_email": "确认电子邮箱", "delete_account": "删除帐号", @@ -18,7 +18,7 @@ "profile_views": "资料浏览", "reputation": "威望", "favourites": "收藏的帖子", - "watched": "Watched", + "watched": "已订阅", "followers": "粉丝", "following": "关注", "signature": "签名档", @@ -59,12 +59,12 @@ "digest_weekly": "每周", "digest_monthly": "每月", "send_chat_notifications": "当我不在线，并受到新的聊天消息时给我发邮件", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "我订阅的主题有回复时发送邮件", "has_no_follower": "此用户还没有粉丝 :(", "follows_no_one": "此用户尚未关注任何人 :(", "has_no_posts": "此用户尚未发布任何帖子。", "has_no_topics": "此用户还未发布任何主题。", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "此用户还未订阅任何主题", "email_hidden": "电子邮箱已隐藏", "hidden": "隐藏", "paginate_description": "分页展示主题和帖子，替代滚动展示。", diff --git a/public/language/zh_CN/users.json b/public/language/zh_CN/users.json index f56a4fb88e..ef7d6dd15b 100644 --- a/public/language/zh_CN/users.json +++ b/public/language/zh_CN/users.json @@ -5,8 +5,8 @@ "search": "搜索", "enter_username": "输入用户名搜索", "load_more": "加载更多", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "users-found-search-took": "找到 %1 位用户！搜索耗时 %2 毫秒。", + "filter-by": "过滤选项", + "online-only": "只看在线", + "picture-only": "只看图片" } \ No newline at end of file From 145f7b3809063524bbbb3450f950980e8ac937fb Mon Sep 17 00:00:00 2001 From: yariplus Date: Thu, 19 Feb 2015 06:31:06 -0500 Subject: [PATCH 436/897] Fix #2684 ACP navbar on mobile. --- public/less/admin/admin.less | 69 +++++++++++++++++++------------ src/views/admin/header.tpl | 79 ++++++++++++++++++++---------------- 2 files changed, 86 insertions(+), 62 deletions(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index ee9a87b605..36626df136 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -183,15 +183,18 @@ .box-header-font } - #user_dropdown { - padding: 6px; - - img { - width: 30px; - height: 30px; - vertical-align: -88%; - margin-right: 5px; - } + #user_label { + a { + padding-top: 13px; + padding-bottom: 13px; + + img { + width: 24px; + height: 24px; + border-radius: 50%; + border: 1px solid #454; + } + } } .icon-container { @@ -213,24 +216,36 @@ } } - .navbar { - padding: 0 5px; - - .nav-home a, .nav-home a:hover { - width: 30px; - height: 30px; - padding: 5px; - text-align: center; - margin-top: 10px; - background: #DDD; - - i { - color: black; - font-size: 17px; - } - } - - } + .navbar-static-top, .navbar-fixed-top { + box-shadow: 0px -3px 12px rgba(0, 0, 0, 0.5); + } + + .navbar-header > .navbar-toggle { + margin-right: 8px; + } + + .navbar-nav { + margin-top: 0; + margin-bottom: 0; + + >li { + >a { + padding-top: 15px; + padding-bottom: 15px; + } + >a:hover, >a:focus { + color:#333; + background-color:#b2cdf0 + } + >#reconnect { + color: #afb1b1; + } + >#reconnect:focus, >#reconnect:hover { + color: #afb1b1; + background-color: transparent; + } + } + } #acp-search { input { diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 9bd680936a..7a5d658eb2 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -56,46 +56,55 @@ -
    +
    +
    + +
    + + +
    From bdcf090aaaf9635f97c6aab2ea6a19c72ab36bb1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 14:20:13 -0500 Subject: [PATCH 442/897] init rewards system --- src/controllers/admin.js | 9 ++++++ src/rewards/admin.js | 50 ++++++++++++++++++++++++++++++ src/rewards/index.js | 7 +++++ src/routes/admin.js | 1 + src/views/admin/extend/rewards.tpl | 27 ++++++++++++++++ src/views/admin/partials/menu.tpl | 1 + 6 files changed, 95 insertions(+) create mode 100644 src/rewards/admin.js create mode 100644 src/rewards/index.js create mode 100644 src/views/admin/extend/rewards.tpl diff --git a/src/controllers/admin.js b/src/controllers/admin.js index f03b7fdb88..b5123da2e8 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -304,6 +304,15 @@ adminController.extend.widgets = function(req, res, next) { }); }; +adminController.extend.rewards = function(req, res, next) { + require('../rewards/admin').get(function(err, data) { + if (err) { + return next(err); + } + + res.render('admin/extend/rewards', data); + }); +}; adminController.groups.get = function(req, res, next) { groups.list({ diff --git a/src/rewards/admin.js b/src/rewards/admin.js new file mode 100644 index 0000000000..b2864fbbd7 --- /dev/null +++ b/src/rewards/admin.js @@ -0,0 +1,50 @@ +"use strict"; + +var rewards = {}; + + +rewards.get = function(callback) { + callback({ + conditions: ["Reputation", "Post Count", "Last Logged in Time"], + conditionals: [">", ">=", "<", "<=", "is string:"], + rewards: [ + { + "rewardID": 0, + "name": "Add to Group", + "inputs": [ + { + "type": "select", + "name": "groupname", + "values": ["Group 1", "Group 2", "Group 3"], + } + ], + "disabled": 0 + }, + { + "rewardID": 0, + "name": "Send alert message", + "inputs": [ + { + "type": "text", + "name": "title", + }, + { + "type": "text", + "name": "message", + } + ], + "disabled": 0 + } + ] + }) +}; + +function getConditions() { + +} + +function getRewards() { + +} + +module.exports = rewards; \ No newline at end of file diff --git a/src/rewards/index.js b/src/rewards/index.js new file mode 100644 index 0000000000..ba68fae92c --- /dev/null +++ b/src/rewards/index.js @@ -0,0 +1,7 @@ +"use strict"; + +var rewards = {}; + + + +module.exports = rewards; \ No newline at end of file diff --git a/src/routes/admin.js b/src/routes/admin.js index 1b9efcef58..5175059493 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -67,6 +67,7 @@ function addRoutes(router, middleware, controllers) { router.get('/extend/plugins', controllers.admin.plugins.get); router.get('/extend/widgets', controllers.admin.extend.widgets); + router.get('/extend/rewards', controllers.admin.extend.rewards); router.get('/advanced/database', controllers.admin.database.get); router.get('/advanced/events', controllers.admin.events.get); diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl new file mode 100644 index 0000000000..329d64ea2e --- /dev/null +++ b/src/views/admin/extend/rewards.tpl @@ -0,0 +1,27 @@ +
    +
    +
    +
    Rewards
    +
    +
    +
      + +
    • + +
      • + +
    +
    +
    +
    +
    + +
    +
    +
    Save Settings
    +
    + +
    +
    +
    +
    \ No newline at end of file diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl index 29f049fa03..597173be2e 100644 --- a/src/views/admin/partials/menu.tpl +++ b/src/views/admin/partials/menu.tpl @@ -47,6 +47,7 @@
  • Extend
  • Plugins
  • Widgets
    • +
  • Rewards
    • From 0e7c3be9d3fd1700829ede48b30e107556c6f6ea Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 15:04:13 -0500 Subject: [PATCH 443/897] made some progress with mock api + acp --- src/rewards/admin.js | 68 ++++++++++++++++++++++++++---- src/views/admin/extend/rewards.tpl | 18 ++++++-- 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/src/rewards/admin.js b/src/rewards/admin.js index b2864fbbd7..6748515e14 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -4,9 +4,61 @@ var rewards = {}; rewards.get = function(callback) { - callback({ - conditions: ["Reputation", "Post Count", "Last Logged in Time"], - conditionals: [">", ">=", "<", "<=", "is string:"], + callback(false, { + conditions: [ + { + "name": "Reputation", + "condition": "reputation" + }, + { + "name": "Post Count", + "condition": "postcount" + }, + { + "name": "Last Logged in Time", + "condition": "lastLoggedIn" + } + ], + conditionals: [ + { + "name": ">", + "conditional": "greaterthan" + }, + { + "name": ">=", + "conditional": "greaterorequalthan" + }, + { + "name": "<", + "conditional": "smallerthan" + }, + { + "name": "<=", + "conditional": "smallerorequalthan" + }, + { + "name": "is string:", + "conditional": "isstring" + } + ], + active: [ + { + "rewardID": 0, + "conditional": { + "condition": ">", + "value": 100 + }, + "disabled": 0 + }, + { + "rewardID": 1, + "conditional": { + "condition": ">", + "value": 100 + }, + "disabled": 0 + } + ], rewards: [ { "rewardID": 0, @@ -17,11 +69,10 @@ rewards.get = function(callback) { "name": "groupname", "values": ["Group 1", "Group 2", "Group 3"], } - ], - "disabled": 0 + ] }, { - "rewardID": 0, + "rewardID": 1, "name": "Send alert message", "inputs": [ { @@ -32,11 +83,10 @@ rewards.get = function(callback) { "type": "text", "name": "message", } - ], - "disabled": 0 + ] } ] - }) + }); }; function getConditions() { diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 329d64ea2e..b0cc48daa2 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -5,11 +5,23 @@
      - +
    • - + If User's + + Is + +
      • - +
    From 711dff1dd0b0eefe8c8dabaa7dd6776060fcd29b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Feb 2015 15:05:35 -0500 Subject: [PATCH 444/897] added language strings for #2601 --- public/language/en_GB/category.json | 1 + public/language/en_GB/topic.json | 1 + 2 files changed, 2 insertions(+) diff --git a/public/language/en_GB/category.json b/public/language/en_GB/category.json index 22d72c3064..3e131894bd 100644 --- a/public/language/en_GB/category.json +++ b/public/language/en_GB/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "New Topic", + "guest-login-post": "Log in to post", "no_topics": "There are no topics in this category.
    Why don't you try posting one?", "browsing": "browsing", diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json index 5fc5863225..1bfdbb25ea 100644 --- a/public/language/en_GB/topic.json +++ b/public/language/en_GB/topic.json @@ -15,6 +15,7 @@ "notify_me": "Be notified of new replies in this topic", "quote": "Quote", "reply": "Reply", + "guest-login-reply": "Log in to reply", "edit": "Edit", "delete": "Delete", "purge": "Purge", From 4dad7de33f4daee5ec9551b699504ee5c0ccc6b9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Feb 2015 15:06:53 -0500 Subject: [PATCH 445/897] fallbacks for #2601 --- public/language/ar/category.json | 1 + public/language/ar/topic.json | 1 + public/language/bn/category.json | 1 + public/language/bn/topic.json | 1 + public/language/cs/category.json | 1 + public/language/cs/topic.json | 1 + public/language/de/category.json | 1 + public/language/de/topic.json | 1 + public/language/el/category.json | 1 + public/language/el/topic.json | 1 + public/language/en@pirate/category.json | 1 + public/language/en@pirate/topic.json | 1 + public/language/en_US/category.json | 1 + public/language/en_US/topic.json | 1 + public/language/es/category.json | 1 + public/language/es/topic.json | 1 + public/language/et/category.json | 1 + public/language/et/topic.json | 1 + public/language/fa_IR/category.json | 1 + public/language/fa_IR/topic.json | 1 + public/language/fi/category.json | 1 + public/language/fi/topic.json | 1 + public/language/fr/category.json | 3 +- public/language/fr/topic.json | 9 ++--- public/language/he/category.json | 1 + public/language/he/topic.json | 1 + public/language/hu/category.json | 1 + public/language/hu/topic.json | 1 + public/language/id/category.json | 1 + public/language/id/topic.json | 1 + public/language/it/category.json | 1 + public/language/it/topic.json | 1 + public/language/ja/category.json | 1 + public/language/ja/topic.json | 1 + public/language/ko/category.json | 1 + public/language/ko/topic.json | 1 + public/language/lt/category.json | 1 + public/language/lt/topic.json | 1 + public/language/ms/category.json | 1 + public/language/ms/topic.json | 1 + public/language/nb/category.json | 1 + public/language/nb/topic.json | 1 + public/language/nl/category.json | 1 + public/language/nl/topic.json | 1 + public/language/pl/category.json | 1 + public/language/pl/topic.json | 1 + public/language/pt_BR/category.json | 1 + public/language/pt_BR/topic.json | 1 + public/language/ro/category.json | 1 + public/language/ro/topic.json | 1 + public/language/ru/category.json | 1 + public/language/ru/topic.json | 47 +++++++++++++------------ public/language/sc/category.json | 1 + public/language/sc/topic.json | 1 + public/language/sk/category.json | 1 + public/language/sk/topic.json | 1 + public/language/sv/category.json | 1 + public/language/sv/topic.json | 1 + public/language/th/category.json | 1 + public/language/th/topic.json | 1 + public/language/tr/category.json | 1 + public/language/tr/topic.json | 1 + public/language/vi/category.json | 1 + public/language/vi/topic.json | 1 + public/language/zh_CN/category.json | 1 + public/language/zh_CN/topic.json | 1 + public/language/zh_TW/category.json | 1 + public/language/zh_TW/topic.json | 1 + 68 files changed, 96 insertions(+), 28 deletions(-) diff --git a/public/language/ar/category.json b/public/language/ar/category.json index 27dad61d69..b4f3a40f7a 100644 --- a/public/language/ar/category.json +++ b/public/language/ar/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "موضوع جديد", + "guest-login-post": "Log in to post", "no_topics": "لا توجد مواضيع في هذه الفئةلم لا تحاول إنشاء موضوع؟
    ", "browsing": "تصفح", "no_replies": "لم يرد أحد", diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 256a6d2b0c..c63f32e61c 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -12,6 +12,7 @@ "notify_me": "تلق تنبيهات بالردود الجديدة في هذا الموضوع", "quote": "اقتبس", "reply": "رد", + "guest-login-reply": "Log in to reply", "edit": "تعديل", "delete": "حذف", "purge": "تطهير", diff --git a/public/language/bn/category.json b/public/language/bn/category.json index 82626ebe86..b706e85080 100644 --- a/public/language/bn/category.json +++ b/public/language/bn/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "নতুন টপিক", + "guest-login-post": "Log in to post", "no_topics": "এই বিভাগে কোন টপিক নেই!
    আপনি চাইলে একটি পোষ্ট করতে পারেন।", "browsing": "ব্রাউজিং", "no_replies": "কোন রিপ্লাই নেই", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index e7a0b35aa0..3b0835cf2e 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -12,6 +12,7 @@ "notify_me": "এই টপিকে নতুন উত্তর আসলে জানুন", "quote": "উদ্ধৃতি", "reply": "উত্তর", + "guest-login-reply": "Log in to reply", "edit": "সম্পাদণা", "delete": "মুছে ফেলুন", "purge": "পার্জ", diff --git a/public/language/cs/category.json b/public/language/cs/category.json index 92d0e10df2..0d598e974a 100644 --- a/public/language/cs/category.json +++ b/public/language/cs/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nové téma", + "guest-login-post": "Log in to post", "no_topics": "V této kategorii zatím nejsou žádné příspěvky.
    Můžeš být první!", "browsing": "prohlíží", "no_replies": "Nikdo ještě neodpověděl", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index 9b18a9ba03..4f20b6e6db 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -12,6 +12,7 @@ "notify_me": "Sledovat toto téma", "quote": "Citovat", "reply": "Odpovědět", + "guest-login-reply": "Log in to reply", "edit": "Upravit", "delete": "Smazat", "purge": "Purge", diff --git a/public/language/de/category.json b/public/language/de/category.json index e3d45d3af8..8635b5738c 100644 --- a/public/language/de/category.json +++ b/public/language/de/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Neues Thema", + "guest-login-post": "Log in to post", "no_topics": "Es gibt noch keine Themen in dieser Kategorie.
    Warum beginnst du nicht eins?", "browsing": "Aktiv", "no_replies": "Niemand hat geantwortet", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index e2e47d83c1..1ef0d0741b 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -12,6 +12,7 @@ "notify_me": "Erhalte eine Benachrichtigung bei neuen Antworten zu diesem Thema.", "quote": "zitieren", "reply": "antworten", + "guest-login-reply": "Log in to reply", "edit": "bearbeiten", "delete": "löschen", "purge": "bereinigen", diff --git a/public/language/el/category.json b/public/language/el/category.json index 34cf7d16c3..73f3b51724 100644 --- a/public/language/el/category.json +++ b/public/language/el/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Νέο Θέμα", + "guest-login-post": "Log in to post", "no_topics": "Δεν υπάρχουν θέματα σε αυτή την κατηγορία.
    Γιατί δεν δοκιμάζεις να δημοσιεύσεις ένα εσύ;", "browsing": "περιηγούνται", "no_replies": "Κανείς δεν έχει απαντήσει", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index c8df981fa3..5e93f49db9 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -12,6 +12,7 @@ "notify_me": "Να ειδοποιούμαι για νέες απαντήσεις σε αυτό το θέμα", "quote": "Παράθεση", "reply": "Απάντηση", + "guest-login-reply": "Log in to reply", "edit": "Επεξεργασία", "delete": "Διαγραφή", "purge": "Εκκαθάριση", diff --git a/public/language/en@pirate/category.json b/public/language/en@pirate/category.json index 74b946d216..c2c0b64832 100644 --- a/public/language/en@pirate/category.json +++ b/public/language/en@pirate/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "New Topic", + "guest-login-post": "Log in to post", "no_topics": "Thar be no topics in 'tis category.
    Why don't ye give a go' postin' one?", "browsing": "browsin'", "no_replies": "No one has replied to ye message", diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json index eb06a391c8..88cd2e2328 100644 --- a/public/language/en@pirate/topic.json +++ b/public/language/en@pirate/topic.json @@ -12,6 +12,7 @@ "notify_me": "Be notified of new replies in this topic", "quote": "Quote", "reply": "Reply", + "guest-login-reply": "Log in to reply", "edit": "Edit", "delete": "Delete", "purge": "Purge", diff --git a/public/language/en_US/category.json b/public/language/en_US/category.json index 93272e1a06..8245a2c365 100644 --- a/public/language/en_US/category.json +++ b/public/language/en_US/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "New Topic", + "guest-login-post": "Log in to post", "no_topics": "There are no topics in this category.
    Why don't you try posting one?", "browsing": "browsing", "no_replies": "No one has replied", diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json index 6a2e3d93c7..750ce2694a 100644 --- a/public/language/en_US/topic.json +++ b/public/language/en_US/topic.json @@ -12,6 +12,7 @@ "notify_me": "Be notified of new replies in this topic", "quote": "Quote", "reply": "Reply", + "guest-login-reply": "Log in to reply", "edit": "Edit", "delete": "Delete", "purge": "Purge", diff --git a/public/language/es/category.json b/public/language/es/category.json index 2bc1d330df..ec2fdadcdc 100644 --- a/public/language/es/category.json +++ b/public/language/es/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nuevo tema", + "guest-login-post": "Log in to post", "no_topics": "No hay temas en esta categoría.
    ¿Por que no te animas y publicas uno?", "browsing": "viendo ahora", "no_replies": "Nadie ha respondido aún", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index f1a3f4221c..576220f99d 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -12,6 +12,7 @@ "notify_me": "Serás notificado cuando haya nuevas respuestas en este tema", "quote": "Citar", "reply": "Responder", + "guest-login-reply": "Log in to reply", "edit": "Editar", "delete": "Borrar", "purge": "Purgar", diff --git a/public/language/et/category.json b/public/language/et/category.json index 1c825ed2fe..d3c0f6e6bd 100644 --- a/public/language/et/category.json +++ b/public/language/et/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Uus teema", + "guest-login-post": "Log in to post", "no_topics": "Kahjuks ei leidu siin kategoorias ühtegi teemat.
    Soovid postitada?", "browsing": "vaatab", "no_replies": "Keegi pole vastanud", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index 2fdc0d8bf0..8992993fb9 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -12,6 +12,7 @@ "notify_me": "Saa teateid uutest postitustest selles teemas", "quote": "Tsiteeri", "reply": "Vasta", + "guest-login-reply": "Log in to reply", "edit": "Muuda", "delete": "Kustuta", "purge": "Kustuta", diff --git a/public/language/fa_IR/category.json b/public/language/fa_IR/category.json index c1c61a1a9f..b5b2749c70 100644 --- a/public/language/fa_IR/category.json +++ b/public/language/fa_IR/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "جستار تازه", + "guest-login-post": "Log in to post", "no_topics": "هیچ جستاری در این دسته نیست.
    چرا شما یکی نفرستید؟", "browsing": "بیننده‌ها", "no_replies": "هیچ کسی پاسخ نداده است.", diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json index 793af1e7cb..f523bee5b6 100644 --- a/public/language/fa_IR/topic.json +++ b/public/language/fa_IR/topic.json @@ -12,6 +12,7 @@ "notify_me": "از پاسخ‌های تازه در جستار آگاه شوید", "quote": "نقل قول", "reply": "پاسخ", + "guest-login-reply": "Log in to reply", "edit": "ویرایش", "delete": "Delete", "purge": "پاک کردن", diff --git a/public/language/fi/category.json b/public/language/fi/category.json index f3ae42f69f..3b098b3cfe 100644 --- a/public/language/fi/category.json +++ b/public/language/fi/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Uusi aihe", + "guest-login-post": "Log in to post", "no_topics": "Tällä aihealueella ei ole yhtään aihetta.
    Miksi et aloittaisi uutta?", "browsing": "selaamassa", "no_replies": "Kukaan ei ole vastannut", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index 194d414e56..eef05da8ee 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -12,6 +12,7 @@ "notify_me": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä", "quote": "Lainaa", "reply": "Vastaa", + "guest-login-reply": "Log in to reply", "edit": "Muokkaa", "delete": "Poista", "purge": "Purge", diff --git a/public/language/fr/category.json b/public/language/fr/category.json index 63450150f5..758bd68885 100644 --- a/public/language/fr/category.json +++ b/public/language/fr/category.json @@ -1,5 +1,6 @@ { - "new_topic_button": "Nouveau Sujet", + "new_topic_button": "Nouveau sujet", + "guest-login-post": "Log in to post", "no_topics": "Il n'y a aucun sujet dans cette catégorie.
    Pourquoi ne pas en créer un ?", "browsing": "parcouru par", "no_replies": "Personne n'a répondu", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 135efce878..b9368f16eb 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -12,7 +12,8 @@ "notify_me": "Être notifié des réponses dans ce sujet", "quote": "Citer", "reply": "Répondre", - "edit": "Editer", + "guest-login-reply": "Log in to reply", + "edit": "Éditer", "delete": "Supprimer", "purge": "Supprimer définitivement", "restore": "Restaurer", @@ -39,7 +40,7 @@ "share_this_post": "Partager ce message", "thread_tools.title": "Outils pour sujets", "thread_tools.markAsUnreadForAll": "Marquer comme non lu", - "thread_tools.pin": "Epingler le sujet", + "thread_tools.pin": "Épingler le sujet", "thread_tools.unpin": "Désépingler le sujet", "thread_tools.lock": "Verrouiller le sujet", "thread_tools.unlock": "Déverouiller le sujet", @@ -60,9 +61,9 @@ "disabled_categories_note": "Les catégories désactivées sont grisées", "confirm_move": "Déplacer", "confirm_fork": "Scinder", - "favourite": "Favoris", + "favourite": "Favori", "favourites": "Favoris", - "favourites.has_no_favourites": "Vous n'avez aucun favoris, mettez des messages en favoris pour les voir ici !", + "favourites.has_no_favourites": "Vous n'avez aucun favori, mettez des messages en favoris pour les voir ici !", "loading_more_posts": "Charger plus de messages", "move_topic": "Déplacer le sujet", "move_topics": "Déplacer des sujets", diff --git a/public/language/he/category.json b/public/language/he/category.json index 86292076b6..66e87dd4e3 100644 --- a/public/language/he/category.json +++ b/public/language/he/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "נושא חדש", + "guest-login-post": "Log in to post", "no_topics": "קטגוריה זו ריקה מנושאים.
    למה שלא תנסה להוסיף נושא חדש?", "browsing": "צופים בנושא זה כעת", "no_replies": "אין תגובות", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index e16ebc08cf..3ff27d0a8a 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -12,6 +12,7 @@ "notify_me": "קבל התראה כאשר יש תגובות חדשות בנושא זה", "quote": "ציטוט", "reply": "תגובה", + "guest-login-reply": "Log in to reply", "edit": "עריכה", "delete": "מחק", "purge": "מחק הכל", diff --git a/public/language/hu/category.json b/public/language/hu/category.json index 6ea4699a4c..b36e9fc37a 100644 --- a/public/language/hu/category.json +++ b/public/language/hu/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Új témakör", + "guest-login-post": "Log in to post", "no_topics": "Nincs nyitva egy téma sem ebben a kategóriában.Hozzunk létre egyet.", "browsing": "böngészés", "no_replies": "Nem érkezett válasz", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 0de62def8d..30bf3ab2f8 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -12,6 +12,7 @@ "notify_me": "Értesítést kérek az új hozzászólásokról ebben a topikban", "quote": "Idéz", "reply": "Válasz", + "guest-login-reply": "Log in to reply", "edit": "Szerkeszt", "delete": "Töröl", "purge": "Purge", diff --git a/public/language/id/category.json b/public/language/id/category.json index 89be56e6ff..7b0ff0f6eb 100644 --- a/public/language/id/category.json +++ b/public/language/id/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Topik Baru", + "guest-login-post": "Log in to post", "no_topics": "Tidak ada topik dikategori ini
    Mengapa anda tidak mencoba membuat yang baru?", "browsing": "penjelajahan", "no_replies": "Belum ada orang yang menjawab", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index cd8f9052b2..c47b9612be 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -12,6 +12,7 @@ "notify_me": "Beritahukan balasan baru untuk topik ini", "quote": "Kutip", "reply": "Balas", + "guest-login-reply": "Log in to reply", "edit": "Ubah", "delete": "Hapus", "purge": "Musnahkan", diff --git a/public/language/it/category.json b/public/language/it/category.json index b88bdd54e0..3e018bf12f 100644 --- a/public/language/it/category.json +++ b/public/language/it/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nuova Discussione", + "guest-login-post": "Log in to post", "no_topics": "Non ci sono discussioni in questa categoria.
    Perché non ne inizi una?", "browsing": "visualizzando", "no_replies": "Nessuno ha risposto", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index ba1beedc77..1cc385c23f 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -12,6 +12,7 @@ "notify_me": "Ricevi notifiche di nuove risposte in questa discussione", "quote": "Cita", "reply": "Rispondi", + "guest-login-reply": "Log in to reply", "edit": "Modifica", "delete": "Cancella", "purge": "Svuota", diff --git a/public/language/ja/category.json b/public/language/ja/category.json index c5ffc01c13..6fbd386dac 100644 --- a/public/language/ja/category.json +++ b/public/language/ja/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "新規スレッド", + "guest-login-post": "Log in to post", "no_topics": "まだスレッドはありません.
    一番目のスレッドを書いてみないか？", "browsing": "閲覧中", "no_replies": "返事はまだありません", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index fd6c7d911b..680b10b702 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -12,6 +12,7 @@ "notify_me": "このスレッドに新しいポストが投稿された際に通知する", "quote": "引用", "reply": "返答", + "guest-login-reply": "Log in to reply", "edit": "編集", "delete": "削除", "purge": "Purge", diff --git a/public/language/ko/category.json b/public/language/ko/category.json index 1ceaddb7ac..3518e3a3d1 100644 --- a/public/language/ko/category.json +++ b/public/language/ko/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "새 주제 생성", + "guest-login-post": "Log in to post", "no_topics": "이 카테고리에는 생성된 주제가 없습니다.
    먼저 주제를 생성해 보세요.", "browsing": "이 주제를 읽고 있는 사용자", "no_replies": "답글이 없습니다.", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index ed806c5882..56714d7a0a 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -12,6 +12,7 @@ "notify_me": "이 주제의 새 답글 알리기", "quote": "인용", "reply": "답글", + "guest-login-reply": "Log in to reply", "edit": "수정", "delete": "삭제", "purge": "폐기", diff --git a/public/language/lt/category.json b/public/language/lt/category.json index 1c9dd0899b..149a102553 100644 --- a/public/language/lt/category.json +++ b/public/language/lt/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nauja tema", + "guest-login-post": "Log in to post", "no_topics": "Šioje kategorijoje temų nėra.
    Kodėl gi jums nesukūrus naujos?", "browsing": "naršo", "no_replies": "Niekas dar neatsakė", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index 2df888e5b7..5138bc2766 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -12,6 +12,7 @@ "notify_me": "Gauti pranešimus apie naujus atsakymus šioje temoje", "quote": "Cituoti", "reply": "Atsakyti", + "guest-login-reply": "Log in to reply", "edit": "Redaguoti", "delete": "Ištrinti", "purge": "Išvalyti", diff --git a/public/language/ms/category.json b/public/language/ms/category.json index db2dc8d039..cc483ad763 100644 --- a/public/language/ms/category.json +++ b/public/language/ms/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "\nTopik Baru", + "guest-login-post": "Log in to post", "no_topics": "Tiada topik dalam kategori ini.
    Cuba menghantar topik yang baru?", "browsing": "melihat", "no_replies": "Tiada jawapan", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index 04be14258d..e173c79263 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -12,6 +12,7 @@ "notify_me": "Kekal dimaklumkan berkenaan respon dalam topik ini", "quote": "Petikan", "reply": "Balas", + "guest-login-reply": "Log in to reply", "edit": "Edit", "delete": "Padamkan", "purge": "Purge", diff --git a/public/language/nb/category.json b/public/language/nb/category.json index 7de0fb5cde..75f38d0df0 100644 --- a/public/language/nb/category.json +++ b/public/language/nb/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nytt emne", + "guest-login-post": "Log in to post", "no_topics": "Det er ingen emner i denne kategorien
    Hvorfor ikke lage ett?", "browsing": "leser", "no_replies": "Ingen har svart", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 49096d9f6f..8a599b7942 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -12,6 +12,7 @@ "notify_me": "Bli varslet om nye svar i dette emnet", "quote": "Siter", "reply": "Svar", + "guest-login-reply": "Log in to reply", "edit": "Endre", "delete": "Slett", "purge": "Tøm", diff --git a/public/language/nl/category.json b/public/language/nl/category.json index 45dbbf4d4d..bee6530395 100644 --- a/public/language/nl/category.json +++ b/public/language/nl/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nieuw onderwerp", + "guest-login-post": "Log in to post", "no_topics": "Er zijn geen onderwerpen in deze categorie.
    Waarom maak je er niet een aan?", "browsing": "verkennen", "no_replies": "Niemand heeft gereageerd", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index 8ab45e30d3..5f9250bea4 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -12,6 +12,7 @@ "notify_me": "Krijg notificaties van nieuwe reacties op dit onderwerp", "quote": "Citeren", "reply": "Reageren", + "guest-login-reply": "Log in to reply", "edit": "Aanpassen", "delete": "Verwijderen", "purge": "weggooien", diff --git a/public/language/pl/category.json b/public/language/pl/category.json index fe8b77fe54..09164c69bb 100644 --- a/public/language/pl/category.json +++ b/public/language/pl/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nowy wątek", + "guest-login-post": "Log in to post", "no_topics": "W tej kategorii nie ma jeszcze żadnych wątków.
    Dlaczego ty nie utworzysz jakiegoś?", "browsing": "przegląda", "no_replies": "Nikt jeszcze nie odpowiedział", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 354da37ef3..e9941d4abf 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -12,6 +12,7 @@ "notify_me": "Powiadamiaj mnie o nowych odpowiedziach w tym wątku", "quote": "Cytuj", "reply": "Odpowiedz", + "guest-login-reply": "Log in to reply", "edit": "Edytuj", "delete": "Usuń", "purge": "Wymaż", diff --git a/public/language/pt_BR/category.json b/public/language/pt_BR/category.json index 42b2b4017f..a781984e16 100644 --- a/public/language/pt_BR/category.json +++ b/public/language/pt_BR/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Novo Tópico", + "guest-login-post": "Log in to post", "no_topics": "Não tem nenhum tópico nesta categoria.
    Por que você não tenta postar o algum?", "browsing": "navegando", "no_replies": "Ninguém respondeu", diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json index df49f8cb20..a99468a79f 100644 --- a/public/language/pt_BR/topic.json +++ b/public/language/pt_BR/topic.json @@ -12,6 +12,7 @@ "notify_me": "Seja notificado de novas respostas nesse tópico", "quote": "Citar", "reply": "Responder", + "guest-login-reply": "Log in to reply", "edit": "Editar", "delete": "Deletar", "purge": "Expurgar", diff --git a/public/language/ro/category.json b/public/language/ro/category.json index 7ff3d49fe6..733f5de0d7 100644 --- a/public/language/ro/category.json +++ b/public/language/ro/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Subiect Nou", + "guest-login-post": "Log in to post", "no_topics": "Nu există nici un subiect de discuție în această categorie.
    De ce nu încerci să postezi tu unul?", "browsing": "navighează", "no_replies": "Nu a răspuns nimeni", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index 49803e1823..590dfed6d5 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -12,6 +12,7 @@ "notify_me": "Notică-mă de noi răspunsuri în acest subiect", "quote": "Citează", "reply": "Răspunde", + "guest-login-reply": "Log in to reply", "edit": "Editează", "delete": "Șterge", "purge": "Curăță", diff --git a/public/language/ru/category.json b/public/language/ru/category.json index f80eccd5ba..8a97af5a0d 100644 --- a/public/language/ru/category.json +++ b/public/language/ru/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Создать тему", + "guest-login-post": "Log in to post", "no_topics": "В этой категории еще нет тем.
    Почему бы вам не создать первую?", "browsing": "просматривают", "no_replies": "Нет ответов", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 644b66d9ae..ec980e67a7 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -7,11 +7,12 @@ "post_is_deleted": "Этот пост удален!", "profile": "Профиль", "posted_by": "Создано %1", - "posted_by_guest": "Опубликовано Гостем", + "posted_by_guest": "Опубликовано гостем", "chat": "Чат", "notify_me": "Сообщать мне об ответах в этой теме", "quote": "Цитировать", "reply": "Ответить", + "guest-login-reply": "Log in to reply", "edit": "Редактировать", "delete": "Удалить", "purge": "Очистить", @@ -39,60 +40,60 @@ "share_this_post": "Поделиться этим Постом", "thread_tools.title": "Опции темы", "thread_tools.markAsUnreadForAll": "Отметить как непрочитанные", - "thread_tools.pin": "Прикрепить Тему", - "thread_tools.unpin": "Открепить Тему", - "thread_tools.lock": "Закрыть Тему", - "thread_tools.unlock": "Открыть Тему", - "thread_tools.move": "Переместить Тему", - "thread_tools.move_all": "Переместить Все", - "thread_tools.fork": "Ответвить Тему", - "thread_tools.delete": "Удалить Тему", + "thread_tools.pin": "Прикрепить тему", + "thread_tools.unpin": "Открепить тему", + "thread_tools.lock": "Закрыть тему", + "thread_tools.unlock": "Открыть тему", + "thread_tools.move": "Переместить тему", + "thread_tools.move_all": "Переместить все", + "thread_tools.fork": "Ответвить тему", + "thread_tools.delete": "Удалить тему", "thread_tools.delete_confirm": "Вы уверены, что хотите удалить тему?", - "thread_tools.restore": "Восстановить Тему", + "thread_tools.restore": "Восстановить тему", "thread_tools.restore_confirm": "Вы уверены, что хотите восстановить тему?", - "thread_tools.purge": "Очистить Тему", + "thread_tools.purge": "Очистить тему", "thread_tools.purge_confirm": "Вы уверены, что хотите очистить эту тему?", "topic_move_success": "Эта тема успешно перемещена в %1", "post_delete_confirm": "Вы уверены, что хотите удалить этот пост?", "post_restore_confirm": "Вы уверены, что хотите восстановить этот пост?", "post_purge_confirm": "Вы уверены, что хотите очистить эту запись?", - "load_categories": "Загружаем Категории", - "disabled_categories_note": "Отключенные категории затемненны", + "load_categories": "Загружаем категории", + "disabled_categories_note": "Отключенные категории затемнены", "confirm_move": "Перенести", "confirm_fork": "Ответвление", "favourite": "Избранное", "favourites": "Избранные", - "favourites.has_no_favourites": "У вас нет избранного, добавьте несколько сообщений в избранное чтобы увидеть их здесь!", + "favourites.has_no_favourites": "У вас нет избранного, добавьте несколько сообщений в избранное, чтобы увидеть их здесь", "loading_more_posts": "Загружаем еще сообщения", "move_topic": "Перенести тему", - "move_topics": "Больше Тем", + "move_topics": "Перенести темы", "move_post": "Перенести сообщение", - "post_moved": "Пост перемещен!", - "fork_topic": "Ответвить Тему", + "post_moved": "Пост перенесен", + "fork_topic": "Ответвить тему", "topic_will_be_moved_to": "Эта тема будет перенесена в категорию", "fork_topic_instruction": "Отметьте сообщения для ответвления", "fork_no_pids": "Сообщения не отмечены!", "fork_success": "Готово! Нажмите для перехода в отделённую тему.", "composer.title_placeholder": "Введите название темы...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Название", "composer.discard": "Отменить", "composer.submit": "Подтвердить", "composer.replying_to": "Ответ %1", - "composer.new_topic": "Создать Тему", + "composer.new_topic": "Создать тему", "composer.uploading": "загрузка...", "composer.thumb_url_label": "Вставьте URL картинки с иконкой темы.", "composer.thumb_title": "Добавить иконку к этой теме", "composer.thumb_url_placeholder": "http://example.com/thumb.png", "composer.thumb_file_label": "Или загрузите файл", "composer.thumb_remove": "Очистить поля", - "composer.drag_and_drop_images": "Перетащите Изображения Сюда", + "composer.drag_and_drop_images": "Перетащите изображения сюда", "more_users_and_guests": "еще %1 пользователя(ей) и %2 гостя(ей)", "more_users": "еще %1 пользователя(ей)", "more_guests": "еще %1 гостя(ей)", "users_and_others": "%1 и %2 других", "sort_by": "Сортировать", - "oldest_to_newest": "От Старых к Новым", - "newest_to_oldest": "От Новых к Старым", + "oldest_to_newest": "От старых к новым", + "newest_to_oldest": "От новых к старым", "most_votes": "По голосам", - "most_posts": "Most posts" + "most_posts": "По количеству ответов" } \ No newline at end of file diff --git a/public/language/sc/category.json b/public/language/sc/category.json index 35e7f7b522..306f0e2d04 100644 --- a/public/language/sc/category.json +++ b/public/language/sc/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Arresonada Noa", + "guest-login-post": "Log in to post", "no_topics": "Non bi sunt arresonadas in custa creze.
    Pro ite non nde pones una?", "browsing": "navighende", "no_replies": "Perunu at rispostu", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index e08b8e84ba..c0ce4121ff 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -12,6 +12,7 @@ "notify_me": "Imbia·mi notìficas pro is rispostas noas a custa arresonada", "quote": "Mèntova", "reply": "Risponde", + "guest-login-reply": "Log in to reply", "edit": "Acontza", "delete": "Contzella", "purge": "Purge", diff --git a/public/language/sk/category.json b/public/language/sk/category.json index 9ce9439a2e..62ef9414d6 100644 --- a/public/language/sk/category.json +++ b/public/language/sk/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nová téma", + "guest-login-post": "Log in to post", "no_topics": "V tejto kategórií zatiaľ nie sú žiadne príspevky.
    Môžeš byť prvý!", "browsing": "prehliada", "no_replies": "Nikdo ešte neodpovedal", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index 05ee94f28e..007cf0f22a 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -12,6 +12,7 @@ "notify_me": "Sledovať túto tému", "quote": "Citovať", "reply": "Odpovedať", + "guest-login-reply": "Log in to reply", "edit": "Upraviť", "delete": "Zmazať", "purge": "Purge", diff --git a/public/language/sv/category.json b/public/language/sv/category.json index 635f2c0ac4..41b49a95db 100644 --- a/public/language/sv/category.json +++ b/public/language/sv/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Nytt ämne", + "guest-login-post": "Log in to post", "no_topics": "Det finns inga ämnen i denna kategori.
    Varför skapar inte du ett ämne?", "browsing": "läser", "no_replies": "Ingen har svarat", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 9d41afee2b..40b81f0ec4 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -12,6 +12,7 @@ "notify_me": "Få notiser om nya svar i detta ämne", "quote": "Citera", "reply": "Svara", + "guest-login-reply": "Log in to reply", "edit": "Ändra", "delete": "Ta bort", "purge": "Rensa", diff --git a/public/language/th/category.json b/public/language/th/category.json index 31246e2a05..387458a0dd 100644 --- a/public/language/th/category.json +++ b/public/language/th/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "กระทู้", + "guest-login-post": "Log in to post", "no_topics": "ยังไม่มีกระทู้ในหมวดนี้
    โพสต์กระทู้แรก?", "browsing": "เรียกดู", "no_replies": "ยังไม่มีใครตอบ", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index c7c9f4e944..652ebe5db5 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -12,6 +12,7 @@ "notify_me": "แจ้งเตือนเมื่อการตอบใหม่ในกระทู้นี้", "quote": "คำอ้างอิง", "reply": "ตอบ", + "guest-login-reply": "Log in to reply", "edit": "แก้ไข", "delete": "ลบ", "purge": "Purge", diff --git a/public/language/tr/category.json b/public/language/tr/category.json index ba1c4f34ef..34ac645f32 100644 --- a/public/language/tr/category.json +++ b/public/language/tr/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Yeni Başlık", + "guest-login-post": "Log in to post", "no_topics": " Bu kategoride hiç konu yok.
    Yeni bir konu açmak istemez misiniz?", "browsing": "gözden geçiriliyor", "no_replies": "Kimse yanıtlamadı", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index 6cd2424e0f..fa76fb4ee6 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -12,6 +12,7 @@ "notify_me": "Bu konudaki cevaplardan haberdar ol", "quote": "Alıntı", "reply": "Cevap", + "guest-login-reply": "Log in to reply", "edit": "Düzenle", "delete": "Sil", "purge": "Temizle", diff --git a/public/language/vi/category.json b/public/language/vi/category.json index 6d2efb5e1b..e536a54efb 100644 --- a/public/language/vi/category.json +++ b/public/language/vi/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "Chủ đề mới", + "guest-login-post": "Log in to post", "no_topics": "Không có bài viết trong danh mục này.
    Hãy đăng một bài viết mới.", "browsing": "đang xem", "no_replies": "Chưa có bình luận nào", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index 2c23893104..8c9f8cdfce 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -12,6 +12,7 @@ "notify_me": "Được thông báo khi có trả lời mới trong chủ đề này", "quote": "Trích dẫn", "reply": "Trả lời", + "guest-login-reply": "Log in to reply", "edit": "Chỉnh sửa", "delete": "Xóa", "purge": "Xóa hẳn", diff --git a/public/language/zh_CN/category.json b/public/language/zh_CN/category.json index 933e12e3e1..21ea5d5acf 100644 --- a/public/language/zh_CN/category.json +++ b/public/language/zh_CN/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "新主题", + "guest-login-post": "Log in to post", "no_topics": "此版块还没有任何内容。
    赶紧来发帖吧！", "browsing": "正在浏览", "no_replies": "尚无回复", diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json index 0cd68a3250..bd20fbdabc 100644 --- a/public/language/zh_CN/topic.json +++ b/public/language/zh_CN/topic.json @@ -12,6 +12,7 @@ "notify_me": "此主题有新回复时通知我", "quote": "引用", "reply": "回复", + "guest-login-reply": "Log in to reply", "edit": "编辑", "delete": "删除", "purge": "清除", diff --git a/public/language/zh_TW/category.json b/public/language/zh_TW/category.json index cb21821aab..055d4a70d3 100644 --- a/public/language/zh_TW/category.json +++ b/public/language/zh_TW/category.json @@ -1,5 +1,6 @@ { "new_topic_button": "新主題", + "guest-login-post": "Log in to post", "no_topics": "這個版面還沒有任何內容。
    趕緊來發文章吧！", "browsing": "正在瀏覽", "no_replies": "還沒有回覆", diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json index 04787766fa..41edd8828f 100644 --- a/public/language/zh_TW/topic.json +++ b/public/language/zh_TW/topic.json @@ -12,6 +12,7 @@ "notify_me": "該主題有新回覆時通知我", "quote": "引用", "reply": "回覆", + "guest-login-reply": "Log in to reply", "edit": "編輯", "delete": "刪除", "purge": "清除", From 6c44de27ed84198395cb3f13fe443224c340edb9 Mon Sep 17 00:00:00 2001 From: yariplus Date: Thu, 19 Feb 2015 15:29:43 -0500 Subject: [PATCH 446/897] Fix spaces and less variables. --- public/less/admin/admin.less | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 36626df136..cac31697ee 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -233,15 +233,18 @@ padding-top: 15px; padding-bottom: 15px; } + >a:hover, >a:focus { - color:#333; - background-color:#b2cdf0 + color: @gray-dark; + background-color: @gray-light; } + >#reconnect { - color: #afb1b1; + color: @gray-light; } + >#reconnect:focus, >#reconnect:hover { - color: #afb1b1; + color: @gray-light; background-color: transparent; } } From 743cd20441537d9dcb014eb9bb32d15bd92cce4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Feb 2015 15:56:04 -0500 Subject: [PATCH 447/897] closes #2267 --- public/src/admin/manage/flags.js | 20 ++++++- public/src/client/search.js | 22 +------ public/src/modules/autocomplete.js | 31 ++++++++++ src/controllers/admin.js | 20 +++++-- src/posts/delete.js | 5 +- src/posts/flags.js | 92 ++++++++++++++++++++++++++---- src/socket.io/admin.js | 22 +++++-- src/socket.io/posts.js | 13 +---- src/user/delete.js | 2 +- src/views/admin/manage/flags.tpl | 85 +++++++++++++++++---------- 10 files changed, 228 insertions(+), 84 deletions(-) create mode 100644 public/src/modules/autocomplete.js diff --git a/public/src/admin/manage/flags.js b/public/src/admin/manage/flags.js index c6dc4b11af..880094af20 100644 --- a/public/src/admin/manage/flags.js +++ b/public/src/admin/manage/flags.js @@ -1,12 +1,21 @@ "use strict"; /*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/ -define('admin/manage/flags', ['forum/infinitescroll', 'admin/modules/selectable'], function(infinitescroll, selectable) { +define('admin/manage/flags', [ + 'forum/infinitescroll', + 'admin/modules/selectable', + 'autocomplete' +], function(infinitescroll, selectable, autocomplete) { + var Flags = {}; Flags.init = function() { $('.post-container .content img').addClass('img-responsive'); + var params = utils.params(); + $('#flag-sort-by').val(params.sortBy); + autocomplete.user($('#byUsername')); + handleDismiss(); handleDismissAll(); handleDelete(); @@ -69,8 +78,15 @@ define('admin/manage/flags', ['forum/infinitescroll', 'admin/modules/selectable' if (direction < 0 && !$('.flags').length) { return; } + var params = utils.params(); + var sortBy = params.sortBy || 'count'; + var byUsername = params.byUsername || ''; - infinitescroll.loadMore('admin.getMoreFlags', $('[data-next]').attr('data-next'), function(data, done) { + infinitescroll.loadMore('admin.getMoreFlags', { + byUsername: byUsername, + sortBy: sortBy, + after: $('[data-next]').attr('data-next') + }, function(data, done) { if (data.posts && data.posts.length) { infinitescroll.parseAndTranslate('admin/manage/flags', 'posts', {posts: data.posts}, function(html) { $('[data-next]').attr('data-next', data.next); diff --git a/public/src/client/search.js b/public/src/client/search.js index 95f49b60f8..0af3d56be2 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -2,7 +2,7 @@ /* globals app, define, utils, socket*/ -define('forum/search', ['search'], function(searchModule) { +define('forum/search', ['search', 'autocomplete'], function(searchModule, autocomplete) { var Search = {}; Search.init = function() { @@ -156,25 +156,7 @@ define('forum/search', ['search'], function(searchModule) { } function enableAutoComplete() { - var input = $('#posted-by-user'); - input.autocomplete({ - delay: 100, - source: function(request, response) { - socket.emit('user.search', {query: request.term}, function(err, result) { - if (err) { - return app.alertError(err.message); - } - - if (result && result.users) { - var names = result.users.map(function(user) { - return user && user.username; - }); - response(names); - } - $('.ui-autocomplete a').attr('data-ajaxify', 'false'); - }); - } - }); + autocomplete.user($('#posted-by-user')); } return Search; diff --git a/public/src/modules/autocomplete.js b/public/src/modules/autocomplete.js new file mode 100644 index 0000000000..d8b2311b98 --- /dev/null +++ b/public/src/modules/autocomplete.js @@ -0,0 +1,31 @@ + +'use strict'; + +/* globals define, socket, app */ + +define('autocomplete', function() { + var module = {}; + + module.user = function (input) { + input.autocomplete({ + delay: 100, + source: function(request, response) { + socket.emit('user.search', {query: request.term}, function(err, result) { + if (err) { + return app.alertError(err.message); + } + + if (result && result.users) { + var names = result.users.map(function(user) { + return user && user.username; + }); + response(names); + } + $('.ui-autocomplete a').attr('data-ajaxify', 'false'); + }); + } + }); + }; + + return module; +}); diff --git a/src/controllers/admin.js b/src/controllers/admin.js index f03b7fdb88..162f9595ac 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -163,14 +163,24 @@ adminController.tags.get = function(req, res, next) { }; adminController.flags.get = function(req, res, next) { - var uid = req.user ? parseInt(req.user.uid, 10) : 0; - posts.getFlags(uid, 0, 19, function(err, posts) { + function done(err, posts) { if (err) { return next(err); } - - res.render('admin/manage/flags', {posts: posts, next: 20}); - }); + res.render('admin/manage/flags', {posts: posts, next: end + 1, byUsername: byUsername}); + } + var uid = req.user ? parseInt(req.user.uid, 10) : 0; + var sortBy = req.query.sortBy || 'count'; + var byUsername = req.query.byUsername || ''; + var start = 0; + var end = 19; + + if (byUsername) { + posts.getUserFlags(byUsername, sortBy, uid, start, end, done); + } else { + var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged'; + posts.getFlags(set, uid, start, end, done); + } }; adminController.database.get = function(req, res, next) { diff --git a/src/posts/delete.js b/src/posts/delete.js index cc1a8c8b5b..f3fab5bd87 100644 --- a/src/posts/delete.js +++ b/src/posts/delete.js @@ -29,7 +29,7 @@ module.exports = function(Posts) { removeFromCategoryRecentPosts(pid, postData.tid, next); }, function(next) { - db.sortedSetRemove('posts:flagged', pid, next); + Posts.dismissFlags(pid, next); } ], function(err) { callback(err, postData); @@ -125,6 +125,9 @@ module.exports = function(Posts) { }, function(next) { db.sortedSetsRemove(['posts:pid', 'posts:flagged'], pid, next); + }, + function(next) { + Posts.dismissFlags(pid, next); } ], function(err) { if (err) { diff --git a/src/posts/flags.js b/src/posts/flags.js index c3b591b001..388b707d3d 100644 --- a/src/posts/flags.js +++ b/src/posts/flags.js @@ -3,22 +3,52 @@ 'use strict'; var async = require('async'), - db = require('../database'); + db = require('../database'), + user = require('../user'); module.exports = function(Posts) { - Posts.flag = function(pid, callback) { - Posts.exists(pid, function(err, exists) { - if (err || !exists) { + + Posts.flag = function(post, uid, callback) { + async.parallel({ + hasFlagged: async.apply(hasFlagged, post.pid, uid), + exists: async.apply(Posts.exists, post.pid) + }, function(err, results) { + if (err || !results.exists) { return callback(err || new Error('[[error:no-post]]')); } + if (results.hasFlagged) { + return callback(new Error('[[error:already-flagged]]')); + } + var now = Date.now(); + async.parallel([ function(next) { - db.sortedSetAdd('posts:flagged', Date.now(), pid, next); + db.sortedSetAdd('posts:flagged', now, post.pid, next); + }, + function(next) { + db.sortedSetIncrBy('posts:flags:count', 1, post.pid, next); + }, + function(next) { + db.incrObjectField('post:' + post.pid, 'flags', next); + }, + function(next) { + db.sortedSetAdd('pid:' + post.pid + ':flag:uids', now, uid, next); }, function(next) { - db.incrObjectField('post:' + pid, 'flags', next); + if (parseInt(post.uid, 10)) { + db.sortedSetAdd('uid:' + post.uid + ':flag:pids', now, post.pid, next); + } else { + next(); + } + }, + function(next) { + if (parseInt(post.uid, 10)) { + db.setAdd('uid:' + post.uid + ':flagged_by', uid, next); + } else { + next(); + } } ], function(err, results) { callback(err); @@ -26,14 +56,31 @@ module.exports = function(Posts) { }); }; + function hasFlagged(pid, uid, callback) { + db.isSortedSetMember('pid:' + pid + ':flag:uids', uid, callback); + } + Posts.dismissFlag = function(pid, callback) { async.parallel([ function(next) { - db.sortedSetRemove('posts:flagged', pid, next); + db.getObjectField('post:' + pid, 'uid', function(err, uid) { + if (err) { + return next(err); + } + + db.sortedSetsRemove([ + 'posts:flagged', + 'posts:flags:count', + 'uid:' + uid + ':flag:pids' + ], pid, next); + }); }, function(next) { db.deleteObjectField('post:' + pid, 'flags', next); - } + }, + function(next) { + db.delete('pid:' + pid + ':flag:uids', next); + } ], function(err, results) { callback(err); }); @@ -43,8 +90,8 @@ module.exports = function(Posts) { db.delete('posts:flagged', callback); }; - Posts.getFlags = function(uid, start, end, callback) { - db.getSortedSetRevRange('posts:flagged', start, end, function(err, pids) { + Posts.getFlags = function(set, uid, start, end, callback) { + db.getSortedSetRevRange(set, start, end, function(err, pids) { if (err) { return callback(err); } @@ -52,4 +99,29 @@ module.exports = function(Posts) { Posts.getPostSummaryByPids(pids, uid, {stripTags: false, extraFields: ['flags']}, callback); }); }; + + Posts.getUserFlags = function(byUsername, sortBy, callerUID, start, end, callback) { + async.waterfall([ + function(next) { + user.getUidByUsername(byUsername, next); + }, + function(uid, next) { + if (!uid) { + return next(null, []); + } + db.getSortedSetRevRange('uid:' + uid + ':flag:pids', 0, -1, next); + }, + function(pids, next) { + Posts.getPostSummaryByPids(pids, callerUID, {stripTags: false, extraFields: ['flags']}, next); + }, + function(posts, next) { + if (sortBy === 'count') { + posts.sort(function(a, b) { + return b.flags - a.flags; + }); + } + next(null, posts.slice(start, end)); + } + ], callback); + }; }; diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index a770af5c53..b954e52da7 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -311,14 +311,24 @@ SocketAdmin.dismissAllFlags = function(socket, data, callback) { posts.dismissAllFlags(callback); }; -SocketAdmin.getMoreFlags = function(socket, after, callback) { - if (!parseInt(after, 10)) { +SocketAdmin.getMoreFlags = function(socket, data, callback) { + if (!data || !parseInt(data.after, 10)) { return callback('[[error:invalid-data]]'); } - after = parseInt(after, 10); - posts.getFlags(socket.uid, after, after + 19, function(err, posts) { - callback(err, {posts: posts, next: after + 20}); - }); + var sortBy = data.sortBy || 'count'; + var byUsername = data.byUsername || ''; + var start = parseInt(data.after, 10); + var end = start + 19; + if (byUsername) { + posts.getUserFlags(byUsername, sortBy, socket.uid, start, end, function(err, posts) { + callback(err, {posts: posts, next: end + 1}); + }); + } else { + var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged'; + posts.getFlags(set, socket.uid, start, end, function(err, posts) { + callback(err, {posts: posts, next: end + 1}); + }); + } }; SocketAdmin.takeHeapSnapshot = function(socket, data, callback) { diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index a2de8ca5d6..0b5ab9b418 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -422,14 +422,14 @@ SocketPosts.flag = function(socket, pid, callback) { return next(new Error('[[error:not-enough-reputation-to-flag]]')); } userName = userData.username; - posts.getPostFields(pid, ['tid', 'uid', 'content', 'deleted'], next); + posts.getPostFields(pid, ['pid', 'tid', 'uid', 'content', 'deleted'], next); }, function(postData, next) { if (parseInt(postData.deleted, 10) === 1) { return next(new Error('[[error:post-deleted]]')); } post = postData; - posts.flag(pid, next); + posts.flag(post, socket.uid, next); }, function(next) { topics.getTopicFields(post.tid, ['title', 'cid'], next); @@ -462,14 +462,7 @@ SocketPosts.flag = function(socket, pid, callback) { } notifications.push(notification, results.admins.concat(results.moderators), next); }); - }, - function(next) { - if (!parseInt(post.uid, 10)) { - return next(); - } - - db.setAdd('uid:' + post.uid + ':flagged_by', socket.uid, next); - } + } ], callback); }; diff --git a/src/user/delete.js b/src/user/delete.js index 3440e810a4..1c1e9c2974 100644 --- a/src/user/delete.js +++ b/src/user/delete.js @@ -80,7 +80,7 @@ module.exports = function(User) { 'uid:' + uid + ':topics', 'uid:' + uid + ':posts', 'uid:' + uid + ':chats', 'uid:' + uid + ':chats:unread', 'uid:' + uid + ':upvote', 'uid:' + uid + ':downvote', - 'uid:' + uid + ':ignored:cids' + 'uid:' + uid + ':ignored:cids', 'uid:' + uid + ':flag:pids' ]; db.deleteAll(keys, next); }, diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl index 23a5d6f796..a87f450a47 100644 --- a/src/views/admin/manage/flags.tpl +++ b/src/views/admin/manage/flags.tpl @@ -2,42 +2,69 @@
    Flags
    -
    +
    + From 2bebac964ef9c91b5bab13f8ec7b9fb280a0a4e7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 16:09:58 -0500 Subject: [PATCH 448/897] loading mock data --- public/src/admin/extend/rewards.js | 21 +++++++++++++++++++++ src/rewards/admin.js | 20 +++++++++----------- src/views/admin/extend/rewards.tpl | 16 ++++++++++++---- 3 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 public/src/admin/extend/rewards.js diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js new file mode 100644 index 0000000000..511a3b6ec3 --- /dev/null +++ b/public/src/admin/extend/rewards.js @@ -0,0 +1,21 @@ +"use strict"; +/* global define, app, socket, bootbox */ + +define('admin/extend/rewards', function() { + var rewards = {}; + + + var available, + active; + + rewards.init = function() { + available = JSON.parse($('#rewards').val()); + active = JSON.parse($('#active').val()); + + $('[data-selected]').each(function() { + $(this).val($(this).attr('data-selected')); + }); + }; + + return rewards; +}); \ No newline at end of file diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 6748515e14..ff0a56ff9c 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -30,11 +30,11 @@ rewards.get = function(callback) { }, { "name": "<", - "conditional": "smallerthan" + "conditional": "lesserthan" }, { "name": "<=", - "conditional": "smallerorequalthan" + "conditional": "lesserorequalthan" }, { "name": "is string:", @@ -44,18 +44,16 @@ rewards.get = function(callback) { active: [ { "rewardID": 0, - "conditional": { - "condition": ">", - "value": 100 - }, + "condition": "postcount", + "conditional": "greaterthan", + "value": 100, "disabled": 0 }, { - "rewardID": 1, - "conditional": { - "condition": ">", - "value": 100 - }, + "rewardID": 0, + "condition": "lastLoggedIn", + "conditional": "lesserthan", + "value": 10, "disabled": 0 } ], diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index b0cc48daa2..538ac93b39 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -8,22 +8,30 @@
  • If User's - - + Is - - + + Then +
    • + +
    From c3a51033a8e71be0fbdf4771861edca51dc5025c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Feb 2015 16:11:23 -0500 Subject: [PATCH 449/897] removed utils.getQueryParams() use utils.params() --- public/src/client/category.js | 2 +- public/src/client/search.js | 4 ++-- public/src/utils.js | 23 ++++------------------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/public/src/client/category.js b/public/src/client/category.js index b9ab5bc800..2dccb5f85d 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -339,7 +339,7 @@ define('forum/category', [ infinitescroll.loadMore('categories.loadMore', { cid: ajaxify.variables.get('category_id'), after: after, - author: utils.getQueryParams().author + author: utils.params().author }, function (data, done) { if (data.topics && data.topics.length) { diff --git a/public/src/client/search.js b/public/src/client/search.js index 0af3d56be2..56bdaf6dca 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -80,8 +80,8 @@ define('forum/search', ['search', 'autocomplete'], function(searchModule, autoco $('#posted-by-user').val(params.by); } - if ((params['categories[]'] || params.categories)) { - $('#posted-in-categories').val(params['categories[]'] || params.categories); + if (params.categories) { + $('#posted-in-categories').val(params.categories); } if (params.searchChildren) { diff --git a/public/src/utils.js b/public/src/utils.js index 9c46e3fb6a..f345ab2a22 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -270,9 +270,12 @@ value = options.skipToType[key] ? decodeURI(val[1]) : utils.toType(decodeURI(val[1])); if (key) { + if (key.substr(-2, 2) === '[]') { + key = key.slice(0, -2); + } if (!hash[key]) { hash[key] = value; - } else { + } else { if (!$.isArray(hash[key])) { hash[key] = [hash[key]]; } @@ -293,24 +296,6 @@ return a; }, - getQueryParams: function() { - var search = window.location.search.slice(1), - data = {}; - - search = search.split('&'); - for(var x=0,numParams=search.length,temp;x Date: Thu, 19 Feb 2015 16:37:56 -0500 Subject: [PATCH 450/897] closes #2738 --- src/controllers/uploads.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js index dc0db0591d..58ab3689c1 100644 --- a/src/controllers/uploads.js +++ b/src/controllers/uploads.js @@ -5,6 +5,7 @@ var uploadsController = {}, fs = require('fs'), path = require('path'), async = require('async'), + validator = require('validator'), meta = require('../meta'), file = require('../file'), @@ -117,8 +118,9 @@ function uploadFile(uid, uploadedFile, callback) { if (uploadedFile.size > parseInt(meta.config.maximumFileSize, 10) * 1024) { return callback(new Error('[[error:file-too-big, ' + meta.config.maximumFileSize + ']]')); } - - var filename = 'upload-' + utils.generateUUID() + path.extname(uploadedFile.name); + + var filename = uploadFile.name || 'upload'; + filename = validator.escape(filename).substr(0, 255) + '-' + Date.now(); file.saveFileToLocal(filename, 'files', uploadedFile.path, function(err, upload) { if (err) { return callback(err); From 767816e669ca896b112e3d0cb86d96a7fb6293ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Feb 2015 16:46:00 -0500 Subject: [PATCH 451/897] #2738 --- src/controllers/uploads.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js index 58ab3689c1..79ae6fae19 100644 --- a/src/controllers/uploads.js +++ b/src/controllers/uploads.js @@ -119,8 +119,9 @@ function uploadFile(uid, uploadedFile, callback) { return callback(new Error('[[error:file-too-big, ' + meta.config.maximumFileSize + ']]')); } - var filename = uploadFile.name || 'upload'; - filename = validator.escape(filename).substr(0, 255) + '-' + Date.now(); + var filename = uploadedFile.name || 'upload'; + + filename = Date.now() + '-' + validator.escape(filename).substr(0, 255); file.saveFileToLocal(filename, 'files', uploadedFile.path, function(err, upload) { if (err) { return callback(err); From ceb18fe73da77f5ba91bfa4e7af9e4fad7b05610 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Feb 2015 16:51:10 -0500 Subject: [PATCH 452/897] added new hook and method for plugins to introduce their own formatting options, #2743 --- public/src/modules/composer.js | 12 +++- public/src/modules/composer/formatting.js | 82 ++++++----------------- src/socket.io/modules.js | 10 +++ 3 files changed, 42 insertions(+), 62 deletions(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 29154d1523..26f4e4a8f2 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -16,11 +16,17 @@ define('composer', [ var composer = { active: undefined, posts: {}, - bsEnvironment: undefined + bsEnvironment: undefined, + formatting: [] }; $(window).off('resize', onWindowResize).on('resize', onWindowResize); + // Query server for formatting options + socket.emit('modules.composer.getFormattingOptions', function(err, options) { + composer.formatting = options; + }); + function onWindowResize() { if (composer.active !== undefined) { resize.reposition($('#cmp-uuid-' + composer.active)); @@ -232,8 +238,10 @@ define('composer', [ maximumTagLength: config.maximumTagLength, isTopic: isTopic, showHandleInput: (app.user.uid === 0 || (isEditing && isGuestPost && app.user.isAdmin)) && config.allowGuestHandles, - handle: composer.posts[post_uuid] ? composer.posts[post_uuid].handle || '' : undefined + handle: composer.posts[post_uuid] ? composer.posts[post_uuid].handle || '' : undefined, + formatting: composer.formatting }; + console.log(composer.formatting); parseAndTranslate(template, data, function(composerTemplate) { if ($('#cmp-uuid-' + post_uuid).length) { diff --git a/public/src/modules/composer/formatting.js b/public/src/modules/composer/formatting.js index f29e287a7f..56edd38815 100644 --- a/public/src/modules/composer/formatting.js +++ b/public/src/modules/composer/formatting.js @@ -7,61 +7,15 @@ define('composer/formatting', ['composer/controls', 'composer/preview'], functio var formatting = {}; var formattingDispatchTable = { - 'fa fa-bold': function(textarea, selectionStart, selectionEnd){ - if(selectionStart === selectionEnd){ - controls.insertIntoTextarea(textarea, '**bolded text**'); - controls.updateTextareaSelection(textarea, selectionStart + 2, selectionStart + 13); - } else { - controls.wrapSelectionInTextareaWith(textarea, '**'); - controls.updateTextareaSelection(textarea, selectionStart + 2, selectionEnd + 2); - } - }, - - 'fa fa-italic': function(textarea, selectionStart, selectionEnd){ - if(selectionStart === selectionEnd){ - controls.insertIntoTextarea(textarea, "*italicised text*"); - controls.updateTextareaSelection(textarea, selectionStart + 1, selectionStart + 16); - } else { - controls.wrapSelectionInTextareaWith(textarea, '*'); - controls.updateTextareaSelection(textarea, selectionStart + 1, selectionEnd + 1); - } - }, - - 'fa fa-list': function(textarea, selectionStart, selectionEnd){ - if(selectionStart === selectionEnd){ - controls.insertIntoTextarea(textarea, "\n* list item"); - - // Highlight "list item" - controls.updateTextareaSelection(textarea, selectionStart + 3, selectionStart + 12); - } else { - controls.wrapSelectionInTextareaWith(textarea, '\n* ', ''); - controls.updateTextareaSelection(textarea, selectionStart + 3, selectionEnd + 3); - } - }, - - 'fa fa-link': function(textarea, selectionStart, selectionEnd){ - if(selectionStart === selectionEnd){ - controls.insertIntoTextarea(textarea, "[link text](link url)"); - - // Highlight "link url" - controls.updateTextareaSelection(textarea, selectionStart + 12, selectionEnd + 20); - } else { - controls.wrapSelectionInTextareaWith(textarea, '[', '](link url)'); - - // Highlight "link url" - controls.updateTextareaSelection(textarea, selectionEnd + 3, selectionEnd + 11); - } - }, - - 'fa fa-picture-o': function(){ + 'picture-o': function(){ $('#files').click(); }, - 'fa fa-upload': function(){ + upload: function(){ $('#files').click(); }, - 'fa fa-tags': function() { + tags: function() { $('.tags-container').toggleClass('hidden'); } }; @@ -69,27 +23,35 @@ define('composer/formatting', ['composer/controls', 'composer/preview'], functio var customButtons = []; formatting.addComposerButtons = function() { - for (var button in customButtons) { - if (customButtons.hasOwnProperty(button)) { - $('.formatting-bar .btn-group form').before(''); - } + for(var x=0,numButtons=customButtons.length;x'); } - } + }; formatting.addButton = function(iconClass, onClick) { - formattingDispatchTable[iconClass] = onClick; + var name = iconClass.replace('fa fa-', ''); + + formattingDispatchTable[name] = onClick; customButtons.push({ + name: name, iconClass: iconClass }); - } + }; + + formatting.addButtonDispatch = function(name, onClick) { + formattingDispatchTable[name] = onClick; + }; formatting.addHandler = function(postContainer) { postContainer.on('click', '.formatting-bar span', function () { - var iconClass = $(this).find('i').attr('class'); - var textarea = $(this).parents('.composer').find('textarea')[0]; + var format = $(this).attr('data-format'), + textarea = $(this).parents('.composer').find('textarea')[0]; + console.log('handling', format); + + console.log(formattingDispatchTable); - if(formattingDispatchTable.hasOwnProperty(iconClass)){ - formattingDispatchTable[iconClass](textarea, textarea.selectionStart, textarea.selectionEnd); + if(formattingDispatchTable.hasOwnProperty(format)){ + formattingDispatchTable[format](textarea, textarea.selectionStart, textarea.selectionEnd); preview.render(postContainer); } }); diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js index 00fdeaf433..306d26d579 100644 --- a/src/socket.io/modules.js +++ b/src/socket.io/modules.js @@ -114,6 +114,16 @@ SocketModules.composer.stopNotifyTyping = function(socket, data) { server.in('topic_' + data.tid).emit('event:topic.stopNotifyTyping', data); }; +SocketModules.composer.getFormattingOptions = function(socket, data, callback) { + plugins.fireHook('filter:composer.formatting', { + options: [ + // { className: 'fa fa-bold' } Just an example of what needs to be set via plugins + ] + }, function(err, payload) { + callback(err, payload.options); + }); +}; + /* Chat */ SocketModules.chats.get = function(socket, data, callback) { From 94c1c2d5478d75beab05b2bd8c5fbda4fd141ed2 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 16:57:32 -0500 Subject: [PATCH 453/897] fixed loading mock data --- public/src/admin/extend/rewards.js | 12 ++++++++---- src/rewards/admin.js | 2 +- src/views/admin/extend/rewards.tpl | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 511a3b6ec3..2c31124032 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -9,11 +9,15 @@ define('admin/extend/rewards', function() { active; rewards.init = function() { - available = JSON.parse($('#rewards').val()); - active = JSON.parse($('#active').val()); + //available = JSON.parse($('#rewards').val()); + //active = JSON.parse($('#active').val()); - $('[data-selected]').each(function() { - $(this).val($(this).attr('data-selected')); + + $(window).on('action:ajaxify.end', function() { + $('[data-selected]').each(function() { + console.log($(this).attr('data-selected')); + $(this).val($(this).attr('data-selected')); + }); }); }; diff --git a/src/rewards/admin.js b/src/rewards/admin.js index ff0a56ff9c..ebc2b95a95 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -43,7 +43,7 @@ rewards.get = function(callback) { ], active: [ { - "rewardID": 0, + "rewardID": 1, "condition": "postcount", "conditional": "greaterthan", "value": 100, diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 538ac93b39..7ff08995b9 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -8,9 +8,9 @@
  • If User's - - + Is @@ -30,8 +30,8 @@ - - + +
    • From 58094d2b3b3a20a2d5503d9d19f917b92c2e3a85 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Feb 2015 17:07:01 -0500 Subject: [PATCH 454/897] removed console logs, and requiring markdown 1.0.0 plugin --- package.json | 2 +- public/src/modules/composer.js | 1 - public/src/modules/composer/formatting.js | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index 8561984d0d..f8bfb660ee 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "nconf": "~0.7.1", "nodebb-plugin-dbsearch": "^0.1.0", "nodebb-plugin-emoji-extended": "^0.4.1-4", - "nodebb-plugin-markdown": "^0.8.0", + "nodebb-plugin-markdown": "^1.0.0", "nodebb-plugin-mentions": "^0.9.0", "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 26f4e4a8f2..84c4c4e9dd 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -241,7 +241,6 @@ define('composer', [ handle: composer.posts[post_uuid] ? composer.posts[post_uuid].handle || '' : undefined, formatting: composer.formatting }; - console.log(composer.formatting); parseAndTranslate(template, data, function(composerTemplate) { if ($('#cmp-uuid-' + post_uuid).length) { diff --git a/public/src/modules/composer/formatting.js b/public/src/modules/composer/formatting.js index 56edd38815..03fb05730e 100644 --- a/public/src/modules/composer/formatting.js +++ b/public/src/modules/composer/formatting.js @@ -46,9 +46,6 @@ define('composer/formatting', ['composer/controls', 'composer/preview'], functio postContainer.on('click', '.formatting-bar span', function () { var format = $(this).attr('data-format'), textarea = $(this).parents('.composer').find('textarea')[0]; - console.log('handling', format); - - console.log(formattingDispatchTable); if(formattingDispatchTable.hasOwnProperty(format)){ formattingDispatchTable[format](textarea, textarea.selectionStart, textarea.selectionEnd); From 4f53bd59be4fd13155d22a4596f09aabd7e35a6c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 17:24:58 -0500 Subject: [PATCH 455/897] rewards - got custom inputs loading --- public/src/admin/extend/rewards.js | 69 +++++++++++++++++++++++++++--- src/rewards/admin.js | 22 ++++++++-- src/views/admin/extend/rewards.tpl | 5 ++- 3 files changed, 84 insertions(+), 12 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 2c31124032..7fb619c752 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, app, socket, bootbox */ +/* global define, app, ajaxify, socket, templates, bootbox */ define('admin/extend/rewards', function() { var rewards = {}; @@ -9,17 +9,72 @@ define('admin/extend/rewards', function() { active; rewards.init = function() { - //available = JSON.parse($('#rewards').val()); - //active = JSON.parse($('#active').val()); - - $(window).on('action:ajaxify.end', function() { + available = JSON.parse(ajaxify.variables.get('rewards')); + active = JSON.parse(ajaxify.variables.get('active')); + $('[data-selected]').each(function() { - console.log($(this).attr('data-selected')); - $(this).val($(this).attr('data-selected')); + select($(this)); + }).on('change', function() { + update($(this)); }); }); }; + function select(el) { + el.val(el.attr('data-selected')); + switch (el.attr('name')) { + case 'reward': + selectReward(el); + break; + } + } + + function update(el) { + el.attr('data-selected', el.val()); + switch (el.attr('name')) { + case 'reward': + selectReward(el); + break; + } + } + + function selectReward(el) { + var div = el.parent().find('.inputs'), + inputs, + html = ''; + + for (var reward in available) { + if (available.hasOwnProperty(reward)) { + if (parseInt(available[reward].rewardID, 10) === parseInt(el.attr('data-selected'), 10)) { + inputs = available[reward].inputs; + break; + } + } + } + + if (!inputs) { + app.alertError('Illegal reward - no inputs found! ' + el.attr('data-selected')); + } + + inputs.forEach(function(input) { + html += ''; + }); + + div.html(html); + } + return rewards; }); \ No newline at end of file diff --git a/src/rewards/admin.js b/src/rewards/admin.js index ebc2b95a95..c7fc90cf8d 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -37,8 +37,8 @@ rewards.get = function(callback) { "conditional": "lesserorequalthan" }, { - "name": "is string:", - "conditional": "isstring" + "name": "string:", + "conditional": "string" } ], active: [ @@ -65,7 +65,21 @@ rewards.get = function(callback) { { "type": "select", "name": "groupname", - "values": ["Group 1", "Group 2", "Group 3"], + "label": "Group Name:", + "values": [ + { + "name": "Group 1", + "value": "group1" + }, + { + "name": "Group 2", + "value": "group2" + }, + { + "name": "Group 3", + "value": "group3" + } + ], } ] }, @@ -76,10 +90,12 @@ rewards.get = function(callback) { { "type": "text", "name": "title", + "label": "Title:" }, { "type": "text", "name": "message", + "label": "Message:" } ] } diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 7ff08995b9..f94cf347c8 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -26,12 +26,13 @@ +
    - - + +
    From d9bd7a400de83a3f9f011bfe6f0364f65c538723 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 17:29:44 -0500 Subject: [PATCH 456/897] minor styling --- public/src/admin/extend/rewards.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 7fb619c752..0deba1328c 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -58,7 +58,7 @@ define('admin/extend/rewards', function() { } inputs.forEach(function(input) { - html += '
    '; }); div.html(html); From 82543bdeee0f004a6cde63ce684096fec871b140 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Feb 2015 17:31:05 -0500 Subject: [PATCH 457/897] fixed #2744 --- public/src/admin/manage/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index dad64e35af..d9eb888985 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -214,7 +214,7 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable) } $('#create-modal').modal('hide'); $('#create-modal').on('hidden.bs.modal', function() { - ajaxify.go('admin/users'); + ajaxify.refresh(); }); app.alertSuccess('User created!'); }); From 9291ec64f9bb432cdd8a885368bc85ce1d2dd65b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 17:47:47 -0500 Subject: [PATCH 458/897] styling --- public/less/admin/admin.less | 1 + public/less/admin/extend/rewards.less | 17 +++++++++++ public/src/admin/extend/rewards.js | 2 +- src/views/admin/extend/rewards.tpl | 44 +++++++++++++++------------ 4 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 public/less/admin/extend/rewards.less diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index ee9a87b605..c304ddd774 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -10,6 +10,7 @@ @import "./appearance/customise"; @import "./appearance/themes"; @import "./extend/plugins"; +@import "./extend/rewards"; @import "./advanced/database"; @import "./modules/alerts"; diff --git a/public/less/admin/extend/rewards.less b/public/less/admin/extend/rewards.less new file mode 100644 index 0000000000..997983ea81 --- /dev/null +++ b/public/less/admin/extend/rewards.less @@ -0,0 +1,17 @@ +#rewards { + .well { + vertical-align: top; + min-height: 100px; + } + + ul { + list-style-type: none; + padding: 0px; + margin: 0px; + + > li { + border-bottom: 1px solid #ddd; + margin-bottom: 20px; + } + } +} \ No newline at end of file diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 0deba1328c..02725f49fb 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -40,7 +40,7 @@ define('admin/extend/rewards', function() { } function selectReward(el) { - var div = el.parent().find('.inputs'), + var div = el.parents('li').find('.inputs'), inputs, html = ''; diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index f94cf347c8..8c7b9e31c3 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -7,25 +7,31 @@
    • - If User's - - Is - - - Then - +
      +
      + +
      +
      +
      + + +
      +
      +
      + +
      • From 7457b22427cdf2e2459b7568cc5b3ee418710773 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 17:48:01 -0500 Subject: [PATCH 459/897] added more api fields to rewards --- src/rewards/admin.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/rewards/admin.js b/src/rewards/admin.js index c7fc90cf8d..0da54efa7f 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -46,6 +46,10 @@ rewards.get = function(callback) { "rewardID": 1, "condition": "postcount", "conditional": "greaterthan", + "rewards": { + "title": "Here is a title", + "message": "here is a message" + }, "value": 100, "disabled": 0 }, @@ -53,6 +57,9 @@ rewards.get = function(callback) { "rewardID": 0, "condition": "lastLoggedIn", "conditional": "lesserthan", + "rewards": { + "groupname": "group2" + }, "value": 10, "disabled": 0 } From 756d03fa62d4d235571a2a14699275ff972f40f7 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Feb 2015 18:14:38 -0500 Subject: [PATCH 460/897] closes #2745 generate paths on retrieval instead of notification creation also fix follow notification path --- src/messaging.js | 53 ++++++++++++++++++++------------------- src/notifications.js | 5 ++-- src/socket.io/user.js | 1 - src/user/notifications.js | 7 ++++++ 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/messaging.js b/src/messaging.js index 339ec7798c..86ecf7014d 100644 --- a/src/messaging.js +++ b/src/messaging.js @@ -320,33 +320,34 @@ var db = require('./database'), }; function sendNotifications(fromuid, touid, messageObj, callback) { - if (!websockets.isUserOnline(touid)) { - notifications.create({ - bodyShort: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]', - bodyLong: messageObj.content, - path: nconf.get('relative_path') + '/chats/' + utils.slugify(messageObj.fromUser.username), - nid: 'chat_' + fromuid + '_' + touid, - from: fromuid - }, function(err, notification) { - if (!err && notification) { - notifications.push(notification, [touid], callback); - } - }); - - user.getSettings(messageObj.toUser.uid, function(err, settings) { - if (settings.sendChatNotifications && !parseInt(meta.config.disableEmailSubscriptions, 10)) { - emailer.send('notif_chat', touid, { - subject: '[[email:notif.chat.subject, ' + messageObj.fromUser.username + ']]', - username: messageObj.toUser.username, - summary: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]', - message: messageObj, - site_title: meta.config.title || 'NodeBB', - url: nconf.get('url'), - fromUserslug: utils.slugify(messageObj.fromUser.username) - }); - } - }); + if (websockets.isUserOnline(touid)) { + return callback(); } + + notifications.create({ + bodyShort: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]', + bodyLong: messageObj.content, + nid: 'chat_' + fromuid + '_' + touid, + from: fromuid + }, function(err, notification) { + if (!err && notification) { + notifications.push(notification, [touid], callback); + } + }); + + user.getSettings(messageObj.toUser.uid, function(err, settings) { + if (settings.sendChatNotifications && !parseInt(meta.config.disableEmailSubscriptions, 10)) { + emailer.send('notif_chat', touid, { + subject: '[[email:notif.chat.subject, ' + messageObj.fromUser.username + ']]', + username: messageObj.toUser.username, + summary: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]', + message: messageObj, + site_title: meta.config.title || 'NodeBB', + url: nconf.get('url'), + fromUserslug: utils.slugify(messageObj.fromUser.username) + }); + } + }); } }(exports)); diff --git a/src/notifications.js b/src/notifications.js index 0008fb1f69..5beed15f9c 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -55,11 +55,12 @@ var async = require('async'), } if (notification.from && !notification.image) { - User.getUserField(notification.from, 'picture', function(err, picture) { + User.getUserFields(notification.from, ['username', 'userslug', 'picture'], function(err, userData) { if (err) { return next(err); } - notification.image = picture; + notification.image = userData.picture; + notification.user = userData; next(null, notification); }); return; diff --git a/src/socket.io/user.js b/src/socket.io/user.js index fd23405758..15aa0e2ba6 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -294,7 +294,6 @@ SocketUser.follow = function(socket, data, callback) { notifications.create({ bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]', - path: nconf.get('relative_path') + '/user/' + userData.userslug, nid: 'follow:' + data.uid + ':uid:' + socket.uid, from: socket.uid }, function(err, notification) { diff --git a/src/user/notifications.js b/src/user/notifications.js index 523b9e4903..706c227097 100644 --- a/src/user/notifications.js +++ b/src/user/notifications.js @@ -124,6 +124,13 @@ var async = require('async'), } notification.path = pidToPaths[notification.pid] || notification.path || ''; + + if (notification.nid.startsWith('chat')) { + notification.path = nconf.get('relative_path') + '/chats/' + notification.user.userslug; + } else if (notification.nid.startsWith('follow')) { + notification.path = nconf.get('relative_path') + '/user/' + notification.user.userslug; + } + notification.datetimeISO = utils.toISOString(notification.datetime); return notification; }); From b1c37775c5fa548ba1234822b53f09300eb5d262 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 18:22:21 -0500 Subject: [PATCH 461/897] more styling --- public/less/admin/extend/rewards.less | 4 ++++ src/rewards/admin.js | 4 ++-- src/views/admin/extend/rewards.tpl | 9 +++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/public/less/admin/extend/rewards.less b/public/less/admin/extend/rewards.less index 997983ea81..cf62159695 100644 --- a/public/less/admin/extend/rewards.less +++ b/public/less/admin/extend/rewards.less @@ -2,6 +2,10 @@ .well { vertical-align: top; min-height: 100px; + + &.pull-right { + min-height: 0px; + } } ul { diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 0da54efa7f..32b1321a8f 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -51,7 +51,7 @@ rewards.get = function(callback) { "message": "here is a message" }, "value": 100, - "disabled": 0 + "disabled": false }, { "rewardID": 0, @@ -61,7 +61,7 @@ rewards.get = function(callback) { "groupname": "group2" }, "value": 10, - "disabled": 0 + "disabled": true } ], rewards: [ diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 8c7b9e31c3..a45f319847 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -33,6 +33,15 @@
    +
    + + + + + + +
    +
    From 4145046e02374bb05e0dc526a26e1e8188799847 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 18:46:36 -0500 Subject: [PATCH 462/897] rewards: got everything loading --- public/src/admin/extend/rewards.js | 15 ++++++++++++++- src/views/admin/extend/rewards.tpl | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 02725f49fb..712089d401 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -40,7 +40,8 @@ define('admin/extend/rewards', function() { } function selectReward(el) { - var div = el.parents('li').find('.inputs'), + var parent = el.parents('[data-rewardID]'), + div = parent.find('.inputs'), inputs, html = ''; @@ -48,6 +49,7 @@ define('admin/extend/rewards', function() { if (available.hasOwnProperty(reward)) { if (parseInt(available[reward].rewardID, 10) === parseInt(el.attr('data-selected'), 10)) { inputs = available[reward].inputs; + parent.attr('data-rewardID', available[reward].rewardID); break; } } @@ -74,6 +76,17 @@ define('admin/extend/rewards', function() { }); div.html(html); + + $('[data-rewardID]').each(function(i) { + var div = $(this).find('.inputs'), + rewards = active[i].rewards; + + for (var reward in rewards) { + if (rewards.hasOwnProperty(reward)) { + div.find('[name="' + reward + '"]').val(rewards[reward]); + } + } + }); } return rewards; diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index a45f319847..d2deab96d1 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -6,7 +6,7 @@
      -
    • +

    • @@ -34,11 +34,11 @@
      - + - + - +
      From 029ae11ed56aaebf0864bbc6139d731f4cac1f19 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 19:10:01 -0500 Subject: [PATCH 464/897] rewards - cleanup --- public/src/admin/extend/rewards.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 0bf6fa35d9..b73ad877b0 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -20,19 +20,24 @@ define('admin/extend/rewards', function() { }); $('.delete').on('click', function() { - var id = $(this).parents('[data-index]'); + var parent = $(this).parents('[data-index]'), + id = parent.attr('data-index'); delete active[id]; // send delete api call + + parent.remove(); + return false; }); $('.toggle').on('click', function() { var btn = $(this), disabled = btn.html() === 'Disabled', - id = $(this).parents('[data-index]'); + id = $(this).parents('[data-index]').attr('data-index'); btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enabled' : 'Disabled'); // send disable api call + return false; }); }); }; @@ -93,6 +98,10 @@ define('admin/extend/rewards', function() { div.html(html); + populateInputs(); + } + + function populateInputs() { $('[data-rewardID]').each(function(i) { var div = $(this).find('.inputs'), rewards = active[i].rewards; From 88aa4276695baf626ccef35b94e1f8bd8de225ea Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Feb 2015 19:33:33 -0500 Subject: [PATCH 465/897] updated upgrade script so that it does not rely on Groups.list, as the method has changed between v0.5.0 and v0.6.0. Also added setImmediate call so eachLimit doesn't explode --- src/upgrade.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/upgrade.js b/src/upgrade.js index 977854ab01..117b79848e 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -250,11 +250,24 @@ Upgrade.upgrade = function(callback) { }, next); } - Groups.list({showSystemGroups: true}, function(err, groups) { + async.waterfall([ + async.apply(db.getSetMembers, 'groups'), + function(groups, next) { + async.filter(groups, function(group, next) { + db.getObjectField('group:' + group, 'hidden', function(err, hidden) { + next(!parseInt(hidden, 10)); + }, next); + }, function(groups) { + next(null, groups); + }); + } + ], function(err, groups) { if (err) { return next(err); } + groups.push('administrators', 'registered-users'); + async.eachLimit(cids, 50, function(cid, next) { upgradePrivileges(cid, groups, next); }, next); @@ -445,7 +458,7 @@ Upgrade.upgrade = function(callback) { if (setting.dailyDigestFreq !== 'off') { db.sortedSetAdd('digest:' + setting.dailyDigestFreq + ':uids', now, setting.uid, next); } else { - next(false); + setImmediate(next); } }, function(err) { if (err) { From 4acf8cafee1bee1b6b6e57a69b698876069b33e7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 21:51:32 -0500 Subject: [PATCH 466/897] rewards: adding new rows --- public/src/admin/extend/rewards.js | 18 +++++++++++++++++- src/views/admin/extend/rewards.tpl | 5 +++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index b73ad877b0..b19f092a69 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -39,6 +39,8 @@ define('admin/extend/rewards', function() { // send disable api call return false; }); + + $('#new').on('click', newReward); }); }; @@ -77,7 +79,7 @@ define('admin/extend/rewards', function() { } if (!inputs) { - app.alertError('Illegal reward - no inputs found! ' + el.attr('data-selected')); + return app.alertError('Illegal reward - no inputs found! ' + el.attr('data-selected')); } inputs.forEach(function(input) { @@ -114,5 +116,19 @@ define('admin/extend/rewards', function() { }); } + function newReward() { + var ul = $('#active'), + li = $('#active li').last().clone(true); + + li.attr('data-index', parseInt(li.attr('data-index') + 1, 10)) + .attr('data-rewardID', ''); + + li.find('.inputs').html(''); + li.find('[name="reward"]').val(''); + + + ul.append(li); + } + return rewards; }); \ No newline at end of file diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 8fc7cd2cb9..360d0b85ec 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -4,7 +4,7 @@
      Rewards
      -
        +
        • @@ -54,8 +54,9 @@
          -
          Save Settings
          +
          Rewards Control
          +
          From 2cc6f0c5076aeec94a8130f2773a527511f0a833 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 21:56:50 -0500 Subject: [PATCH 467/897] fixed disable logic --- public/src/admin/extend/rewards.js | 6 +++--- src/views/admin/extend/rewards.tpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index b19f092a69..1445f2cce1 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -32,10 +32,10 @@ define('admin/extend/rewards', function() { $('.toggle').on('click', function() { var btn = $(this), - disabled = btn.html() === 'Disabled', + disabled = btn.html() === 'Enable', id = $(this).parents('[data-index]').attr('data-index'); - btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enabled' : 'Disabled'); + btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable'); // send disable api call return false; }); @@ -125,7 +125,7 @@ define('admin/extend/rewards', function() { li.find('.inputs').html(''); li.find('[name="reward"]').val(''); - + li.find('.toggle').removeClass('btn-warning').addClass('btn-success').html('Enable'); ul.append(li); } diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 360d0b85ec..5730e4b750 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -36,9 +36,9 @@
          - + - +
          @@ -56,7 +56,7 @@
          Rewards Control
          -
          +
          From 46e0fad2d8b5022337a0f10cd692bfc7bf23cdf7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 22:06:52 -0500 Subject: [PATCH 468/897] rewards: code organization, getting ready to code saving/loading of active rewards --- src/rewards/admin.js | 222 +++++++++++++++++++++++-------------------- 1 file changed, 117 insertions(+), 105 deletions(-) diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 32b1321a8f..3a9b0b0580 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -1,121 +1,133 @@ "use strict"; -var rewards = {}; +var rewards = {}, + async = require('async'), + plugins = require('../plugins'); + +var defaults = { + conditionals: [ + { + "name": ">", + "conditional": "greaterthan" + }, + { + "name": ">=", + "conditional": "greaterorequalthan" + }, + { + "name": "<", + "conditional": "lesserthan" + }, + { + "name": "<=", + "conditional": "lesserorequalthan" + }, + { + "name": "string:", + "conditional": "string" + } + ] +}; rewards.get = function(callback) { - callback(false, { - conditions: [ - { - "name": "Reputation", - "condition": "reputation" - }, - { - "name": "Post Count", - "condition": "postcount" - }, - { - "name": "Last Logged in Time", - "condition": "lastLoggedIn" - } - ], - conditionals: [ - { - "name": ">", - "conditional": "greaterthan" - }, - { - "name": ">=", - "conditional": "greaterorequalthan" - }, - { - "name": "<", - "conditional": "lesserthan" - }, - { - "name": "<=", - "conditional": "lesserorequalthan" - }, - { - "name": "string:", - "conditional": "string" - } - ], - active: [ - { - "rewardID": 1, - "condition": "postcount", - "conditional": "greaterthan", - "rewards": { - "title": "Here is a title", - "message": "here is a message" + async.parallel({ + active: getActiveRewards, + conditions: function(next) { + plugins.fireHook('filter:rewards.conditions', [ + { + "name": "Reputation", + "condition": "reputation" }, - "value": 100, - "disabled": false - }, - { - "rewardID": 0, - "condition": "lastLoggedIn", - "conditional": "lesserthan", - "rewards": { - "groupname": "group2" + { + "name": "Post Count", + "condition": "postcount" }, - "value": 10, - "disabled": true - } - ], - rewards: [ - { - "rewardID": 0, - "name": "Add to Group", - "inputs": [ - { - "type": "select", - "name": "groupname", - "label": "Group Name:", - "values": [ - { - "name": "Group 1", - "value": "group1" - }, - { - "name": "Group 2", - "value": "group2" - }, - { - "name": "Group 3", - "value": "group3" - } - ], - } - ] - }, - { - "rewardID": 1, - "name": "Send alert message", - "inputs": [ - { - "type": "text", - "name": "title", - "label": "Title:" - }, - { - "type": "text", - "name": "message", - "label": "Message:" - } - ] - } - ] - }); + { + "name": "Last Logged in Time", + "condition": "lastLoggedIn" + } + ], next); + }, + conditionals: function(next) { + plugins.fireHook('filter:rewards.conditionals', defaults.conditionals, next); + }, + rewards: function(next) { + plugins.fireHook('filter:rewards.rewards', [ + { + "rewardID": 0, + "name": "Add to Group", + "inputs": [ + { + "type": "select", + "name": "groupname", + "label": "Group Name:", + "values": [ + { + "name": "Group 1", + "value": "group1" + }, + { + "name": "Group 2", + "value": "group2" + }, + { + "name": "Group 3", + "value": "group3" + } + ], + } + ] + }, + { + "rewardID": 1, + "name": "Send alert message", + "inputs": [ + { + "type": "text", + "name": "title", + "label": "Title:" + }, + { + "type": "text", + "name": "message", + "label": "Message:" + } + ] + } + ], next); + } + }, callback); }; function getConditions() { } -function getRewards() { - +function getActiveRewards(callback) { + callback(false, [ + { + "rewardID": 1, + "condition": "postcount", + "conditional": "greaterthan", + "rewards": { + "title": "Here is a title", + "message": "here is a message" + }, + "value": 100, + "disabled": false + }, + { + "rewardID": 0, + "condition": "lastLoggedIn", + "conditional": "lesserthan", + "rewards": { + "groupname": "group2" + }, + "value": 10, + "disabled": true + } + ]); } module.exports = rewards; \ No newline at end of file From 91c02d4e29407dbff64d3de4fd7d3c75ae6bdd67 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 22:19:04 -0500 Subject: [PATCH 469/897] ditching rewardID in favour of verbose id's --- public/src/admin/extend/rewards.js | 10 +++++----- src/rewards/admin.js | 8 ++++---- src/views/admin/extend/rewards.tpl | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 1445f2cce1..9dae5a731b 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -63,16 +63,16 @@ define('admin/extend/rewards', function() { } function selectReward(el) { - var parent = el.parents('[data-rewardID]'), + var parent = el.parents('[data-id]'), div = parent.find('.inputs'), inputs, html = ''; for (var reward in available) { if (available.hasOwnProperty(reward)) { - if (parseInt(available[reward].rewardID, 10) === parseInt(el.attr('data-selected'), 10)) { + if (available[reward].id === el.attr('data-selected')) { inputs = available[reward].inputs; - parent.attr('data-rewardID', available[reward].rewardID); + parent.attr('data-id', available[reward].id); break; } } @@ -104,7 +104,7 @@ define('admin/extend/rewards', function() { } function populateInputs() { - $('[data-rewardID]').each(function(i) { + $('[data-id]').each(function(i) { var div = $(this).find('.inputs'), rewards = active[i].rewards; @@ -121,7 +121,7 @@ define('admin/extend/rewards', function() { li = $('#active li').last().clone(true); li.attr('data-index', parseInt(li.attr('data-index') + 1, 10)) - .attr('data-rewardID', ''); + .attr('data-id', ''); li.find('.inputs').html(''); li.find('[name="reward"]').val(''); diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 3a9b0b0580..dfb70ae78f 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -55,7 +55,7 @@ rewards.get = function(callback) { rewards: function(next) { plugins.fireHook('filter:rewards.rewards', [ { - "rewardID": 0, + "id": "core:add-to-group", "name": "Add to Group", "inputs": [ { @@ -80,7 +80,7 @@ rewards.get = function(callback) { ] }, { - "rewardID": 1, + "id": "core:alert-user", "name": "Send alert message", "inputs": [ { @@ -107,7 +107,7 @@ function getConditions() { function getActiveRewards(callback) { callback(false, [ { - "rewardID": 1, + "id": "core:alert-user", "condition": "postcount", "conditional": "greaterthan", "rewards": { @@ -118,7 +118,7 @@ function getActiveRewards(callback) { "disabled": false }, { - "rewardID": 0, + "id": "core:add-to-group", "condition": "lastLoggedIn", "conditional": "lesserthan", "rewards": { diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 5730e4b750..cc628cbf5b 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -6,7 +6,7 @@
            -
          • +

          • +
            From cd26f5d06db66d094a20221de62055462f22bd5b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 22:44:23 -0500 Subject: [PATCH 470/897] passing in values for saving rewards --- public/src/admin/extend/rewards.js | 26 ++++++++++++++++-- src/socket.io/admin.js | 1 + src/socket.io/admin/rewards.js | 13 +++++++++ src/views/admin/extend/rewards.tpl | 42 ++++++++++++++++-------------- 4 files changed, 61 insertions(+), 21 deletions(-) create mode 100644 src/socket.io/admin/rewards.js diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 9dae5a731b..54177ea4c9 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -41,13 +41,14 @@ define('admin/extend/rewards', function() { }); $('#new').on('click', newReward); + $('#save').on('click', saveRewards); }); }; function select(el) { el.val(el.attr('data-selected')); switch (el.attr('name')) { - case 'reward': + case 'id': selectReward(el); break; } @@ -56,7 +57,7 @@ define('admin/extend/rewards', function() { function update(el) { el.attr('data-selected', el.val()); switch (el.attr('name')) { - case 'reward': + case 'id': selectReward(el); break; } @@ -130,5 +131,26 @@ define('admin/extend/rewards', function() { ul.append(li); } + function saveRewards() { + var activeRewards = []; + + $('#active li').each(function() { + var data = $(this).find('form.main').serializeArray(); + + data.rewards = $(this).find('form.rewards').serializeArray(); + data.disabled = $(this).find('.toggle').html() === 'Enable'; + + activeRewards.push(data); + }); + + socket.emit('admin.rewards.save', activeRewards, function(err) { + if (err) { + app.alertError(err.message); + } else { + app.alertSuccess('Successfully saved rewards'); + } + }); + } + return rewards; }); \ No newline at end of file diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index a770af5c53..49b3744dbb 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -25,6 +25,7 @@ var async = require('async'), categories: require('./admin/categories'), groups: require('./admin/groups'), tags: require('./admin/tags'), + rewards: require('./admin/rewards'), themes: {}, plugins: {}, widgets: {}, diff --git a/src/socket.io/admin/rewards.js b/src/socket.io/admin/rewards.js new file mode 100644 index 0000000000..70ac1fecf5 --- /dev/null +++ b/src/socket.io/admin/rewards.js @@ -0,0 +1,13 @@ +"use strict"; + +var rewards = require('../../rewards'), + rewards = {}; + +rewards.save = function(socket, data, callback) { + console.log(data); + callback(new Error('derp')); + //callback(err ? err.message : null); +}; + + +module.exports = rewards; \ No newline at end of file diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index cc628cbf5b..af6dac1865 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -3,10 +3,10 @@
            Rewards
            - -
              - -
            • +
                + +
              • +

                - +

                -
                +
                • + +
                -
                - - - - - - -
                -
                - - -
              - + + +
              + + + + + + +
              +
              +
              • + +
            From 67b693cd3a708c336baf232b309d265fa833a564 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 23:02:52 -0500 Subject: [PATCH 471/897] pass in expected format of active rewards --- public/src/admin/extend/rewards.js | 15 ++++++++++++--- src/rewards/admin.js | 6 +++++- src/views/admin/extend/rewards.tpl | 6 +++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 54177ea4c9..77055fe32e 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -135,11 +135,20 @@ define('admin/extend/rewards', function() { var activeRewards = []; $('#active li').each(function() { - var data = $(this).find('form.main').serializeArray(); + var data = {rewards: {}}, + main = $(this).find('form.main').serializeArray(), + rewards = $(this).find('form.rewards').serializeArray(); + + main.forEach(function(obj) { + data[obj.name] = obj.value; + }); + + rewards.forEach(function(obj) { + data.rewards[obj.name] = obj.value; + }); - data.rewards = $(this).find('form.rewards').serializeArray(); data.disabled = $(this).find('.toggle').html() === 'Enable'; - + activeRewards.push(data); }); diff --git a/src/rewards/admin.js b/src/rewards/admin.js index dfb70ae78f..a279f44284 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -2,7 +2,8 @@ var rewards = {}, async = require('async'), - plugins = require('../plugins'); + plugins = require('../plugins'), + db = require('../database'); var defaults = { conditionals: [ @@ -29,6 +30,9 @@ var defaults = { ] }; +rewards.save = function(data, callback) { + +}; rewards.get = function(callback) { async.parallel({ diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index af6dac1865..9d060fe965 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -6,7 +6,7 @@
            • -
              +

              - -
              + +
              From e5115c0cf2e9a6cf15d09bcf70d535a372ca895a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 23:15:37 -0500 Subject: [PATCH 472/897] differentiate between rid and id --- public/src/admin/extend/rewards.js | 23 ++++++++++++----------- src/rewards/admin.js | 16 +++++++++++----- src/views/admin/extend/rewards.tpl | 6 +++--- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 77055fe32e..b9e837159d 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -20,8 +20,8 @@ define('admin/extend/rewards', function() { }); $('.delete').on('click', function() { - var parent = $(this).parents('[data-index]'), - id = parent.attr('data-index'); + var parent = $(this).parents('[data-id]'), + id = parent.attr('data-id'); delete active[id]; // send delete api call @@ -33,7 +33,7 @@ define('admin/extend/rewards', function() { $('.toggle').on('click', function() { var btn = $(this), disabled = btn.html() === 'Enable', - id = $(this).parents('[data-index]').attr('data-index'); + id = $(this).parents('[data-id]').attr('data-id'); btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable'); // send disable api call @@ -48,7 +48,7 @@ define('admin/extend/rewards', function() { function select(el) { el.val(el.attr('data-selected')); switch (el.attr('name')) { - case 'id': + case 'rid': selectReward(el); break; } @@ -57,23 +57,23 @@ define('admin/extend/rewards', function() { function update(el) { el.attr('data-selected', el.val()); switch (el.attr('name')) { - case 'id': + case 'rid': selectReward(el); break; } } function selectReward(el) { - var parent = el.parents('[data-id]'), + var parent = el.parents('[data-rid]'), div = parent.find('.inputs'), inputs, html = ''; for (var reward in available) { if (available.hasOwnProperty(reward)) { - if (available[reward].id === el.attr('data-selected')) { + if (available[reward].rid === el.attr('data-selected')) { inputs = available[reward].inputs; - parent.attr('data-id', available[reward].id); + parent.attr('data-rid', available[reward].rid); break; } } @@ -105,7 +105,7 @@ define('admin/extend/rewards', function() { } function populateInputs() { - $('[data-id]').each(function(i) { + $('[data-rid]').each(function(i) { var div = $(this).find('.inputs'), rewards = active[i].rewards; @@ -121,8 +121,8 @@ define('admin/extend/rewards', function() { var ul = $('#active'), li = $('#active li').last().clone(true); - li.attr('data-index', parseInt(li.attr('data-index') + 1, 10)) - .attr('data-id', ''); + li.attr('data-id', parseInt(li.attr('data-id') + 1, 10)) + .attr('data-rid', ''); li.find('.inputs').html(''); li.find('[name="reward"]').val(''); @@ -147,6 +147,7 @@ define('admin/extend/rewards', function() { data.rewards[obj.name] = obj.value; }); + data.id = $(this).attr('data-id'); data.disabled = $(this).find('.toggle').html() === 'Enable'; activeRewards.push(data); diff --git a/src/rewards/admin.js b/src/rewards/admin.js index a279f44284..688f3dcce5 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -31,7 +31,11 @@ var defaults = { }; rewards.save = function(data, callback) { - + data.forEach(function(reward) { + if (reward.disabled) { + //db.setAdd + } + }); }; rewards.get = function(callback) { @@ -59,7 +63,7 @@ rewards.get = function(callback) { rewards: function(next) { plugins.fireHook('filter:rewards.rewards', [ { - "id": "core:add-to-group", + "rid": "core:add-to-group", "name": "Add to Group", "inputs": [ { @@ -84,7 +88,7 @@ rewards.get = function(callback) { ] }, { - "id": "core:alert-user", + "rid": "core:alert-user", "name": "Send alert message", "inputs": [ { @@ -111,7 +115,8 @@ function getConditions() { function getActiveRewards(callback) { callback(false, [ { - "id": "core:alert-user", + "id": 0, + "rid": "core:alert-user", "condition": "postcount", "conditional": "greaterthan", "rewards": { @@ -122,7 +127,8 @@ function getActiveRewards(callback) { "disabled": false }, { - "id": "core:add-to-group", + "id": 1, + "rid": "core:add-to-group", "condition": "lastLoggedIn", "conditional": "lesserthan", "rewards": { diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 9d060fe965..672e41fc7c 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -5,7 +5,7 @@
                -
              • +

              • @@ -26,9 +26,9 @@

                - - +
                From 5f54de3b37cc3ffa9ad777a8fbc636b0ae9e5fdb Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 23:39:39 -0500 Subject: [PATCH 473/897] successfully got loading and saving of rewards working --- public/src/admin/extend/rewards.js | 16 +++++----- src/rewards/admin.js | 50 ++++++++++++++++++++++++++---- src/socket.io/admin/rewards.js | 12 +++---- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index b9e837159d..645f5b0d98 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -106,12 +106,14 @@ define('admin/extend/rewards', function() { function populateInputs() { $('[data-rid]').each(function(i) { - var div = $(this).find('.inputs'), - rewards = active[i].rewards; - - for (var reward in rewards) { - if (rewards.hasOwnProperty(reward)) { - div.find('[name="' + reward + '"]').val(rewards[reward]); + if (active[i]) { + var div = $(this).find('.inputs'), + rewards = active[i].rewards; + + for (var reward in rewards) { + if (rewards.hasOwnProperty(reward)) { + div.find('[name="' + reward + '"]').val(rewards[reward]); + } } } }); @@ -121,7 +123,7 @@ define('admin/extend/rewards', function() { var ul = $('#active'), li = $('#active li').last().clone(true); - li.attr('data-id', parseInt(li.attr('data-id') + 1, 10)) + li.attr('data-id', parseInt(li.attr('data-id'), 10) + 1) .attr('data-rid', ''); li.find('.inputs').html(''); diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 688f3dcce5..8f5fc8b40c 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -31,11 +31,24 @@ var defaults = { }; rewards.save = function(data, callback) { - data.forEach(function(reward) { - if (reward.disabled) { - //db.setAdd - } - }); + function save(data, next) { + var rewards = data.rewards; + delete data.rewards; + + async.parallel([ + function(next) { + db.setAdd('rewards:list', data.id, next); + }, + function(next) { + db.setObject('rewards:id:' + data.id, data, next); + }, + function(next) { + db.setObject('rewards:id:' + data.id + ':rewards', rewards, next); + } + ], next); + } + + async.each(data, save, callback); }; rewards.get = function(callback) { @@ -113,6 +126,31 @@ function getConditions() { } function getActiveRewards(callback) { + var activeRewards = []; + + function load(id, next) { + async.parallel({ + main: function(next) { + db.getObject('rewards:id:' + id, next); + }, + rewards: function(next) { + db.getObject('rewards:id:' + id + ':rewards', next); + } + }, function(err, data) { + data.main.rewards = data.rewards; + activeRewards.push(data.main); + + next(err); + }); + } + + db.getSetMembers('rewards:list', function(err, rewards) { + async.eachSeries(rewards, load, function(err) { + callback(err, activeRewards); + }); + }); + +/* callback(false, [ { "id": 0, @@ -137,7 +175,7 @@ function getActiveRewards(callback) { "value": 10, "disabled": true } - ]); + ]);*/ } module.exports = rewards; \ No newline at end of file diff --git a/src/socket.io/admin/rewards.js b/src/socket.io/admin/rewards.js index 70ac1fecf5..36e8b66c2c 100644 --- a/src/socket.io/admin/rewards.js +++ b/src/socket.io/admin/rewards.js @@ -1,13 +1,11 @@ "use strict"; -var rewards = require('../../rewards'), - rewards = {}; +var rewardsAdmin = require('../../rewards/admin'), + SocketRewards = {}; -rewards.save = function(socket, data, callback) { - console.log(data); - callback(new Error('derp')); - //callback(err ? err.message : null); +SocketRewards.save = function(socket, data, callback) { + rewardsAdmin.save(data, callback); }; -module.exports = rewards; \ No newline at end of file +module.exports = SocketRewards; \ No newline at end of file From c844400ab9834ee1a36d9b804b5394159c37e167 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 23:40:23 -0500 Subject: [PATCH 474/897] cleanup and fix for adding new rewards --- public/src/admin/extend/rewards.js | 2 +- src/rewards/admin.js | 27 --------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 645f5b0d98..b57c1c4cee 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -127,7 +127,7 @@ define('admin/extend/rewards', function() { .attr('data-rid', ''); li.find('.inputs').html(''); - li.find('[name="reward"]').val(''); + li.find('[name="rid"]').val(''); li.find('.toggle').removeClass('btn-warning').addClass('btn-success').html('Enable'); ul.append(li); diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 8f5fc8b40c..dc1103f3ae 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -149,33 +149,6 @@ function getActiveRewards(callback) { callback(err, activeRewards); }); }); - -/* - callback(false, [ - { - "id": 0, - "rid": "core:alert-user", - "condition": "postcount", - "conditional": "greaterthan", - "rewards": { - "title": "Here is a title", - "message": "here is a message" - }, - "value": 100, - "disabled": false - }, - { - "id": 1, - "rid": "core:add-to-group", - "condition": "lastLoggedIn", - "conditional": "lesserthan", - "rewards": { - "groupname": "group2" - }, - "value": 10, - "disabled": true - } - ]);*/ } module.exports = rewards; \ No newline at end of file From 09086f7d30d5a89e80102cdb2341c3ee007e1b59 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 23:49:36 -0500 Subject: [PATCH 475/897] deleting rewards --- public/src/admin/extend/rewards.js | 25 ++++++++++++++----------- src/rewards/admin.js | 16 +++++++++++++++- src/socket.io/admin/rewards.js | 4 ++++ 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index b57c1c4cee..5dd26c1821 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -19,12 +19,19 @@ define('admin/extend/rewards', function() { update($(this)); }); + populateInputs(); + $('.delete').on('click', function() { var parent = $(this).parents('[data-id]'), id = parent.attr('data-id'); - delete active[id]; - // send delete api call + socket.emit('admin.rewards.delete', {id: id}, function(err) { + if (err) { + app.alertError(err.message); + } else { + app.alertSuccess('Successfully deleted reward'); + } + }); parent.remove(); return false; @@ -100,20 +107,16 @@ define('admin/extend/rewards', function() { }); div.html(html); - - populateInputs(); } function populateInputs() { $('[data-rid]').each(function(i) { - if (active[i]) { - var div = $(this).find('.inputs'), - rewards = active[i].rewards; + var div = $(this).find('.inputs'), + rewards = active[i].rewards; - for (var reward in rewards) { - if (rewards.hasOwnProperty(reward)) { - div.find('[name="' + reward + '"]').val(rewards[reward]); - } + for (var reward in rewards) { + if (rewards.hasOwnProperty(reward)) { + div.find('[name="' + reward + '"]').val(rewards[reward]); } } }); diff --git a/src/rewards/admin.js b/src/rewards/admin.js index dc1103f3ae..658c286dcb 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -32,7 +32,7 @@ var defaults = { rewards.save = function(data, callback) { function save(data, next) { - var rewards = data.rewards; + var rewards = data.rewards || {}; delete data.rewards; async.parallel([ @@ -51,6 +51,20 @@ rewards.save = function(data, callback) { async.each(data, save, callback); }; +rewards.delete = function(data, callback) { + async.parallel([ + function(next) { + db.setRemove('rewards:list', data.id, next); + }, + function(next) { + db.delete('rewards:id:' + data.id, next); + }, + function(next) { + db.delete('rewards:id:' + data.id + ':rewards', next); + } + ], callback); +}; + rewards.get = function(callback) { async.parallel({ active: getActiveRewards, diff --git a/src/socket.io/admin/rewards.js b/src/socket.io/admin/rewards.js index 36e8b66c2c..b130a25455 100644 --- a/src/socket.io/admin/rewards.js +++ b/src/socket.io/admin/rewards.js @@ -7,5 +7,9 @@ SocketRewards.save = function(socket, data, callback) { rewardsAdmin.save(data, callback); }; +SocketRewards.delete = function(socket, data, callback) { + rewardsAdmin.delete(data, callback); +}; + module.exports = SocketRewards; \ No newline at end of file From 8373f7359ef2443531e1db1bf28d19a78903438b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Feb 2015 23:53:50 -0500 Subject: [PATCH 476/897] don't error out if reward not filled --- src/rewards/admin.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 658c286dcb..185ad6b1e5 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -32,7 +32,11 @@ var defaults = { rewards.save = function(data, callback) { function save(data, next) { - var rewards = data.rewards || {}; + if (!Object.keys(data.rewards).length) { + return next(); + } + + var rewards = data.rewards; delete data.rewards; async.parallel([ From 1998f102d6380060c4f4cbadb648cb37af0c6298 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 00:26:19 -0500 Subject: [PATCH 477/897] using tjs to load new lines instead of cloning --- public/src/admin/extend/rewards.js | 93 +++++++++++++++++------------- src/views/admin/extend/rewards.tpl | 2 + 2 files changed, 56 insertions(+), 39 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 5dd26c1821..5fa1e25322 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -6,49 +6,54 @@ define('admin/extend/rewards', function() { var available, - active; + active, + conditions, + conditionals; rewards.init = function() { $(window).on('action:ajaxify.end', function() { available = JSON.parse(ajaxify.variables.get('rewards')); active = JSON.parse(ajaxify.variables.get('active')); + conditions = JSON.parse(ajaxify.variables.get('conditions')); + conditionals = JSON.parse(ajaxify.variables.get('conditionals')); $('[data-selected]').each(function() { select($(this)); - }).on('change', function() { - update($(this)); }); - populateInputs(); - - $('.delete').on('click', function() { - var parent = $(this).parents('[data-id]'), - id = parent.attr('data-id'); - - socket.emit('admin.rewards.delete', {id: id}, function(err) { - if (err) { - app.alertError(err.message); - } else { - app.alertSuccess('Successfully deleted reward'); - } + $('#active') + .on('[data-selected]', 'change', function() { + update($(this)); + }) + .on('.delete', 'click', function() { + var parent = $(this).parents('[data-id]'), + id = parent.attr('data-id'); + + socket.emit('admin.rewards.delete', {id: id}, function(err) { + if (err) { + app.alertError(err.message); + } else { + app.alertSuccess('Successfully deleted reward'); + } + }); + + parent.remove(); + return false; + }) + .on('.toggle', 'click', function() { + var btn = $(this), + disabled = btn.html() === 'Enable', + id = $(this).parents('[data-id]').attr('data-id'); + + btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable'); + // send disable api call + return false; }); - parent.remove(); - return false; - }); - - $('.toggle').on('click', function() { - var btn = $(this), - disabled = btn.html() === 'Enable', - id = $(this).parents('[data-id]').attr('data-id'); - - btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable'); - // send disable api call - return false; - }); - $('#new').on('click', newReward); $('#save').on('click', saveRewards); + + populateInputs(); }); }; @@ -124,16 +129,26 @@ define('admin/extend/rewards', function() { function newReward() { var ul = $('#active'), - li = $('#active li').last().clone(true); - - li.attr('data-id', parseInt(li.attr('data-id'), 10) + 1) - .attr('data-rid', ''); - - li.find('.inputs').html(''); - li.find('[name="rid"]').val(''); - li.find('.toggle').removeClass('btn-warning').addClass('btn-success').html('Enable'); - - ul.append(li); + id = parseInt($('#active li').last().attr('data-id'), 10); + + var data = { + active: [{ + id: id ? id + 1 : 0, + disabled: true, + value: '' + }], + conditions: conditions, + conditionals: conditionals, + rewards: available + }; + + var ul = $('#active'); + + templates.parse('admin/extend/rewards', 'active', data, function(li) { + li = $(li); + li.find('[name="rid"]').val(''); + ul.append(li); + }); } function saveRewards() { diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 672e41fc7c..87129fe3c7 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -52,6 +52,8 @@
              + +
          From 5fcbffe65235cbe2be5cdbcd379adc1bc4700329 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 00:29:15 -0500 Subject: [PATCH 478/897] fixed delegate syntax --- public/src/admin/extend/rewards.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 5fa1e25322..63108e8ad2 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -22,10 +22,10 @@ define('admin/extend/rewards', function() { }); $('#active') - .on('[data-selected]', 'change', function() { + .on('change', '[data-selected]', function() { update($(this)); }) - .on('.delete', 'click', function() { + .on('click', '.delete', function() { var parent = $(this).parents('[data-id]'), id = parent.attr('data-id'); @@ -40,7 +40,7 @@ define('admin/extend/rewards', function() { parent.remove(); return false; }) - .on('.toggle', 'click', function() { + .on('click', '.toggle', function() { var btn = $(this), disabled = btn.html() === 'Enable', id = $(this).parents('[data-id]').attr('data-id'); @@ -142,8 +142,6 @@ define('admin/extend/rewards', function() { rewards: available }; - var ul = $('#active'); - templates.parse('admin/extend/rewards', 'active', data, function(li) { li = $(li); li.find('[name="rid"]').val(''); From 332110b8e28576965632591632e8ff2297f789b7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 12:16:04 -0500 Subject: [PATCH 479/897] bugfix --- public/src/admin/extend/rewards.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 63108e8ad2..cff8f7f74e 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -129,11 +129,11 @@ define('admin/extend/rewards', function() { function newReward() { var ul = $('#active'), - id = parseInt($('#active li').last().attr('data-id'), 10); + id = $('#active li').last().attr('data-id'); var data = { active: [{ - id: id ? id + 1 : 0, + id: id ? parseInt(id, 10) + 1 : 0, disabled: true, value: '' }], From 7fa61f03e22f7b95fbb316a8aa2d8794ab06aab5 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 12:16:13 -0500 Subject: [PATCH 480/897] saving conditions --- src/rewards/admin.js | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 185ad6b1e5..1f13ba7854 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -52,7 +52,9 @@ rewards.save = function(data, callback) { ], next); } - async.each(data, save, callback); + async.each(data, save, function(err) { + saveConditions(data, callback); + }); }; rewards.delete = function(data, callback) { @@ -76,15 +78,15 @@ rewards.get = function(callback) { plugins.fireHook('filter:rewards.conditions', [ { "name": "Reputation", - "condition": "reputation" + "condition": "core:user.reputation" }, { "name": "Post Count", - "condition": "postcount" + "condition": "core:user.postcount" }, { "name": "Last Logged in Time", - "condition": "lastLoggedIn" + "condition": "core:user.lastonline" } ], next); }, @@ -139,8 +141,27 @@ rewards.get = function(callback) { }, callback); }; -function getConditions() { +function saveConditions(data, callback) { + db.delete('conditions:active', function(err) { + if (err) { + return callback(err); + } + + var conditions = [], + rewardsPerCondition = {}; + data.forEach(function(reward) { + conditions.push(reward.condition); + rewardsPerCondition[reward.condition] = rewardsPerCondition[reward.condition] || []; + rewardsPerCondition[reward.condition].push(reward.rid); + }); + + db.setAdd('conditions:active', conditions, callback); + + async.each(Object.keys(rewardsPerCondition), function(condition, next) { + db.setAdd('condition:' + condition + ':rewards', rewardsPerCondition[condition]); + }, callback); + }); } function getActiveRewards(callback) { From a7c3d193cc42f6e566c709fb6a452b30edceee3b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 12:17:58 -0500 Subject: [PATCH 481/897] include nodebb-rewards namespace --- src/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins.js b/src/plugins.js index b33fe46ac7..eed2db94b8 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -263,7 +263,7 @@ var fs = require('fs'), function(dirs, next) { dirs = dirs.filter(function(dir){ - return dir.startsWith('nodebb-plugin-') || dir.startsWith('nodebb-widget-') || dir.startsWith('nodebb-theme-') + return dir.startsWith('nodebb-plugin-') || dir.startsWith('nodebb-widget-') || dir.startsWith('nodebb-rewards-') || dir.startsWith('nodebb-theme-') }).map(function(dir){ return path.join(npmPluginPath, dir); }); From 54c5034ce07c477a4569d3c745497698561ed5fc Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 12:31:38 -0500 Subject: [PATCH 482/897] moved rewards/conditions/conditoinals out of core into rewards-essentials --- src/rewards/admin.js | 85 ++------------------------------------------ 1 file changed, 3 insertions(+), 82 deletions(-) diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 1f13ba7854..dd1acf6180 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -5,30 +5,6 @@ var rewards = {}, plugins = require('../plugins'), db = require('../database'); -var defaults = { - conditionals: [ - { - "name": ">", - "conditional": "greaterthan" - }, - { - "name": ">=", - "conditional": "greaterorequalthan" - }, - { - "name": "<", - "conditional": "lesserthan" - }, - { - "name": "<=", - "conditional": "lesserorequalthan" - }, - { - "name": "string:", - "conditional": "string" - } - ] -}; rewards.save = function(data, callback) { function save(data, next) { @@ -75,68 +51,13 @@ rewards.get = function(callback) { async.parallel({ active: getActiveRewards, conditions: function(next) { - plugins.fireHook('filter:rewards.conditions', [ - { - "name": "Reputation", - "condition": "core:user.reputation" - }, - { - "name": "Post Count", - "condition": "core:user.postcount" - }, - { - "name": "Last Logged in Time", - "condition": "core:user.lastonline" - } - ], next); + plugins.fireHook('filter:rewards.conditions', [], next); }, conditionals: function(next) { - plugins.fireHook('filter:rewards.conditionals', defaults.conditionals, next); + plugins.fireHook('filter:rewards.conditionals', [], next); }, rewards: function(next) { - plugins.fireHook('filter:rewards.rewards', [ - { - "rid": "core:add-to-group", - "name": "Add to Group", - "inputs": [ - { - "type": "select", - "name": "groupname", - "label": "Group Name:", - "values": [ - { - "name": "Group 1", - "value": "group1" - }, - { - "name": "Group 2", - "value": "group2" - }, - { - "name": "Group 3", - "value": "group3" - } - ], - } - ] - }, - { - "rid": "core:alert-user", - "name": "Send alert message", - "inputs": [ - { - "type": "text", - "name": "title", - "label": "Title:" - }, - { - "type": "text", - "name": "message", - "label": "Message:" - } - ] - } - ], next); + plugins.fireHook('filter:rewards.rewards', [], next); } }, callback); }; From fc23dea1d2294a05d80a515f525dcd76578d852b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 20 Feb 2015 12:36:48 -0500 Subject: [PATCH 483/897] up versions --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f8bfb660ee..bf77daccd2 100644 --- a/package.json +++ b/package.json @@ -44,9 +44,9 @@ "nodebb-plugin-mentions": "^0.9.0", "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", - "nodebb-theme-lavender": "^1.0.4", - "nodebb-theme-vanilla": "^1.0.5", - "nodebb-widget-essentials": "~0.2.11", + "nodebb-theme-lavender": "^1.0.6", + "nodebb-theme-vanilla": "^1.0.14", + "nodebb-widget-essentials": "~0.2.12", "npm": "^2.1.4", "passport": "^0.2.1", "passport-local": "1.0.0", From 949fcbbf11b631703c7753e04d1bf0ce1006fff1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 13:40:19 -0500 Subject: [PATCH 484/897] rewards: big feature sprint --- src/rewards/admin.js | 2 +- src/rewards/index.js | 95 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/src/rewards/admin.js b/src/rewards/admin.js index dd1acf6180..67271d2695 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -74,7 +74,7 @@ function saveConditions(data, callback) { data.forEach(function(reward) { conditions.push(reward.condition); rewardsPerCondition[reward.condition] = rewardsPerCondition[reward.condition] || []; - rewardsPerCondition[reward.condition].push(reward.rid); + rewardsPerCondition[reward.condition].push(reward.id); }); db.setAdd('conditions:active', conditions, callback); diff --git a/src/rewards/index.js b/src/rewards/index.js index ba68fae92c..821d093d20 100644 --- a/src/rewards/index.js +++ b/src/rewards/index.js @@ -1,7 +1,100 @@ "use strict"; -var rewards = {}; +var rewards = {}, + db = require('../database'), + plugins = require('../plugins'), + async = require('async'); +rewards.checkConditionAndRewardUser = function(uid, condition, method, callback) { + async.waterfall([ + function(next) { + isConditionActive(condition, function(err, isActive) { + if (!isActive) { + return back(err); + } + + next(err); + }); + }, + function(next) { + getIDsByCondition(condition, function(err, ids) { + next(err, ids); + }); + }, + function(next, ids) { + filterIncompleteIDs(uid, ids, function(err, filtered) { + if (!filtered || !filtered.length) { + return back(err); + } + + next(err, filtered); + }); + }, + function(next, ids) { + getRewardDataByIDs(ids, next); + }, + function(next, rewards) { + async.filter(rewards, function(reward, next) { + checkCondition(reward, method, next); + }, function(err, eligible) { + giveRewards(uid, eligible, next); + }); + } + ], back); + + + function back(err) { + if (typeof callback === 'function') { + callback(err); + } + } +}; + +function isConditionActive(condition, callback) { + db.isSetMember('conditions:active', condition, callback); +} + +function getIDsByCondition(condition, callback) { + db.getObject('condition:' + condition + ':rewards', callback); +} + +function filterIncompleteIDs(ids, callback) { + // todo + callback(false, ids); +} + +function getRewardDataByIDs(ids, callback) { + ids.map(function(id) { + return 'rewards:id:' + id; + }); + + db.getObjects(ids, callback); +} + +function getRewardsByRewardData(rewards, callback) { + rewards.map(function(reward) { + return 'rewards:id:' + reward.id + ':rewards'; + }); + + db.getObjects(rewards, callback); +} + +function checkCondition(reward, method, callback) { + method(function(err, value) { + plugins.fireHook('filter:rewards.checkConditional:' + reward.conditional, {left: value, right: reward.value}, callback); + }); +} + +function giveRewards(uid, rewards, callback) { + getRewardsByRewardData(rewards, function(err, rewardData) { + async.each(rewards, function(reward, next) { + var index = rewards.indexOf(reward); + + plugins.fireHook('action:rewards.award:' + reward.rid, {uid: uid, reward: rewardData[index]}); + }); + }); +} + module.exports = rewards; \ No newline at end of file From f9581e435d93cd6090c2bc564a18f9ac34874bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 20 Feb 2015 14:20:49 -0500 Subject: [PATCH 485/897] getGroupsData method and filter:groups.get --- src/groups.js | 52 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/src/groups.js b/src/groups.js index 6cd0963525..1eae52699b 100644 --- a/src/groups.js +++ b/src/groups.js @@ -825,40 +825,58 @@ var async = require('async'), ], callback); }; + Groups.getGroupsData = function(groupNames, callback) { + if (!Array.isArray(groupNames) || !groupNames.length) { + return callback(null, []); + } + var keys = groupNames.map(function(groupName) { + return 'group:' + groupName; + }); + + db.getObjects(keys, function(err, groupData) { + if (err) { + return callback(err); + } + groupData = groupData.map(function(group) { + if (group) { + group.labelColor = group.labelColor || '#000000'; + group.createtimeISO = utils.toISOString(group.createtime); + group.hidden = parseInt(group.hidden, 10) === 1; + + if (!group['cover:url']) { + group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; + group['cover:position'] = '50% 50%'; + } + } + return group; + }); + + plugins.fireHook('filter:groups.get', {groups: groupData}, function(err, data) { + callback(err, data ? data.groups : null); + }); + }); + }; + Groups.getUserGroups = function(uids, callback) { db.getSortedSetRevRange('groups:createtime', 0, -1, function(err, groupNames) { if (err) { return callback(err); } - var groupKeys = groupNames.filter(function(groupName) { + groupNames = groupNames.filter(function(groupName) { return groupName !== 'registered-users' && groupName.indexOf(':privileges:') === -1; - }).map(function(groupName) { - return 'group:' + groupName; }); - db.getObjects(groupKeys, function(err, groupData) { + Groups.getGroupsData(groupNames, function(err, groupData) { if (err) { return callback(err); } groupData = groupData.filter(function(group) { - return parseInt(group.hidden, 10) !== 1 && !!group.userTitle; - }).map(function(group) { - group.createtimeISO = utils.toISOString(group.createtime); - return group; + return group && parseInt(group.hidden, 10) !== 1 && !!group.userTitle; }); - var groupSets = groupData.map(function(group) { - group.labelColor = group.labelColor || '#000000'; - group.createtimeISO = utils.toISOString(group.createtime); - - if (!group['cover:url']) { - group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; - group['cover:position'] = '50% 50%'; - } - return 'group:' + group.name + ':members'; }); From 7e9095b21b2167632efbb4672158524f9f542926 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 14:21:33 -0500 Subject: [PATCH 486/897] added "owner" to action:post.upvote/downvote/unvote --- src/favourites.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/favourites.js b/src/favourites.js index fec00fd9cc..c8a571e758 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -174,6 +174,7 @@ var async = require('async'), plugins.fireHook('action:post.' + hook, { pid: pid, uid: uid, + owner: owner, current: current }); From aa38d6dda2309fc66dc863472837d7cf79d8779a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 14:21:40 -0500 Subject: [PATCH 487/897] rewards bug fixes --- src/rewards/index.js | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/rewards/index.js b/src/rewards/index.js index 821d093d20..6a2f224640 100644 --- a/src/rewards/index.js +++ b/src/rewards/index.js @@ -22,7 +22,7 @@ rewards.checkConditionAndRewardUser = function(uid, condition, method, callback) next(err, ids); }); }, - function(next, ids) { + function(ids, next) { filterIncompleteIDs(uid, ids, function(err, filtered) { if (!filtered || !filtered.length) { return back(err); @@ -31,13 +31,21 @@ rewards.checkConditionAndRewardUser = function(uid, condition, method, callback) next(err, filtered); }); }, - function(next, ids) { + function(ids, next) { getRewardDataByIDs(ids, next); }, - function(next, rewards) { + function(rewards, next) { async.filter(rewards, function(reward, next) { + if (!reward) { + return next(false); + } + checkCondition(reward, method, next); }, function(err, eligible) { + if (!eligible) { + return next(false); + } + giveRewards(uid, eligible, next); }); } @@ -56,24 +64,26 @@ function isConditionActive(condition, callback) { } function getIDsByCondition(condition, callback) { - db.getObject('condition:' + condition + ':rewards', callback); + db.getSetMembers('condition:' + condition + ':rewards', callback); } -function filterIncompleteIDs(ids, callback) { +function filterIncompleteIDs(uid, ids, callback) { // todo callback(false, ids); } function getRewardDataByIDs(ids, callback) { - ids.map(function(id) { + ids = ids.map(function(id) { return 'rewards:id:' + id; }); - db.getObjects(ids, callback); + db.getObjects(ids, function(err, objs) { + callback(err, objs); + }); } function getRewardsByRewardData(rewards, callback) { - rewards.map(function(reward) { + rewards = rewards.map(function(reward) { return 'rewards:id:' + reward.id + ':rewards'; }); From 2ba1363e12ff47acdbd53c62c5863a4345125378 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 14:23:57 -0500 Subject: [PATCH 488/897] results.owner* --- src/favourites.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/favourites.js b/src/favourites.js index c8a571e758..0c9c81dc46 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -174,7 +174,7 @@ var async = require('async'), plugins.fireHook('action:post.' + hook, { pid: pid, uid: uid, - owner: owner, + owner: results.owner, current: current }); From b26bf9f22de530477a0d9e4e7b4a22850eb2f0a8 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 14:45:07 -0500 Subject: [PATCH 489/897] rewards: bug fixes and cleanup, pretty much done part 1 ;) --- src/rewards/index.js | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/rewards/index.js b/src/rewards/index.js index 6a2f224640..30ef85b11a 100644 --- a/src/rewards/index.js +++ b/src/rewards/index.js @@ -41,7 +41,7 @@ rewards.checkConditionAndRewardUser = function(uid, condition, method, callback) } checkCondition(reward, method, next); - }, function(err, eligible) { + }, function(eligible) { if (!eligible) { return next(false); } @@ -73,35 +73,29 @@ function filterIncompleteIDs(uid, ids, callback) { } function getRewardDataByIDs(ids, callback) { - ids = ids.map(function(id) { + db.getObjects(ids.map(function(id) { return 'rewards:id:' + id; - }); - - db.getObjects(ids, function(err, objs) { - callback(err, objs); - }); + }), callback); } function getRewardsByRewardData(rewards, callback) { - rewards = rewards.map(function(reward) { + db.getObjects(rewards.map(function(reward) { return 'rewards:id:' + reward.id + ':rewards'; - }); - - db.getObjects(rewards, callback); + }), callback); } function checkCondition(reward, method, callback) { method(function(err, value) { - plugins.fireHook('filter:rewards.checkConditional:' + reward.conditional, {left: value, right: reward.value}, callback); + plugins.fireHook('filter:rewards.checkConditional:' + reward.conditional, {left: value, right: reward.value}, function(err, bool) { + callback(bool); + }); }); } function giveRewards(uid, rewards, callback) { getRewardsByRewardData(rewards, function(err, rewardData) { async.each(rewards, function(reward, next) { - var index = rewards.indexOf(reward); - - plugins.fireHook('action:rewards.award:' + reward.rid, {uid: uid, reward: rewardData[index]}); + plugins.fireHook('action:rewards.award:' + reward.rid, {uid: uid, reward: rewardData[rewards.indexOf(reward)]}); }); }); } From fbbd405b00b64f2a0a2cc0f43b369fbd8aa0c9d3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 15:07:43 -0500 Subject: [PATCH 490/897] even:alert socket call -> app.alert --- public/src/app.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/src/app.js b/public/src/app.js index 5010ead25d..b4a091f960 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -70,6 +70,10 @@ app.cacheBuster = null; window.location.href = config.relative_path + '/'; }, 1000); }); + + socket.on('event:alert', function(data) { + app.alert(data); + }); } function onSocketConnect(data) { From fe83adcbae862d1c805b5c89c85aca415ed33a5d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 15:21:09 -0500 Subject: [PATCH 491/897] prevent rewards from clobbering each other on save --- src/rewards/admin.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 67271d2695..4d3681b094 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -12,10 +12,13 @@ rewards.save = function(data, callback) { return next(); } - var rewards = data.rewards; + var rewardsData = data.rewards; delete data.rewards; async.parallel([ + function(next) { + rewards.delete(data, next); + }, function(next) { db.setAdd('rewards:list', data.id, next); }, @@ -23,7 +26,7 @@ rewards.save = function(data, callback) { db.setObject('rewards:id:' + data.id, data, next); }, function(next) { - db.setObject('rewards:id:' + data.id + ':rewards', rewards, next); + db.setObject('rewards:id:' + data.id + ':rewards', rewardsData, next); } ], next); } From 5a6457ec7c23951681c4a1a1bde770efac508d8d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 16:09:20 -0500 Subject: [PATCH 492/897] adding rewards-essentials to core --- package.json | 1 + src/install.js | 1 + 2 files changed, 2 insertions(+) diff --git a/package.json b/package.json index 8561984d0d..d6d4dc3e14 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "nodebb-theme-lavender": "^1.0.4", "nodebb-theme-vanilla": "^1.0.5", "nodebb-widget-essentials": "~0.2.11", + "nodebb-rewards-essentials": "^0.0.1", "npm": "^2.1.4", "passport": "^0.2.1", "passport-local": "1.0.0", diff --git a/src/install.js b/src/install.js index 45d44d75ad..10c4d25e05 100644 --- a/src/install.js +++ b/src/install.js @@ -422,6 +422,7 @@ function enableDefaultPlugins(next) { 'nodebb-plugin-markdown', 'nodebb-plugin-mentions', 'nodebb-widget-essentials', + 'nodebb-rewards-essentials', 'nodebb-plugin-soundpack-default' ]; var db = require('./database'); From 61b1251a73a03fe60a13917d4b82e945cd4695fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 20 Feb 2015 16:34:31 -0500 Subject: [PATCH 493/897] removed sort methods --- src/search.js | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/src/search.js b/src/search.js index 5cab307a98..190a764bf2 100644 --- a/src/search.js +++ b/src/search.js @@ -365,47 +365,31 @@ function sortPosts(posts, data) { if (isNumeric) { if (data.sortDirection === 'desc') { - sortDescendingNumeric(posts, fields); + posts.sort(function(p1, p2) { + return p2[fields[0]][fields[1]] - p1[fields[0]][fields[1]]; + }); } else { - sortAscendingNumeric(posts, fields); + posts.sort(function(p1, p2) { + return p1[fields[0]][fields[1]] - p2[fields[0]][fields[1]]; + }); } } else { if (data.sortDirection === 'desc') { - sortDescendingAlpha(posts, fields); + posts.sort(function(p1, p2) { + if (p1[fields[0]][fields[1]] < p2[fields[0]][fields[1]]) return -1; + if (p1[fields[0]][fields[1]] > p2[fields[0]][fields[1]]) return 1; + return 0; + }); } else { - sortAscendingAlpha(posts, fields); + posts.sort(function(p1, p2) { + if (p1[fields[0]][fields[1]] > p2[fields[0]][fields[1]]) return -1; + if (p1[fields[0]][fields[1]] < p2[fields[0]][fields[1]]) return 1; + return 0; + }); } } } -function sortAscendingNumeric(posts, fields) { - posts.sort(function(p1, p2) { - return p1[fields[0]][fields[1]] - p2[fields[0]][fields[1]]; - }); -} - -function sortDescendingNumeric(posts, fields) { - posts.sort(function(p1, p2) { - return p2[fields[0]][fields[1]] - p1[fields[0]][fields[1]]; - }); -} - -function sortAscendingAlpha(posts, fields) { - posts.sort(function(p1, p2) { - if (p1[fields[0]][fields[1]] > p2[fields[0]][fields[1]]) return -1; - if (p1[fields[0]][fields[1]] < p2[fields[0]][fields[1]]) return 1; - return 0; - }); -} - -function sortDescendingAlpha(posts, fields) { - posts.sort(function(p1, p2) { - if (p1[fields[0]][fields[1]] < p2[fields[0]][fields[1]]) return -1; - if (p1[fields[0]][fields[1]] > p2[fields[0]][fields[1]]) return 1; - return 0; - }); -} - function getSearchCategories(data, callback) { if (!Array.isArray(data.categories) || !data.categories.length || data.categories.indexOf('all') !== -1) { return callback(null, []); From bb35950a5a6504605c017db956ea337c703574c7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 17:19:39 -0500 Subject: [PATCH 494/897] rewards acp - ability to set amount of times a user can claim reward --- public/less/admin/extend/rewards.less | 2 +- public/src/admin/extend/rewards.js | 5 +++-- src/views/admin/extend/rewards.tpl | 24 +++++++++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/public/less/admin/extend/rewards.less b/public/less/admin/extend/rewards.less index cf62159695..2dc84b5bc3 100644 --- a/public/less/admin/extend/rewards.less +++ b/public/less/admin/extend/rewards.less @@ -1,5 +1,5 @@ #rewards { - .well { + .well, .panel-body { vertical-align: top; min-height: 100px; diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index cff8f7f74e..9a5f6327b8 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -135,11 +135,12 @@ define('admin/extend/rewards', function() { active: [{ id: id ? parseInt(id, 10) + 1 : 0, disabled: true, - value: '' + value: '', + claimable: 1 }], conditions: conditions, conditionals: conditionals, - rewards: available + rewards: available, }; templates.parse('admin/extend/rewards', 'active', data, function(li) { diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 87129fe3c7..29bf0b8288 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -37,14 +37,24 @@
          +
          -
          - - - - - - +
          +
          +
          +
          + + Enter 0 for infinite +
          +
          +
          + + + + + + +
          • From 7a8d84c011f3a77b93413e5b768facbc0678ec14 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 17:33:29 -0500 Subject: [PATCH 495/897] ability to add a claimability limit to rewards --- src/rewards/index.js | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/rewards/index.js b/src/rewards/index.js index 30ef85b11a..fb4fc9d0e8 100644 --- a/src/rewards/index.js +++ b/src/rewards/index.js @@ -23,7 +23,10 @@ rewards.checkConditionAndRewardUser = function(uid, condition, method, callback) }); }, function(ids, next) { - filterIncompleteIDs(uid, ids, function(err, filtered) { + getRewardDataByIDs(ids, next); + }, + function(rewards, next) { + filterCompletedRewards(uid, rewards, function(err, filtered) { if (!filtered || !filtered.length) { return back(err); } @@ -31,9 +34,6 @@ rewards.checkConditionAndRewardUser = function(uid, condition, method, callback) next(err, filtered); }); }, - function(ids, next) { - getRewardDataByIDs(ids, next); - }, function(rewards, next) { async.filter(rewards, function(reward, next) { if (!reward) { @@ -67,9 +67,26 @@ function getIDsByCondition(condition, callback) { db.getSetMembers('condition:' + condition + ':rewards', callback); } -function filterIncompleteIDs(uid, ids, callback) { - // todo - callback(false, ids); +function filterCompletedRewards(uid, rewards, callback) { + db.getSortedSetRangeByScoreWithScores('uid:' + uid + ':rewards', 0, -1, 1, Infinity, function(err, data) { + var userRewards = {}; + + data.forEach(function(obj) { + userRewards[obj.value] = parseInt(obj.score, 10); + }); + + rewards = rewards.filter(function(reward) { + var claimable = parseInt(reward.claimable, 10); + + if (claimable === 0) { + return true; + } + + return (userRewards[reward.id] > reward.claimable) ? false : true; + }); + + callback(false, rewards); + }); } function getRewardDataByIDs(ids, callback) { @@ -96,7 +113,8 @@ function giveRewards(uid, rewards, callback) { getRewardsByRewardData(rewards, function(err, rewardData) { async.each(rewards, function(reward, next) { plugins.fireHook('action:rewards.award:' + reward.rid, {uid: uid, reward: rewardData[rewards.indexOf(reward)]}); - }); + db.sortedSetIncrBy('uid:' + uid + ':rewards', 1, reward.id, next); + }, callback); }); } From def57d29268c8ce0046d47d68a64db44fadc4ee9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 17:37:34 -0500 Subject: [PATCH 496/897] don't rely on client side to increment id (duh) --- public/src/admin/extend/rewards.js | 4 +--- src/rewards/admin.js | 32 +++++++++++++++++------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 9a5f6327b8..50d7503f5a 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -128,12 +128,10 @@ define('admin/extend/rewards', function() { } function newReward() { - var ul = $('#active'), - id = $('#active li').last().attr('data-id'); + var ul = $('#active'); var data = { active: [{ - id: id ? parseInt(id, 10) + 1 : 0, disabled: true, value: '', claimable: 1 diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 4d3681b094..796127b5f3 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -15,20 +15,24 @@ rewards.save = function(data, callback) { var rewardsData = data.rewards; delete data.rewards; - async.parallel([ - function(next) { - rewards.delete(data, next); - }, - function(next) { - db.setAdd('rewards:list', data.id, next); - }, - function(next) { - db.setObject('rewards:id:' + data.id, data, next); - }, - function(next) { - db.setObject('rewards:id:' + data.id + ':rewards', rewardsData, next); - } - ], next); + db.incrObjectField('global', 'nextRid', function(err, id) { + data.id = id; + + async.parallel([ + function(next) { + rewards.delete(data, next); + }, + function(next) { + db.setAdd('rewards:list', data.id, next); + }, + function(next) { + db.setObject('rewards:id:' + data.id, data, next); + }, + function(next) { + db.setObject('rewards:id:' + data.id + ':rewards', rewardsData, next); + } + ], next); + }); } async.each(data, save, function(err) { From f5eaa083402ec8482a79cd365a869ed8996cdc0c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Feb 2015 19:29:57 -0500 Subject: [PATCH 497/897] fixed complications with deleted id's --- public/src/admin/extend/rewards.js | 4 +++- src/rewards/admin.js | 26 ++++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 50d7503f5a..7fc023eda5 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -134,7 +134,9 @@ define('admin/extend/rewards', function() { active: [{ disabled: true, value: '', - claimable: 1 + claimable: 1, + rid: null, + id: null }], conditions: conditions, conditionals: conditionals, diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 796127b5f3..6136e4f4b3 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -8,14 +8,11 @@ var rewards = {}, rewards.save = function(data, callback) { function save(data, next) { - if (!Object.keys(data.rewards).length) { - return next(); - } - - var rewardsData = data.rewards; - delete data.rewards; + function commit(err, id) { + if (err) { + return callback(err); + } - db.incrObjectField('global', 'nextRid', function(err, id) { data.id = id; async.parallel([ @@ -32,7 +29,20 @@ rewards.save = function(data, callback) { db.setObject('rewards:id:' + data.id + ':rewards', rewardsData, next); } ], next); - }); + } + + if (!Object.keys(data.rewards).length) { + return next(); + } + + var rewardsData = data.rewards; + delete data.rewards; + + if (!parseInt(data.id, 10)) { + db.incrObjectField('global', 'rewards:id', commit); + } else { + commit(false, data.id); + } } async.each(data, save, function(err) { From dfabbb5fa2c02655362897d529a91409f457e616 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sat, 21 Feb 2015 23:13:53 -0500 Subject: [PATCH 498/897] latest translations --- public/language/de/category.json | 2 +- public/language/de/topic.json | 2 +- public/language/fr/category.json | 2 +- public/language/fr/error.json | 2 +- public/language/fr/global.json | 10 ++--- public/language/fr/groups.json | 16 +++---- public/language/fr/modules.json | 4 +- public/language/fr/search.json | 2 +- public/language/fr/tags.json | 2 +- public/language/fr/topic.json | 10 ++--- public/language/fr/user.json | 8 ++-- public/language/fr/users.json | 6 +-- public/language/it/search.json | 54 +++++++++++----------- public/language/ru/email.json | 10 ++--- public/language/ru/error.json | 24 +++++----- public/language/ru/global.json | 8 ++-- public/language/ru/groups.json | 4 +- public/language/ru/notifications.json | 2 +- public/language/ru/pages.json | 2 +- public/language/ru/register.json | 12 ++--- public/language/ru/reset_password.json | 16 +++---- public/language/ru/search.json | 62 +++++++++++++------------- public/language/ru/topic.json | 2 +- public/language/ru/unread.json | 2 +- public/language/ru/user.json | 28 ++++++------ public/language/ru/users.json | 8 ++-- 26 files changed, 150 insertions(+), 150 deletions(-) diff --git a/public/language/de/category.json b/public/language/de/category.json index 8635b5738c..f6a13932c2 100644 --- a/public/language/de/category.json +++ b/public/language/de/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Neues Thema", - "guest-login-post": "Log in to post", + "guest-login-post": "Anmelden um einen Beitrag zu erstellen", "no_topics": "Es gibt noch keine Themen in dieser Kategorie.
          Warum beginnst du nicht eins?", "browsing": "Aktiv", "no_replies": "Niemand hat geantwortet", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 1ef0d0741b..7036cb823a 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -12,7 +12,7 @@ "notify_me": "Erhalte eine Benachrichtigung bei neuen Antworten zu diesem Thema.", "quote": "zitieren", "reply": "antworten", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Anmelden zum Antworten", "edit": "bearbeiten", "delete": "löschen", "purge": "bereinigen", diff --git a/public/language/fr/category.json b/public/language/fr/category.json index 758bd68885..98a8ae2b90 100644 --- a/public/language/fr/category.json +++ b/public/language/fr/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Nouveau sujet", - "guest-login-post": "Log in to post", + "guest-login-post": "Se connecter pour poster", "no_topics": "Il n'y a aucun sujet dans cette catégorie.
          Pourquoi ne pas en créer un ?", "browsing": "parcouru par", "no_replies": "Personne n'a répondu", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index bfa70c579c..3ceda0c847 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -17,7 +17,7 @@ "invalid-pagination-value": "Valeur de pagination invalide", "username-taken": "Nom d’utilisateur déjà utilisé", "email-taken": "Email déjà utilisé", - "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquer ici pour la valider.", + "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.", "email-not-confirmed-chat": "Vous ne pouver discuter tant que votre email n'est pas confirmé", "username-too-short": "Nom d'utilisateur trop court", "username-too-long": "Nom d'utilisateur trop long", diff --git a/public/language/fr/global.json b/public/language/fr/global.json index bb53439c13..d09ab26cfc 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -3,7 +3,7 @@ "search": "Recherche", "buttons.close": "Fermer", "403.title": "Accès refusé", - "403.message": "Il semble que vous ayez atteint une page dont vous n'avez pas accès.", + "403.message": "Il semble que vous ayez atteint une page à laquelle vous n'avez pas accès.", "403.login": "Peut-être deviez vous essayer de vous connecter?", "404.title": "Introuvable", "404.message": "Il semble que vous ayez atteint une page qui n'existe pas. Retourner à la page d'accueil.", @@ -14,7 +14,7 @@ "please_log_in": "Veuillez vous connecter", "logout": "Déconnexion", "posting_restriction_info": "L'envoi de messages est réservé aux membres inscrits, cliquez ici pour vous connecter.", - "welcome_back": "Bon retour", + "welcome_back": "Bienvenue", "you_have_successfully_logged_in": "Vous vous êtes bien connecté", "save_changes": "Enregistrer les changements", "close": "Fermer", @@ -24,7 +24,7 @@ "header.admin": "Admin", "header.recent": "Récent", "header.unread": "Non lu", - "header.tags": "Tags", + "header.tags": "Mots-clés", "header.popular": "Populaire", "header.users": "Utilisateurs", "header.groups": "Groupes", @@ -32,7 +32,7 @@ "header.notifications": "Notifications", "header.search": "Recherche", "header.profile": "Profil", - "notifications.loading": "Chargement des Notifications", + "notifications.loading": "Chargement des notifications", "chats.loading": "Chargement des chats", "motd.welcome": "Bienvenue sur NodeBB, la plate-forme de discussion du futur.", "previouspage": "Page précédente", @@ -77,5 +77,5 @@ "privacy": "Vie privée", "follow": "S'abonner", "unfollow": "Se désabonner", - "delete_all": "Supprimer Tout" + "delete_all": "Tout supprimer" } \ No newline at end of file diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json index abbca27470..39a9efcff2 100644 --- a/public/language/fr/groups.json +++ b/public/language/fr/groups.json @@ -1,10 +1,10 @@ { "groups": "Groupes", "view_group": "Voir le groupe", - "owner": "Propriétaire du Groupe", - "new_group": "Créer un Nouveau Groupe", + "owner": "Propriétaire du groupe", + "new_group": "Créer un nouveau groupe", "no_groups_found": "Il n'y a aucun groupe", - "cover-instructions": "Glisser et Coller une image, ajuster la position, et cliquer sur Enregistrer", + "cover-instructions": "Glissez-déposez une image, ajustez la position, et cliquez sur Enregistrer", "cover-change": "Modifier", "cover-save": "Enregistrer", "cover-saving": "Enregistrement", @@ -13,11 +13,11 @@ "details.pending": "Membres en attente", "details.has_no_posts": "Les membres de ce groupe n'ont envoyé aucun message.", "details.latest_posts": "Derniers messages", - "details.private": "Groupe Privé", - "details.public": "Groupe Public", - "details.grant": "Accorder/Résilier Propriétaire", - "details.kick": "Retirer", - "details.owner_options": "Administration du Groupe", + "details.private": "Groupe privé", + "details.public": "Groupe public", + "details.grant": "Promouvoir/rétrograder comme propriétaire", + "details.kick": "Exclure", + "details.owner_options": "Administration du groupe", "event.updated": "Les détails du groupe ont été mis à jour", "event.deleted": "Le groupe é%1\" a été supprimé" } \ No newline at end of file diff --git a/public/language/fr/modules.json b/public/language/fr/modules.json index 054c1c70f8..c472c6b402 100644 --- a/public/language/fr/modules.json +++ b/public/language/fr/modules.json @@ -1,11 +1,11 @@ { "chat.chatting_with": "Discuter avec ", - "chat.placeholder": "Taper votre message ici, appuyer sur Entrer pour envoyer", + "chat.placeholder": "Tapez votre message ici, appuyez sur Entrer pour envoyer", "chat.send": "Envoyer", "chat.no_active": "Vous n'avez aucune discussion en cours.", "chat.user_typing": "%1 est en train d'écrire ...", "chat.user_has_messaged_you": "%1 vous a envoyé un message.", - "chat.see_all": "Voir toutes les Discussions", + "chat.see_all": "Voir toutes les discussions", "chat.no-messages": "Veuillez sélectionner un destinataire pour voir l'historique des discussions", "chat.recent-chats": "Discussions récentes", "chat.contacts": "Contacts", diff --git a/public/language/fr/search.json b/public/language/fr/search.json index 20e22d2fa0..01574ac59b 100644 --- a/public/language/fr/search.json +++ b/public/language/fr/search.json @@ -29,7 +29,7 @@ "number-of-views": "Nombre de vues", "topic-start-date": "Date de création du sujet", "username": "Nom d'utilisateur", - "category": "Catgorie", + "category": "Catégorie", "descending": "Par ordre décroissant", "ascending": "Par ordre croissant" } \ No newline at end of file diff --git a/public/language/fr/tags.json b/public/language/fr/tags.json index 20bd5dccee..91a1f0aaa4 100644 --- a/public/language/fr/tags.json +++ b/public/language/fr/tags.json @@ -2,6 +2,6 @@ "no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé", "tags": "Mots-clés", "enter_tags_here": "Entrez les mots-clés ici. Appuyez sur entrer après chaque mot-clé.", - "enter_tags_here_short": "Entrez des tags...", + "enter_tags_here_short": "Entrez des mots-clés...", "no_tags": "Il n'y a pas encore de mots-clés." } \ No newline at end of file diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index b9368f16eb..8248eb2580 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -12,7 +12,7 @@ "notify_me": "Être notifié des réponses dans ce sujet", "quote": "Citer", "reply": "Répondre", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Se connecter pour répondre", "edit": "Éditer", "delete": "Supprimer", "purge": "Supprimer définitivement", @@ -73,20 +73,20 @@ "topic_will_be_moved_to": "Ce sujet sera déplacé vers la catégorie", "fork_topic_instruction": "Cliquez sur les postes à scinder", "fork_no_pids": "Aucun post sélectionné !", - "fork_success": "Sujet copié avec succès! Cliquez ici pour aller au sujet copié.", - "composer.title_placeholder": "Entrer le titre du sujet ici ...", + "fork_success": "Sujet copié avec succès ! Cliquez ici pour aller au sujet copié.", + "composer.title_placeholder": "Entrer le titre du sujet ici…", "composer.handle_placeholder": "Nom", "composer.discard": "Abandonner", "composer.submit": "Envoyer", "composer.replying_to": "Réponse à %1", "composer.new_topic": "Nouveau sujet", - "composer.uploading": "envoi en cours ...", + "composer.uploading": "envoi en cours…", "composer.thumb_url_label": "Coller une URL de vignette du sujet", "composer.thumb_title": "Ajouter une vignette à ce sujet", "composer.thumb_url_placeholder": "http://exemple.com/vignette.png", "composer.thumb_file_label": "Ou envoyer un fichier", "composer.thumb_remove": "Effacer les champs", - "composer.drag_and_drop_images": "Glisser-déposer les images ici", + "composer.drag_and_drop_images": "Glissez-déposez les images ici", "more_users_and_guests": "%1 autre(s) utilisateur(s) et %2 invité(s)", "more_users": "%1 autre(s) utilisateur(s)", "more_guests": "%1 autre(s) invité(s)", diff --git a/public/language/fr/user.json b/public/language/fr/user.json index d2cf37feec..8786929c78 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -2,8 +2,8 @@ "banned": "Banni", "offline": "Hors-ligne", "username": "Nom d'utilisateur", - "joindate": "Date d'Adhésion", - "postcount": "Nombre de Messages", + "joindate": "Date d'adhésion", + "postcount": "Nombre de messages", "email": "Email", "confirm_email": "Confirmer l'adresse email", "delete_account": "Supprimer le compte", @@ -29,7 +29,7 @@ "unfollow": "Se désabonner", "profile_update_success": "Le profil a bien été mis à jour !", "change_picture": "Changer d'image", - "edit": "Editer", + "edit": "Éditer", "uploaded_picture": "Image envoyée", "upload_new_picture": "Envoyer une nouvelle image", "upload_new_picture_from_url": "Envoyer une nouvelle image depuis un URL", @@ -44,7 +44,7 @@ "confirm_password": "Confirmer le mot de passe", "password": "Mot de passe", "username_taken_workaround": "Le nom d'utilisateur désiré est déjà utilisé, nous l'avons donc légèrement modifié. Vous êtes maintenant connu comme %1", - "upload_picture": "Envoyer une image", + "upload_picture": "Envoyer l'image", "upload_a_picture": "Envoyer une image", "image_spec": "Vous ne pouvez envoyer que des fichiers PNG, JPG ou GIF", "max": "max.", diff --git a/public/language/fr/users.json b/public/language/fr/users.json index 1028292a9b..3467b5b864 100644 --- a/public/language/fr/users.json +++ b/public/language/fr/users.json @@ -6,7 +6,7 @@ "enter_username": "Entrer un nom d'utilisateur pour rechercher", "load_more": "Charger la suite", "users-found-search-took": "%1 utilisateur(s) trouvé(s)! La recherche a pris %2 secondes.", - "filter-by": "Filtrer Par", - "online-only": "En Ligne uniquement", - "picture-only": "Avec Image uniquement" + "filter-by": "Filtrer par", + "online-only": "En ligne uniquement", + "picture-only": "Avec image uniquement" } \ No newline at end of file diff --git a/public/language/it/search.json b/public/language/it/search.json index 9d021ec7c5..479fec6287 100644 --- a/public/language/it/search.json +++ b/public/language/it/search.json @@ -1,35 +1,35 @@ { "results_matching": "%1 risultato(i) corrispondente(i) \"%2\", (%3 secondi)", - "no-matches": "No matches found", + "no-matches": "Nessuna corrispondenza trovata", "in": "In", - "by": "By", - "titles": "Titles", - "titles-posts": "Titles and Posts", - "posted-by": "Posted by", - "in-categories": "In Categories", + "by": "Da", + "titles": "Titoli", + "titles-posts": "Titoli e Messaggi", + "posted-by": "Pubblicato da", + "in-categories": "In Categorie", "search-child-categories": "Search child categories", - "reply-count": "Reply Count", + "reply-count": "Numero Risposte", "at-least": "At least", "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", + "post-time": "Ora invio", + "newer-than": "Più nuovi di", + "older-than": "Più vecchi di", + "any-date": "Qualsiasi data", + "yesterday": "Ieri", + "one-week": "Una settimana", + "two-weeks": "Due settimane", + "one-month": "Un mese", + "three-months": "Tre mesi", + "six-months": "Sei mesi", + "one-year": "Un anno", + "sort-by": "Ordina per", "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", - "descending": "In descending order", - "ascending": "In ascending order" + "topic-title": "Titolo argomento", + "number-of-replies": "Numero di risposte", + "number-of-views": "Numero di visite", + "topic-start-date": "Data inizio argomento", + "username": "Nome utente", + "category": "Categoria", + "descending": "In ordine decrescente", + "ascending": "In ordine crescente" } \ No newline at end of file diff --git a/public/language/ru/email.json b/public/language/ru/email.json index eed54608d0..4353d9101e 100644 --- a/public/language/ru/email.json +++ b/public/language/ru/email.json @@ -9,9 +9,9 @@ "reset.text1": "Мы получили запрос на сброс Вашего пароля. Если Вы не подавали запрос, пожалуйста, проигнорируйте это сообщение.", "reset.text2": "Для продолжения процедуры изменения пароля, пожалуйста, перейдите по ссылке:", "reset.cta": "Кликните здесь для изменения пароля", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", - "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "reset.notify.subject": "Пароль был успешно изменен", + "reset.notify.text1": "Мы уведомляем вас о том, что %1 ваш пароль был успешно изменен. ", + "reset.notify.text2": "Если вы не совершали этого действия, пожалуйста, незамедлительно свяжитесь с администратором.", "digest.notifications": "У Вас непрочитанные уведомления от %1:", "digest.latest_topics": "Последние темы %1", "digest.cta": "Кликните здесь для просмотра %1", @@ -20,8 +20,8 @@ "notif.chat.subject": "Новое сообщение от %1", "notif.chat.cta": "Нажмите для продолжения диалога", "notif.chat.unsub.info": "Вы получили это уведомление в соответствии с настройками подписок.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Кликните для просмотра всей темы.", + "notif.post.unsub.info": "Вы получили это уведомление согласно вашим настройкам подписки.", "test.text1": "Это тестовое сообщение для проверки почтового сервиса NodeBB.", "unsub.cta": "Изменить настройки", "closing": "Спасибо!" diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 5683d863d1..25309f37d4 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -1,17 +1,17 @@ { - "invalid-data": "Неверные Данные", + "invalid-data": "Неверные данные", "not-logged-in": "Вы не вошли в свой аккаунт.", "account-locked": "Ваш аккаунт временно заблокирован", "search-requires-login": "Поиск доступен зарегистрированным пользователям! Пожалуйста, войдите или зарегистрируйтесь!", - "invalid-cid": "Неверный ID Категории", - "invalid-tid": "Неверный ID Темы", - "invalid-pid": "Неверный ID Поста", - "invalid-uid": "Неверный ID Пользователя", - "invalid-username": "Неверное Имя пользователя", + "invalid-cid": "Неверный ID категории", + "invalid-tid": "Неверный ID темы", + "invalid-pid": "Неверный ID поста", + "invalid-uid": "Неверный ID пользователя", + "invalid-username": "Неверное имя пользователя", "invalid-email": "Неверный Email", - "invalid-title": "Неверный заголовок!", - "invalid-user-data": "Неверные Пользовательские Данные", - "invalid-password": "Неверный Пароль", + "invalid-title": "Неверный заголовок", + "invalid-user-data": "Неверные пользовательские данные", + "invalid-password": "Неверный пароль", "invalid-username-or-password": "Пожалуйста, укажите и имя пользователя и пароль", "invalid-search-term": "Неверный поисковой запрос", "invalid-pagination-value": "Неверное значение пагинации", @@ -35,7 +35,7 @@ "topic-locked": "Тема закрыта", "still-uploading": "Пожалуйста, подождите завершения загрузки.", "content-too-short": "Пост должен содержать минимум %1 симв.", - "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", + "content-too-long": "Размер поста не должен превышать %1 символов. Пожалуйста, сделайте его короче.", "title-too-short": "Заголовок должен содержать минимум %1 симв.", "title-too-long": "Заголовок не может быть длиннее %1 символов.", "too-many-posts": "Вы можете делать пост один раз в %1 сек.", @@ -45,7 +45,7 @@ "already-favourited": "Вы уже добавили этот пост в избранное", "already-unfavourited": "Вы уже удалили этот пост из избранного", "cant-ban-other-admins": "Вы не можете забанить других администраторов!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", + "invalid-image-type": "Неверный формат изображения. Поддерживаемые форматы: %1", "invalid-image-extension": "Недопустимое расширение файла", "group-name-too-short": "Название группы слишком короткое", "group-already-exists": "Группа уже существует", @@ -70,5 +70,5 @@ "not-enough-reputation-to-flag": "У Вас недостаточно репутации, чтобы пометить этот пост.", "reload-failed": "NodeBB обнаружил проблему при перезагрузке: \"%1\". NodeBB продолжит работать с существующими ресурсами клиента, но Вы должны отменить то, что сделали перед перезагрузкой.", "registration-error": "Ошибка при регистрации", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Похоже, что-то пошло не так в процессе обработки ответа сервера." } \ No newline at end of file diff --git a/public/language/ru/global.json b/public/language/ru/global.json index 1983e9f1ab..700ed17127 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -3,10 +3,10 @@ "search": "Поиск", "buttons.close": "Закрыть", "403.title": "Доступ запрещен", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", + "403.message": "Вы пытаетесь перейти на страницу, к которой у вас нет прав доступа.", "403.login": "Возможно Вам следует войти под своим аккаунтом?", "404.title": "Страница не найдена", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Вы пытаетесь перейти на страницу, которой не существует. Вам стоит вернутся на главную страницу.", "500.title": "Внутренняя ошибка.", "500.message": "Упс! Похоже, что-то пошло не так!", "register": "Зарегистрироваться", @@ -75,7 +75,7 @@ "updated.title": "Форум обновлен", "updated.message": "Форум был обновлен до последней версии. Нажмите здесь, чтобы обновить страницу.", "privacy": "Безопасность", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "Подписаться", + "unfollow": "Отписаться", "delete_all": "Удалить все" } \ No newline at end of file diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json index 20a4c0b01c..544998a50e 100644 --- a/public/language/ru/groups.json +++ b/public/language/ru/groups.json @@ -3,9 +3,9 @@ "view_group": "Просмотр группы", "owner": "Администратор группы", "new_group": "Создать группу", - "no_groups_found": "There are no groups to see", + "no_groups_found": "Нет групп для отображения", "cover-instructions": "Перетяните сюда изображение, переместите на нужную позицию и нажмите Сохранить", - "cover-change": "Change", + "cover-change": "Изменить", "cover-save": "Сохранить", "cover-saving": "Сохраняем", "details.title": "Информация о группе", diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 73a6dfb38b..4cc64159b5 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -19,7 +19,7 @@ "user_posted_topic": "%1 открыл новую тему: %2", "user_mentioned_you_in": "%1 упомянул Вас в %2", "user_started_following_you": "%1 подписался на Вас.", - "email-confirmed": "Email Подтвержден", + "email-confirmed": "Email подтвержден", "email-confirmed-message": "Спасибо за подтверждение Вашего Email-адреса. Ваш аккаунт активирован.", "email-confirm-error": "Произошла ошибка...", "email-confirm-error-message": "Ошибка проверки Email-адреса. Возможно, код неверен, либо у него истек срок действия.", diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json index f8a014193b..9ad5cae0c2 100644 --- a/public/language/ru/pages.json +++ b/public/language/ru/pages.json @@ -11,7 +11,7 @@ "user.followers": "Читают %1", "user.posts": "Пост написан %1", "user.topics": "Темы созданы %1", - "user.groups": "%1's Groups", + "user.groups": "Группы %1", "user.favourites": "Избранные сообщения %1", "user.settings": "Настройки", "maintenance.text": "%1 в настоящее время на обслуживании. Пожалуйста, возвращайтесь позже.", diff --git a/public/language/ru/register.json b/public/language/ru/register.json index 419a808877..eae56a5403 100644 --- a/public/language/ru/register.json +++ b/public/language/ru/register.json @@ -3,16 +3,16 @@ "help.email": "По умолчанию, ваш email будет скрыт.", "help.username_restrictions": "Уникальное Имя между %1 и %2 символов. Другие пользователи смогут упоминать вас по @Имени.", "help.minimum_password_length": "Длина вашего пароля должна быть минимум %1 символов.", - "email_address": "Email Адрес", + "email_address": "Email адрес", "email_address_placeholder": "Введите Email адрес", "username": "Имя пользователя", - "username_placeholder": "Введите Имя пользователя", + "username_placeholder": "Введите имя пользователя", "password": "Пароль", - "password_placeholder": "Введите Пароль", - "confirm_password": "Подтвердите Пароль", - "confirm_password_placeholder": "Подтвердите Пароль", + "password_placeholder": "Введите пароль", + "confirm_password": "Подтвердите пароль", + "confirm_password_placeholder": "Подтвердите пароль", "register_now_button": "Зарегистрироваться", - "alternative_registration": "Альтернативная Регистрация", + "alternative_registration": "Альтернативная регистрация", "terms_of_use": "Условия использования", "agree_to_terms_of_use": "Я согласен с условиями" } \ No newline at end of file diff --git a/public/language/ru/reset_password.json b/public/language/ru/reset_password.json index c9b523cf2e..a2226d5e60 100644 --- a/public/language/ru/reset_password.json +++ b/public/language/ru/reset_password.json @@ -1,16 +1,16 @@ { - "reset_password": "Восстановить Пароль", - "update_password": "Изменить Пароль", - "password_changed.title": "Пароль Изменен", + "reset_password": "Восстановить пароль", + "update_password": "Изменить пароль", + "password_changed.title": "Пароль изменен", "password_changed.message": "

          Пароль успешно восстановлен, пожалуйста войдите еще раз.", "wrong_reset_code.title": "Неверный код восстановления", "wrong_reset_code.message": "Неправильный код восстановления пароля. Попробуйте еще раз, или запросите новый код восстановления.", - "new_password": "Новый Пароль", - "repeat_password": "Подтвердите Пароль", + "new_password": "Новый пароль", + "repeat_password": "Подтвердите пароль", "enter_email": "Пожалуйста введите ваш email адрес и мы отправим Вам письмо с инструкцией восстановления пароля.", "enter_email_address": "Введите Email адрес", - "password_reset_sent": "Пароль Отправлен", + "password_reset_sent": "Пароль отправлен", "invalid_email": "Неверный Email / Email не существует!", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "Введенный пароль слишком короткий, пожалуйста, введите более длинный пароль.", + "passwords_do_not_match": "Введенные пароли не совпадают." } \ No newline at end of file diff --git a/public/language/ru/search.json b/public/language/ru/search.json index f6ecb8d611..943b857c9b 100644 --- a/public/language/ru/search.json +++ b/public/language/ru/search.json @@ -1,35 +1,35 @@ { "results_matching": "%1 результатов по фразе \"%2\", (%3 секунды) ", "no-matches": "Совпадений не найдено", - "in": "In", - "by": "By", - "titles": "Titles", - "titles-posts": "Titles and Posts", - "posted-by": "Posted by", - "in-categories": "In Categories", - "search-child-categories": "Search child categories", - "reply-count": "Reply Count", - "at-least": "At least", - "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", - "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", - "descending": "In descending order", - "ascending": "In ascending order" + "in": "В", + "by": "От", + "titles": "Названия", + "titles-posts": "Названия и сообщения", + "posted-by": "Написано ", + "in-categories": "В разделах", + "search-child-categories": "Искать во вложенных разделах", + "reply-count": "Количество ответов", + "at-least": "Минимум", + "at-most": "Максимум", + "post-time": "Время публикации", + "newer-than": "Ранее чем", + "older-than": "Позже чем", + "any-date": "Любая дата", + "yesterday": "Вчера", + "one-week": "Одна неделя", + "two-weeks": "Две недели", + "one-month": "Один месяц", + "three-months": "Три месяца", + "six-months": "Шесть месяцев", + "one-year": "Год", + "sort-by": "Сортировать по", + "last-reply-time": "Время последнего ответа", + "topic-title": "Название темы", + "number-of-replies": "Количество ответов", + "number-of-views": "Количество просмотров", + "topic-start-date": "Время создания темы", + "username": "Имя пользователя", + "category": "Категория", + "descending": "В порядке возрастания", + "ascending": "В порядке убывания" } \ No newline at end of file diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index ec980e67a7..635e31a765 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -12,7 +12,7 @@ "notify_me": "Сообщать мне об ответах в этой теме", "quote": "Цитировать", "reply": "Ответить", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Войдите чтобы оставить сообщение", "edit": "Редактировать", "delete": "Удалить", "purge": "Очистить", diff --git a/public/language/ru/unread.json b/public/language/ru/unread.json index 325a793d59..0bdf6c4933 100644 --- a/public/language/ru/unread.json +++ b/public/language/ru/unread.json @@ -2,7 +2,7 @@ "title": "Непрочитанные темы", "no_unread_topics": "Нет непрочитанных тем.", "load_more": "Загрузить еще", - "mark_as_read": "Пометить Прочитанным", + "mark_as_read": "Пометить прочитанным", "selected": "Выбраны", "all": "Все", "topics_marked_as_read.success": "Темы помечены как прочитанные!" diff --git a/public/language/ru/user.json b/public/language/ru/user.json index ba337e227b..0b5a541199 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -6,7 +6,7 @@ "postcount": "Сообщений", "email": "Email", "confirm_email": "Подтвердить Email", - "delete_account": "Удалить Аккаунт", + "delete_account": "Удалить аккаунт", "delete_account_confirm": "Вы уверены, что хотите удалить аккаунт?
          Это действие необратимо, Вы не сможете восстановить свои данные

          Введите имя пользователя для подтверждения уничтожения аккаунта.", "fullname": "Полное имя", "website": "Сайт", @@ -18,7 +18,7 @@ "profile_views": "Просмотров профиля", "reputation": "Репутация", "favourites": "Избранное", - "watched": "Watched", + "watched": "Просмотров", "followers": "Читателей", "following": "Читаемых", "signature": "Подпись", @@ -30,18 +30,18 @@ "profile_update_success": "Профиль обновлен!", "change_picture": "Изменить фотографию", "edit": "Редактировать", - "uploaded_picture": "Загруженные Фотографии", + "uploaded_picture": "Загруженные фотографии", "upload_new_picture": "Загрузить новую фотографию", "upload_new_picture_from_url": "Загрузить новое изображение с адреса URL", - "current_password": "Текущий Пароль", - "change_password": "Изменить Пароль", - "change_password_error": "Неверный Пароль!", + "current_password": "Текущий пароль", + "change_password": "Изменить пароль", + "change_password_error": "Неверный пароль!", "change_password_error_wrong_current": "Текущий пароль неверен!", "change_password_error_length": "Пароль слишком короткий!", "change_password_error_match": "Пароли должны совпадать!", "change_password_error_privileges": "Вы не можете сменить этот пароль.", "change_password_success": "Ваш пароль изменен!", - "confirm_password": "Подтвердите Пароль", + "confirm_password": "Подтвердите пароль", "password": "Пароль", "username_taken_workaround": "Логин, который Вы запросили, уже занят. Мы его немного изменили. Теперь Ваш логин %1", "upload_picture": "Загрузить фотографию", @@ -52,20 +52,20 @@ "show_email": "Показывать мой Email", "show_fullname": "Показывать Полное Имя", "restrict_chats": "Разрешить чат только с теми, на кого я подписан", - "digest_label": "Подписаться на Дайджест", + "digest_label": "Подписаться на дайджест", "digest_description": "Подписаться на Email обновления этого форума (новые уведомления и топики) согласно расписанию", "digest_off": "Выключить", - "digest_daily": "За День", - "digest_weekly": "За Неделю", - "digest_monthly": "За Месяц", + "digest_daily": "За день", + "digest_weekly": "За неделю", + "digest_monthly": "За месяц", "send_chat_notifications": "Уведомлять на E-mail при поступлении нового сообщения чата, когда я оффлайн", "send_post_notifications": "Отправлять email, когда отвечают в темы, на которые я подписан(а)", "has_no_follower": "Этого пользователя никто не читает :(", "follows_no_one": "Этот пользователь никого не читает :(", "has_no_posts": "Это пользователь еще ничего не написал.", "has_no_topics": "Этот пользователь еще не создал ни одной темы", - "has_no_watched_topics": "This user didn't watch any topics yet.", - "email_hidden": "Email Скрыт", + "has_no_watched_topics": "Этот пользователь еще не просмотрел ни одной темы", + "email_hidden": "Email скрыт", "hidden": "скрыто", "paginate_description": "Использовать пагинацию тем и постов вместо бесконечной прокрутки", "topics_per_page": "Тем на Странице", @@ -73,7 +73,7 @@ "notification_sounds": "Звук при получении уведомления", "browsing": "Настройки просмотра", "open_links_in_new_tab": "Открывать ссылки, ведущие на другие сайты, в новой вкладке?", - "enable_topic_searching": "Включить Поиск по всей теме", + "enable_topic_searching": "Активировать поиск внутри тем", "topic_search_help": "Если включено, то стандартный \"Поиск на странице\" Вашего браузера будет осуществлять поиск по всей теме вместо одной её страницы.", "follow_topics_you_reply_to": "Следить за темами, в которых Вы отвечали.", "follow_topics_you_create": "Следить за темами, которые Вы создали." diff --git a/public/language/ru/users.json b/public/language/ru/users.json index e4253bcf62..ffc028bcf3 100644 --- a/public/language/ru/users.json +++ b/public/language/ru/users.json @@ -5,8 +5,8 @@ "search": "Поиск", "enter_username": "Введите имя пользователя для поиска", "load_more": "Загрузить еще", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "users-found-search-took": "Найдено %1 пользователя(ей). Поиск занял %2 секунд. ", + "filter-by": "Сортировать по", + "online-only": "Только онлайн", + "picture-only": "Только с аватаром" } \ No newline at end of file From 56d18666d60d806e680113c834153ffd18e6dfd5 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 22 Feb 2015 14:47:07 -0500 Subject: [PATCH 499/897] closes #2752 --- src/posts/delete.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/posts/delete.js b/src/posts/delete.js index f3fab5bd87..bd130ade46 100644 --- a/src/posts/delete.js +++ b/src/posts/delete.js @@ -29,7 +29,7 @@ module.exports = function(Posts) { removeFromCategoryRecentPosts(pid, postData.tid, next); }, function(next) { - Posts.dismissFlags(pid, next); + Posts.dismissFlag(pid, next); } ], function(err) { callback(err, postData); @@ -127,7 +127,7 @@ module.exports = function(Posts) { db.sortedSetsRemove(['posts:pid', 'posts:flagged'], pid, next); }, function(next) { - Posts.dismissFlags(pid, next); + Posts.dismissFlag(pid, next); } ], function(err) { if (err) { From 218ecce6c1e3d05ee067f115a64eb02207ffece7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 23 Feb 2015 09:12:06 -0500 Subject: [PATCH 500/897] accessing search route with no term auto-expands the form now, part 1 of 2, #2757 --- src/controllers/search.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/controllers/search.js b/src/controllers/search.js index 2020612094..7ed16d8bb8 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -31,7 +31,8 @@ searchController.search = function(req, res, next) { users: [], tags: [], categories: categories, - breadcrumbs: breadcrumbs + breadcrumbs: breadcrumbs, + expandSearch: true }; plugins.fireHook('filter:search.build', {data: {}, results: results}, function(err, data) { if (err) { @@ -75,6 +76,7 @@ searchController.search = function(req, res, next) { results.showAsTopics = req.query.showAs === 'topics'; results.breadcrumbs = breadcrumbs; results.categories = categories; + results.expandSearch = false; plugins.fireHook('filter:search.build', {data: data, results: results}, function(err, data) { if (err) { From 53db052ccafe930839c09529fb166a48ee2c69fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 23 Feb 2015 12:55:44 -0500 Subject: [PATCH 501/897] timeago widgets --- public/src/widgets.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/src/widgets.js b/public/src/widgets.js index 936ce9cd95..fea7814c9d 100644 --- a/public/src/widgets.js +++ b/public/src/widgets.js @@ -67,9 +67,11 @@ area.addClass('hidden'); ajaxify.widgets.reposition(location); } - - $('#content [widget-area] img:not(.user-img)').addClass('img-responsive'); } + + var widgetAreas = $('#content [widget-area]'); + widgetAreas.find('img:not(.user-img)').addClass('img-responsive'); + widgetAreas.find('span.timeago').timeago(); $(window).trigger('action:widgets.loaded', {}); From 8b81f3d83548afaef4bb9b9d8430e50fa903ed47 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 23 Feb 2015 13:05:27 -0500 Subject: [PATCH 502/897] server-side support for hidden option in group admin, #2758 --- public/language/en_GB/groups.json | 15 +++++++++++++-- src/groups.js | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json index 964b5f42c6..a72cf20110 100644 --- a/public/language/en_GB/groups.json +++ b/public/language/en_GB/groups.json @@ -5,6 +5,9 @@ "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", + "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -15,12 +18,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/src/groups.js b/src/groups.js index 1eae52699b..985cfc2e9d 100644 --- a/src/groups.js +++ b/src/groups.js @@ -510,7 +510,7 @@ var async = require('async'), description: values.description || '', icon: values.icon || '', labelColor: values.labelColor || '#000000', - hidden: values.hidden || '0', + hidden: values.hidden === true ? '1' : '0', 'private': values.private === false ? '0' : '1' }; From 1d5e15eab40192d508680ba380eb59c37bad9ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 23 Feb 2015 13:39:17 -0500 Subject: [PATCH 503/897] closes #2560 --- public/language/en_GB/error.json | 1 + public/src/app.js | 16 +++++++++++++++- src/middleware/middleware.js | 4 ++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 812ae03a17..b2f9a3b86b 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -24,6 +24,7 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", "username-too-short": "Username too short", "username-too-long": "Username too long", diff --git a/public/src/app.js b/public/src/app.js index b4a091f960..d3a47a1bc6 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -570,7 +570,21 @@ app.cacheBuster = null; }; function showEmailConfirmWarning() { - if (config.requireEmailConfirmation && app.user.uid && !app.user['email:confirmed']) { + if (!config.requireEmailConfirmation || !app.user.uid) { + return; + } + if (!app.user.email) { + app.alert({ + alert_id: 'email_confirm', + message: '[[error:no-email-to-confirm]]', + type: 'warning', + timeout: 0, + clickfn: function() { + app.removeAlert('email_confirm'); + ajaxify.go('user/' + app.user.userslug + '/edit'); + } + }); + } else if (!app.user['email:confirmed']) { app.alert({ alert_id: 'email_confirm', message: '[[error:email-not-confirmed]]', diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 43e2a2ea86..658b9e0c63 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -317,7 +317,7 @@ middleware.renderHeader = function(req, res, callback) { }, user: function(next) { if (uid) { - user.getUserFields(uid, ['username', 'userslug', 'picture', 'status', 'email:confirmed', 'banned'], next); + user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'status', 'email:confirmed', 'banned'], next); } else { next(null, { username: '[[global:guest]]', @@ -342,7 +342,7 @@ middleware.renderHeader = function(req, res, callback) { results.user.isAdmin = results.isAdmin || false; results.user.uid = parseInt(results.user.uid, 10); results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1; - + templateValues.browserTitle = results.title; templateValues.isAdmin = results.user.isAdmin; templateValues.user = results.user; From e6e755dd4617a3b15bab1fc3eb1c526fc10b4295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 23 Feb 2015 14:05:43 -0500 Subject: [PATCH 504/897] #2560 --- src/middleware/admin.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/middleware/admin.js b/src/middleware/admin.js index a7ed1997fb..a23781fdef 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -40,13 +40,14 @@ middleware.buildHeader = function(req, res, next) { 'authentication': [] }; - user.getUserFields(uid, ['username', 'userslug', 'picture', 'email:confirmed'], function(err, userData) { + user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) { if (err) { return next(err); } userData.uid = uid; - + userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1; + async.parallel({ scripts: function(next) { plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) { @@ -72,16 +73,15 @@ middleware.buildHeader = function(req, res, next) { return next(err); } res.locals.config = results.config; + var data = { relative_path: nconf.get('relative_path'), configJSON: JSON.stringify(results.config), + user: userData, userJSON: JSON.stringify(userData), plugins: results.custom_header.plugins, authentication: results.custom_header.authentication, scripts: results.scripts, - userpicture: userData.picture, - username: userData.username, - userslug: userData.userslug, 'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '', env: process.env.NODE_ENV ? true : false }; From 89f2520eba2434e5ff6304f07f1ac5475a61268b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 23 Feb 2015 14:07:51 -0500 Subject: [PATCH 505/897] #2560 fix user link pic --- src/views/admin/header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 7a5d658eb2..89b0dc4ac4 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -85,11 +85,11 @@

    + + + + +
    + + From dee5d18439cf7a7173175e2cb68a78f15f555ff0 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 23 Feb 2015 16:08:22 -0500 Subject: [PATCH 513/897] require npm module only as needed - shaves off a full second of loading time yay --- src/plugins.js | 5 ++++- src/plugins/install.js | 9 ++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index fbc74e85ac..2e5202e240 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -1,5 +1,6 @@ 'use strict'; +var start = process.hrtime(); var fs = require('fs'), path = require('path'), async = require('async'), @@ -18,10 +19,12 @@ var fs = require('fs'), controllers = require('./controllers'), app, middleware; +process.profile('requiring modules', start); (function(Plugins) { - +var start = process.hrtime(); require('./plugins/install')(Plugins); +process.profile('requiring modules 2', start); require('./plugins/load')(Plugins); require('./plugins/hooks')(Plugins); diff --git a/src/plugins/install.js b/src/plugins/install.js index de63cd9f3b..6d6865301a 100644 --- a/src/plugins/install.js +++ b/src/plugins/install.js @@ -2,7 +2,6 @@ var winston = require('winston'), async = require('async'), - npm = require('npm'), path = require('path'), fs = require('fs'), nconf = require('nconf'), @@ -88,10 +87,10 @@ module.exports = function(Plugins) { next(); }, function(next) { - npm.load({}, next); + require('npm').load({}, next); }, function(res, next) { - npm.commands[type](installed ? id : [id + '@' + (version || 'latest')], next); + require('npm').commands[type](installed ? id : [id + '@' + (version || 'latest')], next); } ], function(err) { if (err) { @@ -111,10 +110,10 @@ module.exports = function(Plugins) { function upgrade(id, version, callback) { async.waterfall([ function(next) { - npm.load({}, next); + require('npm').load({}, next); }, function(res, next) { - npm.commands.install([id + '@' + (version || 'latest')], next); + require('npm').commands.install([id + '@' + (version || 'latest')], next); } ], callback); } From 61b8fd24028212ccb4ab5b7397b4c1004a663b2d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 23 Feb 2015 16:13:04 -0500 Subject: [PATCH 514/897] woops, left in some debug statements --- src/plugins.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index 2e5202e240..b9e7118df9 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -1,6 +1,5 @@ 'use strict'; -var start = process.hrtime(); var fs = require('fs'), path = require('path'), async = require('async'), @@ -19,12 +18,9 @@ var fs = require('fs'), controllers = require('./controllers'), app, middleware; -process.profile('requiring modules', start); (function(Plugins) { -var start = process.hrtime(); require('./plugins/install')(Plugins); -process.profile('requiring modules 2', start); require('./plugins/load')(Plugins); require('./plugins/hooks')(Plugins); From 13fa1f6b9a03dbaf92ec42c8d6ec370ecb43f3a0 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 23 Feb 2015 16:24:43 -0500 Subject: [PATCH 515/897] require socket.io only when you need it, shaves off another 0.5s on load --- src/controllers/accounts.js | 5 ++--- src/messaging.js | 5 ++--- src/posts/user.js | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 600c6a2347..eb78226145 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -22,8 +22,7 @@ var fs = require('fs'), languages = require('../languages'), image = require('../image'), file = require('../file'), - helpers = require('./helpers'), - websockets = require('../socket.io'); + helpers = require('./helpers'); function getUserDataByUserSlug(userslug, callerUID, callback) { user.getUidByUserslug(userslug, function(err, uid) { @@ -91,7 +90,7 @@ function getUserDataByUserSlug(userslug, callerUID, callback) { userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1; userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10); userData.profile_links = results.profile_links; - userData.status = websockets.isUserOnline(userData.uid) ? (userData.status || 'online') : 'offline'; + userData.status = require('../socket.io').isUserOnline(userData.uid) ? (userData.status || 'online') : 'offline'; userData.banned = parseInt(userData.banned, 10) === 1; userData.websiteName = userData.website.replace(validator.escape('http://'), '').replace(validator.escape('https://'), ''); userData.followingCount = parseInt(userData.followingCount, 10) || 0; diff --git a/src/messaging.js b/src/messaging.js index 86ecf7014d..4a367fbd38 100644 --- a/src/messaging.js +++ b/src/messaging.js @@ -10,7 +10,6 @@ var db = require('./database'), utils = require('../public/src/utils'), notifications = require('./notifications'), userNotifications = require('./user/notifications'), - websockets = require('./socket.io'), emailer = require('./emailer'); (function(Messaging) { @@ -257,7 +256,7 @@ var db = require('./database'), results.users.forEach(function(user, index) { if (user) { user.unread = results.unread[index]; - user.status = websockets.isUserOnline(user.uid) ? user.status : 'offline'; + user.status = require('./socket.io').isUserOnline(user.uid) ? user.status : 'offline'; } }); @@ -320,7 +319,7 @@ var db = require('./database'), }; function sendNotifications(fromuid, touid, messageObj, callback) { - if (websockets.isUserOnline(touid)) { + if (require('./socket.io').isUserOnline(touid)) { return callback(); } diff --git a/src/posts/user.js b/src/posts/user.js index 555b60e46d..02b7816ed9 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -6,7 +6,6 @@ var async = require('async'), user = require('../user'), groups = require('../groups'), meta = require('../meta'), - websockets = require('../socket.io'), postTools = require('../postTools'), plugins = require('../plugins'); @@ -22,7 +21,7 @@ module.exports = function(Posts) { user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status'], next); }, online: function(next) { - websockets.isUsersOnline(uids, next); + require('../socket.io').isUsersOnline(uids, next); } }, function(err, results) { if (err) { From 03e39f7b9b2ee30af3bcbc8ca26da9725d668cb9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 23 Feb 2015 16:31:18 -0500 Subject: [PATCH 516/897] isInvited mechanic for #2758 --- public/src/modules/helpers.js | 2 ++ src/controllers/groups.js | 7 ++++- src/groups.js | 48 +++++++++++++++++++++++++++++------ 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index e8f77a5614..c4676a0e37 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -33,6 +33,8 @@ } else { if (groupObj.isPending) { return ''; + } else if (groupObj.isInvited) { + return ''; } else { return ''; } diff --git a/src/controllers/groups.js b/src/controllers/groups.js index d18aac4fc2..51200d0a40 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -42,7 +42,12 @@ groupsController.details = function(req, res, next) { next(null, true); } else { // If not, only members are granted access - groups.isMember(uid, res.locals.groupName, next); + async.parallel([ + async.apply(groups.isMember, uid, res.locals.groupName), + async.apply(groups.isInvited, uid, res.locals.groupName) + ], function(err, checks) { + next(err, checks[0] || checks[1]); + }); } } ], function(err, ok) { diff --git a/src/groups.js b/src/groups.js index 177d194fff..54ff60a195 100644 --- a/src/groups.js +++ b/src/groups.js @@ -31,7 +31,7 @@ var async = require('async'), if (!group) { return false; } - if (group.deleted || (group.hidden && !group.system && !group.isMember && !options.isAdmin) || (!options.showSystemGroups && group.system)) { + if (group.deleted || (group.hidden && !(group.system || group.isMember || options.isAdmin || group.isInvited)) || (!options.showSystemGroups && group.system)) { return false; } else if (options.removeEphemeralGroups && ephemeralGroups.indexOf(group.name) !== -1) { return false; @@ -179,6 +179,7 @@ var async = require('async'), db.isSetMember('group:' + groupName + ':pending', options.uid, next); }, + isInvited: async.apply(Groups.isInvited, options.uid, groupName), isOwner: function(next) { // Retrieve group ownership state, if uid is passed in if (!options.uid) { @@ -228,6 +229,7 @@ var async = require('async'), results.base.truncated = truncated; results.base.isMember = results.isMember; results.base.isPending = results.isPending; + results.base.isInvited = results.isInvited; results.base.isOwner = results.isOwner; @@ -408,6 +410,11 @@ var async = require('async'), }); }; + Groups.isInvited = function(uid, groupName, callback) { + if (!uid) { return callback(null, false); } + db.isSetMember('group:' + groupName + ':invited', uid, callback); + }; + Groups.exists = function(name, callback) { if (Array.isArray(name)) { var slugs = name.map(function(groupName) { @@ -607,6 +614,7 @@ var async = require('async'), async.apply(db.rename, 'group:' + oldName + ':members', 'group:' + newName + ':members'), async.apply(db.rename, 'group:' + oldName + ':owners', 'group:' + newName + ':owners'), async.apply(db.rename, 'group:' + oldName + ':pending', 'group:' + newName + ':pending'), + async.apply(db.rename, 'group:' + oldName + ':invited', 'group:' + newName + ':invited'), async.apply(renameGroupMember, 'groups:createtime', oldName, newName), function(next) { plugins.fireHook('action:group.rename', { @@ -651,6 +659,7 @@ var async = require('async'), async.apply(db.sortedSetRemove, 'groups:createtime', groupName), async.apply(db.delete, 'group:' + groupName + ':members'), async.apply(db.delete, 'group:' + groupName + ':pending'), + async.apply(db.delete, 'group:' + groupName + ':invited'), async.apply(db.delete, 'group:' + groupName + ':owners'), async.apply(db.deleteObjectField, 'groupslug:groupname', utils.slugify(groupName)), function(next) { @@ -747,18 +756,41 @@ var async = require('async'), Groups.acceptMembership = function(groupName, uid, callback) { // Note: For simplicity, this method intentially doesn't check the caller uid for ownership! async.waterfall([ - function(next) { - db.setRemove('group:' + groupName + ':pending', uid, next); - }, - function(next) { - Groups.join(groupName, uid, next); - } + async.apply(db.setRemove, 'group:' + groupName + ':pending', uid), + async.apply(db.setRemove, 'group:' + groupName + ':invited', uid), + async.apply(Groups.join, groupName, uid) ], callback); }; Groups.rejectMembership = function(groupName, uid, callback) { // Note: For simplicity, this method intentially doesn't check the caller uid for ownership! - db.setRemove('group:' + groupName + ':pending', uid, callback); + async.parallel([ + async.apply(db.setRemove, 'group:' + groupName + ':pending', uid), + async.apply(db.setRemove, 'group:' + groupName + ':invited', uid) + ], callback); + }; + + Groups.invite = function(groupName, uid, callback) { + async.parallel({ + exists: async.apply(Groups.exists, groupName), + isMember: async.apply(Groups.isMember, uid, groupName) + }, function(err, checks) { + if (!checks.exists) { + return callback(new Error('[[error:no-group]]')); + } else if (checks.isMember) { + return callback(new Error('[[error:group-already-member]]')); + } + + if (parseInt(uid, 10) > 0) { + db.setAdd('group:' + groupName + ':invited', uid, callback); + plugins.fireHook('action:group.inviteMember', { + groupName: groupName, + uid: uid + }); + } else { + callback(new Error('[[error:not-logged-in]]')); + } + }); }; Groups.leave = function(groupName, uid, callback) { From 3e3fff9fe85d6bf4e8db9679c71bfdd789975426 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 23 Feb 2015 16:46:45 -0500 Subject: [PATCH 517/897] hooking up accept/reject invite, #2758 --- public/src/client/groups/details.js | 2 ++ src/socket.io/groups.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js index 1d651fad27..f4f56a686e 100644 --- a/public/src/client/groups/details.js +++ b/public/src/client/groups/details.js @@ -64,6 +64,8 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker', case 'leave': case 'accept': case 'reject': + case 'acceptInvite': + case 'rejectInvite': socket.emit('groups.' + action, { toUid: uid, groupName: ajaxify.variables.get('group_name') diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js index ba35e128c4..bb814e6006 100644 --- a/src/socket.io/groups.js +++ b/src/socket.io/groups.js @@ -101,6 +101,34 @@ SocketGroups.reject = function(socket, data, callback) { }); }; +SocketGroups.acceptInvite = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.isInvited(socket.uid, data.groupName, function(err, invited) { + if (!invited) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.acceptMembership(data.groupName, socket.uid, callback); + }); +}; + +SocketGroups.rejectInvite = function(socket, data, callback) { + if (!data) { + return callback(new Error('[[error:invalid-data]]')); + } + + groups.isInvited(socket.uid, data.groupName, function(err, invited) { + if (!invited) { + return callback(new Error('[[error:no-privileges]]')); + } + + groups.rejectMembership(data.groupName, socket.uid, callback); + }); +}; + SocketGroups.update = function(socket, data, callback) { if (!data) { return callback(new Error('[[error:invalid-data]]')); From f408c76a987ebbd25512b491d65226c65f4eaaaa Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 23 Feb 2015 17:24:20 -0500 Subject: [PATCH 518/897] requiring plugins in meta when needed --- src/meta.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/meta.js b/src/meta.js index 0e07681223..b58ac1a9b2 100644 --- a/src/meta.js +++ b/src/meta.js @@ -8,7 +8,6 @@ var async = require('async'), user = require('./user'), groups = require('./groups'), - plugins = require('./plugins'), emitter = require('./emitter'), pubsub = require('./pubsub'), auth = require('./routes/authentication'); @@ -49,6 +48,8 @@ var async = require('async'), function reload(callback) { callback = callback || function() {}; + + var plugins = require('./plugins'); async.series([ async.apply(plugins.clearRequireCache), async.apply(plugins.reload), From fdc8b67449e0326ec8cae1705d65bbc7befff030 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 23 Feb 2015 17:25:36 -0500 Subject: [PATCH 519/897] require pkg when needed --- src/plugins.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index b9e7118df9..cb67084b28 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -14,7 +14,6 @@ var fs = require('fs'), translator = require('../public/src/translator'), utils = require('../public/src/utils'), hotswap = require('./hotswap'), - pkg = require('../package.json'), controllers = require('./controllers'), app, middleware; @@ -168,8 +167,9 @@ var fs = require('fs'), }; Plugins.getAll = function(callback) { - var request = require('request'); - request((nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins?version=' + pkg.version, function(err, res, body) { + var url = (nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins?version=' + require('../package.json').version; + + require('request')(url, function(err, res, body) { var plugins = []; try { From ab2315f3de8dab76a90fbe41821a145d47dbb80d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Feb 2015 11:45:58 -0500 Subject: [PATCH 520/897] #2751 --- public/src/admin/extend/rewards.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 45e81cc289..967e098bf7 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -143,8 +143,8 @@ define('admin/extend/rewards', function() { templates.parse('admin/extend/rewards', 'active', data, function(li) { li = $(li); - li.find('[name="rid"]').val(''); ul.append(li); + li.find('select').val(''); }); } From 9de0c0cdd40e9bc96ec80268e9319f50417b4a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 24 Feb 2015 11:55:07 -0500 Subject: [PATCH 521/897] closes #2761 --- src/database/mongo/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 475360c2ca..0488260946 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -138,7 +138,7 @@ module.exports = function(db, module) { }; module.pexpire = function(key, ms, callback) { - module.expireAt(key, Date.now() + parseInt(ms, 10), callback); + module.setObjectField(key, 'expireAt', new Date(Date.now() + parseInt(ms, 10)), callback); }; module.pexpireAt = function(key, timestamp, callback) { From 52aa7d27e8240eb835cb66303dcc02d3723949b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 24 Feb 2015 11:58:09 -0500 Subject: [PATCH 522/897] #2761 --- src/database/mongo/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 0488260946..8509475bc4 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -138,7 +138,7 @@ module.exports = function(db, module) { }; module.pexpire = function(key, ms, callback) { - module.setObjectField(key, 'expireAt', new Date(Date.now() + parseInt(ms, 10)), callback); + module.pexpireAt(key, Date.now() + parseInt(ms, 10), callback); }; module.pexpireAt = function(key, timestamp, callback) { From 242f66934c5230cf9e0a93c2ab57cc53a5c9c033 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Feb 2015 12:23:35 -0500 Subject: [PATCH 523/897] another attempt --- Gruntfile.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 4db400bf83..eb57d4984e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,7 +7,10 @@ module.exports = function(grunt) { script: 'app.js', node_env: 'development', args: ['dev', 'from-file'], - output: "NodeBB Ready" + output: "NodeBB Ready", + interrupt: true, + spawn: false, + interval: 100 } }, minifyJS: { @@ -15,7 +18,10 @@ module.exports = function(grunt) { script: 'app.js', node_env: 'development', args: ['dev', 'minify-js'], - output: "NodeBB Ready" + output: "NodeBB Ready", + interrupt: true, + spawn: false, + interval: 100 } }, compileLESS: { @@ -23,7 +29,10 @@ module.exports = function(grunt) { script: 'app.js', node_env: 'development', args: ['dev', 'compile-less'], - output: "NodeBB Ready" + output: "NodeBB Ready", + interrupt: true, + spawn: false, + interval: 100 } } }, From eb6754c5ebad9dc1bebf58d9a8398c65c8a6d904 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Feb 2015 12:56:49 -0500 Subject: [PATCH 524/897] nice, I figured out how to speed up grunt watch --- Gruntfile.js | 50 ++++++++++++++++++++++++++++++------------------ app.js | 2 +- src/webserver.js | 4 ++-- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index eb57d4984e..edae80b7d8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,30 +6,41 @@ module.exports = function(grunt) { options: { script: 'app.js', node_env: 'development', - args: ['dev', 'from-file'], - output: "NodeBB Ready", + args: ['--log-level=info'], + output: 'NodeBB Ready', interrupt: true, spawn: false, interval: 100 } }, - minifyJS: { + serverUpdated: { options: { script: 'app.js', node_env: 'development', - args: ['dev', 'minify-js'], - output: "NodeBB Ready", + args: ['--from-file=less,js', '--log-level=info'], + output: 'NodeBB Ready', interrupt: true, spawn: false, interval: 100 } }, - compileLESS: { + clientUpdated: { options: { script: 'app.js', node_env: 'development', - args: ['dev', 'compile-less'], - output: "NodeBB Ready", + args: ['--from-file=less', '--log-level=info'], + output: 'NodeBB Ready', + interrupt: true, + spawn: false, + interval: 100 + } + }, + lessUpdated: { + options: { + script: 'app.js', + node_env: 'development', + args: ['--from-file=js', '--log-level=info'], + output: 'NodeBB Ready', interrupt: true, spawn: false, interval: 100 @@ -39,17 +50,22 @@ module.exports = function(grunt) { less: { development: { files: { - "public/bin/manifest.css": "source/manifest.less" + 'public/bin/manifest.css': 'source/manifest.less' } } }, watch: { - compileLESS: { - files: "**/*.less", - tasks: ['express:compileLESS'], - options: { - livereload: true, - } + lessUpdated: { + files: 'public/**/*.less', + tasks: ['express:lessUpdated'] + }, + clientUpdated: { + files: 'public/src/**/*.js', + tasks: ['express:clientUpdated'] + }, + serverUpdated: { + files: ['*.js', 'src/**/*.js'], + tasks: ['express:serverUpdated'] } } }); @@ -58,8 +74,4 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-express-server'); grunt.registerTask('default', ['express:dev', 'watch']); - - grunt.event.on('watch', function(action, filepath, target) { - grunt.log.writeln(target + ': ' + filepath + ' has ' + action); - }); }; \ No newline at end of file diff --git a/app.js b/app.js index f208072719..ef113e5ece 100644 --- a/app.js +++ b/app.js @@ -43,7 +43,7 @@ winston.add(winston.transports.Console, { var date = new Date(); return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']'; }, - level: global.env === 'production' ? 'info' : 'verbose' + level: (global.env === 'production' || nconf.get('log-level') === 'info') ? 'info' : 'verbose' }); if(os.platform() === 'linux') { diff --git a/src/webserver.js b/src/webserver.js index 5512c84e40..01dee2b91c 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -39,8 +39,8 @@ if(nconf.get('ssl')) { // Preparation dependent on plugins plugins.ready(function() { async.parallel([ - async.apply((!nconf.get('minify-js') && !nconf.get('from-file')) ? meta.js.minify : meta.js.getFromFile, app.enabled('minification')), - async.apply((!nconf.get('compile-less') && !nconf.get('from-file')) ? meta.css.minify : meta.css.getFromFile), + async.apply(!nconf.get('from-file') ? meta.js.minify : meta.js.getFromFile, app.enabled('minification')), + async.apply(!nconf.get('from-file') ? meta.css.minify : meta.css.getFromFile), async.apply(meta.sounds.init) ]); }); From c94c1430b7d9d57c8960745fcfe7b868cf2ddc84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 24 Feb 2015 13:02:58 -0500 Subject: [PATCH 525/897] api/post/pid route --- src/controllers/index.js | 1 + src/controllers/posts.js | 36 ++++++++++++++++++++++++++++++++++++ src/posts/category.js | 5 +---- src/privileges/categories.js | 3 +++ src/privileges/posts.js | 5 +++-- src/routes/api.js | 1 + src/topics/fork.js | 4 ++++ 7 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 src/controllers/posts.js diff --git a/src/controllers/index.js b/src/controllers/index.js index 8a43da5c9f..d8ddf81735 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -16,6 +16,7 @@ var async = require('async'), helpers = require('./helpers'); var Controllers = { + posts: require('./posts'), topics: require('./topics'), categories: require('./categories'), tags: require('./tags'), diff --git a/src/controllers/posts.js b/src/controllers/posts.js new file mode 100644 index 0000000000..e5a32e9791 --- /dev/null +++ b/src/controllers/posts.js @@ -0,0 +1,36 @@ +"use strict"; + +var async = require('async'), + + posts = require('../posts'), + privileges = require('../privileges'), + helpers = require('./helpers'), + postsController = {}; + +postsController.getPost = function(req, res, next) { + var uid = req.user ? parseInt(req.user.uid) : 0; + async.parallel({ + canRead: function(next) { + privileges.posts.can('read', req.params.pid, uid, next); + }, + postData: function(next) { + posts.getPostData(req.params.pid, next); + } + }, function(err, results) { + if (err) { + return next(err); + } + if (!results.postData) { + return helpers.notFound(req, res); + } + if (!results.canRead) { + return helpers.notAllowed(req, res); + } + + res.json(results.postData); + }); +}; + + + +module.exports = postsController; diff --git a/src/posts/category.js b/src/posts/category.js index 761738cb1f..68ae42474b 100644 --- a/src/posts/category.js +++ b/src/posts/category.js @@ -13,10 +13,7 @@ module.exports = function(Posts) { }, function(tid, next) { topics.getTopicField(tid, 'cid', next); - }, - function(cid, next) { - next(!cid ? new Error('[[error:invalid-cid]]') : null, cid); - } + } ], callback); }; diff --git a/src/privileges/categories.js b/src/privileges/categories.js index 5ff70730d4..267c9e2c81 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -46,6 +46,9 @@ module.exports = function(privileges) { }; privileges.categories.can = function(privilege, cid, uid, callback) { + if (!cid) { + return callback(null, false); + } categories.getCategoryField(cid, 'disabled', function(err, disabled) { if (err) { return callback(err); diff --git a/src/privileges/posts.js b/src/privileges/posts.js index 7de1167726..7c304a1a2c 100644 --- a/src/privileges/posts.js +++ b/src/privileges/posts.js @@ -153,9 +153,10 @@ module.exports = function(privileges) { helpers.some([ function(next) { posts.getCidByPid(pid, function(err, cid) { - if (err) { - return next(err); + if (err || !cid) { + return next(err, false); } + user.isModerator(uid, cid, next); }); }, diff --git a/src/routes/api.js b/src/routes/api.js index 47632ccce7..ef1c297e49 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -16,6 +16,7 @@ module.exports = function(app, middleware, controllers) { router.get('/widgets/render', controllers.api.renderWidgets); router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID); + router.get('/post/:pid', controllers.posts.getPost); router.get('/get_templates_listing', templatesController.getTemplatesListing); router.get('/categories/:cid/moderators', getModerators); router.get('/recent/posts/:term?', getRecentPosts); diff --git a/src/topics/fork.js b/src/topics/fork.js index 4cd5e0c53e..3302797f38 100644 --- a/src/topics/fork.js +++ b/src/topics/fork.js @@ -41,6 +41,10 @@ module.exports = function(Topics) { posts.getCidByPid(mainPid, callback); } }, function(err, results) { + if (err) { + return callback(err); + } + Topics.create({uid: results.postData.uid, title: title, cid: results.cid}, function(err, tid) { if (err) { return callback(err); From 912de27c9d0d97192c7c296f51757608e6669d89 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 24 Feb 2015 14:43:19 -0500 Subject: [PATCH 526/897] fixed indentation issues --- src/views/admin/header.tpl | 178 ++++++++++++++++++------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 89b0dc4ac4..4193857410 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -16,100 +16,100 @@ - - - - + + + - - - - - - - - - - + app.inAdmin = true; + + + + + + + + + + + - - - - + + + + - - + -
    - +
    + + +
    From ec075ca60898441529562636f7318f63cf572501 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 25 Feb 2015 15:50:13 -0500 Subject: [PATCH 580/897] suppressing alertSuccess when clicking into topics from unread page --- public/src/client/unread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/unread.js b/public/src/client/unread.js index 8a6df4f9cd..53cb048463 100644 --- a/public/src/client/unread.js +++ b/public/src/client/unread.js @@ -77,7 +77,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], return app.alertError(err.message); } - doneRemovingTids([tid]); + doneRemovingTids([tid], true); }); }); From 37d426dddb3311119b038c073f80c5046d26f881 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 25 Feb 2015 15:56:52 -0500 Subject: [PATCH 581/897] npnp, I totally meant to remove a method that's still in use... --- src/user/notifications.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/user/notifications.js b/src/user/notifications.js index 3a11b06a0a..c3ea4b9c23 100644 --- a/src/user/notifications.js +++ b/src/user/notifications.js @@ -39,6 +39,20 @@ var async = require('async'), }); }; + UserNotifications.getAll = function(uid, count, callback) { + getNotifications(uid, count, function(err, notifs) { + if (err) { + return callback(err); + } + notifs = notifs.unread.concat(notifs.read); + notifs = notifs.filter(Boolean).sort(function(a, b) { + return b.datetime - a.datetime; + }); + + callback(null, notifs); + }); + }; + function getNotifications(uid, count, callback) { async.parallel({ unread: function(next) { From f00589c8bae0fa46ac117f1998840213781df4b1 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 25 Feb 2015 16:07:03 -0500 Subject: [PATCH 582/897] removing 'see all chats' from chats list, as it is in menu.tpl now --- public/src/modules/chat.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 06e8c75c7d..abc1bb58be 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -59,11 +59,6 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, }); })(userObj); } - - var seeAll = '
  • [[modules:chat.see_all]]
    • '; - translator.translate(seeAll, function(translated) { - $(translated).appendTo(chatsListEl); - }); }); }); From 809ed255d180f5dfe56b20b518ffbeed62288fec Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 16:19:14 -0500 Subject: [PATCH 583/897] drag & drop routes --- public/less/admin/general/navigation.less | 4 +++ public/src/admin/general/navigation.js | 35 +++++++++++++++++++++-- src/views/admin/general/navigation.tpl | 4 +-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less index 3ae2c28c25..338971b4a1 100644 --- a/public/less/admin/general/navigation.less +++ b/public/less/admin/general/navigation.less @@ -2,5 +2,9 @@ ul { list-style-type: none; padding: 0; + + li { + cursor: move; + } } } \ No newline at end of file diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index acf1c31ae6..6e95f578b9 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -25,8 +25,31 @@ define('admin/general/navigation', function() { $('#save').on('click', saveNavigation); - $('#enabled').sortable(); - $('#enabled').disableSelection(); + $('#enabled') + .sortable() + .droppable({ + accept: $('#available li') + }) + .disableSelection(); + + $('#available li') + .draggable({ + connectToSortable: '#enabled', + helper: 'clone', + distance: 10, + stop: function(ev, ui) { + var id = ui.helper.attr('data-id'), + el = $('#enabled [data-id="' + id + '"]'), + data = id === 'custom' ? {} : available[id]; + + templates.parse('admin/general/navigation', 'enabled', {enabled: [data]}, function(li) { + li = $(li); + el.after(li); + el.remove(); + }); + } + }) + .disableSelection(); }; function saveNavigation() { @@ -58,5 +81,13 @@ define('admin/general/navigation', function() { }); } + function getDefaultsByRoute(route) { + available.forEach(function(item) { + if (item.route.match(route)) { + return item; + } + }); + } + return navigation; }); \ No newline at end of file diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl index 0f2890f855..3a658efb5b 100644 --- a/src/views/admin/general/navigation.tpl +++ b/src/views/admin/general/navigation.tpl @@ -45,8 +45,8 @@
    Available Menu Items
    -
      -
    • +
        +
      • Custom Route
        • From d806cd134fbcd29e2a015300f69f28ca250cec21 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 16:47:19 -0500 Subject: [PATCH 584/897] sortable menus, done --- public/src/admin/general/navigation.js | 72 ++++++++++++-------------- src/navigation/admin.js | 6 ++- src/navigation/index.js | 4 +- src/upgrade.js | 4 +- 4 files changed, 40 insertions(+), 46 deletions(-) diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index 6e95f578b9..6b0de51420 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -2,57 +2,44 @@ /* global define, app, ajaxify, socket, templates, bootbox */ define('admin/general/navigation', function() { - var navigation = {}; - - - var available; + var navigation = {}, + available; navigation.init = function() { available = JSON.parse(ajaxify.variables.get('available')); - $('.delete').on('click', function() { - $(this).parents('li').remove(); - }); - - $('.toggle').on('click', function() { - var btn = $(this), - disabled = btn.html() === 'Enable'; - - btn.toggleClass('btn-warning').toggleClass('btn-success').html(!disabled ? 'Enable' : 'Disable'); - btn.parents('li').find('[name="enabled"]').val(disabled); - return false; - }); - - $('#save').on('click', saveNavigation); + $('#save').on('click', save); + $('.delete').on('click', remove); + $('.toggle').on('click', toggle); $('#enabled') .sortable() .droppable({ accept: $('#available li') - }) - .disableSelection(); + }); $('#available li') .draggable({ connectToSortable: '#enabled', helper: 'clone', distance: 10, - stop: function(ev, ui) { - var id = ui.helper.attr('data-id'), - el = $('#enabled [data-id="' + id + '"]'), - data = id === 'custom' ? {} : available[id]; - - templates.parse('admin/general/navigation', 'enabled', {enabled: [data]}, function(li) { - li = $(li); - el.after(li); - el.remove(); - }); - } - }) - .disableSelection(); + stop: drop + }); }; - function saveNavigation() { + function drop(ev, ui) { + var id = ui.helper.attr('data-id'), + el = $('#enabled [data-id="' + id + '"]'), + data = id === 'custom' ? {} : available[id]; + + templates.parse('admin/general/navigation', 'enabled', {enabled: [data]}, function(li) { + li = $(li); + el.after(li); + el.remove(); + }); + } + + function save() { var nav = []; $('#enabled li').each(function() { @@ -81,12 +68,17 @@ define('admin/general/navigation', function() { }); } - function getDefaultsByRoute(route) { - available.forEach(function(item) { - if (item.route.match(route)) { - return item; - } - }); + function remove() { + $(this).parents('li').remove(); + } + + function toggle() { + var btn = $(this), + disabled = btn.html() === 'Enable'; + + btn.toggleClass('btn-warning').toggleClass('btn-success').html(!disabled ? 'Enable' : 'Disable'); + btn.parents('li').find('[name="enabled"]').val(disabled); + return false; } return navigation; diff --git a/src/navigation/admin.js b/src/navigation/admin.js index c60701e10d..15726001d1 100644 --- a/src/navigation/admin.js +++ b/src/navigation/admin.js @@ -9,8 +9,10 @@ var admin = {}, admin.save = function(data, callback) { var order = Object.keys(data), - items = data.map(function(item) { - return JSON.stringify(item); + items = data.map(function(item, idx) { + var data = {}; + data[idx] = item; + return JSON.stringify(data); }); async.waterfall([ diff --git a/src/navigation/index.js b/src/navigation/index.js index 6a7ea1f638..2c1cbd7fb6 100644 --- a/src/navigation/index.js +++ b/src/navigation/index.js @@ -8,8 +8,8 @@ var navigation = {}, navigation.get = function(callback) { db.getSortedSetRange('navigation:enabled', 0, -1, function(err, data) { - callback(err, data.map(function(item) { - return JSON.parse(item); + callback(err, data.map(function(item, idx) { + return JSON.parse(item)[idx]; })); }); }; diff --git a/src/upgrade.js b/src/upgrade.js index 6e2306f4fe..fee22659dd 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 1, 25, 2); + latestSchema = Date.UTC(2015, 1, 25, 4); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -943,7 +943,7 @@ Upgrade.upgrade = function(callback) { } }, function(next) { - thisSchemaDate = Date.UTC(2015, 1, 25, 2); + thisSchemaDate = Date.UTC(2015, 1, 25, 4); if (schemaDate < thisSchemaDate) { updatesMade = true; winston.info('[2015/02/25] Upgrading menu items to dynamic navigation system'); From 6c0efa09c0e399447a8595b48cc48121bf4ccdd9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 16:52:50 -0500 Subject: [PATCH 585/897] bugfix --- public/src/admin/general/navigation.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index 6b0de51420..a5b1efb439 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -8,11 +8,9 @@ define('admin/general/navigation', function() { navigation.init = function() { available = JSON.parse(ajaxify.variables.get('available')); - $('#save').on('click', save); - $('.delete').on('click', remove); - $('.toggle').on('click', toggle); - $('#enabled') + .on('click', '.delete', remove) + .on('click', '.toggle', toggle) .sortable() .droppable({ accept: $('#available li') @@ -25,6 +23,8 @@ define('admin/general/navigation', function() { distance: 10, stop: drop }); + + $('#save').on('click', save); }; function drop(ev, ui) { From 33e4a2f1ec2e8090496788bc8cc69e7649d91202 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 16:55:38 -0500 Subject: [PATCH 586/897] translator.escape --- public/src/translator.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/src/translator.js b/public/src/translator.js index 5b052af216..ea93ade4d0 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -29,7 +29,11 @@ callback(languages[language].loaded[filename]); }); } - } + }; + + translator.escape = function(text) { + return text.replace(/\[\[([\S]*?)\]\]/g, '\\[\\[$1\\]\\]'); + }; translator.getLanguage = function() { return config.defaultLang; From be06162f0d8c2128fcc824123a46ef5fe7fbdd3c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 16:59:38 -0500 Subject: [PATCH 587/897] translator.unescape --- public/src/translator.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/src/translator.js b/public/src/translator.js index ea93ade4d0..80ac3984d7 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -35,6 +35,10 @@ return text.replace(/\[\[([\S]*?)\]\]/g, '\\[\\[$1\\]\\]'); }; + translator.unescape = function(text) { + return text.replace(/\\\[\\\[([\S]*?)\\\]\\\]/g, '[[$1]]'); + }; + translator.getLanguage = function() { return config.defaultLang; }; From 1774cf0b1520041874592ecf861b7f9e299aac56 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:12:17 -0500 Subject: [PATCH 588/897] allow language strings in menu items --- install/data/navigation.json | 32 +++++++++++++------------- public/src/admin/general/navigation.js | 12 +++++++--- src/navigation/admin.js | 10 +++++++- src/upgrade.js | 4 ++-- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/install/data/navigation.json b/install/data/navigation.json index 9d690fd415..b36b6fb8e7 100644 --- a/install/data/navigation.json +++ b/install/data/navigation.json @@ -2,46 +2,46 @@ { "id": "unread-count", "route": "/unread", - "title": "[[global:header.unread]]", + "title": "\\[\\[global:header.unread\\]\\]", "enabled": true, "iconClass": "fa-inbox", "textClass": "visible-xs-inline", - "text": "[[global:header.unread]]", + "text": "\\[\\[global:header.unread\\]\\]", "properties": { "loggedIn": true } }, { "route": "/recent", - "title": "[[global:header.recent]]", + "title": "\\[\\[global:header.recent\\]\\]", "enabled": true, "iconClass": "fa-clock-o", "textClass": "visible-xs-inline", - "text": "[[global:header.recent]]" + "text": "\\[\\[global:header.recen\\t\\]]" }, { "route": "/tags", - "title": "[[global:header.tags]]", + "title": "\\[\\[global:header.tags\\]\\]", "enabled": true, "iconClass": "fa-tags", "textClass": "visible-xs-inline", - "text": "[[global:header.tags]]" + "text": "\\[\\[global:header.tag\\s\\]]" }, { "route": "/popular", - "title": "[[global:header.popular]]", + "title": "\\[\\[global:header.popular\\]\\]", "enabled": true, "iconClass": "fa-fire", "textClass": "visible-xs-inline", - "text": "[[global:header.popular]]" + "text": "\\[\\[global:header.popula\\r\\]]" }, { "route": "/users", - "title": "[[global:header.users]]", + "title": "\\[\\[global:header.users\\]\\]", "enabled": true, "iconClass": "fa-user", "textClass": "visible-xs-inline", - "text": "[[global:header.users]]", + "text": "\\[\\[global:header.users\\]\\]", "properties": { "loggedIn": true, "hideIfPrivate": true @@ -49,31 +49,31 @@ }, { "route": "/groups", - "title": "[[global:header.groups]]", + "title": "\\[\\[global:header.groups\\]\\]", "enabled": true, "iconClass": "fa-group", "textClass": "visible-xs-inline", - "text": "[[global:header.groups]]" + "text": "\\[\\[global:header.group\\s\\]]" }, { "route": "/admin", "target": "_top", - "title": "[[global:header.admin]]", + "title": "\\[\\[global:header.admin\\]\\]", "enabled": true, "iconClass": "fa-cogs", "textClass": "visible-xs-inline", - "text": "[[global:header.admin]]", + "text": "\\[\\[global:header.admin\\]\\]", "properties": { "adminOnly": true } }, { "route": "/search", - "title": "[[global:header.search]]", + "title": "\\[\\[global:header.search\\]\\]", "enabled": true, "iconClass": "fa-search", "textClass": "visible-xs-inline", - "text": "[[global:header.search]]", + "text": "\\[\\[global:header.search\\]\\]", "properties": { "installed": { "search": true diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index a5b1efb439..a26f2e3da4 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, app, ajaxify, socket, templates, bootbox */ +/* global define, app, ajaxify, socket, templates, bootbox, translator */ define('admin/general/navigation', function() { var navigation = {}, @@ -8,6 +8,12 @@ define('admin/general/navigation', function() { navigation.init = function() { available = JSON.parse(ajaxify.variables.get('available')); + $('#enabled').html(translator.unescape($('#enabled').html())); + translator.translate(translator.unescape($('#available').html()), function(html) { + $('#available').html(html); + }); + + $('#enabled') .on('click', '.delete', remove) .on('click', '.toggle', toggle) @@ -33,7 +39,7 @@ define('admin/general/navigation', function() { data = id === 'custom' ? {} : available[id]; templates.parse('admin/general/navigation', 'enabled', {enabled: [data]}, function(li) { - li = $(li); + li = $(translator.unescape(li)); el.after(li); el.remove(); }); @@ -47,7 +53,7 @@ define('admin/general/navigation', function() { data = {}; form.forEach(function(input) { - data[input.name] = input.value; + data[input.name] = translator.escape(input.value); }); available.forEach(function(item) { diff --git a/src/navigation/admin.js b/src/navigation/admin.js index 15726001d1..6ae28d179e 100644 --- a/src/navigation/admin.js +++ b/src/navigation/admin.js @@ -4,13 +4,21 @@ var admin = {}, async = require('async'), plugins = require('../plugins'), - db = require('../database'); + db = require('../database'), + translator = require('../../public/src/translator'); admin.save = function(data, callback) { var order = Object.keys(data), items = data.map(function(item, idx) { var data = {}; + + for (var i in item) { + if (item.hasOwnProperty(i)) { + item[i] = typeof item[i] === 'string' ? translator.escape(item[i]) : item[i]; + } + } + data[idx] = item; return JSON.stringify(data); }); diff --git a/src/upgrade.js b/src/upgrade.js index fee22659dd..3a52020ca5 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -21,7 +21,7 @@ var db = require('./database'), schemaDate, thisSchemaDate, // IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema - latestSchema = Date.UTC(2015, 1, 25, 4); + latestSchema = Date.UTC(2015, 1, 25, 6); Upgrade.check = function(callback) { db.get('schemaDate', function(err, value) { @@ -943,7 +943,7 @@ Upgrade.upgrade = function(callback) { } }, function(next) { - thisSchemaDate = Date.UTC(2015, 1, 25, 4); + thisSchemaDate = Date.UTC(2015, 1, 25, 6); if (schemaDate < thisSchemaDate) { updatesMade = true; winston.info('[2015/02/25] Upgrading menu items to dynamic navigation system'); From e90f3bf7c8f41c5da52b102aadd008f61383d385 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:22:12 -0500 Subject: [PATCH 589/897] fix typo in install data --- install/data/navigation.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/data/navigation.json b/install/data/navigation.json index b36b6fb8e7..3303e48cf1 100644 --- a/install/data/navigation.json +++ b/install/data/navigation.json @@ -17,7 +17,7 @@ "enabled": true, "iconClass": "fa-clock-o", "textClass": "visible-xs-inline", - "text": "\\[\\[global:header.recen\\t\\]]" + "text": "\\[\\[global:header.recent\\]\\]" }, { "route": "/tags", @@ -25,7 +25,7 @@ "enabled": true, "iconClass": "fa-tags", "textClass": "visible-xs-inline", - "text": "\\[\\[global:header.tag\\s\\]]" + "text": "\\[\\[global:header.tags\\]\\]" }, { "route": "/popular", @@ -33,7 +33,7 @@ "enabled": true, "iconClass": "fa-fire", "textClass": "visible-xs-inline", - "text": "\\[\\[global:header.popula\\r\\]]" + "text": "\\[\\[global:header.popular\\]\\]" }, { "route": "/users", @@ -53,7 +53,7 @@ "enabled": true, "iconClass": "fa-group", "textClass": "visible-xs-inline", - "text": "\\[\\[global:header.group\\s\\]]" + "text": "\\[\\[global:header.groups\\]\\]" }, { "route": "/admin", From aa58302a27e3692b360b1983e122adf48a53a625 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:22:25 -0500 Subject: [PATCH 590/897] type check before escape/unescape --- public/src/translator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/translator.js b/public/src/translator.js index 80ac3984d7..a6f4027faf 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -32,11 +32,11 @@ }; translator.escape = function(text) { - return text.replace(/\[\[([\S]*?)\]\]/g, '\\[\\[$1\\]\\]'); + return typeof text === 'string' ? text.replace(/\[\[([\S]*?)\]\]/g, '\\[\\[$1\\]\\]') : text; }; translator.unescape = function(text) { - return text.replace(/\\\[\\\[([\S]*?)\\\]\\\]/g, '[[$1]]'); + return typeof text === 'string' ? text.replace(/\\\[\\\[([\S]*?)\\\]\\\]/g, '[[$1]]') : text; }; translator.getLanguage = function() { From 2ff59278c941a7629fe56c79391d2b5c04555e04 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:22:41 -0500 Subject: [PATCH 591/897] navigation cleanup --- public/src/modules/helpers.js | 4 ---- src/controllers/admin.js | 2 +- src/navigation/admin.js | 12 ++++++++++-- src/navigation/index.js | 26 ++++++++++++++++++++------ 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 74946b5f69..70fbeaabb0 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -17,10 +17,6 @@ var item = data.navigation[index], properties = item.properties; - if (!item.enabled) { - return false; - } - if (properties) { if (properties.loggedIn && !data.loggedIn || properties.adminOnly && !data.isAdmin || diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 2f2d5cad52..f6902c77cf 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -246,7 +246,7 @@ adminController.sounds.get = function(req, res, next) { }; adminController.navigation.get = function(req, res, next) { - require('../navigation/admin').get(function(err, data) { + require('../navigation/admin').getAdmin(function(err, data) { if (err) { return next(err); } diff --git a/src/navigation/admin.js b/src/navigation/admin.js index 6ae28d179e..ac662c00ff 100644 --- a/src/navigation/admin.js +++ b/src/navigation/admin.js @@ -33,13 +33,21 @@ admin.save = function(data, callback) { ], callback); }; -admin.get = function(callback) { +admin.getAdmin = function(callback) { async.parallel({ - enabled: require('./index').get, + enabled: admin.get, available: getAvailable }, callback); }; +admin.get = function(callback) { + db.getSortedSetRange('navigation:enabled', 0, -1, function(err, data) { + callback(err, data.map(function(item, idx) { + return JSON.parse(item)[idx]; + })); + }); +}; + function getAvailable(callback) { var core = require('../../install/data/navigation.json').map(function(item) { item.core = true; diff --git a/src/navigation/index.js b/src/navigation/index.js index 2c1cbd7fb6..e84df70316 100644 --- a/src/navigation/index.js +++ b/src/navigation/index.js @@ -3,15 +3,29 @@ var navigation = {}, plugins = require('../plugins'), - db = require('../database'); + db = require('../database'), + admin = require('./admin'), + translator = require('../../public/src/translator'); navigation.get = function(callback) { - db.getSortedSetRange('navigation:enabled', 0, -1, function(err, data) { - callback(err, data.map(function(item, idx) { - return JSON.parse(item)[idx]; - })); - }); + admin.get(function(err, data) { + callback(err, data + .filter(function(item) { + return item.enabled; + }) + .map(function(item) { + console.log(item); + for (var i in item) { + if (item.hasOwnProperty(i)) { + console.log(item[i]); + item[i] = translator.unescape(item[i]); + } + } + + return item; + })); + }) }; From 1b250b8f57bc12857a2ea6d652f276a5906745e4 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:23:02 -0500 Subject: [PATCH 592/897] linting --- src/navigation/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/navigation/index.js b/src/navigation/index.js index e84df70316..81657ce346 100644 --- a/src/navigation/index.js +++ b/src/navigation/index.js @@ -25,7 +25,7 @@ navigation.get = function(callback) { return item; })); - }) + }); }; From 2b57ef3d4bd16cebd13e0efa9417d89233488838 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:26:44 -0500 Subject: [PATCH 593/897] fixed a bug with draggable --- public/src/admin/general/navigation.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index a26f2e3da4..e1760d9813 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -10,10 +10,15 @@ define('admin/general/navigation', function() { $('#enabled').html(translator.unescape($('#enabled').html())); translator.translate(translator.unescape($('#available').html()), function(html) { - $('#available').html(html); + $('#available').html(html) + .find('li').draggable({ + connectToSortable: '#enabled', + helper: 'clone', + distance: 10, + stop: drop + }); }); - $('#enabled') .on('click', '.delete', remove) .on('click', '.toggle', toggle) @@ -22,14 +27,6 @@ define('admin/general/navigation', function() { accept: $('#available li') }); - $('#available li') - .draggable({ - connectToSortable: '#enabled', - helper: 'clone', - distance: 10, - stop: drop - }); - $('#save').on('click', save); }; @@ -38,6 +35,8 @@ define('admin/general/navigation', function() { el = $('#enabled [data-id="' + id + '"]'), data = id === 'custom' ? {} : available[id]; + data.enabled = false; + templates.parse('admin/general/navigation', 'enabled', {enabled: [data]}, function(li) { li = $(translator.unescape(li)); el.after(li); From bc7729fbb3e9d09dfb451c1a9e41c718da2d4e39 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:27:05 -0500 Subject: [PATCH 594/897] console.logs --- src/navigation/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/navigation/index.js b/src/navigation/index.js index 81657ce346..98d575a261 100644 --- a/src/navigation/index.js +++ b/src/navigation/index.js @@ -15,10 +15,8 @@ navigation.get = function(callback) { return item.enabled; }) .map(function(item) { - console.log(item); for (var i in item) { if (item.hasOwnProperty(i)) { - console.log(item[i]); item[i] = translator.unescape(item[i]); } } From b788e134d13bf6d6433c04f973c1b7dd480a983e Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:43:31 -0500 Subject: [PATCH 595/897] added compatibility for deprecated filter:header.build remove after 0.7.x --- src/navigation/admin.js | 7 ++++++- src/views/admin/general/navigation.tpl | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/navigation/admin.js b/src/navigation/admin.js index ac662c00ff..a0f62035b4 100644 --- a/src/navigation/admin.js +++ b/src/navigation/admin.js @@ -54,7 +54,12 @@ function getAvailable(callback) { return item; }); - plugins.fireHook('filter:navigation.available', core, callback); + // DEPRECATION: backwards compatibility for filter:header.build, will be removed soon. + plugins.fireHook('filter:header.build', {navigation: []}, function(err, data) { + core = core.concat(data.navigation); + + plugins.fireHook('filter:navigation.available', core, callback); + }); } module.exports = admin; \ No newline at end of file diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl index 3a658efb5b..fe956cc5bc 100644 --- a/src/views/admin/general/navigation.tpl +++ b/src/views/admin/general/navigation.tpl @@ -51,7 +51,7 @@
      • - {available.title} {available.route} + {available.text} {available.route} coreplugin
        • From d545492b678ea7b8b5e264f575a9c066b776b1bc Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:51:50 -0500 Subject: [PATCH 596/897] navigation: moved target to properties --- install/data/navigation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/data/navigation.json b/install/data/navigation.json index 3303e48cf1..99499448b0 100644 --- a/install/data/navigation.json +++ b/install/data/navigation.json @@ -57,13 +57,13 @@ }, { "route": "/admin", - "target": "_top", "title": "\\[\\[global:header.admin\\]\\]", "enabled": true, "iconClass": "fa-cogs", "textClass": "visible-xs-inline", "text": "\\[\\[global:header.admin\\]\\]", "properties": { + "target": "_top", "adminOnly": true } }, From 5a8babdde5770d08a7d11f964bddb0280ceb2010 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 17:52:45 -0500 Subject: [PATCH 597/897] up'd vanilla's version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54d4c2bc6c..9ba1afea75 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", "nodebb-theme-lavender": "^1.0.6", - "nodebb-theme-vanilla": "^1.0.14", + "nodebb-theme-vanilla": "^1.0.28", "nodebb-widget-essentials": "~0.2.12", "nodebb-rewards-essentials": "^0.0.1", "npm": "^2.1.4", From a0c3ddc555e24576e9901b7c71c3e8217669c063 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 25 Feb 2015 17:59:59 -0500 Subject: [PATCH 598/897] fix navigator --- public/src/client/category.js | 4 ++-- public/src/client/topic.js | 2 +- public/src/modules/navigator.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/client/category.js b/public/src/client/category.js index 2dccb5f85d..e57587fa89 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -84,8 +84,8 @@ define('forum/category', [ }; Category.toBottom = function() { - socket.emit('categories.getTopicCount', ajaxify.variables.get('category_id'), function(err, index) { - navigator.scrollBottom(index); + socket.emit('categories.getTopicCount', ajaxify.variables.get('category_id'), function(err, count) { + navigator.scrollBottom(count - 1); }); }; diff --git a/public/src/client/topic.js b/public/src/client/topic.js index f5627a02d5..8419748956 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -78,7 +78,7 @@ define('forum/topic', [ if (config.topicPostSort !== 'oldest_to_newest') { postCount = 2; } - navigator.scrollBottom(postCount); + navigator.scrollBottom(postCount - 1); }); }; diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 1b039d9b60..e7f78c980f 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -138,7 +138,7 @@ define('navigator', ['forum/pagination'], function(pagination) { if ($('li[data-index="' + index + '"]').length) { navigator.scrollToPost(index, true); } else { - index = parseInt(index, 10); + index = parseInt(index, 10) + 1; ajaxify.go(generateUrl(index)); } }; From 59d176fa7b317555be2396a1218454a3811393ee Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 18:29:15 -0500 Subject: [PATCH 599/897] closes #2779 --- public/src/admin/manage/categories.js | 15 +++++++++++++++ src/views/admin/manage/categories.tpl | 1 + 2 files changed, 16 insertions(+) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 54385b6d0c..18d3d338a2 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -80,6 +80,10 @@ define('admin/manage/categories', [ order: $('.admin-categories #entry-container').children().length + 1 }; + saveNew(category); + } + + function saveNew(category) { socket.emit('admin.categories.create', category, function(err, data) { if(err) { return app.alertError(err.message); @@ -190,6 +194,17 @@ define('admin/manage/categories', [ }); }); + $('.admin-categories').on('click', '.duplicate', function() { + var inputs = $(this).parents('li[data-cid]').find('[data-name]'), + data = {}; + + inputs.each(function() { + data[$(this).attr('data-name')] = $(this).val(); + }); + + saveNew(data); + }); + $('.admin-categories').on('click', '.permissions', function() { var cid = $(this).parents('li[data-cid]').attr('data-cid'); Categories.launchPermissionsModal(cid); diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index 711cdbce72..8d4367bb2e 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -48,6 +48,7 @@
      • Purge
        • +
      • Duplicate
      From 5020e864fc75a07c480cc78864ebc8f9ac9838a3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 18:52:26 -0500 Subject: [PATCH 600/897] #2779 also copy icon --- public/src/admin/manage/categories.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 18d3d338a2..9d310ae594 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -199,7 +199,14 @@ define('admin/manage/categories', [ data = {}; inputs.each(function() { - data[$(this).attr('data-name')] = $(this).val(); + var name = $(this).attr('data-name'); + switch (name) { + case 'icon': + data[name] = $(this).attr('value'); + break; + default: + data[name] = $(this).val(); + } }); saveNew(data); From c1b45bc0ea5289bf4ca249b838fdc22e307ae5d2 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 18:54:11 -0500 Subject: [PATCH 601/897] #2779 when duplicating categories, rename category:name to indicate it is duplicate otherwise :rage1: when somebody deletes the wrong category --- public/src/admin/manage/categories.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 9d310ae594..63105b73f1 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -204,6 +204,9 @@ define('admin/manage/categories', [ case 'icon': data[name] = $(this).attr('value'); break; + case 'name': + data[name] = $(this).val() + ' (copy)'; + break; default: data[name] = $(this).val(); } From f6d90782a8eac2b04c6c8e3bf54387572389f17b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 19:03:32 -0500 Subject: [PATCH 602/897] hinting --- public/src/admin/general/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js index f24bd485a0..7a2243465d 100644 --- a/public/src/admin/general/dashboard.js +++ b/public/src/admin/general/dashboard.js @@ -1,5 +1,5 @@ "use strict"; -/*global define, ajaxify, app, socket, bootbox, Chart, RELATIVE_PATH*/ +/*global define, ajaxify, app, socket, utils, bootbox, Chart, RELATIVE_PATH*/ define('admin/general/dashboard', ['semver'], function(semver) { var Admin = {}, From c3541dbc954be9e9a6064a9e941cc90b389533ea Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 19:05:29 -0500 Subject: [PATCH 603/897] linting acp --- public/src/admin/advanced/logs.js | 4 ++-- public/src/admin/appearance/customise.js | 2 +- public/src/admin/appearance/skins.js | 2 +- public/src/admin/general/sounds.js | 2 +- public/src/admin/manage/users.js | 4 ++-- public/src/admin/modules/search.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/src/admin/advanced/logs.js b/public/src/admin/advanced/logs.js index c44f6bf93f..78581d9cea 100644 --- a/public/src/admin/advanced/logs.js +++ b/public/src/admin/advanced/logs.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, socket */ +/* global define, socket, app */ define('admin/advanced/logs', function() { var Logs = {}; @@ -28,7 +28,7 @@ define('admin/advanced/logs', function() { case 'clear': socket.emit('admin.logs.clear', function(err) { if (!err) { - app.alertSuccess('Logs Cleared!') + app.alertSuccess('Logs Cleared!'); btnEl.prev().click(); } }); diff --git a/public/src/admin/appearance/customise.js b/public/src/admin/appearance/customise.js index 97dd77290b..a135a240fe 100644 --- a/public/src/admin/appearance/customise.js +++ b/public/src/admin/appearance/customise.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, app, socket */ +/* global ace, define, app, socket */ define('admin/appearance/customise', ['admin/settings'], function(Settings) { var Customise = {}; diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js index df21cb5b0a..b67842b1b5 100644 --- a/public/src/admin/appearance/skins.js +++ b/public/src/admin/appearance/skins.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, app, socket */ +/* global define, app, socket, templates */ define('admin/appearance/skins', function() { var Skins = {}; diff --git a/public/src/admin/general/sounds.js b/public/src/admin/general/sounds.js index 9ec9708df5..73899144a0 100644 --- a/public/src/admin/general/sounds.js +++ b/public/src/admin/general/sounds.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, socket */ +/* global app, define, socket */ define('admin/general/sounds', ['sounds', 'settings'], function(Sounds, Settings) { var SoundsAdmin = {}; diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js index d9eb888985..5909522f8c 100644 --- a/public/src/admin/manage/users.js +++ b/public/src/admin/manage/users.js @@ -1,5 +1,5 @@ "use strict"; -/* global socket, define, templates, bootbox, app, ajaxify, */ +/* global config, socket, define, templates, bootbox, app, ajaxify, */ define('admin/manage/users', ['admin/modules/selectable'], function(selectable) { var Users = {}; @@ -145,7 +145,7 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable) } app.alertSuccess('[[notifications:email-confirm-sent]]'); }); - }) + }); $('.password-reset-email').on('click', function() { var uids = getSelectedUids(); diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js index b7cd131925..dec438165d 100644 --- a/public/src/admin/modules/search.js +++ b/public/src/admin/modules/search.js @@ -23,7 +23,7 @@ define(function() { setupACPSearch(); }); - };; + }; function setupACPSearch() { var menu = $('#acp-search .dropdown-menu'), From cb1e2c9fef7d71419369ab0ae8b2c6fa9eccab48 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 19:09:39 -0500 Subject: [PATCH 604/897] linting client side modules --- public/src/client/account/groups.js | 2 +- public/src/client/chats.js | 2 +- public/src/client/footer.js | 3 +++ public/src/client/login.js | 4 ++-- public/src/client/reset.js | 3 +++ public/src/client/reset_code.js | 3 +++ public/src/client/tag.js | 2 +- public/src/client/topic.js | 2 +- public/src/client/topic/fork.js | 2 +- public/src/client/topic/move.js | 2 +- public/src/client/topic/posts.js | 3 +-- public/src/client/users.js | 4 ++-- 12 files changed, 20 insertions(+), 12 deletions(-) diff --git a/public/src/client/account/groups.js b/public/src/client/account/groups.js index ea70433de3..e4c932161d 100644 --- a/public/src/client/account/groups.js +++ b/public/src/client/account/groups.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, socket, utils */ +/* globals ajaxify, define, app, socket, utils */ define('forum/account/groups', ['forum/account/header'], function(header) { var AccountTopics = {}; diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 994ddeb47a..020b0915ef 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, ajaxify, utils, socket, templates */ +/* globals define, app, ajaxify, utils, socket, templates, translator */ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S, sounds, infinitescroll) { var Chats = { diff --git a/public/src/client/footer.js b/public/src/client/footer.js index ff44f25e1e..9d6ff8c4ee 100644 --- a/public/src/client/footer.js +++ b/public/src/client/footer.js @@ -1,3 +1,6 @@ +"use strict"; +/*globals define, app, translator, socket*/ + define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) { Notifications.prepareDOM(); diff --git a/public/src/client/login.js b/public/src/client/login.js index 22f1dca9eb..dc199f3d2f 100644 --- a/public/src/client/login.js +++ b/public/src/client/login.js @@ -1,5 +1,5 @@ "use strict"; -/* global define, app, RELATIVE_PATH */ +/* global define, app, translator, config, RELATIVE_PATH */ define('forum/login', ['csrf'], function(csrf) { var Login = {}; @@ -31,7 +31,7 @@ define('forum/login', ['csrf'], function(csrf) { }, error: function(data, status) { translator.translate(data.responseText, config.defaultLang, function(translated) { - errorEl.find('p').text(translated) + errorEl.find('p').text(translated); errorEl.show(); submitEl.removeClass('disabled'); }); diff --git a/public/src/client/reset.js b/public/src/client/reset.js index 2cbad172ae..7e272c3284 100644 --- a/public/src/client/reset.js +++ b/public/src/client/reset.js @@ -1,3 +1,6 @@ +"use strict"; +/*globals define, app, socket*/ + define('forum/reset', function() { var ResetPassword = {}; diff --git a/public/src/client/reset_code.js b/public/src/client/reset_code.js index f690a2b152..c0f46dc356 100644 --- a/public/src/client/reset_code.js +++ b/public/src/client/reset_code.js @@ -1,3 +1,6 @@ +"use strict"; +/*globals define, app, ajaxify, socket, RELATIVE_PATH*/ + define('forum/reset_code', function() { var ResetCode = {}; diff --git a/public/src/client/tag.js b/public/src/client/tag.js index f15af62f75..3565c7e151 100644 --- a/public/src/client/tag.js +++ b/public/src/client/tag.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, socket */ +/* globals define, app, ajaxify, socket */ define('forum/tag', ['forum/recent', 'forum/infinitescroll'], function(recent, infinitescroll) { var Tag = {}; diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 8419748956..480c2d8aab 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -106,7 +106,7 @@ define('forum/topic', [ function getPostIndex() { var parts = window.location.pathname.split('/'); if (parts[parts.length - 1] && utils.isNumber(parts[parts.length - 1])) { - return parseInt(parts[parts.length - 1], 10) + return parseInt(parts[parts.length - 1], 10); } return 0; } diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js index b9695cb81e..216cc63f9f 100644 --- a/public/src/client/topic/fork.js +++ b/public/src/client/topic/fork.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, translator, socket */ +/* globals define, app, ajaxify, translator, socket */ define('forum/topic/fork', function() { diff --git a/public/src/client/topic/move.js b/public/src/client/topic/move.js index f0dec0e9b7..21fcf999ff 100644 --- a/public/src/client/topic/move.js +++ b/public/src/client/topic/move.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, socket */ +/* globals define, app, socket, templates */ define('forum/topic/move', function() { diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index d95a015c9e..89e08ae9dd 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -1,4 +1,3 @@ - 'use strict'; /* globals config, app, ajaxify, define, socket, utils */ @@ -259,4 +258,4 @@ define('forum/topic/posts', [ return Posts; -}); +}); \ No newline at end of file diff --git a/public/src/client/users.js b/public/src/client/users.js index c3f374c4ff..6b08f05cdd 100644 --- a/public/src/client/users.js +++ b/public/src/client/users.js @@ -103,7 +103,7 @@ define('forum/users', function() { $('.users').on('click', '.pagination a', function() { doSearch($(this).attr('data-page')); return false; - }) + }); } function doSearch(page) { @@ -147,7 +147,7 @@ define('forum/users', function() { templates.parse('partials/paginator', {pagination: data.pagination}, function(html) { $('.pagination-container').replaceWith(html); - }) + }); templates.parse('users', 'users', data, function(html) { translator.translate(html, function(translated) { From 241f5b022400b1ec59d9287a2d736fa12e9b848c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 19:13:03 -0500 Subject: [PATCH 605/897] linted client side modules --- public/src/modules/composer/categoryList.js | 2 +- public/src/modules/composer/uploads.js | 2 +- public/src/modules/csrf.js | 6 ++++-- public/src/modules/notifications.js | 4 ++-- public/src/modules/sort.js | 2 +- public/src/modules/sounds.js | 4 +++- public/src/modules/templates.js | 8 +++++++- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/public/src/modules/composer/categoryList.js b/public/src/modules/composer/categoryList.js index 30ece1875a..f246b9ac50 100644 --- a/public/src/modules/composer/categoryList.js +++ b/public/src/modules/composer/categoryList.js @@ -19,7 +19,7 @@ define('composer/categoryList', function() { // Remove categories that are just external links categories = categories.filter(function(category) { - return !category.link + return !category.link; }); categories.forEach(function(category) { diff --git a/public/src/modules/composer/uploads.js b/public/src/modules/composer/uploads.js index 2a6833c604..e9d7bfa3c3 100644 --- a/public/src/modules/composer/uploads.js +++ b/public/src/modules/composer/uploads.js @@ -202,7 +202,7 @@ define('composer/uploads', ['composer/preview', 'csrf'], function(preview, csrf) function insertText(str, index, insert) { return str.slice(0, index) + insert + str.slice(index); - }; + } function uploadContentFiles(params) { var files = params.files, diff --git a/public/src/modules/csrf.js b/public/src/modules/csrf.js index 0329a42917..10a9b002f0 100644 --- a/public/src/modules/csrf.js +++ b/public/src/modules/csrf.js @@ -1,11 +1,13 @@ +"use strict"; +/*globals define*/ + define('csrf', function() { - "use strict"; var csrf = {}, _data = {}; csrf.get = function() { return _data.token; - } + }; csrf.set = function(token) { _data.token = token; diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index c58287350e..b217a0958d 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, socket, translator, utils, config, app, ajaxify, Tinycon*/ +/* globals define, socket, translator, utils, config, app, ajaxify, templates, Tinycon*/ define('notifications', ['sounds'], function(sound) { var Notifications = {}; @@ -86,7 +86,7 @@ define('notifications', ['sounds'], function(sound) { notifIcon.attr('data-content', count > 20 ? '20+' : count); Tinycon.setBubble(count); - }; + } function increaseNotifCount(delta) { var count = parseInt(notifIcon.attr('data-content'), 10) + delta; diff --git a/public/src/modules/sort.js b/public/src/modules/sort.js index 8d1559d4da..3aad14dc44 100644 --- a/public/src/modules/sort.js +++ b/public/src/modules/sort.js @@ -1,5 +1,5 @@ 'use strict'; -/* globals define, translator, templates */ +/* globals define, config, socket, app, ajaxify, translator, templates */ define('sort', function() { var module = {}; diff --git a/public/src/modules/sounds.js b/public/src/modules/sounds.js index 5dfac33613..fa0eade2b5 100644 --- a/public/src/modules/sounds.js +++ b/public/src/modules/sounds.js @@ -57,7 +57,9 @@ define('sounds', ['buzz'], function(buzz) { }; Sounds.playFile = function(fileName) { - if (!fileName) return; + if (!fileName) { + return; + } function play() { if (loadedSounds[fileName]) { diff --git a/public/src/modules/templates.js b/public/src/modules/templates.js index 2c25dbdb64..12b7cf7006 100644 --- a/public/src/modules/templates.js +++ b/public/src/modules/templates.js @@ -1,3 +1,7 @@ +"use strict"; + +/*globals define, RELATIVE_PATH*/ + define('templates', function() { var Templates = {}; @@ -6,7 +10,9 @@ define('templates', function() { Templates.config = data.templatesConfig; Templates.available = data.availableTemplates; - if (callback) callback(); + if (callback) { + callback(); + } }); }; From 26245133f391a53ffa8b80013d39320fe5a4652c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 19:15:02 -0500 Subject: [PATCH 606/897] linted client-side core modules --- public/src/ajaxify.js | 8 +++++--- public/src/app.js | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index adaef4cb8f..cc5aaa6012 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -208,9 +208,11 @@ $(document).ready(function() { ajaxify.getCustomTemplateMapping = function(tpl) { if (templatesModule.config && templatesModule.config.custom_mapping && tpl !== undefined) { for (var pattern in templatesModule.config.custom_mapping) { - var match = tpl.match(pattern); - if (match && match[0] === tpl) { - return (templatesModule.config.custom_mapping[pattern]); + if (templatesModule.config.custom_mapping.hasOwnProperty(pattern)) { + var match = tpl.match(pattern); + if (match && match[0] === tpl) { + return (templatesModule.config.custom_mapping[pattern]); + } } } } diff --git a/public/src/app.js b/public/src/app.js index d3a47a1bc6..1cc122e8ee 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -1,5 +1,5 @@ "use strict"; -/*global io, templates, translator, ajaxify, utils, bootbox, RELATIVE_PATH, config*/ +/*global io, templates, translator, ajaxify, utils, bootbox, RELATIVE_PATH, config, Visibility*/ var socket, app = app || {}; @@ -366,7 +366,7 @@ app.cacheBuster = null; } } }); - } + }; function createHeaderTooltips() { if (utils.findBootstrapEnvironment() === 'xs') { From 32ce785e5a788166959822b3f1a85a3b15101561 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 19:16:24 -0500 Subject: [PATCH 607/897] somebody was trying to save trees by reducing whitespace burn the trees --- public/src/overrides.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/src/overrides.js b/public/src/overrides.js index 913a5abf3f..afe5003b3c 100644 --- a/public/src/overrides.js +++ b/public/src/overrides.js @@ -1,5 +1,7 @@ 'use strict'; +/*globals translator*/ + if ('undefined' !== typeof window) { @@ -92,7 +94,8 @@ if ('undefined' !== typeof window) { .off('click.data-api.dropdown', _clearMenus) .on('click.data-api.dropdown', function (e) { // call the handler only when not right-click - e.button === 2 || _clearMenus(); + if (e.button !== 2) { + _clearMenus(); + } }); - } From b0628c2df829e8368c18eea9d2853c4e5bf69ee8 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 19:27:13 -0500 Subject: [PATCH 608/897] missing semi-colons in database/ --- src/database/mongo/sets.js | 2 +- src/database/redis/helpers.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/database/mongo/sets.js b/src/database/mongo/sets.js index 2868a04c0b..69dfa020a0 100644 --- a/src/database/mongo/sets.js +++ b/src/database/mongo/sets.js @@ -201,7 +201,7 @@ module.exports = function(db, module) { }); callback(null, counts); }); - } + }; module.setRemoveRandom = function(key, callback) { callback = callback || function() {}; diff --git a/src/database/redis/helpers.js b/src/database/redis/helpers.js index 26e2169c57..f1fe02b3be 100644 --- a/src/database/redis/helpers.js +++ b/src/database/redis/helpers.js @@ -34,6 +34,6 @@ helpers.resultsToBool = function(results) { results[i] = results[i] === 1; } return results; -} +}; module.exports = helpers; \ No newline at end of file From 0c8e0ca46f2eaef459774e88ca9c14c49d71dded Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 25 Feb 2015 19:28:43 -0500 Subject: [PATCH 609/897] linted /meta --- src/meta/logs.js | 4 ++-- src/meta/templates.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/meta/logs.js b/src/meta/logs.js index 01ee677887..0b38b61a34 100644 --- a/src/meta/logs.js +++ b/src/meta/logs.js @@ -20,9 +20,9 @@ module.exports = function(Meta) { callback(undefined, logs || ''); }); - } + }; Meta.logs.clear = function(callback) { fs.truncate(this.path, 0, callback); - } + }; }; \ No newline at end of file diff --git a/src/meta/templates.js b/src/meta/templates.js index af2f8664a6..78596d59a4 100644 --- a/src/meta/templates.js +++ b/src/meta/templates.js @@ -99,7 +99,7 @@ Templates.compile = function(callback) { matches = null, regex = /[ \t]*[ \t]*/; - while(matches = file.match(regex)) { + while((matches = file.match(regex)) !== null) { var partial = "/" + matches[1]; if (paths[partial] && relativePath !== partial) { From 00f3084b8ec6dff64b06384aee4bddad3e103b68 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 08:19:57 -0500 Subject: [PATCH 610/897] closes #2792, closes #2791, closes #2788, closes #2787, closes #2786, closes #2785, closes #2784, closes #2783 Squashed commit of the following: commit ca5064a4effa3904ce936b521b169bba8d24f1a1 Author: Julian Lam Date: Thu Feb 26 08:19:32 2015 -0500 Revert "added ajaxify popstate cache, so back/forward will just put back the already loaded page" This reverts commit 77d154bb8b9549523e35c323dcb62f811c27dfb6. commit ae07fc56c156074de8048bb627f5d9be849c8ad1 Author: Julian Lam Date: Thu Feb 26 08:19:24 2015 -0500 Revert "on click, topics are marked read from the unread page. Also fixed an issue where isPopState kept getting set to true, causing issues" This reverts commit d8c9ec0d406147b4ac9631fcc7687073ee71ea8e. Conflicts: public/src/client/unread.js commit 96ee3631d7e4e1fc2c1b7632d86684fecd1e430f Author: Julian Lam Date: Thu Feb 26 08:18:25 2015 -0500 Revert "actually fixed isPopState error" This reverts commit e6701c5a1f5a87a526c860f8e25e68ca1a65492d. --- public/src/ajaxify.js | 13 ++--------- public/src/client/unread.js | 27 ++++++---------------- public/src/modules/ajaxifyCache.js | 37 ------------------------------ 3 files changed, 9 insertions(+), 68 deletions(-) delete mode 100644 public/src/modules/ajaxifyCache.js diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index cc5aaa6012..22a85224b6 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -1,11 +1,9 @@ "use strict"; -var ajaxify = ajaxify || { - isPopState: false -}; +var ajaxify = ajaxify || {}; $(document).ready(function() { - require(['templates', 'ajaxifyCache'], function (templatesModule, cache) { + require(['templates'], function (templatesModule) { /*global app, templates, utils, socket, translator, config, RELATIVE_PATH*/ var location = document.location || window.location, @@ -15,9 +13,7 @@ $(document).ready(function() { window.onpopstate = function (event) { if (event !== null && event.state && event.state.url !== undefined && !ajaxify.initialLoad) { - ajaxify.isPopState = true; ajaxify.go(event.state.url, function() { - ajaxify.isPopState = false; $(window).trigger('action:popstate', {url: event.state.url}); }, true); } @@ -59,10 +55,6 @@ $(document).ready(function() { // "quiet": If set to true, will not call pushState app.enterRoom(''); - // If the url is in the cache, load from cache instead - if (cache.get(url, callback)) { return true; } - else { cache.url = ajaxify.currentPage; } - $(window).off('scroll'); if ($('#content').hasClass('ajaxifying') && apiXHR) { @@ -122,7 +114,6 @@ $(document).ready(function() { templates.parse(tpl_url, data, function(template) { translator.translate(template, function(translatedTemplate) { setTimeout(function() { - cache.set(); $('#content').html(translatedTemplate); ajaxify.variables.parse(); diff --git a/public/src/client/unread.js b/public/src/client/unread.js index 53cb048463..994d4e1ddb 100644 --- a/public/src/client/unread.js +++ b/public/src/client/unread.js @@ -12,8 +12,6 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], }); Unread.init = function() { - var topicsContainer = $('#topics-container'); - app.enterRoom('recent_posts'); $('#new-topics-alert').on('click', function() { @@ -44,7 +42,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], app.alertSuccess('[[unread:topics_marked_as_read.success]]'); - topicsContainer.empty(); + $('#topics-container').empty(); $('#category-no-topics').removeClass('hidden'); $('.markread').addClass('hidden'); }); @@ -70,22 +68,11 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], }); }); - topicsContainer.on('click', '.topic-title, .replies a', function(e) { - var tid = $(e.target).parents('[data-tid]').attr('data-tid'); - socket.emit('topics.markAsRead', [tid], function(err) { - if(err) { - return app.alertError(err.message); - } - - doneRemovingTids([tid], true); - }); - }); - socket.emit('categories.get', onCategoriesLoaded); topicSelect.init(); - if ($("body").height() <= $(window).height() && topicsContainer.children().length >= 20) { + if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) { $('#load-more-btn').show(); } @@ -96,16 +83,16 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], infinitescroll.init(loadMoreTopics); function loadMoreTopics(direction) { - if(direction < 0 || !topicsContainer.length) { + if(direction < 0 || !$('#topics-container').length) { return; } infinitescroll.loadMore('topics.loadMoreUnreadTopics', { - after: topicsContainer.attr('data-nextstart') + after: $('#topics-container').attr('data-nextstart') }, function(data, done) { if (data.topics && data.topics.length) { recent.onTopicsLoaded('unread', data.topics, true, done); - topicsContainer.attr('data-nextstart', data.nextStart); + $('#topics-container').attr('data-nextstart', data.nextStart); } else { done(); $('#load-more-btn').hide(); @@ -114,10 +101,10 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], } }; - function doneRemovingTids(tids, quiet) { + function doneRemovingTids(tids) { removeTids(tids); - if (!quiet) { app.alertSuccess('[[unread:topics_marked_as_read.success]]'); } + app.alertSuccess('[[unread:topics_marked_as_read.success]]'); if (!$('#topics-container').children().length) { $('#category-no-topics').removeClass('hidden'); diff --git a/public/src/modules/ajaxifyCache.js b/public/src/modules/ajaxifyCache.js deleted file mode 100644 index 02313c3d68..0000000000 --- a/public/src/modules/ajaxifyCache.js +++ /dev/null @@ -1,37 +0,0 @@ -'use strict'; -/* globals define, app, ajaxify */ - -define('ajaxifyCache', function() { - var Cache = { - url: undefined, - DOM: undefined, - tempDOM: undefined - }; - - Cache.set = function() { - Cache.DOM = $('#content > *').detach(); - }; - - Cache.get = function(url, callback) { - if (url === Cache.url && ajaxify.isPopState) { - // Swap DOM elements - // setTimeout(function() { - Cache.tempDOM = $('#content > *').detach(); - $('#content').append(Cache.DOM); - Cache.DOM = Cache.tempDOM; - // }, 100); // 100ms for realism! :sunglasses: - - // Set the values that normally get set on ajaxify - Cache.url = ajaxify.currentPage; - ajaxify.currentPage = url; - - if (typeof callback === 'function') { callback(); } - - return true; - } else { - return false; - } - }; - - return Cache; -}); \ No newline at end of file From 01166b08c33d32121ac76c5681f4124ba99f12a2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 08:41:38 -0500 Subject: [PATCH 611/897] latest translations --- public/language/fi/category.json | 6 +-- public/language/fi/email.json | 14 +++---- public/language/fi/error.json | 30 +++++++------- public/language/fi/global.json | 24 +++++------ public/language/fi/groups.json | 26 ++++++------ public/language/fi/modules.json | 20 ++++----- public/language/fi/notifications.json | 12 +++--- public/language/fi/recent.json | 22 +++++----- public/language/fi/reset_password.json | 4 +- public/language/fi/search.json | 56 +++++++++++++------------- public/language/fi/tags.json | 10 ++--- public/language/fi/topic.json | 44 ++++++++++---------- public/language/fi/user.json | 48 +++++++++++----------- public/language/fi/users.json | 6 +-- public/language/it/category.json | 2 +- public/language/it/email.json | 6 +-- public/language/it/error.json | 16 ++++---- public/language/it/global.json | 14 +++---- public/language/it/groups.json | 26 ++++++------ public/language/it/recent.json | 18 ++++----- public/language/it/reset_password.json | 4 +- public/language/it/search.json | 4 +- public/language/it/topic.json | 6 +-- public/language/it/user.json | 10 ++--- public/language/it/users.json | 8 ++-- public/language/ru/user.json | 2 +- 26 files changed, 219 insertions(+), 219 deletions(-) diff --git a/public/language/fi/category.json b/public/language/fi/category.json index 3b098b3cfe..6e36ca410c 100644 --- a/public/language/fi/category.json +++ b/public/language/fi/category.json @@ -1,9 +1,9 @@ { "new_topic_button": "Uusi aihe", - "guest-login-post": "Log in to post", - "no_topics": "Tällä aihealueella ei ole yhtään aihetta.
      Miksi et aloittaisi uutta?", + "guest-login-post": "Kirjaudu sisään voidaksesi kirjoittaa viesti", + "no_topics": "Tässä kategoriassa ei ole yhtään aihetta.
      Miksi et aloittaisi uutta?", "browsing": "selaamassa", "no_replies": "Kukaan ei ole vastannut", "share_this_category": "Jaa tämä kategoria", - "ignore": "Ignore" + "ignore": "Sivuuta" } \ No newline at end of file diff --git a/public/language/fi/email.json b/public/language/fi/email.json index f290435e75..50237b0d03 100644 --- a/public/language/fi/email.json +++ b/public/language/fi/email.json @@ -1,11 +1,11 @@ { - "password-reset-requested": "Password Reset Requested - %1!", - "welcome-to": "Welcome to %1", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", - "welcome.text1": "Thank you for registering with %1!", - "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", - "welcome.cta": "Click here to confirm your email address", + "password-reset-requested": "Pyydetty salasanan palautuskoodia - %1!", + "welcome-to": "%1 - Tervetuloa", + "greeting_no_name": "Hei", + "greeting_with_name": "Hei %1", + "welcome.text1": "Kiitos rekisteröitymisestäsi sivustolle %1!", + "welcome.text2": "Meidän täytyy varmistaa, että omistat sen sähköpostiosoitteen, jolla rekisteröidyit, ennen kuin tilisi voidaan aktivoida kokonaan.", + "welcome.cta": "Napsauta tästä vahvistaaksesi sähköpostiosoitteesi", "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", "reset.cta": "Click here to reset your password", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 813f7896e2..94256906f1 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -12,24 +12,24 @@ "invalid-title": "Virheellinen otsikko!", "invalid-user-data": "Virheellinen käyttäjätieto", "invalid-password": "Virheellinen salasana", - "invalid-username-or-password": "Please specify both a username and password", - "invalid-search-term": "Invalid search term", + "invalid-username-or-password": "Ole hyvä ja anna sekä käyttäjänimi että salasana", + "invalid-search-term": "Virheellinen hakutermi", "invalid-pagination-value": "Virheellinen taittoarvo", "username-taken": "Käyttäjänimi varattu", "email-taken": "Sähköpostiosoite varattu", - "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed": "Sähköpostiasi ei ole vielä vahvistettu, ole hyvä ja napsauta tätä vahvistaaksesi sen.", + "email-not-confirmed-chat": "Et voi käyttää chattia ennen kuin sähköpostisi on vahvistettu", "username-too-short": "Käyttäjänimi on liian lyhyt", - "username-too-long": "Username too long", + "username-too-long": "Käyttäjänimi on liian pitkä", "user-banned": "Käyttäjä on estetty", - "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post", - "no-category": "Category does not exist", - "no-topic": "Topic does not exist", - "no-post": "Post does not exist", - "no-group": "Group does not exist", - "no-user": "User does not exist", + "user-too-new": "Pahottelut, joudut odottamaan %1 sekuntia ennen ensimmäisen viestin kirjoittamista", + "no-category": "Kategoriaa ei ole olemassa", + "no-topic": "Aihetta ei ole olemassa", + "no-post": "Viestiä ei ole olemassa", + "no-group": "Ryhmää ei ole olemassa", + "no-user": "Käyttäjää ei ole olemassa", "no-teaser": "Teaser does not exist", - "no-privileges": "You do not have enough privileges for this action.", + "no-privileges": "Oikeutesi eivät riitä toiminnon suorittamiseen.", "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategoria ei ole käytössä", "topic-locked": "Aihe lukittu", @@ -40,10 +40,10 @@ "title-too-long": "Otsikkosi on liian pitkä. Otsikoiden pituuden tulee olla enintään %1 merkkiä.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", - "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", + "file-too-big": "Suurin sallittu tiedostokoko on %1 kbs - ole hyvä ja lataa pienempi tiedosto", "cant-vote-self-post": "Et voi antaa ääntä omalle viestillesi", - "already-favourited": "You have already favourited this post", - "already-unfavourited": "You have already unfavourited this post", + "already-favourited": "Tämä viesti on jo suosikeissasi", + "already-unfavourited": "Olet jo poistanut tämän viestin suosikeistasi", "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", diff --git a/public/language/fi/global.json b/public/language/fi/global.json index 7e0be437c7..b5823b4f45 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -3,10 +3,10 @@ "search": "Hae", "buttons.close": "Sulje", "403.title": "Pääsy kielletty", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Olet päätynyt sivulle, johon sinulla ei ole tarvittavia oikeuksia.", + "403.login": "Sinun pitäisi kai kirjautua sisään?", "404.title": "Ei löydy", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Olet päätynyt sivulle, jota ei ole olemassa. Palaa etusivulle.", "500.title": "Sisäinen virhe.", "500.message": "Oho! Jotain meni pieleen!", "register": "Rekisteröidy", @@ -14,20 +14,20 @@ "please_log_in": "Kirjaudu, ole hyvä", "logout": "Kirjaudu ulos", "posting_restriction_info": "Kirjoittaminen on tällä hetkellä rajattu vain rekisteröityneille käyttäjille. Napsauta tätä kirjautuaksesi.", - "welcome_back": "Welcome Back", + "welcome_back": "Tervetuloa takaisin", "you_have_successfully_logged_in": "Olet onnistuneesti kirjautunut sisään", "save_changes": "Tallenna muutokset", "close": "Sulje", "pagination": "Sivutus", "pagination.out_of": "%1/%2", - "pagination.enter_index": "Enter index", + "pagination.enter_index": "Syötä indeksi", "header.admin": "Ylläpitäjä", "header.recent": "Viimeisimmät", "header.unread": "Lukemattomat", - "header.tags": "Tags", + "header.tags": "Tagit", "header.popular": "Suositut", "header.users": "Käyttäjät", - "header.groups": "Groups", + "header.groups": "Ryhmät", "header.chats": "Keskustelut", "header.notifications": "Ilmoitukset", "header.search": "Hae", @@ -40,7 +40,7 @@ "alert.success": "Onnistui", "alert.error": "Virhe", "alert.banned": "Estetty", - "alert.banned.message": "You have just been banned, you will now be logged out.", + "alert.banned.message": "Sinut estettiin juuri ja kirjaudut nyt ulos.", "alert.unfollow": "Et seuraa enää %1!", "alert.follow": "Seuraat nyt %1!", "online": "Online", @@ -74,8 +74,8 @@ "guests": "Vieraat", "updated.title": "Foorumi päivitetty", "updated.message": "Tämä foorumi on juuri päivitetty uusimpaan versioon. Paina tästä päivittääksesi sivun.", - "privacy": "Privacy", - "follow": "Follow", - "unfollow": "Unfollow", - "delete_all": "Delete All" + "privacy": "Yksityisyys", + "follow": "Seuraa", + "unfollow": "Älä seuraa", + "delete_all": "Poista kaikki" } \ No newline at end of file diff --git a/public/language/fi/groups.json b/public/language/fi/groups.json index 950fe6dca3..19a0f89137 100644 --- a/public/language/fi/groups.json +++ b/public/language/fi/groups.json @@ -1,22 +1,22 @@ { - "groups": "Groups", + "groups": "Ryhmät", "view_group": "View Group", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", + "owner": "Ryhmän omistaja", + "new_group": "Luo uusi ryhmä", + "no_groups_found": "Ei ryhmiä", + "cover-instructions": "Vedä ja pudota kuva, raahaa oikeaan kohtaan ja paina Tallenna", "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", - "details.title": "Group Details", - "details.members": "Member List", + "cover-save": "Tallenna", + "cover-saving": "Tallennetaan", + "details.title": "Ryhmän tiedot", + "details.members": "Jäsenluettelo", "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.latest_posts": "Uusimmat viestit", + "details.private": "Yksityinen ryhmä", + "details.public": "Julkinen ryhmä", "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", + "details.kick": "Potkaise", "details.owner_options": "Group Administration", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" diff --git a/public/language/fi/modules.json b/public/language/fi/modules.json index 1edf78c52d..cce7d25fbe 100644 --- a/public/language/fi/modules.json +++ b/public/language/fi/modules.json @@ -1,21 +1,21 @@ { "chat.chatting_with": "Keskustele käyttäjän kanssa", - "chat.placeholder": "Type chat message here, press enter to send", + "chat.placeholder": "Kirjoita viestisi tähän ja paina enter lähettääksesi", "chat.send": "Lähetä", "chat.no_active": "Sinulla ei ole aktiivisia keskusteluita.", "chat.user_typing": "%1 kirjoittaa ...", "chat.user_has_messaged_you": "%1 lähetti sinulle viestin.", "chat.see_all": "Näytä kaikki keskustelut", - "chat.no-messages": "Please select a recipient to view chat message history", - "chat.recent-chats": "Recent Chats", + "chat.no-messages": "Valitse vastaanottaja katsellaksesi keskusteluhistoriaa", + "chat.recent-chats": "Viimeisimmät keskustelut", "chat.contacts": "Contacts", - "chat.message-history": "Message History", + "chat.message-history": "Viestihistoria", "chat.pop-out": "Pop out chat", - "chat.maximize": "Maximize", - "chat.seven_days": "7 Days", - "chat.thirty_days": "30 Days", - "chat.three_months": "3 Months", + "chat.maximize": "Suurenna", + "chat.seven_days": "7 päivää", + "chat.thirty_days": "30 päivää", + "chat.three_months": "3 kuukautta", "composer.user_said_in": "%1 said in %2:", - "composer.user_said": "%1 said:", - "composer.discard": "Are you sure you wish to discard this post?" + "composer.user_said": "%1 sanoi:", + "composer.discard": "Oletko varma, että haluat hylätä viestin?" } \ No newline at end of file diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 3a0a4ff25c..dfc7bf5905 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -11,14 +11,14 @@ "you_have_unread_notifications": "Sinulla on lukemattomia ilmoituksia.", "new_message_from": "Uusi viesti käyttäjältä %1", "upvoted_your_post_in": "%1 has upvoted your post in %2.", - "moved_your_post": "%1 has moved your post.", - "moved_your_topic": "%1 has moved your topic.", + "moved_your_post": "%1 on siirtänyt viestisi.", + "moved_your_topic": "%1 on siirtänyt aiheesi.", "favourited_your_post_in": "%1 has favourited your post in %2.", "user_flagged_post_in": "%1 flagged a post in %2", - "user_posted_to": "%1 has posted a reply to: %2", - "user_posted_topic": "%1 has posted a new topic: %2", - "user_mentioned_you_in": "%1 mentioned you in %2", - "user_started_following_you": "%1 started following you.", + "user_posted_to": "%1 on vastannut viestiin: %2", + "user_posted_topic": "%1 on kirjoittanut uuden aiheen: %2", + "user_mentioned_you_in": "%1 mainitsi sinut viestissä %2", + "user_started_following_you": "%1 alkoi seurata sinua.", "email-confirmed": "Sähköpostiosoite vahvistettu", "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.", "email-confirm-error": "Tapahtui virhe...", diff --git a/public/language/fi/recent.json b/public/language/fi/recent.json index b28b1cddbb..54444a7cbe 100644 --- a/public/language/fi/recent.json +++ b/public/language/fi/recent.json @@ -3,16 +3,16 @@ "day": "Päivä", "week": "Viikko", "month": "Kuukausi", - "year": "Year", - "alltime": "All Time", + "year": "Vuosi", + "alltime": "Alusta lähtien", "no_recent_topics": "Ei viimeisimpiä aiheita.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "Uusi aihe.", + "there-is-a-new-topic-and-a-new-post": "Uusi aihe ja uusi viesti.", + "there-is-a-new-topic-and-new-posts": "Uusi aihe ja %1 uutta viestiä.", + "there-are-new-topics": "%1 uutta aihetta.", + "there-are-new-topics-and-a-new-post": "%1 uutta aihetta ja uusi viesti.", + "there-are-new-topics-and-new-posts": "%1 uutta aihetta ja %2 uutta viestiä.", + "there-is-a-new-post": "Uusi viesti.", + "there-are-new-posts": "%1 uutta viestiä.", + "click-here-to-reload": "Päivitä napsauttamalla tätä." } \ No newline at end of file diff --git a/public/language/fi/reset_password.json b/public/language/fi/reset_password.json index 9d78c5f372..9b523e7e2b 100644 --- a/public/language/fi/reset_password.json +++ b/public/language/fi/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "Syötä sähköpostiosoite", "password_reset_sent": "Salasanan palautuskoodi lähetetty", "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "Salasana on liian lyhyt, käytä pidempää salasanaa.", + "passwords_do_not_match": "Salasana ja sen vahvistus eivät täsmää." } \ No newline at end of file diff --git a/public/language/fi/search.json b/public/language/fi/search.json index a04eb4fc1e..e4f3ea8b7f 100644 --- a/public/language/fi/search.json +++ b/public/language/fi/search.json @@ -3,33 +3,33 @@ "no-matches": "No matches found", "in": "In", "by": "By", - "titles": "Titles", - "titles-posts": "Titles and Posts", - "posted-by": "Posted by", + "titles": "Otsikot", + "titles-posts": "Otsikot ja Viestit", + "posted-by": "Kirjoittanut", "in-categories": "In Categories", - "search-child-categories": "Search child categories", - "reply-count": "Reply Count", - "at-least": "At least", - "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", - "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", - "descending": "In descending order", - "ascending": "In ascending order" + "search-child-categories": "Hae alikategorioista", + "reply-count": "Vastausten määrä", + "at-least": "Vähintään", + "at-most": "Enintään", + "post-time": "Julkaisuaika", + "newer-than": "Uudemmat kuin", + "older-than": "Vanhemmat kuin", + "any-date": "Mikä tahansa päivä", + "yesterday": "Eilen", + "one-week": "Yksi viikko", + "two-weeks": "Kaksi viikkoa", + "one-month": "Yksi kuukausi", + "three-months": "Kolme kuukautta", + "six-months": "Kuusi kuukautta", + "one-year": "Yksi vuosi", + "sort-by": "Lajitteluperuste", + "last-reply-time": "Vastattu viimeksi", + "topic-title": "Aiheen otsikko", + "number-of-replies": "Vastausten määrä", + "number-of-views": "Katselukertojen määrä", + "topic-start-date": "Aiheen aloituspäivä", + "username": "Käyttäjänimi", + "category": "Kategoria", + "descending": "Laskevassa järjestyksessä", + "ascending": "Nousevassa järjestyksessä" } \ No newline at end of file diff --git a/public/language/fi/tags.json b/public/language/fi/tags.json index d2e9a213ac..12e3365d50 100644 --- a/public/language/fi/tags.json +++ b/public/language/fi/tags.json @@ -1,7 +1,7 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "enter_tags_here_short": "Enter tags...", - "no_tags": "There are no tags yet." + "no_tag_topics": "Ei viimeisimpiä aiheita tällä tagilla.", + "tags": "Tagit", + "enter_tags_here": "Syötä tagit tähän. Paina enter kunkin tagin jälkeen.", + "enter_tags_here_short": "Syötä tagit...", + "no_tags": "Ei vielä yhtään tagia." } \ No newline at end of file diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index eef05da8ee..d6812a7fa4 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -1,61 +1,61 @@ { "topic": "Aihe", - "topic_id": "Topic ID", - "topic_id_placeholder": "Enter topic ID", + "topic_id": "Aiheen ID", + "topic_id_placeholder": "Syötä aiheen ID", "no_topics_found": "Aiheita ei löytynyt!", "no_posts_found": "Viestejä ei löytynyt!", - "post_is_deleted": "This post is deleted!", + "post_is_deleted": "Tämä viesti poistettiin!", "profile": "Profiili", - "posted_by": "Posted by %1", - "posted_by_guest": "Posted by Guest", + "posted_by": "%1 kirjoitti", + "posted_by_guest": "Vieras kirjoitti", "chat": "Keskustele", "notify_me": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä", "quote": "Lainaa", "reply": "Vastaa", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Kirjaudu sisään voidaksesi vastata", "edit": "Muokkaa", "delete": "Poista", "purge": "Purge", - "restore": "Restore", + "restore": "Palauta", "move": "Siirrä", "fork": "Haaroita", "link": "Linkitä", "share": "Jaa", "tools": "Työkalut", "flag": "Ilmianna", - "locked": "Locked", + "locked": "Lukittu", "bookmark_instructions": "Click here to return to your last position or close to discard.", "flag_title": "Ilmianna tämä viesti moderaattoreille", - "flag_confirm": "Are you sure you want to flag this post?", - "flag_success": "This post has been flagged for moderation.", - "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", + "flag_confirm": "Oletko varma, että haluat ilmiantaa tämän viestin?", + "flag_success": "Tämä viesti ilmiannettiin moderaattoreille.", + "deleted_message": "Tämä aihe on poistettu. Vain käyttäjät, joilla on aiheen hallintaoikeudet, voivat nähdä sen.", "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.", "not_following_topic.message": "Et saa enää ilmoituksia tästä aiheesta.", - "login_to_subscribe": "Please register or log in in order to subscribe to this topic.", - "markAsUnreadForAll.success": "Topic marked as unread for all.", + "login_to_subscribe": "Ole hyvä ja rekisteröidy tai kirjaudu sisään tilataksesi tämän aiheen.", + "markAsUnreadForAll.success": "Aihe merkitty lukemattomaksi kaikille.", "watch": "Tarkkaile", - "unwatch": "Unwatch", - "watch.title": "Be notified of new replies in this topic", - "unwatch.title": "Stop watching this topic", + "unwatch": "Älä seuraa", + "watch.title": "Ilmoita, kun tähän keskusteluun tulee uusia viestejä", + "unwatch.title": "Lopeta tämän aiheen seuraaminen", "share_this_post": "Jaa tämä viesti", - "thread_tools.title": "Topic Tools", + "thread_tools.title": "Aiheen työkalut", "thread_tools.markAsUnreadForAll": "Merkitse lukemattomaksi", "thread_tools.pin": "Kiinnitä aihe", "thread_tools.unpin": "Poista aiheen kiinnitys", "thread_tools.lock": "Lukitse aihe", "thread_tools.unlock": "Poista aiheen lukitus", "thread_tools.move": "Siirrä aihe", - "thread_tools.move_all": "Move All", + "thread_tools.move_all": "Siirrä kaikki", "thread_tools.fork": "Haaroita aihe", "thread_tools.delete": "Poista aihe", - "thread_tools.delete_confirm": "Are you sure you want to delete this topic?", + "thread_tools.delete_confirm": "Haluatko varmasti poistaa tämän aiheen?", "thread_tools.restore": "Palauta aihe", - "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", + "thread_tools.restore_confirm": "Haluatko varmasti palauttaa tämän aiheen?", "thread_tools.purge": "Purge Topic", "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", "topic_move_success": "This topic has been successfully moved to %1", - "post_delete_confirm": "Are you sure you want to delete this post?", - "post_restore_confirm": "Are you sure you want to restore this post?", + "post_delete_confirm": "Haluatko varmasti poistaa tämän viestin?", + "post_restore_confirm": "Haluatko varmasti palauttaa tämän viestin?", "post_purge_confirm": "Are you sure you want to purge this post?", "load_categories": "Ladataan aihealueita", "disabled_categories_note": "Käytöstä poistetut aihealueet ovat harmaina", diff --git a/public/language/fi/user.json b/public/language/fi/user.json index 4942b2d587..3f0768bf00 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -2,12 +2,12 @@ "banned": "Bannattu", "offline": "Offline", "username": "Käyttäjän nimi", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Liittymispäivä", + "postcount": "Viestien määrä", "email": "Sähköposti", - "confirm_email": "Confirm Email", - "delete_account": "Delete Account", - "delete_account_confirm": "Are you sure you want to delete your account?
      This action is irreversible and you will not be able to recover any of your data

      Enter your username to confirm that you wish to destroy this account.", + "confirm_email": "Vahvista sähköpostiosoite", + "delete_account": "Poista käyttäjätili", + "delete_account_confirm": "Oletko täysin varma, että haluat poistaa käyttäjätilisi?
      Tätä toimintoa ei voi kumonta eikä poistettua dataa voida palauttaa

      Syötä käyttäjänimesi vahvistaaksesi, että haluat poistaa tilisi.", "fullname": "Koko nimi", "website": "Kotisivu", "location": "Sijainti", @@ -18,7 +18,7 @@ "profile_views": "Profiilia katsottu", "reputation": "Maine", "favourites": "Suosikit", - "watched": "Watched", + "watched": "Seurattu", "followers": "Seuraajat", "following": "Seuratut", "signature": "Allekirjoitus", @@ -32,49 +32,49 @@ "edit": "Muokkaa", "uploaded_picture": "Ladattu kuva", "upload_new_picture": "Lataa uusi kuva", - "upload_new_picture_from_url": "Upload New Picture From URL", + "upload_new_picture_from_url": "Lataa uusi kuva URL-osoitteesta", "current_password": "Nykyinen salasana", "change_password": "Vaihda salasana", "change_password_error": "Virheellinen salasana", "change_password_error_wrong_current": "Nykyinen salasanasi ei ole oikein!", "change_password_error_length": "Salasana on liian lyhyt!", "change_password_error_match": "Salasanojen täytyy olla samat!", - "change_password_error_privileges": "You do not have the rights to change this password.", + "change_password_error_privileges": "Sinulla ei ole oikeuksia vaihtaa tätä salasanaa.", "change_password_success": "Salasanasi on päivitetty!", "confirm_password": "Vahvista salasana", "password": "Salasana", - "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as %1", + "username_taken_workaround": "Pyytämäsi käyttäjänimi oli jo varattu, joten muutimme sitä hieman. Käyttäjänimesi on siis nyt %1", "upload_picture": "Lataa kuva", "upload_a_picture": "Lataa kuva", "image_spec": "Voit ladata vain PNG-, JPG- tai GIF-tiedostoja", "max": "max.", "settings": "Asetukset", "show_email": "Näytä sähköpostiosoitteeni", - "show_fullname": "Show My Full Name", - "restrict_chats": "Only allow chat messages from users I follow", + "show_fullname": "Näytä koko nimeni", + "restrict_chats": "Salli pikaviestit vain seuraamiltani käyttäjiltä", "digest_label": "Subscribe to Digest", - "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule", - "digest_off": "Off", - "digest_daily": "Daily", - "digest_weekly": "Weekly", - "digest_monthly": "Monthly", - "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "digest_description": "Tilaa päivitykset sähköpostilla tästä foorumista (uudet ilmoitukset ja aiheet) asetetun ajastuksen mukaan", + "digest_off": "Pois päältä", + "digest_daily": "Päivittäin", + "digest_weekly": "Viikottain", + "digest_monthly": "Kuukausittain", + "send_chat_notifications": "Lähetä minulle sähköposti, jos uusi pikaviesti saapuu, kun en ole paikalla", + "send_post_notifications": "Lähetä minulle sähköposti, kun tilaamiini aiheisiin tulee vastauksia", "has_no_follower": "Kukaan ei seuraa tätä käyttäjää :(", "follows_no_one": "Tämä käyttäjä ei seuraa ketään :(", "has_no_posts": "Tämä käyttäjä ei ole kirjoittanut vielä mitään.", "has_no_topics": "Tämä käyttäjä ei ole kirjoittanut vielä yhtään aihetta.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Tämä käyttäjä ei seuraa vielä yhtään aihetta.", "email_hidden": "Sähköposti piilotettu", "hidden": "piilotettu", "paginate_description": "Sivuta aiheet ja viestit loputtoman vierittämisen sijaan.", "topics_per_page": "Aihetta per sivu", "posts_per_page": "Viestiä per sivu", "notification_sounds": "Soita merkkiääni ilmoituksen saapuessa.", - "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?", - "enable_topic_searching": "Enable In-Topic Searching", + "browsing": "Selataan asetuksia", + "open_links_in_new_tab": "Avaa muualle vievät linkit uudessa välilehdessä?", + "enable_topic_searching": "Salli aiheen sisäiset haut", "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", - "follow_topics_you_reply_to": "Follow topics that you reply to.", - "follow_topics_you_create": "Follow topics you create." + "follow_topics_you_reply_to": "Seuraa aiheita, joihin olen vastannut.", + "follow_topics_you_create": "Seuraa aloittamiani aiheita." } \ No newline at end of file diff --git a/public/language/fi/users.json b/public/language/fi/users.json index f1cca4ea56..fe90faeaeb 100644 --- a/public/language/fi/users.json +++ b/public/language/fi/users.json @@ -5,8 +5,8 @@ "search": "Hae", "enter_username": "Syötä käyttäjätunnus hakeaksesi", "load_more": "Lataa lisää", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", - "filter-by": "Filter By", - "online-only": "Online only", + "users-found-search-took": "%1 käyttäjä(ä) löytyi! Haku kesti %2 sekuntia.", + "filter-by": "Suodata", + "online-only": "Vain verkossa olevat", "picture-only": "Picture only" } \ No newline at end of file diff --git a/public/language/it/category.json b/public/language/it/category.json index 3e018bf12f..5721f6eb3f 100644 --- a/public/language/it/category.json +++ b/public/language/it/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Nuova Discussione", - "guest-login-post": "Log in to post", + "guest-login-post": "Effettua il Log in per pubblicare", "no_topics": "Non ci sono discussioni in questa categoria.
      Perché non ne inizi una?", "browsing": "visualizzando", "no_replies": "Nessuno ha risposto", diff --git a/public/language/it/email.json b/public/language/it/email.json index d54cf8c4cd..be6567c1c2 100644 --- a/public/language/it/email.json +++ b/public/language/it/email.json @@ -9,8 +9,8 @@ "reset.text1": "Abbiamo ricevuto una richiesta di reset della tua password, probabilmente perché l'hai dimenticata. Se non è così si prega di ignorare questa email.", "reset.text2": "Per confermare il reset della password per favore clicca il seguente link:", "reset.cta": "Clicca qui per resettare la tua password", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", + "reset.notify.subject": "Possword modificata con successo.", + "reset.notify.text1": "Ti informiamo che in data %1, la password è stata cambiata con successo.", "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", "digest.notifications": "Hai una notifica non letta da %1:", "digest.latest_topics": "Ultimi argomenti su %1", @@ -20,7 +20,7 @@ "notif.chat.subject": "Nuovo messaggio in chat da %1", "notif.chat.cta": "Clicca qui per continuare la conversazione", "notif.chat.unsub.info": "Questa notifica di chat ti è stata inviata perché l'hai scelta nelle impostazioni.", - "notif.post.cta": "Click here to read the full topic", + "notif.post.cta": "Clicca qui per leggere il topic completo.", "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "Questa è una email di test per verificare che il servizio di invio email è configurato correttamente sul tuo NodeBB.", "unsub.cta": "Clicca qui per modificare queste impostazioni", diff --git a/public/language/it/error.json b/public/language/it/error.json index fe207d0502..3c7dbac6fd 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -18,7 +18,7 @@ "username-taken": "Nome utente già preso", "email-taken": "Email già esistente", "email-not-confirmed": "La tua Email deve essere ancora confermata, per favore clicca qui per confermare la tua Email.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Non potrai chattare finchè non avrai confermato la tua email", "username-too-short": "Nome utente troppo corto", "username-too-long": "Nome utente troppo lungo", "user-banned": "Utente bannato", @@ -35,7 +35,7 @@ "topic-locked": "Discussione Bloccata", "still-uploading": "Per favore attendere il completamento degli uploads.", "content-too-short": "Inserisci un post più lungo. Il Messaggio deve contenere almeno %1 caratteri.", - "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", + "content-too-long": "Per favore inserisci un post più breve. I post non possono essere più lunghi di %1 caratteri.", "title-too-short": "Inserisci un titolo più lungo. I titoli devono contenere almeno %1 caratteri.", "title-too-long": "Per favore inserire un titolo più corto, non può essere più lungo di %1 caratteri.", "too-many-posts": "È possibile inserire un Post ogni %1 secondi - si prega di attendere prima di postare di nuovo", @@ -45,13 +45,13 @@ "already-favourited": "Hai già inserito tra i preferiti questo post", "already-unfavourited": "Hai già inserito tra i Non Preferiti questo post", "cant-ban-other-admins": "Non puoi bannare altri amministratori!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", + "invalid-image-type": "Tipo dell'immagine non valido. I tipi permessi sono: %1", + "invalid-image-extension": "Estensione immagine non valida", "group-name-too-short": "Nome del Gruppo troppo corto", "group-already-exists": "Il Gruppo esiste già", "group-name-change-not-allowed": "Il cambio di nome al Gruppo non è consentito", - "group-already-member": "You are already part of this group", - "group-needs-owner": "This group requires at least one owner", + "group-already-member": "Fai già parte di questo gruppo", + "group-needs-owner": "Questo gruppo richiede almeno un proprietario.", "post-already-deleted": "Questo Post è già stato cancellato", "post-already-restored": "Questo Post è già stato ripristinato", "topic-already-deleted": "Questo Topic è già stato cancellato", @@ -63,12 +63,12 @@ "signature-too-long": "Spiacenti, la tua firma non può essere lunga %1 caratteri.", "cant-chat-with-yourself": "Non puoi chattare con te stesso!", "chat-restricted": "Questo utente ha ristretto i suoi messaggi in chat alle persone che segue. Per poter chattare con te ti deve prima seguire.", - "too-many-messages": "You have sent too many messages, please wait awhile.", + "too-many-messages": "Hai inviato troppi messaggi, aspetta un attimo.", "reputation-system-disabled": "Il sistema di reputazione è disabilitato.", "downvoting-disabled": "Il Downvoting è disabilitato", "not-enough-reputation-to-downvote": "Non hai i privilegi per votare negativamente questo post", "not-enough-reputation-to-flag": "Tu non hai abbastanza reputazione per segnalare questo Post", "reload-failed": "NodeBB ha incontrato un problema durante il ricaricamento: \"%1\". NodeBB continuerà a servire gli assets esistenti lato client, così puoi annullare quello che hai fatto prima di ricaricare.", "registration-error": "Errore nella registrazione", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Qualcosa è andato storto durante l'analisi della risposta proveniente dal server" } \ No newline at end of file diff --git a/public/language/it/global.json b/public/language/it/global.json index 35d1244d7f..ed27a9340d 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -3,10 +3,10 @@ "search": "Cerca", "buttons.close": "Chiudi", "403.title": "Accesso Proibito", - "403.message": "You seem to have stumbled upon a page that you do not have access to.", - "403.login": "Perhaps you should try logging in?", + "403.message": "Sembra tu sia arrivato ad una pagina a cui non hai accesso.", + "403.login": "Forse dovresti effettuare l'accesso?", "404.title": "Non trovato", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "404.message": "Sembra tu sia arrivato ad una pagina che non esiste. Torna alla home page.", "500.title": "Errore interno.", "500.message": "Oops! Qualcosa non funziona come si deve!", "register": "Registrazione", @@ -27,7 +27,7 @@ "header.tags": "Tags", "header.popular": "Popolare", "header.users": "Utenti", - "header.groups": "Groups", + "header.groups": "Gruppi", "header.chats": "Messaggi", "header.notifications": "Notifiche", "header.search": "Cerca", @@ -57,7 +57,7 @@ "posted_in_ago_by": "postato in %1 %2 da %3", "posted_in_ago": "postato in %1 %2", "replied_ago": "risposto %1", - "user_posted_ago": "%1 postato %2", + "user_posted_ago": "%1 ha postato %2", "guest_posted_ago": "Ospite ha scritto %1", "last_edited_by_ago": "ultima modifica di %1 %2", "norecentposts": "Nessun Post Recente", @@ -75,7 +75,7 @@ "updated.title": "Forum Aggiornato", "updated.message": "Questo forum è stato aggiornato all'ultima versione. Clicca qui per ricaricare la pagina.", "privacy": "Privacy", - "follow": "Follow", - "unfollow": "Unfollow", + "follow": "Segui", + "unfollow": "Non seguire", "delete_all": "Elimina Tutto" } \ No newline at end of file diff --git a/public/language/it/groups.json b/public/language/it/groups.json index f4e5f32787..dbc3ebfed8 100644 --- a/public/language/it/groups.json +++ b/public/language/it/groups.json @@ -1,23 +1,23 @@ { "groups": "Gruppi", "view_group": "Vedi Gruppo", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "Proprietario del Gruppo", + "new_group": "Crea Nuovo Gruppo", + "no_groups_found": "Non ci sono gruppi da vedere", + "cover-instructions": "Drag and Drop una fotografia, spostarla ad una posizione, e premere Salva", + "cover-change": "Cambia", + "cover-save": "Salva", + "cover-saving": "Salvando", "details.title": "Dettagli Gruppo", "details.members": "Lista Membri", - "details.pending": "Pending Members", + "details.pending": "Membri in attesa", "details.has_no_posts": "I membri di questo gruppo non hanno ancora postato.", "details.latest_posts": "Ultimi Post", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Gruppo Privato", + "details.public": "Gruppo Pubblico", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", - "details.owner_options": "Group Administration", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.owner_options": "Amministratore del Grupo", + "event.updated": "I dettagli del Gruppo sono stati aggiornati", + "event.deleted": "Il gruppo \"%1\" è stato eliminato" } \ No newline at end of file diff --git a/public/language/it/recent.json b/public/language/it/recent.json index f7d5f4d624..9fd2b684ff 100644 --- a/public/language/it/recent.json +++ b/public/language/it/recent.json @@ -6,13 +6,13 @@ "year": "Anno", "alltime": "Sempre", "no_recent_topics": "Non ci sono discussioni recenti.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "there-is-a-new-topic": "C'è un nuovo topic.", + "there-is-a-new-topic-and-a-new-post": "C'è un nuovo topic e un nuovo post.", + "there-is-a-new-topic-and-new-posts": "C'è una nuova discussione e %1 nuovi post.", + "there-are-new-topics": "Ci sono %1 nuove discussioni.", + "there-are-new-topics-and-a-new-post": "Ci sono %1 nuove discussioni e un nuovo post.", + "there-are-new-topics-and-new-posts": "Ci sono %1 nuove discussioni e %2 nuovi post.", + "there-is-a-new-post": "C'è un nuovo post.", + "there-are-new-posts": "Ci sono %1 nuovi post.", + "click-here-to-reload": "Clicca qui per ricaricare." } \ No newline at end of file diff --git a/public/language/it/reset_password.json b/public/language/it/reset_password.json index 4789b7f1c1..d89642e43b 100644 --- a/public/language/it/reset_password.json +++ b/public/language/it/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "Inserisci l'Indirizzo Email", "password_reset_sent": "Password Reset Inviata", "invalid_email": "Email invalida / L'email non esiste!", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "La password inserita è troppo corta, inserisci una password differente.", + "passwords_do_not_match": "Le due password che hai inserito non corrispondono." } \ No newline at end of file diff --git a/public/language/it/search.json b/public/language/it/search.json index 479fec6287..82ffa288d1 100644 --- a/public/language/it/search.json +++ b/public/language/it/search.json @@ -9,8 +9,8 @@ "in-categories": "In Categorie", "search-child-categories": "Search child categories", "reply-count": "Numero Risposte", - "at-least": "At least", - "at-most": "At most", + "at-least": "Almeno", + "at-most": "Al massimo", "post-time": "Ora invio", "newer-than": "Più nuovi di", "older-than": "Più vecchi di", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 1cc385c23f..e53ac5c6f2 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -12,7 +12,7 @@ "notify_me": "Ricevi notifiche di nuove risposte in questa discussione", "quote": "Cita", "reply": "Rispondi", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Effettua il Log in per rispondere", "edit": "Modifica", "delete": "Cancella", "purge": "Svuota", @@ -75,7 +75,7 @@ "fork_no_pids": "Nessun post selezionato!", "fork_success": "Topic Diviso con successo ! Clicca qui per andare al Topic Diviso.", "composer.title_placeholder": "Inserisci qui il titolo della discussione...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Nome", "composer.discard": "Annulla", "composer.submit": "Invia", "composer.replying_to": "Rispondendo a %1", @@ -95,5 +95,5 @@ "oldest_to_newest": "Da Vecchi a Nuovi", "newest_to_oldest": "Da Nuovi a Vecchi", "most_votes": "Più votati", - "most_posts": "Most posts" + "most_posts": "Ulteriori post" } \ No newline at end of file diff --git a/public/language/it/user.json b/public/language/it/user.json index ddbc35be12..e93be01541 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -2,8 +2,8 @@ "banned": "Bannato", "offline": "Non in linea", "username": "Nome Utente", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Data di adesione", + "postcount": "Numero post", "email": "Email", "confirm_email": "Conferma Email", "delete_account": "Elimina Account", @@ -18,7 +18,7 @@ "profile_views": "Visite al profilo", "reputation": "Reputazione", "favourites": "Favoriti", - "watched": "Watched", + "watched": "Osservati", "followers": "Da chi è seguito", "following": "Chi segue", "signature": "Firma", @@ -59,12 +59,12 @@ "digest_weekly": "Settimanale", "digest_monthly": "Mensile", "send_chat_notifications": "Invia una email se arriva un nuovo messaggio di chat e non sono online", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "Invia una email quando le risposte sono fatte a discussioni a cui sono sottoscritto", "has_no_follower": "Questo utente non è seguito da nessuno :(", "follows_no_one": "Questo utente non segue nessuno :(", "has_no_posts": "Questo utente non ha ancora postato nulla.", "has_no_topics": "Questo utente non ha ancora avviato discussioni.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Questo utente non sta ancora osservando alcuna discussione.", "email_hidden": "Email Nascosta", "hidden": "nascosta", "paginate_description": "Dividi discussioni e post in pagine anziché usare lo scroll infinito.", diff --git a/public/language/it/users.json b/public/language/it/users.json index 44f4b4f916..4774dd2909 100644 --- a/public/language/it/users.json +++ b/public/language/it/users.json @@ -5,8 +5,8 @@ "search": "Cerca", "enter_username": "Inserisci il nome utente da cercare", "load_more": "Carica altri", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", - "filter-by": "Filter By", - "online-only": "Online only", - "picture-only": "Picture only" + "users-found-search-took": "%1 utente(i) trovati! La ricerca ha impiegato %2 secondi.", + "filter-by": "Filtra per", + "online-only": "Solo online", + "picture-only": "Solo con foto" } \ No newline at end of file diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 0b5a541199..99be44abd6 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -62,7 +62,7 @@ "send_post_notifications": "Отправлять email, когда отвечают в темы, на которые я подписан(а)", "has_no_follower": "Этого пользователя никто не читает :(", "follows_no_one": "Этот пользователь никого не читает :(", - "has_no_posts": "Это пользователь еще ничего не написал.", + "has_no_posts": "Этот пользователь еще ничего не написал.", "has_no_topics": "Этот пользователь еще не создал ни одной темы", "has_no_watched_topics": "Этот пользователь еще не просмотрел ни одной темы", "email_hidden": "Email скрыт", From 4a264cac5207fdefff0b2d04bf30ebd63c32d8d9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 08:43:42 -0500 Subject: [PATCH 612/897] latest fallbacks --- public/language/ar/error.json | 11 +++++++++-- public/language/ar/groups.json | 15 +++++++++++++-- public/language/ar/login.json | 4 +++- public/language/ar/notifications.json | 2 +- public/language/ar/recent.json | 1 + public/language/ar/search.json | 7 ++++++- public/language/ar/tags.json | 2 +- public/language/bn/error.json | 11 +++++++++-- public/language/bn/groups.json | 15 +++++++++++++-- public/language/bn/login.json | 4 +++- public/language/bn/notifications.json | 2 +- public/language/bn/recent.json | 1 + public/language/bn/search.json | 7 ++++++- public/language/bn/tags.json | 2 +- public/language/cs/error.json | 11 +++++++++-- public/language/cs/groups.json | 15 +++++++++++++-- public/language/cs/login.json | 4 +++- public/language/cs/notifications.json | 2 +- public/language/cs/recent.json | 1 + public/language/cs/search.json | 7 ++++++- public/language/cs/tags.json | 2 +- public/language/de/error.json | 11 +++++++++-- public/language/de/groups.json | 15 +++++++++++++-- public/language/de/login.json | 4 +++- public/language/de/notifications.json | 2 +- public/language/de/recent.json | 1 + public/language/de/search.json | 7 ++++++- public/language/de/tags.json | 2 +- public/language/el/error.json | 11 +++++++++-- public/language/el/groups.json | 15 +++++++++++++-- public/language/el/login.json | 4 +++- public/language/el/notifications.json | 2 +- public/language/el/recent.json | 1 + public/language/el/search.json | 7 ++++++- public/language/el/tags.json | 2 +- public/language/en@pirate/error.json | 11 +++++++++-- public/language/en@pirate/groups.json | 15 +++++++++++++-- public/language/en@pirate/login.json | 4 +++- public/language/en@pirate/notifications.json | 2 +- public/language/en@pirate/recent.json | 1 + public/language/en@pirate/search.json | 7 ++++++- public/language/en@pirate/tags.json | 2 +- public/language/en_US/error.json | 11 +++++++++-- public/language/en_US/groups.json | 15 +++++++++++++-- public/language/en_US/login.json | 4 +++- public/language/en_US/notifications.json | 2 +- public/language/en_US/recent.json | 1 + public/language/en_US/search.json | 7 ++++++- public/language/en_US/tags.json | 2 +- public/language/es/error.json | 11 +++++++++-- public/language/es/groups.json | 15 +++++++++++++-- public/language/es/login.json | 4 +++- public/language/es/notifications.json | 2 +- public/language/es/recent.json | 1 + public/language/es/search.json | 7 ++++++- public/language/es/tags.json | 2 +- public/language/et/error.json | 11 +++++++++-- public/language/et/groups.json | 15 +++++++++++++-- public/language/et/login.json | 4 +++- public/language/et/notifications.json | 2 +- public/language/et/recent.json | 1 + public/language/et/search.json | 7 ++++++- public/language/et/tags.json | 2 +- public/language/fa_IR/error.json | 11 +++++++++-- public/language/fa_IR/groups.json | 15 +++++++++++++-- public/language/fa_IR/login.json | 4 +++- public/language/fa_IR/notifications.json | 2 +- public/language/fa_IR/recent.json | 1 + public/language/fa_IR/search.json | 7 ++++++- public/language/fa_IR/tags.json | 2 +- public/language/fi/error.json | 11 +++++++++-- public/language/fi/groups.json | 15 +++++++++++++-- public/language/fi/login.json | 4 +++- public/language/fi/notifications.json | 2 +- public/language/fi/recent.json | 1 + public/language/fi/search.json | 7 ++++++- public/language/fi/tags.json | 2 +- public/language/fr/error.json | 11 +++++++++-- public/language/fr/groups.json | 15 +++++++++++++-- public/language/fr/login.json | 4 +++- public/language/fr/notifications.json | 2 +- public/language/fr/recent.json | 1 + public/language/fr/search.json | 7 ++++++- public/language/fr/tags.json | 2 +- public/language/he/error.json | 11 +++++++++-- public/language/he/groups.json | 15 +++++++++++++-- public/language/he/login.json | 4 +++- public/language/he/notifications.json | 2 +- public/language/he/recent.json | 1 + public/language/he/search.json | 7 ++++++- public/language/he/tags.json | 2 +- public/language/hu/error.json | 11 +++++++++-- public/language/hu/groups.json | 15 +++++++++++++-- public/language/hu/login.json | 4 +++- public/language/hu/notifications.json | 2 +- public/language/hu/recent.json | 1 + public/language/hu/search.json | 7 ++++++- public/language/hu/tags.json | 2 +- public/language/id/error.json | 11 +++++++++-- public/language/id/groups.json | 15 +++++++++++++-- public/language/id/login.json | 4 +++- public/language/id/notifications.json | 2 +- public/language/id/recent.json | 1 + public/language/id/search.json | 7 ++++++- public/language/id/tags.json | 2 +- public/language/it/error.json | 11 +++++++++-- public/language/it/groups.json | 15 +++++++++++++-- public/language/it/login.json | 4 +++- public/language/it/notifications.json | 2 +- public/language/it/recent.json | 1 + public/language/it/search.json | 7 ++++++- public/language/it/tags.json | 2 +- public/language/ja/error.json | 11 +++++++++-- public/language/ja/groups.json | 15 +++++++++++++-- public/language/ja/login.json | 4 +++- public/language/ja/notifications.json | 2 +- public/language/ja/recent.json | 1 + public/language/ja/search.json | 7 ++++++- public/language/ja/tags.json | 2 +- public/language/ko/error.json | 11 +++++++++-- public/language/ko/groups.json | 15 +++++++++++++-- public/language/ko/login.json | 4 +++- public/language/ko/notifications.json | 2 +- public/language/ko/recent.json | 1 + public/language/ko/search.json | 7 ++++++- public/language/ko/tags.json | 2 +- public/language/lt/error.json | 11 +++++++++-- public/language/lt/groups.json | 15 +++++++++++++-- public/language/lt/login.json | 4 +++- public/language/lt/notifications.json | 2 +- public/language/lt/recent.json | 1 + public/language/lt/search.json | 7 ++++++- public/language/lt/tags.json | 2 +- public/language/ms/error.json | 11 +++++++++-- public/language/ms/groups.json | 15 +++++++++++++-- public/language/ms/login.json | 4 +++- public/language/ms/notifications.json | 2 +- public/language/ms/recent.json | 1 + public/language/ms/search.json | 7 ++++++- public/language/ms/tags.json | 2 +- public/language/nb/error.json | 11 +++++++++-- public/language/nb/groups.json | 15 +++++++++++++-- public/language/nb/login.json | 4 +++- public/language/nb/notifications.json | 2 +- public/language/nb/recent.json | 1 + public/language/nb/search.json | 7 ++++++- public/language/nb/tags.json | 2 +- public/language/nl/error.json | 11 +++++++++-- public/language/nl/groups.json | 15 +++++++++++++-- public/language/nl/login.json | 4 +++- public/language/nl/notifications.json | 2 +- public/language/nl/recent.json | 1 + public/language/nl/search.json | 7 ++++++- public/language/nl/tags.json | 2 +- public/language/pl/error.json | 11 +++++++++-- public/language/pl/groups.json | 15 +++++++++++++-- public/language/pl/login.json | 4 +++- public/language/pl/notifications.json | 2 +- public/language/pl/recent.json | 1 + public/language/pl/search.json | 7 ++++++- public/language/pl/tags.json | 2 +- public/language/pt_BR/error.json | 11 +++++++++-- public/language/pt_BR/groups.json | 15 +++++++++++++-- public/language/pt_BR/login.json | 4 +++- public/language/pt_BR/notifications.json | 2 +- public/language/pt_BR/recent.json | 1 + public/language/pt_BR/search.json | 7 ++++++- public/language/pt_BR/tags.json | 2 +- public/language/ro/error.json | 11 +++++++++-- public/language/ro/groups.json | 15 +++++++++++++-- public/language/ro/login.json | 4 +++- public/language/ro/notifications.json | 2 +- public/language/ro/recent.json | 1 + public/language/ro/search.json | 7 ++++++- public/language/ro/tags.json | 2 +- public/language/ru/error.json | 11 +++++++++-- public/language/ru/groups.json | 15 +++++++++++++-- public/language/ru/login.json | 4 +++- public/language/ru/notifications.json | 2 +- public/language/ru/recent.json | 1 + public/language/ru/search.json | 7 ++++++- public/language/ru/tags.json | 2 +- public/language/sc/error.json | 11 +++++++++-- public/language/sc/groups.json | 15 +++++++++++++-- public/language/sc/login.json | 4 +++- public/language/sc/notifications.json | 2 +- public/language/sc/recent.json | 1 + public/language/sc/search.json | 7 ++++++- public/language/sc/tags.json | 2 +- public/language/sk/error.json | 11 +++++++++-- public/language/sk/groups.json | 15 +++++++++++++-- public/language/sk/login.json | 4 +++- public/language/sk/notifications.json | 2 +- public/language/sk/recent.json | 1 + public/language/sk/search.json | 7 ++++++- public/language/sk/tags.json | 2 +- public/language/sv/error.json | 11 +++++++++-- public/language/sv/groups.json | 15 +++++++++++++-- public/language/sv/login.json | 4 +++- public/language/sv/notifications.json | 2 +- public/language/sv/recent.json | 1 + public/language/sv/search.json | 7 ++++++- public/language/sv/tags.json | 2 +- public/language/th/error.json | 11 +++++++++-- public/language/th/groups.json | 15 +++++++++++++-- public/language/th/login.json | 4 +++- public/language/th/notifications.json | 2 +- public/language/th/recent.json | 1 + public/language/th/search.json | 7 ++++++- public/language/th/tags.json | 2 +- public/language/tr/error.json | 11 +++++++++-- public/language/tr/groups.json | 15 +++++++++++++-- public/language/tr/login.json | 4 +++- public/language/tr/notifications.json | 2 +- public/language/tr/recent.json | 1 + public/language/tr/search.json | 7 ++++++- public/language/tr/tags.json | 2 +- public/language/vi/error.json | 11 +++++++++-- public/language/vi/groups.json | 15 +++++++++++++-- public/language/vi/login.json | 4 +++- public/language/vi/notifications.json | 2 +- public/language/vi/recent.json | 1 + public/language/vi/search.json | 7 ++++++- public/language/vi/tags.json | 2 +- public/language/zh_CN/error.json | 11 +++++++++-- public/language/zh_CN/groups.json | 15 +++++++++++++-- public/language/zh_CN/login.json | 4 +++- public/language/zh_CN/notifications.json | 2 +- public/language/zh_CN/recent.json | 1 + public/language/zh_CN/search.json | 7 ++++++- public/language/zh_CN/tags.json | 2 +- public/language/zh_TW/error.json | 11 +++++++++-- public/language/zh_TW/groups.json | 15 +++++++++++++-- public/language/zh_TW/login.json | 4 +++- public/language/zh_TW/notifications.json | 2 +- public/language/zh_TW/recent.json | 1 + public/language/zh_TW/search.json | 7 ++++++- public/language/zh_TW/tags.json | 2 +- 238 files changed, 1156 insertions(+), 272 deletions(-) diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 73eb289378..51993e5f98 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -19,6 +19,8 @@ "email-taken": "البريد الالكتروني مأخوذ", "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "اسم المستخدم قصير.", "username-too-long": "اسم المستخدم طويل", "user-banned": "المستخدم محظور", @@ -33,6 +35,7 @@ "no-emailers-configured": "لا يمكن إرسال رسالة إلكترونية تجريبية لعدم وجود قوالب خاصة بالرسائل الإلكترونية،", "category-disabled": "قائمة معطلة", "topic-locked": "الموضوع مقفول", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "الرجاء انتظار الرفع", "content-too-short": "المرجو إدخال موضوع أطول من هذا. يجب أن تتوفر المواضيع على %1 حروف على الأقل.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "المرجو إدخال عنوان أقصر من هذا. يجب ألا تتجاوز العناوين %1 حرفًا.", "too-many-posts": "يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية - المرجو الانتظار قليلا.", "too-many-posts-newbie": "بصفتك مستخدمًا جديدًا، يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية حتى تحصل على سمعة %2 - المرجو الانتظار قليلا.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "حجم الملفات الأقصى المسموح به هو %1 كب - المرجو رفع ملف أقل حجمًا", "cant-vote-self-post": "لايمكنك التصويت لردك", "already-favourited": "لقد سبق وأضفت هذا الرد إلى المفضلة", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "اسم المجموعة قصير", "group-already-exists": "المجموعة موجودة مسبقا", "group-name-change-not-allowed": "لايسمح بتغيير أسماء المجموعات", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "الصور المصغرة غير مفعلة.", "invalid-file": "ملف غير مقبول", "uploads-are-disabled": "رفع الملفات غير مفعل", - "upload-error": "مشكلة في الرفع: 1%", "signature-too-long": "عذرا، توقيعك يجب ألا يتجاوز %1 حرفًا", "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك", "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل", "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\". سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.", "registration-error": "حدث خطأ أثناء التسجيل", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ar/groups.json b/public/language/ar/groups.json index b006f74391..0975ca84ca 100644 --- a/public/language/ar/groups.json +++ b/public/language/ar/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة", "details.latest_posts": "آخر المشاركات", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ar/login.json b/public/language/ar/login.json index ffc5beb15a..f6575cf40a 100644 --- a/public/language/ar/login.json +++ b/public/language/ar/login.json @@ -1,5 +1,7 @@ { - "username": "اسم المستخدم / عنوان البريد الإلكتروني", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "تذكرني؟", "forgot_password": "نسيت كلمة المرور؟", "alternative_logins": "تسجيلات الدخول البديلة", diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 0c1f53f377..711a1a4450 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -2,6 +2,7 @@ "title": "تنبيهات", "no_notifs": "ليس لديك أية تنبيهات جديدة", "see_all": "معاينة كل التنبيهات", + "mark_all_read": "Mark all notifications read", "back_to_home": "عودة إلى %1", "outgoing_link": "رابط خارجي", "outgoing_link_message": "أنت تغادر %1 حاليا.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 صار يتابعك.", "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني", "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.", - "email-confirm-error": "حدث خطأ ما...", "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.", "email-confirm-sent": "تم إرسال بريد التفعيل." } \ No newline at end of file diff --git a/public/language/ar/recent.json b/public/language/ar/recent.json index 41da45d951..02003e5d81 100644 --- a/public/language/ar/recent.json +++ b/public/language/ar/recent.json @@ -6,6 +6,7 @@ "year": "سنة", "alltime": "دائمًا", "no_recent_topics": "لاوجود لمشاركات جديدة", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ar/search.json b/public/language/ar/search.json index 50b985d452..9128baf408 100644 --- a/public/language/ar/search.json +++ b/public/language/ar/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ar/tags.json b/public/language/ar/tags.json index 2aa28aa7c5..004681a32a 100644 --- a/public/language/ar/tags.json +++ b/public/language/ar/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "لاوجود لمواضيع تحمل هذا الوسم.", "tags": "بطاقات", - "enter_tags_here": "أدخل البطاقات هنا. اضغط ENTER بعد كل بطاقة.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "أدخل البطاقات...", "no_tags": "لاتوجد هناك بطاقات بعد." } \ No newline at end of file diff --git a/public/language/bn/error.json b/public/language/bn/error.json index d1abf066d9..946b152345 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -19,6 +19,8 @@ "email-taken": "ইমেইল আগেই ব্যবহৃত", "email-not-confirmed": "আপনার ইমেইল এড্রেস নিশ্চিত করা হয় নি, নিশ্চিত করতে এখানে ক্লিক করুন।", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "খুব ছোট ইউজারনেম", "username-too-long": "ইউজারনেম বড় হয়ে গিয়েছে", "user-banned": "ব্যবহারকারী নিষিদ্ধ", @@ -33,6 +35,7 @@ "no-emailers-configured": "কোন ইমেল প্লাগইন লোড করা নেই, কাজেই টেস্ট মেইল পাঠানো সম্ভব হচ্ছে না", "category-disabled": "বিভাগটি নিষ্ক্রিয়", "topic-locked": "টপিক বন্ধ", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "আপলোড সম্পূর্ণ জন্য অনুগ্রহ করে অপেক্ষা করুন", "content-too-short": "অনুগ্রহকরে অপেক্ষকৃত বড় পোষ্ট করুন। একটি পোষ্টে নূন্যতম %1 অক্ষর থাকতে হবে।", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "অনুগ্রহ করে সংক্ষিপ্ত শিরোনাম লিখুন। শিরোনাম %1 অক্ষরের বেশি হতে পারবে না।", "too-many-posts": "আপনি প্রতি %1 সেকেন্ডে একবার পোষ্ট করতে পারবেন। পরবর্তী পোষ্ট করার জন্য অপেক্ষা করুন। ", "too-many-posts-newbie": "নতুন সদস্য হিসাবে %2 সন্মানণা পাওয়া পর্যন্ত আপনি প্রতি %1 সেকেন্ডে একবার পোষ্ট করতে পারবেন। পরবর্তী পোষ্ট করার জন্য অপেক্ষা করুন। ", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "সর্বোচ্চ গৃহীত ফাইলসাইজ হচ্ছে %1 kb - অনুগ্রহপূর্বক ছোট ফাইল আপলোড করুন", "cant-vote-self-post": "আপনি নিজের পোস্টে ভোট দিতে পারবেন না।", "already-favourited": "আপনি ইতিমধ্যে এই পোষ্টটি পছন্দের তালিকায় যোগ করেছেন", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "গ্রুপের নাম খুব ছোট", "group-already-exists": "গ্রুপ ইতিমধ্যেই বিদ্যমান", "group-name-change-not-allowed": "গ্রুপের নাম পরিবর্তনের অনুমতি নেই", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "টপিক থাম্বনেল নিষ্ক্রিয় করা। ", "invalid-file": "ভুল ফাইল", "uploads-are-disabled": "আপলোড নিষ্ক্রিয় করা", - "upload-error": "আপলোড ত্রুটিঃ %1", "signature-too-long": "দুঃখিত, আপনার সাক্ষর %1 অক্ষরের বেশী হতে পারবে না। ", "cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!", "chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "এই পোষ্টকে ফ্লাগ করার জন্য আপনার পর্যাপ্ত সম্মাননা নেই", "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ", "registration-error": "নিবন্ধন এরর!", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/bn/groups.json b/public/language/bn/groups.json index fe8c9fed1d..50e0a886dc 100644 --- a/public/language/bn/groups.json +++ b/public/language/bn/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "এই গ্রুপের সদস্যরা এখনো কোন পোষ্ট করেন নি", "details.latest_posts": "সর্বশেষ পোষ্টসমূহ", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/bn/login.json b/public/language/bn/login.json index e9e2529361..c34f1de706 100644 --- a/public/language/bn/login.json +++ b/public/language/bn/login.json @@ -1,5 +1,7 @@ { - "username": "ইউজারনেম / ইমেইল", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "মনে রাখুন", "forgot_password": "পাসওয়ার্ড ভুলে গিয়েছেন?", "alternative_logins": "বিকল্প প্রবেশ", diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index 14604f6b38..2c29c68362 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -2,6 +2,7 @@ "title": "বিজ্ঞপ্তিগুলো", "no_notifs": "আপনার নতুন কোন বিজ্ঞপ্তি নেই", "see_all": "সকল বিজ্ঞপ্তিগুলো দেখুন", + "mark_all_read": "Mark all notifications read", "back_to_home": "ফিরুন %1", "outgoing_link": "বহির্গামী লিঙ্ক", "outgoing_link_message": "আপনি এখন %1 ত্যাগ করছেন", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 আপনাকে অনুসরন করা শুরু করেছেন।", "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে", "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।", - "email-confirm-error": "একটি ত্রুটি ঘটেছে...", "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।", "email-confirm-sent": "নিশ্চিতকরণ ইমেইল পাঠানো হয়েছে।" } \ No newline at end of file diff --git a/public/language/bn/recent.json b/public/language/bn/recent.json index 518b443560..720bab2407 100644 --- a/public/language/bn/recent.json +++ b/public/language/bn/recent.json @@ -6,6 +6,7 @@ "year": "বছর", "alltime": "সবসময় ", "no_recent_topics": "কোন সাম্প্রতিক টপিক নেই। ", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/bn/search.json b/public/language/bn/search.json index 0038567599..8fef1aef5a 100644 --- a/public/language/bn/search.json +++ b/public/language/bn/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/bn/tags.json b/public/language/bn/tags.json index 9db45491d2..e99c0f835d 100644 --- a/public/language/bn/tags.json +++ b/public/language/bn/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "এই ট্যাগ সম্বলিত কোন টপিক নেই", "tags": "ট্যাগসমূহ", - "enter_tags_here": "এখানে আপনার ট্যাগ টাইপ করুন, প্রত্যেকটি ট্যাগের পর Enter চাপুন", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "ট্যাগ বসান", "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই" } \ No newline at end of file diff --git a/public/language/cs/error.json b/public/language/cs/error.json index f858b2b15f..6be7f9f69d 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -19,6 +19,8 @@ "email-taken": "Email je již použit", "email-not-confirmed": "Vaše emailová adresa zatím nebyla potvrzena. Kliknutím zde svůj email potvrdíte.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Uživatelské jméno je příliš krátké", "username-too-long": "Uživatelské jméno je příliš dlouhé", "user-banned": "Uživatel byl zakázán", @@ -33,6 +35,7 @@ "no-emailers-configured": "Protože není zaveden žádný emailový plugin, není možné odeslat testovací email.", "category-disabled": "Kategorie zakázána", "topic-locked": "Téma uzamčeno", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Vyčkejte, prosím, nežli se vše kompletně nahraje.", "content-too-short": "Vložte, prosím, delší příspěvek. Příspěvky by měly obsahovat nejméně %1 znaků.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Vložte, prosím, kratší titulek. Titulky by neměly být delší, než-li %1 znaků.", "too-many-posts": "Své příspěvky můžete odesílat po %1 sekundách - vyčkejte, prosím, před dalším odesláním", "too-many-posts-newbie": "Jako nový uživatel můžete své příspěvky odesílat po %1 sekundách, dokud nedosáhnete %2 reputace - vyčkejte, prosím, před dalším odesláním", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximální povolená velikost souboru je %1 kbs - nahrávejte, prosím, menší soubory", "cant-vote-self-post": "Nemůžete hlasovat pro svůj vlastní příspěvek", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Nemůžete zakazovat ostatní administrátory!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Název skupiny je příliš krátký", "group-already-exists": "Skupina už exstuje", "group-name-change-not-allowed": "Změna názvu skupiny není povolena", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Neplatný soubor", "uploads-are-disabled": "Nahrávání je zakázáno", - "upload-error": "Chyba při nahrávání : %1", "signature-too-long": "Pardon, ale váš podpis nemůže být delší, než-li %1 znaků.", "cant-chat-with-yourself": "Nemůžete chatovat sami se sebou!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Chyba při registraci", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/cs/groups.json b/public/language/cs/groups.json index 95d083451f..06b86790ae 100644 --- a/public/language/cs/groups.json +++ b/public/language/cs/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Členové této skupiny dosud neodeslali ani jeden příspěvek.", "details.latest_posts": "Nejnovější příspěvky", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/cs/login.json b/public/language/cs/login.json index a2bb040e89..3308fbdde6 100644 --- a/public/language/cs/login.json +++ b/public/language/cs/login.json @@ -1,5 +1,7 @@ { - "username": "Uživatelské jméno / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Zapamatovat si mě?", "forgot_password": "Zapomněli jste heslo?", "alternative_logins": "Další způsoby přihlášení", diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index de2aad9422..791c3dc948 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -2,6 +2,7 @@ "title": "Upozornění", "no_notifs": "You have no new notifications", "see_all": "See all Notifications", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Odkaz mimo fórum", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/cs/recent.json b/public/language/cs/recent.json index 9432ffeac8..13e8b2284e 100644 --- a/public/language/cs/recent.json +++ b/public/language/cs/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "There are no recent topics.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/cs/search.json b/public/language/cs/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/cs/search.json +++ b/public/language/cs/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/cs/tags.json b/public/language/cs/tags.json index 55bce276dc..f2003f978a 100644 --- a/public/language/cs/tags.json +++ b/public/language/cs/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Není zde žádné téma s tímto tagem.", "tags": "Tagy", - "enter_tags_here": "Zde vložte tagy. Po každém vložení tagu zmáčkněte enter.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Vložte tagy ...", "no_tags": "Zatím tu není žádný tag." } \ No newline at end of file diff --git a/public/language/de/error.json b/public/language/de/error.json index b2deb8a2d3..a05417d878 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -19,6 +19,8 @@ "email-taken": "Die E-Mail-Adresse ist bereits vergeben", "email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.", "email-not-confirmed-chat": "Der Chat ist deaktiviert bis Du deine E-Mail bestätigt hast", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Benutzername ist zu kurz", "username-too-long": "Der Benutzername ist zu lang", "user-banned": "Der Benutzer ist gesperrt", @@ -33,6 +35,7 @@ "no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.", "category-disabled": "Kategorie ist deaktiviert", "topic-locked": "Thema ist gesperrt", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.", "content-too-short": "Bitte gib einen längeren Beitrag ein. Beiträge sollten mindestens %1 Zeichen enthalten.", "content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht mehr als %1 Zeichen enthalten.", @@ -40,6 +43,8 @@ "title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.", "too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen - bitte warte, bevor du einen neuen Beitrag erstellst", "too-many-posts-newbie": "Als neuer Benutzer kannst du nur alle %1 Sekunden einen Beitrag verfassen, bis du %2 Reputationspunkte hast - Bitte warte etwas, bevor du erneut einen Beitrag verfasst", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Die maximale Dateigröße beträgt %1 kbs - bitte lade eine kleinere Datei hoch", "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten.", "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!", "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1", "invalid-image-extension": "Ungültige Dateinamenerweiterung", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Gruppenname zu kurz", "group-already-exists": "Gruppe existiert bereits", "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Vorschaubilder für Themen sind deaktiviert", "invalid-file": "Datei ungültig", "uploads-are-disabled": "Uploads sind deaktiviert", - "upload-error": "Upload-Fehler: %1", "signature-too-long": "Entschuldigung, deine Signatur darf maximal %1 Zeichen enthalten.", "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!", "chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden", "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.", "registration-error": "Registrierungsfehler", - "parse-error": "Ein Fehler ist beim Parsen der Server-Antwort aufgetreten" + "parse-error": "Ein Fehler ist beim Parsen der Server-Antwort aufgetreten", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/de/groups.json b/public/language/de/groups.json index 92b805dd6a..3f81c9bfea 100644 --- a/public/language/de/groups.json +++ b/public/language/de/groups.json @@ -4,6 +4,8 @@ "owner": "Gruppenbesitzer", "new_group": "Neue Gruppe erstellen", "no_groups_found": "Es sind keine Gruppen vorhanden", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop ein Foto, bewege es in Position, dann drücke Speichern", "cover-change": "Ändern", "cover-save": "Speichern", @@ -13,11 +15,20 @@ "details.pending": "Ausstehende Mitglieder", "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.", "details.latest_posts": "Aktuelle Beiträge", - "details.private": "Private Gruppe", - "details.public": "Öffentliche Gruppe", + "details.private": "Private", "details.grant": "Gewähre/Widerrufe Besitz", "details.kick": "Kick", "details.owner_options": "Gruppenadministration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Gruppendetails wurden aktualisiert", "event.deleted": "Die Gruppe \"% 1\" wurde gelöscht" } \ No newline at end of file diff --git a/public/language/de/login.json b/public/language/de/login.json index 099b5a48c4..4099772d0d 100644 --- a/public/language/de/login.json +++ b/public/language/de/login.json @@ -1,5 +1,7 @@ { - "username": "Nutzername / E-Mail Adresse", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Eingeloggt bleiben?", "forgot_password": "Passwort vergessen?", "alternative_logins": "Login Alternativen", diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 5a8981943d..f032f7151e 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -2,6 +2,7 @@ "title": "Benachrichtigungen", "no_notifs": "Du hast keine neuen Benachrichtigungen", "see_all": "Alle Benachrichtigungen ansehen", + "mark_all_read": "Mark all notifications read", "back_to_home": "Zurück zu %1", "outgoing_link": "Externer Link", "outgoing_link_message": "Du verlässt nun %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 folgt dir jetzt.", "email-confirmed": "E-Mail bestätigt", "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.", - "email-confirm-error": "Es ist ein Fehler aufgetreten ...", "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.", "email-confirm-sent": "Bestätigungs-E-Mail gesendet." } \ No newline at end of file diff --git a/public/language/de/recent.json b/public/language/de/recent.json index 7242d231da..3fb6fc7ea7 100644 --- a/public/language/de/recent.json +++ b/public/language/de/recent.json @@ -6,6 +6,7 @@ "year": "Jahr", "alltime": "Gesamter Zeitraum", "no_recent_topics": "Es gibt keine aktuellen Themen.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Es gibt ein neues Thema.", "there-is-a-new-topic-and-a-new-post": "Es gibt ein neues Thema und einen neuen Beitrag.", "there-is-a-new-topic-and-new-posts": "Es gibt ein neues Thema und %1 neue Beiträge.", diff --git a/public/language/de/search.json b/public/language/de/search.json index d817f2aa7f..29a51edbe3 100644 --- a/public/language/de/search.json +++ b/public/language/de/search.json @@ -31,5 +31,10 @@ "username": "Benutzername", "category": "Kategorie", "descending": "In absteigender Reihenfolge", - "ascending": "In aufsteigender Reihenfolge" + "ascending": "In aufsteigender Reihenfolge", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/de/tags.json b/public/language/de/tags.json index 13a2b4b0d0..7e7e548c8f 100644 --- a/public/language/de/tags.json +++ b/public/language/de/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Es gibt keine Themen mit diesem Tag.", "tags": "Tags", - "enter_tags_here": "Gib hier Tags ein und drück die Eingabetaste nach jedem Tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Gib Tags ein...", "no_tags": "Es gibt bisher keine Tags." } \ No newline at end of file diff --git a/public/language/el/error.json b/public/language/el/error.json index 9cadac2731..26ca6539ba 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -19,6 +19,8 @@ "email-taken": "Το email είναι πιασμένο", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Το όνομα χρήστη είναι πολύ μικρό", "username-too-long": "Το όνομα χρήστη είναι πολύ μεγάλο", "user-banned": "Ο Χρήστης είναι αποκλεισμένος/η", @@ -33,6 +35,7 @@ "no-emailers-configured": "Δεν έχουν φορτωθεί email plugins, οποτε το δοκιμαστικό email δεν μπορεί να σταλθεί", "category-disabled": "Η κατηγορία έχει απενεργοποιηθεί", "topic-locked": "Το θέμα έχει κλειδωθεί", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Παρακαλώ περίμενε να τελειώσει το ανέβασμα των αρχείων.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Παρακαλώ γράψε έναν μικρότερο τίτλο. Δεν μπορεί να είναι μεγαλύτερος από %1 χαρακτήρες.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Δεν μπορείς να ψηφίσεις την δημοσίευσή σου", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Το όνομα της ομάδας είναι πολύ μικρό", "group-already-exists": "Το όνομα της ομάδας υπάρχει ήδη", "group-name-change-not-allowed": "Αλλαγή του ονόματος της ομάδας δεν επιτρέπεται", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Οι εικόνες θεμάτων είναι απενεργοποιημένες", "invalid-file": "Άκυρο Αρχείο", "uploads-are-disabled": "Το ανέβασμα αρχείων έχει απενεργοποιηθεί", - "upload-error": "Λάθος ανεβάσματος αρχείου: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Δεν μπορείς να συνομιλήσεις με τον εαυτό σου!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "Το NodeBB συνάντησε ένα πρόβλημα καθώς γινόταν η ανανέωση: \"%1\". Το NodeBB θα συνεχίσει να προσφέρει τα στοιχεία του χρήστη, αν και θα ήταν καλή ιδέα να επαναφέρεις ότι έκανες πριν την ανανέωση.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/el/groups.json b/public/language/el/groups.json index 9ad8583476..305920e189 100644 --- a/public/language/el/groups.json +++ b/public/language/el/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Τα μέλη αυτής της ομάδας δεν έχουν δημοσιεύσει τίποτα.", "details.latest_posts": "Τελευταίες δημοσιεύσεις.", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/el/login.json b/public/language/el/login.json index e8ba8157d5..6c10fb3de8 100644 --- a/public/language/el/login.json +++ b/public/language/el/login.json @@ -1,5 +1,7 @@ { - "username": "Όνομα χρήστη / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Απομνημόνευση;", "forgot_password": "Ξέχασες τον κωδικό σου;", "alternative_logins": "Εναλλακτικά Login", diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json index d59bf490c6..68fe73ee7f 100644 --- a/public/language/el/notifications.json +++ b/public/language/el/notifications.json @@ -2,6 +2,7 @@ "title": "Ειδοποιήσεις", "no_notifs": "Δεν έχεις νέες ειδοποιήσεις;", "see_all": "Προβολή όλων των ειδοποιήσεων", + "mark_all_read": "Mark all notifications read", "back_to_home": "Πίσω στο %1", "outgoing_link": "Εξερχόμενος Σύνδεσμος", "outgoing_link_message": "Τώρα φεύγεις από το %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "Ο/Η %1 σε ακολουθεί.", "email-confirmed": "Το Εmail Επιβεβαιώθηκε", "email-confirmed-message": "Ευχαριστούμε που επιβεβαίωσες το email σου. Ο λογαριασμός σου είναι πλέον πλήρως ενεργοποιημένος.", - "email-confirm-error": "Συνέβη κάποιο σφάλμα...", "email-confirm-error-message": "Υπήρξε κάποιο πρόβλημα με την επιβεβαίωση της διεύθυνσής email σου. Ίσως ο κώδικας να είναι άκυρος ή να έχει λήξει.", "email-confirm-sent": "Στάλθηκε email επιβεβαίωσης." } \ No newline at end of file diff --git a/public/language/el/recent.json b/public/language/el/recent.json index d5ca1ec34f..8424eb4616 100644 --- a/public/language/el/recent.json +++ b/public/language/el/recent.json @@ -6,6 +6,7 @@ "year": "Έτος", "alltime": "Όλο το Ιστορικό", "no_recent_topics": "Δεν υπάρχουν πρόσφατα θέματα.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/el/search.json b/public/language/el/search.json index eb08d6b538..11b0b90621 100644 --- a/public/language/el/search.json +++ b/public/language/el/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/el/tags.json b/public/language/el/tags.json index 0447ae05b3..4264ed78aa 100644 --- a/public/language/el/tags.json +++ b/public/language/el/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Δεν υπάρχουν θέματα με αυτή την ετικέτα.", "tags": "Ετικέτες", - "enter_tags_here": "Εισαγωγή ετικετών εδώ. Πάτα enter μετά από κάθε ετικέτα.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Εισαγωγή ετικετών...", "no_tags": "Δεν υπάρχουν ακόμα ετικέτες." } \ No newline at end of file diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json index 9bbcf03247..e0700f76c4 100644 --- a/public/language/en@pirate/error.json +++ b/public/language/en@pirate/error.json @@ -19,6 +19,8 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/en@pirate/groups.json b/public/language/en@pirate/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/en@pirate/groups.json +++ b/public/language/en@pirate/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/en@pirate/login.json b/public/language/en@pirate/login.json index 70876d7617..6e7b7a36c0 100644 --- a/public/language/en@pirate/login.json +++ b/public/language/en@pirate/login.json @@ -1,5 +1,7 @@ { - "username": "Yer handle or email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Remember Me?", "forgot_password": "My mind be a scatt'rbrain, help a matey out!", "alternative_logins": "Oth'r gangplanks", diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json index 67e29239a7..3eb4fba74d 100644 --- a/public/language/en@pirate/notifications.json +++ b/public/language/en@pirate/notifications.json @@ -2,6 +2,7 @@ "title": "Notifications", "no_notifs": "You have no new notifications", "see_all": "Spy wit' ye eye all ye notifications", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Go offshore", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/en@pirate/recent.json b/public/language/en@pirate/recent.json index 065b6dc6a5..791760308e 100644 --- a/public/language/en@pirate/recent.json +++ b/public/language/en@pirate/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "There be no recent topics.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/en@pirate/search.json b/public/language/en@pirate/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/en@pirate/search.json +++ b/public/language/en@pirate/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/en@pirate/tags.json b/public/language/en@pirate/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/en@pirate/tags.json +++ b/public/language/en@pirate/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json index 9bbcf03247..e0700f76c4 100644 --- a/public/language/en_US/error.json +++ b/public/language/en_US/error.json @@ -19,6 +19,8 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/en_US/groups.json b/public/language/en_US/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/en_US/groups.json +++ b/public/language/en_US/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/en_US/login.json b/public/language/en_US/login.json index 5ec7affa9a..70b7b98dd5 100644 --- a/public/language/en_US/login.json +++ b/public/language/en_US/login.json @@ -1,5 +1,7 @@ { - "username": "Username / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Remember Me?", "forgot_password": "Forgot Password?", "alternative_logins": "Alternative Logins", diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json index 1cf64627a4..32ddb12eb7 100644 --- a/public/language/en_US/notifications.json +++ b/public/language/en_US/notifications.json @@ -2,6 +2,7 @@ "title": "Notifications", "no_notifs": "You have no new notifications", "see_all": "See all Notifications", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Outgoing Link", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/en_US/recent.json b/public/language/en_US/recent.json index 5e105ace78..f638d2f8ac 100644 --- a/public/language/en_US/recent.json +++ b/public/language/en_US/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "There are no recent topics.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/en_US/search.json b/public/language/en_US/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/en_US/search.json +++ b/public/language/en_US/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/en_US/tags.json b/public/language/en_US/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/en_US/tags.json +++ b/public/language/en_US/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/es/error.json b/public/language/es/error.json index 7a79b28ba4..1fd31a5b00 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -19,6 +19,8 @@ "email-taken": "Correo electrónico ocupado", "email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.", "email-not-confirmed-chat": "No puedes hacer uso del chat hasta que confirmes tu email", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nombre de usuario es demasiado corto", "username-too-long": "Nombre de usuario demasiado largo", "user-banned": "Usuario baneado", @@ -33,6 +35,7 @@ "no-emailers-configured": "No se ha cargado ningún plugin de email, así que no se pudo enviar el email de prueba.", "category-disabled": "Categoría deshabilitada", "topic-locked": "Tema bloqueado", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Por favor, espera a que terminen las subidas.", "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caracteres.", "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caracteres.", @@ -40,6 +43,8 @@ "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.", "too-many-posts": "Solo puedes publicar una vez cada %1 segundos - por favor espere antes de volver a publicar", "too-many-posts-newbie": "Como nuevo usuario, solo puedes publicar una vez cada %1 segundos hasta hayas ganado una reputación de %2 - por favor espere antes de volver a publicar", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "El tamaño de fichero máximo es de %1 kbs - por favor, suba un fichero más pequeño", "cant-vote-self-post": "No puedes votar tus propios posts", "already-favourited": "Ya ha marcado esta publicación como favorita", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!", "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1", "invalid-image-extension": "Extensión de imagen inválida", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nombre del grupo es demasiado corto.", "group-already-exists": "El grupo ya existe.", "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Las miniaturas de los temas están deshabilitadas.", "invalid-file": "Archivo no válido", "uploads-are-disabled": "Las subidas están deshabilitadas.", - "upload-error": "Error de subida: %1", "signature-too-long": "Lo sentimos, pero tu firma no puede ser más larga de %1 caracteres.", "cant-chat-with-yourself": "¡No puedes conversar contigo mismo!", "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirte antes de que pueda charlar con ellos", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "No tiene suficiente reputación para poner reportar esta publicación", "reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.", "registration-error": "Error de registro", - "parse-error": "Algo ha ido mal mientras se parseaba la respuesta del servidor" + "parse-error": "Algo ha ido mal mientras se parseaba la respuesta del servidor", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/es/groups.json b/public/language/es/groups.json index 999550b671..112cce2994 100644 --- a/public/language/es/groups.json +++ b/public/language/es/groups.json @@ -4,6 +4,8 @@ "owner": "Propietario del Grupo", "new_group": "Crear Nuevo Grupo", "no_groups_found": "No hay grupos que ver", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Arrastra y suelta una foto, arrastra a la posición, y pulsa Guardar ", "cover-change": "Cambiar", "cover-save": "Guardar", @@ -13,11 +15,20 @@ "details.pending": "Miembros Pendientes", "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.", "details.latest_posts": "Últimas Publicaciones", - "details.private": "Grupo Privado", - "details.public": "Grupo Público", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Administración De Grupo", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Los detalles del grupo han sido actualizados", "event.deleted": "El grupo \"%1\" ha sido eliminado" } \ No newline at end of file diff --git a/public/language/es/login.json b/public/language/es/login.json index abf84d1921..e30f15dff4 100644 --- a/public/language/es/login.json +++ b/public/language/es/login.json @@ -1,5 +1,7 @@ { - "username": "Usuario / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "¿Recordarme?", "forgot_password": "¿Olvidaste tu contraseña?", "alternative_logins": "Métodos alternativos", diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 36cc975006..630e9376fe 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -2,6 +2,7 @@ "title": "Notificaciones", "no_notifs": "No tiene nuevas notificaciones", "see_all": "Ver todas las notificaciones", + "mark_all_read": "Mark all notifications read", "back_to_home": "Volver a %1", "outgoing_link": "Enlace externo", "outgoing_link_message": "Ahora estás saliendo de %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 comenzó a seguirte.", "email-confirmed": "Correo electrónico confirmado", "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.", - "email-confirm-error": "Ha ocurrido un error...", "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró...", "email-confirm-sent": "Correo de confirmación enviado." } \ No newline at end of file diff --git a/public/language/es/recent.json b/public/language/es/recent.json index ea473a2b51..1ff9669e51 100644 --- a/public/language/es/recent.json +++ b/public/language/es/recent.json @@ -6,6 +6,7 @@ "year": "Año", "alltime": "Siempre", "no_recent_topics": "No hay publicaciones recientes.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Hay una nueva publicación.", "there-is-a-new-topic-and-a-new-post": "hay una nueva publicación y un nuevo mensaje.", "there-is-a-new-topic-and-new-posts": "Hay una nueva publicación y %1 nuevos mensajes.", diff --git a/public/language/es/search.json b/public/language/es/search.json index e23eea6ba8..2378430561 100644 --- a/public/language/es/search.json +++ b/public/language/es/search.json @@ -31,5 +31,10 @@ "username": "Usuario", "category": "Categoría", "descending": "En orden descendente", - "ascending": "En orden ascendente" + "ascending": "En orden ascendente", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/es/tags.json b/public/language/es/tags.json index 2b41cc48c5..3a86bb7da7 100644 --- a/public/language/es/tags.json +++ b/public/language/es/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "No hay temas con esta etiqueta.", "tags": "Etiquetas", - "enter_tags_here": "Introduce las etiquetas aquí. Pulsa Intro después de introducir cada una.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Introduzca las etiquetas...", "no_tags": "Aún no hay etiquetas." } \ No newline at end of file diff --git a/public/language/et/error.json b/public/language/et/error.json index 277568c591..303197735f 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -19,6 +19,8 @@ "email-taken": "Email on võetud", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Kasutajanimi on liiga lühike", "username-too-long": "Username too long", "user-banned": "Kasutaja bannitud", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategooria keelatud", "topic-locked": "Teema lukustatud", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Palun oota, kuni üleslaadimised on laetud.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Palun sisesta lühem pealkiri. Pealkirjad ei saa olla pikemad kui %1 tähemärki.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Sa ei saa hääletada enda postituse poolt", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Grupi nimi liiga lühike", "group-already-exists": "Grupp juba eksisteerib", "group-name-change-not-allowed": "Grupi nimevahetus ei ole lubatud", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Teema thumbnailid on keelatud.", "invalid-file": "Vigane fail", "uploads-are-disabled": "Üleslaadimised on keelatud", - "upload-error": "Üleslaadimise viga: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Sa ei saa endaga vestelda!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/et/groups.json b/public/language/et/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/et/groups.json +++ b/public/language/et/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/et/login.json b/public/language/et/login.json index 0981b34e8c..20bd7e3f0d 100644 --- a/public/language/et/login.json +++ b/public/language/et/login.json @@ -1,5 +1,7 @@ { - "username": "Kasutajanimi / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Mäleta mind?", "forgot_password": "Unustasid parooli?", "alternative_logins": "Alternatiivsed sisse logimise võimalused", diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index fad40fc5d7..46718ce1d4 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -2,6 +2,7 @@ "title": "Teated", "no_notifs": "Sul pole uusi teateid", "see_all": "Vaata kõiki teateid", + "mark_all_read": "Mark all notifications read", "back_to_home": "Tagasi %1", "outgoing_link": "Väljaminev link", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Emaili aadress kinnitatud", "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja omn nüüd täielikult aktiveeritud.", - "email-confirm-error": "Süsteemis tekkis viga...", "email-confirm-error-message": "Emaili aadressi kinnitamisel tekkis viga. Võibolla kinnituskood oli vale või aegunud.", "email-confirm-sent": "Kinnituskiri on saadetud." } \ No newline at end of file diff --git a/public/language/et/recent.json b/public/language/et/recent.json index 4c35d7484b..272a2b9131 100644 --- a/public/language/et/recent.json +++ b/public/language/et/recent.json @@ -6,6 +6,7 @@ "year": "Aasta", "alltime": "Kogu aja vältel", "no_recent_topics": "Hetkel ei ole hiljutisi teemasid.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/et/search.json b/public/language/et/search.json index 448f45b055..661cebbacd 100644 --- a/public/language/et/search.json +++ b/public/language/et/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/et/tags.json b/public/language/et/tags.json index 4464ed5090..5f63e2b3e7 100644 --- a/public/language/et/tags.json +++ b/public/language/et/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Teemasid, mis sisaldaksid seda märksõna, ei eksisteeri.", "tags": "Märksõnad", - "enter_tags_here": "Sisesta märksõnad siia. Iga märksõna tagant sisesta enterit.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Sisesta märksõnu...", "no_tags": "Siin ei ole veel ühtegi märksõna." } \ No newline at end of file diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index e99118134c..40ce45c9e0 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -19,6 +19,8 @@ "email-taken": "این رایانامه گرفته شده است.", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "نام کاربری خیلی کوتاه است.", "username-too-long": "Username too long", "user-banned": "کاربر محروم شد.", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "دسته غیر‌فعال شد.", "topic-locked": "جستار بسته شد.", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "خواهشمندیم عنوان کوتاه‌تری بنویسید. عنوان‌ها نمی‌توانند بیش‌تر از %1 نویسه داشته باشند.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "شما نمی‌توانید به دیدگاه خود رای بدهید.", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "نام گروه خیلی کوتاه است.", "group-already-exists": "این گروه از پیش وجود دارد.", "group-name-change-not-allowed": "تغیر نام گروه نیاز به دسترسی دارد.", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "چهرک‌های جستار غیرفعال شده است.", "invalid-file": "فایل نامعتبر است.", "uploads-are-disabled": "امکان بارگذاری غیرفعال شده است.", - "upload-error": "خطای بارگذاری: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "شما نمی‌توانید با خودتان گفتگو کنید!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/fa_IR/groups.json b/public/language/fa_IR/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/fa_IR/groups.json +++ b/public/language/fa_IR/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/fa_IR/login.json b/public/language/fa_IR/login.json index 87936c3112..07012aad28 100644 --- a/public/language/fa_IR/login.json +++ b/public/language/fa_IR/login.json @@ -1,5 +1,7 @@ { - "username": "نام کاربری / رایانامه", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "مرا به یاد بسپار؟", "forgot_password": "گذرواژه را فراموش کرده‌اید؟", "alternative_logins": "روش‌های درون آمدن جایگزین", diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json index fe0a2aa45d..e56553bba6 100644 --- a/public/language/fa_IR/notifications.json +++ b/public/language/fa_IR/notifications.json @@ -2,6 +2,7 @@ "title": "آگاه‌سازی‌ها", "no_notifs": "هیچ آگاه‌سازی تازه‌ای ندارید", "see_all": "دیدن همهٔ آگاه‌سازی‌ها", + "mark_all_read": "Mark all notifications read", "back_to_home": "بازگشت به %1", "outgoing_link": "پیوند برون‌رو", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "رایانامه تایید شد", "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.", - "email-confirm-error": "خطایی پیش آمده است...", "email-confirm-error-message": "خطایی در تایید آدرس ایمیل شما پیش آمده است. ممکن است کد نا‌معتبر و یا منقضی شده باشد.", "email-confirm-sent": "ایمیل تایید ارسال شد." } \ No newline at end of file diff --git a/public/language/fa_IR/recent.json b/public/language/fa_IR/recent.json index 19fff6a7a7..2a9060fad9 100644 --- a/public/language/fa_IR/recent.json +++ b/public/language/fa_IR/recent.json @@ -6,6 +6,7 @@ "year": "سال", "alltime": "All Time", "no_recent_topics": "There are no recent topics.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/fa_IR/search.json b/public/language/fa_IR/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/fa_IR/search.json +++ b/public/language/fa_IR/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/fa_IR/tags.json b/public/language/fa_IR/tags.json index 78c658e958..82e477f4cc 100644 --- a/public/language/fa_IR/tags.json +++ b/public/language/fa_IR/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "جُستاری با این برچسب وجود ندارد.", "tags": "برچسب‌ها", - "enter_tags_here": "برچسب‌ها را اینجا وارد کنید. بعد از هر برچسب، اینتر بزنید.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "هنوز برچسبی وجود ندارد." } \ No newline at end of file diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 94256906f1..9ca0ec4973 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -19,6 +19,8 @@ "email-taken": "Sähköpostiosoite varattu", "email-not-confirmed": "Sähköpostiasi ei ole vielä vahvistettu, ole hyvä ja napsauta tätä vahvistaaksesi sen.", "email-not-confirmed-chat": "Et voi käyttää chattia ennen kuin sähköpostisi on vahvistettu", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Käyttäjänimi on liian lyhyt", "username-too-long": "Käyttäjänimi on liian pitkä", "user-banned": "Käyttäjä on estetty", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategoria ei ole käytössä", "topic-locked": "Aihe lukittu", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Ole hyvä ja odota tiedostojen lähettämisen valmistumista.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Otsikkosi on liian pitkä. Otsikoiden pituuden tulee olla enintään %1 merkkiä.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Suurin sallittu tiedostokoko on %1 kbs - ole hyvä ja lataa pienempi tiedosto", "cant-vote-self-post": "Et voi antaa ääntä omalle viestillesi", "already-favourited": "Tämä viesti on jo suosikeissasi", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Ryhmän nimi on liian lyhyt", "group-already-exists": "Ryhmä on jo olemassa", "group-name-change-not-allowed": "Et voi vaihtaa ryhmän nimeä", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Aiheiden kuvakkeet eivät ole käytössä", "invalid-file": "Virheellinen tiedosto", "uploads-are-disabled": "Et voi lähettää tiedostoa", - "upload-error": "Lähetysvirhe: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/fi/groups.json b/public/language/fi/groups.json index 19a0f89137..c8538e2c28 100644 --- a/public/language/fi/groups.json +++ b/public/language/fi/groups.json @@ -4,6 +4,8 @@ "owner": "Ryhmän omistaja", "new_group": "Luo uusi ryhmä", "no_groups_found": "Ei ryhmiä", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Vedä ja pudota kuva, raahaa oikeaan kohtaan ja paina Tallenna", "cover-change": "Change", "cover-save": "Tallenna", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Uusimmat viestit", - "details.private": "Yksityinen ryhmä", - "details.public": "Julkinen ryhmä", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Potkaise", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/fi/login.json b/public/language/fi/login.json index 6f6285b001..3dc14792ee 100644 --- a/public/language/fi/login.json +++ b/public/language/fi/login.json @@ -1,5 +1,7 @@ { - "username": "Käyttäjätunnus tai sähköpostiosoite", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Muista minut?", "forgot_password": "Unohditko salasanasi?", "alternative_logins": "Vaihtoehtoiset kirjautumistavat", diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index dfc7bf5905..2b45a426b6 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -2,6 +2,7 @@ "title": "Ilmoitukset", "no_notifs": "Sinulla ei ole uusia ilmoituksia", "see_all": "Katso kaikki ilmoitukset", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Ulkopuolinen linkki", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 alkoi seurata sinua.", "email-confirmed": "Sähköpostiosoite vahvistettu", "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.", - "email-confirm-error": "Tapahtui virhe...", "email-confirm-error-message": "Ongelma sähköpostiosoitteen vahvistamisessa. Ehkäpä koodi oli virheellinen tai vanhentunut.", "email-confirm-sent": "Vahvistussähköposti lähetetty." } \ No newline at end of file diff --git a/public/language/fi/recent.json b/public/language/fi/recent.json index 54444a7cbe..aed5a7a0fd 100644 --- a/public/language/fi/recent.json +++ b/public/language/fi/recent.json @@ -6,6 +6,7 @@ "year": "Vuosi", "alltime": "Alusta lähtien", "no_recent_topics": "Ei viimeisimpiä aiheita.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Uusi aihe.", "there-is-a-new-topic-and-a-new-post": "Uusi aihe ja uusi viesti.", "there-is-a-new-topic-and-new-posts": "Uusi aihe ja %1 uutta viestiä.", diff --git a/public/language/fi/search.json b/public/language/fi/search.json index e4f3ea8b7f..df7f7a2352 100644 --- a/public/language/fi/search.json +++ b/public/language/fi/search.json @@ -31,5 +31,10 @@ "username": "Käyttäjänimi", "category": "Kategoria", "descending": "Laskevassa järjestyksessä", - "ascending": "Nousevassa järjestyksessä" + "ascending": "Nousevassa järjestyksessä", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/fi/tags.json b/public/language/fi/tags.json index 12e3365d50..3d1cf1271b 100644 --- a/public/language/fi/tags.json +++ b/public/language/fi/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Ei viimeisimpiä aiheita tällä tagilla.", "tags": "Tagit", - "enter_tags_here": "Syötä tagit tähän. Paina enter kunkin tagin jälkeen.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Syötä tagit...", "no_tags": "Ei vielä yhtään tagia." } \ No newline at end of file diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 3ceda0c847..f6354486ff 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -19,6 +19,8 @@ "email-taken": "Email déjà utilisé", "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.", "email-not-confirmed-chat": "Vous ne pouver discuter tant que votre email n'est pas confirmé", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nom d'utilisateur trop court", "username-too-long": "Nom d'utilisateur trop long", "user-banned": "Utilisateur banni", @@ -33,6 +35,7 @@ "no-emailers-configured": "Un email de test n'a pas pu être envoyé car aucun plugin de gestion des emails n'était chargé", "category-disabled": "Catégorie désactivée", "topic-locked": "Sujet verrouillé", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Veuillez patienter pendant le téléchargement.", "content-too-short": "Veuillez entrer un message plus long. %1 caractères minimum.", "content-too-long": "Veuillez poster un message plus cours. Les messages ne peuvent être plus long que %1 caractères.", @@ -40,6 +43,8 @@ "title-too-long": "Veuillez entrer un titre plus court. Les titres ne peuvent excéder %1 caractères.", "too-many-posts": "Vous ne pouvez poster que toutes les %1 secondes.", "too-many-posts-newbie": "En tant que nouvel utilisateur, vous ne pouvez poster que toutes les %1 secondes jusqu'à ce que vous obteniez une réputation de %2 - patientez avant de publier de nouveau. ", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "La taille maximum des fichiers est de %1 kbs.", "cant-vote-self-post": "Vous ne pouvez pas voter pour vos propres messages", "already-favourited": "Vous avez déjà mis ce message en favoris", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !", "invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1", "invalid-image-extension": "Extension d'image invalide", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nom de groupe trop court", "group-already-exists": "Ce groupe existe déjà", "group-name-change-not-allowed": "Modification du nom de groupe non permise", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Les miniatures de sujet sont désactivés", "invalid-file": "Fichier invalide", "uploads-are-disabled": "Les envois sont désactivés", - "upload-error": "Erreur d'envoi : %1", "signature-too-long": "La signature ne peut dépasser %1 caractères !", "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !", "chat-restricted": "Cet utilisateur a restreint les ses messages de chat. Il doit d'abord vous suivre avant de pouvoir discuter avec lui.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Vous n'avez pas une réputation assez élevée pour signaler ce message", "reload-failed": "NodeBB a rencontré un problème lors du rechargement : \"% 1\" . NodeBB continuera de fonctionner côté client, même si vous devez annuler ce que vous avez fait juste avant de recharger .", "registration-error": "Erreur d'enregistrement", - "parse-error": "Une erreur est survenue en analysant la réponse du serveur" + "parse-error": "Une erreur est survenue en analysant la réponse du serveur", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json index 39a9efcff2..03b25aebc8 100644 --- a/public/language/fr/groups.json +++ b/public/language/fr/groups.json @@ -4,6 +4,8 @@ "owner": "Propriétaire du groupe", "new_group": "Créer un nouveau groupe", "no_groups_found": "Il n'y a aucun groupe", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Glissez-déposez une image, ajustez la position, et cliquez sur Enregistrer", "cover-change": "Modifier", "cover-save": "Enregistrer", @@ -13,11 +15,20 @@ "details.pending": "Membres en attente", "details.has_no_posts": "Les membres de ce groupe n'ont envoyé aucun message.", "details.latest_posts": "Derniers messages", - "details.private": "Groupe privé", - "details.public": "Groupe public", + "details.private": "Private", "details.grant": "Promouvoir/rétrograder comme propriétaire", "details.kick": "Exclure", "details.owner_options": "Administration du groupe", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Les détails du groupe ont été mis à jour", "event.deleted": "Le groupe é%1\" a été supprimé" } \ No newline at end of file diff --git a/public/language/fr/login.json b/public/language/fr/login.json index 39978db58b..b34dda64b5 100644 --- a/public/language/fr/login.json +++ b/public/language/fr/login.json @@ -1,5 +1,7 @@ { - "username": "Nom d'utilisateur / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Se souvenir de moi ?", "forgot_password": "Mot de passe oublié ?", "alternative_logins": "Autres méthodes de connexion", diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index 597388efdb..139b0a30da 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -2,6 +2,7 @@ "title": "Notifications", "no_notifs": "Vous n'avez aucune notification", "see_all": "Voir toutes les notifications.", + "mark_all_read": "Mark all notifications read", "back_to_home": "Revenir à %1", "outgoing_link": "Lien sortant", "outgoing_link_message": "Vous quittez %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 vous suit.", "email-confirmed": "Email vérifié", "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.", - "email-confirm-error": "Un erreur est survenue ...", "email-confirm-error-message": "Il y a un un problème dans la vérification de votre adresse email. Le code est peut être invalide ou a expiré.", "email-confirm-sent": "Email de vérification envoyé." } \ No newline at end of file diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json index d2ee95b1b6..bd3b216df0 100644 --- a/public/language/fr/recent.json +++ b/public/language/fr/recent.json @@ -6,6 +6,7 @@ "year": "An", "alltime": "Toujours", "no_recent_topics": "Il n'y a aucun sujet récent.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Il y a un nouveau sujet.", "there-is-a-new-topic-and-a-new-post": "Il y a un nouveau sujet et un nouveau message.", "there-is-a-new-topic-and-new-posts": "Il y a un nouveau sujet et %1 nouveaux messages.", diff --git a/public/language/fr/search.json b/public/language/fr/search.json index 01574ac59b..cd5f207136 100644 --- a/public/language/fr/search.json +++ b/public/language/fr/search.json @@ -31,5 +31,10 @@ "username": "Nom d'utilisateur", "category": "Catégorie", "descending": "Par ordre décroissant", - "ascending": "Par ordre croissant" + "ascending": "Par ordre croissant", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/fr/tags.json b/public/language/fr/tags.json index 91a1f0aaa4..8c533e76ca 100644 --- a/public/language/fr/tags.json +++ b/public/language/fr/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé", "tags": "Mots-clés", - "enter_tags_here": "Entrez les mots-clés ici. Appuyez sur entrer après chaque mot-clé.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Entrez des mots-clés...", "no_tags": "Il n'y a pas encore de mots-clés." } \ No newline at end of file diff --git a/public/language/he/error.json b/public/language/he/error.json index 23d21ee1ae..d6f29ea755 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -19,6 +19,8 @@ "email-taken": "כתובת אימייל תפוסה", "email-not-confirmed": "כתובת המייל שלך עוד לא אושרה, לחץ כאן על-מנת לאשר את המייל שלך.", "email-not-confirmed-chat": "לא תוכל לדבר בצ'אט עד שלא תאשר את כתובת המייל שלך", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "שם משתמש קצר מדי", "username-too-long": "שם משתמש ארוך מדי", "user-banned": "המשתמש חסום", @@ -33,6 +35,7 @@ "no-emailers-configured": "לא נמצאו פלאגינים למייל, לכן אין אפשרות לשלוח מייל ניסיון.", "category-disabled": "קטגוריה לא פעילה", "topic-locked": "נושא נעול", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "אנא המתן לסיום ההעלאות", "content-too-short": "יש להכניס פוסט ארוך יותר. פוסטים חייבים להכיל לפחות %1 תווים.", "content-too-long": "יש לקצר את הפוסט. פוסטים אינם יכולים להיות ארוכים מ %1 תווים.", @@ -40,6 +43,8 @@ "title-too-long": "יש לקצר את הכותרת. כותרות אינן יכולות להיות ארוכות מ %1 תווים.", "too-many-posts": "אתה יכול להעלות פוסט כל %1 שניות בלבד - אנא המתן.", "too-many-posts-newbie": "כמשתמש חדש, אתה יכול להעלות פוסט כל %1 שניות עד שצברת %2 מוניטין - אנא המתן.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "גודל קובץ מקסימלי הינו %1 קילובייט - אנא העלה קובץ קטן יותר.", "cant-vote-self-post": "לא ניתן להצביע לפוסט שלך", "already-favourited": "כבר הוספת פוסט זה למועדפים", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!", "invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1", "invalid-image-extension": "פורמט תמונה לא תקין", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "שם הקבוצה קצר מדי", "group-already-exists": "הקבוצה כבר קיימת", "group-name-change-not-allowed": "לא ניתן לשנות את שם הקבוצה", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "תמונות ממוזערות לנושא אינן מאופשרות.", "invalid-file": "קובץ לא תקין", "uploads-are-disabled": "העלאת קבצים אינה מאופשרת", - "upload-error": "שגיאה בהעלאה : %1", "signature-too-long": "מצטערים, אורך החתימה המקסימלי הוא %1 תווים.", "cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!", "chat-restricted": "משתמש זה חסם את הודעות הצ'אט שלו ממשתמשים זרים. המשתמש חייב לעקוב אחריך לפני שתוכל לשוחח איתו בצ'אט", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "אין לך מוניטין מספק על מנת לסמן את הפוסט הזה", "reload-failed": "אירעה תקלה ב NodeBB בזמן הטעינה של: \"%1\". המערכת תמשיך להגיש דפים קיימים, אבל כדאי שתשחזר את הפעולות שלך מהפעם האחרונה שהמערכת עבדה כראוי.", "registration-error": "שגיאה בהרשמה", - "parse-error": "אירעה שגיאה בעת בעת ניתוח תגובת השרת" + "parse-error": "אירעה שגיאה בעת בעת ניתוח תגובת השרת", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/he/groups.json b/public/language/he/groups.json index 6754a5611c..a6bcffab82 100644 --- a/public/language/he/groups.json +++ b/public/language/he/groups.json @@ -4,6 +4,8 @@ "owner": "מנהל הקבוצה", "new_group": "צור קבוצה חדשה", "no_groups_found": "אין קבוצות לצפייה", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "גרור תמונה, הזז למיקום הרצוי ואז לחץ על שמור", "cover-change": "שנה", "cover-save": "שמור", @@ -13,11 +15,20 @@ "details.pending": "חברי קבוצה הממתינים לאישור", "details.has_no_posts": "חברי הקבוצה הזו לא העלו אף פוסט.", "details.latest_posts": "פוסטים אחרונים", - "details.private": "קבוצה פרטית", - "details.public": "קבוצה פומבית", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "ניהול הקבוצה", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "פרטי הקבוצה עודכנו", "event.deleted": "קבוצת \"%1\" נמחקה" } \ No newline at end of file diff --git a/public/language/he/login.json b/public/language/he/login.json index 181cd62240..0a21aa92ba 100644 --- a/public/language/he/login.json +++ b/public/language/he/login.json @@ -1,5 +1,7 @@ { - "username": "שם משתמש / אימייל", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "זכור אותי?", "forgot_password": "שכחת סיסמתך?", "alternative_logins": "התחבר באמצעות...", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 515b890810..215356f8e4 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -2,6 +2,7 @@ "title": "התראות", "no_notifs": "אין התראות", "see_all": "צפה בכל ההתראות", + "mark_all_read": "Mark all notifications read", "back_to_home": "חזרה ל%1", "outgoing_link": "לינק", "outgoing_link_message": "אתה כעת עוזב את %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 התחיל לעקוב אחריך.", "email-confirmed": "כתובת המייל אושרה", "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.", - "email-confirm-error": "אירעה שגיאה...", "email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.", "email-confirm-sent": "מייל אישור נשלח." } \ No newline at end of file diff --git a/public/language/he/recent.json b/public/language/he/recent.json index 44960c78f7..7d4d3bf1a9 100644 --- a/public/language/he/recent.json +++ b/public/language/he/recent.json @@ -6,6 +6,7 @@ "year": "שנה", "alltime": "כל הזמן", "no_recent_topics": "אין נושאים חדשים", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "יש נושא חדש.", "there-is-a-new-topic-and-a-new-post": "יש נושא ופוסט חדש.", "there-is-a-new-topic-and-new-posts": "יש נושא ו%1 פוסטים חדשים.", diff --git a/public/language/he/search.json b/public/language/he/search.json index fec789c3be..b9ca111d91 100644 --- a/public/language/he/search.json +++ b/public/language/he/search.json @@ -31,5 +31,10 @@ "username": "שם משתמש", "category": "קטגוריה", "descending": "בסדר יורד", - "ascending": "בסדר עולה" + "ascending": "בסדר עולה", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/he/tags.json b/public/language/he/tags.json index 13912500cb..54ead310ad 100644 --- a/public/language/he/tags.json +++ b/public/language/he/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "אין פוסטים עם תגית זו.", "tags": "תגיות", - "enter_tags_here": "יש להכניס כאן את התגיות. לחץ אנטר אחרי כל תגית.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "הכנס תגיות", "no_tags": "אין עדיין תגיות." } \ No newline at end of file diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 821145775e..e03041b557 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -19,6 +19,8 @@ "email-taken": "Foglalt e-mail", "email-not-confirmed": "Az e-mail címed még nem lett ellenőrizve, kérlek kattints ide az e-mail címed ellenőrzéséhez!", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Túl rövid felhasználónév", "username-too-long": "Túl hosszú felhasználónév", "user-banned": "Kitiltott felhasználó", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategória kikapcsolva", "topic-locked": "Téma lezárva", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "A csoport név túl rövid", "group-already-exists": "A csoport nem létezik", "group-name-change-not-allowed": "A csoport névváltoztatás nem engedélyezett", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Témakör bélyegképek tíltásra kerültek.", "invalid-file": "Érvénytelen fájl", "uploads-are-disabled": "A feltöltés nem engedélyezett", - "upload-error": "Feltöltés hiba: %1", "signature-too-long": "Sajnáljuk, az aláírás nem lehet hosszabb %1 karakternél.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Regisztrációs hiba", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/hu/groups.json b/public/language/hu/groups.json index 09324055a0..75a7b053d5 100644 --- a/public/language/hu/groups.json +++ b/public/language/hu/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "A csoport felhasználói nem tettek még közzé bejegyzést.", "details.latest_posts": "Legújabb bejegyzések", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/hu/login.json b/public/language/hu/login.json index df6d518f81..14be774171 100644 --- a/public/language/hu/login.json +++ b/public/language/hu/login.json @@ -1,5 +1,7 @@ { - "username": "Felhasználónév / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Megjegyzés", "forgot_password": "Elfelejtett Jelszó?", "alternative_logins": "Alternatív belépés", diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index d6efa73982..f991c637f6 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -2,6 +2,7 @@ "title": "Értesítések", "no_notifs": "Nincs új értesítés", "see_all": "Összes értesítés megtekintése", + "mark_all_read": "Mark all notifications read", "back_to_home": "Vissza - %1", "outgoing_link": "Külső Link", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/hu/recent.json b/public/language/hu/recent.json index f749b684d9..c20cbf3d6f 100644 --- a/public/language/hu/recent.json +++ b/public/language/hu/recent.json @@ -6,6 +6,7 @@ "year": "Év", "alltime": "Minden idők", "no_recent_topics": "Nincs friss topik.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/hu/search.json b/public/language/hu/search.json index 6cae8bb926..5c09b69e77 100644 --- a/public/language/hu/search.json +++ b/public/language/hu/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/hu/tags.json b/public/language/hu/tags.json index d818646831..aa7a02a772 100644 --- a/public/language/hu/tags.json +++ b/public/language/hu/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nem létezik témakör ezzel a címkével.", "tags": "Címkék", - "enter_tags_here": "Adjunk meg címkét majd nyomjuk meg az entert.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Címke megadása...", "no_tags": "Nincs címke." } \ No newline at end of file diff --git a/public/language/id/error.json b/public/language/id/error.json index ce802296e2..d2ceed9a23 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -19,6 +19,8 @@ "email-taken": "Email sudah terdaftar", "email-not-confirmed": "Email kamu belum dikonfirmasi, klik disini untuk mengkonfirmasi email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username terlalu pendek", "username-too-long": "Username terlalu panjang", "user-banned": "Pengguna dibanned", @@ -33,6 +35,7 @@ "no-emailers-configured": "Tidak ada plugin email, jadi test email tidak dapat dikirim", "category-disabled": "Kategori ditiadakan", "topic-locked": "Topik dikunci", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Tunggu proses upload sampai selesai", "content-too-short": "Mohon masukkan posting yang lebih panjang. Posting harus memuat setidaknya %1 karakter.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Mohon masukkan judul yang lebih pendek. Judul tidak dapat melebihi %1 karakter.", "too-many-posts": "Kamu hanya dapat melakukan posting satu kali setiap %1 detik - mohon tunggu beberapa saat sebelum melakukan posting kembali", "too-many-posts-newbie": "Sebagai pengguna baru, kamu hanya diijinkan membuat posting satu kali setiap %1 detik sampai kamu mendapatkan %2 reputasi - mohon tunggu beberapa saat sebelum melakukan posting kembali", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Ukuran file yang boleh diupload %1 kbs - mohon upload file dengan ukuran lebih kecil", "cant-vote-self-post": "Kamu tidak dapat vote postingan sendiri", "already-favourited": "Post ini sudah kamu favorit", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nama grup terlalu pendek", "group-already-exists": "Grup sudah ada", "group-name-change-not-allowed": "Perubahan nama grup tidak dibolehkan", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Thumbnail di topik ditiadakan", "invalid-file": "File Salah", "uploads-are-disabled": "Upload ditiadakan", - "upload-error": "Upload Error: %1", "signature-too-long": "Maaf, tanda pengenalmu tidak dapat melebihi %1 karakter.", "cant-chat-with-yourself": "Kamu tidak dapat chat dengan akun sendiri", "chat-restricted": "Pengguna ini telah membatasi percakapa mereka. Mereka harus mengikutimu sebelum kamu dapat melakukan percakapan dengan mereka ", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Tidak cukup reputation untuk flag post ini", "reload-failed": "NodeBB mengalami masalah saat memuat \"%1\". NodeBB akan melanjutkan pemuatan, kamu harus membatalkan tindakanmu sebelum pemuatan kembali dilakukan.", "registration-error": "Registrasti Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/id/groups.json b/public/language/id/groups.json index 3bae971661..f70bea0bf5 100644 --- a/public/language/id/groups.json +++ b/public/language/id/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Anggota grup ini belum membuat posting satupun.", "details.latest_posts": "Posting Terkini", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/id/login.json b/public/language/id/login.json index 8aede403da..7a1c52fe71 100644 --- a/public/language/id/login.json +++ b/public/language/id/login.json @@ -1,5 +1,7 @@ { - "username": "Username / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Ingin Diingat?", "forgot_password": "Lupa Password?", "alternative_logins": "Login Alternatif", diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json index 6a4145dc63..ee609afb0b 100644 --- a/public/language/id/notifications.json +++ b/public/language/id/notifications.json @@ -2,6 +2,7 @@ "title": "Pemberitahuan", "no_notifs": "Kamu tidak memiliki pemberitahuan baru", "see_all": "Lihat seluruh Pemberitahuan", + "mark_all_read": "Mark all notifications read", "back_to_home": "Kembali ke %1", "outgoing_link": "Tautan Keluar", "outgoing_link_message": "Saat ini kamu meninggalkan %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 mulai mengikutimu.", "email-confirmed": "Email telah Dikonfirmasi", "email-confirmed-message": "Terimakasih telah melakukan validasi email. Akunmu saat ini telah aktif sepenuhnya.", - "email-confirm-error": "Terjadi error...", "email-confirm-error-message": "Terjadi masalah saat melakukan validasi emailmu. Mungkin terjadi kesalahan kode atau waktu habis.", "email-confirm-sent": "Email konfirmasi telah dikirim." } \ No newline at end of file diff --git a/public/language/id/recent.json b/public/language/id/recent.json index 75c621983d..896583950f 100644 --- a/public/language/id/recent.json +++ b/public/language/id/recent.json @@ -6,6 +6,7 @@ "year": "Tahun", "alltime": "Sepanjang Waktu", "no_recent_topics": "Tidak ada topik terbaru.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/id/search.json b/public/language/id/search.json index 5eb7f1f851..544579a3ff 100644 --- a/public/language/id/search.json +++ b/public/language/id/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/id/tags.json b/public/language/id/tags.json index d6fece770e..647542884e 100644 --- a/public/language/id/tags.json +++ b/public/language/id/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Tidak ada topik dengan tag ini.", "tags": "Tag", - "enter_tags_here": "Masukkan tag di sini. Tekan enter untuk setiap tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Masukkan tag...", "no_tags": "Belum ada tag." } \ No newline at end of file diff --git a/public/language/it/error.json b/public/language/it/error.json index 3c7dbac6fd..777c76856c 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -19,6 +19,8 @@ "email-taken": "Email già esistente", "email-not-confirmed": "La tua Email deve essere ancora confermata, per favore clicca qui per confermare la tua Email.", "email-not-confirmed-chat": "Non potrai chattare finchè non avrai confermato la tua email", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nome utente troppo corto", "username-too-long": "Nome utente troppo lungo", "user-banned": "Utente bannato", @@ -33,6 +35,7 @@ "no-emailers-configured": "Nessun plugin per le email è caricato, quindi la mail di test non può essere inviata", "category-disabled": "Categoria disabilitata", "topic-locked": "Discussione Bloccata", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Per favore attendere il completamento degli uploads.", "content-too-short": "Inserisci un post più lungo. Il Messaggio deve contenere almeno %1 caratteri.", "content-too-long": "Per favore inserisci un post più breve. I post non possono essere più lunghi di %1 caratteri.", @@ -40,6 +43,8 @@ "title-too-long": "Per favore inserire un titolo più corto, non può essere più lungo di %1 caratteri.", "too-many-posts": "È possibile inserire un Post ogni %1 secondi - si prega di attendere prima di postare di nuovo", "too-many-posts-newbie": "Come nuovo utente puoi postare solamente una volta ogni %1 secondi finché non hai raggiunto un livello di reputazione %2 - per favore attendi prima di inviare ancora", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "La dimensione massima del file consentita è di % 1 kbs - si prega di caricare un file più piccolo", "cant-vote-self-post": "Non puoi votare il tuo stesso post", "already-favourited": "Hai già inserito tra i preferiti questo post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Non puoi bannare altri amministratori!", "invalid-image-type": "Tipo dell'immagine non valido. I tipi permessi sono: %1", "invalid-image-extension": "Estensione immagine non valida", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nome del Gruppo troppo corto", "group-already-exists": "Il Gruppo esiste già", "group-name-change-not-allowed": "Il cambio di nome al Gruppo non è consentito", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Le anteprime della Discussione sono disabilitate.", "invalid-file": "File non valido", "uploads-are-disabled": "Uploads disabilitati", - "upload-error": "Errore upload: %1", "signature-too-long": "Spiacenti, la tua firma non può essere lunga %1 caratteri.", "cant-chat-with-yourself": "Non puoi chattare con te stesso!", "chat-restricted": "Questo utente ha ristretto i suoi messaggi in chat alle persone che segue. Per poter chattare con te ti deve prima seguire.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Tu non hai abbastanza reputazione per segnalare questo Post", "reload-failed": "NodeBB ha incontrato un problema durante il ricaricamento: \"%1\". NodeBB continuerà a servire gli assets esistenti lato client, così puoi annullare quello che hai fatto prima di ricaricare.", "registration-error": "Errore nella registrazione", - "parse-error": "Qualcosa è andato storto durante l'analisi della risposta proveniente dal server" + "parse-error": "Qualcosa è andato storto durante l'analisi della risposta proveniente dal server", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/it/groups.json b/public/language/it/groups.json index dbc3ebfed8..96b915d56e 100644 --- a/public/language/it/groups.json +++ b/public/language/it/groups.json @@ -4,6 +4,8 @@ "owner": "Proprietario del Gruppo", "new_group": "Crea Nuovo Gruppo", "no_groups_found": "Non ci sono gruppi da vedere", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop una fotografia, spostarla ad una posizione, e premere Salva", "cover-change": "Cambia", "cover-save": "Salva", @@ -13,11 +15,20 @@ "details.pending": "Membri in attesa", "details.has_no_posts": "I membri di questo gruppo non hanno ancora postato.", "details.latest_posts": "Ultimi Post", - "details.private": "Gruppo Privato", - "details.public": "Gruppo Pubblico", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Amministratore del Grupo", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "I dettagli del Gruppo sono stati aggiornati", "event.deleted": "Il gruppo \"%1\" è stato eliminato" } \ No newline at end of file diff --git a/public/language/it/login.json b/public/language/it/login.json index c4961f6221..75747e30d1 100644 --- a/public/language/it/login.json +++ b/public/language/it/login.json @@ -1,5 +1,7 @@ { - "username": "Nome utente / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Ricordami?", "forgot_password": "Password dimenticata?", "alternative_logins": "Accessi Alternativi", diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index f888a9a744..a52aabb969 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -2,6 +2,7 @@ "title": "Notifiche", "no_notifs": "Non hai nuove notifiche", "see_all": "Vedi tutte le Notifiche", + "mark_all_read": "Mark all notifications read", "back_to_home": "Indietro a %1", "outgoing_link": "Link in uscita", "outgoing_link_message": "Stai lasciando %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 ha iniziato a seguirti.", "email-confirmed": "Email Confermata", "email-confirmed-message": "Grazie per aver validato la tua email. Il tuo account è ora completamente attivato.", - "email-confirm-error": "Si è verificato un errore...", "email-confirm-error-message": "C'è stato un problema nella validazione del tuo indirizzo email. Potrebbe essere il codice non valido o scaduto.", "email-confirm-sent": "Email di conferma inviata." } \ No newline at end of file diff --git a/public/language/it/recent.json b/public/language/it/recent.json index 9fd2b684ff..bf4485644c 100644 --- a/public/language/it/recent.json +++ b/public/language/it/recent.json @@ -6,6 +6,7 @@ "year": "Anno", "alltime": "Sempre", "no_recent_topics": "Non ci sono discussioni recenti.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "C'è un nuovo topic.", "there-is-a-new-topic-and-a-new-post": "C'è un nuovo topic e un nuovo post.", "there-is-a-new-topic-and-new-posts": "C'è una nuova discussione e %1 nuovi post.", diff --git a/public/language/it/search.json b/public/language/it/search.json index 82ffa288d1..14ddeaa98a 100644 --- a/public/language/it/search.json +++ b/public/language/it/search.json @@ -31,5 +31,10 @@ "username": "Nome utente", "category": "Categoria", "descending": "In ordine decrescente", - "ascending": "In ordine crescente" + "ascending": "In ordine crescente", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/it/tags.json b/public/language/it/tags.json index f8f88265a4..c3364a0bbf 100644 --- a/public/language/it/tags.json +++ b/public/language/it/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Non ci sono discussioni con questo tag.", "tags": "Tags", - "enter_tags_here": "Inserire qui i tags. Premere invio dopo ogni tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Inserisci i tags...", "no_tags": "Non ci sono ancora tags." } \ No newline at end of file diff --git a/public/language/ja/error.json b/public/language/ja/error.json index 2a4a1ebac9..95cf6728ac 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -19,6 +19,8 @@ "email-taken": "メールアドレスが使用された", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "ユーザーが停止された", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "この板は無効された", "topic-locked": "スレッドがロックされた", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "アップロードが完成するまでお待ちください。", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "タイトルに最大 %1 文字の制限があります。", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "自分のポストに評価することはできません。", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "ほかの管理者を停止することはできません！", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "グループ名は短すぎます。", "group-already-exists": "グループ名はすでに存在しています", "group-name-change-not-allowed": "グループ名の修正はできません", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "スレッドのサムネイルが無効された", "invalid-file": "無効なファイル", "uploads-are-disabled": "アップロードが無効された", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "自分にチャットすることはできません！", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ja/groups.json b/public/language/ja/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/ja/groups.json +++ b/public/language/ja/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ja/login.json b/public/language/ja/login.json index 915c86a4cd..82a18ea9b1 100644 --- a/public/language/ja/login.json +++ b/public/language/ja/login.json @@ -1,5 +1,7 @@ { - "username": "ユーザー名 / メール", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "ログイン情報を記憶", "forgot_password": "パスワードがわからない？", "alternative_logins": "ほかのログイン方法", diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index 80467939b6..6677d832e2 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -2,6 +2,7 @@ "title": "通知センター", "no_notifs": "新しい通知はありません", "see_all": "すべての通知を確認", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "外部サイトへのリンク", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/ja/recent.json b/public/language/ja/recent.json index 1aa2f932f3..5b76f5d6fc 100644 --- a/public/language/ja/recent.json +++ b/public/language/ja/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "最近のスレッドはありません。", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ja/search.json b/public/language/ja/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/ja/search.json +++ b/public/language/ja/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ja/tags.json b/public/language/ja/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/ja/tags.json +++ b/public/language/ja/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/ko/error.json b/public/language/ko/error.json index fcca053185..bf1eb8d8e4 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -19,6 +19,8 @@ "email-taken": "이미 사용 중인 이메일입니다.", "email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "사용자 이름이 너무 짧습니다.", "username-too-long": "사용자 이름이 너무 깁니다.", "user-banned": "차단된 사용자입니다.", @@ -33,6 +35,7 @@ "no-emailers-configured": "이메일 추가기능이 로드되지 않았으므로 테스트 메일을 발송할 수 없습니다.", "category-disabled": "비활성화된 카테고리입니다.", "topic-locked": "잠긴 주제입니다.", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "업로드가 끝날 때까지 기다려 주세요.", "content-too-short": "게시물의 내용이 너무 짧습니다. 최소 %1자 이상이어야 합니다.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "제목은 최대 %1자로 제한됩니다.", "too-many-posts": "새 게시물 작성은 %1초 간격으로 제한됩니다 - 잠시 기다렸다가 작성해주세요.", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "파일의 크기는 최대 %1KB로 제한됩니다 - 더 작은 파일을 업로드하세요.", "cant-vote-self-post": "자신의 게시물에는 투표할 수 없습니다.", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다.", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "그룹 이름이 너무 짧습니다.", "group-already-exists": "이미 존재하는 그룹입니다.", "group-name-change-not-allowed": "금지된 그룹 이름입니다.", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "주제 섬네일이 이미 해제되었습니다.", "invalid-file": "올바르지 않은 파일입니다.", "uploads-are-disabled": "업로드는 비활성화되어 있습니다.", - "upload-error": "업로드 오류가 발생했습니다. : %1", "signature-too-long": "죄송합니다. 서명은 최대 %1자로 제한됩니다.", "cant-chat-with-yourself": "자신과는 채팅할 수 없습니다.", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "인기도가 낮아 이 게시물을 신고할 수 없습니다.", "reload-failed": "NodeBB를 다시 읽어들이는 중 다음과 같은 문제가 발생했습니다. \"%1\" 다시 읽어들이기 직전에 했던 동작은 되돌리세요. 클라이언트측 자원은 문제없이 계속 전송됩니다.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ko/groups.json b/public/language/ko/groups.json index 344c35078b..a3383c2ce2 100644 --- a/public/language/ko/groups.json +++ b/public/language/ko/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "이 그룹의 구성원이 작성한 게시물이 없습니다.", "details.latest_posts": "최근 게시물", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ko/login.json b/public/language/ko/login.json index 2898cb892d..736c28484f 100644 --- a/public/language/ko/login.json +++ b/public/language/ko/login.json @@ -1,5 +1,7 @@ { - "username": "사용자 이름 / 이메일", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "로그인 유지", "forgot_password": "비밀번호 초기화", "alternative_logins": "다른 방법으로 로그인", diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index 9489b51e45..d0240f52ae 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -2,6 +2,7 @@ "title": "알림", "no_notifs": "새 알림이 없습니다.", "see_all": "모든 알림 보기", + "mark_all_read": "Mark all notifications read", "back_to_home": "%1로 돌아가기", "outgoing_link": "외부 링크", "outgoing_link_message": "%1에서 다른 사이트로 이동합니다.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1님이 나를 팔로우합니다.", "email-confirmed": "확인된 이메일", "email-confirmed-message": "이메일을 확인해주셔서 감사합니다. 계정이 완전히 활성화되었습니다.", - "email-confirm-error": "에러가 발생했습니다...", "email-confirm-error-message": "이메일 주소를 검증하지 못했습니다. 코드가 올바르지 않거나 만료되었을 수 있습니다.", "email-confirm-sent": "확인 이메일이 발송되었습니다." } \ No newline at end of file diff --git a/public/language/ko/recent.json b/public/language/ko/recent.json index f05f6ff771..9fdf7af769 100644 --- a/public/language/ko/recent.json +++ b/public/language/ko/recent.json @@ -6,6 +6,7 @@ "year": "연간", "alltime": "전체", "no_recent_topics": "최근 생성된 주제가 없습니다.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ko/search.json b/public/language/ko/search.json index 3905534515..3ec01cd868 100644 --- a/public/language/ko/search.json +++ b/public/language/ko/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ko/tags.json b/public/language/ko/tags.json index a1e86639cb..a50fc5e9e1 100644 --- a/public/language/ko/tags.json +++ b/public/language/ko/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "이 태그에 해당하는 주제가 없습니다.", "tags": "태그", - "enter_tags_here": "태그를 여기에 입력하세요. 태그 한 개마다 엔터를 누르세요.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "태그 입력...", "no_tags": "아직 아무런 태그도 없습니다." } \ No newline at end of file diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 1951d21778..295af44ce4 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -19,6 +19,8 @@ "email-taken": "El. pašto adresas jau užimtas", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Slapyvardis per trumpas", "username-too-long": "Username too long", "user-banned": "Vartotojas užblokuotas", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategorija išjungta", "topic-locked": "Tema užrakinta", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Prašome palaukti kol bus baigti visi kėlimai į serverį", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Pavadinimas turėtų būti trumpesnis. Maksimalus leistinas ilgis- %1 simbolių.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Jūs negalite balsuoti už savo pranešimą", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Grupės pavadinimas per trumpas", "group-already-exists": "Tokia grupė jau egzistuoja", "group-name-change-not-allowed": "Grupės pavadinimas keitimas neleidžiamas", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Temos paveikslėliai neleidžiami.", "invalid-file": "Klaidingas failas", "uploads-are-disabled": "Įkėlimai neleidžiami", - "upload-error": "Įkėlimo klaida: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/lt/groups.json b/public/language/lt/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/lt/groups.json +++ b/public/language/lt/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/lt/login.json b/public/language/lt/login.json index ce993ead94..ea6dab6e24 100644 --- a/public/language/lt/login.json +++ b/public/language/lt/login.json @@ -1,5 +1,7 @@ { - "username": "Vartotojo vardas / El. paštas", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Prisiminti?", "forgot_password": "Užmiršote slaptažodį?", "alternative_logins": "Alternatyvūs prisijungimo būdai", diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index 10a4cd914e..0a38999bff 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -2,6 +2,7 @@ "title": "Pranešimai", "no_notifs": "Jūs neturite naujų pranešimų", "see_all": "Peržiūrėti visus pranešimus", + "mark_all_read": "Mark all notifications read", "back_to_home": "Atgal į %1", "outgoing_link": "Išeinanti nuoroda", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "El. paštas patvirtintas", "email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.", - "email-confirm-error": "Įvyko klaida...", "email-confirm-error-message": "Įvyko klaida mėginant patvirtinti Jūsų el. pašto adresą. Galbūt kodas yra neteisingas, arba nebegalioajantis.", "email-confirm-sent": "Patvirtinimo laiškas išsiųstas." } \ No newline at end of file diff --git a/public/language/lt/recent.json b/public/language/lt/recent.json index d9257022d6..ebb6269a19 100644 --- a/public/language/lt/recent.json +++ b/public/language/lt/recent.json @@ -6,6 +6,7 @@ "year": "Metai", "alltime": "All Time", "no_recent_topics": "Paskutinių temų nėra", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/lt/search.json b/public/language/lt/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/lt/search.json +++ b/public/language/lt/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/lt/tags.json b/public/language/lt/tags.json index 93a06c9cbe..2f2b9e11d2 100644 --- a/public/language/lt/tags.json +++ b/public/language/lt/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Temų su šią žyma nėra.", "tags": "Žymos", - "enter_tags_here": "Čia surašykite žymas. Paspauskite enter po kiekvienos žymos.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "Žymų kolkas nėra." } \ No newline at end of file diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 3c68a1d7e5..340e4e528b 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -19,6 +19,8 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nama pengunna terlalu pendek", "username-too-long": "Username too long", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ms/groups.json b/public/language/ms/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/ms/groups.json +++ b/public/language/ms/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ms/login.json b/public/language/ms/login.json index 7836b6feb7..3f0d1e37ea 100644 --- a/public/language/ms/login.json +++ b/public/language/ms/login.json @@ -1,5 +1,7 @@ { - "username": "Nama pengguna / Emel", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Ingat Saya?", "forgot_password": "Lupa Kata Laluan?", "alternative_logins": "Login Alternatif", diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index 8026012905..e8fffb1cd8 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -2,6 +2,7 @@ "title": "pemberitahuan", "no_notifs": "Anda tiada pemberitahuan baru", "see_all": "LIhat semua pemberitahuan", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Sambungan luar", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/ms/recent.json b/public/language/ms/recent.json index 237ababd11..fe18961628 100644 --- a/public/language/ms/recent.json +++ b/public/language/ms/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "Tiada topik terkini", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ms/search.json b/public/language/ms/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/ms/search.json +++ b/public/language/ms/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ms/tags.json b/public/language/ms/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/ms/tags.json +++ b/public/language/ms/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/nb/error.json b/public/language/nb/error.json index a19bdad64d..2fe73f83a4 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -19,6 +19,8 @@ "email-taken": "E-post opptatt", "email-not-confirmed": "E-posten din har ikke blitt bekreftet enda, vennligst klikk for å bekrefte din e-post.", "email-not-confirmed-chat": "Du kan ikke chatte før e-posten din har blitt bekreftet", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Brukernavnet er for kort", "username-too-long": "Brukernavnet er for langt", "user-banned": "Bruker utestengt", @@ -33,6 +35,7 @@ "no-emailers-configured": "Ingen e-post-tillegg er lastet, så ingen test e-post kunne bli sendt", "category-disabled": "Kategori deaktivert", "topic-locked": "Emne låst", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Vennligst vent til opplastingene blir fullført.", "content-too-short": "Vennligst skriv et lengere innlegg. Innlegg må inneholde minst %1 tegn.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Vennligst skriv en kortere tittel. Titler må inneholde minst %1 tegn.", "too-many-posts": "Du kan bare poste et innlegg hvert %1 sekund - vennligst vent før du poster igjen", "too-many-posts-newbie": "Som en ny bruker, kan du bare poste et innlegg hvert %1 sekund til du har tjent deg opp %2 i rykte - vennligst vent før du poster igjen", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Max tilatte filstørrelse er %1 kbs - vennligst last opp en mindre fil", "cant-vote-self-post": "Du kan ikke stemme på ditt eget innlegg", "already-favourited": "Du har allerede favorittmerket dette innlegget", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!", "invalid-image-type": "Ugyldig bildetype. Tilatte typer er: %1", "invalid-image-extension": "Ugyldig bildefiltype", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Gruppenavnet er for kort", "group-already-exists": "Gruppe eksisterer allerede", "group-name-change-not-allowed": "Gruppenavn ikke tillatt", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Emne-minatyrbilder har blitt deaktivert", "invalid-file": "Ugyldig fil", "uploads-are-disabled": "Opplastninger er deaktivert", - "upload-error": "Opplastningfeil: %1", "signature-too-long": "Beklager, signaturen din kan ikke være lengre en %1 tegn.", "cant-chat-with-yourself": "Du kan ikke chatte med deg selv!", "chat-restricted": "Denne brukeren har begrenset sine chat-meldinger. De må følge deg før du kan chatte med dem", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Du har ikke nok rykte til å flagge dette innlegget", "reload-failed": "NodeBB støtte på et problem under lasting på nytt: \"%1\". NodeBB vil fortsette å servere eksisterende klientside ressureser, selv om du burde angre endringene du gjorde før du lastet på nytt.", "registration-error": "Feil under registrering", - "parse-error": "Noe gikk feil under analysering av serversvar" + "parse-error": "Noe gikk feil under analysering av serversvar", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/nb/groups.json b/public/language/nb/groups.json index 894bbc0a12..e837ac8961 100644 --- a/public/language/nb/groups.json +++ b/public/language/nb/groups.json @@ -4,6 +4,8 @@ "owner": "Gruppe-eier", "new_group": "Opprett ny gruppe", "no_groups_found": "Det er ingen grupper å se", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Dra og slipp et bilde, dra til posisjon, og trykk Lagre", "cover-change": "Endre", "cover-save": "Lagre", @@ -13,11 +15,20 @@ "details.pending": "Ventende meldemmer", "details.has_no_posts": "Medlemmene i denne gruppen har ikke skrevet noen innlegg.", "details.latest_posts": "Seneste innlegg", - "details.private": "Privat grup", - "details.public": "Offentlig grup", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Gruppeadministrasjon", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Gruppedetaljer har blitt oppgradert", "event.deleted": "Gruppen \"%1\" har blitt slettet" } \ No newline at end of file diff --git a/public/language/nb/login.json b/public/language/nb/login.json index 92e26c01da..2b51b10c6a 100644 --- a/public/language/nb/login.json +++ b/public/language/nb/login.json @@ -1,5 +1,7 @@ { - "username": "Brukernavn / E-post", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Husk meg?", "forgot_password": "Glemt passord?", "alternative_logins": "Alternativ innlogging", diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index f85acbdd55..33ff86eff6 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -2,6 +2,7 @@ "title": "Varsler", "no_notifs": "Du har ingen nye varsler", "see_all": "Se alle varsler", + "mark_all_read": "Mark all notifications read", "back_to_home": "Tilbake til %1", "outgoing_link": "Utgående link", "outgoing_link_message": "Du forlater nå %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 begynte å følge deg.", "email-confirmed": "E-post bekreftet", "email-confirmed-message": "Thank for at du har validert din e-post. Kontoen din er nå fullstendig aktivert.", - "email-confirm-error": "En feil oppsto...", "email-confirm-error-message": "Det oppsto et problem under valdiering av din e-post. Koden kan ha vært ugyldig eller ha utløpt.", "email-confirm-sent": "Bekreftelsesepost sendt." } \ No newline at end of file diff --git a/public/language/nb/recent.json b/public/language/nb/recent.json index 24ece53c70..3b980f6f02 100644 --- a/public/language/nb/recent.json +++ b/public/language/nb/recent.json @@ -6,6 +6,7 @@ "year": "År", "alltime": "All tid", "no_recent_topics": "Det er ingen nye tråder.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Det finnes et nytt emne.", "there-is-a-new-topic-and-a-new-post": "Det finnes et nytt emne og et nytt innlegg.", "there-is-a-new-topic-and-new-posts": "Det finnes et nytt emne og %1 nye innlegg.", diff --git a/public/language/nb/search.json b/public/language/nb/search.json index 053950fd9e..74fdc462a6 100644 --- a/public/language/nb/search.json +++ b/public/language/nb/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/nb/tags.json b/public/language/nb/tags.json index 3e2f7961ce..d38e00a025 100644 --- a/public/language/nb/tags.json +++ b/public/language/nb/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Det er ingen emnet med denne taggen.", "tags": "Tagger", - "enter_tags_here": "Skriv tagger her. Trykk enter etter hver tagg.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Skriv tagger...", "no_tags": "Det finnes ingen tagger enda." } \ No newline at end of file diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 8b2c37d5a1..de83d31255 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -19,6 +19,8 @@ "email-taken": "Email adres is al gebruikt", "email-not-confirmed": "U email adres is niet bevestigd, Klik hier om uw email adres te bevestigen", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Gebruikersnaam is te kort", "username-too-long": "Gebruikersnaam is te lang", "user-banned": "Gebruiker verbannen", @@ -33,6 +35,7 @@ "no-emailers-configured": "Er zijn geen email plugins geladen, een test email kan dus niet verzonden worden", "category-disabled": "Categorie uitgeschakeld", "topic-locked": "Onderwerp gesloten", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Heb even geduld totdat de alle bestanden geüpload zijn", "content-too-short": "Maak de bericht alsjeblieft wat langer. Op z'n minst %1 karakters", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Maak de titel wat korter. Het kan niet langer zijn dan %1 karakters", "too-many-posts": "Je kan eens in de %1 seconden een bericht aanmaken. Wacht alstublieft.", "too-many-posts-newbie": "Als een nieuwe gebruiker kan je maar om de %1 seconden een bericht plaatsen vanwege je reputatie. Uw moet deze level van reputatie verdienen %2. Wacht alstublieft met het plaatsen van uw bericht.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "De maximale bestandsgrootte is %1 kbs", "cant-vote-self-post": "Je kan niet op je eigen berichten stemmen", "already-favourited": "U heeft al dit bericht in uw favorieten staan", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "U kunt niet de andere admins bannen!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "De groepsnaam is te kort", "group-already-exists": "Deze groep bestaat al", "group-name-change-not-allowed": "Het veranderen van de groepsnaam is niet toegestaan!", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Onderwerp thumbnails zijn uitgeschakeld", "invalid-file": "Ongeldig bestand", "uploads-are-disabled": "Uploads zijn uitgeschakeld", - "upload-error": "Upload Fout : %1", "signature-too-long": "Sorry, maar deze handtekening kan niet groter zijn dan %1 karakters!", "cant-chat-with-yourself": "Je kan niet met jezelf chatten!", "chat-restricted": "Deze gebruiker heeft beperkingen gelegd op chatfunctie. Hun moeten jouw volgen voordat je met hun kan chatten", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "U heeft niet de benodigde reputatie om dit bericht te melden aan de admins", "reload-failed": "NodeBB heeft een probleem geconstateerd tijdens het laden van: \"%1\".\nNodeBB blijft verder draaien. Het is wel verstandig om de actie wat u daarvoor heeft gedaan ongedaan te maken door te herladen.", "registration-error": "Registratie fout", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json index 59681475d1..9fe5c00975 100644 --- a/public/language/nl/groups.json +++ b/public/language/nl/groups.json @@ -4,6 +4,8 @@ "owner": "Groep eigenaar", "new_group": "Maak een nieuwe groep", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Opslaan", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Deze groepleden hebben nog geen berichten geplaatst", "details.latest_posts": "Nieuwste Berichten", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/nl/login.json b/public/language/nl/login.json index fa8f5d55d7..ec75667e86 100644 --- a/public/language/nl/login.json +++ b/public/language/nl/login.json @@ -1,5 +1,7 @@ { - "username": "Gebruikersnaam / Emailadres", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Mij Onthouden?", "forgot_password": "Wachtwoord Vergeten?", "alternative_logins": "Alternatieve Loginmethodes", diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index a63b085026..f0dc76c27f 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -2,6 +2,7 @@ "title": "Notificaties", "no_notifs": "Je hebt geen nieuwe notificaties", "see_all": "Bekijk alle Notificaties", + "mark_all_read": "Mark all notifications read", "back_to_home": "Terug naar %1", "outgoing_link": "Uitgaande Link", "outgoing_link_message": "Je verlaat nu %1", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 volgt u nu.", "email-confirmed": "Email adres bevestigd", "email-confirmed-message": "Bedankt voor het bevestigen van uw email adres. Uw account is nu volledig actief.", - "email-confirm-error": "Een fout vond plaats", "email-confirm-error-message": "Er was een probleem met het bevestigen van uw email adres. Misschien was de code niet goed of was door de tijd verstreken.", "email-confirm-sent": "Bevestigings email verstuurd" } \ No newline at end of file diff --git a/public/language/nl/recent.json b/public/language/nl/recent.json index 2b1b292298..e2f3471de6 100644 --- a/public/language/nl/recent.json +++ b/public/language/nl/recent.json @@ -6,6 +6,7 @@ "year": "Jaar", "alltime": "Intussen", "no_recent_topics": "Er zijn geen recente reacties.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Er is een nieuw onderwerp", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "Er is een nieuwe onderwerp en %1 nieuwe berichten", diff --git a/public/language/nl/search.json b/public/language/nl/search.json index 168dde5142..756a0ef3a7 100644 --- a/public/language/nl/search.json +++ b/public/language/nl/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/nl/tags.json b/public/language/nl/tags.json index 07e2c9ccf0..85c11b0476 100644 --- a/public/language/nl/tags.json +++ b/public/language/nl/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Er zijn geen onderwerpen met deze tag", "tags": "Tags", - "enter_tags_here": "Voer hier uw tags in. Druk op enter na elke tag ingevoerd te hebben", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Voer uw tags in...", "no_tags": "Er zijn nog geen tags te vinden" } \ No newline at end of file diff --git a/public/language/pl/error.json b/public/language/pl/error.json index eaebbb6fcd..c09640123e 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -19,6 +19,8 @@ "email-taken": "E-mail zajęty.", "email-not-confirmed": "Twój email nie został jeszcze potwierdzony. Proszę kliknąć tutaj by go potwierdzić.", "email-not-confirmed-chat": "Nie możesz rozmawiać do czasu, gdy twój email zostanie potwierdzony.", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nazwa użytkownika za krótka.", "username-too-long": "Zbyt długa nazwa użytkownika", "user-banned": "Użytkownik zbanowany", @@ -33,6 +35,7 @@ "no-emailers-configured": "Nie zainstalowano żadnego dodatku obsługującego e-mail, więc nie można wysłać testowej wiadomości.", "category-disabled": "Kategoria wyłączona.", "topic-locked": "Temat zamknięty", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Poczekaj na pełne załadowanie", "content-too-short": "Proszę wpisać dłuższy post. Posty powinny zawierać co najmniej %1 znaków.", "content-too-long": "Proszę wpisać krótszy post. Posty nie mogą zawierać więcej niż %1 znaków.", @@ -40,6 +43,8 @@ "title-too-long": "Wpisz krótszy tytuł, nie może być dłuższy niż %1 znaków.", "too-many-posts": "Możesz wysyłać posty co %1 sekund - proszę poczekać", "too-many-posts-newbie": "Jako nowy użytkownik, możesz wysyłać posty co %1 sekund, do chwili aż zbierzesz %2 reputacji - proszę poczekać przed ponownym wysłaniem posta", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maksymalny dozwolony rozmiar pliku to %1 kb - proszę wybrać mniejszy plik", "cant-vote-self-post": "Nie możesz głosować na własny post", "already-favourited": "Już polubiłeś ten post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", "invalid-image-type": "Błędny typ pliku. Dozwolone typy to: %1", "invalid-image-extension": "Błędne rozszerzenie pliku", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nazwa grupy za krótka", "group-already-exists": "Grupa już istnieje", "group-name-change-not-allowed": "Nie można zmieniać nazwy tej grupy.", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Miniatury tematów są wyłączone", "invalid-file": "Błędny plik", "uploads-are-disabled": "Uploadowanie jest wyłączone", - "upload-error": "Błąd uploadu: %1", "signature-too-long": "Przepraszamy, ale podpis nie może być dłuższy niż %1 znaków.", "cant-chat-with-yourself": "Nie możesz rozmawiać ze sobą", "chat-restricted": "Ten użytkownik ograniczył swoje czaty. Musi Cię śledzić, zanim będziesz mógł z nim czatować.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Nie masz dość reputacji, by flagować ten post", "reload-failed": "NodeBB napotkał problem w czasie ładowania \"%1\". Forum będzie nadal dostarczać zasoby dostępne w kliencie, jednak powinieneś cofnąć ostatnią akcję.", "registration-error": "Błąd rejestracji", - "parse-error": "Coś poszło nie tak podczas parsingu odpowiedzi serwera" + "parse-error": "Coś poszło nie tak podczas parsingu odpowiedzi serwera", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json index ca279d4b90..19f43e2d89 100644 --- a/public/language/pl/groups.json +++ b/public/language/pl/groups.json @@ -4,6 +4,8 @@ "owner": "Właściciel grupy", "new_group": "Stwórz nową grupę", "no_groups_found": "Brak grup do wyświetlenia", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Przeciągnij i upuść zdjęcie, ustaw w odpowiedniej pozycji i kliknij Zapisz", "cover-change": "Zmień", "cover-save": "Zapisz", @@ -13,11 +15,20 @@ "details.pending": "Członkowie oczekujący", "details.has_no_posts": "Członkowie tej grupy nie napisali żadnych postów.", "details.latest_posts": "Ostatnie posty", - "details.private": "Grupa prywatna", - "details.public": "Grupa publiczna", + "details.private": "Private", "details.grant": "Nadaj/Cofnij prawa Właściciela", "details.kick": "Wykop", "details.owner_options": "Administracja grupy", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Dane grupy zostały zaktualizowane", "event.deleted": "Grupa \"%1\" została skasowana" } \ No newline at end of file diff --git a/public/language/pl/login.json b/public/language/pl/login.json index cc6f749e15..4a95c6d26e 100644 --- a/public/language/pl/login.json +++ b/public/language/pl/login.json @@ -1,5 +1,7 @@ { - "username": "Nazwa użytkownika lub adres e-mail", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Zapamiętaj mnie", "forgot_password": "Zapomniałeś hasło?", "alternative_logins": "Alternatywne logowanie", diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index ad8cc4de3d..5e84128ee9 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -2,6 +2,7 @@ "title": "Powiadomienia", "no_notifs": "Nie masz nowych powiadomień", "see_all": "Zobacz wszystkie powiadomienia", + "mark_all_read": "Mark all notifications read", "back_to_home": "Wróć do %1", "outgoing_link": "Łącze wychodzące", "outgoing_link_message": "Opuszczasz %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 zaczął Cię śledzić.", "email-confirmed": "E-mail potwierdzony", "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.", - "email-confirm-error": "Wystąpił błąd.", "email-confirm-error-message": "Wystąpił problem przy aktywacji, - kod jest błędny lub przestarzały", "email-confirm-sent": "E-mail potwierdzający wysłany" } \ No newline at end of file diff --git a/public/language/pl/recent.json b/public/language/pl/recent.json index 3a5ed0fa33..d395ee5722 100644 --- a/public/language/pl/recent.json +++ b/public/language/pl/recent.json @@ -6,6 +6,7 @@ "year": "Rok", "alltime": "Od początku", "no_recent_topics": "Brak ostatnich wątków.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Masz nowy wątek.", "there-is-a-new-topic-and-a-new-post": "Masz nowy wątek i nowy post.", "there-is-a-new-topic-and-new-posts": "Masz nowy wątek i %1 nowych postów.", diff --git a/public/language/pl/search.json b/public/language/pl/search.json index 6f2afda91d..7a055eb66c 100644 --- a/public/language/pl/search.json +++ b/public/language/pl/search.json @@ -31,5 +31,10 @@ "username": "Nazwa użytkownika", "category": "Kategoria", "descending": "W kolejności malejącej", - "ascending": "W kolejności rosnącej" + "ascending": "W kolejności rosnącej", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/pl/tags.json b/public/language/pl/tags.json index 57f1a280df..c4d9498474 100644 --- a/public/language/pl/tags.json +++ b/public/language/pl/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nie ma tematów z tym tagiem", "tags": "Tagi", - "enter_tags_here": "Tutaj wpisz tagi. Naciśnij enter po każdym.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Wpisz tagi...", "no_tags": "Jeszcze nie ma tagów." } \ No newline at end of file diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index e0ad9b1e67..359f3c654a 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -19,6 +19,8 @@ "email-taken": "Email já cadastrado", "email-not-confirmed": "O seu email ainda não foi confirmado, por favor clique aqui para confirmar seu email.", "email-not-confirmed-chat": "Você não pode usar o chat até que seu email seja confirmado", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Nome de usuário muito curto", "username-too-long": "Nome de usuário muito longo", "user-banned": "Usuário banido", @@ -33,6 +35,7 @@ "no-emailers-configured": "Nenhum plugin de email foi carregado, por isso um email de teste não pôde ser enviado", "category-disabled": "Categoria desativada", "topic-locked": "Tópico Trancado", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Aguarde a conclusão dos uploads.", "content-too-short": "Por favor digite um post mais longo. Posts devem conter no mínimo %1 caracteres.", "content-too-long": "Por favor entre com um post mais curto. Posts não podem ser maiores do que %1 caracteres.", @@ -40,6 +43,8 @@ "title-too-long": "Por favor entre com um título mais curto; Títulos não podem ser maiores que %1 caracteres.", "too-many-posts": "Você pode postar apenas uma vez a cada %1 segundos - por favor aguarde antes de postar novamente", "too-many-posts-newbie": "Como novo usuário, você pode postar apenas uma vez a cada %1 segundos até que você tenha recebido reputação de %2 - por favor aguarde antes de postar novamente", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "O tamanho máximo permitido de arquivo é %1 kbs - por favor faça upload de um arquivo menor", "cant-vote-self-post": "Você não pode votar no seu próprio post", "already-favourited": "Você já adicionou este post aos favoritos", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Você não pode banir outros administradores!", "invalid-image-type": "Tipo inválido de imagem. Os tipos permitidos são: %1", "invalid-image-extension": "Extensão de imagem inválida", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Nome do grupo é muito curto", "group-already-exists": "O grupo já existe", "group-name-change-not-allowed": "Sem permissão para alterar nome do grupo", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Thumbnails para tópico estão desativados.", "invalid-file": "Arquivo Inválido", "uploads-are-disabled": "Uploads estão desativados", - "upload-error": "Erro de Upload : %1", "signature-too-long": "Desculpe, sua assinatura não pode ser maior que %1 caracteres.", "cant-chat-with-yourself": "Você não pode iniciar um chat consigo mesmo!", "chat-restricted": "Este usuário restringiu suas mensagens de chat. Eles devem seguir você antes que você possa conversar com eles", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Você não possui reputação suficiente para sinalizar este post", "reload-failed": "O NodeBB encontrou um problema ao recarregar: \"%1\". O NodeBB continuará a servir os assets existentes no lado do cliente, apesar de que você deve desfazer o que você fez antes de recarregar.", "registration-error": "Erro de Cadastro", - "parse-error": "Algo deu errado ao conseguir resposta do servidor" + "parse-error": "Algo deu errado ao conseguir resposta do servidor", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/pt_BR/groups.json b/public/language/pt_BR/groups.json index f3a19ea8ef..a9e9efa321 100644 --- a/public/language/pt_BR/groups.json +++ b/public/language/pt_BR/groups.json @@ -4,6 +4,8 @@ "owner": "Dono do Grupo", "new_group": "Criar Novo Grupo", "no_groups_found": "Não há grupos para ver", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Arraste uma foto, arraste para a posição correta e clique em Salvar", "cover-change": "Alterar", "cover-save": "Salvar", @@ -13,11 +15,20 @@ "details.pending": "Membros Pendentes", "details.has_no_posts": "Os membros deste grupo não fizeram quaisquer posts.", "details.latest_posts": "Últimos Posts", - "details.private": "Grupo Privado", - "details.public": "Grupo Público.", + "details.private": "Private", "details.grant": "Conceder/Retomar a Posse", "details.kick": "Chutar", "details.owner_options": "Administração do Grupo", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Os detalhes do grupo foram atualizados", "event.deleted": "O grupo \"%1\" foi deletado" } \ No newline at end of file diff --git a/public/language/pt_BR/login.json b/public/language/pt_BR/login.json index 210ff01ef7..9b267d8d9c 100644 --- a/public/language/pt_BR/login.json +++ b/public/language/pt_BR/login.json @@ -1,5 +1,7 @@ { - "username": "Nome de Usuário / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Lembrar de Mim?", "forgot_password": "Esqueceu a Senha?", "alternative_logins": "Logins Alternativos", diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json index 48220327e2..72b406d47b 100644 --- a/public/language/pt_BR/notifications.json +++ b/public/language/pt_BR/notifications.json @@ -2,6 +2,7 @@ "title": "Notificações", "no_notifs": "Você não tem nenhuma notificação nova", "see_all": "Ver todas as Notificações", + "mark_all_read": "Mark all notifications read", "back_to_home": "Voltar para %1", "outgoing_link": "Link Externo", "outgoing_link_message": "Você deixou de seguir %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 começou a seguir você.", "email-confirmed": "Email Confirmado", "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.", - "email-confirm-error": "Ocorreu um erro...", "email-confirm-error-message": "Houve um problema ao validar o seu endereço de email. Talvez o código era invalido ou tenha expirado.", "email-confirm-sent": "Email de confirmação enviado." } \ No newline at end of file diff --git a/public/language/pt_BR/recent.json b/public/language/pt_BR/recent.json index b0dd732602..2af16e248a 100644 --- a/public/language/pt_BR/recent.json +++ b/public/language/pt_BR/recent.json @@ -6,6 +6,7 @@ "year": "Ano", "alltime": "Todos os Tempos", "no_recent_topics": "Não há tópicos recentes.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Há um novo tópico.", "there-is-a-new-topic-and-a-new-post": "Há um novo tópico e um novo post.", "there-is-a-new-topic-and-new-posts": "Há um novo tópico e %1 novos posts.", diff --git a/public/language/pt_BR/search.json b/public/language/pt_BR/search.json index f1b47b737e..695d7795ce 100644 --- a/public/language/pt_BR/search.json +++ b/public/language/pt_BR/search.json @@ -31,5 +31,10 @@ "username": "Nome de usuário", "category": "Categoria", "descending": "Em ordem descendente", - "ascending": "Em ordem ascendente" + "ascending": "Em ordem ascendente", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/pt_BR/tags.json b/public/language/pt_BR/tags.json index 4d598667b8..267888cbfa 100644 --- a/public/language/pt_BR/tags.json +++ b/public/language/pt_BR/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Não há tópicos com esta tag.", "tags": "Tags", - "enter_tags_here": "Digite as tags aqui. Pressione enter após cada tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Digite tags...", "no_tags": "Ainda não há tags." } \ No newline at end of file diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 1e7de8b50b..51ad7c7cbc 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -19,6 +19,8 @@ "email-taken": "Adresa de email este deja folostă", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Numele de utilizator este prea scurt", "username-too-long": "Numele de utilizator este prea lung", "user-banned": "Utilizator banat", @@ -33,6 +35,7 @@ "no-emailers-configured": "Nici un plugin pentru email nu a fost încărcat, așa că un email de test nu a fost trimis.", "category-disabled": "Categorie dezactivată", "topic-locked": "Subiect Închis", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Te rugăm să aștepți până se termină uploadul.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Te rugăm să introduci un titlu mai scurt. Titlurile nu pot fi mai lungi de %1 caractere.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Nu poți vota propriul tău mesaj", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Nu poți bana alți administratori!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Numele grupului este prea scurt", "group-already-exists": "Grupul deja există", "group-name-change-not-allowed": "Schimbarea numelui grupului este interzisă", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Pictogramele pentru subiect sunt interzise.", "invalid-file": "Fișier invalid", "uploads-are-disabled": "Uploadurile sunt dezactivate", - "upload-error": "Eroare Upload : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Nu poți conversa cu tine!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB a întâmpinat o problemă la reîncarcare: \"%1\". NodeBB va continua să servească fișierele existente pentru partea-client, dar tu va trebuie să refaci modificările pe care le-ai facut înainte de reîncarcare.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ro/groups.json b/public/language/ro/groups.json index 03cacf8b36..c41b17a0c5 100644 --- a/public/language/ro/groups.json +++ b/public/language/ro/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Membrii acestui grup nu au facut nici o postare.", "details.latest_posts": "Ultimele Mesaje", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/ro/login.json b/public/language/ro/login.json index 806a40d81b..31504eb1c1 100644 --- a/public/language/ro/login.json +++ b/public/language/ro/login.json @@ -1,5 +1,7 @@ { - "username": "Utilizator / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Autentifică-mă automat la fiecare vizită", "forgot_password": "Ai uitat parola?", "alternative_logins": "Autentificare Alternativă", diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index bf0fba8426..46bdd5fa7a 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -2,6 +2,7 @@ "title": "Notificări", "no_notifs": "Nu ai nici o notificare recentă", "see_all": "Vezi toate notificările", + "mark_all_read": "Mark all notifications read", "back_to_home": "Înapoi la %1", "outgoing_link": "Link Extern", "outgoing_link_message": "Acum părăsești %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 a început să te urmărească.", "email-confirmed": "Email confirmat", "email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.", - "email-confirm-error": "S-a produs o eroare ...", "email-confirm-error-message": "A fost o problemă cu activarea adresei tale de email. Poate codul de activare a fost invalid sau expirat.", "email-confirm-sent": "Un email de confirmare a fost trimis." } \ No newline at end of file diff --git a/public/language/ro/recent.json b/public/language/ro/recent.json index a630ebe91a..5b657f39b1 100644 --- a/public/language/ro/recent.json +++ b/public/language/ro/recent.json @@ -6,6 +6,7 @@ "year": "An", "alltime": "Tot Timpul", "no_recent_topics": "Nu există subiecte recente.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/ro/search.json b/public/language/ro/search.json index cdae3636ce..54328cf585 100644 --- a/public/language/ro/search.json +++ b/public/language/ro/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ro/tags.json b/public/language/ro/tags.json index d5e5b040a2..483efa66f6 100644 --- a/public/language/ro/tags.json +++ b/public/language/ro/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nu există nici un subiect cu acest tag.", "tags": "Taguri", - "enter_tags_here": "Introdu tagurile aici. Apasă enter după fiecare tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Introdu taguri...", "no_tags": "În acest moment nu există nici un tag." } \ No newline at end of file diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 25309f37d4..cb43902332 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -19,6 +19,8 @@ "email-taken": "Email занят", "email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.", "email-not-confirmed-chat": "Вы не можете оставлять сообщения, пока Ваш email не подтверждён", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Слишком короткое имя пользователя", "username-too-long": "Имя пользователя слишком длинное", "user-banned": "Пользователь заблокирован", @@ -33,6 +35,7 @@ "no-emailers-configured": "Не подключен ни один плагин для отправки почты, поэтому тестовый email не может быть отправлен", "category-disabled": "Категория отключена", "topic-locked": "Тема закрыта", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Пожалуйста, подождите завершения загрузки.", "content-too-short": "Пост должен содержать минимум %1 симв.", "content-too-long": "Размер поста не должен превышать %1 символов. Пожалуйста, сделайте его короче.", @@ -40,6 +43,8 @@ "title-too-long": "Заголовок не может быть длиннее %1 символов.", "too-many-posts": "Вы можете делать пост один раз в %1 сек.", "too-many-posts-newbie": "Вы новый пользователь, поэтому можете делать пост раз в %1 сек., пока не заработаете %2 п. репутации.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Максимальный разрешенный размер файла - %1 Кбайт. Пожалуйста, загрузите файл меньшего размера.", "cant-vote-self-post": "Вы не можете проголосовать за Ваш пост", "already-favourited": "Вы уже добавили этот пост в избранное", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Вы не можете забанить других администраторов!", "invalid-image-type": "Неверный формат изображения. Поддерживаемые форматы: %1", "invalid-image-extension": "Недопустимое расширение файла", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Название группы слишком короткое", "group-already-exists": "Группа уже существует", "group-name-change-not-allowed": "Изменение названия группы запрещено", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Иконки для темы запрещены", "invalid-file": "Файл испорчен", "uploads-are-disabled": "Загрузка запрещена", - "upload-error": "Ошибка загрузки : %1", "signature-too-long": "Ваша подпись не может быть длиннее %1 симв.", "cant-chat-with-yourself": "Вы не можете общаться с самим собой", "chat-restricted": "Пользователь ограничил прием сообщений. Он должен подписаться на Вас, чтобы Вы могли вести переписку с ним.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "У Вас недостаточно репутации, чтобы пометить этот пост.", "reload-failed": "NodeBB обнаружил проблему при перезагрузке: \"%1\". NodeBB продолжит работать с существующими ресурсами клиента, но Вы должны отменить то, что сделали перед перезагрузкой.", "registration-error": "Ошибка при регистрации", - "parse-error": "Похоже, что-то пошло не так в процессе обработки ответа сервера." + "parse-error": "Похоже, что-то пошло не так в процессе обработки ответа сервера.", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json index 544998a50e..c46e857368 100644 --- a/public/language/ru/groups.json +++ b/public/language/ru/groups.json @@ -4,6 +4,8 @@ "owner": "Администратор группы", "new_group": "Создать группу", "no_groups_found": "Нет групп для отображения", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Перетяните сюда изображение, переместите на нужную позицию и нажмите Сохранить", "cover-change": "Изменить", "cover-save": "Сохранить", @@ -13,11 +15,20 @@ "details.pending": "Заявки в группу", "details.has_no_posts": "Пользователями этой группы не публиковали никаких записей", "details.latest_posts": "Последние записи", - "details.private": "Приватная группа", - "details.public": "Открытая группа", + "details.private": "Private", "details.grant": "Выдать/забрать администратора", "details.kick": "Исключить", "details.owner_options": "Настройки группы", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Настройки группы обновлены", "event.deleted": "Группа \"%1\" удалена" } \ No newline at end of file diff --git a/public/language/ru/login.json b/public/language/ru/login.json index e3c85ddeac..b371df159e 100644 --- a/public/language/ru/login.json +++ b/public/language/ru/login.json @@ -1,5 +1,7 @@ { - "username": "Имя пользователя / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Запомнить меня", "forgot_password": "Забыли пароль?", "alternative_logins": "Войти через", diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 4cc64159b5..0618e808db 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -2,6 +2,7 @@ "title": "Уведомления", "no_notifs": "Для Вас нет новых уведомлений", "see_all": "Просмотреть все уведомления", + "mark_all_read": "Mark all notifications read", "back_to_home": "Назад к %1", "outgoing_link": "Внешняя ссылка", "outgoing_link_message": "Вы покидаете %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 подписался на Вас.", "email-confirmed": "Email подтвержден", "email-confirmed-message": "Спасибо за подтверждение Вашего Email-адреса. Ваш аккаунт активирован.", - "email-confirm-error": "Произошла ошибка...", "email-confirm-error-message": "Ошибка проверки Email-адреса. Возможно, код неверен, либо у него истек срок действия.", "email-confirm-sent": "Письмо с проверочным кодом отправлено" } \ No newline at end of file diff --git a/public/language/ru/recent.json b/public/language/ru/recent.json index c232a6bb5e..83c1e01b53 100644 --- a/public/language/ru/recent.json +++ b/public/language/ru/recent.json @@ -6,6 +6,7 @@ "year": "Год", "alltime": "За всё время", "no_recent_topics": "Нет свежих тем.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Опубликована новая тема.", "there-is-a-new-topic-and-a-new-post": "Опубликована новая тема и новое сообщение.", "there-is-a-new-topic-and-new-posts": "Опубликована новая тема и %1 новых сообщений.", diff --git a/public/language/ru/search.json b/public/language/ru/search.json index 943b857c9b..a3929d303b 100644 --- a/public/language/ru/search.json +++ b/public/language/ru/search.json @@ -31,5 +31,10 @@ "username": "Имя пользователя", "category": "Категория", "descending": "В порядке возрастания", - "ascending": "В порядке убывания" + "ascending": "В порядке убывания", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/ru/tags.json b/public/language/ru/tags.json index 0ec34e5741..fa5fa0b9b2 100644 --- a/public/language/ru/tags.json +++ b/public/language/ru/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Нет топиков с таким тегом.", "tags": "Теги", - "enter_tags_here": "Укажите теги здесь. Нажимайте Enter после каждого тега.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Введите теги...", "no_tags": "Здесь еще нет тегов." } \ No newline at end of file diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 9bbcf03247..e0700f76c4 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -19,6 +19,8 @@ "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/sc/groups.json b/public/language/sc/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/sc/groups.json +++ b/public/language/sc/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sc/login.json b/public/language/sc/login.json index 13c8f5cae9..83a84e0ad1 100644 --- a/public/language/sc/login.json +++ b/public/language/sc/login.json @@ -1,5 +1,7 @@ { - "username": "Username / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Regorda·mi?", "forgot_password": "Password Iscarèssida?", "alternative_logins": "Intradas Alternativas", diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index 70ce1dd022..a3a210afe8 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -2,6 +2,7 @@ "title": "Notìficas", "no_notifs": "Non tenes notìficas noas", "see_all": "Càstia totus is Notìficas", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Acàpiu a Foras", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/sc/recent.json b/public/language/sc/recent.json index 7c7d242a90..ea0c3c0752 100644 --- a/public/language/sc/recent.json +++ b/public/language/sc/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "Non bi sunt ùrtimas arresonadas.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/sc/search.json b/public/language/sc/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/sc/search.json +++ b/public/language/sc/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/sc/tags.json b/public/language/sc/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/sc/tags.json +++ b/public/language/sc/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 0ca1924e76..069d7b8deb 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -19,6 +19,8 @@ "email-taken": "Email je obsadený", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Username too short", "username-too-long": "Username too long", "user-banned": "Užívateľ je zakázaný", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategória je znefunkčená.", "topic-locked": "Uzamknutá téma", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Prosím čakajte na dokončenie nahrávania", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Prosím uvedťe kratší názov. Názov nesmie byť dlhší ako 1 % znakov", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "Nedá sa hlasovať za vlastný príspevok", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Nemožte zakázať druhých adminov.", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Názov skupiny je príliš krátky", "group-already-exists": "Skupina už existuje", "group-name-change-not-allowed": "Nepovolená zmena mena skupiny", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Nahľady tém sú znefunkčnené.", "invalid-file": "Neplatný súbor", "uploads-are-disabled": "Nahrávanie je znefunkčnené", - "upload-error": "Upload chyba: %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Nemôžete chatovat so samým sebou.", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/sk/groups.json b/public/language/sk/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/sk/groups.json +++ b/public/language/sk/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sk/login.json b/public/language/sk/login.json index a7c029ab74..bc2f675ff2 100644 --- a/public/language/sk/login.json +++ b/public/language/sk/login.json @@ -1,5 +1,7 @@ { - "username": "Prihlasovacie meno / email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Zapamätať si ma?", "forgot_password": "Zabudol si heslo?", "alternative_logins": "Ďalšie spôsoby prihlásenia", diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index be2f47b646..31f981cbee 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -2,6 +2,7 @@ "title": "Notifikácie", "no_notifs": "Nemáte žiadne nové notifikácie", "see_all": "Pozri všetky notifikácie", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "Odkaz mimo fórum", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email bol potvrdený", "email-confirmed-message": "Ďakujeme za potvrdenie tvojho emailu. Účet je plne aktivovaný.", - "email-confirm-error": "Vyskytla sa chyba...", "email-confirm-error-message": "Vyskytla sa chyba pri overení tvojej emailovej adresy. ", "email-confirm-sent": "Práve sme poslali potvrdzujúci email." } \ No newline at end of file diff --git a/public/language/sk/recent.json b/public/language/sk/recent.json index 13fb11de81..123d7f43ed 100644 --- a/public/language/sk/recent.json +++ b/public/language/sk/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "Nie sú žiadne posledné témy", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/sk/search.json b/public/language/sk/search.json index a04eb4fc1e..9dad8b6eab 100644 --- a/public/language/sk/search.json +++ b/public/language/sk/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/sk/tags.json b/public/language/sk/tags.json index d2e9a213ac..aa9f14c70c 100644 --- a/public/language/sk/tags.json +++ b/public/language/sk/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/sv/error.json b/public/language/sv/error.json index bf9769aa41..8f8c577d0d 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -19,6 +19,8 @@ "email-taken": "Epostadress upptagen", "email-not-confirmed": "Din epostadress är ännu inte bekräftad. Klicka här för att bekräfta din epostadress.", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Användarnamnet är för kort", "username-too-long": "Användarnamnet är för långt", "user-banned": "Användare bannlyst", @@ -33,6 +35,7 @@ "no-emailers-configured": "Inga tillägg för epostadress har laddats, så något textmeddelande kunde inte skickas", "category-disabled": "Kategorin inaktiverad", "topic-locked": "Ämnet låst", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Vänta medan uppladdningen slutförs.", "content-too-short": "Skriv ett längre inlägg. Inlägget måste ha minst %1 tecken.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Skriv in en kortare rubrik. Rubriker får inte vara längre än %1 tecken.", "too-many-posts": "Du kan endast skapa inlägg var %1:e sekund - vänta ett tag innan du försöker skapa ett nytt inlägg", "too-many-posts-newbie": "Som en ny användare kan du endast skapa nya inlägg var %1:e sekund tills du har %2 förtroende - vänta ett tag innan du försöker skapa ett nytt inlägg", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximal filstorlek är %1 kbs - var god ladda upp en mindre fil", "cant-vote-self-post": "Du kan inte rösta på ditt eget inlägg.", "already-favourited": "Du har redan favoriserat det här inlägget", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Du kan inte bannlysa andra administratörer.", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Gruppnamnet är för kort", "group-already-exists": "Gruppen existerar redan", "group-name-change-not-allowed": "Gruppnamnet får inte ändras", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Miniatyrbilder för ämnen är inaktiverat", "invalid-file": "Ogiltig fil", "uploads-are-disabled": "Uppladdningar är inaktiverat", - "upload-error": "Fel vid uppladdning: %1", "signature-too-long": "Signaturer kan tyvärr inte vara längre än %1 tecken.", "cant-chat-with-yourself": "Du kan inte chatta med dig själv.", "chat-restricted": "Denna användaren har begränsat sina chatt-meddelanden. Användaren måste följa dig innan ni kan chatta med varann", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Du har inte tillräckligt förtroende för att flagga det här inlägget.", "reload-failed": "NodeBB stötte på problem med att ladda om: \"%1\". NodeBB kommer fortsätta servera den befintliga resurser till klienten, men du borde återställa det du gjorde alldeles innan du försökte ladda om.", "registration-error": "Registreringsfel", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json index fdba1db1b1..8474322fa4 100644 --- a/public/language/sv/groups.json +++ b/public/language/sv/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Den här gruppens medlemmar har inte skrivit några inlägg.", "details.latest_posts": "Senaste inlägg", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/sv/login.json b/public/language/sv/login.json index 51f4e33296..c96dd64485 100644 --- a/public/language/sv/login.json +++ b/public/language/sv/login.json @@ -1,5 +1,7 @@ { - "username": "Användarnamn eller epostadress", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Kom ihåg mig?", "forgot_password": "Glömt lösenord?", "alternative_logins": "Alternativa inloggningssätt", diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index eddc4f1ae0..1be16f89db 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -2,6 +2,7 @@ "title": "Notiser", "no_notifs": "Du har inga nya notiser", "see_all": "Visa alla notiser", + "mark_all_read": "Mark all notifications read", "back_to_home": "Tillbaka till %1", "outgoing_link": "Utgående länk", "outgoing_link_message": "Du lämnar nu %1. ", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 började följa dig.", "email-confirmed": "Epost bekräftad", "email-confirmed-message": "Tack för att du bekräftat din epostadress. Ditt konto är nu fullt ut aktiverat.", - "email-confirm-error": "Ett fel uppstod...", "email-confirm-error-message": "Det uppstod ett fel med att bekräfta din epostadress. Kanske var koden ogiltig eller har gått ut.", "email-confirm-sent": "Bekräftelseepost skickat." } \ No newline at end of file diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json index 17de423337..28a0d6f599 100644 --- a/public/language/sv/recent.json +++ b/public/language/sv/recent.json @@ -6,6 +6,7 @@ "year": "År", "alltime": "Alltid", "no_recent_topics": "Det finns inga olästa ämnen.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/sv/search.json b/public/language/sv/search.json index 0e4e831f93..4418f62e13 100644 --- a/public/language/sv/search.json +++ b/public/language/sv/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/sv/tags.json b/public/language/sv/tags.json index 09f84c36b9..fffe39ea0a 100644 --- a/public/language/sv/tags.json +++ b/public/language/sv/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Det finns inga ämnen med detta märkord.", "tags": "Märkord", - "enter_tags_here": "Skriv in märkord här. Tryck på enter efter varje märkord.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Ange taggar...", "no_tags": "Det finns inga märkord ännu." } \ No newline at end of file diff --git a/public/language/th/error.json b/public/language/th/error.json index 05985e9b49..064bd1b530 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -19,6 +19,8 @@ "email-taken": "อีเมลนี้มีการใช้แล้ว", "email-not-confirmed": "ยังไม่มีการยืนยันอีเมลของคุณ, โปรดกดยืนยันอีเมลของคุณตรงนี้", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "ชื่อบัญชีผู้ใช้ สั้นเกินไป", "username-too-long": "ชื่อบัญชีผู้ใช้ ยาวเกินไป", "user-banned": "User banned", @@ -33,6 +35,7 @@ "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Category disabled", "topic-locked": "Topic Locked", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.", "too-many-posts": "You can only post once every %1 seconds - please wait before posting again", "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file", "cant-vote-self-post": "You cannot vote for your own post", "already-favourited": "You have already favourited this post", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "You can't ban other admins!", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Group name too short", "group-already-exists": "Group already exists", "group-name-change-not-allowed": "Group name change not allowed", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Topic thumbnails are disabled.", "invalid-file": "Invalid File", "uploads-are-disabled": "Uploads are disabled", - "upload-error": "Upload Error : %1", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", "registration-error": "Registration Error", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/th/groups.json b/public/language/th/groups.json index 950fe6dca3..d2314fdc29 100644 --- a/public/language/th/groups.json +++ b/public/language/th/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "This group's members have not made any posts.", "details.latest_posts": "Latest Posts", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/th/login.json b/public/language/th/login.json index bb93152904..f0aff3c796 100644 --- a/public/language/th/login.json +++ b/public/language/th/login.json @@ -1,5 +1,7 @@ { - "username": "ชื่อบัญชีส่วนตัว / อีเมล", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "จำไว้ในระบบ?", "forgot_password": "ลืมรหัสผ่าน?", "alternative_logins": "เข้าสู่ระบบโดยทางอื่น", diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index d8f0875a8f..53d7dc8ea7 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -2,6 +2,7 @@ "title": "แจ้งเตือน", "no_notifs": "คุณไม่มีข้อแจ้งเตือนใหม่", "see_all": "ดูข้อแจ้งเตือนทั้งหมด", + "mark_all_read": "Mark all notifications read", "back_to_home": "Back to %1", "outgoing_link": "ลิงค์ออก", "outgoing_link_message": "You are now leaving %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", - "email-confirm-error": "An error occurred...", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", "email-confirm-sent": "Confirmation email sent." } \ No newline at end of file diff --git a/public/language/th/recent.json b/public/language/th/recent.json index 369a88a1dc..2a6beb73f4 100644 --- a/public/language/th/recent.json +++ b/public/language/th/recent.json @@ -6,6 +6,7 @@ "year": "Year", "alltime": "All Time", "no_recent_topics": "ไม่มีกระทู้ล่าสุด", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/th/search.json b/public/language/th/search.json index 4e865998e1..167d50d0de 100644 --- a/public/language/th/search.json +++ b/public/language/th/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/th/tags.json b/public/language/th/tags.json index 0dc699ef23..d2d0ff6fe0 100644 --- a/public/language/th/tags.json +++ b/public/language/th/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "ไม่มีหัวข้อสนทนาที่เกี่ยวข้องกับป้ายคำศัพท์นี้", "tags": "ป้ายคำศัพท์", - "enter_tags_here": "ใส่ป้ายคำศัพท์ตรงนี้. โปรดกด 'Enter' หลังทุกป้ายคำศัพท์", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "ใส่ป้ายคำศัพท์ ...", "no_tags": "ยังไม่มีป้ายคำศัพท์" } \ No newline at end of file diff --git a/public/language/tr/error.json b/public/language/tr/error.json index a18f42652b..69cd323a2f 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -19,6 +19,8 @@ "email-taken": "E-posta Alınmış", "email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.", "email-not-confirmed-chat": "Email adresiniz doğrulanmadan sohbet edemezsiniz.", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Kullanıcı ismi çok kısa", "username-too-long": "Kullanıcı ismi çok uzun.", "user-banned": "Kullanıcı Yasaklı", @@ -33,6 +35,7 @@ "no-emailers-configured": "E-posta eklentisi kurulu değil bu yüzden test e-postası gönderilemedi", "category-disabled": "Kategori aktif değil", "topic-locked": "Başlık Kilitli", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Lütfen yüklemelerin bitmesini bekleyin.", "content-too-short": "Lütfen daha uzun bir ileti girin. En az %1 karakter.", "content-too-long": "Lütfen daha kısa bir yayın girin. Yayınlar %1 karakterden uzun olamaz.", @@ -40,6 +43,8 @@ "title-too-long": "Lütfen daha kısa bir başlık girin. Başlıklar %1 karakterden uzun olamaz.", "too-many-posts": "Sadece %1 saniyede bir ileti gönderebilirsiniz.", "too-many-posts-newbie": "Yeni bir kullanıcı olarak, %2 saygınlığınız olana kadar sadece %1 saniyede bir mesaj gönderebilirsiniz. Lütfen tekrar ileti göndermeden önce bekleyin.", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "İzin verilen en büyük dosya boyutu %1 kbs.", "cant-vote-self-post": "Kendi iletinize oy veremezsiniz", "already-favourited": "Bu iletiyi zaten favorilerinize eklediniz", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!", "invalid-image-type": "Geçersiz resim uzantısı. Izin verilen uzantılar: %1", "invalid-image-extension": "Geçersiz resim uzantısı", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Grup ismi çok kısa", "group-already-exists": "Grup zaten var", "group-name-change-not-allowed": "Grup ismini değiştiremezsiniz", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Başlık resimleri kapalı.", "invalid-file": "Geçersiz Dosya", "uploads-are-disabled": "Yüklemeler kapalı", - "upload-error": "Yükleme Hatası : %1", "signature-too-long": "İmza en fazla %1 karakter olabilir!", "cant-chat-with-yourself": "Kendinizle sohbet edemezsiniz!", "chat-restricted": "Bu kullanıcı sohbet ayarlarını kısıtlamış. Bu kişiye mesaj gönderebilmeniz için sizi takip etmeleri gerekiyor", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Bu iletiyi bayraklamak için yeterince saygınlığınız yok", "reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.", "registration-error": "Kayıt Hatası", - "parse-error": "Sunucu yanıtı çözümlemesi sırasında bir şeyler ters gitti" + "parse-error": "Sunucu yanıtı çözümlemesi sırasında bir şeyler ters gitti", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json index 3b765a2f7b..7191d93c86 100644 --- a/public/language/tr/groups.json +++ b/public/language/tr/groups.json @@ -4,6 +4,8 @@ "owner": "Grup Kurucusu", "new_group": "Yeni Grup Oluştur", "no_groups_found": "Henüz hiç grup yok", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Bir fotoğrafı Sürükleyin ve Bırakın, uygun yere sürükleyip Kaydet'e tıklayın.", "cover-change": "Değiştir", "cover-save": "Kaydet", @@ -13,11 +15,20 @@ "details.pending": "Üyeler bekleniyor", "details.has_no_posts": "Bu grubun üyeleri henüz bir ileti göndermedi.", "details.latest_posts": "En son iletiler", - "details.private": "Özel Grup", - "details.public": "Herkese Açık Grup", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Grup Yöneticisi", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Grup detayları güncellenmiştir", "event.deleted": "\"%1\" grubu silinmiş" } \ No newline at end of file diff --git a/public/language/tr/login.json b/public/language/tr/login.json index 1cc526d5c2..e18bc769ca 100644 --- a/public/language/tr/login.json +++ b/public/language/tr/login.json @@ -1,5 +1,7 @@ { - "username": "Kullanıcı İsmi / E-posta", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Beni Hatırla!", "forgot_password": "Şifrenizi mi unuttunuz?", "alternative_logins": "Alternatif Girişler", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index 006f9f70e2..c87b3ec4ee 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -2,6 +2,7 @@ "title": "Bildirimler", "no_notifs": "Yeni bildirimleriniz yok", "see_all": "Bütün bildirimleri gör", + "mark_all_read": "Mark all notifications read", "back_to_home": "Geri dön %1", "outgoing_link": "Harici Link", "outgoing_link_message": "Bu forumdan ayrılıyorsunuz", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 sizi takip etmeye başladı.", "email-confirmed": "E-posta onaylandı", "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktive edildi.", - "email-confirm-error": "Bir hata oluştu...", "email-confirm-error-message": "E-posta adresinizi onaylarken bir hata oluştu. Kodunuz geçersiz ya da eski olabilir.", "email-confirm-sent": "Onay e-postası gönderildi." } \ No newline at end of file diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json index a1af8adb56..817a69b2f8 100644 --- a/public/language/tr/recent.json +++ b/public/language/tr/recent.json @@ -6,6 +6,7 @@ "year": "Yıl", "alltime": "Hepsi", "no_recent_topics": "Güncel konular yok.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "Yeni bir konu mevcut.", "there-is-a-new-topic-and-a-new-post": "Yeni bir konu ve yayın mevcut.", "there-is-a-new-topic-and-new-posts": "Bir adet yeni konu ve %1 adet yeni yayın var.", diff --git a/public/language/tr/search.json b/public/language/tr/search.json index 0d079ffe4a..1819a07de3 100644 --- a/public/language/tr/search.json +++ b/public/language/tr/search.json @@ -31,5 +31,10 @@ "username": "Kullanıcı Adı", "category": "Kategori", "descending": "Azalan düzene göre", - "ascending": "Artan düzene göre" + "ascending": "Artan düzene göre", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/tr/tags.json b/public/language/tr/tags.json index 4ef4669f63..c0ffd63eb1 100644 --- a/public/language/tr/tags.json +++ b/public/language/tr/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Bu etiketli başlık yok.", "tags": "Etiketler", - "enter_tags_here": "Etiketleri buraya girin.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Etiketleri gir...", "no_tags": "Henüz etiket yok." } \ No newline at end of file diff --git a/public/language/vi/error.json b/public/language/vi/error.json index e8da82c330..65ddf93ba0 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -19,6 +19,8 @@ "email-taken": "Email đã được đăng kí", "email-not-confirmed": "Email của bạn chưa được xác nhận, xin hãy nhấn vào đây để xác nhận địa chỉ này là của bạn", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Tên đăng nhập quá ngắn", "username-too-long": "Tên đăng nhập quá dài", "user-banned": "Tài khoản bị ban", @@ -33,6 +35,7 @@ "no-emailers-configured": "Không có trình cắm email nào được tải, vì vậy email kiểm tra không thể gửi được", "category-disabled": "Danh mục bị khóa", "topic-locked": "Chủ đề bị khóa", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Vui lòng chờ upload", "content-too-short": "Vui lòng tạo bài viết dài hơn. Bài viết phải có ít nhất %1 ký tự.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "Yêu cầu tiêu đề ngắn hơn. Không dài quá %1 ký tự", "too-many-posts": "Bạn chỉ có thể gửi một bài viết mỗi %1 giây - Xin chờ trong giây lát trước khi gửi lại.", "too-many-posts-newbie": "Tài khoản mới chỉ có thể gởi 1 bài mỗi %1 giây cho đến khi bạn có được %2 điểm tín nhiệm - Xin vui lòng chờ giây lát trước khi thử lại", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "Kích thước tối đa cho phép là %1 kb - xin lựa chọn tập tin nhỏ hơn", "cant-vote-self-post": "Bạn không thể vote cho chính bài viết của bạn", "already-favourited": "Bạn đã bấm yêu thích cho bài viết này rồi", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "Bạn không thể ban được các admin khác", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "Tên nhóm quá ngắn", "group-already-exists": "Nhóm đã tồn tại", "group-name-change-not-allowed": "Không cho phép đổi tên nhóm", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "Thumbnails cho chủ đề đã bị tắt", "invalid-file": "File không hợp lệ", "uploads-are-disabled": "Đã khóa lựa chọn tải lên", - "upload-error": "Lỗi tải lên : %1", "signature-too-long": "Chứ ký không được dài quá %1 ký tự", "cant-chat-with-yourself": "Bạn không thể chat với chính bạn!", "chat-restricted": "Người dùng này đã bật chế độ hạn chế tin nhắn chat. Bạn phải được anh/cô ta follow thì mới có thể gởi tin nhắn đến họ được.", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "Bạn không đủ tín nhiệm để đánh dấu bài viết này", "reload-failed": "NodeBB gặp lỗi trong khi tải lại: \"%1\". NodeBB sẽ tiếp tục hoạt động với dữ liệu trước đó, tuy nhiên bạn nên tháo gỡ những gì bạn vừa thực hiện trước khi tải lại.", "registration-error": "Lỗi đăng kí", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json index b649073d9b..511c942133 100644 --- a/public/language/vi/groups.json +++ b/public/language/vi/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "Nhóm thành viên này chưa viết bài viết nào.", "details.latest_posts": "Bài mới nhất", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/vi/login.json b/public/language/vi/login.json index 0190bd059e..4ae9230b8a 100644 --- a/public/language/vi/login.json +++ b/public/language/vi/login.json @@ -1,5 +1,7 @@ { - "username": "Tên người dùng / Email", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "Ghi nhớ tôi?", "forgot_password": "Quên mật khẩu?", "alternative_logins": "Đăng nhập bằng tên khác", diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index 2c3be42609..d204c2fd0b 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -2,6 +2,7 @@ "title": "Thông báo", "no_notifs": "Bạn không có thông báo nào mới", "see_all": "Xem tất cả thông báo", + "mark_all_read": "Mark all notifications read", "back_to_home": "Quay lại %1", "outgoing_link": "Liên kết ngoài", "outgoing_link_message": "Bạn đang rời khỏi %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 đã theo dõi bạn.", "email-confirmed": "Đã xác nhận email", "email-confirmed-message": "Cảm ơn bạn đã xác nhận địa chỉ email của bạn. Tài khoản của bạn đã được kích hoạt đầy đủ.", - "email-confirm-error": "Đã có lỗi xảy ra...", "email-confirm-error-message": "Đã có lỗi khi xác nhận địa chỉ email. Có thể đoạn mã không đúng hoặc đã hết hạn.", "email-confirm-sent": "Email xác nhận đã gửi." } \ No newline at end of file diff --git a/public/language/vi/recent.json b/public/language/vi/recent.json index ad679de4e7..b97df0e137 100644 --- a/public/language/vi/recent.json +++ b/public/language/vi/recent.json @@ -6,6 +6,7 @@ "year": "Năm", "alltime": "Tất cả thời gian", "no_recent_topics": "Không có chủ đề nào gần đây", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/vi/search.json b/public/language/vi/search.json index a6450e408b..c9c176ba74 100644 --- a/public/language/vi/search.json +++ b/public/language/vi/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/vi/tags.json b/public/language/vi/tags.json index 80954cface..68f5639c02 100644 --- a/public/language/vi/tags.json +++ b/public/language/vi/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Không có bài viết nào với thẻ này.", "tags": "Thẻ", - "enter_tags_here": "Nhập tên thẻ ở đây. Nhấn enter sau mỗi thẻ.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Tên thẻ...", "no_tags": "Chưa có thẻ nào." } \ No newline at end of file diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index 2511027169..69ea834c58 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -19,6 +19,8 @@ "email-taken": "电子邮箱已被占用", "email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。", "email-not-confirmed-chat": "在确认您的邮箱之前，您不能使用聊天功能", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "用户名太短", "username-too-long": "用户名太长", "user-banned": "用户已禁止", @@ -33,6 +35,7 @@ "no-emailers-configured": "未加载任何电子邮箱插件，无法发送测试邮件", "category-disabled": "版块已禁用", "topic-locked": "主题已锁定", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "请等待上传完成", "content-too-short": "请再输入一些内容，帖子至少要有 %1 个字符。", "content-too-long": "请输入更短的发帖。发帖字数不能超过 %1 个字符。", @@ -40,6 +43,8 @@ "title-too-long": "请输入更短的标题。不超过 %1 字。", "too-many-posts": "发帖间隔至少要 %1 秒 - 请稍候再发帖", "too-many-posts-newbie": "作为新用户，您必须每隔 %1 秒才能发帖一次，直到您有 %2 点威望为止 —— 请稍候再发帖", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "文件不能超过 %1k 字节 - 请上传更小的文件", "cant-vote-self-post": "您不能给自己的帖子投票。", "already-favourited": "您已收藏该帖", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "您不能禁止其他管理员！", "invalid-image-type": "无效的图像类型。允许的类型有：%1", "invalid-image-extension": "无效的图像扩展", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "用户组名称太短", "group-already-exists": "用户组已存在", "group-name-change-not-allowed": "不允许更改用户组名称", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "主题缩略图已禁用", "invalid-file": "无效文件", "uploads-are-disabled": "上传已禁用", - "upload-error": "上传错误：%1", "signature-too-long": "抱歉，您的签名不能超过 %1 个字符。", "cant-chat-with-yourself": "您不能和自己聊天！", "chat-restricted": "此用户限制了他的聊天消息。必须他先关注您，您才能和他聊天。", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "您没有足够的威望标记此帖", "reload-failed": "NodeBB 重新加载时遇到问题: \"%1\"。NodeBB 会继续给已存在的客户端组件服务，虽然您应该撤销在重新加载前执行的操作。", "registration-error": "注册错误", - "parse-error": "解析服务器响应时出错" + "parse-error": "解析服务器响应时出错", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/zh_CN/groups.json b/public/language/zh_CN/groups.json index bd0abbbf67..39eb395078 100644 --- a/public/language/zh_CN/groups.json +++ b/public/language/zh_CN/groups.json @@ -4,6 +4,8 @@ "owner": "用户组组长", "new_group": "创建新用户组", "no_groups_found": "还没有用户组", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "拖放照片，拖动位置，然后点击 保存", "cover-change": "变更", "cover-save": "保存", @@ -13,11 +15,20 @@ "details.pending": "预备成员", "details.has_no_posts": "此用户组的会员尚未发表任何帖子。", "details.latest_posts": "最新帖子", - "details.private": "私有组", - "details.public": "公共组", + "details.private": "Private", "details.grant": "授予/取消所有权", "details.kick": "踢", "details.owner_options": "用户组管理", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "用户组信息已更新", "event.deleted": "用户组 \"%1\" 已被删除" } \ No newline at end of file diff --git a/public/language/zh_CN/login.json b/public/language/zh_CN/login.json index 49cf1cc83f..3e8d54af50 100644 --- a/public/language/zh_CN/login.json +++ b/public/language/zh_CN/login.json @@ -1,5 +1,7 @@ { - "username": "用户名/电子邮箱", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "记住我？", "forgot_password": "忘记密码？", "alternative_logins": "使用合作网站帐号登录", diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index b48aa7378a..f8a88ca3fe 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -2,6 +2,7 @@ "title": "通知", "no_notifs": "您没有新的通知", "see_all": "查看全部通知", + "mark_all_read": "Mark all notifications read", "back_to_home": "返回 %1", "outgoing_link": "站外链接", "outgoing_link_message": "您正在离开 %1。", @@ -21,7 +22,6 @@ "user_started_following_you": "%1关注了您。", "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已全面激活。", - "email-confirm-error": "出错了.……", "email-confirm-error-message": "验证您电子邮箱地址时出现了问题。可能是因为验证码无效或已过期。", "email-confirm-sent": "确认邮件已发送。" } \ No newline at end of file diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json index 8aa1e96ab2..c37b2c0557 100644 --- a/public/language/zh_CN/recent.json +++ b/public/language/zh_CN/recent.json @@ -6,6 +6,7 @@ "year": "年度热帖榜", "alltime": "总热帖榜", "no_recent_topics": "暂无主题。", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "这是个新主题。", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/zh_CN/search.json b/public/language/zh_CN/search.json index 1b1096b667..68799a19f9 100644 --- a/public/language/zh_CN/search.json +++ b/public/language/zh_CN/search.json @@ -31,5 +31,10 @@ "username": "用户名", "category": "版面", "descending": "逆序", - "ascending": "顺序" + "ascending": "顺序", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/zh_CN/tags.json b/public/language/zh_CN/tags.json index cfea2abd2c..a50705d3d6 100644 --- a/public/language/zh_CN/tags.json +++ b/public/language/zh_CN/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "此话题还没有主题帖。", "tags": "话题", - "enter_tags_here": "在此输入话题。每输入一个话题后，按回车确认。", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "输入话题...", "no_tags": "尚无话题。" } \ No newline at end of file diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json index cb254c35aa..9efb1e5ec1 100644 --- a/public/language/zh_TW/error.json +++ b/public/language/zh_TW/error.json @@ -19,6 +19,8 @@ "email-taken": "該信箱已被使用", "email-not-confirmed": "您的電郵尚未得到確認，請點擊此處確認您的電子郵件。", "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", + "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "用戶名太短", "username-too-long": "用戶名太長", "user-banned": "該使用者已被停用", @@ -33,6 +35,7 @@ "no-emailers-configured": "未加載電郵插件，所以無法發送測試郵件", "category-disabled": "該類別已被關閉", "topic-locked": "該主題已被鎖定", + "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "請等待上傳完成。", "content-too-short": "請輸入一個較長的帖子。 帖子需至少有 %1 個字。", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", @@ -40,6 +43,8 @@ "title-too-long": "請輸入一個較短的主題名稱。 標題不能超過 %1 個字元。", "too-many-posts": "你必須間隔 %1 秒後才能發表文章－請稍後", "too-many-posts-newbie": "新用戶在贏得%2信譽前，每隔%1秒才能發佈新文章－請稍後再試", + "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", + "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", "file-too-big": "允許的最大檔案大小是 ％1 kbs－請上傳一個較小的檔案", "cant-vote-self-post": "你不能對自己的文章說讚！", "already-favourited": "你已經收藏了這篇文章", @@ -47,6 +52,7 @@ "cant-ban-other-admins": "你不能禁用其他管理員！", "invalid-image-type": "Invalid image type. Allowed types are: %1", "invalid-image-extension": "Invalid image extension", + "invalid-file-type": "Invalid file type. Allowed types are: %1", "group-name-too-short": "群組名稱太短了", "group-already-exists": "群組名稱已存在", "group-name-change-not-allowed": "變更群組名稱不被允許", @@ -59,7 +65,6 @@ "topic-thumbnails-are-disabled": "禁用主題縮圖", "invalid-file": "無效的檔案", "uploads-are-disabled": "上傳功能被停用", - "upload-error": "上傳錯誤：%1", "signature-too-long": "對不起，簽名檔長度不能超過 %1 字元！", "cant-chat-with-yourself": "你不能與自己聊天！", "chat-restricted": "此用戶已限制了他的聊天功能。你要在他關注你之後，才能跟他聊天", @@ -70,5 +75,7 @@ "not-enough-reputation-to-flag": "你沒有足夠的信譽來舉報這個帖子", "reload-failed": "NodeBB重載\"%1\"時遇到了問題。 NodeBB將繼續提供現有的客戶端資源，但請你撤消重載前的動作。", "registration-error": "註冊錯誤", - "parse-error": "Something went wrong while parsing server response" + "parse-error": "Something went wrong while parsing server response", + "wrong-login-type-email": "Please use your email to login", + "wrong-login-type-username": "Please use your username to login" } \ No newline at end of file diff --git a/public/language/zh_TW/groups.json b/public/language/zh_TW/groups.json index a6c0d93c19..97401e5d7d 100644 --- a/public/language/zh_TW/groups.json +++ b/public/language/zh_TW/groups.json @@ -4,6 +4,8 @@ "owner": "Group Owner", "new_group": "Create New Group", "no_groups_found": "There are no groups to see", + "pending.accept": "Accept", + "pending.reject": "Reject", "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", "cover-change": "Change", "cover-save": "Save", @@ -13,11 +15,20 @@ "details.pending": "Pending Members", "details.has_no_posts": "這個群組的成員還未發出任何帖子。", "details.latest_posts": "最新帖子", - "details.private": "Private Group", - "details.public": "Public Group", + "details.private": "Private", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", + "details.group_name": "Group Name", + "details.description": "Description", + "details.badge_preview": "Badge Preview", + "details.change_icon": "Change Icon", + "details.change_colour": "Change Colour", + "details.badge_text": "Badge Text", + "details.userTitleEnabled": "Show Badge", + "details.private_help": "If enabled, joining of groups requires approval from a group owner", + "details.hidden": "Hidden", + "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "Group details have been updated", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/zh_TW/login.json b/public/language/zh_TW/login.json index 3f0879b49d..f93286b21a 100644 --- a/public/language/zh_TW/login.json +++ b/public/language/zh_TW/login.json @@ -1,5 +1,7 @@ { - "username": "使用者名稱 / 電郵", + "username-email": "Username / Email", + "username": "Username", + "email": "Email", "remember_me": "記住我？", "forgot_password": "忘記密碼？", "alternative_logins": "其他登錄方式", diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json index f0023a1d49..6736c06584 100644 --- a/public/language/zh_TW/notifications.json +++ b/public/language/zh_TW/notifications.json @@ -2,6 +2,7 @@ "title": "通知", "no_notifs": "沒有新消息", "see_all": "顯示全部", + "mark_all_read": "Mark all notifications read", "back_to_home": "返回%1", "outgoing_link": "站外鏈接", "outgoing_link_message": "你正在離開 %1.", @@ -21,7 +22,6 @@ "user_started_following_you": "%1 開始關注你。", "email-confirmed": "已確認電郵", "email-confirmed-message": "感謝您驗證您的電郵。您的帳戶現已全面啟用。", - "email-confirm-error": "發生錯誤...", "email-confirm-error-message": "驗證您的電郵地址時出現問題。也許啟動碼無效或已過期。", "email-confirm-sent": "已發送確認電郵。" } \ No newline at end of file diff --git a/public/language/zh_TW/recent.json b/public/language/zh_TW/recent.json index 3234bb7376..476bc25844 100644 --- a/public/language/zh_TW/recent.json +++ b/public/language/zh_TW/recent.json @@ -6,6 +6,7 @@ "year": "全年", "alltime": "所有時間", "no_recent_topics": "最近沒新主題.", + "no_popular_topics": "There are no popular topics.", "there-is-a-new-topic": "There is a new topic.", "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", diff --git a/public/language/zh_TW/search.json b/public/language/zh_TW/search.json index 9fa8e84f2a..66fee75c1a 100644 --- a/public/language/zh_TW/search.json +++ b/public/language/zh_TW/search.json @@ -31,5 +31,10 @@ "username": "Username", "category": "Category", "descending": "In descending order", - "ascending": "In ascending order" + "ascending": "In ascending order", + "save-preferences": "Save preferences", + "clear-preferences": "Clear preferences", + "search-preferences-saved": "Search preferences saved", + "search-preferences-cleared": "Search preferences cleared", + "show-results-as": "Show results as" } \ No newline at end of file diff --git a/public/language/zh_TW/tags.json b/public/language/zh_TW/tags.json index 25985a9391..dc5c1601ba 100644 --- a/public/language/zh_TW/tags.json +++ b/public/language/zh_TW/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "沒有此標籤的主題。", "tags": "標籤", - "enter_tags_here": "在這裡輸入標籤。每個標籤後按Enter。", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "輸入標籤...", "no_tags": "還沒有標籤呢。" } \ No newline at end of file From 339619fc9d16ff4c2bd9b4f24c6170c3ee1523a8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 09:06:33 -0500 Subject: [PATCH 613/897] #2799 --- public/src/modules/notifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index b217a0958d..52e4c42c8c 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -59,7 +59,7 @@ define('notifications', ['sounds'], function(sound) { notifList.on('click', '.mark-read', function(e) { var liEl = $(this.parentNode), - nid = liEl.siblings('a').attr('data-nid'), + nid = liEl.attr('data-nid'), unread = liEl.hasClass('unread'); e.preventDefault(); From a2c6f58782826cf49f8ddb80cc4ccc2e8795c652 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 09:14:28 -0500 Subject: [PATCH 614/897] fixed issue where an updated alert didn't contain changes to the clickfn, closes #2798 --- public/src/modules/alerts.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js index 4db3a1d9ab..15f592720e 100644 --- a/public/src/modules/alerts.js +++ b/public/src/modules/alerts.js @@ -77,6 +77,19 @@ define('alerts', function() { alert.children().fadeIn(100); alert.html(translatedHTML); }); + + // Handle changes in the clickfn + alert.off('click').removeClass('pointer'); + if (typeof params.clickfn === 'function') { + alert + .addClass('pointer') + .on('click', function (e) { + if(!$(e.target).is('.close')) { + params.clickfn(); + } + fadeOut(alert); + }); + } } function fadeOut(alert) { From 72e9a6caa8bf6b9f5f89733a749db35ae6110d6d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 09:26:38 -0500 Subject: [PATCH 615/897] tweaks to ACP plugins page --- public/less/admin/extend/plugins.less | 6 ++++++ src/views/admin/extend/plugins.tpl | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/public/less/admin/extend/plugins.less b/public/less/admin/extend/plugins.less index cc2c264920..b07d9f16b9 100644 --- a/public/less/admin/extend/plugins.less +++ b/public/less/admin/extend/plugins.less @@ -18,4 +18,10 @@ font-size: 12px; } } + + .plugin-list.ui-sortable { + li { + .pointer; + } + } } \ No newline at end of file diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index 2fdccebfdd..64f6f649c4 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -84,7 +84,16 @@
      Plugin Search

      - +
      +
    + +
    +
    Re-order Plugins
    +
    + +

    + Certain plugins work ideally when they are initialised before/after other plugins. You can alter this loading behaviour here. +

    From 5173fd7138b049811c14467ea284e4daf7120a79 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 09:34:43 -0500 Subject: [PATCH 616/897] #2796 --- public/src/modules/composer/formatting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/composer/formatting.js b/public/src/modules/composer/formatting.js index 03fb05730e..071c0ca2e7 100644 --- a/public/src/modules/composer/formatting.js +++ b/public/src/modules/composer/formatting.js @@ -7,7 +7,7 @@ define('composer/formatting', ['composer/controls', 'composer/preview'], functio var formatting = {}; var formattingDispatchTable = { - 'picture-o': function(){ + 'picture': function(){ $('#files').click(); }, From a3bc5d20374850764c6742e7dfc72784dbb2314f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 10:08:48 -0500 Subject: [PATCH 617/897] fixing bug where the nav dropdown didn't close when a chat was opened --- public/src/app.js | 2 +- public/src/modules/chat.js | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 1cc122e8ee..530ff81732 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -459,7 +459,7 @@ app.cacheBuster = null; } function collapseNavigationOnClick() { - $('#main-nav a, #user-control-list a, #logged-out-menu li a, #logged-in-menu .visible-xs').off('click').on('click', function() { + $('#nav-dropdown').off('click').on('click', '#main-nav a, #user-control-list a, #logged-out-menu li a, #logged-in-menu .visible-xs, #chat-list a', function() { if($('.navbar .navbar-collapse').hasClass('in')) { $('.navbar-header button').click(); } diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index abc1bb58be..7dd76874e9 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -52,10 +52,6 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, } else { ajaxify.go('chats/' + utils.slugify(userObj.username)); } - /*javascript:app.openChat(\'' + - userObj.username + - '\', ' + userObj.uid + - ');*/ }); })(userObj); } From 6a32a0f3999eee91954f94472863760ae269af5a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 11:03:15 -0500 Subject: [PATCH 618/897] closes #2775 --- public/src/modules/chat.js | 41 ++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 7dd76874e9..5d60f2d411 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -202,13 +202,8 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, if (ui.originalSize.height === ui.size.height) { return; } - var totalHeight = chatModal.find('.modal-content').outerHeight() - chatModal.find('.modal-header').outerHeight(); - var padding = parseInt(chatModal.find('.modal-body').css('padding-top'), 10) + parseInt(chatModal.find('.modal-body').css('padding-bottom'), 10); - var contentMargin = parseInt(chatModal.find('#chat-content').css('margin-top'), 10) + parseInt(chatModal.find('#chat-content').css('margin-bottom'), 10); - var sinceHeight = chatModal.find('.since-bar').outerHeight(true); - var inputGroupHeight = chatModal.find('.input-group').outerHeight(); - chatModal.find('#chat-content').css('height', totalHeight - padding - contentMargin - sinceHeight - inputGroupHeight); + chatModal.find('#chat-content').css('height', module.calculateChatListHeight(chatModal)); }); chatModal.find('#chat-with-name').html(username); @@ -295,6 +290,10 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, chatModal.data('modal', null); taskbar.discard('chat', chatModal.attr('UUID')); Chats.notifyTyping(chatModal.attr('touid'), false); + + if (chatModal.attr('data-mobile')) { + module.disableMobileBehaviour(chatModal); + } }; module.center = function(chatModal) { @@ -321,6 +320,36 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, module.bringModalToTop(chatModal); module.focusInput(chatModal); socket.emit('modules.chats.markRead', chatModal.attr('touid')); + + var env = utils.findBootstrapEnvironment(); + if (env === 'xs' || env === 'sm') { + module.enableMobileBehaviour(chatModal); + } + }; + + module.enableMobileBehaviour = function(modalEl) { + app.toggleNavbar(false); + modalEl.attr('data-mobile', '1'); + var messagesEl = modalEl.find('#chat-content'); + messagesEl.css('height', module.calculateChatListHeight(modalEl)); + + $(window).on('resize', function() { + messagesEl.css('height', module.calculateChatListHeight(modalEl)); + }); + }; + + module.disableMobileBehaviour = function(modalEl) { + app.toggleNavbar(true); + }; + + module.calculateChatListHeight = function(modalEl) { + var totalHeight = modalEl.find('.modal-content').outerHeight() - modalEl.find('.modal-header').outerHeight(), + padding = parseInt(modalEl.find('.modal-body').css('padding-top'), 10) + parseInt(modalEl.find('.modal-body').css('padding-bottom'), 10), + contentMargin = parseInt(modalEl.find('#chat-content').css('margin-top'), 10) + parseInt(modalEl.find('#chat-content').css('margin-bottom'), 10), + sinceHeight = modalEl.find('.since-bar').outerHeight(true), + inputGroupHeight = modalEl.find('.input-group').outerHeight(); + + return totalHeight - padding - contentMargin - sinceHeight - inputGroupHeight; }; module.minimize = function(uuid) { From e0c7ef14518c54cd377bfea930ad7efa3704e21e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 11:09:14 -0500 Subject: [PATCH 619/897] fixed #2781 --- src/controllers/admin.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controllers/admin.js b/src/controllers/admin.js index f6902c77cf..27af0709fa 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -353,10 +353,11 @@ adminController.groups.get = function(req, res, next) { groups.list({ expand: true, truncateUserList: true, - isAdmin: true + isAdmin: true, + showSystemGroups: true }, function(err, groups) { groups = groups.filter(function(group) { - return group.name !== 'registered-users' && group.name !== 'guests'; + return group.name !== 'registered-users' && group.name !== 'guests' && group.name.indexOf(':privileges:') === -1; }); res.render('admin/manage/groups', { groups: groups, From 046bcef800e6786a2350a5631d8271bc82c5a66f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 26 Feb 2015 11:53:10 -0500 Subject: [PATCH 620/897] fixes #2782 --- public/src/admin/extend/widgets.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 43f70de05a..bc7993ac6b 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -31,15 +31,19 @@ define('admin/extend/widgets', function() { connectToSortable: ".widget-area" }); - $('#widgets .available-containers .containers > [data-container-html]').draggable({ - helper: function(e) { - var target = $(e.target); - target = target.attr('data-container-html') ? target : target.parents('[data-container-html]'); - - return target.clone().addClass('block').width(target.width()).css('opacity', '0.5'); - }, - distance: 10 - }); + $('#widgets .available-containers .containers > [data-container-html]') + .draggable({ + helper: function(e) { + var target = $(e.target); + target = target.attr('data-container-html') ? target : target.parents('[data-container-html]'); + + return target.clone().addClass('block').width(target.width()).css('opacity', '0.5'); + }, + distance: 10 + }) + .each(function() { + $(this).attr('data-container-html', $(this).attr('data-container-html').replace(/\\\{([\s\S]*?)\\\}/, '{$1}')); + }); $('#widgets .widget-area').sortable({ update: function (event, ui) { From f7f453f8cd1f01f3ac67af3048a4fdd342e864d6 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 26 Feb 2015 12:22:48 -0500 Subject: [PATCH 621/897] closes #2794 --- public/src/client/category.js | 105 ++++++++++++++++----------------- public/src/modules/composer.js | 12 +--- src/groups.js | 10 ++-- src/socket.io/topics.js | 8 --- src/topics/suggested.js | 24 ++++---- 5 files changed, 70 insertions(+), 89 deletions(-) diff --git a/public/src/client/category.js b/public/src/client/category.js index e57587fa89..ec3992283d 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -20,6 +20,12 @@ define('forum/category', [ } }); + $(window).on('action:composer.topics.post', function(ev, data) { + localStorage.removeItem('category:' + data.data.cid + ':bookmark'); + localStorage.removeItem('category:' + data.data.cid + ':bookmark:clicked'); + ajaxify.go('topic/' + data.data.slug); + }); + function removeListeners() { socket.removeListener('event:new_topic', Category.onNewTopic); categoryTools.removeListeners(); @@ -50,11 +56,11 @@ define('forum/category', [ } $('#topics-container').on('click', '.topic-title', function() { - var clickedTid = $(this).parents('li.category-item[data-tid]').attr('data-tid'); + var clickedIndex = $(this).parents('[data-index]').attr('data-index'); $('#topics-container li.category-item').each(function(index, el) { - if($(el).offset().top - $(window).scrollTop() > 0) { - localStorage.setItem('category:' + cid + ':bookmark', $(el).attr('data-tid')); - localStorage.setItem('category:' + cid + ':bookmark:clicked', clickedTid); + if ($(el).offset().top - $(window).scrollTop() > 0) { + localStorage.setItem('category:' + cid + ':bookmark', $(el).attr('data-index')); + localStorage.setItem('category:' + cid + ':bookmark:clicked', clickedIndex); return false; } }); @@ -94,7 +100,7 @@ define('forum/category', [ }; $(window).on('action:popstate', function(ev, data) { - if(data.url.indexOf('category/') === 0) { + if (data.url.indexOf('category/') === 0) { var cid = data.url.match(/^category\/(\d+)/); if (cid && cid[1]) { cid = cid[1]; @@ -103,52 +109,44 @@ define('forum/category', [ return; } - var bookmark = localStorage.getItem('category:' + cid + ':bookmark'); - var clicked = localStorage.getItem('category:' + cid + ':bookmark:clicked'); + var bookmarkIndex = localStorage.getItem('category:' + cid + ':bookmark'); + var clickedIndex = localStorage.getItem('category:' + cid + ':bookmark:clicked'); - if (!bookmark) { + if (!bookmarkIndex) { return; } - if(config.usePagination) { - socket.emit('topics.getTidPage', bookmark, function(err, page) { - if (err) { - return; - } - if(parseInt(page, 10) !== pagination.currentPage) { - pagination.loadPage(page); - } else { - Category.scrollToTopic(bookmark, clicked, 400); - } - }); + if (config.usePagination) { + var page = Math.ceil((parseInt(bookmarkIndex, 10) + 1) / config.topicsPerPage); + if (parseInt(page, 10) !== pagination.currentPage) { + pagination.loadPage(page, function() { + Category.scrollToTopic(bookmarkIndex, clickedIndex, 400); + }); + } else { + Category.scrollToTopic(bookmarkIndex, clickedIndex, 400); + } } else { - socket.emit('topics.getTidIndex', bookmark, function(err, index) { - if (err) { - return; - } - - if (index === 0) { - Category.highlightTopic(clicked); - return; - } + if (bookmarkIndex === 0) { + Category.highlightTopic(clickedIndex); + return; + } - if (index < 0) { - index = 0; - } + if (bookmarkIndex < 0) { + bookmarkIndex = 0; + } - $('#topics-container').empty(); + $('#topics-container').empty(); - loadTopicsAfter(index, function() { - Category.scrollToTopic(bookmark, clicked, 0); - }); + loadTopicsAfter(bookmarkIndex, function() { + Category.scrollToTopic(bookmarkIndex, clickedIndex, 0); }); } } }); - Category.highlightTopic = function(tid) { - var highlight = $('#topics-container li.category-item[data-tid="' + tid + '"]'); - if(highlight.length && !highlight.hasClass('highlight')) { + Category.highlightTopic = function(topicIndex) { + var highlight = $('#topics-container [data-index="' + topicIndex + '"]'); + if (highlight.length && !highlight.hasClass('highlight')) { highlight.addClass('highlight'); setTimeout(function() { highlight.removeClass('highlight'); @@ -156,27 +154,24 @@ define('forum/category', [ } }; - Category.scrollToTopic = function(tid, clickedTid, duration, offset) { - if(!tid) { + Category.scrollToTopic = function(bookmarkIndex, clickedIndex, duration, offset) { + if (!bookmarkIndex) { return; } - if(!offset) { + if (!offset) { offset = 0; } - if($('#topics-container li.category-item[data-tid="' + tid + '"]').length) { - var cid = ajaxify.variables.get('category_id'); - var scrollTo = $('#topics-container li.category-item[data-tid="' + tid + '"]'); - - if (cid && scrollTo.length) { - $('html, body').animate({ - scrollTop: (scrollTo.offset().top - $('#header-menu').height() - offset) + 'px' - }, duration !== undefined ? duration : 400, function() { - Category.highlightTopic(clickedTid); - navigator.update(); - }); - } + var scrollTo = $('#topics-container [data-index="' + bookmarkIndex + '"]'); + var cid = ajaxify.variables.get('category_id'); + if (scrollTo.length && cid) { + $('html, body').animate({ + scrollTop: (scrollTo.offset().top - $('#header-menu').height() - offset) + 'px' + }, duration !== undefined ? duration : 400, function() { + Category.highlightTopic(clickedIndex); + navigator.update(); + }); } }; @@ -191,7 +186,7 @@ define('forum/category', [ Category.onNewTopic = function(topic) { var cid = ajaxify.variables.get('category_id'); - if(!topic || parseInt(topic.cid, 10) !== parseInt(cid, 10)) { + if (!topic || parseInt(topic.cid, 10) !== parseInt(cid, 10)) { return; } @@ -324,7 +319,7 @@ define('forum/category', [ infinitescroll.calculateAfter(direction, '#topics-container .category-item[data-tid]', config.topicsPerPage, false, function(after, offset, el) { loadTopicsAfter(after, function() { if (direction < 0 && el) { - Category.scrollToTopic(el.attr('data-tid'), null, 0, offset); + Category.scrollToTopic(el.attr('data-index'), null, 0, offset); } }); }); diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 84c4c4e9dd..ca345406d0 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -432,13 +432,7 @@ define('composer', [ }; action = 'topics.post'; - socket.emit(action, composerData, function(err, topic) { - done(err); - - if (!err) { - ajaxify.go('topic/' + topic.slug); - } - }); + socket.emit(action, composerData, done); } else if (parseInt(postData.tid, 10) > 0) { composerData = { tid: postData.tid, @@ -463,7 +457,7 @@ define('composer', [ socket.emit(action, composerData, done); } - function done(err) { + function done(err, data) { $('.action-bar button').removeAttr('disabled'); if (err) { if (err.message === '[[error:email-not-confirmed]]') { @@ -476,7 +470,7 @@ define('composer', [ discard(post_uuid); drafts.removeDraft(postData.save_id); - $(window).trigger('action:composer.' + action, composerData); + $(window).trigger('action:composer.' + action, {composerData: composerData, data: data}); } } diff --git a/src/groups.js b/src/groups.js index 21575db866..ba3ceb41aa 100644 --- a/src/groups.js +++ b/src/groups.js @@ -248,8 +248,8 @@ var async = require('async'), plugins.fireHook('filter:group.get', {group: results.base}, function(err, data) { callback(err, data ? data.group : null); - }); - }); + }); + }); }); }; @@ -906,10 +906,10 @@ var async = require('async'), } return group; }); - + plugins.fireHook('filter:groups.get', {groups: groupData}, function(err, data) { - callback(err, data ? data.groups : null); - }); + callback(err, data ? data.groups : null); + }); }); }; diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 5cc6cb3bad..a4ee937429 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -518,14 +518,6 @@ SocketTopics.getPageCount = function(socket, tid, callback) { topics.getPageCount(tid, socket.uid, callback); }; -SocketTopics.getTidPage = function(socket, tid, callback) { - topics.getTidPage(tid, socket.uid, callback); -}; - -SocketTopics.getTidIndex = function(socket, tid, callback) { - categories.getTopicIndex(tid, callback); -}; - SocketTopics.searchTags = function(socket, data, callback) { topics.searchTags(data, callback); }; diff --git a/src/topics/suggested.js b/src/topics/suggested.js index fd3455f726..ff6e16aada 100644 --- a/src/topics/suggested.js +++ b/src/topics/suggested.js @@ -3,11 +3,11 @@ var async = require('async'), _ = require('underscore'), - + categories = require('../categories'), search = require('../search'), - db = require('../database'); - + db = require('../database'); + module.exports = function(Topics) { @@ -21,7 +21,7 @@ module.exports = function(Topics) { }, categoryTids: function(next) { getCategoryTids(tid, next); - } + } }, function(err, results) { if (err) { return callback(err); @@ -29,8 +29,8 @@ module.exports = function(Topics) { var tids = results.tagTids.concat(results.searchTids).concat(results.categoryTids); tids = tids.filter(function(_tid, index, array) { return parseInt(_tid, 10) !== parseInt(tid, 10) && array.indexOf(_tid) === index; - }).slice(start, end + 1); - + }).slice(start, end + 1); + Topics.getTopics(tids, uid, callback); }); }; @@ -48,18 +48,18 @@ module.exports = function(Topics) { function(data, next) { next(null, _.unique(_.flatten(data))); } - ], callback); - } + ], callback); + } function getSearchTids(tid, callback) { async.waterfall([ function(next) { - Topics.getTopicField(tid, 'title', next); + Topics.getTopicField(tid, 'title', next); }, function(title, next) { search.searchQuery('topic', title, next); } - ], callback); + ], callback); } function getCategoryTids(tid, callback) { @@ -68,7 +68,7 @@ module.exports = function(Topics) { return callback(err, []); } categories.getTopicIds('cid:' + cid + ':tids', true, 0, 9, callback); - }); + }); } - + }; \ No newline at end of file From cfd66e5dd4951f61be7a25b92d584a8124f44b45 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 26 Feb 2015 12:29:46 -0500 Subject: [PATCH 622/897] fixes #2795 --- public/src/client/footer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/footer.js b/public/src/client/footer.js index 9d6ff8c4ee..6462e3e39a 100644 --- a/public/src/client/footer.js +++ b/public/src/client/footer.js @@ -12,7 +12,7 @@ define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) return console.warn('Error updating unread count', err); } - $('#unread-count') + $('#unread-count i') .toggleClass('unread-count', count > 0) .attr('data-content', count > 20 ? '20+' : count); } @@ -43,7 +43,7 @@ define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) } function increaseUnreadCount() { - var count = parseInt($('#unread-count').attr('data-content'), 10) + 1; + var count = parseInt($('#unread-count i').attr('data-content'), 10) + 1; updateUnreadTopicCount(null, count); } From a59b9320200dae69c596409f1c091c7db7e54269 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 26 Feb 2015 12:35:36 -0500 Subject: [PATCH 623/897] displayUsersLink deprecated --- public/src/modules/helpers.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 70fbeaabb0..149e13cf0a 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -9,10 +9,6 @@ var helpers = {}; - helpers.displayUsersLink = function(config) { - return (config.loggedIn || !config.privateUserInfo); - }; - helpers.displayMenuItem = function(data, index) { var item = data.navigation[index], properties = item.properties; From 332d4346badfe5c6000b78e3f7015a36c86b0199 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 26 Feb 2015 12:53:48 -0500 Subject: [PATCH 624/897] fixed disable toggle for nav --- public/src/admin/general/navigation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index e1760d9813..95f41b3510 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -82,7 +82,7 @@ define('admin/general/navigation', function() { disabled = btn.html() === 'Enable'; btn.toggleClass('btn-warning').toggleClass('btn-success').html(!disabled ? 'Enable' : 'Disable'); - btn.parents('li').find('[name="enabled"]').val(disabled); + btn.parents('li').find('[name="enabled"]').val(!disabled ? '' : 'on'); return false; } From 3cc3e2f306aba123b80eb1b01c6a40a07ffde300 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 26 Feb 2015 14:10:41 -0500 Subject: [PATCH 625/897] moved homepage configuration to its own acp page --- src/controllers/admin.js | 5 +++++ src/routes/admin.js | 1 + src/views/admin/general/homepage.tpl | 31 ++++++++++++++++++++++++++++ src/views/admin/partials/menu.tpl | 3 ++- src/views/admin/settings/general.tpl | 15 -------------- 5 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 src/views/admin/general/homepage.tpl diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 27af0709fa..62e09eb965 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -37,6 +37,7 @@ var adminController = { settings: {}, logger: {}, sounds: {}, + homepage: {}, navigation: {}, themes: {}, users: require('./admin/users'), @@ -255,6 +256,10 @@ adminController.navigation.get = function(req, res, next) { }); }; +adminController.homepage.get = function(req, res, next) { + res.render('admin/general/homepage', {}); +}; + adminController.settings.get = function(req, res, next) { var term = req.params.term ? req.params.term : 'general'; diff --git a/src/routes/admin.js b/src/routes/admin.js index a9c3ecc6ff..85a3a8ddc5 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -44,6 +44,7 @@ function addRoutes(router, middleware, controllers) { router.get('/general/languages', controllers.admin.languages.get); router.get('/general/sounds', controllers.admin.sounds.get); router.get('/general/navigation', controllers.admin.navigation.get); + router.get('/general/homepage', controllers.admin.homepage.get); router.get('/manage/categories', controllers.admin.categories.active); router.get('/manage/categories/active', controllers.admin.categories.active); diff --git a/src/views/admin/general/homepage.tpl b/src/views/admin/general/homepage.tpl new file mode 100644 index 0000000000..f784e64ce2 --- /dev/null +++ b/src/views/admin/general/homepage.tpl @@ -0,0 +1,31 @@ +
    +
    +
    Home Page
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    Save Settings
    +
    + + +
    +
    +
    + + diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl index 37fbd6f017..dcf28ba45e 100644 --- a/src/views/admin/partials/menu.tpl +++ b/src/views/admin/partials/menu.tpl @@ -2,9 +2,10 @@
    diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl index b403835994..063d7c34e7 100644 --- a/src/views/admin/settings/general.tpl +++ b/src/views/admin/settings/general.tpl @@ -28,21 +28,6 @@
    -
    -
    Home Page
    -
    -
    - - -
    -
    -
    - -
    Site Logo
    From b07574d838f61dfc16597e9c586416f0180c3341 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 26 Feb 2015 14:11:13 -0500 Subject: [PATCH 626/897] unnecessary return --- src/controllers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/index.js b/src/controllers/index.js index 7f4afeb4dc..7495c9ce0d 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -33,7 +33,7 @@ var Controllers = { Controllers.home = function(req, res, next) { var route = meta.config.homePageRoute || 'categories'; if (route === 'categories') { - return Controllers.categories.list(req, res, next); + Controllers.categories.list(req, res, next); } else if (route === 'recent') { Controllers.categories.recent(req, res, next); } else if (route === 'popular') { From 83663cf46bf594ddc209e31e589342aa2e2d98f9 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 26 Feb 2015 14:14:54 -0500 Subject: [PATCH 627/897] removed unused require --- src/topics/unread.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/topics/unread.js b/src/topics/unread.js index a12f1c4d77..e6910b9b5a 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -6,7 +6,6 @@ var async = require('async'), db = require('../database'), user = require('../user'), - meta = require('../meta'), notifications = require('../notifications'), categories = require('../categories'), privileges = require('../privileges'); From 2c2586b578d5ac9ffc72e3d195343162acfb6620 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 26 Feb 2015 15:14:27 -0500 Subject: [PATCH 628/897] closes #2271 --- public/src/client/infinitescroll.js | 4 ---- public/src/client/topic/posts.js | 30 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/public/src/client/infinitescroll.js b/public/src/client/infinitescroll.js index e600d16fbe..ba3385d92f 100644 --- a/public/src/client/infinitescroll.js +++ b/public/src/client/infinitescroll.js @@ -14,10 +14,6 @@ define('forum/infinitescroll', function() { callback = cb; topOffset = _topOffest || 0; $(window).off('scroll', onScroll).on('scroll', onScroll); - - // if ($(document).height() === $(window).height()) { - // callback(1); - // } }; function onScroll() { diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 89e08ae9dd..1a9a71e7ca 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -26,7 +26,11 @@ define('forum/topic/posts', [ postcount.html(parseInt(postcount.html(), 10) + 1); } - createNewPosts(data); + createNewPosts(data, function(html) { + if (html) { + html.addClass('new'); + } + }); }; function onNewPostPagination(data) { @@ -48,7 +52,7 @@ define('forum/topic/posts', [ function createNewPosts(data, callback) { callback = callback || function() {}; if(!data || (data.posts && !data.posts.length)) { - return callback(false); + return callback(); } function removeAlreadyAddedPosts() { @@ -64,9 +68,9 @@ define('forum/topic/posts', [ var firstPostTimestamp = parseInt(data.posts[0].timestamp, 10); var firstPostVotes = parseInt(data.posts[0].votes, 10); var firstPostIndex = parseInt(data.posts[0].index, 10); - - var firstReply = $('#post-container .post-row[data-index!="0"]').first(); - var lastReply = $('#post-container .post-row[data-index!="0"]').last(); + var replies = $('#post-container .post-row[data-index!="0"]:not(.new)'); + var firstReply = replies.first(); + var lastReply = replies.last(); if (config.topicPostSort === 'oldest_to_newest') { if (firstPostTimestamp < parseInt(firstReply.attr('data-timestamp'), 10)) { @@ -96,8 +100,8 @@ define('forum/topic/posts', [ } removeAlreadyAddedPosts(); - if(!data.posts.length) { - return callback(false); + if (!data.posts.length) { + return callback(); } findInsertionPoint(); @@ -106,9 +110,9 @@ define('forum/topic/posts', [ data.viewcount = ajaxify.variables.get('viewcount'); infinitescroll.parseAndTranslate('topic', 'posts', data, function(html) { - if(after) { + if (after) { html.insertAfter(after); - } else if(before) { + } else if (before) { // Save document height and position for future reference (about 5 lines down) var height = $(document).height(), scrollTop = $(document).scrollTop(), @@ -135,7 +139,7 @@ define('forum/topic/posts', [ $(window).trigger('action:posts.loaded', {posts: data.posts}); onNewPostsLoaded(html, pids); - callback(true); + callback(html); }); } @@ -180,7 +184,7 @@ define('forum/topic/posts', [ var reverse = config.topicPostSort === 'newest_to_oldest' || config.topicPostSort === 'most_votes'; - infinitescroll.calculateAfter(direction, '#post-container .post-row[data-index!="0"]', config.postsPerPage, reverse, function(after, offset, el) { + infinitescroll.calculateAfter(direction, '#post-container .post-row[data-index!="0"]:not(.new)', config.postsPerPage, reverse, function(after, offset, el) { loadPostsAfter(after); }); }; @@ -204,9 +208,7 @@ define('forum/topic/posts', [ indicatorEl.fadeOut(); if (data && data.posts && data.posts.length) { - createNewPosts(data, function(postsCreated) { - done(); - }); + createNewPosts(data, done); } else { if (app.user.uid) { socket.emit('topics.markAsRead', [tid]); From 01b012d89da88b8366120eff510efdce57f5a8fa Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 26 Feb 2015 18:44:13 -0500 Subject: [PATCH 629/897] #1642 --- public/src/modules/composer.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index ca345406d0..50a729bb54 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -22,6 +22,14 @@ define('composer', [ $(window).off('resize', onWindowResize).on('resize', onWindowResize); + $(window).on('action:popstate', function(ev, data) { + var env = utils.findBootstrapEnvironment(); + + if (composer.active && (env === 'xs' || env ==='sm')) { + discard(composer.active); + } + }); + // Query server for formatting options socket.emit('modules.composer.getFormattingOptions', function(err, options) { composer.formatting = options; From 3ef54c3c017a3582a0150f7f82ca83ba0794c3cc Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Feb 2015 10:55:10 -0500 Subject: [PATCH 630/897] added new hook to allow plugins to override the local login strategy with their own, closes #2806 --- src/routes/authentication.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/routes/authentication.js b/src/routes/authentication.js index 5b8a3ffe5f..6a5bc87723 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -38,6 +38,13 @@ plugins.ready(function() { loginStrategies.length = 0; + if (plugins.hasListeners('action:auth.overrideLogin')) { + winston.warn('[authentication] Login override detected, skipping local login strategy.'); + plugins.fireHook('action:auth.overrideLogin'); + } else { + passport.use(new passportLocal({passReqToCallback: true}, Auth.login)); + } + plugins.fireHook('filter:auth.init', loginStrategies, function(err) { if (err) { winston.error('filter:auth.init - plugin failure'); @@ -110,8 +117,6 @@ ], next); }; - passport.use(new passportLocal({passReqToCallback: true}, Auth.login)); - passport.serializeUser(function(user, done) { done(null, user.uid); }); @@ -132,6 +137,10 @@ req.session.returnTo = req.body.returnTo; } + if (plugins.hasListeners('action:auth.overrideLogin')) { + return Auth.continueLogin(req, res, next); + }; + var loginWith = meta.config.allowLoginWith || 'username-email'; if (req.body.username && utils.isEmailValid(req.body.username) && loginWith.indexOf('email') !== -1) { @@ -140,16 +149,16 @@ return next(err); } req.body.username = username ? username : req.body.username; - continueLogin(req, res, next); + Auth.continueLogin(req, res, next); }); } else if (loginWith.indexOf('username') !== -1 && !validator.isEmail(req.body.username)) { - continueLogin(req, res, next); + Auth.continueLogin(req, res, next); } else { res.status(500).send('[[error:wrong-login-type-' + loginWith + ']]'); } } - function continueLogin(req, res, next) { + Auth.continueLogin = function(req, res, next) { passport.authenticate('local', function(err, userData, info) { if (err) { return res.status(403).send(err.message); @@ -196,7 +205,7 @@ } }); })(req, res, next); - } + }; function register(req, res) { if (parseInt(meta.config.allowRegistration, 10) === 0) { From 4c67fffabc4a0752457254b2556ddde2e7d38263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Feb 2015 11:58:31 -0500 Subject: [PATCH 631/897] dont parse sig if its falsy --- src/posts/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/posts/user.js b/src/posts/user.js index 02b7816ed9..6b9f4f5e48 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -45,7 +45,7 @@ module.exports = function(Posts) { async.parallel({ signature: function(next) { - if (parseInt(meta.config.disableSignatures, 10) === 1) { + if (!userData.signature || parseInt(meta.config.disableSignatures, 10) === 1) { userData.signature = ''; return next(); } From 27282a2877476885d70fc2512ffb29f4b66d18d6 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 27 Feb 2015 12:31:08 -0500 Subject: [PATCH 632/897] if no order is specified during a category creation, NodeBB won't crash --- src/categories/create.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/categories/create.js b/src/categories/create.js index af9598866b..a8bfaeb6fc 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -13,7 +13,8 @@ module.exports = function(Categories) { return callback(err); } - var slug = cid + '/' + utils.slugify(data.name); + var slug = cid + '/' + utils.slugify(data.name), + order = data.order || cid; // If no order provided, place it at the end var category = { cid: cid, @@ -27,7 +28,7 @@ module.exports = function(Categories) { topic_count: 0, post_count: 0, disabled: 0, - order: data.order, + order: order, link: '', numRecentReplies: 1, class: 'col-md-3 col-xs-6', @@ -38,7 +39,7 @@ module.exports = function(Categories) { async.series([ async.apply(db.setObject, 'category:' + cid, category), - async.apply(db.sortedSetAdd, 'categories:cid', data.order, cid), + async.apply(db.sortedSetAdd, 'categories:cid', order, cid), async.apply(privileges.categories.give, defaultPrivileges, cid, 'administrators'), async.apply(privileges.categories.give, defaultPrivileges, cid, 'registered-users'), async.apply(privileges.categories.give, ['find', 'read'], cid, 'guests') From 5140e5db8d807d5fcbe1fe46b12457fa3404a3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Feb 2015 12:53:00 -0500 Subject: [PATCH 633/897] closes #2759 --- public/language/en_GB/user.json | 4 +++- src/controllers/accounts.js | 4 ++++ src/posts/user.js | 17 +++++++++++++---- src/user/settings.js | 3 ++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json index 9c32b2d26e..265439e4ca 100644 --- a/public/language/en_GB/user.json +++ b/public/language/en_GB/user.json @@ -88,5 +88,7 @@ "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", "follow_topics_you_reply_to": "Follow topics that you reply to.", - "follow_topics_you_create": "Follow topics you create." + "follow_topics_you_create": "Follow topics you create.", + + "grouptitle": "Select the group title you would like to display" } diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index eb78226145..a9577a9899 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -354,6 +354,9 @@ accountsController.accountSettings = function(req, res, next) { settings: function(next) { plugins.fireHook('filter:user.settings', [], next); }, + userGroups: function(next) { + groups.getUserGroups([userData.uid], next); + }, languages: function(next) { languages.list(next); } @@ -364,6 +367,7 @@ accountsController.accountSettings = function(req, res, next) { userData.settings = results.settings; userData.languages = results.languages; + userData.userGroups = results.userGroups[0]; userData.disableEmailSubscriptions = parseInt(meta.config.disableEmailSubscriptions, 10) === 1; diff --git a/src/posts/user.js b/src/posts/user.js index 6b9f4f5e48..c2094d5707 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -17,6 +17,9 @@ module.exports = function(Posts) { groups: function(next) { groups.getUserGroups(uids, next); }, + userSettings: function(next){ + user.getMultipleUserSettings(uids, next); + }, userData: function(next) { user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status'], next); }, @@ -29,10 +32,16 @@ module.exports = function(Posts) { } var userData = results.userData; - for(var i=0; i Date: Fri, 27 Feb 2015 12:58:43 -0500 Subject: [PATCH 634/897] fixed hungarian language key being incorrect :rage2: --- public/language/hu/language.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/language/hu/language.json b/public/language/hu/language.json index a1a3c30c09..7c6d5e8fb0 100644 --- a/public/language/hu/language.json +++ b/public/language/hu/language.json @@ -1,5 +1,5 @@ { - "name": "Angol (Egyesült Királyság/Kanada)", - "code": "en_GB", + "name": "Magyar Nyelv", + "code": "hu", "dir": "ltr" } \ No newline at end of file From 8b21f1c8ab5d1b37aac67e71ae07eeef6d94b5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Feb 2015 13:24:45 -0500 Subject: [PATCH 635/897] dont reload settings page on every save only show an alert if reload is required renamed settings.language to settings.userLang to match the config --- public/language/en_GB/user.json | 1 + public/src/client/account/settings.js | 20 +++++++++++++++----- src/controllers/api.js | 2 +- src/emailer.js | 2 +- src/middleware/middleware.js | 2 +- src/socket.io/meta.js | 2 +- src/user/settings.js | 6 +++--- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json index 265439e4ca..f7460a8821 100644 --- a/public/language/en_GB/user.json +++ b/public/language/en_GB/user.json @@ -65,6 +65,7 @@ "digest_monthly": "Monthly", "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.", "has_no_follower": "This user doesn't have any followers :(", "follows_no_one": "This user isn't following anyone :(", diff --git a/public/src/client/account/settings.js b/public/src/client/account/settings.js index fef95fc495..20b33a613b 100644 --- a/public/src/client/account/settings.js +++ b/public/src/client/account/settings.js @@ -36,16 +36,26 @@ define('forum/account/settings', ['forum/account/header'], function(header) { } app.alertSuccess('[[success:settings-saved]]'); - + var requireReload = false; for (var key in newSettings) { if (newSettings.hasOwnProperty(key)) { - config[key] = newSettings[key]; + if (key === 'userLang' && config.userLang !== newSettings.userLang) { + requireReload = true; + } + config[key] = newSettings[key]; } } app.exposeConfigToTemplates(); - - if (parseInt(app.user.uid, 10) === parseInt(ajaxify.variables.get('theirid'), 10)) { - ajaxify.refresh(); + if (requireReload && parseInt(app.user.uid, 10) === parseInt(ajaxify.variables.get('theirid'), 10)) { + app.alert({ + id: 'setting-change', + message: '[[user:settings-require-reload]]', + type: 'warning', + timeout: 5000, + clickfn: function() { + ajaxify.refresh(); + } + }); } }); diff --git a/src/controllers/api.js b/src/controllers/api.js index c335cdf272..263d1b3a4e 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -80,7 +80,7 @@ apiController.getConfig = function(req, res, next) { config.topicsPerPage = settings.topicsPerPage; config.postsPerPage = settings.postsPerPage; config.notificationSounds = settings.notificationSounds; - config.userLang = settings.language || config.defaultLang; + config.userLang = settings.userLang || config.defaultLang; config.openOutgoingLinksInNewTab = settings.openOutgoingLinksInNewTab; config.topicPostSort = settings.topicPostSort || config.topicPostSort; config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort; diff --git a/src/emailer.js b/src/emailer.js index 557de96f6e..b358e170fb 100644 --- a/src/emailer.js +++ b/src/emailer.js @@ -41,7 +41,7 @@ var fs = require('fs'), return callback(err); } async.map([results.html, results.plaintext, params.subject], function(raw, next) { - translator.translate(raw, results.settings.language || meta.config.defaultLang || 'en_GB', function(translated) { + translator.translate(raw, results.settings.userLang || meta.config.defaultLang || 'en_GB', function(translated) { next(undefined, translated); }); }, function(err, translated) { diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 5d06207dce..3a50e2fbf0 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -303,7 +303,7 @@ middleware.renderHeader = function(req, res, callback) { if (err) { return next(err); } - meta.title.build(req.url.slice(1), settings.language, res.locals, next); + meta.title.build(req.url.slice(1), settings.userLang, res.locals, next); }); } else { meta.title.build(req.url.slice(1), meta.config.defaultLang, res.locals, next); diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index 331678473e..c801381a1f 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -40,7 +40,7 @@ SocketMeta.buildTitle = function(socket, text, callback) { if (err) { return callback(err); } - meta.title.build(text, settings.language, {}, callback); + meta.title.build(text, settings.userLang, {}, callback); }); } else { meta.title.build(text, meta.config.defaultLang, {}, callback); diff --git a/src/user/settings.js b/src/user/settings.js index 93e2389f0e..20c16fceb8 100644 --- a/src/user/settings.js +++ b/src/user/settings.js @@ -63,7 +63,7 @@ module.exports = function(User) { settings.topicsPerPage = Math.min(settings.topicsPerPage ? parseInt(settings.topicsPerPage, 10) : parseInt(meta.config.topicsPerPage, 10) || 20, 20); settings.postsPerPage = Math.min(settings.postsPerPage ? parseInt(settings.postsPerPage, 10) : parseInt(meta.config.postsPerPage, 10) || 10, 20); settings.notificationSounds = parseInt(settings.notificationSounds, 10) === 1; - settings.language = settings.language || meta.config.defaultLang || 'en_GB'; + settings.userLang = settings.userLang || meta.config.defaultLang || 'en_GB'; settings.topicPostSort = settings.topicPostSort || meta.config.topicPostSort || 'oldest_to_newest'; settings.categoryTopicSort = settings.categoryTopicSort || meta.config.categoryTopicSort || 'newest_to_oldest'; settings.followTopicsOnCreate = (settings.followTopicsOnCreate === null || settings.followTopicsOnCreate === undefined) ? true : parseInt(settings.followTopicsOnCreate, 10) === 1; @@ -82,7 +82,7 @@ module.exports = function(User) { return callback(new Error('[[error:invalid-pagination-value]]')); } - data.language = data.language || meta.config.defaultLang; + data.userLang = data.userLang || meta.config.defaultLang; plugins.fireHook('action:user.saveSettings', {uid: uid, settings: data}); @@ -97,7 +97,7 @@ module.exports = function(User) { topicsPerPage: Math.min(data.topicsPerPage, 20), postsPerPage: Math.min(data.postsPerPage, 20), notificationSounds: data.notificationSounds, - language: data.language || meta.config.defaultLang, + userLang: data.userLang || meta.config.defaultLang, followTopicsOnCreate: data.followTopicsOnCreate, followTopicsOnReply: data.followTopicsOnReply, sendChatNotifications: data.sendChatNotifications, From c97c1ab4b936a151366b448e20f292d59f5954dd Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 27 Feb 2015 15:00:24 -0500 Subject: [PATCH 636/897] filter:config.get --- src/controllers/api.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/controllers/api.js b/src/controllers/api.js index 263d1b3a4e..78e8fe2c75 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -86,11 +86,13 @@ apiController.getConfig = function(req, res, next) { config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort; config.topicSearchEnabled = settings.topicSearchEnabled || false; - if (res.locals.isAPI) { - res.status(200).json(config); - } else { - next(err, config); - } + plugins.fireHook('filter:config.get', config, function(err, config) { + if (res.locals.isAPI) { + res.status(200).json(config); + } else { + next(err, config); + } + }); }); }; From 44e8323efaaf57634781775bd2c1272e71d9531a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 27 Feb 2015 15:00:38 -0500 Subject: [PATCH 637/897] action:navigation.get:* --- src/controllers/index.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/controllers/index.js b/src/controllers/index.js index 7495c9ce0d..fb34c66441 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -31,15 +31,21 @@ var Controllers = { Controllers.home = function(req, res, next) { - var route = meta.config.homePageRoute || 'categories'; - if (route === 'categories') { - Controllers.categories.list(req, res, next); - } else if (route === 'recent') { - Controllers.categories.recent(req, res, next); - } else if (route === 'popular') { - Controllers.categories.popular(req, res, next); + var route = meta.config.homePageRoute || 'categories', + hook = 'action:navigation.get:' + route; + + if (plugins.hasListeners(hook)) { + plugins.fireHook(hook, {req: req, res: res, next: next}); } else { - next(); + if (route === 'categories') { + Controllers.categories.list(req, res, next); + } else if (route === 'recent') { + Controllers.categories.recent(req, res, next); + } else if (route === 'popular') { + Controllers.categories.popular(req, res, next); + } else { + next(); + } } }; From 657fa8de737cb79430569e20f1e40035cec5475d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 27 Feb 2015 15:04:44 -0500 Subject: [PATCH 638/897] oops action:homepage.get:* --- src/controllers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/index.js b/src/controllers/index.js index fb34c66441..6aba26bb1f 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -32,7 +32,7 @@ var Controllers = { Controllers.home = function(req, res, next) { var route = meta.config.homePageRoute || 'categories', - hook = 'action:navigation.get:' + route; + hook = 'action:homepage.get:' + route; if (plugins.hasListeners(hook)) { plugins.fireHook(hook, {req: req, res: res, next: next}); From 0fadaf037abaa7533f43161349f4223d836d4da9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 27 Feb 2015 15:09:09 -0500 Subject: [PATCH 639/897] filter:homepage.get for populating available routes on ACP --- src/controllers/admin.js | 17 ++++++++++++++++- src/views/admin/general/homepage.tpl | 6 +++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 62e09eb965..e0912a668c 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -257,7 +257,22 @@ adminController.navigation.get = function(req, res, next) { }; adminController.homepage.get = function(req, res, next) { - res.render('admin/general/homepage', {}); + plugins.fireHook('filter:homepage.get', {routes: [ + { + route: 'categories', + name: 'Categories' + }, + { + route: 'recent', + name: 'Recent' + }, + { + route: 'popular', + name: 'Popular' + } + ]}, function(err, data) { + res.render('admin/general/homepage', data); + }); }; adminController.settings.get = function(req, res, next) { diff --git a/src/views/admin/general/homepage.tpl b/src/views/admin/general/homepage.tpl index f784e64ce2..d17593f15a 100644 --- a/src/views/admin/general/homepage.tpl +++ b/src/views/admin/general/homepage.tpl @@ -5,9 +5,9 @@
    From cd1d287a464bd7f8a94e829ecb9d266231fd373f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 27 Feb 2015 15:18:44 -0500 Subject: [PATCH 640/897] fix new posts appearing out of order --- public/src/client/topic/posts.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 1a9a71e7ca..8731121de1 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -26,7 +26,7 @@ define('forum/topic/posts', [ postcount.html(parseInt(postcount.html(), 10) + 1); } - createNewPosts(data, function(html) { + createNewPosts(data, '.post-row[data-index!="0"]', function(html) { if (html) { html.addClass('new'); } @@ -43,13 +43,13 @@ define('forum/topic/posts', [ pagination.pageCount = Math.max(1, Math.ceil((posts[0].topic.postcount - 1) / config.postsPerPage)); if (pagination.currentPage === pagination.pageCount) { - createNewPosts(data, scrollToPost); + createNewPosts(data, '.post-row[data-index!="0"]', scrollToPost); } else if (parseInt(posts[0].uid, 10) === parseInt(app.user.uid, 10)) { pagination.loadPage(pagination.pageCount, scrollToPost); } } - function createNewPosts(data, callback) { + function createNewPosts(data, repliesSelector, callback) { callback = callback || function() {}; if(!data || (data.posts && !data.posts.length)) { return callback(); @@ -68,7 +68,7 @@ define('forum/topic/posts', [ var firstPostTimestamp = parseInt(data.posts[0].timestamp, 10); var firstPostVotes = parseInt(data.posts[0].votes, 10); var firstPostIndex = parseInt(data.posts[0].index, 10); - var replies = $('#post-container .post-row[data-index!="0"]:not(.new)'); + var replies = $(repliesSelector); var firstReply = replies.first(); var lastReply = replies.last(); @@ -208,7 +208,7 @@ define('forum/topic/posts', [ indicatorEl.fadeOut(); if (data && data.posts && data.posts.length) { - createNewPosts(data, done); + createNewPosts(data, '.post-row[data-index!="0"]:not(.new)', done); } else { if (app.user.uid) { socket.emit('topics.markAsRead', [tid]); From 5b67cd841e5cf89776771683956a7990c02bf2bc Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 27 Feb 2015 15:30:36 -0500 Subject: [PATCH 641/897] fire filter:config.get even if anonymous --- src/controllers/api.js | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/controllers/api.js b/src/controllers/api.js index 78e8fe2c75..c98fd79e0c 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -12,6 +12,16 @@ var pkg = require('./../../package.json'), var apiController = {}; apiController.getConfig = function(req, res, next) { + function filterConfig() { + plugins.fireHook('filter:config.get', config, function(err, config) { + if (res.locals.isAPI) { + res.status(200).json(config); + } else { + next(err, config); + } + }); + } + var config = {}; config.relative_path = nconf.get('relative_path'); config.socketioTransports = nconf.get('socket.io:transports') || ['polling', 'websocket']; @@ -63,12 +73,7 @@ apiController.getConfig = function(req, res, next) { config.searchEnabled = plugins.hasListeners('filter:search.query'); if (!req.user) { - if (res.locals.isAPI) { - res.status(200).json(config); - } else { - next(null, config); - } - return; + return filterConfig(); } user.getSettings(req.user.uid, function(err, settings) { @@ -86,15 +91,8 @@ apiController.getConfig = function(req, res, next) { config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort; config.topicSearchEnabled = settings.topicSearchEnabled || false; - plugins.fireHook('filter:config.get', config, function(err, config) { - if (res.locals.isAPI) { - res.status(200).json(config); - } else { - next(err, config); - } - }); + filterConfig(); }); - }; From bd17bff7d47b7a7a9deff51a444a0a0e6e692ff7 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 27 Feb 2015 17:57:09 -0500 Subject: [PATCH 642/897] prevent double follow/unfollow --- src/socket.io/user.js | 32 ++++++++++++++----------------- src/user/follow.js | 44 +++++++++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 15aa0e2ba6..7170cf27d0 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -282,28 +282,24 @@ SocketUser.follow = function(socket, data, callback) { return; } - toggleFollow('follow', socket.uid, data.uid, function(err) { - if (err) { - return callback(err); - } - - user.getUserFields(socket.uid, ['username', 'userslug'], function(err, userData) { - if (err) { - return callback(err); - } - + async.waterfall([ + function(next) { + toggleFollow('follow', socket.uid, data.uid, next); + }, + function(next) { + user.getUserFields(socket.uid, ['username', 'userslug'], next); + }, + function(userData, next) { notifications.create({ bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]', nid: 'follow:' + data.uid + ':uid:' + socket.uid, from: socket.uid - }, function(err, notification) { - if (!err && notification) { - notifications.push(notification, [data.uid]); - } - callback(err); - }); - }); - }); + }, next); + }, + function(notification, next) { + notifications.push(notification, [data.uid], next); + } + ], callback); }; SocketUser.unfollow = function(socket, data, callback) { diff --git a/src/user/follow.js b/src/user/follow.js index 6b0c0a3973..b7bda96903 100644 --- a/src/user/follow.js +++ b/src/user/follow.js @@ -23,22 +23,34 @@ module.exports = function(User) { return callback(new Error('[[error:you-cant-follow-yourself]]')); } - if (type === 'follow') { - var now = Date.now(); - async.parallel([ - async.apply(db.sortedSetAdd, 'following:' + uid, now, theiruid), - async.apply(db.sortedSetAdd, 'followers:' + theiruid, now, uid), - async.apply(User.incrementUserFieldBy, uid, 'followingCount', 1), - async.apply(User.incrementUserFieldBy, theiruid, 'followerCount', 1) - ], callback); - } else { - async.parallel([ - async.apply(db.sortedSetRemove, 'following:' + uid, theiruid), - async.apply(db.sortedSetRemove, 'followers:' + theiruid, uid), - async.apply(User.decrementUserFieldBy, uid, 'followingCount', 1), - async.apply(User.decrementUserFieldBy, theiruid, 'followerCount', 1) - ], callback); - } + User.isFollowing(uid, theiruid, function(err, isFollowing) { + if (err) { + return callback(err); + } + + if (type === 'follow') { + if (isFollowing) { + return callback(new Error('[[error:already-following]]')); + } + var now = Date.now(); + async.parallel([ + async.apply(db.sortedSetAdd, 'following:' + uid, now, theiruid), + async.apply(db.sortedSetAdd, 'followers:' + theiruid, now, uid), + async.apply(User.incrementUserFieldBy, uid, 'followingCount', 1), + async.apply(User.incrementUserFieldBy, theiruid, 'followerCount', 1) + ], callback); + } else { + if (!isFollowing) { + return callback(new Error('[[error:not-following]]')); + } + async.parallel([ + async.apply(db.sortedSetRemove, 'following:' + uid, theiruid), + async.apply(db.sortedSetRemove, 'followers:' + theiruid, uid), + async.apply(User.decrementUserFieldBy, uid, 'followingCount', 1), + async.apply(User.decrementUserFieldBy, theiruid, 'followerCount', 1) + ], callback); + } + }); } User.getFollowing = function(uid, start, end, callback) { From fa607132be1dbdb2f8d5e85c4cd7990d7f4538cc Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 27 Feb 2015 18:07:14 -0500 Subject: [PATCH 643/897] closes #2782 --- src/views/admin/extend/widgets.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index f083200b98..d2aca20177 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -72,18 +72,18 @@
    None
    -
    +
    Well
    -
    +
    Jumbotron
    -
    +
    Panel
    -
    +
    Panel Header
    @@ -100,7 +100,7 @@
    -
    +
    Alert
    From c40258a82c051a131a27bc9f34c184c947851e6c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 27 Feb 2015 23:18:00 -0500 Subject: [PATCH 644/897] removed 2x calls to getRecentTopicReplies --- src/controllers/categories.js | 51 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/src/controllers/categories.js b/src/controllers/categories.js index d5cfda79c8..1ec014240b 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -121,40 +121,37 @@ categoriesController.list = function(req, res, next) { }, categories: function (next) { var uid = req.user ? req.user.uid : 0; - categories.getCategoriesByPrivilege(uid, 'find', function (err, categoryData) { - if (err) { - return next(err); - } - var childCategories = []; - - for(var i=categoryData.length - 1; i>=0; --i) { - - if (Array.isArray(categoryData[i].children) && categoryData[i].children.length) { - childCategories.push.apply(childCategories, categoryData[i].children); - } - - if (categoryData[i].parent && categoryData[i].parent.cid) { - categoryData.splice(i, 1); - } + var categoryData; + async.waterfall([ + function(next) { + categories.getCategoriesByPrivilege(uid, 'find', next); + }, + function(_categoryData, next) { + categoryData = _categoryData; + var allCategories = []; + + categoryData = categoryData.filter(function(category) { + if (!category.parent) { + allCategories.push(category); + } + + if (Array.isArray(category.children) && category.children.length) { + allCategories.push.apply(allCategories, category.children); + } + return category && !category.parent; + }); + + categories.getRecentTopicReplies(allCategories, uid, next); } - - async.parallel([ - function(next) { - categories.getRecentTopicReplies(categoryData, uid, next); - }, - function(next) { - categories.getRecentTopicReplies(childCategories, uid, next); - } - ], function(err) { - next(err, categoryData); - }); + ], function(err) { + next(err, categoryData); }); } }, function (err, data) { if (err) { return next(err); } - + res.render('categories', data); }); }; From 8c79e11daec64754035950dae0b802ba0435f417 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sun, 1 Mar 2015 16:10:45 -0500 Subject: [PATCH 645/897] properly fixes #2782 --- public/src/admin/extend/widgets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index bc7993ac6b..239d5bd809 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -42,7 +42,7 @@ define('admin/extend/widgets', function() { distance: 10 }) .each(function() { - $(this).attr('data-container-html', $(this).attr('data-container-html').replace(/\\\{([\s\S]*?)\\\}/, '{$1}')); + $(this).attr('data-container-html', $(this).attr('data-container-html').replace(/\\\{([\s\S]*?)\\\}/g, '{$1}')); }); $('#widgets .widget-area').sortable({ From ac1e0513fc566c60e32164b367c81be9fe75f226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 2 Mar 2015 14:01:18 -0500 Subject: [PATCH 646/897] moved setupPageRoute to helpers --- src/routes/helpers.js | 12 ++++++++++++ src/routes/index.js | 12 +++--------- 2 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 src/routes/helpers.js diff --git a/src/routes/helpers.js b/src/routes/helpers.js new file mode 100644 index 0000000000..31f3ece5b2 --- /dev/null +++ b/src/routes/helpers.js @@ -0,0 +1,12 @@ +'use strict'; + +var helpers = {}; + +helpers.setupPageRoute = function(router, name, middleware, middlewares, controller) { + middlewares = middlewares.concat([middleware.pageView]); + + router.get(name, middleware.buildHeader, middlewares, controller); + router.get('/api' + name, middlewares, controller); +}; + +module.exports = helpers; \ No newline at end of file diff --git a/src/routes/index.js b/src/routes/index.js index 6bb83ee556..0b951197c5 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -13,9 +13,10 @@ var nconf = require('nconf'), adminRoutes = require('./admin'), feedRoutes = require('./feeds'), pluginRoutes = require('./plugins'), - authRoutes = require('./authentication'); - + authRoutes = require('./authentication'), + helpers = require('./helpers'); +var setupPageRoute = helpers.setupPageRoute; function mainRoutes(app, middleware, controllers) { setupPageRoute(app, '/', middleware, [], controllers.home); @@ -99,13 +100,6 @@ function groupRoutes(app, middleware, controllers) { setupPageRoute(app, '/groups/:slug/members', middleware, middlewares, controllers.groups.members); } -function setupPageRoute(router, name, middleware, middlewares, controller) { - middlewares = middlewares.concat([middleware.pageView]); - - router.get(name, middleware.buildHeader, middlewares, controller); - router.get('/api' + name, middlewares, controller); -} - module.exports = function(app, middleware) { var router = express.Router(), pluginRouter = express.Router(), From 89ecda5163ff7d38fa52fb8aec7f6f505b7b7aa2 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 2 Mar 2015 14:09:36 -0500 Subject: [PATCH 647/897] for plugin admin pages need to find a better solution tho --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index b1a381b64f..551d8d7ed3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -63,7 +63,7 @@ module.exports = function(grunt) { files: ['*.js', 'src/**/*.js'] }, templatesUpdated: { - files: ['src/views/**/*.tpl', 'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/*/*.tpl', 'node_modules/nodebb-*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*.tpl'] + files: ['src/views/**/*.tpl', 'node_modules/nodebb-*/*.tpl', 'node_modules/nodebb-*/*/*.tpl', 'node_modules/nodebb-*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*.tpl', 'node_modules/nodebb-*/*/*/*/*/*.tpl'] } } }); From c851b5a9b19ab10e3f341682ed9d3011afdc0c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 2 Mar 2015 14:12:45 -0500 Subject: [PATCH 648/897] made getBaseUser public --- src/controllers/accounts.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index a9577a9899..8b966fbd26 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -235,7 +235,7 @@ accountsController.getTopics = function(req, res, next) { accountsController.getGroups = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, callerUID, function(err, userData) { + accountsController.getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -259,7 +259,7 @@ accountsController.getGroups = function(req, res, next) { function getFromUserSet(tpl, set, method, type, req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, callerUID, function(err, userData) { + accountsController.getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } @@ -281,7 +281,7 @@ function getFromUserSet(tpl, set, method, type, req, res, next) { }); } -function getBaseUser(userslug, callerUID, callback) { +accountsController.getBaseUser = function(userslug, callerUID, callback) { user.getUidByUserslug(userslug, function (err, uid) { if (err || !uid) { return callback(err); @@ -314,7 +314,7 @@ function getBaseUser(userslug, callerUID, callback) { callback(null, results.user); }); }); -} +}; accountsController.accountEdit = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; @@ -341,7 +341,7 @@ accountsController.accountEdit = function(req, res, next) { accountsController.accountSettings = function(req, res, next) { var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; - getBaseUser(req.params.userslug, callerUID, function(err, userData) { + accountsController.getBaseUser(req.params.userslug, callerUID, function(err, userData) { if (err) { return next(err); } From 8cb18b1e484263ff874f5cce881adab89fab355e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 2 Mar 2015 16:06:40 -0500 Subject: [PATCH 649/897] possible fix to group category --- src/groups.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index ba3ceb41aa..5e91eb0978 100644 --- a/src/groups.js +++ b/src/groups.js @@ -665,7 +665,14 @@ var async = require('async'), } Groups.destroy = function(groupName, callback) { - Groups.get(groupName, {}, function(err, groupObj) { + Groups.getGroupsData([groupName], function(err, groupsData) { + if (err) { + return callback(err); + } + if (!Array.isArray(groupsData) || !groupsData[0]) { + return callback(); + } + var groupObj = groupsData[0]; plugins.fireHook('action:group.destroy', groupObj); async.parallel([ From e8644dac26daaf89f17c97cea45e23697be956df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 2 Mar 2015 16:10:08 -0500 Subject: [PATCH 650/897] group.hidden is already bool --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 5e91eb0978..ea7d8bcdc4 100644 --- a/src/groups.js +++ b/src/groups.js @@ -936,7 +936,7 @@ var async = require('async'), } groupData = groupData.filter(function(group) { - return group && parseInt(group.hidden, 10) !== 1; + return group && !group.hidden; }); var groupSets = groupData.map(function(group) { From 0fdaaadae5972b13c4d2ee8f9ee9bd98bcda81ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 2 Mar 2015 16:28:03 -0500 Subject: [PATCH 651/897] changed to before all --- tests/database/hash.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/database/hash.js b/tests/database/hash.js index 5e294f3c4b..e5e066b0b9 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -12,7 +12,7 @@ describe('Hash methods', function() { age: 99 }; - before(function(done) { + beforeAll(function(done) { db.setObject('hashTestObject', testData, done); }); From fa05971326bd3e0c698376bf63d37f61667c2793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 2 Mar 2015 16:35:12 -0500 Subject: [PATCH 652/897] derp beforeEach --- tests/database/hash.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/database/hash.js b/tests/database/hash.js index e5e066b0b9..469172ce70 100644 --- a/tests/database/hash.js +++ b/tests/database/hash.js @@ -12,7 +12,7 @@ describe('Hash methods', function() { age: 99 }; - beforeAll(function(done) { + beforeEach(function(done) { db.setObject('hashTestObject', testData, done); }); From 9f2b8498619e1284a058972371021b5fea8a1597 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 3 Mar 2015 12:13:03 -0500 Subject: [PATCH 653/897] latest tjs --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ba1afea75..a3a37a08c3 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "socket.io-redis": "^0.1.3", "socketio-wildcard": "~0.1.1", "string": "^3.0.0", - "templates.js": "^0.1.21", + "templates.js": "^0.1.22", "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git", "underscore": "~1.7.0", "validator": "^3.30.0", From d7cd936b5452ba26f1fb623276ab6ca1c20ea1eb Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 3 Mar 2015 12:34:41 -0500 Subject: [PATCH 654/897] added preserveCase option to slugify --- public/src/utils.js | 4 ++-- src/groups.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/utils.js b/public/src/utils.js index 1521d53e28..4efad224fd 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -74,7 +74,7 @@ languageKeyRegex: /\[\[[\w]+:.+\]\]/, //http://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/ - slugify: function(str) { + slugify: function(str, preserveCase) { if (!str) { str = ''; } str = str.replace(utils.trimRegex, ''); if(utils.isLatin.test(str)) { @@ -82,7 +82,7 @@ } else { str = XRegExp.replace(str, utils.invalidUnicodeChars, '-'); } - str = str.toLocaleLowerCase(); + str = !preserveCase ? str.toLocaleLowerCase() : str; str = str.replace(utils.collapseWhitespace, '-'); str = str.replace(utils.collapseDash, '-'); str = str.replace(utils.trimTrailingDash, ''); diff --git a/src/groups.js b/src/groups.js index ea7d8bcdc4..452b47d56c 100644 --- a/src/groups.js +++ b/src/groups.js @@ -224,10 +224,10 @@ var async = require('async'), if (err) { return callback(err); } - results.base.name = validator.escape(results.base.name); - results.base.description = validator.escape(results.base.description); + results.base.name = !options.unescape ? validator.escape(results.base.name) : results.base.name; + results.base.description = options.unescape ? validator.escape(results.base.description) : results.base.description; results.base.descriptionParsed = descriptionParsed; - results.base.userTitle = validator.escape(results.base.userTitle); + results.base.userTitle = options.unescape ? validator.escape(results.base.userTitle) : results.base.userTitle; results.base.userTitleEnabled = results.base.userTitleEnabled ? !!parseInt(results.base.userTitleEnabled, 10) : true; results.base.createtimeISO = utils.toISOString(results.base.createtime); results.base.members = results.users.filter(Boolean); From a19b25a3b3c8d685eeb8bd2ef96ae2aed650e52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 3 Mar 2015 12:40:20 -0500 Subject: [PATCH 655/897] closes #2816 --- src/posts/user.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/posts/user.js b/src/posts/user.js index c2094d5707..de563d86b5 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -34,9 +34,7 @@ module.exports = function(Posts) { var userData = results.userData; userData.forEach(function(userData, i) { userData.groups = results.groups[i]; - if (!results.userSettings[i].groupTitle) { - results.userSettings[i].groupTitle = results.groups[i][0] ? results.groups[i][0].name : ''; - } + results.groups[i].forEach(function(group, index) { group.selected = group.name === results.userSettings[i].groupTitle; }); From a22300746cefe71a4e33b6fd3b83911c00ac100d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 3 Mar 2015 14:03:40 -0500 Subject: [PATCH 656/897] latest tjs --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a3a37a08c3..6f38b87f0d 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "socket.io-redis": "^0.1.3", "socketio-wildcard": "~0.1.1", "string": "^3.0.0", - "templates.js": "^0.1.22", + "templates.js": "^0.1.23", "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git", "underscore": "~1.7.0", "validator": "^3.30.0", From 80945eff7eed931fb25bdee4722e02b17db87bc7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 3 Mar 2015 14:19:18 -0500 Subject: [PATCH 657/897] closes #2819 --- src/plugins.js | 1 + src/views/admin/extend/plugins.tpl | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/plugins.js b/src/plugins.js index cb67084b28..4d384f3714 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -209,6 +209,7 @@ var fs = require('fs'), pluginMap[plugin.id].description = plugin.description; pluginMap[plugin.id].url = pluginMap[plugin.id].url || plugin.url; pluginMap[plugin.id].installed = true; + pluginMap[plugin.id].isTheme = !!plugin.id.match('nodebb-theme-'); pluginMap[plugin.id].error = plugin.error || false; pluginMap[plugin.id].active = plugin.active; pluginMap[plugin.id].version = plugin.version; diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index 64f6f649c4..dc39b80103 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -9,7 +9,11 @@
  • + + Themes + +
    From d9e0a495b013fde6365a5951fa922a8b89ba3e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 3 Mar 2015 14:31:09 -0500 Subject: [PATCH 658/897] updated install.js to install mongodb native 2 --- src/install.js | 2 +- src/middleware/middleware.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/install.js b/src/install.js index b696c5cdf8..f0597315d4 100644 --- a/src/install.js +++ b/src/install.js @@ -13,7 +13,7 @@ var async = require('async'), "dependencies": ["redis@~0.10.1", "connect-redis@~2.0.0"] }, "mongo": { - "dependencies": ["mongodb", "connect-mongo"] + "dependencies": ["mongodb@~2.0.0", "connect-mongo"] } }; diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 3a50e2fbf0..7d0ee3ab24 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -388,6 +388,11 @@ middleware.processRender = function(req, res, next) { } render.call(self, template, options, function(err, str) { + if (err) { + winston.error(err); + return fn(err); + } + // str = str + ''; str = (res.locals.postHeader ? res.locals.postHeader : '') + str + (res.locals.preFooter ? res.locals.preFooter : ''); From e421a2c7cdd4b0248ac3a10e4c91013b518d2c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 3 Mar 2015 15:12:40 -0500 Subject: [PATCH 659/897] pass session --- src/database/mongo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database/mongo.js b/src/database/mongo.js index 0e69c12380..6708d9c94b 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -45,7 +45,7 @@ mongoClient = require('mongodb').MongoClient; if (!nconf.get('redis')) { - sessionStore = require('connect-mongo')({session: session}); + sessionStore = require('connect-mongo')(session); } else { sessionStore = require('connect-redis')(session); } From 9bf55c96d265fa8150d5dcaabf3cad0eab6043e4 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 3 Mar 2015 15:46:57 -0500 Subject: [PATCH 660/897] closes #2818 --- public/src/modules/helpers.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 149e13cf0a..9f643d8736 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -16,8 +16,13 @@ if (properties) { if (properties.loggedIn && !data.loggedIn || properties.adminOnly && !data.isAdmin || - properties.installed && properties.installed.search && !data.searchEnabled || - properties.hideIfPrivate && data.privateUserInfo) { + properties.installed && properties.installed.search && !data.searchEnabled) { + return false; + } + } + + if (item.route.match('/users')) { + if (data.privateUserInfo && !data.isAdmin) { return false; } } From f082270f2507827a75e1acef53de6983c47b144e Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 3 Mar 2015 15:47:23 -0500 Subject: [PATCH 661/897] got rid of hideIfPrivate --- install/data/navigation.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/data/navigation.json b/install/data/navigation.json index 99499448b0..228f9c4b3d 100644 --- a/install/data/navigation.json +++ b/install/data/navigation.json @@ -43,8 +43,7 @@ "textClass": "visible-xs-inline", "text": "\\[\\[global:header.users\\]\\]", "properties": { - "loggedIn": true, - "hideIfPrivate": true + "loggedIn": true } }, { From 3c9431b2fcc07fdd44f9d2356942524970d114f2 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 3 Mar 2015 15:50:21 -0500 Subject: [PATCH 662/897] socket.io/plugin updated instructions to use require.main.require instead --- src/socket.io/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/plugins.js b/src/socket.io/plugins.js index 52dfeecc69..a4ee9bbe89 100644 --- a/src/socket.io/plugins.js +++ b/src/socket.io/plugins.js @@ -7,7 +7,7 @@ var SocketPlugins = {}; How? From your plugin: - var SocketPlugins = module.parent.require('./socket.io/plugins'); + var SocketPlugins = require.main.require('./src/socket.io/modules'); SocketPlugins.myPlugin = {}; SocketPlugins.myPlugin.myMethod = function() { ... }; From 6bd3c54a033b58f6b5ecd6aed69508188b54b935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 3 Mar 2015 16:16:32 -0500 Subject: [PATCH 663/897] fix findAndModify temp fix for connect-mongo create admin after categories --- src/database/mongo.js | 4 +++- src/database/mongo/hash.js | 2 +- src/database/mongo/main.js | 2 +- src/database/mongo/sorted.js | 2 +- src/install.js | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/database/mongo.js b/src/database/mongo.js index 6708d9c94b..e7ee038f96 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -74,8 +74,10 @@ db = _db; module.client = db; - + if (!nconf.get('redis')) { + // TEMP: to fix connect-mongo, see https://github.com/kcbanner/connect-mongo/issues/161 + db.openCalled = true module.sessionStore = new sessionStore({ db: db }); diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js index da1d2483d9..65157d8cb9 100644 --- a/src/database/mongo/hash.js +++ b/src/database/mongo/hash.js @@ -242,7 +242,7 @@ module.exports = function(db, module) { data[field] = value; db.collection('objects').findAndModify({_key: key}, {}, {$inc: data}, {new: true, upsert: true}, function(err, result) { - callback(err, result ? result[field] : null); + callback(err, result && result.value ? result.value[field] : null); }); }; }; \ No newline at end of file diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 8509475bc4..c2cf4883bf 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -118,7 +118,7 @@ module.exports = function(db, module) { return callback(); } db.collection('objects').findAndModify({_key: key}, {}, {$inc: {value: 1}}, {new: true, upsert: true}, function(err, result) { - callback(err, result ? result.value : null); + callback(err, result && result.value ? result.value.value : null); }); }; diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js index 565189dd8f..0c049a74ae 100644 --- a/src/database/mongo/sorted.js +++ b/src/database/mongo/sorted.js @@ -499,7 +499,7 @@ module.exports = function(db, module) { data.score = parseInt(increment, 10); db.collection('objects').findAndModify({_key: key, value: value}, {}, {$inc: data}, {new: true, upsert: true}, function(err, result) { - callback(err, result ? result.score : null); + callback(err, result && result.value ? result.value.score : null); }); }; }; \ No newline at end of file diff --git a/src/install.js b/src/install.js index f0597315d4..ded2921a0b 100644 --- a/src/install.js +++ b/src/install.js @@ -468,8 +468,8 @@ install.setup = function (callback) { setupConfig, setupDefaultConfigs, enableDefaultTheme, - createAdministrator, createCategories, + createAdministrator, createMenuItems, createWelcomePost, enableDefaultPlugins, @@ -479,7 +479,7 @@ install.setup = function (callback) { } ], function (err) { if (err) { - winston.warn('NodeBB Setup Aborted. ' + err.message); + winston.warn('NodeBB Setup Aborted.\n ' + err.stack); process.exit(); } else { callback(); From b777c448cfacd1e2b208e90a238722eeb64ab977 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 4 Mar 2015 16:03:58 -0500 Subject: [PATCH 664/897] closed #2803 --- src/socket.io/admin/groups.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/socket.io/admin/groups.js b/src/socket.io/admin/groups.js index 9700bee3ca..12dae2ceb4 100644 --- a/src/socket.io/admin/groups.js +++ b/src/socket.io/admin/groups.js @@ -17,7 +17,8 @@ Groups.create = function(socket, data, callback) { Groups.get = function(socket, groupName, callback) { groups.get(groupName, { - expand: true + expand: true, + unescape: true }, callback); }; From 68cb1350f24e5348f86b482fabb56eb6205b8b98 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 5 Mar 2015 15:41:35 -0500 Subject: [PATCH 665/897] added instructions to grabbing theme versions --- CONTRIBUTING.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c602661541..5223929285 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,6 +50,15 @@ $ git rev-parse HEAD If you have downloaded the `.zip` or `.tar.gz` packages from GitHub (or elsewhere), please let us know. +## Provide theme versions if issue is related to the theme/display + +``` bash +$ npm ls nodebb-theme-vanilla nodebb-theme-lavender +nodebb@0.7.0-dev /home/julian/Projects/nodebb/forum +├── nodebb-theme-lavender@0.2.13 +└── nodebb-theme-vanilla@0.2.35 +``` + ## Attempt to use `git bisect` If you have installed NodeBB via GitHub clone, are familiar with utilising git, and are willing to help us narrow down the specific commit that causes a bug, consider running `git bisect`. From e5343b7efc51f7a7e767135016b0da48fa84686a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 5 Mar 2015 16:21:52 -0500 Subject: [PATCH 666/897] dont display cluster warning if not running as cluster --- src/socket.io/index.js | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index aed324d520..d2f97f8186 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -163,34 +163,32 @@ function requireModules() { }); } -function authorize(socket, next) { +function authorize(socket, callback) { var handshake = socket.request, sessionID; if (!handshake) { - return next(new Error('[[error:not-authorized]]')); + return callback(new Error('[[error:not-authorized]]')); } - - cookieParser(handshake, {}, function(err) { - if (err) { - return next(err); - } - - var sessionID = handshake.signedCookies['express.sid']; - - db.sessionStore.get(sessionID, function(err, sessionData) { - if (err) { - return next(err); - } - + + async.waterfall([ + function(next) { + cookieParser(handshake, {}, next); + }, + function(next) { + var sessionID = handshake.signedCookies['express.sid']; + console.log(next, sessionID) + db.sessionStore.get(sessionID, next); + }, + function(sessionData, next) { if (sessionData && sessionData.passport && sessionData.passport.user) { socket.uid = parseInt(sessionData.passport.user, 10); } else { socket.uid = 0; } next(); - }); - }); + } + ], callback); } function addRedisAdapter(io) { @@ -201,7 +199,7 @@ function addRedisAdapter(io) { var sub = redis.connect({return_buffers: true}); io.adapter(redisAdapter({pubClient: pub, subClient: sub})); - } else { + } else if (nconf.get('isCluster') === 'true') { winston.warn('[socket.io] Clustering detected, you are advised to configure Redis as a websocket store.'); } } From 558e708576a5fcb148fec69453b40d3625481a53 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 5 Mar 2015 17:32:40 -0500 Subject: [PATCH 667/897] remove console.log --- src/socket.io/index.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index d2f97f8186..ba4f324d7c 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -70,7 +70,7 @@ function onConnect(socket) { if (err || !userData) { return; } - + socket.emit('event:connect'); if (userData.status !== 'offline') { socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.status || 'online'}); @@ -164,21 +164,18 @@ function requireModules() { } function authorize(socket, callback) { - var handshake = socket.request, - sessionID; + var handshake = socket.request; if (!handshake) { return callback(new Error('[[error:not-authorized]]')); } - + async.waterfall([ function(next) { cookieParser(handshake, {}, next); }, function(next) { - var sessionID = handshake.signedCookies['express.sid']; - console.log(next, sessionID) - db.sessionStore.get(sessionID, next); + db.sessionStore.get(handshake.signedCookies['express.sid'], next); }, function(sessionData, next) { if (sessionData && sessionData.passport && sessionData.passport.user) { From daaf61bc68348bd0f027ef4d6b1e679fef318244 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 6 Mar 2015 12:02:07 -0500 Subject: [PATCH 668/897] fixed issue where accessing a category's access control caused a client-side error --- src/socket.io/admin/categories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js index 55d8300819..5659b8aca9 100644 --- a/src/socket.io/admin/categories.js +++ b/src/socket.io/admin/categories.js @@ -68,7 +68,7 @@ Categories.getPrivilegeSettings = function(socket, cid, callback) { async.reduce(privileges, [], function(members, privilege, next) { groups.get('cid:' + cid + ':privileges:' + privilege, { expand: true }, function(err, groupObj) { if (err || !groupObj) { - return next(err, members); + return next(null, members); } members = members.concat(groupObj.members); From 607535b37ed27158e2afd2b89fb9ed1e70d1f219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 6 Mar 2015 12:28:57 -0500 Subject: [PATCH 669/897] closes #2823 --- public/src/client/search.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index 56bdaf6dca..44477cd06d 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -116,7 +116,7 @@ define('forum/search', ['search', 'autocomplete'], function(searchModule, autoco if (!searchQuery) { return; } - var searchTerms = searchQuery.split(' '); + var searchTerms = searchQuery.trim().split(' '); var regexes = []; for (var i=0; i Date: Fri, 6 Mar 2015 13:00:56 -0500 Subject: [PATCH 670/897] closes #2808 --- public/src/admin/extend/plugins.js | 14 +++++++++++++- src/plugins/install.js | 11 ++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index 220c4e1980..e2484b1f07 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -144,7 +144,7 @@ define('admin/extend/plugins', function() { socket.emit('admin.plugins.upgrade', { id: pluginID, version: version - }, function(err) { + }, function(err, isActive) { if (err) { return app.alertError(err.message); } @@ -152,6 +152,18 @@ define('admin/extend/plugins', function() { parent.find('.fa-exclamation-triangle').remove(); parent.find('.currentVersion').text(version); btn.remove(); + if (isActive) { + app.alert({ + alert_id: 'plugin_upgraded', + title: 'Plugin Upgraded', + message: 'Please reload your NodeBB to fully upgrade this plugin', + type: 'warning', + timeout: 5000, + clickfn: function() { + socket.emit('admin.reload'); + } + }); + } }); } diff --git a/src/plugins/install.js b/src/plugins/install.js index 6d6865301a..5185d38a70 100644 --- a/src/plugins/install.js +++ b/src/plugins/install.js @@ -113,7 +113,16 @@ module.exports = function(Plugins) { require('npm').load({}, next); }, function(res, next) { - require('npm').commands.install([id + '@' + (version || 'latest')], next); + require('npm').commands.install([id + '@' + (version || 'latest')], function(err, a, b) { + next(err); + }); + }, + function(next) { + Plugins.isActive(id, next); + }, + function(isActive, next) { + meta.reloadRequired = isActive; + next(null, isActive); } ], callback); } From 9915e31bc5144aac7177ce54d5ee8f66544b68f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 6 Mar 2015 13:05:22 -0500 Subject: [PATCH 671/897] closes #2826 --- src/controllers/admin/uploads.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js index 81a98ed151..193b20b6d5 100644 --- a/src/controllers/admin/uploads.js +++ b/src/controllers/admin/uploads.js @@ -31,7 +31,7 @@ uploadsController.uploadFavicon = function(req, res, next) { var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon']; if (validateUpload(req, res, next, uploadedFile, allowedTypes)) { - file.saveFileToLocal('favicon.ico', 'files', uploadedFile.path, function(err, image) { + file.saveFileToLocal('favicon.ico', 'system', uploadedFile.path, function(err, image) { fs.unlink(uploadedFile.path); if (err) { return next(err); @@ -55,7 +55,7 @@ function upload(name, req, res, next) { var allowedTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif']; if (validateUpload(req, res, next, uploadedFile, allowedTypes)) { var filename = name + path.extname(uploadedFile.name); - uploadImage(filename, 'files', uploadedFile, req, res, next); + uploadImage(filename, 'system', uploadedFile, req, res, next); } } From f14c5f7e1ced024ebe45ed2795173fba03a5e08f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 6 Mar 2015 13:40:35 -0500 Subject: [PATCH 672/897] added new hook 'action:meta.override404' so plugins can override the regular handling of pages that are not found --- src/controllers/helpers.js | 9 ++++++- src/routes/index.js | 52 ++++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 7958ace2df..dd5961839b 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -6,12 +6,19 @@ var nconf = require('nconf'), translator = require('../../public/src/translator'), categories = require('../categories'), + plugins = require('../plugins'), meta = require('../meta'); var helpers = {}; helpers.notFound = function(req, res, error) { - if (res.locals.isAPI) { + if (plugins.hasListeners('action:meta.override404')) { + plugins.fireHook('action:meta.override404', { + req: req, + res: res, + error: error + }); + } else if (res.locals.isAPI) { res.status(404).json({path: req.path.replace(/^\/api/, ''), error: error}); } else { res.status(404).render('404', {path: req.path, error: error}); diff --git a/src/routes/index.js b/src/routes/index.js index 0b951197c5..a6c51b17c9 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -173,30 +173,38 @@ module.exports = function(app, middleware) { function handle404(app, middleware) { app.use(function(req, res, next) { - var relativePath = nconf.get('relative_path'); - var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'), - isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js'); - - if (isClientScript.test(req.url)) { - res.type('text/javascript').status(200).send(''); - } else if (isLanguage.test(req.url)) { - res.status(200).json({}); - } else if (req.accepts('html')) { - if (process.env.NODE_ENV === 'development') { - winston.warn('Route requested but not found: ' + req.url); + if (!plugins.hasListeners('action:meta.override404')) { + var relativePath = nconf.get('relative_path'); + var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'), + isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js'); + + if (isClientScript.test(req.url)) { + res.type('text/javascript').status(200).send(''); + } else if (isLanguage.test(req.url)) { + res.status(200).json({}); + } else if (req.accepts('html')) { + if (process.env.NODE_ENV === 'development') { + winston.warn('Route requested but not found: ' + req.url); + } + + res.status(404); + + if (res.locals.isAPI) { + return res.json({path: req.path, error: 'not-found'}); + } + + middleware.buildHeader(req, res, function() { + res.render('404', {path: req.path}); + }); + } else { + res.status(404).type('txt').send('Not found'); } - - res.status(404); - - if (res.locals.isAPI) { - return res.json({path: req.path, error: 'not-found'}); - } - - middleware.buildHeader(req, res, function() { - res.render('404', {path: req.path}); - }); } else { - res.status(404).type('txt').send('Not found'); + plugins.fireHook('action:meta.override404', { + req: req, + res: res, + error: {} + }); } }); } From 07572b188b6d4e493de1ee12369ae551aca7a5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 6 Mar 2015 14:54:02 -0500 Subject: [PATCH 673/897] fix crash --- src/socket.io/index.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index ba4f324d7c..337320e226 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -175,15 +175,17 @@ function authorize(socket, callback) { cookieParser(handshake, {}, next); }, function(next) { - db.sessionStore.get(handshake.signedCookies['express.sid'], next); - }, - function(sessionData, next) { - if (sessionData && sessionData.passport && sessionData.passport.user) { - socket.uid = parseInt(sessionData.passport.user, 10); - } else { - socket.uid = 0; - } - next(); + db.sessionStore.get(handshake.signedCookies['express.sid'], function(err, sessionData) { + if (err) { + return next(err); + } + if (sessionData && sessionData.passport && sessionData.passport.user) { + socket.uid = parseInt(sessionData.passport.user, 10); + } else { + socket.uid = 0; + } + next(); + }); } ], callback); } From ea9fccbf2afe97b395bab580e0a58f4fd805be99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 6 Mar 2015 15:12:55 -0500 Subject: [PATCH 674/897] fix -inf +inf added test for -inf +inf --- src/database/mongo/sorted.js | 11 +++++++---- tests/database/sorted.js | 7 +++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js index 565189dd8f..5b06e22cfb 100644 --- a/src/database/mongo/sorted.js +++ b/src/database/mongo/sorted.js @@ -204,14 +204,17 @@ module.exports = function(db, module) { if (!key) { return callback(); } - var scoreQuery = {}; + + var query = {_key: key}; if (min !== '-inf') { - scoreQuery.$gte = min; + query.score = {$gte: min}; } if (max !== '+inf') { - scoreQuery.$lte = max; + query.score = query.score || {}; + query.score.$lte = max; } - db.collection('objects').count({_key: key, score: scoreQuery}, function(err, count) { + + db.collection('objects').count(query, function(err, count) { callback(err, count ? count : 0); }); }; diff --git a/tests/database/sorted.js b/tests/database/sorted.js index 68e6f587da..9e92a4c388 100644 --- a/tests/database/sorted.js +++ b/tests/database/sorted.js @@ -172,6 +172,13 @@ describe('Sorted Set methods', function() { assert.equal(count, 2); done(); }); + + db.sortedSetCount('sortedSetTest1', '-inf', '+inf', function(err, count) { + assert.equal(err, null); + assert.equal(arguments.length, 2); + assert.equal(count, 3); + done(); + }); }); }); From 00be1e07e369cbe70dace06b2d4852aa3a4f0a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 6 Mar 2015 15:21:00 -0500 Subject: [PATCH 675/897] fix test --- tests/database/sorted.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/database/sorted.js b/tests/database/sorted.js index 9e92a4c388..6680ee8716 100644 --- a/tests/database/sorted.js +++ b/tests/database/sorted.js @@ -172,13 +172,15 @@ describe('Sorted Set methods', function() { assert.equal(count, 2); done(); }); + }); + it('should return number of elements between scores -inf +inf inclusive', function(done) { db.sortedSetCount('sortedSetTest1', '-inf', '+inf', function(err, count) { assert.equal(err, null); assert.equal(arguments.length, 2); assert.equal(count, 3); done(); - }); + }); }); }); From 5821a0758f9f18d58d5134425e6c09146234276a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 6 Mar 2015 17:41:38 -0500 Subject: [PATCH 676/897] return template name as well --- src/middleware/middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 3a50e2fbf0..cd52157ec4 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -339,7 +339,7 @@ middleware.renderHeader = function(req, res, callback) { results.user.isAdmin = results.isAdmin || false; results.user.uid = parseInt(results.user.uid, 10); results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1; - + templateValues.browserTitle = results.title; templateValues.isAdmin = results.user.isAdmin; templateValues.user = results.user; @@ -376,7 +376,7 @@ middleware.processRender = function(req, res, next) { } options.loggedIn = req.user ? parseInt(req.user.uid, 10) !== 0 : false; - options.template = {}; + options.template = {name: template}; options.template[template] = true; if ('function' !== typeof fn) { From 2a8437f08f20508072297cec4c6eca6007736f3f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 6 Mar 2015 19:02:18 -0500 Subject: [PATCH 677/897] removed templates config and mapping :sheep: --- public/src/ajaxify.js | 443 ++++++++++++++------------------ public/src/app.js | 11 +- public/src/client/categories.js | 2 +- public/src/client/category.js | 2 +- public/src/client/recent.js | 2 +- public/src/client/topic.js | 2 +- public/src/client/unread.js | 4 +- public/src/modules/templates.js | 20 -- src/controllers/templates.js | 90 ------- src/middleware/middleware.js | 5 +- src/routes/api.js | 4 +- src/views/config.json | 27 -- 12 files changed, 208 insertions(+), 404 deletions(-) delete mode 100644 public/src/modules/templates.js delete mode 100644 src/controllers/templates.js delete mode 100644 src/views/config.json diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 22a85224b6..cf6c67a7a9 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -3,321 +3,266 @@ var ajaxify = ajaxify || {}; $(document).ready(function() { - require(['templates'], function (templatesModule) { - /*global app, templates, utils, socket, translator, config, RELATIVE_PATH*/ - var location = document.location || window.location, - rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''), - apiXHR = null; + /*global app, templates, utils, socket, translator, config, RELATIVE_PATH*/ + var location = document.location || window.location, + rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''), + apiXHR = null; - window.onpopstate = function (event) { - if (event !== null && event.state && event.state.url !== undefined && !ajaxify.initialLoad) { - ajaxify.go(event.state.url, function() { - $(window).trigger('action:popstate', {url: event.state.url}); - }, true); - } - }; - - ajaxify.currentPage = null; - ajaxify.initialLoad = false; - - - function onAjaxError(err, url, callback, quiet) { - var data = err.data, - textStatus = err.textStatus; - - if (data) { - var status = parseInt(data.status, 10); - - if (status === 403 || status === 404 || status === 500) { - $('#footer, #content').removeClass('hide').addClass('ajaxifying'); - return renderTemplate(url, status.toString(), data.responseJSON, (new Date()).getTime(), callback); - } else if (status === 401) { - app.alertError('[[global:please_log_in]]'); - app.previousUrl = url; - return ajaxify.go('login'); - } else if (status === 302) { - if (data.responseJSON.path) { - if (!ajaxify.go(data.responseJSON.path, callback, quiet)) { - window.location.href = data.responseJSON.path; - } - } else if (data.responseJSON) { - ajaxify.go(data.responseJSON.slice(1), callback, quiet); - } - } - } else if (textStatus !== 'abort') { - app.alertError(data.responseJSON.error); - } + window.onpopstate = function (event) { + if (event !== null && event.state && event.state.url !== undefined && !ajaxify.initialLoad) { + ajaxify.go(event.state.url, function() { + $(window).trigger('action:popstate', {url: event.state.url}); + }, true); } + }; - ajaxify.go = function (url, callback, quiet) { - // "quiet": If set to true, will not call pushState - app.enterRoom(''); + ajaxify.currentPage = null; + ajaxify.initialLoad = false; - $(window).off('scroll'); + ajaxify.go = function (url, callback, quiet) { + // "quiet": If set to true, will not call pushState + app.enterRoom(''); - if ($('#content').hasClass('ajaxifying') && apiXHR) { - apiXHR.abort(); - } - - // Remove relative path and trailing slash - url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); - - var tpl_url = ajaxify.getTemplateMapping(url); - - $(window).trigger('action:ajaxify.start', {url: url, tpl_url: tpl_url}); - - var hash = ''; - if(ajaxify.initialLoad) { - hash = window.location.hash ? window.location.hash : ''; - } + $(window).off('scroll'); - if (ajaxify.isTemplateAvailable(tpl_url) && !!!templatesModule.config.force_refresh[tpl_url]) { - ajaxify.currentPage = url; + if ($('#content').hasClass('ajaxifying') && apiXHR) { + apiXHR.abort(); + } - if (window.history && window.history.pushState) { - window.history[!quiet ? 'pushState' : 'replaceState']({ - url: url + hash - }, url, RELATIVE_PATH + '/' + url + hash); - } + // Remove relative path and trailing slash + url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); - translator.load(config.defaultLang, tpl_url); + $(window).trigger('action:ajaxify.start', {url: url}); - $('#footer, #content').removeClass('hide').addClass('ajaxifying'); + var hash = ''; + if(ajaxify.initialLoad) { + hash = window.location.hash ? window.location.hash : ''; + } - var startTime = (new Date()).getTime(); + ajaxify.currentPage = url; - ajaxify.variables.flush(); - ajaxify.loadData(url, function(err, data) { - if (err) { - return onAjaxError(err, url, callback, quiet); - } + if (window.history && window.history.pushState) { + window.history[!quiet ? 'pushState' : 'replaceState']({ + url: url + hash + }, url, RELATIVE_PATH + '/' + url + hash); + } - renderTemplate(url, tpl_url, data, startTime, callback); + $('#footer, #content').removeClass('hide').addClass('ajaxifying'); - require(['search'], function(search) { - search.topicDOM.end(); - }); - }); + var startTime = (new Date()).getTime(); - return true; + ajaxify.variables.flush(); + ajaxify.loadData(url, function(err, data) { + if (err) { + return onAjaxError(err, url, callback, quiet); } - return false; - }; + app.template = data.template.name; - function renderTemplate(url, tpl_url, data, startTime, callback) { - var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2; - $(window).trigger('action:ajaxify.loadingTemplates', {}); + translator.load(config.defaultLang, data.template.name); - templates.parse(tpl_url, data, function(template) { - translator.translate(template, function(translatedTemplate) { - setTimeout(function() { - $('#content').html(translatedTemplate); + renderTemplate(url, data.template.name, data, startTime, callback); - ajaxify.variables.parse(); + require(['search'], function(search) { + search.topicDOM.end(); + }); + }); - ajaxify.widgets.render(tpl_url, url, function() { - $(window).trigger('action:ajaxify.end', {url: url, tpl_url: tpl_url}); - }); + return true; + }; - $(window).trigger('action:ajaxify.contentLoaded', {url: url}); + function onAjaxError(err, url, callback, quiet) { + var data = err.data, + textStatus = err.textStatus; - ajaxify.loadScript(tpl_url); + if (data) { + var status = parseInt(data.status, 10); - if (typeof callback === 'function') { - callback(); - } + if (status === 403 || status === 404 || status === 500) { + $('#footer, #content').removeClass('hide').addClass('ajaxifying'); + return renderTemplate(url, status.toString(), data.responseJSON, (new Date()).getTime(), callback); + } else if (status === 401) { + app.alertError('[[global:please_log_in]]'); + app.previousUrl = url; + return ajaxify.go('login'); + } else if (status === 302) { + if (data.responseJSON.path) { + if (!ajaxify.go(data.responseJSON.path, callback, quiet)) { + window.location.href = data.responseJSON.path; + } + } else if (data.responseJSON) { + ajaxify.go(data.responseJSON.slice(1), callback, quiet); + } + } + } else if (textStatus !== 'abort') { + app.alertError(data.responseJSON.error); + } + } - app.processPage(); + function renderTemplate(url, tpl_url, data, startTime, callback) { + var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2; + $(window).trigger('action:ajaxify.loadingTemplates', {}); - $('#content, #footer').removeClass('ajaxifying'); - ajaxify.initialLoad = false; + templates.parse(tpl_url, data, function(template) { + translator.translate(template, function(translatedTemplate) { + setTimeout(function() { + $('#content').html(translatedTemplate); - app.refreshTitle(url); - }, animationDuration * 1000 - ((new Date()).getTime() - startTime)); + ajaxify.variables.parse(); - }); - }); + ajaxify.widgets.render(tpl_url, url, function() { + $(window).trigger('action:ajaxify.end', {url: url}); + }); - } + $(window).trigger('action:ajaxify.contentLoaded', {url: url}); - ajaxify.removeRelativePath = function(url) { - if (url.indexOf(RELATIVE_PATH.slice(1)) === 0) { - url = url.slice(RELATIVE_PATH.length); - } - return url; - }; + ajaxify.loadScript(tpl_url); - ajaxify.refresh = function() { - ajaxify.go(ajaxify.currentPage); - }; + if (typeof callback === 'function') { + callback(); + } - ajaxify.loadScript = function(tpl_url, callback) { - var location = !app.inAdmin ? 'forum/' : ''; + app.processPage(); - require([location + tpl_url], function(script) { - if (script && script.init) { - script.init(); - } + $('#content, #footer').removeClass('ajaxifying'); + ajaxify.initialLoad = false; + + app.refreshTitle(url); + }, animationDuration * 1000 - ((new Date()).getTime() - startTime)); - if (callback) { - callback(); - } }); - }; + }); - ajaxify.isTemplateAvailable = function(tpl) { - return $.inArray(tpl + '.tpl', templatesModule.available) !== -1; - }; + } - ajaxify.getTemplateMapping = function(url) { - var tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]); + ajaxify.removeRelativePath = function(url) { + if (url.indexOf(RELATIVE_PATH.slice(1)) === 0) { + url = url.slice(RELATIVE_PATH.length); + } + return url; + }; - if (tpl_url === false && !templates[url]) { - tpl_url = url.split('/'); + ajaxify.refresh = function() { + ajaxify.go(ajaxify.currentPage); + }; - while(tpl_url.length) { - if (ajaxify.isTemplateAvailable(tpl_url.join('/'))) { - tpl_url = tpl_url.join('/'); - break; - } - tpl_url.pop(); - } + ajaxify.loadScript = function(tpl_url, callback) { + var location = !app.inAdmin ? 'forum/' : ''; - if (!tpl_url.length) { - tpl_url = url.split('/')[0].split('?')[0]; - } - } else if (templates[url]) { - tpl_url = url; + require([location + tpl_url], function(script) { + if (script && script.init) { + script.init(); } - return tpl_url; - }; - - ajaxify.getCustomTemplateMapping = function(tpl) { - if (templatesModule.config && templatesModule.config.custom_mapping && tpl !== undefined) { - for (var pattern in templatesModule.config.custom_mapping) { - if (templatesModule.config.custom_mapping.hasOwnProperty(pattern)) { - var match = tpl.match(pattern); - if (match && match[0] === tpl) { - return (templatesModule.config.custom_mapping[pattern]); - } - } - } + if (callback) { + callback(); } + }); + }; - return false; - }; + ajaxify.loadData = function(url, callback) { + url = ajaxify.removeRelativePath(url); - ajaxify.loadData = function(url, callback) { - url = ajaxify.removeRelativePath(url); + $(window).trigger('action:ajaxify.loadingData', {url: url}); - $(window).trigger('action:ajaxify.loadingData', {url: url}); + var location = document.location || window.location; - var location = document.location || window.location, - tpl_url = ajaxify.getCustomTemplateMapping(url.split('?')[0]); + apiXHR = $.ajax({ + url: RELATIVE_PATH + '/api/' + url, + cache: false, + success: function(data) { + if (!data) { + return; + } - if (!tpl_url) { - tpl_url = ajaxify.getTemplateMapping(url); - } + data.relative_path = RELATIVE_PATH; - apiXHR = $.ajax({ - url: RELATIVE_PATH + '/api/' + url, - cache: false, + if (callback) { + callback(null, data); + } + }, + error: function(data, textStatus) { + callback({ + data: data, + textStatus: textStatus + }); + } + }); + }; + + ajaxify.loadTemplate = function(template, callback) { + if (templates.cache[template]) { + callback(templates.cache[template]); + } else { + $.ajax({ + url: RELATIVE_PATH + '/templates/' + template + '.tpl' + (config['cache-buster'] ? '?v=' + config['cache-buster'] : ''), + type: 'GET', success: function(data) { - if (!data) { - return; - } - - data.relative_path = RELATIVE_PATH; - - if (callback) { - callback(null, data); - } + callback(data.toString()); }, - error: function(data, textStatus) { - callback({ - data: data, - textStatus: textStatus - }); + error: function(error) { + throw new Error("Unable to load template: " + template + " (" + error.statusText + ")"); } }); - }; - - ajaxify.loadTemplate = function(template, callback) { - if (templates.cache[template]) { - callback(templates.cache[template]); - } else { - $.ajax({ - url: RELATIVE_PATH + '/templates/' + template + '.tpl' + (config['cache-buster'] ? '?v=' + config['cache-buster'] : ''), - type: 'GET', - success: function(data) { - callback(data.toString()); - }, - error: function(error) { - throw new Error("Unable to load template: " + template + " (" + error.statusText + ")"); - } - }); - } - }; + } + }; - $('document').ready(function () { - templates.registerLoader(ajaxify.loadTemplate); - templatesModule.refresh(app.load); + function ajaxifyAnchors() { + templates.registerLoader(ajaxify.loadTemplate); - if (!window.history || !window.history.pushState) { - return; // no ajaxification for old browsers - } - - function hrefEmpty(href) { - return href === undefined || href === '' || href === 'javascript:;' || href === window.location.href + "#" || href.slice(0, 1) === "#"; - } + if (!window.history || !window.history.pushState) { + return; // no ajaxification for old browsers + } - // Enhancing all anchors to ajaxify... - $(document.body).on('click', 'a', function (e) { - if (this.target !== '') { - return; - } else if (hrefEmpty(this.href) || this.protocol === 'javascript:' || $(this).attr('data-ajaxify') === 'false') { - return e.preventDefault(); - } + function hrefEmpty(href) { + return href === undefined || href === '' || href === 'javascript:;' || href === window.location.href + "#" || href.slice(0, 1) === "#"; + } - if (!window.location.pathname.match(/\/(403|404)$/g)) { - app.previousUrl = window.location.href; - } + // Enhancing all anchors to ajaxify... + $(document.body).on('click', 'a', function (e) { + if (this.target !== '') { + return; + } else if (hrefEmpty(this.href) || this.protocol === 'javascript:' || $(this).attr('data-ajaxify') === 'false') { + return e.preventDefault(); + } - if (!e.ctrlKey && !e.shiftKey && !e.metaKey && e.which === 1) { - if (this.host === '' || this.host === window.location.host) { - // Internal link - var url = this.href.replace(rootUrl + '/', ''); + if (!window.location.pathname.match(/\/(403|404)$/g)) { + app.previousUrl = window.location.href; + } - if(window.location.pathname === this.pathname && this.hash) { - if (this.hash !== window.location.hash) { - window.location.hash = this.hash; - } + if (!e.ctrlKey && !e.shiftKey && !e.metaKey && e.which === 1) { + if (this.host === '' || this.host === window.location.host) { + // Internal link + var url = this.href.replace(rootUrl + '/', ''); - ajaxify.loadScript(ajaxify.getTemplateMapping(url)); - e.preventDefault(); - } else { - if (ajaxify.go(url)) { - e.preventDefault(); - } + if(window.location.pathname === this.pathname && this.hash) { + if (this.hash !== window.location.hash) { + window.location.hash = this.hash; } - } else if (window.location.pathname !== '/outgoing') { - // External Link - if (config.openOutgoingLinksInNewTab) { - window.open(this.href, '_blank'); - e.preventDefault(); - } else if (config.useOutgoingLinksPage) { - ajaxify.go('outgoing?url=' + encodeURIComponent(this.href)); + + e.preventDefault(); + } else { + if (ajaxify.go(url)) { e.preventDefault(); } } + } else if (window.location.pathname !== '/outgoing') { + // External Link + if (config.openOutgoingLinksInNewTab) { + window.open(this.href, '_blank'); + e.preventDefault(); + } else if (config.useOutgoingLinksPage) { + ajaxify.go('outgoing?url=' + encodeURIComponent(this.href)); + e.preventDefault(); + } } - }); - + } }); + } + + ajaxifyAnchors(); + app.load(); - }); }); \ No newline at end of file diff --git a/public/src/app.js b/public/src/app.js index 530ff81732..8c5c0201a3 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -482,16 +482,12 @@ app.cacheBuster = null; app.load = function() { $('document').ready(function () { var url = ajaxify.removeRelativePath(window.location.pathname.slice(1).replace(/\/$/, "")), - tpl_url = ajaxify.getTemplateMapping(url), + tpl_url = app.template, search = window.location.search, hash = window.location.hash, $window = $(window); - - $window.trigger('action:ajaxify.start', { - url: url, - tpl_url: tpl_url - }); + $window.trigger('action:ajaxify.start', {url: url}); collapseNavigationOnClick(); @@ -532,8 +528,7 @@ app.cacheBuster = null; ajaxify.widgets.render(tpl_url, url, function() { app.processPage(); $window.trigger('action:ajaxify.end', { - url: url, - tpl_url: tpl_url + url: url }); }); }); diff --git a/public/src/client/categories.js b/public/src/client/categories.js index 6840f69e89..d3cf1cae43 100644 --- a/public/src/client/categories.js +++ b/public/src/client/categories.js @@ -6,7 +6,7 @@ define('forum/categories', function() { var categories = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if (data.tpl_url !== 'categories') { + if (ajaxify.currentPage !== data.url) { socket.removeListener('event:new_post', categories.onNewPost); } }); diff --git a/public/src/client/category.js b/public/src/client/category.js index ec3992283d..3b6a0e69b9 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -13,7 +13,7 @@ define('forum/category', [ var Category = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if(data && data.tpl_url !== 'category') { + if (ajaxify.currentPage !== data.url) { navigator.hide(); removeListeners(); diff --git a/public/src/client/recent.js b/public/src/client/recent.js index 9bc840d125..bdf8897151 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -9,7 +9,7 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) { newPostCount = 0; $(window).on('action:ajaxify.start', function(ev, data) { - if (data.tpl_url !== 'recent') { + if (ajaxify.currentPage !== data.url) { Recent.removeListeners(); } }); diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 480c2d8aab..75f0cc6879 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -18,7 +18,7 @@ define('forum/topic', [ currentUrl = ''; $(window).on('action:ajaxify.start', function(ev, data) { - if(data.tpl_url !== 'topic') { + if (ajaxify.currentPage !=== data.url) { navigator.hide(); $('.header-topic-title').find('span').text('').hide(); app.removeAlert('bookmark'); diff --git a/public/src/client/unread.js b/public/src/client/unread.js index 994d4e1ddb..7e08037f5a 100644 --- a/public/src/client/unread.js +++ b/public/src/client/unread.js @@ -6,7 +6,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], var Unread = {}; $(window).on('action:ajaxify.start', function(ev, data) { - if (data.tpl_url !== 'unread') { + if (ajaxify.currentPage !== data.url) { recent.removeListeners(); } }); @@ -130,7 +130,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], function createCategoryLink(category) { var link = $(''); - + if (category.icon) { link.append(' ' + category.name); } else { diff --git a/public/src/modules/templates.js b/public/src/modules/templates.js deleted file mode 100644 index 12b7cf7006..0000000000 --- a/public/src/modules/templates.js +++ /dev/null @@ -1,20 +0,0 @@ -"use strict"; - -/*globals define, RELATIVE_PATH*/ - -define('templates', function() { - var Templates = {}; - - Templates.refresh = function(callback) { - $.getJSON(RELATIVE_PATH + '/api/get_templates_listing', function (data) { - Templates.config = data.templatesConfig; - Templates.available = data.availableTemplates; - - if (callback) { - callback(); - } - }); - }; - - return Templates; -}); \ No newline at end of file diff --git a/src/controllers/templates.js b/src/controllers/templates.js deleted file mode 100644 index dbf0be4870..0000000000 --- a/src/controllers/templates.js +++ /dev/null @@ -1,90 +0,0 @@ -"use strict"; - -var async = require('async'), - nconf = require('nconf'), - fs = require('fs'), - path = require('path'), - meta = require('../meta'), - plugins = require('../plugins'), - utils = require('../../public/src/utils'), - templatesController = {}; - - -var availableTemplatesCache = null; -var configCache = null; - -templatesController.getTemplatesListing = function(req, res, next) { - async.parallel({ - availableTemplates: function(next) { - getAvailableTemplates(next); - }, - templatesConfig: function(next) { - async.waterfall([ - function(next) { - readConfigFile(next); - }, - function(config, next) { - config.custom_mapping['^/?$'] = meta.config.homePageRoute || 'categories'; - - plugins.fireHook('filter:templates.get_config', config, next); - } - ], next); - }, - }, function(err, results) { - if (err) { - return next(err); - } - - res.json(results); - }); -}; - -function readConfigFile(callback) { - if (configCache) { - return callback(null, configCache); - } - fs.readFile(path.join(nconf.get('views_dir'), 'config.json'), function(err, config) { - if (err) { - return callback(err); - } - try { - config = JSON.parse(config.toString()); - } catch (err) { - return callback(err); - } - configCache = config; - callback(null, config); - }); -} - -function getAvailableTemplates(callback) { - if (availableTemplatesCache) { - return callback(null, availableTemplatesCache); - } - - async.parallel({ - views: function(next) { - utils.walk(nconf.get('views_dir'), next); - }, - extended: function(next) { - plugins.fireHook('filter:templates.get_virtual', [], next); - } - }, function(err, results) { - if (err) { - return callback(err); - } - var availableTemplates = results.views.filter(function(value, index, self) { - return value && self.indexOf(value) === index; - }).map(function(el) { - return el && el.replace(nconf.get('views_dir') + '/', ''); - }); - - availableTemplatesCache = availableTemplates.concat(results.extended); - callback(null, availableTemplatesCache); - }); - -} - - - -module.exports = templatesController; diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index cd52157ec4..00087e84a9 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -348,6 +348,9 @@ middleware.renderHeader = function(req, res, callback) { templateValues.customJS = results.customJS; templateValues.maintenanceHeader = parseInt(meta.config.maintenanceMode, 10) === 1 && !results.isAdmin; + templateValues.template = {name: res.locals.template}; + templateValues.template[res.locals.template] = true; + app.render('header', templateValues, callback); }); }); @@ -378,6 +381,7 @@ middleware.processRender = function(req, res, next) { options.loggedIn = req.user ? parseInt(req.user.uid, 10) !== 0 : false; options.template = {name: template}; options.template[template] = true; + res.locals.template = template; if ('function' !== typeof fn) { fn = defaultFn; @@ -453,7 +457,6 @@ middleware.maintenanceMode = function(req, res, next) { '/nodebb.min.js', '/vendor/fontawesome/fonts/fontawesome-webfont.woff', '/src/modules/[\\w]+\.js', - '/api/get_templates_listing', '/api/login', '/api/?', '/language/.+' diff --git a/src/routes/api.js b/src/routes/api.js index ef1c297e49..88c3686850 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -4,8 +4,7 @@ var express = require('express'), posts = require('../posts'), categories = require('../categories'), - uploadsController = require('../controllers/uploads'), - templatesController = require('../controllers/templates'); + uploadsController = require('../controllers/uploads'); module.exports = function(app, middleware, controllers) { @@ -17,7 +16,6 @@ module.exports = function(app, middleware, controllers) { router.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID); router.get('/post/:pid', controllers.posts.getPost); - router.get('/get_templates_listing', templatesController.getTemplatesListing); router.get('/categories/:cid/moderators', getModerators); router.get('/recent/posts/:term?', getRecentPosts); diff --git a/src/views/config.json b/src/views/config.json deleted file mode 100644 index f8a04fa620..0000000000 --- a/src/views/config.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "custom_mapping": { - "^\/?$": "categories", - "^admin?$": "admin/general/dashboard", - "^users/sort-posts": "users", - "^users/latest": "users", - "^users/sort-reputation": "users", - "^users/search": "users", - "^user/.*/edit": "account/edit", - "^user/.*/following": "account/following", - "^user/.*/followers": "account/followers", - "^user/.*/settings": "account/settings", - "^user/.*/favourites": "account/favourites", - "^user/.*/watched": "account/watched", - "^user/.*/posts": "account/posts", - "^user/.*/topics": "account/topics", - "^user/.*/groups": "account/groups", - "^user/[^\/]+": "account/profile", - "^reset/.*": "reset_code", - "^tags/.*": "tag", - "^groups/?$": "groups/list", - "^groups/.*": "groups/details" - }, - "force_refresh": { - "logout": true - } -} From c15a289d2a7065365eac54af71bef4bcfa06e602 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 6 Mar 2015 19:05:51 -0500 Subject: [PATCH 678/897] fix check --- public/src/client/topic.js | 2 +- src/views/admin/header.tpl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 75f0cc6879..9acd1a4d73 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -18,7 +18,7 @@ define('forum/topic', [ currentUrl = ''; $(window).on('action:ajaxify.start', function(ev, data) { - if (ajaxify.currentPage !=== data.url) { + if (ajaxify.currentPage !== data.url) { navigator.hide(); $('.header-topic-title').find('span').text('').hide(); app.removeAlert('bookmark'); diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 4193857410..a2b3a4c8e7 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -11,7 +11,9 @@ From 3809b331bc30d3562b4feb90999ca7b862cf664e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 6 Mar 2015 19:38:10 -0500 Subject: [PATCH 679/897] acp shenans --- src/middleware/admin.js | 137 +++++++++++++++++++---------------- src/middleware/middleware.js | 15 ++-- 2 files changed, 79 insertions(+), 73 deletions(-) diff --git a/src/middleware/admin.js b/src/middleware/admin.js index a23781fdef..1d6c0dae6a 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -32,77 +32,86 @@ middleware.isAdmin = function(req, res, next) { }; middleware.buildHeader = function(req, res, next) { + res.locals.renderAdminHeader = true; + + async.parallel({ + config: function(next) { + controllers.api.getConfig(req, res, next); + }, + footer: function(next) { + app.render('admin/footer', {}, next); + } + }, function(err, results) { + if (err) { + return next(err); + } + + res.locals.config = results.config; + res.locals.adminFooter = results.footer; + next(); + }); +}; + +middleware.renderHeader = function(req, res, next) { var uid = req.user ? req.user.uid : 0; - async.parallel([ - function(next) { - var custom_header = { - 'plugins': [], - 'authentication': [] - }; - user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) { - if (err) { - return next(err); - } - - userData.uid = uid; - userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1; - - async.parallel({ - scripts: function(next) { - plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) { - if (err) { - return next(err); - } - var arr = []; - scripts.forEach(function(script) { - arr.push({src: nconf.get('url') + script}); - }); - - next(null, arr); - }); - }, - custom_header: function(next) { - plugins.fireHook('filter:admin.header.build', custom_header, next); - }, - config: function(next) { - controllers.api.getConfig(req, res, next); - } - }, function(err, results) { + var custom_header = { + 'plugins': [], + 'authentication': [] + }; + + user.getUserFields(uid, ['username', 'userslug', 'email', 'picture', 'email:confirmed'], function(err, userData) { + if (err) { + return next(err); + } + + userData.uid = uid; + userData['email:confirmed'] = parseInt(userData['email:confirmed'], 10) === 1; + + async.parallel({ + scripts: function(next) { + plugins.fireHook('filter:admin.scripts.get', [], function(err, scripts) { if (err) { return next(err); } - res.locals.config = results.config; - - var data = { - relative_path: nconf.get('relative_path'), - configJSON: JSON.stringify(results.config), - user: userData, - userJSON: JSON.stringify(userData), - plugins: results.custom_header.plugins, - authentication: results.custom_header.authentication, - scripts: results.scripts, - 'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '', - env: process.env.NODE_ENV ? true : false - }; - - app.render('admin/header', data, function(err, template) { - if (err) { - return next(err); - } - res.locals.adminHeader = template; - next(); + var arr = []; + scripts.forEach(function(script) { + arr.push({src: nconf.get('url') + script}); }); + + next(null, arr); }); - }); - }, - function(next) { - app.render('admin/footer', {}, function(err, template) { - res.locals.adminFooter = template; - next(err); - }); - } - ], next); + }, + custom_header: function(next) { + plugins.fireHook('filter:admin.header.build', custom_header, next); + }, + config: function(next) { + controllers.api.getConfig(req, res, next); + } + }, function(err, results) { + if (err) { + return next(err); + } + res.locals.config = results.config; + + var data = { + relative_path: nconf.get('relative_path'), + configJSON: JSON.stringify(results.config), + user: userData, + userJSON: JSON.stringify(userData), + plugins: results.custom_header.plugins, + authentication: results.custom_header.authentication, + scripts: results.scripts, + 'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '', + env: process.env.NODE_ENV ? true : false, + }; + + data.template = {name: res.locals.template}; + data.template[res.locals.template] = true; + + app.render('admin/header', data, next); + }); + }); }; module.exports = function(webserver) { diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 00087e84a9..85cc10c908 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -284,7 +284,6 @@ middleware.renderHeader = function(req, res, callback) { href: nconf.get('relative_path') + '/favicon.ico' }); - async.parallel({ customCSS: function(next) { templateValues.useCustomCSS = parseInt(meta.config.useCustomCSS, 10) === 1; @@ -401,20 +400,18 @@ middleware.processRender = function(req, res, next) { str = str + res.locals.adminFooter; } - if (res.locals.renderHeader) { - middleware.renderHeader(req, res, function(err, template) { + if (res.locals.renderHeader || res.locals.renderAdminHeader) { + var method = res.locals.renderHeader ? middleware.renderHeader : middleware.admin.renderHeader; + method(req, res, function(err, template) { + if (err) { + return fn(err); + } str = template + str; var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB'; translator.translate(str, language, function(translated) { fn(err, translated); }); }); - } else if (res.locals.adminHeader) { - str = res.locals.adminHeader + str; - var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB'; - translator.translate(str, language, function(translated) { - fn(err, translated); - }); } else { fn(err, str); } From 23a6b33f6411b818e718ee2e9814d1201df51abe Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 6 Mar 2015 19:45:27 -0500 Subject: [PATCH 680/897] not used --- public/src/ajaxify.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index cf6c67a7a9..e5c7bdec53 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -167,8 +167,6 @@ $(document).ready(function() { $(window).trigger('action:ajaxify.loadingData', {url: url}); - var location = document.location || window.location; - apiXHR = $.ajax({ url: RELATIVE_PATH + '/api/' + url, cache: false, From 63a6702285e7789fff144fdafb2d17224806177c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 6 Mar 2015 19:48:12 -0500 Subject: [PATCH 681/897] removed whitespace --- public/src/ajaxify.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index e5c7bdec53..e60d80e83d 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -131,10 +131,8 @@ $(document).ready(function() { app.refreshTitle(url); }, animationDuration * 1000 - ((new Date()).getTime() - startTime)); - }); }); - } ajaxify.removeRelativePath = function(url) { From 289474edf7c3cb2abea7c61e52af567ff7276942 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Mar 2015 00:25:55 -0500 Subject: [PATCH 682/897] closes #2827 --- public/src/ajaxify.js | 66 ++++++++++++++++++++++--------------------- public/src/app.js | 31 ++------------------ 2 files changed, 36 insertions(+), 61 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index e60d80e83d..b63e2dbadf 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -11,7 +11,7 @@ $(document).ready(function() { apiXHR = null; window.onpopstate = function (event) { - if (event !== null && event.state && event.state.url !== undefined && !ajaxify.initialLoad) { + if (event !== null && event.state && event.state.url !== undefined) { ajaxify.go(event.state.url, function() { $(window).trigger('action:popstate', {url: event.state.url}); }, true); @@ -19,10 +19,8 @@ $(document).ready(function() { }; ajaxify.currentPage = null; - ajaxify.initialLoad = false; ajaxify.go = function (url, callback, quiet) { - // "quiet": If set to true, will not call pushState app.enterRoom(''); $(window).off('scroll'); @@ -31,23 +29,7 @@ $(document).ready(function() { apiXHR.abort(); } - // Remove relative path and trailing slash - url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); - - $(window).trigger('action:ajaxify.start', {url: url}); - - var hash = ''; - if(ajaxify.initialLoad) { - hash = window.location.hash ? window.location.hash : ''; - } - - ajaxify.currentPage = url; - - if (window.history && window.history.pushState) { - window.history[!quiet ? 'pushState' : 'replaceState']({ - url: url + hash - }, url, RELATIVE_PATH + '/' + url + hash); - } + url = ajaxify.start(url, quiet); $('#footer, #content').removeClass('hide').addClass('ajaxifying'); @@ -73,6 +55,23 @@ $(document).ready(function() { return true; }; + ajaxify.start = function(url, quiet) { + url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); + var hash = window.location.hash; + var search = window.location.search; + + ajaxify.currentPage = url; + + $(window).trigger('action:ajaxify.start', {url: url}); + + if (window.history && window.history.pushState) { + window.history[!quiet ? 'pushState' : 'replaceState']({ + url: url + search + hash + }, url, RELATIVE_PATH + '/' + url + search + hash); + } + return url; + }; + function onAjaxError(err, url, callback, quiet) { var data = err.data, textStatus = err.textStatus; @@ -110,24 +109,13 @@ $(document).ready(function() { setTimeout(function() { $('#content').html(translatedTemplate); - ajaxify.variables.parse(); - - ajaxify.widgets.render(tpl_url, url, function() { - $(window).trigger('action:ajaxify.end', {url: url}); - }); - - $(window).trigger('action:ajaxify.contentLoaded', {url: url}); - - ajaxify.loadScript(tpl_url); + ajaxify.end(url, tpl_url); if (typeof callback === 'function') { callback(); } - app.processPage(); - $('#content, #footer').removeClass('ajaxifying'); - ajaxify.initialLoad = false; app.refreshTitle(url); }, animationDuration * 1000 - ((new Date()).getTime() - startTime)); @@ -135,6 +123,20 @@ $(document).ready(function() { }); } + ajaxify.end = function(url, tpl_url) { + ajaxify.variables.parse(); + + ajaxify.loadScript(tpl_url); + + ajaxify.widgets.render(tpl_url, url, function() { + $(window).trigger('action:ajaxify.end', {url: url}); + }); + + $(window).trigger('action:ajaxify.contentLoaded', {url: url}); + + app.processPage(); + }; + ajaxify.removeRelativePath = function(url) { if (url.indexOf(RELATIVE_PATH.slice(1)) === 0) { url = url.slice(RELATIVE_PATH.length); diff --git a/public/src/app.js b/public/src/app.js index 8c5c0201a3..bd914e1e54 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -481,13 +481,8 @@ app.cacheBuster = null; app.load = function() { $('document').ready(function () { - var url = ajaxify.removeRelativePath(window.location.pathname.slice(1).replace(/\/$/, "")), - tpl_url = app.template, - search = window.location.search, - hash = window.location.hash, - $window = $(window); - - $window.trigger('action:ajaxify.start', {url: url}); + var url = ajaxify.start(window.location.pathname.slice(1), true); + ajaxify.end(url, app.template); collapseNavigationOnClick(); @@ -511,28 +506,6 @@ app.cacheBuster = null; createHeaderTooltips(); showEmailConfirmWarning(); - ajaxify.variables.parse(); - ajaxify.currentPage = url; - - $window.trigger('action:ajaxify.contentLoaded', { - url: url - }); - - if (window.history && window.history.replaceState) { - window.history.replaceState({ - url: url + search + hash - }, url, RELATIVE_PATH + '/' + url + search + hash); - } - - ajaxify.loadScript(tpl_url, function() { - ajaxify.widgets.render(tpl_url, url, function() { - app.processPage(); - $window.trigger('action:ajaxify.end', { - url: url - }); - }); - }); - socket.removeAllListeners('event:nodebb.ready'); socket.on('event:nodebb.ready', function(cacheBusters) { if ( From 3dd337bd341237682b2aaced0823227105ffb7a8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Mar 2015 00:59:03 -0500 Subject: [PATCH 683/897] closes #2829 --- src/plugins/load.js | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/plugins/load.js b/src/plugins/load.js index 4bd432f582..89b38fdc64 100644 --- a/src/plugins/load.js +++ b/src/plugins/load.js @@ -22,15 +22,7 @@ module.exports = function(Plugins) { return callback(); } - if (pluginData.compatibility && semver.validRange(pluginData.compatibility)) { - if (!semver.gtr(pkg.version, pluginData.compatibility)) { - // NodeBB may not be new enough to run this plugin - process.stdout.write('\n'); - winston.warn('[plugins/' + pluginData.id + '] This plugin may not be compatible with your version of NodeBB. This may cause unintended behaviour or crashing.'); - winston.warn('[plugins/' + pluginData.id + '] In the event of an unresponsive NodeBB caused by this plugin, run ./nodebb reset plugin="' + pluginData.id + '".'); - process.stdout.write('\n'); - } - } + versionWarning(pluginData); async.parallel([ function(next) { @@ -63,6 +55,23 @@ module.exports = function(Plugins) { }); }; + function versionWarning(pluginData) { + function display() { + process.stdout.write('\n'); + winston.warn('[plugins/' + pluginData.id + '] This plugin may not be compatible with your version of NodeBB. This may cause unintended behaviour or crashing.'); + winston.warn('[plugins/' + pluginData.id + '] In the event of an unresponsive NodeBB caused by this plugin, run ./nodebb reset plugin="' + pluginData.id + '".'); + process.stdout.write('\n'); + } + + if (pluginData.nbbpm && pluginData.nbbpm.compatibility && semver.validRange(pluginData.nbbpm.compatibility)) { + if (!semver.gtr(pkg.version, pluginData.nbbpm.compatibility)) { + display(); + } + } else { + display(); + } + } + function registerHooks(pluginData, pluginPath, callback) { function libraryNotFound() { winston.warn('[plugins.reload] Library not found for plugin: ' + pluginData.id); From 42eadc72a405d68c4b9d285888406d7be891344b Mon Sep 17 00:00:00 2001 From: Mega Date: Sat, 7 Mar 2015 13:17:07 +0300 Subject: [PATCH 684/897] Click on "Delete" btn in ACP > General > Navigation causes redirect. --- public/src/admin/general/navigation.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index 95f41b3510..9bd684ec80 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -18,7 +18,7 @@ define('admin/general/navigation', function() { stop: drop }); }); - + $('#enabled') .on('click', '.delete', remove) .on('click', '.toggle', toggle) @@ -75,6 +75,7 @@ define('admin/general/navigation', function() { function remove() { $(this).parents('li').remove(); + return false; } function toggle() { From f87f797bed6fd55136a7254461236eacee251f8f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Mar 2015 13:52:02 -0500 Subject: [PATCH 685/897] dont keep window.location.search on regular ajaxify --- public/src/ajaxify.js | 5 ++--- public/src/app.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index b63e2dbadf..16b0c5bbf2 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -55,11 +55,10 @@ $(document).ready(function() { return true; }; - ajaxify.start = function(url, quiet) { + ajaxify.start = function(url, quiet, search) { url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); var hash = window.location.hash; - var search = window.location.search; - + search = search || ''; ajaxify.currentPage = url; $(window).trigger('action:ajaxify.start', {url: url}); diff --git a/public/src/app.js b/public/src/app.js index bd914e1e54..53e43e86fc 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -481,7 +481,7 @@ app.cacheBuster = null; app.load = function() { $('document').ready(function () { - var url = ajaxify.start(window.location.pathname.slice(1), true); + var url = ajaxify.start(window.location.pathname.slice(1), true, window.location.search); ajaxify.end(url, app.template); collapseNavigationOnClick(); From dc94fe2b6c478ab340264ac5e3df99bfb5ff7875 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Mar 2015 20:19:00 -0500 Subject: [PATCH 686/897] move admin upload routes to api namespace move usrrs/csv to api namespace --- public/src/admin/manage/categories.js | 4 ++-- src/file.js | 5 +---- src/routes/admin.js | 17 ++++++++--------- src/views/admin/manage/users.tpl | 2 +- src/views/admin/settings/general.tpl | 4 ++-- src/views/admin/settings/user.tpl | 2 +- 6 files changed, 15 insertions(+), 19 deletions(-) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 63105b73f1..a9cf3b60e8 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -207,7 +207,7 @@ define('admin/manage/categories', [ case 'name': data[name] = $(this).val() + ' (copy)'; break; - default: + default: data[name] = $(this).val(); } }); @@ -226,7 +226,7 @@ define('admin/manage/categories', [ var inputEl = $(this), cid = inputEl.parents('li[data-cid]').attr('data-cid'); - uploader.open(RELATIVE_PATH + '/admin/category/uploadpicture', { cid: cid }, 0, function(imageUrlOnServer) { + uploader.open(RELATIVE_PATH + '/api/admin/category/uploadpicture', { cid: cid }, 0, function(imageUrlOnServer) { inputEl.val(imageUrlOnServer); var previewBox = inputEl.parents('li[data-cid]').find('.preview-box'); previewBox.css('background', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')') diff --git a/src/file.js b/src/file.js index a3b594f326..543c5011fa 100644 --- a/src/file.js +++ b/src/file.js @@ -27,10 +27,7 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) { }); }); - os.on('error', function (err) { - winston.error(err.message); - callback(err); - }); + os.on('error', callback); is.pipe(os); }; diff --git a/src/routes/admin.js b/src/routes/admin.js index 85a3a8ddc5..4a7e7ef460 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -3,19 +3,18 @@ var express = require('express'); -function apiRoutes(app, middleware, controllers) { - // todo, needs to be in api namespace - app.get('/users/csv', middleware.authenticate, controllers.admin.users.getCSV); +function apiRoutes(router, middleware, controllers) { + router.get('/users/csv', middleware.authenticate, controllers.admin.users.getCSV); var multipart = require('connect-multiparty'); var multipartMiddleware = multipart(); var middlewares = [multipartMiddleware, middleware.validateFiles, middleware.applyCSRF, middleware.authenticate]; - app.post('/category/uploadpicture', middlewares, controllers.admin.uploads.uploadCategoryPicture); - app.post('/uploadfavicon', middlewares, controllers.admin.uploads.uploadFavicon); - app.post('/uploadlogo', middlewares, controllers.admin.uploads.uploadLogo); - app.post('/uploadgravatardefault', middlewares, controllers.admin.uploads.uploadGravatarDefault); + router.post('/category/uploadpicture', middlewares, controllers.admin.uploads.uploadCategoryPicture); + router.post('/uploadfavicon', middlewares, controllers.admin.uploads.uploadFavicon); + router.post('/uploadlogo', middlewares, controllers.admin.uploads.uploadLogo); + router.post('/uploadgravatardefault', middlewares, controllers.admin.uploads.uploadGravatarDefault); } function adminRouter(middleware, controllers) { @@ -25,8 +24,6 @@ function adminRouter(middleware, controllers) { addRoutes(router, middleware, controllers); - apiRoutes(router, middleware, controllers); - return router; } @@ -35,6 +32,8 @@ function apiRouter(middleware, controllers) { addRoutes(router, middleware, controllers); + apiRoutes(router, middleware, controllers); + return router; } diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index a4997c49e0..37b993dba7 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -129,7 +129,7 @@
    Users Control Panel
    - Download CSV + Download CSV
    • diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl index 063d7c34e7..65039333ee 100644 --- a/src/views/admin/settings/general.tpl +++ b/src/views/admin/settings/general.tpl @@ -34,7 +34,7 @@

    - +
    @@ -45,7 +45,7 @@


    - +
    diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl index cc11b93727..c0c1ca8ab3 100644 --- a/src/views/admin/settings/user.tpl +++ b/src/views/admin/settings/user.tpl @@ -67,7 +67,7 @@

    - +
    From d00f8a3d27a3a32f9f6b38318e646da068581826 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Mar 2015 20:27:23 -0500 Subject: [PATCH 687/897] added uploads/system --- .gitignore | 2 +- public/uploads/system/.gitignore | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 public/uploads/system/.gitignore diff --git a/.gitignore b/.gitignore index 2f966c4535..73c0c4170a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,7 @@ pidfile /public/templates /public/sounds -/public/uploads + # compiled files /public/stylesheet.css diff --git a/public/uploads/system/.gitignore b/public/uploads/system/.gitignore new file mode 100644 index 0000000000..e69de29bb2 From a5bf991cf06ad900543391a9d940ebbf852042d0 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Mar 2015 20:27:46 -0500 Subject: [PATCH 688/897] ignored public/uploads again --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 73c0c4170a..2f966c4535 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,7 @@ pidfile /public/templates /public/sounds - +/public/uploads # compiled files /public/stylesheet.css From e5dc408ef517a49fc45af1abf6f9563be986667d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 7 Mar 2015 21:59:21 -0500 Subject: [PATCH 689/897] change current page after ajaxify:start event --- public/src/ajaxify.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 16b0c5bbf2..74c588a1ed 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -59,10 +59,11 @@ $(document).ready(function() { url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); var hash = window.location.hash; search = search || ''; - ajaxify.currentPage = url; $(window).trigger('action:ajaxify.start', {url: url}); + ajaxify.currentPage = url; + if (window.history && window.history.pushState) { window.history[!quiet ? 'pushState' : 'replaceState']({ url: url + search + hash From e71ef216f2a015328fc0034cd128adacdf89924e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 9 Mar 2015 10:50:03 -0400 Subject: [PATCH 690/897] hiding the right sidebar in ACP dash temporarily --- src/views/admin/general/dashboard.tpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/admin/general/dashboard.tpl b/src/views/admin/general/dashboard.tpl index d5334fffb1..759144152d 100644 --- a/src/views/admin/general/dashboard.tpl +++ b/src/views/admin/general/dashboard.tpl @@ -1,5 +1,6 @@
    -
    + +
    Forum Traffic
    @@ -87,7 +88,8 @@
    -
    + +
    Anonymous vs Registered Users
    From 43600698590a85754936d5cdebd29b11e762b38f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 9 Mar 2015 12:17:33 -0400 Subject: [PATCH 691/897] fixing buttons on mobile composer, and updating format so tags button only appears on mobile --- public/src/modules/composer.js | 1 + public/src/modules/composer/formatting.js | 8 ++++---- src/socket.io/modules.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 50a729bb54..568dae805c 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -240,6 +240,7 @@ define('composer', [ var template = (composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm') ? 'composer-mobile' : 'composer'; var data = { + mobile: template === 'composer-mobile', allowTopicsThumbnail: allowTopicsThumbnail, showTags: isTopic || isMain, minimumTagLength: config.minimumTagLength, diff --git a/public/src/modules/composer/formatting.js b/public/src/modules/composer/formatting.js index 071c0ca2e7..05315a7edf 100644 --- a/public/src/modules/composer/formatting.js +++ b/public/src/modules/composer/formatting.js @@ -20,11 +20,11 @@ define('composer/formatting', ['composer/controls', 'composer/preview'], functio } }; - var customButtons = []; + var buttons = []; formatting.addComposerButtons = function() { - for(var x=0,numButtons=customButtons.length;x'); + for(var x=0,numButtons=buttons.length;x'); } }; @@ -32,7 +32,7 @@ define('composer/formatting', ['composer/controls', 'composer/preview'], functio var name = iconClass.replace('fa fa-', ''); formattingDispatchTable[name] = onClick; - customButtons.push({ + buttons.push({ name: name, iconClass: iconClass }); diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js index 306d26d579..2825b28656 100644 --- a/src/socket.io/modules.js +++ b/src/socket.io/modules.js @@ -117,7 +117,7 @@ SocketModules.composer.stopNotifyTyping = function(socket, data) { SocketModules.composer.getFormattingOptions = function(socket, data, callback) { plugins.fireHook('filter:composer.formatting', { options: [ - // { className: 'fa fa-bold' } Just an example of what needs to be set via plugins + { name: 'tags', className: 'fa fa-tags', mobile: true } ] }, function(err, payload) { callback(err, payload.options); From e47c375e6913b1961d00f807ed5f20c5994166ce Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 12:30:16 -0400 Subject: [PATCH 692/897] closes #1642 --- public/src/ajaxify.js | 12 +++++++----- public/src/modules/composer.js | 7 ++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 74c588a1ed..865626635c 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -10,13 +10,15 @@ $(document).ready(function() { rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''), apiXHR = null; - window.onpopstate = function (event) { - if (event !== null && event.state && event.state.url !== undefined) { - ajaxify.go(event.state.url, function() { - $(window).trigger('action:popstate', {url: event.state.url}); + $(window).on('popstate', function (ev) { + ev = ev.originalEvent; + + if (ev !== null && ev.state && ev.state.url !== undefined) { + ajaxify.go(ev.state.url, function() { + $(window).trigger('action:popstate', {url: ev.state.url}); }, true); } - }; + }); ajaxify.currentPage = null; diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 568dae805c..461681ed58 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -22,7 +22,7 @@ define('composer', [ $(window).off('resize', onWindowResize).on('resize', onWindowResize); - $(window).on('action:popstate', function(ev, data) { + $(window).on('popstate', function(ev, data) { var env = utils.findBootstrapEnvironment(); if (composer.active && (env === 'xs' || env ==='sm')) { @@ -95,6 +95,11 @@ define('composer', [ composer.posts[uuid] = post; composer.load(uuid); + + var env = utils.findBootstrapEnvironment(); + if (env === 'xs' || env ==='sm') { + history.pushState({}, '', '#compose'); + } } function composerAlert(message) { From fcc8093fa63dca2443c1d2f12d5fbb7fa4f34dd2 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 12:44:15 -0400 Subject: [PATCH 693/897] #1642 show discard prompt --- public/src/modules/composer.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 461681ed58..98ab0407a5 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -26,7 +26,20 @@ define('composer', [ var env = utils.findBootstrapEnvironment(); if (composer.active && (env === 'xs' || env ==='sm')) { - discard(composer.active); + if (!composer.posts[composer.active].modified) { + discard(composer.active); + return; + } + + translator.translate('[[modules:composer.discard]]', function(translated) { + bootbox.confirm(translated, function(confirm) { + if (confirm) { + discard(composer.active); + } else { + history.pushState({}, '', '#compose'); + } + }); + }); } }); From cda38d6ed63cdcd963afc300807ed68054ba850d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 9 Mar 2015 13:16:14 -0400 Subject: [PATCH 694/897] closes #2515 --- src/posts.js | 26 +----------------- src/posts/topics.js | 44 ++++++++++++++++++++++++++++++ src/socket.io/posts.js | 60 +++++++++++++++++++++++++++++++++-------- src/socket.io/topics.js | 18 ++++++------- 4 files changed, 103 insertions(+), 45 deletions(-) create mode 100644 src/posts/topics.js diff --git a/src/posts.js b/src/posts.js index c8cfb8f085..2c7ca82737 100644 --- a/src/posts.js +++ b/src/posts.js @@ -16,6 +16,7 @@ var async = require('async'), require('./posts/create')(Posts); require('./posts/delete')(Posts); require('./posts/user')(Posts); + require('./posts/topics')(Posts); require('./posts/category')(Posts); require('./posts/summary')(Posts); require('./posts/recent')(Posts); @@ -25,20 +26,6 @@ var async = require('async'), db.isSortedSetMember('posts:pid', pid, callback); }; - Posts.getPostsByTid = function(tid, set, start, end, uid, reverse, callback) { - Posts.getPidsFromSet(set, start, end, reverse, function(err, pids) { - if(err) { - return callback(err); - } - - if(!Array.isArray(pids) || !pids.length) { - return callback(null, []); - } - - Posts.getPostsByPids(pids, uid, callback); - }); - }; - Posts.getPidsFromSet = function(set, start, end, reverse, callback) { if (isNaN(start) || isNaN(end)) { return callback(null, []); @@ -243,17 +230,6 @@ var async = require('async'), }); }; - Posts.isMain = function(pid, callback) { - Posts.getPostField(pid, 'tid', function(err, tid) { - if (err) { - return callback(err); - } - topics.getTopicField(tid, 'mainPid', function(err, mainPid) { - callback(err, parseInt(pid, 10) === parseInt(mainPid, 10)); - }); - }); - }; - Posts.updatePostVoteCount = function(pid, voteCount, callback) { async.parallel([ function(next) { diff --git a/src/posts/topics.js b/src/posts/topics.js new file mode 100644 index 0000000000..75577d2925 --- /dev/null +++ b/src/posts/topics.js @@ -0,0 +1,44 @@ + +'use strict'; + +var async = require('async'), + topics = require('../topics'); + +module.exports = function(Posts) { + + Posts.getPostsByTid = function(tid, set, start, end, uid, reverse, callback) { + Posts.getPidsFromSet(set, start, end, reverse, function(err, pids) { + if (err) { + return callback(err); + } + + if (!Array.isArray(pids) || !pids.length) { + return callback(null, []); + } + + Posts.getPostsByPids(pids, uid, callback); + }); + }; + + Posts.isMain = function(pid, callback) { + Posts.getPostField(pid, 'tid', function(err, tid) { + if (err) { + return callback(err); + } + topics.getTopicField(tid, 'mainPid', function(err, mainPid) { + callback(err, parseInt(pid, 10) === parseInt(mainPid, 10)); + }); + }); + }; + + Posts.getTopicFields = function(pid, fields, callback) { + Posts.getPostField(pid, 'tid', function(err, tid) { + if (err) { + return callback(err); + } + + topics.getTopicFields(tid, fields, callback); + }); + }; + +}; \ No newline at end of file diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 0b5ab9b418..e8f5ef9a63 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -16,6 +16,7 @@ var async = require('async'), groups = require('../groups'), user = require('../user'), websockets = require('./index'), + socketTopics = require('./topics'), events = require('../events'), utils = require('../../public/src/utils'), @@ -345,27 +346,64 @@ function deleteOrRestore(command, socket, data, callback) { } SocketPosts.purge = function(socket, data, callback) { - if(!data || !parseInt(data.pid, 10)) { + function purgePost() { + postTools.purge(socket.uid, data.pid, function(err) { + if (err) { + return callback(err); + } + + websockets.in('topic_' + data.tid).emit('event:post_purged', data.pid); + + events.log({ + type: 'post-purge', + uid: socket.uid, + pid: data.pid, + ip: socket.ip + }); + + callback(); + }); + } + + if (!data || !parseInt(data.pid, 10)) { return callback(new Error('[[error:invalid-data]]')); } - postTools.purge(socket.uid, data.pid, function(err) { - if(err) { + + isMainAndLastPost(data.pid, function(err, results) { + if (err) { return callback(err); } - websockets.in('topic_' + data.tid).emit('event:post_purged', data.pid); + if (!results.isMain) { + return purgePost(); + } - events.log({ - type: 'post-purge', - uid: socket.uid, - pid: data.pid, - ip: socket.ip - }); + if (!results.isLast) { + return callback(new Error('[[error:cant-purge-main-post]]')); + } - callback(); + posts.getTopicFields(data.pid, ['tid', 'cid'], function(err, topic) { + if (err) { + return callback(err); + } + socketTopics.doTopicAction('delete', 'event:topic_deleted', socket, {tids: [topic.tid], cid: topic.cid}, callback); + }); }); }; +function isMainAndLastPost(pid, callback) { + async.parallel({ + isMain: function(next) { + posts.isMain(pid, next); + }, + isLast: function(next) { + posts.getTopicFields(pid, ['postcount'], function(err, topic) { + next(err, topic ? parseInt(topic.postcount, 10) === 1 : false); + }); + } + }, callback); +} + SocketPosts.getPrivileges = function(socket, pids, callback) { privileges.posts.get(pids, socket.uid, function(err, privileges) { if (err) { diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index a4ee937429..cd42d1fde4 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -205,34 +205,34 @@ SocketTopics.markAsUnreadForAll = function(socket, tids, callback) { }; SocketTopics.delete = function(socket, data, callback) { - doTopicAction('delete', 'event:topic_deleted', socket, data, callback); + SocketTopics.doTopicAction('delete', 'event:topic_deleted', socket, data, callback); }; SocketTopics.restore = function(socket, data, callback) { - doTopicAction('restore', 'event:topic_restored', socket, data, callback); + SocketTopics.doTopicAction('restore', 'event:topic_restored', socket, data, callback); }; SocketTopics.purge = function(socket, data, callback) { - doTopicAction('purge', 'event:topic_purged', socket, data, callback); + SocketTopics.doTopicAction('purge', 'event:topic_purged', socket, data, callback); }; SocketTopics.lock = function(socket, data, callback) { - doTopicAction('lock', 'event:topic_locked', socket, data, callback); + SocketTopics.doTopicAction('lock', 'event:topic_locked', socket, data, callback); }; SocketTopics.unlock = function(socket, data, callback) { - doTopicAction('unlock', 'event:topic_unlocked', socket, data, callback); + SocketTopics.doTopicAction('unlock', 'event:topic_unlocked', socket, data, callback); }; SocketTopics.pin = function(socket, data, callback) { - doTopicAction('pin', 'event:topic_pinned', socket, data, callback); + SocketTopics.doTopicAction('pin', 'event:topic_pinned', socket, data, callback); }; SocketTopics.unpin = function(socket, data, callback) { - doTopicAction('unpin', 'event:topic_unpinned', socket, data, callback); + SocketTopics.doTopicAction('unpin', 'event:topic_unpinned', socket, data, callback); }; -function doTopicAction(action, event, socket, data, callback) { +SocketTopics.doTopicAction = function(action, event, socket, data, callback) { if (!socket.uid) { return; } @@ -274,7 +274,7 @@ function doTopicAction(action, event, socket, data, callback) { }); }); }, callback); -} +}; function emitToTopicAndCategory(event, data) { websockets.in('topic_' + data.tid).emit(event, data); From 33723f8b1be5591c6ef6c6a31590e388cfe42591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 9 Mar 2015 13:54:35 -0400 Subject: [PATCH 695/897] closes #2835 --- src/controllers/categories.js | 2 +- src/routes/feeds.js | 109 ++++++++++++++++++++++++---------- src/topics.js | 10 +++- 3 files changed, 88 insertions(+), 33 deletions(-) diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 1ec014240b..5264e0e5f4 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -55,7 +55,7 @@ categoriesController.popular = function(req, res, next) { var data = { topics: topics, 'feeds:disableRSS': parseInt(meta.config['feeds:disableRSS'], 10) === 1, - rssFeedUrl: nconf.get('relative_path') + '/popular.rss', + rssFeedUrl: nconf.get('relative_path') + '/popular/' + (req.params.term || 'daily') + '.rss', breadcrumbs: helpers.buildBreadcrumbs([{text: '[[global:header.popular]]'}]) }; diff --git a/src/routes/feeds.js b/src/routes/feeds.js index 12b0f6a0e1..0f2f6082b6 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -135,14 +135,17 @@ function generateForCategory(req, res, next) { return next(err); } - var feed = generateTopicsFeed({ + generateTopicsFeed({ title: categoryData.name, description: categoryData.description, feed_url: '/category/' + cid + '.rss', site_url: '/category/' + categoryData.cid, - }, categoryData.topics); - - sendFeed(feed, res); + }, categoryData.topics, function(err, feed) { + if (err) { + return next(err); + } + sendFeed(feed, res); + }); }); } @@ -156,12 +159,32 @@ function generateForRecent(req, res, next) { } function generateForPopular(req, res, next) { - generateForTopics({ - title: 'Popular Topics', - description: 'A list of topics that are sorted by post count', - feed_url: '/popular.rss', - site_url: '/popular' - }, 'topics:posts', req, res, next); + var uid = req.user ? req.user.uid : 0; + var terms = { + daily: 'day', + weekly: 'week', + monthly: 'month', + alltime: 'alltime' + }; + var term = terms[req.params.term] || 'day'; + + topics.getPopular(term, uid, 19, function(err, topics) { + if (err) { + return next(err); + } + + generateTopicsFeed({ + title: 'Popular Topics', + description: 'A list of topics that are sorted by post count', + feed_url: '/popular/' + (req.params.term || 'daily') + '.rss', + site_url: '/popular/' + (req.params.term || 'daily') + }, topics, function(err, feed) { + if (err) { + return next(err); + } + sendFeed(feed, res); + }); + }); } function disabledRSS(req, res, next) { @@ -178,35 +201,58 @@ function generateForTopics(options, set, req, res, next) { if (err) { return next(err); } - - var feed = generateTopicsFeed(options, data.topics); - - sendFeed(feed, res); + + generateTopicsFeed(options, data.topics, function(err, feed) { + if (err) { + return next(err); + } + sendFeed(feed, res); + }); }); } -function generateTopicsFeed(feedOptions, topics) { +function generateTopicsFeed(feedOptions, feedTopics, callback) { + var tids = feedTopics.map(function(topic) { + return topic ? topic.tid : null; + }); + + topics.getMainPids(tids, function(err, pids) { + if (err) { + return callback(err); + } + posts.getPostsFields(pids, ['content'], function(err, posts) { + if (err) { + return callback(err); + } - feedOptions.ttl = 60; - feedOptions.feed_url = nconf.get('url') + feedOptions.feed_url; - feedOptions.site_url = nconf.get('url') + feedOptions.site_url; + feedTopics.forEach(function(topic, index) { + if (topic && posts[index]) { + topic.mainPost = posts[index].content; + } + }); - var feed = new rss(feedOptions); + feedOptions.ttl = 60; + feedOptions.feed_url = nconf.get('url') + feedOptions.feed_url; + feedOptions.site_url = nconf.get('url') + feedOptions.site_url; - if (topics.length > 0) { - feed.pubDate = new Date(parseInt(topics[0].lastposttime, 10)).toUTCString(); - } + var feed = new rss(feedOptions); - topics.forEach(function(topicData) { - feed.item({ - title: topicData.title, - url: nconf.get('url') + '/topic/' + topicData.slug, - author: topicData.username, - date: new Date(parseInt(topicData.lastposttime, 10)).toUTCString() - }); - }); + if (feedTopics.length > 0) { + feed.pubDate = new Date(parseInt(feedTopics[0].lastposttime, 10)).toUTCString(); + } - return feed; + feedTopics.forEach(function(topicData) { + feed.item({ + title: topicData.title, + description: topicData.mainPost, + url: nconf.get('url') + '/topic/' + topicData.slug, + author: topicData.username, + date: new Date(parseInt(topicData.lastposttime, 10)).toUTCString() + }); + }); + callback(null, feed); + }); + }); } function generateForRecentPosts(req, res, next) { @@ -291,6 +337,7 @@ module.exports = function(app, middleware, controllers){ app.get('/category/:category_id.rss', hasCategoryPrivileges, disabledRSS, generateForCategory); app.get('/recent.rss', disabledRSS, generateForRecent); app.get('/popular.rss', disabledRSS, generateForPopular); + app.get('/popular/:term.rss', disabledRSS, generateForPopular); app.get('/recentposts.rss', disabledRSS, generateForRecentPosts); app.get('/category/:category_id/recentposts.rss', hasCategoryPrivileges, disabledRSS, generateForCategoryRecentPosts); app.get('/user/:userslug/topics.rss', disabledRSS, generateForUserTopics); diff --git a/src/topics.js b/src/topics.js index 274ffbcf70..3c22bcf30c 100644 --- a/src/topics.js +++ b/src/topics.js @@ -255,7 +255,7 @@ var async = require('async'), }); }; - Topics.getMainPosts = function(tids, uid, callback) { + Topics.getMainPids = function(tids, callback) { Topics.getTopicsFields(tids, ['mainPid'], function(err, topicData) { if (err) { return callback(err); @@ -264,7 +264,15 @@ var async = require('async'), var mainPids = topicData.map(function(topic) { return topic ? topic.mainPid : null; }); + callback(null, mainPids); + }); + }; + Topics.getMainPosts = function(tids, uid, callback) { + Topics.getMainPids(tids, function(err, mainPids) { + if (err) { + return callback(err); + } getMainPosts(mainPids, uid, callback); }); }; From 1ec1c5a366ffbac25b9a201e2e01e9429cf57cae Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 15:05:48 -0400 Subject: [PATCH 696/897] fixes composer maximizing --- public/src/modules/composer/resize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 9d5d303df9..491da42dca 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -21,7 +21,7 @@ define('composer/resize', function() { if (percentage) { if (env === 'md' || env === 'lg') { - postContainer.css('height', Math.floor($(window).height() * percentage) + 'px'); + postContainer.height(Math.floor($(window).height() * percentage) + 'px'); } } From 4d45a81fdb0686bfcb21c9849b2da4bf2248a5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 9 Mar 2015 15:30:52 -0400 Subject: [PATCH 697/897] closes #2383 --- public/src/ajaxify.js | 12 +++++++----- src/views/500.tpl | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 865626635c..5e26619253 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -89,11 +89,9 @@ $(document).ready(function() { app.previousUrl = url; return ajaxify.go('login'); } else if (status === 302) { - if (data.responseJSON.path) { - if (!ajaxify.go(data.responseJSON.path, callback, quiet)) { - window.location.href = data.responseJSON.path; - } - } else if (data.responseJSON) { + if (data.responseJSON.external && data.responseJSON.path) { + window.location.href = data.responseJSON.path; + } else if (typeof data.responseJSON === 'string') { ajaxify.go(data.responseJSON.slice(1), callback, quiet); } } @@ -184,6 +182,9 @@ $(document).ready(function() { } }, error: function(data, textStatus) { + if (data.status === 0 && textStatus === 'error') { + data.status = 500; + } callback({ data: data, textStatus: textStatus @@ -264,5 +265,6 @@ $(document).ready(function() { ajaxifyAnchors(); app.load(); + templates.cache['500'] = $('.tpl-500').html(); }); \ No newline at end of file diff --git a/src/views/500.tpl b/src/views/500.tpl index 13b0e9de89..6408fbb79d 100644 --- a/src/views/500.tpl +++ b/src/views/500.tpl @@ -1,7 +1,7 @@
    [[global:500.title]]

    [[global:500.message]]

    -

    {path}

    +

    {path}

    {error}

    -
    \ No newline at end of file +
    From 53e0615df79afb951107b23a08eb24261312c9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 9 Mar 2015 15:33:20 -0400 Subject: [PATCH 698/897] removed path use external --- public/src/ajaxify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 5e26619253..2392511386 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -89,8 +89,8 @@ $(document).ready(function() { app.previousUrl = url; return ajaxify.go('login'); } else if (status === 302) { - if (data.responseJSON.external && data.responseJSON.path) { - window.location.href = data.responseJSON.path; + if (data.responseJSON.external) { + window.location.href = data.responseJSON.external; } else if (typeof data.responseJSON === 'string') { ajaxify.go(data.responseJSON.slice(1), callback, quiet); } From 4f2ac340b2cfb9e0db7f8b2a0a12d19eb1ecbd4f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 15:52:01 -0400 Subject: [PATCH 699/897] latest tjs --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f38b87f0d..bab3c6bcb4 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "socket.io-redis": "^0.1.3", "socketio-wildcard": "~0.1.1", "string": "^3.0.0", - "templates.js": "^0.1.23", + "templates.js": "^0.1.28", "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git", "underscore": "~1.7.0", "validator": "^3.30.0", From b56e862838d9432b87c2b789e9996b417f2d0f2f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 16:00:46 -0400 Subject: [PATCH 700/897] removed hardcoded fa-chevron icons from client js --- public/src/modules/composer/resize.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 491da42dca..616c8f2a5a 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -72,20 +72,20 @@ define('composer/resize', function() { } function toggleHeight(e) { - var triggerIconEl = $('.resizer i'); + var resizer = $('.resizer'); if (e.clientY - resizeDown === 0){ var newPercentage = ($(window).height() - $('#header-menu').height() - 20) / $(window).height(); - if (triggerIconEl.hasClass('fa-chevron-up')) { + if (!resizer.hasClass('maximized')) { oldPercentage = getPercentage(postContainer); doResize(postContainer, newPercentage); - triggerIconEl.addClass('fa-chevron-down').removeClass('fa-chevron-up'); + resizer.addClass('maximized'); } else { doResize(postContainer, oldPercentage); - triggerIconEl.addClass('fa-chevron-up').removeClass('fa-chevron-down'); + resizer.removeClass('maximized'); } } else { - triggerIconEl.addClass('fa-chevron-up').removeClass('fa-chevron-down'); + resizer.removeClass('maximized'); } } From 706527fa80ff4694057c27a94a258236e290bbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 9 Mar 2015 16:01:04 -0400 Subject: [PATCH 701/897] fix group titles clone groups for each user --- src/posts/user.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/posts/user.js b/src/posts/user.js index de563d86b5..8fb2d039e0 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -33,9 +33,9 @@ module.exports = function(Posts) { var userData = results.userData; userData.forEach(function(userData, i) { - userData.groups = results.groups[i]; - - results.groups[i].forEach(function(group, index) { + userData.groups = results.groups[i].slice(); + + userData.groups.forEach(function(group) { group.selected = group.name === results.userSettings[i].groupTitle; }); userData.status = user.getStatus(userData.status, results.online[i]); From d2e8d4d86ed3fa41ed31b482f655c7223fd64026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 9 Mar 2015 16:08:48 -0400 Subject: [PATCH 702/897] slice doesnt deep clone derp --- src/groups.js | 7 ++++++- src/posts/user.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/groups.js b/src/groups.js index 452b47d56c..e94e9d46f9 100644 --- a/src/groups.js +++ b/src/groups.js @@ -16,6 +16,7 @@ var async = require('async'), posts = require('./posts'), privileges = require('./privileges'), utils = require('../public/src/utils'), + util = require('util'), uploadsController = require('./controllers/uploads'); @@ -952,7 +953,11 @@ var async = require('async'), var memberOf = []; isMembers.forEach(function(isMember, index) { if (isMember) { - memberOf.push(groupData[index]); + if (uids.length > 1) { + memberOf.push(util._extend({}, groupData[index])); + } else { + memberOf.push(groupData[index]); + } } }); diff --git a/src/posts/user.js b/src/posts/user.js index 8fb2d039e0..494b1dbc6f 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -33,7 +33,7 @@ module.exports = function(Posts) { var userData = results.userData; userData.forEach(function(userData, i) { - userData.groups = results.groups[i].slice(); + userData.groups = results.groups[i]; userData.groups.forEach(function(group) { group.selected = group.name === results.userSettings[i].groupTitle; From bbbb36212598a0394dcc80dda91a2cc78d1e6d99 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 9 Mar 2015 16:15:00 -0400 Subject: [PATCH 703/897] not referencing parent scope when inside BEGIN in widgets tpl --- public/src/admin/extend/widgets.js | 2 +- src/views/admin/extend/widgets.tpl | 8 ++++---- src/widgets.js | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 239d5bd809..b57453ffab 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -3,7 +3,7 @@ define('admin/extend/widgets', function() { var Widgets = {}; - + Widgets.init = function() { $('#widgets .nav-pills a').on('click', function(ev) { var $this = $(this); diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index d2aca20177..91fc127d89 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -6,7 +6,7 @@ @@ -14,10 +14,10 @@
    -
    +
    -
    -

    {templates.areas.name} {templates.template} / {templates.areas.location}

    +
    +

    {areas.name} {template} / {areas.location}

    diff --git a/src/widgets.js b/src/widgets.js index c0234b2a28..ffe2ad2629 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -9,7 +9,6 @@ var async = require('async'), (function(Widgets) { - Widgets.render = function(uid, area, callback) { if (!area.locations || !area.template) { return callback(new Error('[[error:invalid-data]]')); From da758c429aaf4a7daf6e4b092426891aaf9fd7e1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 16:19:20 -0400 Subject: [PATCH 704/897] remove hardcoded z-index; give composer a "maximized" class if maximized --- public/src/modules/composer/resize.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 616c8f2a5a..0f4f1528c6 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -21,7 +21,7 @@ define('composer/resize', function() { if (percentage) { if (env === 'md' || env === 'lg') { - postContainer.height(Math.floor($(window).height() * percentage) + 'px'); + postContainer.height(Math.floor($(window).height() * percentage) - 1 + 'px'); } } @@ -40,7 +40,7 @@ define('composer/resize', function() { postContainer.find('#files.lt-ie9').removeClass('hide'); } - postContainer.css('visibility', 'visible').css('z-index', 2); + postContainer.css('visibility', 'visible'); // Add some extra space at the bottom of the body so that the user can still scroll to the last post w/ composer open $('body').css({'margin-bottom': postContainer.css('height')}); @@ -72,20 +72,20 @@ define('composer/resize', function() { } function toggleHeight(e) { - var resizer = $('.resizer'); + var composer = $('.composer'); if (e.clientY - resizeDown === 0){ var newPercentage = ($(window).height() - $('#header-menu').height() - 20) / $(window).height(); - if (!resizer.hasClass('maximized')) { + if (!composer.hasClass('maximized')) { oldPercentage = getPercentage(postContainer); doResize(postContainer, newPercentage); - resizer.addClass('maximized'); + composer.addClass('maximized'); } else { doResize(postContainer, oldPercentage); - resizer.removeClass('maximized'); + composer.removeClass('maximized'); } } else { - resizer.removeClass('maximized'); + composer.removeClass('maximized'); } } From c0e6c306d0f3e60d769c7ba61b6dc0b996a0c761 Mon Sep 17 00:00:00 2001 From: Mega Date: Mon, 9 Mar 2015 23:48:53 +0300 Subject: [PATCH 705/897] Update nodebb-plugin-mentions version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f38b87f0d..5fe1a334c4 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "nodebb-plugin-dbsearch": "^0.1.0", "nodebb-plugin-emoji-extended": "^0.4.1-4", "nodebb-plugin-markdown": "^1.0.0", - "nodebb-plugin-mentions": "^0.9.0", + "nodebb-plugin-mentions": "^0.10.0", "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", "nodebb-theme-lavender": "^1.0.6", From bd99124fb998c4c8b39fe28c83963cf5a82e3e17 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 16:49:53 -0400 Subject: [PATCH 706/897] refactored write preview code --- public/src/modules/composer/resize.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 0f4f1528c6..f2da4f90ca 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -143,12 +143,17 @@ define('composer/resize', function() { function resizeWritePreview(postContainer) { - var h1 = postContainer.find('.title-container').outerHeight(true); - var h2 = postContainer.find('.category-tag-row').outerHeight(true); - var h3 = postContainer.find('.formatting-bar').outerHeight(true); - var h4 = postContainer.find('.topic-thumb-container').outerHeight(true); - var h5 = $('.taskbar').height(); - var total = h1 + h2 + h3 + h4 + h5; + var rows = [ + postContainer.find('.title-container').outerHeight(true), + postContainer.find('.formatting-bar').outerHeight(true), + postContainer.find('.topic-thumb-container').outerHeight(true), + $('.taskbar').height() + ]; + + var total = rows.reduce(function(a, b) { + return a + b; + }); + postContainer.find('.write-preview-container').css('height', postContainer.height() - total); } From 09e0d660cd38d6f57defe6a027501b3803a27bcf Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 16:56:40 -0400 Subject: [PATCH 707/897] tags:enter_tags_here better messaging --- public/language/ar/tags.json | 2 +- public/language/bn/tags.json | 2 +- public/language/cs/tags.json | 2 +- public/language/de/tags.json | 2 +- public/language/el/tags.json | 2 +- public/language/en@pirate/tags.json | 2 +- public/language/en_GB/tags.json | 2 +- public/language/en_US/tags.json | 2 +- public/language/es/tags.json | 2 +- public/language/et/tags.json | 2 +- public/language/fa_IR/tags.json | 2 +- public/language/fi/tags.json | 2 +- public/language/fr/tags.json | 2 +- public/language/he/tags.json | 2 +- public/language/hu/tags.json | 2 +- public/language/id/tags.json | 2 +- public/language/it/tags.json | 2 +- public/language/ja/tags.json | 2 +- public/language/ko/tags.json | 2 +- public/language/lt/tags.json | 2 +- public/language/ms/tags.json | 2 +- public/language/nb/tags.json | 2 +- public/language/nl/tags.json | 2 +- public/language/pl/tags.json | 2 +- public/language/pt_BR/tags.json | 2 +- public/language/ro/tags.json | 2 +- public/language/ru/tags.json | 2 +- public/language/sc/tags.json | 2 +- public/language/sk/tags.json | 2 +- public/language/sv/tags.json | 2 +- public/language/th/tags.json | 2 +- public/language/tr/tags.json | 2 +- public/language/vi/tags.json | 2 +- public/language/zh_CN/tags.json | 2 +- public/language/zh_TW/tags.json | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/public/language/ar/tags.json b/public/language/ar/tags.json index 004681a32a..f2eccbd1c0 100644 --- a/public/language/ar/tags.json +++ b/public/language/ar/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "لاوجود لمواضيع تحمل هذا الوسم.", "tags": "بطاقات", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "أدخل البطاقات...", "no_tags": "لاتوجد هناك بطاقات بعد." } \ No newline at end of file diff --git a/public/language/bn/tags.json b/public/language/bn/tags.json index e99c0f835d..86bbe70e75 100644 --- a/public/language/bn/tags.json +++ b/public/language/bn/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "এই ট্যাগ সম্বলিত কোন টপিক নেই", "tags": "ট্যাগসমূহ", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "ট্যাগ বসান", "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই" } \ No newline at end of file diff --git a/public/language/cs/tags.json b/public/language/cs/tags.json index f2003f978a..8fc07c7da2 100644 --- a/public/language/cs/tags.json +++ b/public/language/cs/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Není zde žádné téma s tímto tagem.", "tags": "Tagy", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Vložte tagy ...", "no_tags": "Zatím tu není žádný tag." } \ No newline at end of file diff --git a/public/language/de/tags.json b/public/language/de/tags.json index 7e7e548c8f..898759f0b5 100644 --- a/public/language/de/tags.json +++ b/public/language/de/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Es gibt keine Themen mit diesem Tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Gib Tags ein...", "no_tags": "Es gibt bisher keine Tags." } \ No newline at end of file diff --git a/public/language/el/tags.json b/public/language/el/tags.json index 4264ed78aa..e3776579ed 100644 --- a/public/language/el/tags.json +++ b/public/language/el/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Δεν υπάρχουν θέματα με αυτή την ετικέτα.", "tags": "Ετικέτες", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Εισαγωγή ετικετών...", "no_tags": "Δεν υπάρχουν ακόμα ετικέτες." } \ No newline at end of file diff --git a/public/language/en@pirate/tags.json b/public/language/en@pirate/tags.json index aa9f14c70c..c416d8d4ec 100644 --- a/public/language/en@pirate/tags.json +++ b/public/language/en@pirate/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/en_GB/tags.json b/public/language/en_GB/tags.json index a3f75bb2e6..c74b9759cf 100644 --- a/public/language/en_GB/tags.json +++ b/public/language/en_GB/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/en_US/tags.json b/public/language/en_US/tags.json index aa9f14c70c..c416d8d4ec 100644 --- a/public/language/en_US/tags.json +++ b/public/language/en_US/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/es/tags.json b/public/language/es/tags.json index 3a86bb7da7..260ff42eef 100644 --- a/public/language/es/tags.json +++ b/public/language/es/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "No hay temas con esta etiqueta.", "tags": "Etiquetas", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Introduzca las etiquetas...", "no_tags": "Aún no hay etiquetas." } \ No newline at end of file diff --git a/public/language/et/tags.json b/public/language/et/tags.json index 5f63e2b3e7..87b8332fad 100644 --- a/public/language/et/tags.json +++ b/public/language/et/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Teemasid, mis sisaldaksid seda märksõna, ei eksisteeri.", "tags": "Märksõnad", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Sisesta märksõnu...", "no_tags": "Siin ei ole veel ühtegi märksõna." } \ No newline at end of file diff --git a/public/language/fa_IR/tags.json b/public/language/fa_IR/tags.json index 82e477f4cc..26a393396b 100644 --- a/public/language/fa_IR/tags.json +++ b/public/language/fa_IR/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "جُستاری با این برچسب وجود ندارد.", "tags": "برچسب‌ها", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "هنوز برچسبی وجود ندارد." } \ No newline at end of file diff --git a/public/language/fi/tags.json b/public/language/fi/tags.json index 3d1cf1271b..35903730b2 100644 --- a/public/language/fi/tags.json +++ b/public/language/fi/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Ei viimeisimpiä aiheita tällä tagilla.", "tags": "Tagit", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Syötä tagit...", "no_tags": "Ei vielä yhtään tagia." } \ No newline at end of file diff --git a/public/language/fr/tags.json b/public/language/fr/tags.json index 8c533e76ca..477f1a0b56 100644 --- a/public/language/fr/tags.json +++ b/public/language/fr/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé", "tags": "Mots-clés", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Entrez des mots-clés...", "no_tags": "Il n'y a pas encore de mots-clés." } \ No newline at end of file diff --git a/public/language/he/tags.json b/public/language/he/tags.json index 54ead310ad..3061057672 100644 --- a/public/language/he/tags.json +++ b/public/language/he/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "אין פוסטים עם תגית זו.", "tags": "תגיות", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "הכנס תגיות", "no_tags": "אין עדיין תגיות." } \ No newline at end of file diff --git a/public/language/hu/tags.json b/public/language/hu/tags.json index aa7a02a772..baddf9f8d6 100644 --- a/public/language/hu/tags.json +++ b/public/language/hu/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nem létezik témakör ezzel a címkével.", "tags": "Címkék", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Címke megadása...", "no_tags": "Nincs címke." } \ No newline at end of file diff --git a/public/language/id/tags.json b/public/language/id/tags.json index 647542884e..8485344416 100644 --- a/public/language/id/tags.json +++ b/public/language/id/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Tidak ada topik dengan tag ini.", "tags": "Tag", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Masukkan tag...", "no_tags": "Belum ada tag." } \ No newline at end of file diff --git a/public/language/it/tags.json b/public/language/it/tags.json index c3364a0bbf..5fcdf9ff47 100644 --- a/public/language/it/tags.json +++ b/public/language/it/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Non ci sono discussioni con questo tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Inserisci i tags...", "no_tags": "Non ci sono ancora tags." } \ No newline at end of file diff --git a/public/language/ja/tags.json b/public/language/ja/tags.json index aa9f14c70c..c416d8d4ec 100644 --- a/public/language/ja/tags.json +++ b/public/language/ja/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/ko/tags.json b/public/language/ko/tags.json index a50fc5e9e1..8e1011bd29 100644 --- a/public/language/ko/tags.json +++ b/public/language/ko/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "이 태그에 해당하는 주제가 없습니다.", "tags": "태그", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "태그 입력...", "no_tags": "아직 아무런 태그도 없습니다." } \ No newline at end of file diff --git a/public/language/lt/tags.json b/public/language/lt/tags.json index 2f2b9e11d2..2151f58d36 100644 --- a/public/language/lt/tags.json +++ b/public/language/lt/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Temų su šią žyma nėra.", "tags": "Žymos", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "Žymų kolkas nėra." } \ No newline at end of file diff --git a/public/language/ms/tags.json b/public/language/ms/tags.json index aa9f14c70c..c416d8d4ec 100644 --- a/public/language/ms/tags.json +++ b/public/language/ms/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/nb/tags.json b/public/language/nb/tags.json index d38e00a025..5287b6125a 100644 --- a/public/language/nb/tags.json +++ b/public/language/nb/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Det er ingen emnet med denne taggen.", "tags": "Tagger", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Skriv tagger...", "no_tags": "Det finnes ingen tagger enda." } \ No newline at end of file diff --git a/public/language/nl/tags.json b/public/language/nl/tags.json index 85c11b0476..281fd4a0a5 100644 --- a/public/language/nl/tags.json +++ b/public/language/nl/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Er zijn geen onderwerpen met deze tag", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Voer uw tags in...", "no_tags": "Er zijn nog geen tags te vinden" } \ No newline at end of file diff --git a/public/language/pl/tags.json b/public/language/pl/tags.json index c4d9498474..a2247f39e7 100644 --- a/public/language/pl/tags.json +++ b/public/language/pl/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nie ma tematów z tym tagiem", "tags": "Tagi", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Wpisz tagi...", "no_tags": "Jeszcze nie ma tagów." } \ No newline at end of file diff --git a/public/language/pt_BR/tags.json b/public/language/pt_BR/tags.json index 267888cbfa..1150d12f7f 100644 --- a/public/language/pt_BR/tags.json +++ b/public/language/pt_BR/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Não há tópicos com esta tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Digite tags...", "no_tags": "Ainda não há tags." } \ No newline at end of file diff --git a/public/language/ro/tags.json b/public/language/ro/tags.json index 483efa66f6..59edbb0063 100644 --- a/public/language/ro/tags.json +++ b/public/language/ro/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nu există nici un subiect cu acest tag.", "tags": "Taguri", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Introdu taguri...", "no_tags": "În acest moment nu există nici un tag." } \ No newline at end of file diff --git a/public/language/ru/tags.json b/public/language/ru/tags.json index fa5fa0b9b2..e923cccf2c 100644 --- a/public/language/ru/tags.json +++ b/public/language/ru/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Нет топиков с таким тегом.", "tags": "Теги", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Введите теги...", "no_tags": "Здесь еще нет тегов." } \ No newline at end of file diff --git a/public/language/sc/tags.json b/public/language/sc/tags.json index aa9f14c70c..c416d8d4ec 100644 --- a/public/language/sc/tags.json +++ b/public/language/sc/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/sk/tags.json b/public/language/sk/tags.json index aa9f14c70c..c416d8d4ec 100644 --- a/public/language/sk/tags.json +++ b/public/language/sk/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/sv/tags.json b/public/language/sv/tags.json index fffe39ea0a..d846962ea4 100644 --- a/public/language/sv/tags.json +++ b/public/language/sv/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Det finns inga ämnen med detta märkord.", "tags": "Märkord", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Ange taggar...", "no_tags": "Det finns inga märkord ännu." } \ No newline at end of file diff --git a/public/language/th/tags.json b/public/language/th/tags.json index d2d0ff6fe0..e8bf52df2e 100644 --- a/public/language/th/tags.json +++ b/public/language/th/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "ไม่มีหัวข้อสนทนาที่เกี่ยวข้องกับป้ายคำศัพท์นี้", "tags": "ป้ายคำศัพท์", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "ใส่ป้ายคำศัพท์ ...", "no_tags": "ยังไม่มีป้ายคำศัพท์" } \ No newline at end of file diff --git a/public/language/tr/tags.json b/public/language/tr/tags.json index c0ffd63eb1..9f614ce38c 100644 --- a/public/language/tr/tags.json +++ b/public/language/tr/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Bu etiketli başlık yok.", "tags": "Etiketler", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Etiketleri gir...", "no_tags": "Henüz etiket yok." } \ No newline at end of file diff --git a/public/language/vi/tags.json b/public/language/vi/tags.json index 68f5639c02..7b8931883f 100644 --- a/public/language/vi/tags.json +++ b/public/language/vi/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Không có bài viết nào với thẻ này.", "tags": "Thẻ", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "Tên thẻ...", "no_tags": "Chưa có thẻ nào." } \ No newline at end of file diff --git a/public/language/zh_CN/tags.json b/public/language/zh_CN/tags.json index a50705d3d6..9802f9c79a 100644 --- a/public/language/zh_CN/tags.json +++ b/public/language/zh_CN/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "此话题还没有主题帖。", "tags": "话题", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "输入话题...", "no_tags": "尚无话题。" } \ No newline at end of file diff --git a/public/language/zh_TW/tags.json b/public/language/zh_TW/tags.json index dc5c1601ba..ce9de5c88b 100644 --- a/public/language/zh_TW/tags.json +++ b/public/language/zh_TW/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "沒有此標籤的主題。", "tags": "標籤", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", "enter_tags_here_short": "輸入標籤...", "no_tags": "還沒有標籤呢。" } \ No newline at end of file From f0ad2020dfdeef90f65d98e245bc0e488c6b1807 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 9 Mar 2015 17:18:18 -0400 Subject: [PATCH 708/897] updated sorting logic (syntax error) --- src/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index e94e9d46f9..0645fc55ac 100644 --- a/src/groups.js +++ b/src/groups.js @@ -1089,7 +1089,7 @@ var async = require('async'), case 'alpha': // intentional fall-through default: groups = groups.sort(function(a, b) { - return a.slug > b.slug; + return a.slug > b.slug ? 1 : -1; }); } From 5b5615740324eee39da8e48412d16f225dfc1006 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 18:05:18 -0400 Subject: [PATCH 709/897] composer refactor part 1 removed lots of hardcoded values; used translate 3d instead of height for smoother dragging; various optimizations; snap to top functionality --- public/src/modules/composer/resize.js | 82 ++++++++++++++++----------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index f2da4f90ca..6ba01f944c 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -19,15 +19,23 @@ define('composer/resize', function() { env = utils.findBootstrapEnvironment(); } + postContainer.percentage = percentage; + if (percentage) { + if (percentage < 0.35) { + // write snap to taskbar code + } + if (env === 'md' || env === 'lg') { - postContainer.height(Math.floor($(window).height() * percentage) - 1 + 'px'); + postContainer.css('transform', 'translate(0, ' + (Math.abs(1-percentage) * 100) + '%)'); } } + // todo, lump in browsers that don't support transform (ie8) here + // at this point we should use modernizr if (env === 'sm' || env === 'xs' || window.innerHeight < 480) { app.toggleNavbar(false); - postContainer.css('height', $(window).height()); + //postContainer.css('height', $(window).height()); } if (config.hasImageUploadPlugin) { @@ -50,8 +58,9 @@ define('composer/resize', function() { resize.handleResize = function(postContainer) { function resizeStart(e) { - var resizeRect = resizeEl[0].getBoundingClientRect(); - var resizeCenterY = resizeRect.top + (resizeRect.height/2); + var resizeRect = resizeEl[0].getBoundingClientRect(), + resizeCenterY = resizeRect.top + (resizeRect.height/2); + resizeOffset = resizeCenterY - e.clientY; resizeActive = true; resizeDown = e.clientY; @@ -63,29 +72,37 @@ define('composer/resize', function() { function resizeStop(e) { resizeActive = false; - toggleHeight(e); postContainer.find('textarea').focus(); $(window).off('mousemove', resizeAction); $(window).off('mouseup', resizeStop); $('body').off('touchmove', resizeTouchAction); + + var position = (e.clientY + resizeOffset), + newHeight = $(window).height() - position, + windowHeight = $(window).height(); + + if (newHeight > windowHeight - $('#header-menu').height() - (windowHeight / 15)) { + snapToTop = true; + } else { + snapToTop = false; + } + + toggleMaximize(e); } - function toggleHeight(e) { - var composer = $('.composer'); - if (e.clientY - resizeDown === 0){ - var newPercentage = ($(window).height() - $('#header-menu').height() - 20) / $(window).height(); + function toggleMaximize(e) { + if (e.clientY - resizeDown === 0 || snapToTop) { + var newPercentage = ($(window).height() - $('#header-menu').height()) / $(window).height(); - if (!composer.hasClass('maximized')) { - oldPercentage = getPercentage(postContainer); + if (!postContainer.hasClass('maximized') || !snapToTop) { + oldPercentage = postContainer.percentage; doResize(postContainer, newPercentage); - composer.addClass('maximized'); + postContainer.addClass('maximized'); } else { doResize(postContainer, oldPercentage); - composer.removeClass('maximized'); + postContainer.removeClass('maximized'); } - } else { - composer.removeClass('maximized'); } } @@ -96,20 +113,19 @@ define('composer/resize', function() { function resizeAction(e) { if (resizeActive) { - var position = (e.clientY + resizeOffset); - var newHeight = $(window).height() - position; + var position = (e.clientY + resizeOffset), + newHeight = $(window).height() - position; - if(newHeight > $(window).height() - $('#header-menu').height() - 20) { - newHeight = $(window).height() - $('#header-menu').height() - 20; - } else if (newHeight < 100) { - newHeight = 100; - } + doResize(postContainer, newHeight / $(window).height()); - postContainer.css('height', newHeight); - $('body').css({'margin-bottom': newHeight}); resizeWritePreview(postContainer); resizeSavePosition(newHeight); + + if (Math.abs(e.clientY - resizeDown) > 0) { + postContainer.removeClass('maximized'); + } } + e.preventDefault(); return false; } @@ -119,13 +135,10 @@ define('composer/resize', function() { localStorage.setItem('composer:resizePercentage', percentage); } - function getPercentage(postContainer) { - return postContainer.height() / $(window).height(); - } - var resizeActive = false, resizeOffset = 0, resizeDown = 0, + snapToTop = false, resizeEl = postContainer.find('.resizer'); resizeEl.on('mousedown', resizeStart); @@ -143,18 +156,19 @@ define('composer/resize', function() { function resizeWritePreview(postContainer) { - var rows = [ + var total = getFormattingHeight(postContainer); + postContainer.find('.write-preview-container').css('height', postContainer.percentage * $(window).height() - $('#header-menu').height() - total); + } + + function getFormattingHeight(postContainer) { + return [ postContainer.find('.title-container').outerHeight(true), postContainer.find('.formatting-bar').outerHeight(true), postContainer.find('.topic-thumb-container').outerHeight(true), $('.taskbar').height() - ]; - - var total = rows.reduce(function(a, b) { + ].reduce(function(a, b) { return a + b; }); - - postContainer.find('.write-preview-container').css('height', postContainer.height() - total); } From bc9d7f2922a567a2fede76093b39f1701b6e7993 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 18:19:58 -0400 Subject: [PATCH 710/897] fix so that mouse is always on the handle --- public/src/modules/composer/resize.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 6ba01f944c..6267228761 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -59,9 +59,9 @@ define('composer/resize', function() { resize.handleResize = function(postContainer) { function resizeStart(e) { var resizeRect = resizeEl[0].getBoundingClientRect(), - resizeCenterY = resizeRect.top + (resizeRect.height/2); - - resizeOffset = resizeCenterY - e.clientY; + resizeCenterY = resizeRect.top + resizeRect.height; + + resizeOffset = (resizeCenterY - e.clientY) / 2; resizeActive = true; resizeDown = e.clientY; @@ -78,7 +78,7 @@ define('composer/resize', function() { $(window).off('mouseup', resizeStop); $('body').off('touchmove', resizeTouchAction); - var position = (e.clientY + resizeOffset), + var position = (e.clientY - resizeOffset), newHeight = $(window).height() - position, windowHeight = $(window).height(); @@ -113,7 +113,7 @@ define('composer/resize', function() { function resizeAction(e) { if (resizeActive) { - var position = (e.clientY + resizeOffset), + var position = (e.clientY - resizeOffset), newHeight = $(window).height() - position; doResize(postContainer, newHeight / $(window).height()); From ddd4680ea7d4c6d893c37b026bba18dcfdf96f60 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 9 Mar 2015 18:22:44 -0400 Subject: [PATCH 711/897] added helpers.redirect --- src/controllers/categories.js | 3 +-- src/controllers/groups.js | 50 +++++++++++++++++++---------------- src/controllers/helpers.js | 8 ++++++ src/controllers/topics.js | 10 +++---- src/middleware/middleware.js | 15 ++--------- src/routes/index.js | 2 +- 6 files changed, 42 insertions(+), 46 deletions(-) diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 5264e0e5f4..18bbd57f8b 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -200,8 +200,7 @@ categoriesController.get = function(req, res, next) { var topicCount = parseInt(results.categoryData.topic_count, 10); if (topicIndex < 0 || topicIndex > Math.max(topicCount - 1, 0)) { - var url = '/category/' + cid + '/' + req.params.slug + (topicIndex > topicCount ? '/' + topicCount : ''); - return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url); + return helpers.redirect(res, '/category/' + cid + '/' + req.params.slug + (topicIndex > topicCount ? '/' + topicCount : '')); } userPrivileges = results.privileges; diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 51200d0a40..7371c924e7 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -51,31 +51,35 @@ groupsController.details = function(req, res, next) { } } ], function(err, ok) { - if (ok) { - async.parallel({ - group: function(next) { - groups.get(res.locals.groupName, { - expand: true, - uid: uid - }, next); - }, - posts: function(next) { - groups.getLatestMemberPosts(res.locals.groupName, 10, uid, next); - } - }, function(err, results) { - if (err) { - return next(err); - } - - if (!results.group) { - return helpers.notFound(req, res); - } + if (err) { + return next(err); + } - res.render('groups/details', results); - }); - } else { - return res.locals.isAPI ? res.status(302).json('/groups') : res.redirect('/groups'); + if (!ok) { + return helpers.redirect(res, '/groups'); } + + async.parallel({ + group: function(next) { + groups.get(res.locals.groupName, { + expand: true, + uid: uid + }, next); + }, + posts: function(next) { + groups.getLatestMemberPosts(res.locals.groupName, 10, uid, next); + } + }, function(err, results) { + if (err) { + return next(err); + } + + if (!results.group) { + return helpers.notFound(req, res); + } + + res.render('groups/details', results); + }); }); }; diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index dd5961839b..12a3327c55 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -45,6 +45,14 @@ helpers.notAllowed = function(req, res, error) { } }; +helpers.redirect = function(res, url) { + if (res.locals.isAPI) { + res.status(302).json(url); + } else { + res.redirect(url); + } +}; + helpers.buildCategoryBreadcrumbs = function(cid, callback) { var breadcrumbs = []; diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 1d756b4189..8429e19396 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -56,12 +56,8 @@ topicsController.get = function(req, res, next) { var postCount = parseInt(results.topic.postcount, 10); var pageCount = Math.max(1, Math.ceil((postCount - 1) / settings.postsPerPage)); - if (utils.isNumber(req.params.post_index)) { - var url = ''; - if (req.params.post_index < 1 || req.params.post_index > postCount) { - url = '/topic/' + req.params.topic_id + '/' + req.params.slug + (req.params.post_index > postCount ? '/' + postCount : ''); - return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url); - } + if (utils.isNumber(req.params.post_index) && (req.params.post_index < 1 || req.params.post_index > postCount)) { + return helpers.redirect(res, '/topic/' + req.params.topic_id + '/' + req.params.slug + (req.params.post_index > postCount ? '/' + postCount : '')); } if (settings.usePagination && (req.query.page < 1 || req.query.page > pageCount)) { @@ -266,7 +262,7 @@ topicsController.get = function(req, res, next) { }); topics.increaseViewCount(tid); - + plugins.fireHook('filter:topic.build', {req: req, res: res, templateData: data}, function(err, data) { if (err) { return next(err); diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 85cc10c908..62575d066b 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -60,12 +60,7 @@ middleware.redirectToAccountIfLoggedIn = function(req, res, next) { if (err) { return next(err); } - - if (res.locals.isAPI) { - res.status(302).json(nconf.get('relative_path') + '/user/' + userslug); - } else { - res.redirect(nconf.get('relative_path') + '/user/' + userslug); - } + helpers.redirect(res, '/user/' + userslug); }); }; @@ -85,13 +80,7 @@ middleware.addSlug = function(req, res, next) { return next(err); } - var url = nconf.get('relative_path') + name + encodeURI(slug); - - if (res.locals.isAPI) { - res.status(302).json(url); - } else { - res.redirect(url); - } + helpers.redirect(res, name + encodeURI(slug)); }); } diff --git a/src/routes/index.js b/src/routes/index.js index a6c51b17c9..37ce391e54 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -218,7 +218,7 @@ function handleErrors(app, middleware) { } if (parseInt(err.status, 10) === 302 && err.path) { - return res.locals.isAPI ? res.status(302).json(err) : res.redirect(err.path); + return res.locals.isAPI ? res.status(302).json(err.path) : res.redirect(err.path); } res.status(err.status || 500); From 49a173bdf0af6dec0e508ce3474d4b767d157590 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 18:33:42 -0400 Subject: [PATCH 712/897] last bit of fixes to composer --- public/src/modules/composer/resize.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 6267228761..88ba15acd1 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -22,10 +22,6 @@ define('composer/resize', function() { postContainer.percentage = percentage; if (percentage) { - if (percentage < 0.35) { - // write snap to taskbar code - } - if (env === 'md' || env === 'lg') { postContainer.css('transform', 'translate(0, ' + (Math.abs(1-percentage) * 100) + '%)'); } @@ -35,7 +31,7 @@ define('composer/resize', function() { // at this point we should use modernizr if (env === 'sm' || env === 'xs' || window.innerHeight < 480) { app.toggleNavbar(false); - //postContainer.css('height', $(window).height()); + postContainer.find('textarea').css('height', $(window).height()); } if (config.hasImageUploadPlugin) { @@ -59,7 +55,7 @@ define('composer/resize', function() { resize.handleResize = function(postContainer) { function resizeStart(e) { var resizeRect = resizeEl[0].getBoundingClientRect(), - resizeCenterY = resizeRect.top + resizeRect.height; + resizeCenterY = resizeRect.top + (resizeRect.height / 2); resizeOffset = (resizeCenterY - e.clientY) / 2; resizeActive = true; From 0913dbbade05651b237a2ff8a4adbda71ac63676 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 18:39:41 -0400 Subject: [PATCH 713/897] added a border effect on max'd composer --- public/src/modules/composer/resize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 88ba15acd1..770f087b3c 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -89,7 +89,7 @@ define('composer/resize', function() { function toggleMaximize(e) { if (e.clientY - resizeDown === 0 || snapToTop) { - var newPercentage = ($(window).height() - $('#header-menu').height()) / $(window).height(); + var newPercentage = ($(window).height() - $('#header-menu').height() - 1) / $(window).height(); if (!postContainer.hasClass('maximized') || !snapToTop) { oldPercentage = postContainer.percentage; From 6059165a54040f8b22b9439744b907de998c3122 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 9 Mar 2015 18:52:53 -0400 Subject: [PATCH 714/897] if composer:resizePercentage hasn't been set, default to half the page --- public/src/modules/composer/resize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 770f087b3c..f21c0027b3 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -9,7 +9,7 @@ define('composer/resize', function() { env; resize.reposition = function(postContainer) { - var percentage = localStorage.getItem('composer:resizePercentage'); + var percentage = localStorage.getItem('composer:resizePercentage') || 0.5; doResize(postContainer, percentage); }; From 5d7b46935d1ffc59286f3c1bbfc3920356e4c9f4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 4 Mar 2015 17:17:54 -0500 Subject: [PATCH 715/897] fixing issue where grunt wouldn't read js from file properly if nodebb wasn't run in production mode at least once --- src/meta/js.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/meta/js.js b/src/meta/js.js index b8fa903c12..26e8f497ae 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -209,17 +209,24 @@ module.exports = function(Meta) { Meta.js.getFromFile = function(minify, callback) { var scriptPath = path.join(__dirname, '../../public/nodebb.min.js'), - mapPath = path.join(__dirname, '../../public/nodebb.min.js.map'); + mapPath = path.join(__dirname, '../../public/nodebb.min.js.map'), + paths = [scriptPath]; fs.exists(scriptPath, function(exists) { if (exists) { if (nconf.get('isPrimary') === 'true') { - winston.verbose('[meta/js] Reading client-side scripts from file'); - async.map([scriptPath, mapPath], fs.readFile, function(err, files) { - Meta.js.cache = files[0]; - Meta.js.map = files[1]; + fs.exists(mapPath, function(exists) { + if (exists) { + paths.push(mapPath); + } - emitter.emit('meta:js.compiled'); - callback(); + winston.verbose('[meta/js] Reading client-side scripts from file'); + async.map(paths, fs.readFile, function(err, files) { + Meta.js.cache = files[0]; + Meta.js.map = files[1] || ''; + + emitter.emit('meta:js.compiled'); + callback(); + }); }); } else { callback(); From 25a2e9b8120292190eb0f16d39b79a88858a5116 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 9 Mar 2015 19:29:51 -0400 Subject: [PATCH 716/897] we just need the group members :trollface: --- src/notifications.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/notifications.js b/src/notifications.js index 5beed15f9c..3aafdb346d 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -207,12 +207,12 @@ var async = require('async'), Notifications.pushGroup = function(notification, groupName, callback) { callback = callback || function() {}; - groups.get(groupName, {}, function(err, groupObj) { - if (err || !groupObj || !Array.isArray(groupObj.members) || !groupObj.members.length) { + groups.getMembers(groupName, 0, -1, function(err, members) { + if (err || !Array.isArray(members) || !members.length) { return callback(err); } - Notifications.push(notification, groupObj.members, callback); + Notifications.push(notification, members, callback); }); }; From 724df69561651a1dae63714863043fe33a548658 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 9 Mar 2015 21:00:07 -0400 Subject: [PATCH 717/897] fix redirects --- src/controllers/helpers.js | 2 +- src/middleware/middleware.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 12a3327c55..3b3faa0622 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -49,7 +49,7 @@ helpers.redirect = function(res, url) { if (res.locals.isAPI) { res.status(302).json(url); } else { - res.redirect(url); + res.redirect(nconf.get('relative_path') + url); } }; diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 62575d066b..34d2a79870 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -60,14 +60,14 @@ middleware.redirectToAccountIfLoggedIn = function(req, res, next) { if (err) { return next(err); } - helpers.redirect(res, '/user/' + userslug); + controllers.helpers.redirect(res, '/user/' + userslug); }); }; middleware.redirectToLoginIfGuest = function(req, res, next) { if (!req.user || parseInt(req.user.uid, 10) === 0) { req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, ''); - return res.redirect(nconf.get('relative_path') + '/login'); + return controllers.helpers.redirect(res, '/login'); } else { next(); } @@ -80,7 +80,7 @@ middleware.addSlug = function(req, res, next) { return next(err); } - helpers.redirect(res, name + encodeURI(slug)); + controllers.helpers.redirect(res, name + encodeURI(slug)); }); } From f0836f4107d27cb548ccabe0954218e53353c3a1 Mon Sep 17 00:00:00 2001 From: Fokke Zandbergen Date: Tue, 10 Mar 2015 10:36:34 +0100 Subject: [PATCH 718/897] Skip setTimeout if it doesn't exist (<= 0.10.36) --- src/webserver.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webserver.js b/src/webserver.js index 849be56879..bd4acb231f 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -110,7 +110,7 @@ if(nconf.get('ssl')) { emitter.emit('nodebb:ready'); }); - server.setTimeout(10000); + server.setTimout && server.setTimeout(10000); module.exports.listen = function(callback) { logger.init(app); From 6454e89bac0ba6215cea686c4669dcdf045cd9d3 Mon Sep 17 00:00:00 2001 From: Trevor Date: Tue, 10 Mar 2015 09:40:36 -0400 Subject: [PATCH 719/897] Update FontAwesome 4.3.0 --- .../vendor/fontawesome/fonts/FontAwesome.otf | Bin 85908 -> 93888 bytes .../fontawesome/fonts/fontawesome-webfont.eot | Bin 56006 -> 60767 bytes .../fontawesome/fonts/fontawesome-webfont.svg | 61 +++++++++++++++--- .../fontawesome/fonts/fontawesome-webfont.ttf | Bin 112160 -> 122092 bytes .../fonts/fontawesome-webfont.woff | Bin 65452 -> 71508 bytes .../fonts/fontawesome-webfont.woff2 | Bin 0 -> 56780 bytes .../less/{spinning.less => animated.less} | 7 +- public/vendor/fontawesome/less/core.less | 4 +- public/vendor/fontawesome/less/extras.less | 2 - .../vendor/fontawesome/less/font-awesome.less | 4 +- public/vendor/fontawesome/less/icons.less | 46 ++++++++++++- public/vendor/fontawesome/less/mixins.less | 4 +- public/vendor/fontawesome/less/path.less | 1 + public/vendor/fontawesome/less/variables.less | 51 ++++++++++++++- 14 files changed, 161 insertions(+), 19 deletions(-) create mode 100644 public/vendor/fontawesome/fonts/fontawesome-webfont.woff2 rename public/vendor/fontawesome/less/{spinning.less => animated.less} (79%) delete mode 100644 public/vendor/fontawesome/less/extras.less diff --git a/public/vendor/fontawesome/fonts/FontAwesome.otf b/public/vendor/fontawesome/fonts/FontAwesome.otf index 81c9ad949b47f64afeca5642ee2494b6e3147f44..f7936cc1e789eea5438d576d6b12de20191da09d 100644 GIT binary patch delta 36186 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 D;duUM delta 28309 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%0DKehr}RFC`2XTB_?==0w^)u1m5PYii@6f)6_5Ydu zv+NIZ_(Rt}Q++LT5!n8!J4x!>sE&v_3*cXat{Zq5;17w;B6$epw}$Rg`0nFJg5D-L zYvw@(goc5TeJjM($AJAZxZHZN}RzBcP0=_>ZI6WVGU zO#Nk-YqZTa3{!84P0K~GsI#32<+_AsXU43wILwZS(8n%S9)lP!Dg$$e2$$9$E?^Nj zql4do#+a8qEP(bD2)DpP|$dp<`TZ#bY6^~7Xv_Lle)77^OsVhMOm(@ z??8O8kA%}ZWpR&2v!7qFSw@TF6d*=9YT^Rtk(n8p=CQWvt1Om=n&5uP;GiT6 zMRvbm39kbp*KB`qoVg12w52Z)T}`X41P>D|q_%K#zuhwb+BpEogY0E)KnSy#@+(m5 z20@LG@LUEvk`I|OIUV^^0_YtG9AElBS!Dsh%k^P9r0moJ25Lkm-gh#igwBDhAOj0!EF&8MxV^-m1U1MEd?H7} zL;r;tfFIT|ei3-Z@gyM=!%Ba7Pa626JRAA`V<2D<{RLRT@0o=bE)XF)nFtUL67`2L z{?_Qz_`Yy2t+I)?9&z#z__Q%L3pnhN}U z_rN#WU)kD59D4whbSYERHY01jM7id50EuI1ctl?<_IT=Y5vP>(sNNkB&U5&F&^kBhm5y{o!y!F+4wdxXoy;!4$W`?_nL(+bK_QDAMUV1O0AwZ| z6j)s}9YEZbY-C^Y)9Ej`aS&~{sXCG2SS3ce$EY;Yv-c8TlrD$C85ATlLZpGP_YWfi z`RQ?z1@zIfa{yqfsUDMEPpwuX%XHdO+ASb3EPi1fBPocvfgsC0xa^CG2SWBPWQ&GS zpCXPti8b>WkYbf#Vg%A?&_UwUsUQE_t4GX?7QqUpKJ2Iw#%)Q4Ft(`9Ja&Yk{C@38 z@%T`)#wWy(kKfEH;ZBQ(m*Iq&L=<)4D7tNO{SsA4Fp4D?(Ex6nQS&f3TK|atgj`fE z2|OX0(&(ZqxJd~IANX&dvX?U14_<~h2(lP6k^H8ep;2HW6oPo?U%v{M>|{sU~;p zLTv$OTx3H^4zNUn4wUfo>j{CEvTC@C+cw+cW*ABH6u@!M2EdBL?1GbL_#e;7YDBas zic?MTazk(khXSyPeDom_I~wkLv?Wr8<%egEfM!*M9^kl$>zsVzaP}S!gcD3;Czy#58RTm?`p)RTS8I<-sC3+*n{A)P*rU!@Npj`e{x9xsif2v zTW`{q3p^?A!Mk60Q{(FLt(&TVe9z z0-!PiOV02JcNeq?AbJaI+B9xC;LB=}Ho0vH(@;Qe0zq~-8ckOa!(u@Wou`p_TR|QT z38H`lJE$G{q1egUX@&v$x7wNLWD#j*!D58GLv^bT+jpdKBrK#SsQsWK(+RO40VA^w z0nA7MN1Y1Fc#5JkwD5TtHG1t;lo=i)U+kFG?1Jh11h9382!marrRE2eZh;JGh`wNO zQA_~n?%97HOKLA^#oG(5*bgSllS%rOc(S%Yj00cYR;!D9G_90{pfq7D4I*$k?byOV zR|epi%oIJ{ou`5zS!-_dnxOa{uNv)(luMo^5TCOItq}2}sxCztLEzBGS)Mf6dzaw< z!GweAgvFYJu&mH(Vl9HJBV%=Jz~~i%nDGIF9ncTET-AQ=fv{L11&K_;ei!iht(!De;ym|y7ksL|^5Ko~B-vSh80++s?unD}bZaYa@ zPH4M$&fw;xEGN3_H1vHW><%-+dg7dfW)F8$bB+h7sThoOtteO(v{&-+iK}r$%G))# z*Nhx^!ZMj1VeG?EkWg+0CYQSX1t96fV9^3c+9C393LU&CHsFCa1q99$`zTMsEWwLc zxsw1|A?k8-m8HCrk6;K7dhNDJN3R9iws%6vTq_}PtR2CZ8TG;ltZ4I}sU+^s8`P3F5QxrypG1-{ zGlr^7$Wsy(lo=xfC~BpKfg<2z4OEeEF@~x{Pi7O#CvqMJy+f+}=CB_$&IuEslB@s# J000000038FvZ??8 literal 56006 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�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 - + @@ -147,14 +147,14 @@ - + - + @@ -275,7 +275,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -438,7 +438,7 @@ - + @@ -513,8 +513,53 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/vendor/fontawesome/fonts/fontawesome-webfont.ttf b/public/vendor/fontawesome/fonts/fontawesome-webfont.ttf index 96a3639cdde5e8ab459c6380e3b9524ee81641dc..ed9372f8ea0fbaa04f42630a48887e4b38945345 100644 GIT binary patch delta 13268 zcmbVz30#y_*Z4ipG7G}&3yTa4+Ylnlz|4RNjJV~JDDH@e3yK?}xR9AMDlVy+fr(pa znoDGsQITeeW~HX4rY)9*edU{dW@TmyGtYeIJ_9bjz3>0``#-~7o_p^(_ug~QJ?Gr> zT((`8Tt6Un5g>#ph?}saxL2E6RO7#6-CMSTCD2?TLweQtxDZA3|XN_0p2D6XaL* zwFKUFV!gezw8S-5aW^0y3o5Z7rgZx3$}Z!yUGaSj!q-omF@9|DnW|$14nKxS3a5{) zEN9j;9SMB!61I;l8#}$kI=AWqz8@omb(hbmn0>jh+oJ?N?m>vYZeGc_iMFyKM+kiL z1Gbl7pwlI1PX-OA=_i98`z}Q+xccKSVpSl%889&T223KxocKl?v62K>OL)R@t2v|z zS>{if3dFjy<_goXW*lgN)Xarg;~}I1?W!Z;U>l|rh!Y`WYTkfC?xyKxc8!7=$K6!j zG}n|f#WLlu%3p%8vzoE�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 diff --git a/public/vendor/fontawesome/fonts/fontawesome-webfont.woff b/public/vendor/fontawesome/fonts/fontawesome-webfont.woff index 628b6a52a87e62c6f22426e17c01f6a303aa194e..8b280b98fa2fa261aa4b0f8fd061f772073ef83e 100644 GIT binary patch delta 71000 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ɲSD;H&r=zK(C;_wfh#L;Ml`7=MC4#h>BN@lAXS-^O?FUHk?965qr3@dNx2 ze}%us-{431F@A!d;%ABTv!QK{jV&DGzB)F4HtZ{LUyb`(+}Gp25%pXg}(4o zUDF!m0zuO~1tvMif^fKET-iGedAvdbK2pqO?}_D&cioo+Ydn>|~#lDgAN2cGJG z8!5vXh#c)E6x9k+fjJN<&rv(2jx%XnB=B@@ILL%9cWKksoT;K~snd#Xdb%Y@rz_MT z>xr%>d?UxE$PFz=@29$!+AGjuIcS3$SBwT8FE2;(lF$##?sSUJQZ(%jt&4E6EZ2^7Rb8;xlnJvV zoUCi=LFkE$D{S4g3Io+u*jC|X)DCY*9ws|Q#|+ZGp?V^%8-hH<7gqKI;VPPcs`n>V zuT$=-WhS@Xq|Zm9!x#;jD&>=NyS z+NBurL{3Z-(dahvEa;ZwixPRoHtn8Vo+f|VBB!gCusf=k@l?Cx46?d27|qRwvZl4Ao=Fz6a%c1w}jmX%WIMlVzn;e-w>~+9$?29`Ol73muCxhG+IgV9Hj=1g7-K&%lDd!a|HbNm#u3F;y?sO7V*!FAbt)*1VZ~7bhS}CQ-4F@te{qi{%-@ z<+9JohFFgFNa{vJ+f*rt}UasJPnr!$-@4IWuvBnmxq{YW7$r zC?gnHjg;>DwG45SQf48_sxgTvGf{P1f%tB^zUj{@NTV}z!=jZ^YGbv$eERYJ8JZ+} zN0z^T9AvqUQofwbS%QL|X&4ETvC((=jF4$vhJ;e9R0~nbmlc7+p2C_dTSSoMOd;y> z>Q+*OUb3gT$r?XKWiL?_#{1Zok>4SVd^<%CryD7PLY|W#d&4g+UbtRqEU{xM4(v5fw&MV%v5ci+jdZ8CPXom2p+ZRT)=h zT$OQE)>LCnHAd7JQDa0cHg8e9;i5|1%M}c*#VQvy;=UR8ym_7XsI%5OYpt_?*1G(_ z(0UBri4`|kaf7#QFsQ+x27?+5YA~q5paz@TWJHq@O-3{s(Tq)9EWa_R*&=^;%!@knqRzaiGcW4njA%2W c%?Kt%z0HVr{l7^Jpz#0z00C14{Ijh90H1zNjsO4v diff --git a/public/vendor/fontawesome/fonts/fontawesome-webfont.woff2 b/public/vendor/fontawesome/fonts/fontawesome-webfont.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..3311d585145b1cc1b9581e914acbb32d8542b4f5 GIT binary patch literal 56780 zcmV(|K+(T#O0Nrc=1OUYV00000000000000000000 z0000#Mn+Uk92y=5U;u?e5eN!~<79=jS^+i!Bm600*lcKX+wfW(HdY zfN_R#dm&NLolxqx_tG1O83no>L_x*xw{C^(d@;VG{rRcc|NsBLAX$vz?hm|2KvZ=) zOIuYlvYz^cEXd)e6i3QlvtuZ5)HY)BifjsIEo;AS{=hCrH3#ONR4X&pisNaE6`o9R zCg{jzY$xUj)qIF1h0WrhL?M}8W@&a!Gh9f-773A;`E>=NG$e zQTTn4msXK)xyWnukjC7{D2KVM!UQovQoLP36Ms;#ZSl^uAEd?X=VDINb45_R3pZqZ zIDSR`c&6ED?Z#`2le(q2iuYd=Deu&3#!ySRI&|~R$j+|tJ$mAaCVzKi3FX+15)CaK z?^A^5Yb|>{jf(*U2|VQkK$fsP2p<{aQXcs3gg)c<56{o7w;~tKHezFpF`~wZ++PsA zQ6Zy3Qd-?4S|ue6Kn!eDRIr#CC}$KHb!MG6|39a_XFm_-F+9N)48sVKRv;92e@dZq z3YA@yv1(m6ZfXYr57K@4GMS(GyWsVkN_>l!YT+WE#05TdA*wOmxw#-Y7h}V%1=M-B z1r&~@FDu>7ms9_LB*#grv5IN>kYK=2N({OLNe$YJ?$SDcr;!Xv(Mb$RN&zgv<=hSw zHtpvfQMYB4sWI4hAGuziRDN$t2H7T-1ref;Esy{I{hwOWEKA8^>;Pf`_)03Lsb>q6 z0y+9I{Q1R0fJu?Vg4o$J6Kb+ZsU7SInvjTJgRHY6l9FePiTiL0BXY(a2@WXNhh_td$RP;vh>mu z*hwnjT2OSUf`g%Rfx!dOs^V{1!}D|N0V8@;kI|#X0tOrGuL4$#1*~9WW7J?oZ-9t^ z5+;ZzQ&c=LP{G2$x-{xey-+SH8Qf;b9WfnZdO~`~!^_ui2Y`6_R@(ma&*`hS-i)+( zca>ilGaBKoOl@>rg9tImoI0frXaIPxqa~6AxSv~?DqAncbiVO$ug*S=6lXUx zl9MCg>dNcLvI9%-krFqfR&xvxIH(AU>c4funC_(m^LQ=&Zfi;vRp|(ddV!I!nB?F0 zof@J6XslaoY%~_^QyaC`Me)zcRtJYSu-)E~h=34a00$$t^KYtU3y{Q#m$KF&>q2)f zx?MS?_T1&7pC4wx|NnddGXs#E8Gs}JQX&9K;tU9h0Lk3}21%|yX*X}s9cpUUD~Bxw6*`%>`@byFs}U)yRIPFsr*bG`L`T?WetqF{K(Ig(TPtf-PXpyZL|S{QN}g>q$2cUuk9$ zMuapT8EZ30AxP^G`6y&NV$KQ*nsok5LOg?t9i-Sn>bBY4fqNYz zQ=n@|#Joqj(KX1nx=r-b1O>z)vB4z-vi^ zQhnAu^R0O0=d&W&Dxdc(f_$*Yv#Agn(E0&x5h5fQ6rxW>FX z)O-g)e<4;w#t47|5R_&tBWz@s#AA`#O((TbFqnhrS!$Rht(6d^J~~Ix~WyEyba@TfgA#-$bRZ9rYaa zZpQb7i{kWut)CQcn3+G9GxphJ{|iR<>o-3ct})Uhn_8~!Ppv_O0%bI0xC>I4w5-zO zu_LZCX}TfZ#K?cWv=R(2j1r7t38TalXOSGSvEy9Qa+!IR5g0F(iiTAzT4jkN!ATyh zdXZcu7Z#@2gzHxk7Rx{}NHbm{GW20br{)`XBkoTayP6pU%fZDEJ77TAj-;*USj}G! zDnaLAQdRJvX=X!aa6*^?9%IULU8{3~cs&!t(#=2iWj$W2V(Kid=4~*-?F)$x?6Zt?#L3xW;Uy>L9<`j1#9Vsg zSpQ+EdBNh`@PGJyf~UIKb2;x(_j=JWq_QU!!@x6)wv|tXe;^$R4`yLhn2V%mn5~xYV-86RT_{^9xL)C)pZ(k_HmcQ!Ud!VL}*IY6`w)Vo6>g%u10iI#U3Q(~x z3>NDY?|i*Kc`Cox>`OuIq1-ouJRbzI7bn0UL4+{1_s6;Gf1Fq0BRuusQ z-{-N&1yZRGevvn@L=9I=`7#OBZmYV=p|r12VuVKp%5WNdb?cj(5BPLQRLbjf&C-_! zfF6|%Hqn#-Z_T2z&7v}E1-G4+I$)EwJfEZn@BIyz0&NrM^idp6n$=%;YfnieW;TS8 z$y)RsG+SS#WbcW2GPiN4vj4)w{+rB7kvO^84V7;eoZ*qJ;0oV{xEuTfL*mg`-Fd%G zh;%990Q07^h&{Z9`vb6MOy3g9F1W%P$ihjf<4s@Xr=8XzLOEZs*oR%V{nnY-GoPGxHxbui*F~%WR3Fx4mUFByJ!Ezq72Rc=SU){(smx4&mn(*ejEX$ z%{U@$l2|11aR{4g=wt>xrK#4nmgNx<>mnCgnkaKa(YADKekz2)NEdBd$6csGT14Q8 z^`xn77TYRGwuqFbK95+*1YYQ=+Qc)t{B8=N`MjT~-01T1x;teM`MphO$^}H$5@8L1 zha*VxZt$nG{cQk2ApW}PlUW7!~&OV2^P;xcw zd5s%lo{IQgY3rv08Rla2?xm0b=G1ZvMoyG04Q;5bO2x3!+lv>-sz$4}`@+Bf?sa z`C|q>2AeDd$roR*51!jr3_~N z0`!Lco1wLu1getp<<6^}xTed@^|LF9T)Z`8FjwnZWq1>Kd@G&Wwj*I#2nA!+N7ZIk zq#?ANj>lZqoJ(bK2XM8o4f=(RA`~KA9bfS?&t(^^UN< zn1f)zc>?&W=YdE&3-WNc5z5HpEP$18NTrH>t|RUpz3G{1I-^QKEhkvJoQJ$3dYNBO zQ;wO%+k2B|IM|Qs@t*zu?FM{ zP&$dBc?`8ZHd5%i?X>4@$ro7=g8kr1E#&;cD(HlDIi8M@%e#umoB&`3Um7wvZjls# z)Bf{~`UA>=_vz{$VyDJ?^q8zK`TBbD3y<{sI$yb`UH2MUi1?^;0&q}3XId{a?h$|^BLX8xS z)M6eoM5{+-uWipjqn{0g@Z?8^oOT{ci9jePbqCFSdBQ{|PeFPE>&EF#l8FR+oZq2CI&x(GJtdV^T89-tlsuQ zcim}R%}mi$N+6sVOvnWu;Rh^DNfi(z@XhH#HpoVHeKq|0gh$(VmJ@l!Jii@#3;Slj zl-}M9`UD%>8ylUi4c=_yq2_fu`B#(ooE?Dl1?7R?^lh@Qx4bCZ3U%4^*gkKkijWBV zf`y8UNLH+4JS2$WA@l}RtBm%xug(qvXM{S;{+F-!rR9aJ4MKRYGl-(xO6s^uc z`(-k|i1oasBZI0Q$aXn=BcGzmh2)-rklvjZpQ1>uWpGSm{|;z}F;ps4&6}?j5FUje zAfPNu_Re7G*3H)#+@V;Bq*V}MuM!GIT0XV2XWrISl&xX`c!!d~lrJHnSew|Yo)*BT z^QgwSJ=*@`L8OYWT4pD;z_}I~Ctpz*EDO|^%-&#u#7S0`d!*;vHXis0wP;?3$jrWSHeY)tj7y2B-2h>F?A_z5 zciF}o@8;A*Uz&77uWQ~hEuhB4DS{m+QU-4?!V-2PiJflXU>&&)#OID&5Xhc-FJ^tV znILx~Y(<-M5#mE5@tH9$L+K2&o5oeGdq|GLqeLBO-&!SostVdXYchjYM#v#rZ(qbb7b0G& zFxmjwOC#PGhz#Wo+-~?-dpLPsb!%)#rm`i#NM2I6mM*}6ktz_BAvB|~TYUR{2An=` z3iL%b)YcaEKi(pB!T$b}g7_T-xFfFWnEC)}1hRnVB$0j&s>~$a0*)HSJWO%Johle)zi z*)x{0cm5?@Dw?#-(8GGtrx7Qx#^P}d_Bh-eoSz#9J)rfo8{q~0#dc@U5^EyN#G>E#W zEL-{i16l59%I+KhGH#o|>Eyr3#k%mPpmBQps|l(yZN{+$`LEH$-uzev!4p<$RvKoe zUvq$@fL5_GK>kqBG-Hn%rn+*Mx7ivryiyUH>ee6@4)e;pI8bSD*)w6a1wYr#Hws7?;rj4WKagTxywU+ZbT0MrPO!{a*in(GK)E&$JZp>< z2hS=#7<^OkF+KQ&#Umg^u3>~SD#jiW32T%HS8bViOqiTh9%(hAsiTKtw8gU#+Jn=t z>moLzuWJKa@Yi*)?6hVtOQP#(&P@K3&Y%&}xWW5&XC zXm;BzmH6unu{a|$v+^k)%Y!77Kp_**1UtO!8}!Yl&?9*Io8G<3`KOCzs{Z{aQhEs5(+mAOXt0_>Eh zXqlciCX<-XDjqEA(q88c4U zj)d?1muWF%%KVs36`HcJ>kn1dMt&(G&X0msMqAc`bWh-@_A z7EXlSZrCUiWe5w~)be$Dt?D|}HBT@TWn~Rot(ufkV5?4_&qT=O0y=G^^fREz|1fW5 z^zp2EqGoYgN@*vh~wB|1D`m7DIY#cfVX1pxXT#ctV8*VNo?c&M5~= zQ6?|Ht0FBw=!=(rBf|`lF^KbG)n^(UO5;ubO#36a#V>F3Kr%Jq=Ai2Faq^l zE>seE2r9l^RJzf?xFAnz*QxFa3LcZ%T7xWx$4Cj=J7nZNqGl$QVD7!SbF)*(D`)W@=PM-omz)a%^q8@k@m<91F3i(W%8lMLi84v!T? z#vnfGEntC@Ju1OebUdiAM$@Iz{QL7RT3n)wdTXTPDn-Q!@j*mIH%;gQ^H|9OSJOj} zAcm;`_#me7nQNphyCQYNV}srhAw_MEch``^spG|?L2PG!m*{y~StuCnJGdc9fvvA5 zD47cO#(dDhg+P#>%7F=BVpAwgusC^}wx=Q73r%2z3IrT%U0;~x*a{UmZkD6_V<9ap z3~%N*<1ADBVHqljO`ky*EK%- z+I%&@vRMF30wB1eCy+up68T452-0%&-X?FGd(_Z$gza8s=q(8R?yEc+mLr3K88IGj z)RFgYN-CGre3~?EV<9D6GI@kK@Aj$}Z78jA535LDD`@oe`F!Hu*nD#Jz*Vgan_Tpn zL?8XvU;&*w^tnr~^4d>2D|3nh4t0Y~S4^b;XavK<;G}u)SGByi^d?9g?N=A~nd?Uj1civ%c#?{2Q@{qkS zdKyC4D`se0n<=$UKd?@OGzr1NRA&#)4lu?vie zjCcC(L5JeJ`Prp;QplG7CQQc<)k+xm$0b!GHS8DA_UjiR!fDCw(kSgmd}DcC>&awsbdsv1QdMco4wwnYXlx&vGhgtcz{49va0 z=hP9yDH`*?xoqNiy}3=4m@jGmbQxN(_i!BHu#6l;u8B^JK6m|U#4sztM7*nWssd2o z>{(Rj9@nRLM4k%Wv-#Aa^QSmjz2}5MSK#g^{nyT0O3%uY&zH|{KSRvyF#CcTTZ^>G zZR%A=e2TVXf9x=So#Nd}Jq`ZIt?obm2vk-@SKOWzH#uaY@{ecSaz`{ER!)+tsmmRy z6^(JHW?~bE_Pl*wiem+ZsX;`2-@v!+WRipa+*RC6|o*F^4p;k}A4gObSDB9M{wf+oLuwWs}U zvflQogb7C0f1y1jA*uNdYoeT&mooJ7=b*cArS;Zf;D>D&%@1x4iCcOi?_;m1y(?nh zOVn~Dr_mdrSp>Wz3{3S@ecVw}V=?}qX6f%S!iVKg?G^w$P$2vCJ#Vq6#}-}}(Ww*+ zMEb;lYK2v4=!z6QTaz8NT`f4@F-3u`2ij7(V<922cUCY)ffRm|7>WVxbsYM4c+V>k zp8G9GO=l=pDnbu_a~sbKVEM4xc`PylB&-BoaAYze;CAeUXO)grC$cobVwB7t1q>X) z*Rc@|Mgs6mv}DjME6kzfUw~9E5thstFesxgC{9bjM0zp=J{%rQs`%yN1;>qbrTxjL zMumJy9qb=R!87GF^P~+rlu?yK4t=C42)HSA2u@K|+QCs*T1ca>9i^O_tENyScqjk@ z4v5>3LIy#*BGAWTfk4`3%63frH=H;Q z@PKfz&vPQB=f$U5Jt;vGtuR))92~H?#&yNfnOzczp)|2%%h~}u$q=+jPd4TZ_$Q6Z zRt{;}pvoH=)D)yFPu2H|Ky*DoX;$sClvY_7n1frSW~HNSW<#e0H73$)khVH0QPW1_ z+{XhRscQJXpkIT8rr2RR8n8A{Bn*&YjtlHdMl`@{XyLF-lY$w?!4>96YTEpj0S;Q! zqEem!v0MKCI9YMBV`RbuV7e$^*{^DAe4KIYfDMBLw(F&VyPOshCx&;4+~;OVk}gbM zCTjDEAER<%?sm;LgYb+zEn3~J?*r))#Jb+~+)@hwp+w~pmEjAGu zbwpq-p0v3`jl4sOLjEkc_*q2(R%G}g>iVek3814Fprn?Iy#XO^why_+sH2lHs@sX& zuv$Yl2w{vt7-wI>6}xq$_j#hjmQBI{av7Z}mLVgq{{f1bYzk2rI$4^2om$y45~<*T zxdJiq5Q7USaH;4j3M7#iA}Z0NOt>*K0UL}5?yhHYJC;6U#89i1Ef6W)c~OQ9O*39X zfpDTmsB)7^Xj>YMOvp_7nKt|+pA*fLnoT~=Mf|cIicE2`PD&RUSA-oKlu4@H+RiRN zTt=u_C9EG{Bkb6xed-o0z_>_W0NFmxHX(l6K}#g=#pQK5L`x|cAzU_v;%xddiV;1S zvv-Wya$;svOR3aN;61AF20RB*Y89o(RLA)Vk4Q(ji&ox(^2SF;x>Pb|OFl^}yn}0e zI4=DVT*`1Pj7o*Dh{(ax)r2|_@(f%J?b*gwJKFE#wf>^4x4`?>ZW_{t)p~VbAYWi1iQCf@TUQ@F z^TLL5+oi}2w;#5uJvHh-2myRmiN@=2YxgYkOpD#Xq7-%A3$Ig6bYYVem$@gz#!w0b+*u+`B8|C3lg)kLBB>a%jf5~UhebK zm4geH&8Zl&x5Vth!E*ZAGt37DAGcsr2^A^?1OgJnzZNu@;foe%;_vfQiEtmf`@cqO%^ol}# zhivKxy)Mnz`EiS}V=~a##apt`XK;SS>+n`Wx@mfDkQHh!;xpx?D`pe?7G4<`a5X)2gUry3e-2*uY|6_# zx+`9TT-z~18ue7$GaTAuFXc@x5liIh=l3X4mOuI8!kACxnyDBe zTylOltLSn&=6Y%5;0I1pih1tMw&bJWlX%35haB!3A$n4fG+FBL41CNER1C$Zh%e}dF%a3Z34C@^Ltq^VCva^C=YxBkN_sLd!{Dsql=0EXBmQst($WoIP;w)@KgL8l1 zaPNBe^+vRrjD|T*k0RH$d9^s;>odv(08;*(#X#Mqf2Pc3jxFWgE>u<6h_zQOp&7(s zZ(5FKVcH-@MqHEhx)kxOm0Lx~d??UR0S@Kr;8x*f2N6T1p{x1jP zF3tu2T><|aB>?`NQhCFg7`kM@wbbBXT0Ng7eKFCp)^jK*d91cxyWCy2Um#;E z>F@Ogb>>cT%?E1se^mo^{1^f?>aY$L=t+m6k@6^T9A~gnV{i`^fl%*_`vjCz5Xeei z6hRdjlG!KGlmMx$3{SN&J2dSv3(lwh&)afyS=)aYSqo4mT;phv4`eX2PBh@~t8=3; zP(KM`L=1>93KpRsc~tKELV2}Qx&?azE#gw?a%va5@UQyI0V`f4HOoNN@)xe_ptN?m zP>;J>`|ywc%_saR@WuT=z2cv_OUUIP?U4WHe?Rmu0YrNL3bE!1`Qv^45e&b<2lC_4 zp9z(;=z|Dit(NC?TAu$YdHzBcb^kwesAu}QzxG)eGY?AE^`h%6Ni8RCzl&yeIr?_sG%m6{x?2`XNy$6_U z9r~9EWBin;2x+xKLT#BsO~P9k=m^yeg#*#q;0Uab_;Rf*{T-=D84ov!K`^nu;U(Tc zRbHlxztRl0A>K40%^L-{9Fnirb?!2@ozl5#z3c^0PKjqERArQhjIbB-MxkkDx>{-# zw6U3UA3r=&{3i}n7=#wIfOU%f-m=%TXU~|GQBzA#HBRR(M`5}CxUn2d4TxxX@&a9G z1}imDq{dC|y}*4!&7wCqoctqzkw<6&SEW9=wdQqnkN0HqKUrSyA+I9i)`zRq{yr1A zAF*ek*I&vU!P;jg-Y0xZkeKz65=L$>`}it{ooud1=C1$o1q-sM(uCS4-uzhcV^C|v z#Ac{?*IJ*EXIeUj(FZWv^5yYP;>N>`;ZjE4DaI#FAX>qi`cwmW`Uu@;^a;0sL2!$F zad%ynyA%}{IhI$%xyvXu?ec#UhGjQOh`)v+&Ff3#1W>g=H!dLKQ#f6u+%wf@LgP=h zJfJa`T;(anuT0A9DEUgd|B{h3adN52tW3X>uOBF5TTP0M^x}w7n)PKy9_BO_2Man3 zejQr)z_A_4w&M1#sy0l}BAvuG-6bpyP166{xaYqq2pe(M9N$mUIwMWDsD@J%VwIwL zxld1#{SwX%m*7E zD}ebILdkkp&4dy_owNnc^ENKRNdBU3D{Q8UAU&{A4+PQi+&rNpXeOt3(5xS=>P^Fj zAKqub(MO?K;Oxw~lccDZDrLKtF~~~|DwTYdfOzo>j1WlEKok~8jupH}aD;sHMs{o< zYT=|b?1=?#Zi-Ea&nG^A5n^<~P%1@%BP(wNHwOEKH^?DTFZV2&A_3nAptYl?ABEur zCQnSj9)urFGM#-)+H>?{VY(lwg_@D0gr4vgl2ng8=GmQJJwSGq0+a(|yMg-#dZ>(% z(3u;w)msS{jk;tENcn@6=yR#=wqBMSvfRhO!%{OmVVEpjU!KuiSkyqH>LAkvE)1e4 zPd3@9oWw?vb~5*8R{2#x>S#_)MzFHfrK>im(Y?aj6GdFlC$w@KNhc) zu|H9svdtskl_(RVg7hArGN~p1zQ5qG^??b@%HI`jwAEW;=JPz0zPP%==|a(4u{&E= zJ?i;=_V1#^?$eU)Jg|c{znRq>V+6jUT1wtN< zKM<=`{x1Nrzvsb6;VJ>}?g?lWV_>q*3^AOK{`f>(>D{}EqUa`s#tfB zJ_yL^j}}z-)Wc!g`vK_sGjk|h!1&@I&gpeU&uh9s&ETI zU6phAq>9rW<#8b;7&GevdQtvE^-?iF&Hs8yYbGKnQ(* z)-RN}1tKzxuk@CN4v@myro0bU`%v6mA=K5X8%;yt@VGz;EKqJ`&{;bTCwKRaeWt_) zORwyHsT=($k>%Fv)VhS+{_Aia<6w@Z9oS2)6KmD#GHP{2f*BP^R34R5VZhI2l{$OObL@C?wA1C^C4mf3AZN+Pb5Ibw>wBZ5On6OhGW( zvQF+2bQv%Sn@^lwe;IP+&JhK06P6Akc)*!LjRs-XL@kpq1X-aGg!U`mp;-WF zGsa);St2LI^Lvlp&zN$YEEJDuH%t!0&`IC))}9#Zf{N~@WV&c{7Sg|aR+SrTuN;vjK5 zBsR#eu~y-;SU)evI~Lb)NR5&%S-!@k)bnT`QwDCSgn&ftw7JW^dF^j^ER0_%O3~|! zq_}z0dTYcsO+*>K#7ut$A~=6=_KPic(X8b`P(Kf z{;ox``YFR>O;dE*G#7H~ypwze*IU{IFlFUSldL2%vsxRrIB{v4Hx!mcyEZg*QN)=P z>(QX6WS^$(5U?)Y z5f|s2^gq=P`or(zo|KdSoH9xJ#Up7 z^+SU#Z6!*JTUrWvLJ+((mxJvfs9|U58d$b!&Mjn!1U+GN0b>e^1eH6qEdF3!*S@bk zYmCR_SbjV{m#H%32V;59*h=E@HF0y2PddC}tbzYYo?5Lnvo^O;(^lDANJ5!1)8LIj zPTy(MOKmtB3zTmLcGBU^4mcaZkE8Mu3r0k6{sNEv++aVBVVZiv24qA$0ZkEYU* z_$mszD5%T5>DGt+qSMa{yI&bEGN8{Z_-E0i7^ zW5gNS?z}KlfWNP7zqTX`I3ENR`b=&KJ&E+#AJ5f+ID%uT8s=ennJdAr0NSU^+javf=O>ytU-#8S^rrWAQboA;)3kwEb+@<(X zkld1-jqa~eT;>kFe*Np1h@9c#v3_F~lj-;*0Pv1j^n7U=YX#y5Ou^AbSmrCs=CbY! zON2KhNn|UOiuG7xHVb002w;7dDJf|)|5}g*b(Wo8qTa5{I(ODVIczqgi^0L9U@)7! z_?9gM2iwHGL|(ecw}3- zUX$k#AwHr8&x9us4im*RX_QK*9u6u4nYmDE$Z0+q}-yx+^FQB{x}O#$ICcmzjxDEUo(@_yUiKH?4k_ zCXYJ4-0790K;cWyk21HEe=W54nqFgaQOX@3aGfLw_kn?w$YV1VzCeqpSq<(OZL-Vf zT*pqchDlPErP>SJCpL`=?FODuh2qKxZ5dXNGNT}d$1_HR9`i7wbes@#Ab~rkQ2ztg&k?PfX87Pg9JMqbmK9;u;r@y-_(ZTu~SR`GP9No#M4aM4ys z-DdJF0PHm%^S+{}C{BZsh!nQRWZiK$l5wEwgOkS=W{KIvqci1P1W~s*bm{B6{JFT7 zMxfk_JQp2au?H7O9Ks^R8I}0jbm9@V$ezUn}hr zP$fl_Fc(6+4W-lSKsg5&?kio=^xRG*kJzY!aQ#ldCPO>?H;h{K#5Ik2+8`u2c%0Xy ztJz+d&K&u{Iwi#!d$Z}om12DxdorVJyHXH?sI9T-{<37U<;2hxt~?uam(aB7fzmd8 zF?+oU2*3S=WY>AKrHCsvs(ne&So$@w4)>;ZY(sL)M@D1cUDJ}%) z`f-&rZ(`_Lj840o_&9E5_rMLpR}QI(D8P2IE_H-mwG#2`1ApCkl3Y?rL_*4O9$l+V z2%S=3dgXRe^(7!^yNBIs-I!#;+t?8>dq`|)ha{ z5US{WeK0T0<`(0wv+QTYpxhF~gAE%-9WiF$txiW~)Fhg(WWTWlO6f-f%q#>s$|A$b zX-F&P&&3gFb_#ojJ++h;>p%wX>F(+k$2thX>VLa*6@z+hA0=%-(ArT=!GWEhbx!Dt zpNYm;4-0*Wpr$ZR9%@p5R&tlA}>kA z6%JItKXkI6ButW)+(HOTv@(zqZ@y$^Oo`w2P}m2gUOjXNZe&olPhq91^=CFPDWIX+ zA&jGZ{>*kMauLGp4N9up=LC;biP$EbS#LKE!N3Uj zaEGGx=t#2$LF*sIr1bo@b!B{z?8g*Wo{jAacPjzch)1?Mguvb6qIT~sGBdI}*bDxj zQ1Ya0s?C?ujaAS3_r|C|=ri#7itQVzyRzvOuC>+FRZo@s-}A0@d6#bFNTtMUl$tET zOQKYG<>h?Ly_`Eku^^+CLoMw`{7?M)e2Lm>My`2wm8GtG#c9EI(ep0*?wb9KNP{7( zdXH+@9a{X=2y*Tg<_SuRm7aAy$W$Kx8>c{GeKVn4=bMKu?n=PimG|ZNI`aH;&y@Rl zuIL|Ip2nBD3-`?{Hy)euHaxpX4`yRCBs+Sz>;#BAW%69z{&hhO5Ht(n55O_;Cf4%_ zwoHvI&Z97{MJAMMRtea{tv;{CcjI_l$pVIOE7NvH+iZbA1)Ok)%w7F(eo#T7uGyEs z%wvh_in0d4%-v`K3Gka7U13eV1?JFK(XBhlW?!`);G1n_OX&3X3pFcdeZ6-+%?d^+ zl~Jf?1iMcz9=Il)#AY>BgQG*tA86+?sdN8q{Aw#MO}k`k$JlZ*lk-YYwlyi0$e4(ap7vj$o9fAXRu_D+WU79*O@YQ~w*jkBTGv6lY*veW=_<0a!YC z>NjXuRa#$&Ck_^J?-jV7O%W;!x6XEI(p2gcRz~-pQE?vKrLL!*Tj?UBEB3dtZ<m>;pTV`>=ZMEj=mp2mu&RFcmOgGI9i0 zO!-LC$g9`bTEfHB!#b44h#{}FSgM65)Nhf%D!osoz=vukRl-$$`YWrMaIJ*zd&bnz z@c5-EfuQ>Cjf`E$sJ;p4RmVg9OqU1Gw1EyA>8X}6fF14A!jIp1ZFBALFGHWwa&*c3>Bmmg}-VG(`Lx9gzRIA4@J*&+i< z`&7e}Ha+gwy64ZGFWK^a@aDI4c8xL{EFl0hm*6%iwP28I7QQ{8q|x64Q6Lni+3$k5 zlx|q|giOiGp!SE5T$vk@{}{!@C!oRP=j%bJa0?go$!~+IiEu(yt7w$lgGfX(Eh@WM z&*J%msOP*X;knBtx?YUU9j2uG@@W28u&In=Guf9+m@_H8u?l#HxH+O(UNwreNrZkh zTcTVzAkep9oj(&n278OFH4WzGZzG%2qU0=v=SrfaIqHGeS}|gP`L}k38PlXhm0u?! z@SA>Rg*5aa%thrC2R>hSLDJWCQ)Wz<{qY7h3(Eqk4>{GZQL`QrK72q3=9E;k0y?yJ zQ{_c#Oo}#MZ5Wr!l$RL2`6t){?B?dk%trs*)z^ERoqrA;e#RYBJ)DP})@ z34T$ceflBF?hTTHpLH)7j`BaAeUVCrEEfK{`)iQu|PV0FNVSRL=Y|T)$M4~ zRf9$8dm6qLdW|ZMCP9z7>z4?)lV$H_BpH?aK!4#XyWV)=4|;4$${)^eBpO4b=QjND z3%|QEdyDhl;KpF&4+IlX&xeA7#kkRPTNxq*R;M#%UKoAy&8fH7gI9su!C#DxWoLYP z3FGzSw!L|I7rY&&V6o~TxZ8M?$DNT0Y&e^TrC!1EVFxf4?YT=--}e^CN1*;(QowDa zRu2(~<@DH3@(6fw6WM_-fF3Bdqv+x8=5R2AE*zQei)=1>PGK=Lv0ps;@L zR*4|S5jPnS9)2|~70(mbjP*wem~rE2>q(+kg*q5{YboeSlW3kQVb-76RL@!^w-se= zdBG*k9jR_Wcs|^mX}GS~E=mv|t@lq&nvoEut?q9?jLD6GgzQl&_4f5~v22kdhk-sH zxN*#QI^Efab+3R9?Mly%Q5wiy9!lYP_iTEwV-)Ps<-$VyDeYfkIg-aTOX^V7FP(!A zt?}lqJLK@L0Y_F`kIuXG@#L;)#7>3W77!=Tzr)-L{adm)2rtzbqB7+Rg~ypfr{AOPP049Y1w(#*ER$293f6s1k{Ck`!_g7kPfDZiH44^s;E&58`}c# zVuQ(XARH~>=TM!1$+v&SVzR#O_;GZNiOG!|v zf7OX1XQUYr3Gfk^yVSrXbNV_ukzox`?V$2R4OM01oL^)|k_k$1Cti&$BN?nXK0HbV z&=lHyP^BZE3zUvdGFipmgLT$(eA(}mpH$1x>WXL49ljJC0V#z257DBF zKh`>osJa2sKq6>YEI*aYCLRzrg54=FA|2d3RsptN57T_uv9nz>|J>X3TYl5twMgwD5OLv3 zq>Y;=rKFq)*taM?zc|g;+J&gNX*q6vUYe*x+bNn!ITk|J$QK z35+P+iH`4Ktv|TS>PH+gn)VoV_#bCIM~pIBRgiTq;mGrU_NuiHY1<+_uCBrNT@5tiMy8j=0_@+{Q~RI6_HHDm26 z>8a<~opBI^2r+Cy87SX9%2%vo(Y@<6<(exl*<`J3t`Aa?!9kccY+IBOddSkgkboFA zQEAo2^<5BH`|qO$iRPm(CZQ*iBmIBl)Z8SH|smVg&!>++GLzgyvHuSW0p^*a4? z+1{)b*YAe~yiJ9e=EUOU-=)L>` zuwebJMh@GXs|Newz4|fSp1;GO z!C9~T)-=liEY*Hk7CFh3HZO`(?3LTMe{Y^@rNwyj-V%G(SSwD(9r3;zmh8A(eSc&< z;LMyBg@7dFJcV*V)D-&_>8kxa(M)H-FGJ%L_(f2M{d|B851sp( zdkkI-4fNDMF4b*@r5;CpMqFVOi<}K5#%5zg5(}ss%B6p~7sapmGla8B!PnJ%fE{87 zB%iRXbts#H`dOl8#yNl;FXqD?rxuGo%OUq z4TH&BNMFVx;&#m$UAoay-Bj(fvxS-q>x{frQz3{(g@v=XJ_BBzVsT9BcyA*lG-)kshy)w|lPaWmqS=_AM_USIQF(BOLSr7MIVe8770yfpl= zoc`B=C4=eSfSS zU`jYwL)9MKr2*Bba5aCj$bZQlODE>N_oIP;VoAaN8Zd?5y^!FshaSdp$2ygM{FEQ_ ztF1zG96f_R^&s}8piZD*nb$tHfjs*QMSXR&6BW{@Z{aZj>T6R- zQFP2W?M7oHw5@~)S|(kS8G|LpvfQ$4jbv)M5??!B90vk{<807VyTmz^odc8~aq+0h zQ&N`$MvfE@Lee2&K_c?Kvf6s?($||Gk$oa2h4>>fJLcZ0RVP~ak~lJHCDKt?S3k)M z^0NvLm+XN_Jqz(vPDJNyMi-GtPg|NSn?3)-2G^+?tf@A7#VyZuIYp`2)WoHa0VfDy zr=uv)Fazg!pl9Lv8dOw+eu7@sT|w4vhRBx?FGOyYl;(>9wxJ9Kyy41%W{}&r0UaC% z^^&S7YC_yc^|3hPc9Cfy$fg_)*N-@fOtSy;oWvWc`pIUuYD*s{HT+0cGz)_Zl2aHH z^$bT;+MP{IxqN&~TJoCeh~R5Zd|$dzi~!Js$7?9E54)Q47;qcdYj@BeW_S(Zus z00XgCx+*)u$w?>MHG}nPS`lV@#X&L|2(59xk~cQ8r%kK=0R~yg%^-V)K$+LJYoQmb zx?bB>ZWUcQMg)20{O|z11TN<2^INVRq3UMDZyni3 zXeuh<#nErwuLtE}c2OOhZ{r@1%@274#?PNt3P^g%Gk+eB#l+3k_-Ar9k|0HbRJFo& z+mL@CBW1jM_;?knUuDuhhxnp`>PKY5$wCAdhI1^!G6T+H{3|zJkTqJ5m3_L z##t*to$sYO|8c3MTQ0ri>R$PE-0T`X&{7C~^u`~=@B8@oqV)ZUS6b~Z%kb{HC!~rc z&-2D&nXzI+)a=k~7b~69H#>od)!CMk>cZWN5Z8>l@vm2;MU(MYwdhj6`tO6z-a5CI zxgpwCWtq`pR$1;A0gX?UBfN)7!#CHW44_Q&13+HTR6-ow3r6Z{;smyy4BogsvrtVp z#lKaD@|_8=#K5&s$bk=GB){&G%#&S*heE^Cjd2tBiMuEe2Yj|$gEyIf*RgN>sj|C0 z&mzsB0# zu_hWLaPg=+lJ-+0%}Mj5H5U}zE?h7_Yapbm-XY}4LkJyGIiW0#QB@eILLC)d;{)1d z0hrZ}HB%Uh;4ZBbxoIr9a1!~C4z-6+9ie1eR}lC-gvFK6&+|D1U}z@WHfc4m!vvVA zYHLyf+l9$kL4+diIdkFY7Zn*6gizhtvI7>yfQta!Fm?{~uq>~c)TiaUGq$chvsCoc z7?Z11j*rwx1MT{ki9oah9E&;E)UA#_flq7Mx15zje{o5Y1~Dv%v{CnbK_?_r{KPm} zem(ot?sNioisfRq{TWNhZkttE>2{w^2d` zr){3($U5j>M&W9NccZus7BMo;w2g~i-7#UW)wYdM)p59lWiaskIGkpNe;uc2gH*Y|3py$(@t>$m%d5=*MqKjnQx%KL3& z!b4$lHKbcd3KP8dkRNP}?q5;>j#&85-=U7HIk%bVK*aSbJDyu0-T>&G-H6$0A8dw&Gq3{9yXpdR2NgdRqE#O8X3e5t`$0 z)%vwK(4K0W`64xNWvR7Moxlx@@L;rEo-@`*e zQ0V~_D3*dx3pJvu$w~+mQr3Td&@yvlk|Q*4&lo(3*O?J_1u(E5pIQmnaP3kpt;r4@ znp6T_FfP|QCi+b62dj~VM~@c5Oq#$bve2aS3|2p=-4|0v2PS|3UqZdFtgpA)C~!c- zU=B01VI@uUuY`U9zHCeq05f@TqAu`{U)BLT#Ef^Bt@U5q6g5fL&yry<@@xiuGU~CZ zx<8>}QmKKcDiswA&Ya3K1oK|oRb9y8t|VwK%C$p?RbEcmFb8Uh4ltkV!~BX+Bz zh4aoIJbd=7Fcz2))zq0ho%9zi3?+md6s&&Zp+sWtfZ}Ex{Uu*FN=d5v7O;Mn=fw-n zuy7rKMGSW2ZT7yr%wWQ{ZosDM*Q(AMmFZFFAm5U6m4m^mskUl!XCz#OcgrBRFsq!^ zzEpimp{~eEEZAhVxnTxrZ1ZgNl)sIcViG-1c}_h z22;(ei$GT6-J;uXbu;`LAj zP77D9tB$&R#jx6K;DT>5`wotXrV38w`2PC~n=_osF~3utBfQ+&dQ|qHp>1TBb2`oM zJZ)hPoAc}6T+DD+fkR~DsFB8`PAb#-!YOJj0gDaF66k|^gj9ZV1uThQ^a;2gl@!&v zf;!jN=ge}!3-q_WQ-(l4CE2%zrTJz7n$2FhGH-3SI(1wR_4IO#YIPCUi zO@sWgzy8`4>GQQ#iaaz8l5)$aAg%$IE&Wn=;>TV^}W!VXAQJ6Zwn4Ht*XEn zvBnWo9}XJU00e>siB91TX)vy-C?8L%CaF&r5D;Qv&I%c%wqKGn?`(t0EMKKwv z>X??xTO=108C;!xw>%4VN`-iv{`4Ey*^dC?;H(8kG{dd}cGbgX9fpAU+zl4?2=eAs zT}NOl_CsYnKXIb!K3H|+o~tpx;{N(_=~OEwG;r@gKLaG5Za8A0;n{iZyix#e2Ldf9 z5j#&~v05+b=-79}jc|mDe-9i1S_hah&+LX+P*+5=Ae+lDjMw$+R~K*KQc#x?^}#C& z#odh!tw17xQ5p?15Tf~*!x%pLjE~f3qQ9b<-_8cwtzn30k|r<%k01^aqqYlld4&;7 zF7*tK^x9!(Fa*pN%wcB|lthw=rNPeYfe;)KNUwQG=1=WmW)(6ksza zq+v@g*DlnP-g_jh`C%Q5#OzN8Fyzk=$=MQq^TTOu31$uRS~LS`4m@E*GvvUp*pGcW z-dPNYA|VE4V12~V0l4tZK|e8tuL$@bpUqX~Kf|6dg~JzjM~)V?2?koT($;#{+S=1{ zA?Ns3Uq9MMXKH_(9iXoH2|M1>+N@JuFz7tFbKM0(O}Jc4c3ls#Ay410x~ftDb;&vk zCe-f_3EYma&okInY#iN820w8DvZck3a@JqB`Q-}VCWmEJMd%ua4eKG9k#2kZ$X;)V z(T4N~LxQ%G97mM80=AU%-6{Ek<^;fd8g*ZzHf?IBNO>8GR%K)49_b)MqfOOh4N&Ku ziO!OTb7EcTY!K=xZS7(dPN`W^7X+g~z_-s7?LL1Cz;lDn&OZoLfYv|swq3W%hP->M z%biB8Ici*&4xSOs_?-13blscE>HLfCy&htI?sCftC$Xh3BN~|CZCgBdI9ylPEt842n(6 zO8++fj(bhQ2##-HT>dkdla)vWKO2EfY43+9H&oSbE*h0m&etdfLx3|dQQ{~U4vYf; z56D7*QVCtYDG>lQN?e~Snd0G0&wny}@_gL&5Q#TLAVZiX1PFM8rLMHMWGwPq0spx8^MU_f3XiI$pdKC9pX=qH}L%4riM{dhvoES*{Xmz$M;q#$t0) zXPn=~3(-m(eu2(yvw8`#gTf+U+w7ZTD6^sCc~Qj%)I?Y^M!N>Z*dL@Yq?^mrSO%!Q z<}}MjM~}q<5?^3xx5U}Klooa~KDHaC=DML22jFp-UqOP#5Dp=s&8*Fjt};ZO+%sgr zsG2oaR|np_pGj1U(6L_ounJ6_mp}|<6sn|wfHNusHaeRPP`d1Fv<2P4erl`3^wiJ? z7=W82bn^Cvc52qWD@0wP1H;BFj2x+)V*zm-3Ab1T5TZ-m{;A6~*(T@KLuCTuA|QW)LDG)#)j*-arXL{Tk@q?&XnrJ;69c%=t+7m;Qt7 zJ7@Yb82gtP_DdHGD{M}oZ1TD&U^%{2zMGq~4=vKFcB;{X)0bWhMY4%muw6P!ksb~i z$PS&oeh=@i;*^wLm5mrh_Eg2fBWWS21Q8|*3qx#Wq@UH_sBc_Gif)BToz4@$VqiB7 zc3(E?UI5P(Y$^jn^k-=0S53m?Ih#EQ8_p__Xs&gAMEXHZC(;24D_W3+)Zc73lJNXP z(NZ9rV(Zj!LK?t?BEIOzv=$+PNAa*iq<`m<1uL?@9@Y*Y3^OE&_-_)N*yW`^K5@)i zdatE4)3qnF)mhKL(8+8^ziGQcp^b3`tGa7&Rta1wN_XF1KZTP9R3Jc6uU!bn7q$*1 z@{U~wljXbg_C9o=Uyuho0}ccX_f+Ij2H)Kb77^MZI@%x*uz=7Px7cs_3*)!7_g%(+ z+~l9Z&*y!MV;Rq9u~MjBO{B>EI3OyZ{Bg6 zHzlt(75(pPKY&IgNyRjaSq$n;t&h(Go-a^uYL%+RPpqxSVFj8LXlIzbJ9p}*-e@+I z95lEnJD5dA3bPK%-U4V&L@{?`l7fV}E?Iw^=O2@uP=AgYHCu1fdxJ!Kx#B>K{UfY z%4JCV>q9*T;O$(-o@D@(nz5FB`%H`bk;{Vtpj7h39q||j^#mvTHA3#pnI7|+jT0O8 zsR~@l7O+kG3#tTVb*U2PCk2R4EuuhK#Q_Qw?c2CY!L0y``;j#&hJZ9G|bno$7&V>+qQcOL#k{SuDgF>!?OxXqh|{hmK3 z7At`-e@8DMo1_$kz#&&PfNO#jPKY{M71k77Q*i89vl|%5$B)T#vVvXP=iUJITXFSzX6?vGe%vA?NV}P}Cfd?;xYh*6@$bJQoC#feLZI%? z8EKM<0HAkW=;|6|%(RTqthq`g?$9z>^c?=y5u`XagwG8t!2 z);(CE6k!8s)8Q1;G1E`@#Zvd)?skTgG58Z(?;8RLSbq z!Mxw@VoI8FtbwZ5GlV?`8$zRYf9`g+6vz>*c%?FV*|?;@@#J?7Dn?)2Wn`@v*00Zs ze6Bm-v_WWW(cR5rXzszNrU$+GIA;aOZ>qzGlm)F53CFQSj2h#FInJj{jUmD^33cec ze(VEme;*oOpyz{~#@Yc7FzNP04XNkc=pIIDqlT}~yt!;-gLP`9to^BLYnYn8VX5OJ zZ_jYbwPqyKE6edyHI+P2cNjLwwIsgski*pEtM0HDumm7Oa0Stf<7Sml#;Z4T!Wq$w zaPih;6=qAVTlPUl5-NqHvwcbSzE|*1{z7l7-KSlFVek)D!Slu@eeOP_W#$>$X5Jxz z_~#^~p@cr*Y>j!iX2Y?Hx&+;R>^}HjonEefFbf@;Lrd{VWDerWfE+lWsIgN1#K9v; zVGe^~6&kUIRl-6mowQ;b8pQL)BDa(&>@JIGCNHQK^|Sf~COFjp=GhW2WA(+DK095V zP~lkBaJlpI9E5@hsYl4Y`}QphUX>CmtL`id&OKo#<&QnTL&n~rv_Ip2($9nhg8 z7m-iybyEWf95{{*9c!>+d{{lvOXL}-~@CfC1nd1{!;WD6xv&4k0WDmu zx^P;wXn6|2>S`i*7W}Q{|MQe zv36__PSeX0%<(}9-Q97_B}_%^n{s3 zG+>RNVl?+8pDe!V*IuFD>u@wG(BrKoOdTt)1SKeyYT}n8UpIdFyw~juX*Ib2s;p(> zaQBY$ug*u3O&vi2e4kMO_88;*2vRS+N}k^*?YOkP%b1TA02Ln<0ArTt&^dmEr^_>B zJ;#bRFS4>BXARB3IVcFPCT8A98NeYXG6!Bph)S)q5@r?1;Y@j903kIsz_W;Of~`q; z|NapkDl`<8dSt_fJ$1*%E?*uSIp&yiY($QEtZq+QrAC8%kMLcW{I2;9Mho~7kz7Hb z07Blh!95ieiOXZ}t?|g$xUKP`-VN1|!NGvIJaMiUI%{!TTafpfQU$f!EB|^1>_>@$=2m>kSCy$Vf0oOnueJOyTmRZ=W zuUOXK3y#ndP{gN{l{)MePnL zqSO+yupMK%7(t3HH2~EuKYIAEG@E9(dPKRvJa&o$N}3G;Y$-4%GVm=1xX5tzy>=4 zB26ve-U6DksvRrkZz(^I%_~dH~nRvp#Jc&Od%tYjT+l(Bl zTD{mjrsptutf@R=Q&SkTWhXbWyLT#PrY%D{-B#T~{0ve4^y`d19)@{q*iHY#_46mM z^u245f^|GBwwLfjs@G6LnARBzOC5;rEGbP?+E}J?Q;e|{5wGDJ%-`Wn8E;q@bChAF zozm2Pp+JFG8Vr?rhy(u;LnxE|f)j@FGx5Y_=XjAuxS85imERQw9Vhtgis$2p9BQp-vF>t0NmTs7gy@Sytm+XLeB2L zQf07MeX@n06)%K(Hr|Wq4!KhB?%V@O@s%#)t6VCHw-eLcF)fHToL--2qWRMGBSky( z9en2`-R^Knz#FN|5YI6;!kDM%6Sbp30C(?}6qmwX+)w$RPX?)ps#DW_jp~A(hu-~j z(6(+TZlTjG{qdgG9H-4oW3@;l>!G61?GxoNiFq+xWL>;6Ql8GO+L>_XjBYt+^UzDD=LUGBO5o<(KO04sq|CI3Ix5`m;xeE!)UXn z;-)6cW;35r29{*BnnBgkzqPl{D7tR%EwqXgvDzqyz(AnTkN%lHe0chwM}PuL6@NdD z*kwtpZTL{CXL`uvck9+Y_A18qvx>cV#DNQ9BPimh)5*w0QJ$Y`#9^nCKWz)H3az2^ zluw2uVU)F9q;koNLAydkuUE+zHaRXbo@d$Ets~3fk-EjG8cK=v{g;*GJM=(2INWO6 z%JZwT1nyvh1^0}KBEq?&z^rP{h`k5`p4Mb1`}}y_w9h37B4pYrI0R;6EwHxv;lkDt z@SP<||uM1t4lz1eUzYx;9v z_4WYgX*?>O_aH`)t^=W$Qwl9UswF~!$+s-z#y>paF5B2xLoaXZ>Se%Ad(R1w!RhKX zBHNe1lG)x_2Iu0V{XG2RNHpu12*EQl6#YS&VHLa()P7f1wBm%)+rnc)<2hYcdbTUi zF^?-!+xVU#FoyIB&I(P`@!l3h7=hYDTRFY!VB@mnk3Se&$WL>jz`*WDJD_Hh7wcmT z2!YZW-7DQ|RbThX-vA`{6Zv^Jv2h$WBy=0?-zE{q^m@rHqoVU6f5^J#Ha9vTLh#ti z=ppH4kNNfAw8;W?_}w8>4phk(r9AxKuJtx<>{{tGyJpXt+*fa^#G!@|;wW(J0CG4K zMP4f!uvzwE02%H=- zS`UQx^)CO&s-ZpY0175un-a;8+cuZbHux$jw{!Ex-+k8qvvLc58V8C$|L!o-qDe2n zQ$0P#q*s72FU0u$=+PVrJs}{MLo*??ni>GWJ9zZycSf`(kL2!z5eB@)81zo-^VjN~ z6j!@e?7-=L|ATeu-4v;w&i8*fe@5%iRRP5lz954K27|I6|3n)&6Ea!xOE@7Dd(iM` z?G-oi-2<`Co6~9OdflRVVufG) z*;i#f!0k^B*aCShx46=2eKP$(6w_l%&nf)fNc^oHm|3KR-jQJX+=(oM`MDAiru+w{ zkABHSlt1yt71Eb+>6Q49d?P9#JD_p)U3qr@4_cbSgMOKj2S=e7VCr{xXZsCHr zMxQ*X9gB}=OgZEBm50>oz)WG>mFCXIu5!}MD-uUaaxSfp1j)Vg&V=aSI=YeZEJ;Y{ z43M*&cyJ6J zZexI0ofLIsf>jCkiH)cXs5)nf*Moq@^eP_?IbadMlnqN8kN&y<29dcX$U$*@n`x!= z75YM1WfSny($>}0ev;Zf0G?<&iBsI&VCCsf4S7@nWo$ZI#{Aqo)c|fLh{b!EAqba; zewrU#!2*QW(MbK9%dePq4zQ7?RGC(O<1bS}KmV}Yoy8JI1On(8G}SN~y^258j61&O zA2;4}JWn)BAqH^}bVr*))=?Au7wzBLT0nULO1%1X+qS$8HMh1PL?0jLKCtd0_uDN( z#dbsgZdsY7+}@*)b>%nvH)ni7ohROr(8bL4&;WEz9aY+ZovBe~-NJ*Wd{HDX$BX4j zKsI?-=WUl?Fk65WC57=~v4M`3l?(tYz(dJ-Re+5E3*}&A>mwtfh9(Y$9oQkK1ywN) z)OO|tfW;ILI(?EhI$>hsFYmgsuif-Kvuh!RmK-FPg(`E!jSkDf&!7_!>ZI1}WyUTYv%e&)>@=hVkpO@BLl zVrp2UP`o*->i|-=WXzZ@3Z;3rTX8MjmMUw=I{@V{h_`y}+7TXVp8fw0OA~Gb?9RWb z`|t-g){1xJ%GK?bsngwEM~=T-xa9~h>8yN>lT zOu2_Xs0xl`-jeYjNA9Kv=^rI1_G{92I3?ekgSZ`LH^Y7@Az;9*S1HVwLZxtHcgbAJ zFoEXu(rM7e2~v{X`zKn7^T3Q$<-w^DWkB~zN#Rmb=EChfwj_n5oU^jBR&Ez+P9=I0 zM_5WZ0EjBQ2X$2FJdmmT%U@YvKAc{K-l0=mx^MXY!{H63mI~Dj8h;s&8BA7}@T<*J zeR(xJ9(qvseFP+tK;rME(mm{$Xk$d%;NTbk5RVq)yp4-!Y7)!uNu^afU>_F}V5nHcffbvMtL+ZA`}Fsi&+?2gea5l;-U0Xj|yq) zu>@>jKENu{1y!|aV3g+rFYfi@4KFwETy(u2$9JF%g>Y56h@k)gIn^hH`wFtPi7SoD zP0L~YB}9sTq1i6Ia7>L?V9>ru*ICD2f0?qYnN~n`mj_a){)fmDZz;)WJL~_AW^ER} zk*Cl4QOwE|*s}=&a(AgPbj)JnO(hmn!1P6tZ8BkxjRT+i^KOmJZ4QLEk$n2wZ>3Q} zb~HesOhqNmv1&svr+O`RjNG{laouee!_=LENU2vUFj`vR8O8urYg25s7Hg--DT`_v z`J(TtOAc5U?v{$}Mn!wT#GJs9bf+7z=%_oo!SG5nAsVCYdPx!B75$!}ZJ}R^sY0D3 z7hr?en?r&5TsJebj3MFt3V~O{K;- zny7W6vDW33ry{661-tNmveA&3dZAIk7Mv^fAh0$S*pF#Bd9no~gGcBM8hlF){3~pq z!6y_hNkolZtPi;;Cg68$D{wbsdmR+Yr_Jvy*GkB`-F zZ+VyR&58M-l+!|$GcnF0eo=IZlw(gjfM+1`t|a`e{VG+#I|t~d`c71JsBDGxNk3B_ z>A*AYlPKSPH61GfX4A4;Pl}=owMkrEG8+JHF*@j ze~s6@m5r+c;UrNQ5g#6ftQ8arqrLF5cw}Sl-B_V#bic5=K2~L~QHN45(``z2>&yAy zy2U!BbEHQ?WBB@9uPT!oFG@BgCq>pXv^3+(1IJ9*b|jlHV(W|wvQN%&1hQ!^qCb;f zJmmrEYztFni~T!8nui;nMYw5#St9vJVCH}v9`NgfB?r1m?Y*e(jbP0@4-q{Q z7H@2g9SkhuwI{IA%~B?#z`x5oIh?gOpt>Nw(WfU@1fhgn`@flXL0MMSUZOaxOL}gB znXYuoP4grpDUQVn+rCS zDurEL+S3vu*m(-hQfZ!dSWbj=_ZII~Af)%F-#c|3lyVMsETNZex%iWCO#mSh1jv~g zwm|5X0|=H-&tCC$7LbaBP=pl)$bC8IFE9xWEbBO2%y60iY zr1)MV=A=)3_0McUcrc>4qLE9DxxY1~jre7?I$&WirwQ9Mk8G=9eb{6r4cAQsVA_$1 z!rf5T@l$dGCzyf!)J`aCcLG`Z*5K~qZedA;v6#xNix#Os$j#OBLGz0oK|q$S)Hxzu z$Kh6MkECnaznHlN5^H2_W#m#R^@LMeAZ*n~94@dEE*$pDt2QC;xc21K%`&QU_kpz2 zd9q+I*Q2tfbpZD%m#u!BU0H8$)0Joa7?drok!t4^syuyQLr?v^dZ1wf;H7!BC9hO@ z@s25M*Jze4`;hmLAaVZDz1ZH1dyIWzdmn8Y!;1nX!1HZg5r6C+`#x9ivvvRLU<<026y&9+xc;ut_bQGXzn4q=ax(uPQb_p7pv6dd(94;u zOHzGFf^l!zU15pTQK4(cLmRW$5s+Zh@j&a~%HSV91g|Ur5OV5(ep)q`BSfx*{VKp?%^Y|6EY0q*ooBd{ zS{b5jqMf}g(3Fz<#?iCXgQw0ao=uk@>nuJ8T~#0?`X$KduPz3F4r1!5B)4F&rG${y z*3FM}&;XH(joVnG-Z+mfQ$VzgzEdRF;3Hu%_e?f1)FVlYp&4!+A{ z!mm(s0)N{IlOs_=_=t^wXvZR{sHh*8kJmT`8uH)ktpev#6* zdwi=3Sut?JLT38lC7)IG*-YrheIO?|nu>p|GQ4A`|Kf90olAe}bb8wXJpf^y21{vv z*$Mg0oLzd$$S!wU{Xk5HXx!+qu*ffUQ~R*iLMg5|+%QIZ|8^&cjApoXVfLG)_fL+0 z+?}`Drz2x|+aH@QrxNyKy0l0_p!3hMG14ZpiLnMhU6G&1K`K%O`~-~>xB`f+hd7Wb zkSvQjH1j4RPU(Ds`vvFZkp6F&5DwdJ7G#HnI%lZ3ULq6D5=&sZKD#N1U{^wI2iS%| zDoU-|*g^fWqapA5Di^kevjoTVn1&9tAX1dq^I^?uIC7)`L`F9$unr!fXaZs#?EG+e zd_C-pMs;t1a=y;@sv0y{=Fg^Ils?-($t#w`qZX^!zW~n{w9aCo6u_=~uvYtm6h=jyeL{bGzj%#-(42pe%uQ@%^}1-=fl&NtpQFLclm zj=-^l4mgA}5oU!wBZ#B%jg({K7}^mC0ga5z%qui%7E7fwV_?T*4;2fc)+jF6hzU~= zr5GFy^wMGy=H3l2MTl7IX0c&vwMwm=$z&YaU@8|dRn45yuz)NJ3G(Ye0Adk!EZr^M z<#4=7%tZ=7cFK?z*A&-ZqIoA{hA_jJnVl6lp~A+UY5-M0s=w9MT@Q#umc*etJ8Pkg z&O-s3!*?I3f2VZI;X?u%|AhN+4sDdtc}QU4^v)sFFVp7_6VM#%ees=g$~*>&;Vh`e zq+br}AW}$j5J^ngf0)996a4-#!?}nQlOFwwIZXk(UtW*tqNw*dD+aM^M3Jg;wbCpv zRWafU6nF%FgdYOR%qw@Td3bj^h%2Q_V&MLw;{TWa|3NKSv6T3?wouPbY|va>{hHy9;{2M(qT!i7^qLa zv?x-Td~7U13v6V|^62Ep(>Y7{>N?}n6>A|St_Jp;cS~xi1wU=FS3j-Jjvu?SkI045 zZov?+WedY4UbH9x6>^w?$YtzQZO6#ginJLrQ*Wmk`^o7Q6<;MM52SLZY=$rq;}HRi z)dd~WH?MuotJa*~RJ7f5joqh{6lQbXLLA`@d)K5RAn&g0@0vF-L~$(`L&1EQS+bpd zu(zIRlFx_M-rw0JvPfa`FwlZ^b;%e%sNkTT$}h@>3pPfm67UdDX|>H|os@t9mKl}wKLJm=XOnR$5aR?>QKAHJE%SY=Hn}zstY~;1Bk2Y z+td8AnkHyUJ1QW(RR6(T{_X0H^M+6Egv@-qef!%?Bxsw=Z;^1%g}-6%%*Reu%j5oV zxaN!I{^cFsJ{->LxKYf8-D{HZC&A8mK1tJrgQ-=wP9W@-Dcu=imRt03z3UNmm+}Mf zwOZJ>Q_TTekroaIitWRUEiCjbNN`;UjwdMtE(1=t2z;B34+q8JplHP(?ab7uasW^j zyQs=*$fm2ed*!KIZNLP3lQW($67fU2!-9)?*YoAEzZPG1)nd~)ro1Z$+&coXO=fB8 z&(ZKReO6nVwPQ4F3)9~8=VkqI4CIxMzA=r41zCEri}JrDwo5f{Uzk1R#8_?hnm6YZ zU-vF@5j%AqDJtLe;qg;|gVWTLxQiLnms9rbIkQ9iX8EyOg+5c~r~WPLwOM!OiED2g zaBuV-HaklV>wZManshe{Qk{=>I(F>TIu^{IQnv1=dn_5E?}OA1Ht%YBaf1x%?9Ha@ zdH`}-A{09tWF$tJhDGap73{x$>a3UCu8w}nl|XsMulSuf6B7C5JfmZ!@`S<~1sa?H%K}0{HlZ>xw!^g`iN>T7!HU zTy++2NPL$AGBlBqwj^$STJMmxd`h z@4P=Z<~=DmY}^#gWPZ6MX|t8hLhQ|8TyT;LvIz)-Kmzp6e~Pb))k5Js&P+bM1h|89 zIvULY20iX6k_gZBb9{)Eo1Es)&&vp$Nyc(i6{rtbTtcUQPrwtl%fYdH`j~`3!h4Q1 zTp*E}RJtBH_%xxbKfnNOwu86jI30}9c-rflO&ZNOEl9nC8G|43m3V$OJy|ZX$$3oT zrOeGP5_-UL{Es*(DKm0KcPR20J=-ctSSZ@bW5wSmqR)*jeKU0FoUVgx)Vn`hv>Qao zJ?o{nfm9)IBJ5nOgUn)EmW$4W-$H}8lNxnMYS>)BWwm*f9FFUVy$>Q~vt8gn%BIHyPN>vmU z+ZLK~M=Y_o?j_`u?+g(`H4VcRRRnZ$P=U;yXI0DkQbv1^H+P-`4;$D)0;nzqm2Rq} zR^@Xfxm*=ch1&ogQe!FpBfX$@HyB9t0Nhuf7SKg-&K#7>YXxa+_8Ss*QsL5+xPC1Z zb%fZ5H|pAXM+)-I*^&-6+ftA(7nQau#pyBO&@-y-eX&fl%b;Jm2K>TJ-LB22tu8@du1Zk!&G z&VZ(frLQesp(pK@_6;1`ymPpd8>vv+28 zo0xL!`s+5hic>UNOx?7#lV-RgwA5#@*@fF6lEPM2Xr{3 zQkPT|sRF+~ghot&GV#&0ftFgUsF%(8{eaQR_rL`O4sc-*AB{N-tAI@@2OaVG%9%Fl zC^3``-8KUJwMC=uIOw)DZ9(sPQlC^k+wBQV=k7#S~B?X&0#Z6K4Ch zChznsU}EMA`q?~j@*XA^1))_ zKV!ecyv?9F@sq z`nnTFg@LID_3q!-8${y=2{}ECiE|H zaGdbVl}wq&%g35Lk-49mFwJ=a>oxp=C%gg>(#vz?oUxj|^76j5S(dw??vs4;A8ikfE@xJQTEfU?oA3i8`NJaeVK z4jg}b^pG9q#z>(Muv?e(CO>a|$BzDfCxSvjcsTt4Alcx`RF9ltjw)Gha7Cj{^y=1* zxs+74JrxVzNo%X6r&uK*SU2*+C_O9 zR;O-;*UFYhYjN5UaVhDkxowZP+HD=NvP_~G<};2MZ8I9Bzj-K2VmCAT~x za$tk-nibW``dS$1%v169G{6=fk2w5vtgbO!KWD2EXi2gqK!=Zt56%cbH)VbI4Pp9X zM))47HJxtph^sK+Lhziu!FqWN%DG{_WD}BGL4PEvAHj3NbBPf+b)}=Utlk zp+d8el^A-kJs|_N!KUJrgToW2x{Z&q%g-qt8|U!tYi+|y0;9gy*rRXE8prKZl^Q=Hrkn(TM@Ept0Q`goR zFWZ}!%~%31Y~HW8$ae^;>*|84nV7t{fM{5}0gLEh}2i$eHXdNMy6k5pR&XZjGBK#`N=KimPL# zA=e0VD~k!#+rT~tYl>knFz99yeVd@ zl&4-;(k@iUOy36O7Ro!44bKCoC>d%lC>=Iht{E_QNf59eoUaIQzjGmhWNNR(;1=949N;w-!IbV8t7a zTB0%Z(Tu6a`U)c}as)rSE=(zFd^2{L+V)EtLBJOkVWl^?CCb`|ZqxGP*M>5zS$z}{ zLNoM7Hu>L>hUgE1&YK)8!Zdf|g?dc1B&6}sO#p%GwEd7f@xBfH7v@%NV)P&>uBUOH z?)M8{jdkUR!E_>YI=M7B64Ia7owfD*VOr;Kj?PAnK)~H;jt@_PAKDdD6aye6xRd;_ zzyIMsu}s!mucAW+k*i2^eqiokgpqiDBUPw#^KtQJiNgRvOH8NzpC4z!kY=z{&v@jM zX1a-_A=UbKK5%_UGMc4S05!f2NU*?9w~Qm;D#SkGmt|F-xyBa<$R2Np&#s{SS?O!G zA`f8>&YJjwCkr;mnf*TN+t>+ki(To6|6{H@_gSO^J%S089v`_4aYMBs;AM)VA;o~v zv0&y?mX}_7-W^gA+N;%fNe5(j;Mc?Rmk3W#F86vpNfao&NYY#trM zaMne8@B`617aw|sYhAdg1Q%E*s^W^M-1v zVPw>B^hAS*rXcZ0(?K9IrtljUJote&`c;Nbkvm<;Yk+Y=2-LMEWeh&O%L>sM71>Y6 zttc@z`AcFzz}kk^ti>ZvNQPYi`Fq&Qb_|V647Lt1zg^}X5?0a#;0U#Asq~xNQy>S$ z#Z4t4g=M$R$p)klZaAj>CG33wIg7z|IWn)Rn(U8*(eM)UB>8q$V#jywoBP5g?d3d{ScFB}N)1xvk}RbiJ%OZMldmSIbMy5q z#ryc0=Y~WMoK+A%?AShOhfdm=d^@mJ+l9aRZhU_{`ZWg^tv0#XH_<5~-89QL_H4G` zP#TS1xg35X{8pMT8y9Is<04Mp@QqI04( zB<)Sw{dW^SdTdtJI4%Q+3A7vGR2xe2m~IDrPsx|X44QaFc1pG!L1R#t!$iL%<`wg^ zPFFgOCN{=9nG+4~EdxoBnN!~n?Bf1FaqRwY1_nl`E4x=2{J>l1bs*!^CR3L!u<)$; z&JENbtd>U9$010oIxK#o0;`({*s=#A<^^I`zNP0W>{R^9l}q6lnF&s1^4fq^6Xehx z81fOHHASplI*zyx8@Qpo*BmAlO$>UV5k4irxGJvG4;=Y!kzm}XhUH^7VIf>VZWYu0 zA+64UY+ibOC1W7$CRn~nNbljivWz|$Ky`=(3Sq&}CKJ?|bC--aX&KO|TQlD)t z3?##r&Ntlmb8@#z*$|AUv|sPuY}8?V(zwIuuyK3$^=RMqwnA>TiUe=AY7bB+Vm@xE zwtEt^r&hrNG@|>wW4H6mMHlz^E4auwr}x_-KA-;2o0qrn1lnkkp-7g)*3T=1`{tb~ zNlpJIsLEN2Na$9UyC-N@_dl)nV6iV~v+aluTkd|M-%n(l4n8%yZ}`%G`=3eI^!L@+ z47Avq?Ig9oXLlN&g@5Wt5}E$Wr=>7&rqEvWxW4T175$+fIYmDb^+o9Z9pIm3hNM3j zT}9u7oDWJ5?`OYGuAwjL_*>pFUgq=OQrlHR7bi7l$d(xV1p}PnL)Ic&{1`BeW=ZfI zFLzOF{h)qsqO%yE8+*#vWL&=DjuX=jlS8DVq?H(IIPK(Z>f9OjtSQok=K7!ZmVi%2 za;HagSArvEUfRjlG5)mOmlhZUVRM_#HlVf?A)fkR8TI?=c4W>y2#tbPf{BYey zcT`zS&0eU|NeVXGM{?|4ebB#ZzWqs7&S0>EX}0^Nbz~Nivx4k7lFFZgR}L)j1)ZZ( z{!^-|mAd~dc%)|m1@L;b6_#ih1~LML+Y{MiKc#Y1GNnw4w~!??#SZksyOE!t6?YX) z>$v(sip=~R;3EUlEcJED7mR;;b1Lw^;{2A(ZtAk6Kp#+wL5{}&_=^i z-o=D`1Y*(3+G=n&u=jS%hV8PC6!_Wkj{(~@i&0zmIkQa$_w_WyOd$~eH+6z?rt|K& zn>08%D)MmJYpi2oL`5R^l|`w}+Vn@)&=Mm<*g{nR$c$~L|LbgZdT$Nu-5*W3kQrnDB`9h2pL+&494fc;^IHzAjQmL zJ@YSCtZnjsT{270&P*S%@q|GWJW@R3TLzDxUqiBw?w{B1Jj8mCiHG0xKrC_n2JU;# z^u4YsBqIc|j*RD*-!BF5n`Y&1#5k&8}3C6+>b`+&X%x)1E60x#Ez?U%AsJq7tT~-i=a8HXes6C zaS$eL^A58B$YrwX$`=Xe`nYR03T-@}x+KvMokVl0Uv*Qz2yq4$@6;8J(u<&)=z>=1 zexwAsh}~vtNi&({_pvd>u6_mwx<)r8!{J+rV-Ltt$pMn@Bwu2WF67FLhZT>U44_fI z?#cOEj}-{_yN|u`Zs_-J0D(lykEy^J|1D}qNN?HjN;d!BLw)}?cx{LNb4ki`!!C_o z50A@{cMr8DchOXQba2)`m2raXin+UTvFK6t`%rmD*w(e5i$-!lZ;i zqLg!`%S=I0ec@Sz^C?b3rq4QN4By%|=}XwbGFZx}o#hiXT&HMuWLKTsdo8LYT0cuwIOM;oJzql}fr$mj2{ z0U-n41c&IT^24Nf9HzDEz_Yjjx2a4%aIJIYEfRNV$TgH2-KSIsZ?}*-aBT(*Gz*Cp zBpQZSs#Fx{ksbou+;vcPKZ}k(S2l!JUDbJs{0{~Ip`*@G!D-0so#t*J zmVEK_oC}X8(4nk$*3L?#pHvT*6wOU|()wb8fmv7`~*Y-E6euc)BBf9eDU9u#;HCI>u$D}M9%2+E}wlOmyde9`{1fgsZsI0p8YEl^JzI& zwL}%(Wzn`d%c!g_lBImRWYCp0u;g-7Ntp)oFSoRfF6yd@5}BR#rg_tM2+9a6{~vmP zpeEv{Ai%uN-kyB>^l%x8x$(nvHG5)8p+z6dWelDd)uZJJTOzEOR69Z|}A%ML3GBYRf| zw$A&}^Egh8m}2v-d|E(wT>w#Fra;D`B1jBMUm+|}mwW4dRBXQ5#14~CokF>NUZPM^ zsj-B>0|()7YPaKXOdGdAVB2PHg{^b|VS5d!(amk5d>1r^AYU$0YO#*FaZ587vF#LF zCGSe2%$O4WGXXYyRjm(YH4H_Kk4TJfPcvuO;XN-)ty?HYVi?fKfe__-Ey4OT!h`AI ztT$OU0^Y?V4c$A3EFzZ7`{GUIQ?lW0_kH#s9$BX|G^Dfcz;(-Q-tf9={M4hyJnShh zf3jl92MoGo#`SNo=FHucoH z|1jGtriMD9M_;`N!I*WJO^MSgFYJg64z3Gno68<;;is4vFS)5_j!I~kXGVGtHT{-| z<)+to0k1MJzVb^(G`}0jw;ZUje%hmsYN=AqYkhG9jUXL2Ruoy~DHPo%NG(>3C0;wc zn7m&FLB4jTw4AOGcsL|a<%GxEVIau9VKG^;Mn(BK&aayPHs?}^%CVnSl-;O55(`Zj zL$lv0$#C~t{c*?qy`_7R{lXz;++bW%rXuOS@%nZ1#+(&}oy>fO8Rzt1ffhhcJQx0> zj0_fi{^=7TE7T<+7CrK|WJD4pqlwue&fmIha;|ZiuM9&EBxMH=f8&7Q4T`rcyfE7( z`1o3Z$!*qo50xaBk=`1v6W}&fhLIwp$c)az&ZdFvsiK_ul;iS^U}V&VK_x|n5i>ml zj<0hzdCt4GJ5aQob8-ssd2wmcA{cA(34(HZnM6mY0wA7iygXj@!=b+Z$sFL4%(NQI z*^QEyTK{FyrwyiRE_y*hR2&OTGGUEHED(5IXi@1p+l?$n}pWwL%9lHZ$J zhQf=dA*6de>NR~}!@8^+1p0I)^yTdDCc@n-{TF@^>LKm-uJ%X0oZ*N|XM6N=b2MJA zfwDXwSN`EeF}0D2MR~t&ylp}WmRa`~o8s~&Bh)8O&0bUN&is0_$I*Ng{)wQ%W9z!= zk0gSl!~`ly!_S^Idno~g^y=sU?M1bmbl{XvNo8aI{MX%a{(I8=9s15Y=G6Js1A@<9 z8v~Tg&Ra;qtvwbM zZ5#OM60A>Q$6K|hr8H#nReX2l9lMxhJYhXJC#YOzQ!7eeV zppvJ@V{2O1)s7tSjBoI+jr}x}_XfwA%UGlSjjRJLv73TwaUbBzq&u=XLTNlzSsVN* z%F!af&fw;e|TDFK$fW?T|QX!_!Rm4lGXYh_qb|r_%GRf6-%fh_`m6FGQH4j z>Ue`AR1weANTr3OxENAlY;4!_Sj57FZ_mp);l zpps|WXNOJZaSN<}0G5=pChw(ogw7QQn4fPB#@|oRVqp@e7M?h-(6L-(`x3FPpdcR$ zn^b_!F|O>{^1ouwngO>}X;E7mf;>wF$YoE*M;3*bH9E=~1X00IL?C zO6(SiG`_LmgBxC4zD=GE2x+QqnwA8vOkXy>eC4v-IAk|vK0wT7&FjUOAqVd!&-;s6 zOk^y8l18@&EAZ*NDN9y(J(((4*-K*CRrH=?%Yu>A(A+Y0x9idyysK>SvLiV@6W^G* z)Pzd`s#h@0yVtSlXCVHF%umyBom=cGeXH9bEsCX`kb6!_`mZW?)`vXlIm4&qv*kmO^%gMJBiuYO);M7z6)yQ zcaneX3?)GU%tAE#@!u(slSqh8*~cDNetW@XvvzSc=2i z)p@&ugNxob>CSrL4re2r{(71cj&=Eb+-3>YWv{%{Iq)j9`(mcaa%Xz%Q-j-0I%Dw- z$T-2%>(ElT;lp~g^RNYFMZ^?s*0ePI$I$O8bajSwkjG(;0i5Fwtdt3(QnSw&qK zl`C5D{h!&-+L#a+%!LPhpXIVos%&q=y%u|zkz~q75QtPo@;qc`HJI=6ZDrI7R%umT z05|Zk)AB5&N|i3s68ytj^9j2sWhH23D^!$LHC0Lpb&XkWt3|=-sSLI36LiT!er7mW zpZp^UkN6zCx*$mMfti_G_LIR5*<~ET%(&6o&4b!|G`rHcBwZ{2nPV*>(6R#x=bz7!Tu{~cpf9B^RfxiF)=CcYN< zbx$+EvlS&@)5O}y8l9Xmfi1;$&BHb(Z0y+yJ10}EsKvTnc}S1bP925VlT`! zt%%rR!xnK-Z{o@hc~hKqb2Sg$6(MQLx6zsDv6ma_qr$SFzVf-!rv0ld%}y5ghnD`tumGy5xr5i504`9d*s?$C|EqA8#8CNI@?y@v8pc z)mK#GDGU{Yv}eqVt5!{m-*%U z_AR&Z2kce$O?Th&D|)&|Cw;tCC-yc}U+kw@pC|5WSQnP9#>fqK!w&0dA33V02SUdz z9VHe=aY<>~!jH)Z*DYnuVuH$j!s+p$O3c<;O#3-GtCTDj-dMbviOlSf29<4mthsTcud|~yy|dS0Jqscgi8sfqm?O0Ro}%B@alT_xxH7}QKT7~kRODAgnK#1R z`MN#ZFR_1hYc$9ZJ0(1@EQ&bM`a2?tGC zFY?`P)V^IA@&1yHq}|c+a`}w3f=ET9d%?#E$9ETim&@v1KA08rKjZXa&ALFh)IiAp zLUXOZ8Wom+Rj6vd6xe~xDD+gS&>|+Q2+t9K|JW|Z~<%Eo^ z9V2J$e3ysK{W-Q0|DmnDo!_!A3~&USa367cx>r#6P!HphKk8oArCK`a-OvxjzrFK$8PexMzP`?zxwaU@6wEY-*`QJ4OOG3|3+V$6CdV&U|s-U0)v1? zm7tdB*CI>?n)G!tZWH{{>RJzPDi6F)z|)#&22mlr>LJwK2 zKQP$tF^!7Hovj75LHFV0>e7s7s|e0cQ7(;=VY6NX5qjvvR%Qsy;5d1l5&%b;z-siR zF7wZxxkfcwuw%o6YF?w`wW1K&2r~eKfkhpQ&!}tHG&%2Nz-3Y%6;sEMx;EUd(5qa+ zi$Y@^V1AaO)uYO1&i4*0KTWrc(?MFmMZAHS*d{i8v zc=6szy8xIP0&7=uGzvPUtc_j_QjyPdpp+u!be%R~g`kh=xSp5P6(Q*?cmX>}L|0fP zU(+=_G~&qfyr3kU5Yv_pw1dehJ69^Jwn`0peDjw2Gb>%6F8}YJVy37z4B*MXMx!Aq zEWM@(2a|@!UhXl(#w7jQ?zaO)k--UWy>1C)QwL9rc?eajJsyHXt{U!2g@RIrZPC$9 zz{YODA}PzLt~J}YnlD&(9r)~AP1@YHyXGUC8#j;!Y(#s=kzXgC8|jP*qZgfcEiVY5 z>OONegQ|mu&tpbMUWeO=?3W;%sibPWbUj5YW^v>_L;Bs=oDO*BnXr_j^6+FnyXFsMO7H!S8q&o50AvXMJTdF0pyMp4n{|Ym= zoUPgP=G9i@0%95lM{U!6^I~&h{l!H5Icw|KXt{=;&mH8h?%!hI*hre!(vB3tySA=e zI+9iSi%-BYF;tw#7w6(bB=`)OB_x4FY>|*=NuyLBSykD&u(Ea{Rr~U3;#v`zFA#{Z z`GL~>^e~bP%DqxVYe*y4Z0i6STR;XcW(Ko#d;Ikia>HW)7D8WfQD`XNuAmo*-@cSW zF$lU~UP(#s0_m6nNYb+b7PzVfy@z`4(FN6_KW~{JAK0){UewiMvaNf;PI+L1`~iNP zM;BBeuuuEW?dsDi6oA1hOUVY;Hr5_wZ@^)HW`L2)$36O}Ni!V4mN2TWJQz@^2md*f zU8*f+hx> zsAV=IkEv464k2x-+ZJ*|WO{MEu%9-SyO?_K8cJLYdE=w+ zTlZ{*2&b!+Uxwd}x%)EQq+HCuFzQB)56J%Lp5z{};sXfcsZlXMw)~~(qrD1eRfu>8 zc+g^vAEpZ~3L8r(0#lGc_I--ZK$0)I0EjHlw{ zS~8SYov<^STU@FvP84tE^oB;~8+pZ)H?#uYBk_)*$=X?)vHRq81Q0Wm_hJVWyQ}mlRs^sjsO-?QuaoH zb#e*EGYk>F>3A_!^LB7UmHz@}R|c8waP^9(N= z8le}S^_%w*F#T0KMvRCST$(LBb+JjppQe}X1I0ZCldv-+eU}o_RpZf_qWGRe1UQUA$x8U z^iQ9j`oyI&G4)(6S>*yV6W?6lHX525M$AE|UlGWdkB+@%=|_&ix(ms-ZmUCi$!0iz z0^*ROKV$x}jvwv z+0X{)amM=xe<3TuW{T%2^D*vCT?!~&<@?t+{8DCQJ1u)k%g%b6mX$#(E%seQ{8w64 zI<^Rm9zj&`wDI+RJ0g=&OUp9f!)ko$^maxpW3>D$PCFn|^iDF4&~NBbfUuntDT8yl zjCQ(bChHwq)>zYHt?qrzZ397jDue$z_}I&YQ40jmC4n&l8pfe74ux0IvGf9dW=^g? zNjGB@FcRn=yY*A;dfh2iv{zpG=Eur7KV}rZ85LLEmX`J`E$flHcll?LaUUSOT=LAc&^>OMc5Co>;d1bK zoESOe_)BYk`r*yiwFAPD)B08hrjaUDWc;XS|E`B$K1*mwJX;eta&YyFI;l+%^Xh{m zaT|uimq`A$9z9>|1)VNt8B%<^>UUuEdvHUIEH}W2ZwXFhMaNt;rQrt_Pb}F1Y8UcvCW1m%5BEZ zpQ#^YAn%+;fX(81a;w9?RD(4Lq1yjQ1LtvCHNVMqy*U&at6&&2mkjbVv>c9^F}b?0 zZ+Lj)#?y9FwKX*>2Zl}e1-n}tH=Z$leXBd8%p6WF{f2-2x^s0D$n7zbEN?r56C|a5 zt!HZg7Afg%Q!3Dfs!;Z}u4}K2C9}ijk^)-Nfh`H~Oo|fAjRVn92)G0+Mq{Qe-4Y62 zP)`&RAog>$3c#HWG`Ve1)%!b35^dfuva}$L%wjt!-=!EZU?tiLAVQSH%Cv#sOl z?cet9^;^Gy?%rM1RDb{uvb#!<5Hgc3|35kHo#s2C6(bfaiw4TgU{uNdkJCTYobyH6K=d)| zKJO~;SvaAukLWX4Utc+;Qc#gWG_kMmFIIni-#XQX^8%tD*C$Y^Iy{ZI#86NYMgg0k z_I^9w3Ti65C%Dtjn$5=ubw>59U%|Hjz4M=GPE#TKCz^HE0Ig;`ypUZSFdD>j@BCQi z!lEFuKFx&Y>{}60<4Vd)Eb+X*@!m+QHzJ{sO|(Loq<@%)m|kc5*;k9%M9Us_Vbflr z>k5AH!Nha!9uLOujf7J#S3nv6m7G?0kXz<;;*uB>gS;BwI7*iwzvo zL7Z$-#YY1x@|`mB{RzJIEGn6h-0oR~Kp=Iv(e>I!q(HQTMgqbdOA}Hh6Jxdd}GzC5LTv%F}YfW$4?Z+_?tV7#1G(SQP?^fRQ=IcaixCG2FF? z;)tLqf=;tmsUz_J=S>JFeN1~*Uu`UwT=5)lRU^j(=C&-LQCp|m{VNhv>cNmPyRkT_o^! zex_JwO|U{av$Krj!g+X?Q1iH?nm2i!zkYZ19_U`&XH8$=r}vdqJ4~AYHNkr8N0SOWK8ojTXWS0M)NJVvZ2#s8XddgZ}WujP7W8m2oDI}hkY7>uK*$$$mG21 zr9o8{0!^`odwZX;TvSXUf5B@{e^Z3TZ=%H17;bXUILJ$In-3{Z4<#R_qVxM_{IUO1 zc%jm?93O~}_7U5qM~7Ndxmo({nR+ftP|ER#EcV9|r(*1H+F|x-c)*Bu#++W0TQf-u zOnY@SOYt&p-hXBEeVr+{_5>@z8q}VDp(#XY8VmLhvw!TC8cG?`Wtn|-3kl7$sX!k6 z3Cc7A_p%s8MlICIDPfe%JC3`KyO2WD>YpF=jORu9O41M(##RyDBI}S(qRdO=E%SKm zS|5kKzj!YBrn|kT=Nj6Z+x@J5ip9VwFY0{A`F`u*U5KLM+blIx z`gJ^ARUXz$`fX4dw}lYnBC?HN!e*pX{D&M~AurH| z1ExW&vq%??^_|WNWTrv>10ZJ|e$4F|?v7i3uzwx|j^o6*@9i1wAg|xOjT1rc33Kfc`6X4qb*W)(Q+sfK zV_Tz;sNJ>jWExbElDBeV66aD2Hb8pG>QO+Mz>$bXyfC-GP{*{>mLv8tKDBIE?2!#P z5=m=si=cys?PDdyB~2CCbw@SkArdT4q?xf4=*dt1|Ky6~!QRQuAA z@dmVoD@N`Iq8nUO`PfwGD^C$b3nzWUGPoWhRzQ(BP8|BqcfSG%qK4JKz%w0;<+P6o z#r~;U`L8@Kn^>qAR*?frZsW6j-jCX!%t3rz@f~f&Khr`RdxBwoSl?fNdkufT8{AH| zW+lA%!sf&|?>C4M;mRQ*Wo=|m~{pSeiUFj#7Tla*&!z-6uS zPsgN%{b{V6Sc%njX~(^)-kxiVep9`@phmMB-&VZ{Ef=cx8Yp**=^w3@X!26^PmkCm zfm?0B6_uc3G>z*Rx_r{%RLj@D zpgQebL)2?d_@cnY8r>M53)5n0r#zbwVJRD8)dwby?_OW8`*^4^cGyo7xPWR$RiJ95 zk?onR@RU~8(m-r7#Vfl!EU`Q>aUc-Ce|66$R*!ep*lWFw1~SEe#}7RX-c{okwgSB$ zSUsYfoV5NZJG&`NdyYw|q~qUi<7Y&3$yr+ZO(yNe*~S+ONy*q1wNN-SGd`EpK>r;u zb1InRjM(6oO*L9&XW#Oa(w->kr5+ZQeN%KDT(ou4u(54Bjm^e5vGv6`VPo5FY@3a3 zHRg%U<^*kWV%?1KKm0HE<*xm_#+dtU@3kh*?m7mQpAIngA~Tnk`i*>9s-A*gHgO4C za@+KBk4cnawVaVqtYlai;O~Xhcw2A@n9#R3FZduYJ-+vrE9Ej_LI=gqf5T=T&}h#N z=NbvI608tctfY#Rx|3(c$deb5Pue4t2lr{k`9-js~Hqdd`? zvT*cEr1PqT@+~A~cQDl$fFdhm;z8w|JwysFU*Hzy6KnE+yC9qQxo?DT?c;3X^$fs) zs#6Eu#+V|%FzPF>AlhFOHW;I#&rQQNp56mjtE+ii7~%)~d@L#`>aN^9g?qk~O%`-H zRlW!-=bBmX6q5uS6u3kW&!d&k592TcRWO+WI79$u64&e1YgV3z4;+%1t=mT&g0sjw zKciigw$t?9_0AJ}vwHiXo{er6p8iSmiKcb`YWCwhZSQ97D5ehzKE{$sdww!+0iV8m z=uy-UBSHaoa*@d7I^{4K&yIg`$uC}Zi-Q>*yO!gfOT+H#m;${+c0=n09jtJ|FGIbz45F1*TRpZ4V{5 z4R9vqO~U~%K2dkHRc;k>v#9bK6+JExtfBL8mZ|!i6>V_(O0a_3W6RHU)i@`myG{i> z(UD^RnCfokd7oGoY6YF^<7W$z%o~0|Cpm8mxL#52c11zB)3I3tzUEw<%^B^jZ)y(N zeHC?6KS;lDr1-;)r|WD}vFaR}OSE+FR5ZR%SF^nJKq}{VgzpakojiNAnXsjgq4Zjj zU6o@en@^m8mlnrF=mHb!0tH*@0!bWaXb^<-4V^7dGU$|(%zsvL7Nbzg<_-XtM8#YL zsiHgH4xP3doea&YXm2u`QPuZcn$Wsg53A^5>GH2v)YbR^OA$0kUW$v_Rp zdd+j>4YaO}Wr#r9LC9ZO8$lt8UzPQ#NjJT-IEdGj&c2M_xh!v5o#F4xJPShGI`yCr zgZ;)+wjAqCR2+>PaSZpaBYKXncyd;7H`}y=mcI!3!CCe%<+`1 zOCe&^V4}bXE01fCo^S*1kBsE;ogXQ?^NeG|DgPr$0efGOarZ!nZv9(11~YNy)3DCf zWW|tIWsXMDem&d~%8e*?$Ih%N=TDU_O^&T6d(!7M#DO*u$?UE14s!jR%kf zJaqRlU`nxu3+>j2)lTW;y}<%@Px%&mbD73@Ic=IF?p3sffBo&v{vJ7a(Ppr=^hCv! zv`Q{){6R&F-9hHW?^R1?WKIr5gp2mQcWS1Ny%5Fq$Z@))aH0D3Dpa_CuIa?vyKuMjjOTC^Ur z*|;7V+if2Y6t?51JcOZ3(n}ar|TEiC2T-Au0*Kk+3V z4M?2%;4LYTt$^fnq2v7d)1dBSt>W3x@9X~^5~pZwrqS)90V>=v+n9Rjkc$A2kr)O# z`0yXvs^Uc7?~0Pv;wa`!CwU(;N8(LpzuR^V4H(sB$Lj5ZI?GIf=9}dNmUrbup=0&S zBigQCCax!>{208iK&__eT&E6AXn+{%R&Uh@*vf{tH~+2N7NoxgB}{YmU92zJPqG%9 zZB*Moue;^~co0AI=|j4W)wFcs!WIW`Yu^*@p>tV#&Y5} z6v{6jHk>uf^U7M~g(H-eN{kJvQLuvYm zD?mp@jV4qh6ZqhDOVJawy|tV=VyD)h6>5r-_9NBSvym+I2kWR6^=1%(Udfg-4d%0X z=7xA)GTRRObf!oc#h3Vwa3XFqmxYfLJb!h;2-nDMcVqIpz`oeGxKMd|Zzq9cF^7GM za7W4ruIZoGvl)Ixve658n?70TC0-xeNJrlVP4`bkfziqJ9v>@XG`l&l=Cw0A5BlL* zt!|z#`(R1MF@{cB6Wu6-eBMX{I6ABTb8GqfdK*y^!%N=chkHgx-TrSEt>47T^{6X9 zN@tU75&fvsfnk5CeC^J43OyehDP_tIkGTej#wP7YN4Qi_YE%W|3-(9di`*>OU~Cdw^PVM^J# z)JV+-o9jw%JBL@fd?KNY$-}r}6t(Xv()YwBv?6Nr?ef<5{X7RomKq92N^?2l4>i33 zJ8AYcT(m4(v^|#o(p)c0a;n0b)Vj^8?q;l%B>c~4f3b~&PZilGRcMPCs+=CviYB5| zkwlunSwKt(>_7Q{P&-8My57?)p6!avF_MMU=F0a?TmDtiS>%VlgYfJ(Y{yQgnx1Uqr#+t zr=qjSr8z6ZoF~51s%mnJuJ4D}ThpZtH^GDE;S&1ucc!7a?q_GAm!pvFgu&h84MRF( zN+)*r&)NFy*l|Q`Q$3X2fYB1`6xFo7Pt&)K8X-(w~j=1GNh_d%my_S36t3GloknA|VF|*2jG6 z!BKb~*HKWZ)AtonV{pDf{k6vTy&{lp1!T^uXA0l^Y* zwM>iDg_()@*EmSjH=_6l`u+sW<$GL+=E$Nsn5mn=)@U;-rxDr6VeXFTp-eo~gp)c4 zd#a*So*I9)8SVmO8?!zna;CyB$y>{mlS_t{tIjzkp%rhzixdGoX z83&=<2Lq?uocQXM*v&4trRFD$Dc{5jY*dj}1y zxfXD@COAVmNxeeITX{C>G;<&x@_Mt4ywXH_WtUEq=}887mIX`0xXKLuO1oV=Z&M$X zs&Y>sb9s#HT8>CBHyRVn>$4|%uk(}0_)Jv<*h=442Q@Z-lE%;UK2Eg{YXDog-GnIm_bhsTnTT*4D94zn^TEvzBa~4ON9)0PGeYINQ6P-B zQxEBX#o3;nt6g3CQc#E=?4YO{lU08)?4vvztjG^UM{TzRRW%lsE$F+MK>D6rn?1=~ zEa(-{@0vy1(FRbu7vgVJl~pEQJ2PKMP`dLat5@p}3>;5gy5;x12mV-YkgU!lLn4R* zvf2S&|Jj$g5Ee~73bF|QCubEkdz%(vC80H~d z)izq6wq^xgPD-26`G`=l9nm{_^K7V6HBh-;Vg9|0@}u1C%!SwcRehUO5?|!`%Rj8u zif%5bGMH&mfgDIUjo{nTuw`J|$;F-~+Qrpgof+BB?#XLLBbHwyF$Zf=9y9MVg<keo7X3%{6w}iJ>)XWx9lR^dFngSlo^0>>F%oSMk z9iW;%h$=ikIN&v8spbq5Bw$>KyM3yla7eOw1mH9U;9x% z>z8btwH^wac#%x1UAr0?G1CZEW@k zC<~hDv`OxA0T`YU8X>-!Z^8{NZMk~658ysV9(+lDh6fRx9i#h8_x0D_!!&WnrlIvt z^fQ#-o=W2u6Z4bmLcJabJ3gC_ry*@YA=;gPS^Hw_RtCYF3YG(nLf7eRLzk?KK-a9- z!2qgu5qjvu#V}IGMT2!+3{znk^ZuQQgC^z${-RZW_t}Htj|+n-fRZAPY4Ex9!mjn3 z8^BFZ`OS7TM0)x3`z15xP`)pq21Jnh-1=V40>@EUbApZ$N=QH7ylP^6Ur=qS|Qr$mToM>$gWfU?PpJo zZCDx`y*zFW17fV{oXOL^`!|p(z#pD{o871A4eq5>1Ty<%>2S@79I-YWRfXtxH(tP{ zSj6_$z#Eu48O}EygwujVraXiTd@u9t{eUE;X6?`32j7o!qv+_Hts&dUZ!--qjt?gxoqv@;M?7~mp4gMehGE%;U7H| z3Qfg!U8eeNhd!c+LkxgVU(v~G$BlaOF-)63IY>Dg`F(X)2O7*JM%S3emr*GNQcr`Ou&RtOA7zAI!2QlSvh(bsA zze-_cNtP`TD&ge}AOC|JqWJh+m7n(2T#3QQC^eg3(I<&mk1Z3SbhwV2eJiS z1a5mvKLKyZ#Ial#fiCrg^AKcSZbZ90yR;qU2KJ2MAyRHeO^#Ug)^HvA502phyPE;+ z=Z2phA43FCK;I!=I%YLdEmB6PQ}3C`Zcm~4~AuXU0#!cd=mayXK3!&4RCAE`i}DA*0pf00}`3(mjT zOFo)ZtQCh*!}B>xn*6TWs#@|LE|e)TNf`Kon^&k{$M#M%X6)nApqq|zrypDMi7+p? zcnF(VCV3jVMHw48A7G<%BvW->JVYO{7T0~YHI+=w{#MC=ax^smxWN4*C;jGMUIY$X zgJ2Ln{KWTPG2Ct6^OVoyJ7FC~@B^DTa9pvNiO;}{?cqe1(Mys3X2Te*E@F;F(VE!; z5&5}iazhcBHfDJ729QF2z(L{qSsLY5i$OT>eqb!AV8e@9=S@hms^&UU%MJj2>*aAV z-(vPc)FfuFE}+OP8N-<*y(Nr8(u#+U*-e^m$9uV!WvR^5GU8m!ePKt?Da}3ErGe25 z-Ro?h6X8g^*NhCnI)j{^&4J+b4x)YJs$V#A2_Ba!CTvo)C4nunPD|Bd2>9AKEIuWb zzpwvxT(n?!?VAX6>g&TCdRkyD>rcKht2g7{{fC0sc1EDd&IXS`irCedfVLvcZf7Ht z47rfc#{S+kDKtM{Ndo-xHHB$d$}eEa%&3Ag$pd2)`A6W1RuW>Zh8l@h(B+oC?d8h? z`GC+)Hs2l|yZ8Hue%H$t4UT8{SHe5F(TX?`;qz4=c@-2z;5KI)>H?y=E}lGhhWNk3 zqh#&Lor-1GDaVpb1eLcZpr$_u$6=S=?Q$p%UakFVWBC3=qn0K+2`tVZzc9b2qS%@W> zuuM4}7|P{8?y@H#{!H*uSaTx^KjeS4mPp9&x2{GtA%B49%5uIjvY11BSVHV(8ZmG3 zx)SZij`Whgoo{2^-u*M@h?Ua(NucW-q^s@d&3ySI$R<_l{K@{I z=?=)xC>&0d*#WX3C=mappA~F)dK{P&e=@Cl-=~Z{j$_SaKQqk@|&1quk>gHeo%bQ}THuYnNBAgDrH^}mE z|FA=ZWd=L!36?1H%oJpMryr8Sxf+v;SnPBKNc7EYCchShcU`j0=$@XG&et-`I6d+1 z16|jvN70r0S5)AY6^G{( ztpUa(o8;A?R;(rR_8Iyf^j)WMdpGVQKBMN;Rft~FU;*{&P9xPzqS2n6bctA56*aMK z3^`2~$g1Ef1Q<|9v(!sMca5}zU->WGU&~eMZ21vp@?WiQ_)?En7g1;_K`qj1ViefL zNIM|*PmT+YCgX<=hW%0!gG)3!1vib=wIY!#%r&UrLR9-!*3a~N--mFDzd(Hzs?})> zqtulG`JJ(`-u^Zu(8Vf!Q`*RJD3DW(=ti(-?)fq~>(@_ua&+SBSpD^ehQ=zYIOHm~ zr>XnDMS6RHY*G<0wdUotw6dz;j7;Llr-lo~$3hnp0?O!FrcscM89^Zk0=r?j$QTwI z8ZZmrSgry4Gt}5Pxh-ra<}s33uu=Xq+SET>u#8^b{v*R@(0XO{gEF=uAE3i$7>)tn zFHcg4%v4ucp9yzpBw5MhK9ws6kFA zfDthN@4&-wMn!xYE#$sLme2$9Xhu4c6c7-oKC4<`n!r4cV+>^f9{T<+h643J$naE} literal 0 HcmV?d00001 diff --git a/public/vendor/fontawesome/less/spinning.less b/public/vendor/fontawesome/less/animated.less similarity index 79% rename from public/vendor/fontawesome/less/spinning.less rename to public/vendor/fontawesome/less/animated.less index 6e1564e05e..66ad52a5ba 100644 --- a/public/vendor/fontawesome/less/spinning.less +++ b/public/vendor/fontawesome/less/animated.less @@ -1,4 +1,4 @@ -// Spinning Icons +// Animated Icons // -------------------------- .@{fa-css-prefix}-spin { @@ -6,6 +6,11 @@ animation: fa-spin 2s infinite linear; } +.@{fa-css-prefix}-pulse { + -webkit-animation: fa-spin 1s infinite steps(8); + animation: fa-spin 1s infinite steps(8); +} + @-webkit-keyframes fa-spin { 0% { -webkit-transform: rotate(0deg); diff --git a/public/vendor/fontawesome/less/core.less b/public/vendor/fontawesome/less/core.less index 01d1910f72..f814f1e17e 100644 --- a/public/vendor/fontawesome/less/core.less +++ b/public/vendor/fontawesome/less/core.less @@ -3,9 +3,11 @@ .@{fa-css-prefix} { display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration + font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration font-size: inherit; // can't have font-size inherit on line above, so need to override text-rendering: auto; // optimizelegibility throws things off #1094 -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + transform: translate(0, 0); // ensures no half-pixel rendering in firefox + } diff --git a/public/vendor/fontawesome/less/extras.less b/public/vendor/fontawesome/less/extras.less deleted file mode 100644 index 89faf70fc9..0000000000 --- a/public/vendor/fontawesome/less/extras.less +++ /dev/null @@ -1,2 +0,0 @@ -// Extras -// -------------------------- diff --git a/public/vendor/fontawesome/less/font-awesome.less b/public/vendor/fontawesome/less/font-awesome.less index 195fd46c66..1f45c63d15 100644 --- a/public/vendor/fontawesome/less/font-awesome.less +++ b/public/vendor/fontawesome/less/font-awesome.less @@ -1,5 +1,5 @@ /*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ @@ -11,7 +11,7 @@ @import "fixed-width.less"; @import "list.less"; @import "bordered-pulled.less"; -@import "spinning.less"; +@import "animated.less"; @import "rotated-flipped.less"; @import "stacked.less"; @import "icons.less"; diff --git a/public/vendor/fontawesome/less/icons.less b/public/vendor/fontawesome/less/icons.less index b5c26c701b..c265de5a68 100644 --- a/public/vendor/fontawesome/less/icons.less +++ b/public/vendor/fontawesome/less/icons.less @@ -158,6 +158,7 @@ .@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; } .@{fa-css-prefix}-phone-square:before { content: @fa-var-phone-square; } .@{fa-css-prefix}-twitter:before { content: @fa-var-twitter; } +.@{fa-css-prefix}-facebook-f:before, .@{fa-css-prefix}-facebook:before { content: @fa-var-facebook; } .@{fa-css-prefix}-github:before { content: @fa-var-github; } .@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; } @@ -397,7 +398,8 @@ .@{fa-css-prefix}-trello:before { content: @fa-var-trello; } .@{fa-css-prefix}-female:before { content: @fa-var-female; } .@{fa-css-prefix}-male:before { content: @fa-var-male; } -.@{fa-css-prefix}-gittip:before { content: @fa-var-gittip; } +.@{fa-css-prefix}-gittip:before, +.@{fa-css-prefix}-gratipay:before { content: @fa-var-gratipay; } .@{fa-css-prefix}-sun-o:before { content: @fa-var-sun-o; } .@{fa-css-prefix}-moon-o:before { content: @fa-var-moon-o; } .@{fa-css-prefix}-archive:before { content: @fa-var-archive; } @@ -500,6 +502,7 @@ .@{fa-css-prefix}-send-o:before, .@{fa-css-prefix}-paper-plane-o:before { content: @fa-var-paper-plane-o; } .@{fa-css-prefix}-history:before { content: @fa-var-history; } +.@{fa-css-prefix}-genderless:before, .@{fa-css-prefix}-circle-thin:before { content: @fa-var-circle-thin; } .@{fa-css-prefix}-header:before { content: @fa-var-header; } .@{fa-css-prefix}-paragraph:before { content: @fa-var-paragraph; } @@ -550,3 +553,44 @@ .@{fa-css-prefix}-sheqel:before, .@{fa-css-prefix}-ils:before { content: @fa-var-ils; } .@{fa-css-prefix}-meanpath:before { content: @fa-var-meanpath; } +.@{fa-css-prefix}-buysellads:before { content: @fa-var-buysellads; } +.@{fa-css-prefix}-connectdevelop:before { content: @fa-var-connectdevelop; } +.@{fa-css-prefix}-dashcube:before { content: @fa-var-dashcube; } +.@{fa-css-prefix}-forumbee:before { content: @fa-var-forumbee; } +.@{fa-css-prefix}-leanpub:before { content: @fa-var-leanpub; } +.@{fa-css-prefix}-sellsy:before { content: @fa-var-sellsy; } +.@{fa-css-prefix}-shirtsinbulk:before { content: @fa-var-shirtsinbulk; } +.@{fa-css-prefix}-simplybuilt:before { content: @fa-var-simplybuilt; } +.@{fa-css-prefix}-skyatlas:before { content: @fa-var-skyatlas; } +.@{fa-css-prefix}-cart-plus:before { content: @fa-var-cart-plus; } +.@{fa-css-prefix}-cart-arrow-down:before { content: @fa-var-cart-arrow-down; } +.@{fa-css-prefix}-diamond:before { content: @fa-var-diamond; } +.@{fa-css-prefix}-ship:before { content: @fa-var-ship; } +.@{fa-css-prefix}-user-secret:before { content: @fa-var-user-secret; } +.@{fa-css-prefix}-motorcycle:before { content: @fa-var-motorcycle; } +.@{fa-css-prefix}-street-view:before { content: @fa-var-street-view; } +.@{fa-css-prefix}-heartbeat:before { content: @fa-var-heartbeat; } +.@{fa-css-prefix}-venus:before { content: @fa-var-venus; } +.@{fa-css-prefix}-mars:before { content: @fa-var-mars; } +.@{fa-css-prefix}-mercury:before { content: @fa-var-mercury; } +.@{fa-css-prefix}-transgender:before { content: @fa-var-transgender; } +.@{fa-css-prefix}-transgender-alt:before { content: @fa-var-transgender-alt; } +.@{fa-css-prefix}-venus-double:before { content: @fa-var-venus-double; } +.@{fa-css-prefix}-mars-double:before { content: @fa-var-mars-double; } +.@{fa-css-prefix}-venus-mars:before { content: @fa-var-venus-mars; } +.@{fa-css-prefix}-mars-stroke:before { content: @fa-var-mars-stroke; } +.@{fa-css-prefix}-mars-stroke-v:before { content: @fa-var-mars-stroke-v; } +.@{fa-css-prefix}-mars-stroke-h:before { content: @fa-var-mars-stroke-h; } +.@{fa-css-prefix}-neuter:before { content: @fa-var-neuter; } +.@{fa-css-prefix}-facebook-official:before { content: @fa-var-facebook-official; } +.@{fa-css-prefix}-pinterest-p:before { content: @fa-var-pinterest-p; } +.@{fa-css-prefix}-whatsapp:before { content: @fa-var-whatsapp; } +.@{fa-css-prefix}-server:before { content: @fa-var-server; } +.@{fa-css-prefix}-user-plus:before { content: @fa-var-user-plus; } +.@{fa-css-prefix}-user-times:before { content: @fa-var-user-times; } +.@{fa-css-prefix}-hotel:before, +.@{fa-css-prefix}-bed:before { content: @fa-var-bed; } +.@{fa-css-prefix}-viacoin:before { content: @fa-var-viacoin; } +.@{fa-css-prefix}-train:before { content: @fa-var-train; } +.@{fa-css-prefix}-subway:before { content: @fa-var-subway; } +.@{fa-css-prefix}-medium:before { content: @fa-var-medium; } diff --git a/public/vendor/fontawesome/less/mixins.less b/public/vendor/fontawesome/less/mixins.less index b7bfadc797..c97f4604ca 100644 --- a/public/vendor/fontawesome/less/mixins.less +++ b/public/vendor/fontawesome/less/mixins.less @@ -3,11 +3,13 @@ .fa-icon() { display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration + font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration font-size: inherit; // can't have font-size inherit on line above, so need to override text-rendering: auto; // optimizelegibility throws things off #1094 -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + transform: translate(0, 0); // ensures no half-pixel rendering in firefox + } .fa-icon-rotate(@degrees, @rotation) { diff --git a/public/vendor/fontawesome/less/path.less b/public/vendor/fontawesome/less/path.less index c5a691246d..9211e66597 100644 --- a/public/vendor/fontawesome/less/path.less +++ b/public/vendor/fontawesome/less/path.less @@ -5,6 +5,7 @@ font-family: 'FontAwesome'; src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), + url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'), url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); diff --git a/public/vendor/fontawesome/less/variables.less b/public/vendor/fontawesome/less/variables.less index 56a699851f..d526064c84 100644 --- a/public/vendor/fontawesome/less/variables.less +++ b/public/vendor/fontawesome/less/variables.less @@ -1,10 +1,11 @@ // Variables // -------------------------- -@fa-font-path: "./vendor/fontawesome/fonts"; -//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts"; // for referencing Bootstrap CDN font files directly +@fa-font-path: "../fonts"; +@fa-font-size-base: 14px; +//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts"; // for referencing Bootstrap CDN font files directly @fa-css-prefix: fa; -@fa-version: "4.2.0"; +@fa-version: "4.3.0"; @fa-border-color: #eee; @fa-inverse: #fff; @fa-li-width: (30em / 14); @@ -56,6 +57,7 @@ @fa-var-bar-chart-o: "\f080"; @fa-var-barcode: "\f02a"; @fa-var-bars: "\f0c9"; +@fa-var-bed: "\f236"; @fa-var-beer: "\f0fc"; @fa-var-behance: "\f1b4"; @fa-var-behance-square: "\f1b5"; @@ -83,6 +85,7 @@ @fa-var-bullhorn: "\f0a1"; @fa-var-bullseye: "\f140"; @fa-var-bus: "\f207"; +@fa-var-buysellads: "\f20d"; @fa-var-cab: "\f1ba"; @fa-var-calculator: "\f1ec"; @fa-var-calendar: "\f073"; @@ -98,6 +101,8 @@ @fa-var-caret-square-o-right: "\f152"; @fa-var-caret-square-o-up: "\f151"; @fa-var-caret-up: "\f0d8"; +@fa-var-cart-arrow-down: "\f218"; +@fa-var-cart-plus: "\f217"; @fa-var-cc: "\f20a"; @fa-var-cc-amex: "\f1f3"; @fa-var-cc-discover: "\f1f2"; @@ -146,6 +151,7 @@ @fa-var-comments-o: "\f0e6"; @fa-var-compass: "\f14e"; @fa-var-compress: "\f066"; +@fa-var-connectdevelop: "\f20e"; @fa-var-copy: "\f0c5"; @fa-var-copyright: "\f1f9"; @fa-var-credit-card: "\f09d"; @@ -157,11 +163,13 @@ @fa-var-cut: "\f0c4"; @fa-var-cutlery: "\f0f5"; @fa-var-dashboard: "\f0e4"; +@fa-var-dashcube: "\f210"; @fa-var-database: "\f1c0"; @fa-var-dedent: "\f03b"; @fa-var-delicious: "\f1a5"; @fa-var-desktop: "\f108"; @fa-var-deviantart: "\f1bd"; +@fa-var-diamond: "\f219"; @fa-var-digg: "\f1a6"; @fa-var-dollar: "\f155"; @fa-var-dot-circle-o: "\f192"; @@ -191,6 +199,8 @@ @fa-var-eye-slash: "\f070"; @fa-var-eyedropper: "\f1fb"; @fa-var-facebook: "\f09a"; +@fa-var-facebook-f: "\f09a"; +@fa-var-facebook-official: "\f230"; @fa-var-facebook-square: "\f082"; @fa-var-fast-backward: "\f049"; @fa-var-fast-forward: "\f050"; @@ -232,6 +242,7 @@ @fa-var-folder-open: "\f07c"; @fa-var-folder-open-o: "\f115"; @fa-var-font: "\f031"; +@fa-var-forumbee: "\f211"; @fa-var-forward: "\f04e"; @fa-var-foursquare: "\f180"; @fa-var-frown-o: "\f119"; @@ -242,6 +253,7 @@ @fa-var-ge: "\f1d1"; @fa-var-gear: "\f013"; @fa-var-gears: "\f085"; +@fa-var-genderless: "\f1db"; @fa-var-gift: "\f06b"; @fa-var-git: "\f1d3"; @fa-var-git-square: "\f1d2"; @@ -256,6 +268,7 @@ @fa-var-google-plus-square: "\f0d4"; @fa-var-google-wallet: "\f1ee"; @fa-var-graduation-cap: "\f19d"; +@fa-var-gratipay: "\f184"; @fa-var-group: "\f0c0"; @fa-var-h-square: "\f0fd"; @fa-var-hacker-news: "\f1d4"; @@ -268,9 +281,11 @@ @fa-var-headphones: "\f025"; @fa-var-heart: "\f004"; @fa-var-heart-o: "\f08a"; +@fa-var-heartbeat: "\f21e"; @fa-var-history: "\f1da"; @fa-var-home: "\f015"; @fa-var-hospital-o: "\f0f8"; +@fa-var-hotel: "\f236"; @fa-var-html5: "\f13b"; @fa-var-ils: "\f20b"; @fa-var-image: "\f03e"; @@ -294,6 +309,7 @@ @fa-var-lastfm: "\f202"; @fa-var-lastfm-square: "\f203"; @fa-var-leaf: "\f06c"; +@fa-var-leanpub: "\f212"; @fa-var-legal: "\f0e3"; @fa-var-lemon-o: "\f094"; @fa-var-level-down: "\f149"; @@ -325,10 +341,17 @@ @fa-var-mail-reply-all: "\f122"; @fa-var-male: "\f183"; @fa-var-map-marker: "\f041"; +@fa-var-mars: "\f222"; +@fa-var-mars-double: "\f227"; +@fa-var-mars-stroke: "\f229"; +@fa-var-mars-stroke-h: "\f22b"; +@fa-var-mars-stroke-v: "\f22a"; @fa-var-maxcdn: "\f136"; @fa-var-meanpath: "\f20c"; +@fa-var-medium: "\f23a"; @fa-var-medkit: "\f0fa"; @fa-var-meh-o: "\f11a"; +@fa-var-mercury: "\f223"; @fa-var-microphone: "\f130"; @fa-var-microphone-slash: "\f131"; @fa-var-minus: "\f068"; @@ -340,8 +363,10 @@ @fa-var-money: "\f0d6"; @fa-var-moon-o: "\f186"; @fa-var-mortar-board: "\f19d"; +@fa-var-motorcycle: "\f21c"; @fa-var-music: "\f001"; @fa-var-navicon: "\f0c9"; +@fa-var-neuter: "\f22c"; @fa-var-newspaper-o: "\f1ea"; @fa-var-openid: "\f19b"; @fa-var-outdent: "\f03b"; @@ -366,6 +391,7 @@ @fa-var-pied-piper: "\f1a7"; @fa-var-pied-piper-alt: "\f1a8"; @fa-var-pinterest: "\f0d2"; +@fa-var-pinterest-p: "\f231"; @fa-var-pinterest-square: "\f0d3"; @fa-var-plane: "\f072"; @fa-var-play: "\f04b"; @@ -415,8 +441,10 @@ @fa-var-search: "\f002"; @fa-var-search-minus: "\f010"; @fa-var-search-plus: "\f00e"; +@fa-var-sellsy: "\f213"; @fa-var-send: "\f1d8"; @fa-var-send-o: "\f1d9"; +@fa-var-server: "\f233"; @fa-var-share: "\f064"; @fa-var-share-alt: "\f1e0"; @fa-var-share-alt-square: "\f1e1"; @@ -425,11 +453,15 @@ @fa-var-shekel: "\f20b"; @fa-var-sheqel: "\f20b"; @fa-var-shield: "\f132"; +@fa-var-ship: "\f21a"; +@fa-var-shirtsinbulk: "\f214"; @fa-var-shopping-cart: "\f07a"; @fa-var-sign-in: "\f090"; @fa-var-sign-out: "\f08b"; @fa-var-signal: "\f012"; +@fa-var-simplybuilt: "\f215"; @fa-var-sitemap: "\f0e8"; +@fa-var-skyatlas: "\f216"; @fa-var-skype: "\f17e"; @fa-var-slack: "\f198"; @fa-var-sliders: "\f1de"; @@ -468,10 +500,12 @@ @fa-var-step-forward: "\f051"; @fa-var-stethoscope: "\f0f1"; @fa-var-stop: "\f04d"; +@fa-var-street-view: "\f21d"; @fa-var-strikethrough: "\f0cc"; @fa-var-stumbleupon: "\f1a4"; @fa-var-stumbleupon-circle: "\f1a3"; @fa-var-subscript: "\f12c"; +@fa-var-subway: "\f239"; @fa-var-suitcase: "\f0f2"; @fa-var-sun-o: "\f185"; @fa-var-superscript: "\f12b"; @@ -506,6 +540,9 @@ @fa-var-toggle-on: "\f205"; @fa-var-toggle-right: "\f152"; @fa-var-toggle-up: "\f151"; +@fa-var-train: "\f238"; +@fa-var-transgender: "\f224"; +@fa-var-transgender-alt: "\f225"; @fa-var-trash: "\f1f8"; @fa-var-trash-o: "\f014"; @fa-var-tree: "\f1bb"; @@ -532,7 +569,14 @@ @fa-var-usd: "\f155"; @fa-var-user: "\f007"; @fa-var-user-md: "\f0f0"; +@fa-var-user-plus: "\f234"; +@fa-var-user-secret: "\f21b"; +@fa-var-user-times: "\f235"; @fa-var-users: "\f0c0"; +@fa-var-venus: "\f221"; +@fa-var-venus-double: "\f226"; +@fa-var-venus-mars: "\f228"; +@fa-var-viacoin: "\f237"; @fa-var-video-camera: "\f03d"; @fa-var-vimeo-square: "\f194"; @fa-var-vine: "\f1ca"; @@ -544,6 +588,7 @@ @fa-var-wechat: "\f1d7"; @fa-var-weibo: "\f18a"; @fa-var-weixin: "\f1d7"; +@fa-var-whatsapp: "\f232"; @fa-var-wheelchair: "\f193"; @fa-var-wifi: "\f1eb"; @fa-var-windows: "\f17a"; From 8d2f89a5e2a9d656b8fb0df1858d61eb31b85cc4 Mon Sep 17 00:00:00 2001 From: Trevor Date: Tue, 10 Mar 2015 09:50:32 -0400 Subject: [PATCH 720/897] Update FontAwesome 4.3.0 Fixed incorrect variables path. --- public/vendor/fontawesome/less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/vendor/fontawesome/less/variables.less b/public/vendor/fontawesome/less/variables.less index d526064c84..775708b735 100644 --- a/public/vendor/fontawesome/less/variables.less +++ b/public/vendor/fontawesome/less/variables.less @@ -1,7 +1,7 @@ // Variables // -------------------------- -@fa-font-path: "../fonts"; +@fa-font-path: "./vendor/fontawesome/fonts"; @fa-font-size-base: 14px; //@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts"; // for referencing Bootstrap CDN font files directly @fa-css-prefix: fa; From 2a80140e704b35c694640ba5f59edab69a4a4e60 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 10 Mar 2015 11:52:32 -0400 Subject: [PATCH 721/897] fixed issue where socket.io would no longer reconnect perpetually, new behaviour waits 10x the reconnect delay, and then starts over. Also upped the reconnection delay default to 1.5s. --- public/src/app.js | 14 +++++++------- src/controllers/api.js | 2 +- src/views/admin/settings/sockets.tpl | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 53e43e86fc..d1f6ab93bc 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -17,12 +17,12 @@ app.cacheBuster = null; function socketIOConnect() { var ioParams = { reconnectionAttempts: config.maxReconnectionAttempts, - reconnectionDelay : config.reconnectionDelay, + reconnectionDelay: config.reconnectionDelay, transports: config.socketioTransports, path: config.relative_path + '/socket.io' }; - socket = io.connect(config.websocketAddress, ioParams); + socket = io(config.websocketAddress, ioParams); reconnecting = false; socket.on('event:connect', function () { @@ -41,11 +41,6 @@ app.cacheBuster = null; }); socket.on('reconnecting', function (attempt) { - if(attempt === parseInt(config.maxReconnectionAttempts, 10)) { - socket.io.attempts = 0; - return; - } - reconnecting = true; var reconnectEl = $('#reconnect'); @@ -74,6 +69,11 @@ app.cacheBuster = null; socket.on('event:alert', function(data) { app.alert(data); }); + + socket.on('reconnect_failed', function() { + // Wait ten times the reconnection delay and then start over + setTimeout(socket.connect.bind(socket), parseInt(config.reconnectionDelay, 10) * 10); + }); } function onSocketConnect(data) { diff --git a/src/controllers/api.js b/src/controllers/api.js index c98fd79e0c..8be2211ca1 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -51,7 +51,7 @@ apiController.getConfig = function(req, res, next) { config.disableSocialButtons = parseInt(meta.config.disableSocialButtons, 10) === 1; config.disableChat = parseInt(meta.config.disableChat, 10) === 1; config.maxReconnectionAttempts = meta.config.maxReconnectionAttempts || 5; - config.reconnectionDelay = meta.config.reconnectionDelay || 200; + config.reconnectionDelay = meta.config.reconnectionDelay || 1500; config.tagsPerTopic = meta.config.tagsPerTopic || 5; config.minimumTagLength = meta.config.minimumTagLength || 3; config.maximumTagLength = meta.config.maximumTagLength || 15; diff --git a/src/views/admin/settings/sockets.tpl b/src/views/admin/settings/sockets.tpl index ab24ab2970..94ef41bf56 100644 --- a/src/views/admin/settings/sockets.tpl +++ b/src/views/admin/settings/sockets.tpl @@ -6,11 +6,11 @@
      - +
      - +
    From daf9999a298b645902f5fec0d59cfade8415ee6a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 10 Mar 2015 13:53:44 -0400 Subject: [PATCH 722/897] prevent composer from going too low --- public/src/modules/composer/resize.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index f21c0027b3..608efed945 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -22,6 +22,10 @@ define('composer/resize', function() { postContainer.percentage = percentage; if (percentage) { + if (percentage < 0.25) { + percentage = 0.25; + } + if (env === 'md' || env === 'lg') { postContainer.css('transform', 'translate(0, ' + (Math.abs(1-percentage) * 100) + '%)'); } From d342e01ef15945b694dc94a7dc902ff4dc0508f8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 10 Mar 2015 14:09:24 -0400 Subject: [PATCH 723/897] search group members --- src/groups.js | 63 +++++++++++++++++++++++++++++++++++++++++ src/socket.io/groups.js | 9 ++++++ src/user/search.js | 43 +++++++++++++++++----------- 3 files changed, 98 insertions(+), 17 deletions(-) diff --git a/src/groups.js b/src/groups.js index 0645fc55ac..dddd0aafcf 100644 --- a/src/groups.js +++ b/src/groups.js @@ -1096,4 +1096,67 @@ var async = require('async'), next(null, groups); }; + Groups.searchMembers = function(data, callback) { + + function userInGroup(userGroups) { + for(var i=0; i Date: Tue, 10 Mar 2015 14:55:20 -0400 Subject: [PATCH 724/897] if bgColor and color are not sent in the category creation call, automatic colours are supplied --- public/src/admin/manage/categories.js | 2 -- src/categories/create.js | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index a9cf3b60e8..52d13874ab 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -75,8 +75,6 @@ define('admin/manage/categories', [ name: $('#inputName').val(), description: $('#inputDescription').val(), icon: $('#new-category-modal i').attr('value'), - bgColor: '#0059b2', - color: '#fff', order: $('.admin-categories #entry-container').children().length + 1 }; diff --git a/src/categories/create.js b/src/categories/create.js index a8bfaeb6fc..ce293d1c42 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -14,15 +14,16 @@ module.exports = function(Categories) { } var slug = cid + '/' + utils.slugify(data.name), - order = data.order || cid; // If no order provided, place it at the end + order = data.order || cid, // If no order provided, place it at the end + colours = Categories.assignColours(); var category = { cid: cid, name: data.name, description: data.description, icon: data.icon, - bgColor: data.bgColor, - color: data.color, + bgColor: data.bgColor || colours[0], + color: data.color || colours[1], slug: slug, parentCid: 0, topic_count: 0, @@ -52,4 +53,12 @@ module.exports = function(Categories) { }); }); }; + + Categories.assignColours = function() { + var backgrounds = ['#AB4642', '#DC9656', '#F7CA88', '#A1B56C', '#86C1B9', '#7CAFC2', '#BA8BAF', '#A16946'], + text = ['#fff', '#fff', '#333', '#fff', '#333', '#fff', '#fff', '#fff'], + index = Math.floor(Math.random() * backgrounds.length); + + return [backgrounds[index], text[index]]; + }; }; From 201c4b35da7179e529a296c163c2d91ad07a5396 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 10 Mar 2015 15:04:17 -0400 Subject: [PATCH 725/897] pagination data if query is empty get all uids --- src/controllers/users.js | 7 +++++-- src/user/search.js | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/controllers/users.js b/src/controllers/users.js index 81001d0f3a..a4cb36259b 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -5,6 +5,7 @@ var usersController = {}; var async = require('async'), user = require('../user'), meta = require('../meta'), + pagination = require('../pagination'), plugins = require('../plugins'), db = require('../database'); @@ -67,11 +68,13 @@ usersController.getUsers = function(set, count, req, res, next) { if (err) { return next(err); } + var pageCount = Math.ceil(data.count / (parseInt(meta.config.userSearchResultsPerPage, 10) || 20)); var userData = { search_display: 'hidden', loadmore_display: data.count > count ? 'block' : 'hide', users: data.users, - show_anon: 'hide' + show_anon: 'hide', + pagination: pagination.create(1, pageCount) }; res.render('users', userData); @@ -94,7 +97,7 @@ function getUsersAndCount(set, uid, count, callback) { return user && parseInt(user.uid, 10); }); - callback(null, {users: results.users, count: results.count}); + callback(null, results); }); } diff --git a/src/user/search.js b/src/user/search.js index bc5efa7f77..fc5b11681e 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -22,19 +22,14 @@ module.exports = function(User) { } var startTime = process.hrtime(); - var keys = searchBy.map(function(searchBy) { - return searchBy + ':uid'; - }); - - var filterBy = Array.isArray(data.filterBy) ? data.filterBy : []; var searchResult = {}; async.waterfall([ function(next) { - findUids(query, keys, startsWith, next); + findUids(query, searchBy, startsWith, next); }, function(uids, next) { - + var filterBy = Array.isArray(data.filterBy) ? data.filterBy : []; filterAndSortUids(uids, filterBy, data.sortBy, next); }, function(uids, next) { @@ -61,6 +56,7 @@ module.exports = function(User) { var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20; var start = Math.max(0, page - 1) * resultsPerPage; var end = start + resultsPerPage; + var pageCount = Math.ceil(data.length / resultsPerPage); var currentPage = Math.max(1, Math.ceil((start + 1) / resultsPerPage)); @@ -70,7 +66,15 @@ module.exports = function(User) { }; }; - function findUids(query, keys, startsWith, callback) { + function findUids(query, searchBy, startsWith, callback) { + if (!query) { + return db.getSortedSetRevRange('users:joindate', 0, -1, callback); + } + + var keys = searchBy.map(function(searchBy) { + return searchBy + ':uid'; + }); + db.getObjects(keys, function(err, hashes) { if (err || !hashes) { return callback(err, []); From 9f4f858ff985300fa5d03ad2a111071e3fcfbf34 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 10 Mar 2015 15:50:40 -0400 Subject: [PATCH 726/897] group member search only look in uids that are member of the group, added custom findUids function to user.search --- src/groups.js | 73 ++++++++++++++++------------------------------ src/user/search.js | 6 +++- 2 files changed, 30 insertions(+), 49 deletions(-) diff --git a/src/groups.js b/src/groups.js index dddd0aafcf..3f1ba0ddf7 100644 --- a/src/groups.js +++ b/src/groups.js @@ -1098,65 +1098,42 @@ var async = require('async'), Groups.searchMembers = function(data, callback) { - function userInGroup(userGroups) { - for(var i=0; i 1) { + uids = uids.filter(function(uid, index, array) { + return array.indexOf(uid) === index; + }); + } - if (!uids.length) { - return callback(null, searchResult); + next(null, uids); } - Groups.getUserGroups(uids, next); - }, - function(groups, next) { - searchResult.users = searchResult.users.filter(function(user, index) { - return user && userInGroup(groups[index]); - }); + ], callback); + } - pagination = user.paginate(data.page, searchResult.users); - searchResult.pagination = pagination.pagination; - searchResult.users = pagination.data; - next(null, searchResult); - } - ], callback); + data.findUids = findUids; + user.search(data, callback); }; }(module.exports)); diff --git a/src/user/search.js b/src/user/search.js index fc5b11681e..7545a6d3f3 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -26,7 +26,11 @@ module.exports = function(User) { var searchResult = {}; async.waterfall([ function(next) { - findUids(query, searchBy, startsWith, next); + if (data.findUids) { + data.findUids(query, searchBy, startsWith, next); + } else { + findUids(query, searchBy, startsWith, next); + } }, function(uids, next) { var filterBy = Array.isArray(data.filterBy) ? data.filterBy : []; From 8e2483b2e6a60d0423fcf48aff158c453686c375 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 11 Mar 2015 10:32:49 -0400 Subject: [PATCH 727/897] fixed #2849 --- src/middleware/middleware.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 34d2a79870..c4c4e6d792 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -154,17 +154,9 @@ middleware.checkAccountPermissions = function(req, res, next) { }; middleware.isAdmin = function(req, res, next) { - function render() { - if (res.locals.isAPI) { - return controllers.helpers.notAllowed(req, res); - } - - middleware.buildHeader(req, res, function() { - controllers.helpers.notAllowed(req, res); - }); - } if (!req.user) { - return render(); + req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, ''); + return controllers.helpers.redirect(res, '/login'); } user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) { @@ -172,7 +164,13 @@ middleware.isAdmin = function(req, res, next) { return next(err); } - render(); + if (res.locals.isAPI) { + return controllers.helpers.notAllowed(req, res); + } + + middleware.buildHeader(req, res, function() { + controllers.helpers.notAllowed(req, res); + }); }); }; From 57a64870fd579e6cefcdd3c2a99fd688aeefe16c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 11 Mar 2015 10:44:34 -0400 Subject: [PATCH 728/897] actually fixing #2849 --- public/src/ajaxify.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 2392511386..fdfdc34a10 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -23,6 +23,11 @@ $(document).ready(function() { ajaxify.currentPage = null; ajaxify.go = function (url, callback, quiet) { + // If ajaxifying into an admin route from regular site, do a cold load. + if (url.indexOf('admin') === 0 && window.location.pathname.indexOf('/admin') !== 0) { + return window.open(RELATIVE_PATH + '/' + url, '_blank'); + } + app.enterRoom(''); $(window).off('scroll'); From 40763d2ae7b2ea3a816a311d2cf7f14c0cd68a9b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 11 Mar 2015 11:24:46 -0400 Subject: [PATCH 729/897] #2849 again --- public/src/ajaxify.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index fdfdc34a10..ee317d9133 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -23,9 +23,8 @@ $(document).ready(function() { ajaxify.currentPage = null; ajaxify.go = function (url, callback, quiet) { - // If ajaxifying into an admin route from regular site, do a cold load. - if (url.indexOf('admin') === 0 && window.location.pathname.indexOf('/admin') !== 0) { - return window.open(RELATIVE_PATH + '/' + url, '_blank'); + if (ajaxify.handleACPRedirect(url)) { + return; } app.enterRoom(''); @@ -62,6 +61,14 @@ $(document).ready(function() { return true; }; + ajaxify.handleACPRedirect = function(url) { + // If ajaxifying into an admin route from regular site, do a cold load. + url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); + if (url.indexOf('admin') === 0 && window.location.pathname.indexOf('/admin') !== 0) { + return window.open(RELATIVE_PATH + '/' + url, '_blank'); + } + } + ajaxify.start = function(url, quiet, search) { url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); var hash = window.location.hash; From 8484c7c51a8ee976227c17547fd3fcf3399ccac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Mar 2015 12:07:40 -0400 Subject: [PATCH 730/897] closes #2850 --- public/src/client/recent.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/public/src/client/recent.js b/public/src/client/recent.js index bdf8897151..05e936a577 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -2,7 +2,7 @@ /* globals define, app, socket, utils */ -define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) { +define('forum/recent', ['forum/infinitescroll', 'composer'], function(infinitescroll, composer) { var Recent = {}; var newTopicCount = 0, @@ -23,6 +23,17 @@ define('forum/recent', ['forum/infinitescroll'], function(infinitescroll) { $(this).addClass('hide'); }); + $('#new_topic').on('click', function() { + socket.emit('categories.getCategoriesByPrivilege', 'topics:create', function(err, categories) { + if (err) { + return app.alertError(err.message); + } + if (categories.length) { + composer.newTopic(categories[0].cid); + } + }); + }); + infinitescroll.init(Recent.loadMoreTopics); }; From eb733fdb6f9ab7420d7cc9bb61d56a857e26095d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 12:54:35 -0400 Subject: [PATCH 731/897] toggle preview button on composer --- public/src/modules/composer.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 98ab0407a5..3bfb17b31a 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -348,6 +348,7 @@ define('composer', [ resize.handleResize(postContainer); handleHelp(postContainer); + handleToggle(postContainer); $(window).trigger('action:composer.loaded', { post_uuid: post_uuid @@ -376,6 +377,23 @@ define('composer', [ }); } + function handleToggle(postContainer) { + var showBtn = postContainer.find('.write-container .toggle-preview'), + hideBtn = postContainer.find('.preview-container .toggle-preview'); + + hideBtn.on('click', function() { + $('.preview-container').addClass('hide'); + $('.write-container').addClass('maximized'); + showBtn.removeClass('hide'); + }); + + showBtn.on('click', function() { + $('.preview-container').removeClass('hide'); + $('.write-container').removeClass('maximized'); + showBtn.addClass('hide'); + }); + } + function updateTitle(postData, postContainer) { var titleEl = postContainer.find('.title'); From abd3979fb31e96d98cbebf5e9c2ae7f1b6be9560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Mar 2015 13:25:48 -0400 Subject: [PATCH 732/897] closes #2465 --- public/language/en_GB/error.json | 2 +- public/src/client/chats.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 8bb83071fc..a8d4c042b5 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -23,7 +23,7 @@ "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.", "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", "email-confirm-failed": "We could not confirm your email, please try again later.", diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 020b0915ef..0b0f80ff8c 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -206,6 +206,9 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S, message:msg }, function(err) { if (err) { + if (err.message === '[[error:email-not-confirmed-chat]]') { + return showEmailConfirmAlert(err); + } return app.alertError(err.message); } From 940c33c42612b68478d8bfc01ce6dc4ca232d09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Mar 2015 13:32:28 -0400 Subject: [PATCH 733/897] fix js error removed dupe code --- public/src/app.js | 4 ++-- public/src/client/chats.js | 2 +- public/src/modules/composer.js | 23 ++--------------------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index d1f6ab93bc..3c47aebf9c 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -537,7 +537,7 @@ app.cacheBuster = null; }); }; - function showEmailConfirmWarning() { + function showEmailConfirmWarning(err) { if (!config.requireEmailConfirmation || !app.user.uid) { return; } @@ -555,7 +555,7 @@ app.cacheBuster = null; } else if (!app.user['email:confirmed']) { app.alert({ alert_id: 'email_confirm', - message: '[[error:email-not-confirmed]]', + message: err ? err.message : '[[error:email-not-confirmed]]', type: 'warning', timeout: 0, clickfn: function() { diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 0b0f80ff8c..fe491b49c3 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -207,7 +207,7 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S, }, function(err) { if (err) { if (err.message === '[[error:email-not-confirmed-chat]]') { - return showEmailConfirmAlert(err); + return app.showEmailConfirmWarning(err); } return app.alertError(err.message); } diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 3bfb17b31a..d8107e0e33 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -30,7 +30,7 @@ define('composer', [ discard(composer.active); return; } - + translator.translate('[[modules:composer.discard]]', function(translated) { bootbox.confirm(translated, function(confirm) { if (confirm) { @@ -506,7 +506,7 @@ define('composer', [ $('.action-bar button').removeAttr('disabled'); if (err) { if (err.message === '[[error:email-not-confirmed]]') { - return showEmailConfirmAlert(err); + return app.showEmailConfirmWarning(err); } return app.alertError(err.message); @@ -519,25 +519,6 @@ define('composer', [ } } - function showEmailConfirmAlert(err) { - app.alert({ - alert_id: 'email_confirm', - title: '[[global:alert.error]]', - message: err.message, - type: 'danger', - timeout: 0, - clickfn: function() { - app.removeAlert('email_confirm'); - socket.emit('user.emailConfirm', {}, function(err) { - if (err) { - return app.alertError(err.message); - } - app.alertSuccess('[[notifications:email-confirm-sent]]'); - }); - } - }); - } - function discard(post_uuid) { if (composer.posts[post_uuid]) { $('#cmp-uuid-' + post_uuid).remove(); From 9d0b4f58413a30bc59e3ad96ecae26130126bc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Mar 2015 13:34:57 -0400 Subject: [PATCH 734/897] app.showEmailConfirmWarning :dull: --- public/src/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 3c47aebf9c..f663a3dba9 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -504,7 +504,7 @@ app.cacheBuster = null; }); createHeaderTooltips(); - showEmailConfirmWarning(); + app.showEmailConfirmWarning(); socket.removeAllListeners('event:nodebb.ready'); socket.on('event:nodebb.ready', function(cacheBusters) { @@ -537,7 +537,7 @@ app.cacheBuster = null; }); }; - function showEmailConfirmWarning(err) { + app.showEmailConfirmWarning = function(err) { if (!config.requireEmailConfirmation || !app.user.uid) { return; } @@ -569,7 +569,7 @@ app.cacheBuster = null; } }); } - } + }; showWelcomeMessage = window.location.href.indexOf('loggedin') !== -1; From 8234e4cc075854cad436338ade8761a218f8fcae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Mar 2015 15:57:17 -0400 Subject: [PATCH 735/897] new hook action:topic.reply only fires on normal replies --- src/topics/create.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/topics/create.js b/src/topics/create.js index 1e9336fedc..36a73948d7 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -166,6 +166,7 @@ module.exports = function(Topics) { data.topicData = data.topicData[0]; data.topicData.unreplied = 1; + data.topicData.mainPost = data.postData; plugins.fireHook('action:topic.post', data.topicData); @@ -280,6 +281,10 @@ module.exports = function(Topics) { Topics.notifyFollowers(postData, uid); } + if (postData.index > 0) { + plugins.fireHook('action:topic.reply', postData); + } + postData.topic.title = validator.escape(postData.topic.title); next(null, postData); } From 7282bbafb204ab2177e4c6ed5bf7b69138968868 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 13:17:25 -0400 Subject: [PATCH 736/897] removing composer-mobile.tpl was totally a bad idea. --- public/src/modules/composer.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index d8107e0e33..c57c094250 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -254,11 +254,9 @@ define('composer', [ isGuestPost = composer.posts[post_uuid] ? parseInt(composer.posts[post_uuid].uid, 10) === 0 : null; composer.bsEnvironment = utils.findBootstrapEnvironment(); - - var template = (composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm') ? 'composer-mobile' : 'composer'; - + var data = { - mobile: template === 'composer-mobile', + mobile: template === (composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm'), allowTopicsThumbnail: allowTopicsThumbnail, showTags: isTopic || isMain, minimumTagLength: config.minimumTagLength, @@ -269,7 +267,7 @@ define('composer', [ formatting: composer.formatting }; - parseAndTranslate(template, data, function(composerTemplate) { + parseAndTranslate('composer', data, function(composerTemplate) { if ($('#cmp-uuid-' + post_uuid).length) { return; } From 7227dfd704095d38db833f04a1dfec17160131f1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 13:22:41 -0400 Subject: [PATCH 737/897] add composing mobile classes if composing on mobile --- public/src/modules/composer.js | 4 ++-- public/src/modules/composer/resize.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index c57c094250..ca3b0fd78a 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -254,9 +254,9 @@ define('composer', [ isGuestPost = composer.posts[post_uuid] ? parseInt(composer.posts[post_uuid].uid, 10) === 0 : null; composer.bsEnvironment = utils.findBootstrapEnvironment(); - + var data = { - mobile: template === (composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm'), + mobile: composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm', allowTopicsThumbnail: allowTopicsThumbnail, showTags: isTopic || isMain, minimumTagLength: config.minimumTagLength, diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 608efed945..da3e4b0ed6 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -34,8 +34,7 @@ define('composer/resize', function() { // todo, lump in browsers that don't support transform (ie8) here // at this point we should use modernizr if (env === 'sm' || env === 'xs' || window.innerHeight < 480) { - app.toggleNavbar(false); - postContainer.find('textarea').css('height', $(window).height()); + $('html').addClass('composing mobile'); } if (config.hasImageUploadPlugin) { From 5e3a990f2db03021b8cf7e625d4d9c04cdbcde40 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 13:43:14 -0400 Subject: [PATCH 738/897] added vendor/autosize --- public/vendor/autosize/autosize.min.js | 6 ++++++ src/meta/js.js | 1 + 2 files changed, 7 insertions(+) create mode 100644 public/vendor/autosize/autosize.min.js diff --git a/public/vendor/autosize/autosize.min.js b/public/vendor/autosize/autosize.min.js new file mode 100644 index 0000000000..217ff6eff4 --- /dev/null +++ b/public/vendor/autosize/autosize.min.js @@ -0,0 +1,6 @@ +/*! + Autosize 2.0.0 + license: MIT + http://www.jacklmoore.com/autosize +*/ +!function(e,t){"use strict";"function"==typeof define&&define.amd?define('autosize',t):"object"==typeof exports?module.exports=t():e.autosize=t()}(this,function(){function e(e){function t(){var t=window.getComputedStyle(e,null);"vertical"===t.resize?e.style.resize="none":"both"===t.resize&&(e.style.resize="horizontal"),e.style.wordWrap="break-word";var i=e.style.width;e.style.width="0px",e.offsetWidth,e.style.width=i,n="none"!==t.maxHeight?parseFloat(t.maxHeight):!1,r="content-box"===t.boxSizing?-(parseFloat(t.paddingTop)+parseFloat(t.paddingBottom)):parseFloat(t.borderTopWidth)+parseFloat(t.borderBottomWidth),o()}function o(){var t=e.style.height,o=document.documentElement.scrollTop,i=document.body.scrollTop;e.style.height="auto";var s=e.scrollHeight+r;if(n!==!1&&s>n?(s=n,"scroll"!==e.style.overflowY&&(e.style.overflowY="scroll")):"hidden"!==e.style.overflowY&&(e.style.overflowY="hidden"),e.style.height=s+"px",document.documentElement.scrollTop=o,document.body.scrollTop=i,t!==e.style.height){var d=document.createEvent("Event");d.initEvent("autosize.resized",!0,!1),e.dispatchEvent(d)}}if(e&&e.nodeName&&"TEXTAREA"===e.nodeName&&!e.hasAttribute("data-autosize-on")){var n,r;"onpropertychange"in e&&"oninput"in e&&e.addEventListener("keyup",o),window.addEventListener("resize",o),e.addEventListener("input",o),e.addEventListener("autosize.update",o),e.addEventListener("autosize.destroy",function(t){window.removeEventListener("resize",o),e.removeEventListener("input",o),e.removeEventListener("keyup",o),e.removeEventListener("autosize.destroy"),Object.keys(t).forEach(function(o){e.style[o]=t[o]}),e.removeAttribute("data-autosize-on")}.bind(e,{height:e.style.height,overflow:e.style.overflow,overflowY:e.style.overflowY,wordWrap:e.style.wordWrap,resize:e.style.resize})),e.setAttribute("data-autosize-on",!0),e.style.overflow="hidden",e.style.overflowY="hidden",t()}}return"function"!=typeof window.getComputedStyle?function(e){return e}:function(t){return t&&t.length?Array.prototype.forEach.call(t,e):t&&t.nodeName&&e(t),t}}); \ No newline at end of file diff --git a/src/meta/js.js b/src/meta/js.js index 26e8f497ae..bb28642d7f 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -38,6 +38,7 @@ module.exports = function(Meta) { 'public/vendor/xregexp/unicode/unicode-base.js', 'public/vendor/buzz/buzz.min.js', 'public/vendor/mousetrap/mousetrap.js', + 'public/vendor/autosize/autosize.min.js', './node_modules/templates.js/lib/templates.js', 'public/src/utils.js', 'public/src/app.js', From 31368ac97476d3e1038604e0565195bb75a8deff Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 13:43:46 -0400 Subject: [PATCH 739/897] on mobile, resize composer textarea as you type so it doesn't constrain the editable view --- public/src/modules/composer/resize.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index da3e4b0ed6..8f37b0f76e 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -3,7 +3,7 @@ /* globals app, define, config, utils*/ -define('composer/resize', function() { +define('composer/resize', ['autosize'], function(autosize) { var resize = {}, oldPercentage = 0, env; @@ -35,6 +35,8 @@ define('composer/resize', function() { // at this point we should use modernizr if (env === 'sm' || env === 'xs' || window.innerHeight < 480) { $('html').addClass('composing mobile'); + postContainer.percentage = 1; + autosize(postContainer.find('textarea')[0]); } if (config.hasImageUploadPlugin) { From 83f89e95374913dfb2b11657b0956330570824b8 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 15:12:01 -0400 Subject: [PATCH 740/897] made action bar button less restrictive --- public/src/modules/composer.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index ca3b0fd78a..c9f42655c5 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -116,7 +116,7 @@ define('composer', [ } function composerAlert(message) { - $('.action-bar button').removeAttr('disabled'); + $('[data-action="post"]').removeAttr('disabled'); app.alert({ type: 'danger', timeout: 3000, @@ -284,6 +284,7 @@ define('composer', [ tags.init(postContainer, composer.posts[post_uuid]); categoryList.init(postContainer, composer.posts[post_uuid]); + updateTitle(postData, postContainer); activate(post_uuid); @@ -303,12 +304,12 @@ define('composer', [ composer.posts[post_uuid].modified = true; }); - postContainer.on('click', '.action-bar button[data-action="post"]', function() { + postContainer.on('click', '[data-action="post"]', function() { $(this).attr('disabled', true); post(post_uuid); }); - postContainer.on('click', '.action-bar button[data-action="discard"]', function() { + postContainer.on('click', '[data-action="discard"]', function() { if (!composer.posts[post_uuid].modified) { discard(post_uuid); return; @@ -501,7 +502,7 @@ define('composer', [ } function done(err, data) { - $('.action-bar button').removeAttr('disabled'); + $('[data-action="post"]').removeAttr('disabled'); if (err) { if (err.message === '[[error:email-not-confirmed]]') { return app.showEmailConfirmWarning(err); @@ -528,7 +529,7 @@ define('composer', [ composer.active = undefined; taskbar.discard('composer', post_uuid); $('body').css({'margin-bottom': 0}); - $('.action-bar button').removeAttr('disabled'); + $('[data-action="post"]').removeAttr('disabled'); app.toggleNavbar(true); } From 9262c8b9f68b6a05230d954b15ad5410985183bd Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 15:12:16 -0400 Subject: [PATCH 741/897] after selecting a category in composer, auto-select the next field --- public/src/modules/composer/categoryList.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/src/modules/composer/categoryList.js b/public/src/modules/composer/categoryList.js index f246b9ac50..1eb86051bf 100644 --- a/public/src/modules/composer/categoryList.js +++ b/public/src/modules/composer/categoryList.js @@ -35,6 +35,8 @@ define('composer/categoryList', function() { if (postData.cid) { postData.cid = this.value; } + + $('[tabindex=' + (parseInt($(this).attr('tabindex'), 10) + 1) + ']').trigger('focus'); }); }; From 6d4b658579f43b7952cafadf5db5d1d1e56c4bfa Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 16:16:22 -0400 Subject: [PATCH 742/897] using unminified version of autosize --- public/vendor/autosize.js | 146 +++++++++++++++++++++++++ public/vendor/autosize/autosize.min.js | 6 - src/meta/js.js | 2 +- 3 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 public/vendor/autosize.js delete mode 100644 public/vendor/autosize/autosize.min.js diff --git a/public/vendor/autosize.js b/public/vendor/autosize.js new file mode 100644 index 0000000000..54fe82bb56 --- /dev/null +++ b/public/vendor/autosize.js @@ -0,0 +1,146 @@ +/*! + Autosize 2.0.0 + license: MIT + http://www.jacklmoore.com/autosize +*/ +(function (root, factory) { + 'use strict'; + + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define([], factory); + } else if (typeof exports === 'object') { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } else { + // Browser globals (root is window) + root.autosize = factory(); + } +}(this, function () { + function main(ta) { + if (!ta || !ta.nodeName || ta.nodeName !== 'TEXTAREA' || ta.hasAttribute('data-autosize-on')) { return; } + + var maxHeight; + var heightOffset; + + function init() { + var style = window.getComputedStyle(ta, null); + + if (style.resize === 'vertical') { + ta.style.resize = 'none'; + } else if (style.resize === 'both') { + ta.style.resize = 'horizontal'; + } + + // horizontal overflow is hidden, so break-word is necessary for handling words longer than the textarea width + ta.style.wordWrap = 'break-word'; + + // Chrome/Safari-specific fix: + // When the textarea y-overflow is hidden, Chrome/Safari doesn't reflow the text to account for the space + // made available by removing the scrollbar. This workaround will cause the text to reflow. + var width = ta.style.width; + ta.style.width = '0px'; + // Force reflow: + /* jshint ignore:start */ + ta.offsetWidth; + /* jshint ignore:end */ + ta.style.width = width; + + maxHeight = style.maxHeight !== 'none' ? parseFloat(style.maxHeight) : false; + + if (style.boxSizing === 'content-box') { + heightOffset = -(parseFloat(style.paddingTop)+parseFloat(style.paddingBottom)); + } else { + heightOffset = parseFloat(style.borderTopWidth)+parseFloat(style.borderBottomWidth); + } + + adjust(); + } + + function adjust() { + var startHeight = ta.style.height; + var htmlTop = document.documentElement.scrollTop; + var bodyTop = document.body.scrollTop; + + ta.style.height = 'auto'; + + var endHeight = ta.scrollHeight+heightOffset; + + if (maxHeight !== false && maxHeight < endHeight) { + endHeight = maxHeight; + if (ta.style.overflowY !== 'scroll') { + ta.style.overflowY = 'scroll'; + } + } else if (ta.style.overflowY !== 'hidden') { + ta.style.overflowY = 'hidden'; + } + + ta.style.height = endHeight+'px'; + + // prevents scroll-position jumping + document.documentElement.scrollTop = htmlTop; + document.body.scrollTop = bodyTop; + + if (startHeight !== ta.style.height) { + var evt = document.createEvent('Event'); + evt.initEvent('autosize.resized', true, false); + ta.dispatchEvent(evt); + } + } + + // IE9 does not fire onpropertychange or oninput for deletions, + // so binding to onkeyup to catch most of those events. + // There is no way that I know of to detect something like 'cut' in IE9. + if ('onpropertychange' in ta && 'oninput' in ta) { + ta.addEventListener('keyup', adjust); + } + + window.addEventListener('resize', adjust); + ta.addEventListener('input', adjust); + + ta.addEventListener('autosize.update', adjust); + + ta.addEventListener('autosize.destroy', function(style){ + window.removeEventListener('resize', adjust); + ta.removeEventListener('input', adjust); + ta.removeEventListener('keyup', adjust); + ta.removeEventListener('autosize.destroy'); + + Object.keys(style).forEach(function(key){ + ta.style[key] = style[key]; + }); + + ta.removeAttribute('data-autosize-on'); + }.bind(ta, { + height: ta.style.height, + overflow: ta.style.overflow, + overflowY: ta.style.overflowY, + wordWrap: ta.style.wordWrap, + resize: ta.style.resize + })); + + ta.setAttribute('data-autosize-on', true); + ta.style.overflow = 'hidden'; + ta.style.overflowY = 'hidden'; + + init(); + } + + // Do nothing in IE8 or lower + if (typeof window.getComputedStyle !== 'function') { + return function(elements) { + return elements; + }; + } else { + return function(elements) { + if (elements && elements.length) { + Array.prototype.forEach.call(elements, main); + } else if (elements && elements.nodeName) { + main(elements); + } + return elements; + }; + } +})); diff --git a/public/vendor/autosize/autosize.min.js b/public/vendor/autosize/autosize.min.js deleted file mode 100644 index 217ff6eff4..0000000000 --- a/public/vendor/autosize/autosize.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! - Autosize 2.0.0 - license: MIT - http://www.jacklmoore.com/autosize -*/ -!function(e,t){"use strict";"function"==typeof define&&define.amd?define('autosize',t):"object"==typeof exports?module.exports=t():e.autosize=t()}(this,function(){function e(e){function t(){var t=window.getComputedStyle(e,null);"vertical"===t.resize?e.style.resize="none":"both"===t.resize&&(e.style.resize="horizontal"),e.style.wordWrap="break-word";var i=e.style.width;e.style.width="0px",e.offsetWidth,e.style.width=i,n="none"!==t.maxHeight?parseFloat(t.maxHeight):!1,r="content-box"===t.boxSizing?-(parseFloat(t.paddingTop)+parseFloat(t.paddingBottom)):parseFloat(t.borderTopWidth)+parseFloat(t.borderBottomWidth),o()}function o(){var t=e.style.height,o=document.documentElement.scrollTop,i=document.body.scrollTop;e.style.height="auto";var s=e.scrollHeight+r;if(n!==!1&&s>n?(s=n,"scroll"!==e.style.overflowY&&(e.style.overflowY="scroll")):"hidden"!==e.style.overflowY&&(e.style.overflowY="hidden"),e.style.height=s+"px",document.documentElement.scrollTop=o,document.body.scrollTop=i,t!==e.style.height){var d=document.createEvent("Event");d.initEvent("autosize.resized",!0,!1),e.dispatchEvent(d)}}if(e&&e.nodeName&&"TEXTAREA"===e.nodeName&&!e.hasAttribute("data-autosize-on")){var n,r;"onpropertychange"in e&&"oninput"in e&&e.addEventListener("keyup",o),window.addEventListener("resize",o),e.addEventListener("input",o),e.addEventListener("autosize.update",o),e.addEventListener("autosize.destroy",function(t){window.removeEventListener("resize",o),e.removeEventListener("input",o),e.removeEventListener("keyup",o),e.removeEventListener("autosize.destroy"),Object.keys(t).forEach(function(o){e.style[o]=t[o]}),e.removeAttribute("data-autosize-on")}.bind(e,{height:e.style.height,overflow:e.style.overflow,overflowY:e.style.overflowY,wordWrap:e.style.wordWrap,resize:e.style.resize})),e.setAttribute("data-autosize-on",!0),e.style.overflow="hidden",e.style.overflowY="hidden",t()}}return"function"!=typeof window.getComputedStyle?function(e){return e}:function(t){return t&&t.length?Array.prototype.forEach.call(t,e):t&&t.nodeName&&e(t),t}}); \ No newline at end of file diff --git a/src/meta/js.js b/src/meta/js.js index bb28642d7f..177d8b03c8 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -38,7 +38,7 @@ module.exports = function(Meta) { 'public/vendor/xregexp/unicode/unicode-base.js', 'public/vendor/buzz/buzz.min.js', 'public/vendor/mousetrap/mousetrap.js', - 'public/vendor/autosize/autosize.min.js', + 'public/vendor/autosize.js', './node_modules/templates.js/lib/templates.js', 'public/src/utils.js', 'public/src/app.js', From 7b604c0895ba6b318663e8d1ec0931e7d3d6142f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 16:18:40 -0400 Subject: [PATCH 743/897] this prevents autosize from causing the screen from jumping up and down as you type, on android at least @jackmoore this might not the best solution but its working well so far. let me know if you'd like a PR :) --- public/vendor/autosize.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/public/vendor/autosize.js b/public/vendor/autosize.js index 54fe82bb56..645826fcb6 100644 --- a/public/vendor/autosize.js +++ b/public/vendor/autosize.js @@ -8,7 +8,7 @@ if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. - define([], factory); + define('autosize', factory); } else if (typeof exports === 'object') { // Node. Does not work with strict CommonJS, but // only CommonJS-like environments that support module.exports, @@ -24,6 +24,7 @@ var maxHeight; var heightOffset; + var amountOfCR; function init() { var style = window.getComputedStyle(ta, null); @@ -56,6 +57,7 @@ heightOffset = parseFloat(style.borderTopWidth)+parseFloat(style.borderBottomWidth); } + amountOfCR = (ta.value.match(/\n/g) || []).length; adjust(); } @@ -63,6 +65,13 @@ var startHeight = ta.style.height; var htmlTop = document.documentElement.scrollTop; var bodyTop = document.body.scrollTop; + + var newAmountOfCR = (ta.value.match(/\n/g) || []).length; + if (newAmountOfCR === amountOfCR) { + return; + } + + amountOfCR = newAmountOfCR; ta.style.height = 'auto'; @@ -143,4 +152,4 @@ return elements; }; } -})); +})); \ No newline at end of file From 8d313d2f16cdf1cf182089dbd8a489255ad3f502 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 11 Mar 2015 16:34:40 -0400 Subject: [PATCH 744/897] return composing state to normal after discard/posting --- public/src/modules/composer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index c9f42655c5..8a85846b0b 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -531,7 +531,8 @@ define('composer', [ $('body').css({'margin-bottom': 0}); $('[data-action="post"]').removeAttr('disabled'); - app.toggleNavbar(true); + + $('html').removeClass('composing mobile'); } } From a626005570e74bb0fec3ac647c93e80b65249b8b Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Mar 2015 18:04:27 -0400 Subject: [PATCH 745/897] closes #2851 --- src/plugins.js | 32 +++++++------------------------- src/plugins/load.js | 12 +++++------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index 4d384f3714..c63039be67 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -168,7 +168,7 @@ var fs = require('fs'), Plugins.getAll = function(callback) { var url = (nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins?version=' + require('../package.json').version; - + require('request')(url, function(err, res, body) { var plugins = []; @@ -262,9 +262,9 @@ var fs = require('fs'), function(dirs, next) { dirs = dirs.filter(function(dir){ - return dir.startsWith('nodebb-plugin-') || - dir.startsWith('nodebb-widget-') || - dir.startsWith('nodebb-rewards-') || + return dir.startsWith('nodebb-plugin-') || + dir.startsWith('nodebb-widget-') || + dir.startsWith('nodebb-rewards-') || dir.startsWith('nodebb-theme-'); }).map(function(dir){ return path.join(npmPluginPath, dir); @@ -272,11 +272,7 @@ var fs = require('fs'), async.filter(dirs, function(dir, callback){ fs.stat(dir, function(err, stats){ - if (err) { - return callback(false); - } - - callback(stats.isDirectory()); + callback(!err && stats.isDirectory()); }); }, function(plugins){ next(null, plugins); @@ -287,25 +283,11 @@ var fs = require('fs'), var plugins = []; async.each(files, function(file, next) { - var configPath; - async.waterfall([ function(next) { Plugins.loadPluginInfo(file, next); }, function(pluginData, next) { - var packageName = path.basename(file); - - if (!pluginData) { - winston.warn("Plugin `" + packageName + "` is corrupted or invalid. Please check either package.json or plugin.json for errors."); - return next(null, { - id: packageName, - installed: true, - error: true, - active: null - }); - } - Plugins.isActive(pluginData.name, function(err, active) { if (err) { return next(new Error('no-active-state')); @@ -319,12 +301,12 @@ var fs = require('fs'), next(null, pluginData); }); } - ], function(err, config) { + ], function(err, pluginData) { if (err) { return next(); // Silently fail } - plugins.push(config); + plugins.push(pluginData); next(); }); }, function(err) { diff --git a/src/plugins/load.js b/src/plugins/load.js index 89b38fdc64..0637427a12 100644 --- a/src/plugins/load.js +++ b/src/plugins/load.js @@ -14,14 +14,12 @@ module.exports = function(Plugins) { Plugins.loadPlugin = function(pluginPath, callback) { Plugins.loadPluginInfo(pluginPath, function(err, pluginData) { if (err) { + if (err.message === '[[error:parse-error]]') { + return callback(); + } return callback(pluginPath.match('nodebb-theme') ? null : err); } - var staticDir; - if (!pluginData) { - return callback(); - } - versionWarning(pluginData); async.parallel([ @@ -229,9 +227,9 @@ module.exports = function(Plugins) { var pluginDir = pluginPath.split(path.sep); pluginDir = pluginDir[pluginDir.length -1]; - winston.error('[plugins/' + pluginDir + '] Error in plugin.json/package.json! ' + err.message); + winston.error('[plugins/' + pluginDir + '] Error in plugin.json or package.json! ' + err.message); - callback(); + callback(new Error('[[error:parse-error]]')); } }); }; From 076931d5b53ef7effad4af328827f47558661af0 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Mar 2015 18:21:40 -0400 Subject: [PATCH 746/897] fix search tooltip --- public/src/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index f663a3dba9..fdfe7856b3 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -372,7 +372,7 @@ app.cacheBuster = null; if (utils.findBootstrapEnvironment() === 'xs') { return; } - $('#header-menu li [title]').each(function() { + $('#header-menu li a[title]').each(function() { $(this).tooltip({ placement: 'bottom', title: $(this).attr('title') From 5269c2eb9e1e7458c2ab329bbbc850817de12628 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 11 Mar 2015 18:34:26 -0400 Subject: [PATCH 747/897] latest language translations --- public/language/ar/category.json | 2 +- public/language/ar/email.json | 10 +++--- public/language/ar/error.json | 10 +++--- public/language/ar/groups.json | 52 +++++++++++++-------------- public/language/ar/login.json | 6 ++-- public/language/ar/notifications.json | 2 +- public/language/ar/tags.json | 2 +- public/language/bn/tags.json | 2 +- public/language/cs/tags.json | 2 +- public/language/de/error.json | 24 ++++++------- public/language/de/groups.json | 38 ++++++++++---------- public/language/de/login.json | 8 ++--- public/language/de/notifications.json | 2 +- public/language/de/recent.json | 4 +-- public/language/de/search.json | 24 ++++++------- public/language/de/tags.json | 10 +++--- public/language/el/tags.json | 2 +- public/language/en@pirate/tags.json | 2 +- public/language/en_US/tags.json | 2 +- public/language/es/category.json | 2 +- public/language/es/error.json | 16 ++++----- public/language/es/groups.json | 30 ++++++++-------- public/language/es/login.json | 6 ++-- public/language/es/notifications.json | 2 +- public/language/es/recent.json | 2 +- public/language/es/search.json | 10 +++--- public/language/es/tags.json | 2 +- public/language/es/topic.json | 2 +- public/language/et/tags.json | 2 +- public/language/fa_IR/tags.json | 2 +- public/language/fi/tags.json | 2 +- public/language/fr/error.json | 16 ++++----- public/language/fr/groups.json | 24 ++++++------- public/language/fr/login.json | 4 +-- public/language/fr/notifications.json | 2 +- public/language/fr/recent.json | 2 +- public/language/fr/search.json | 10 +++--- public/language/fr/tags.json | 2 +- public/language/he/tags.json | 2 +- public/language/hu/tags.json | 2 +- public/language/id/tags.json | 2 +- public/language/it/tags.json | 2 +- public/language/ja/tags.json | 2 +- public/language/ko/tags.json | 2 +- public/language/lt/tags.json | 2 +- public/language/ms/tags.json | 2 +- public/language/nb/tags.json | 2 +- public/language/nl/tags.json | 2 +- public/language/pl/category.json | 2 +- public/language/pl/error.json | 16 ++++----- public/language/pl/groups.json | 26 +++++++------- public/language/pl/login.json | 6 ++-- public/language/pl/notifications.json | 2 +- public/language/pl/recent.json | 2 +- public/language/pl/search.json | 10 +++--- public/language/pl/tags.json | 2 +- public/language/pl/topic.json | 2 +- public/language/pt_BR/tags.json | 2 +- public/language/ro/tags.json | 2 +- public/language/ru/category.json | 2 +- public/language/ru/error.json | 16 ++++----- public/language/ru/groups.json | 26 +++++++------- public/language/ru/login.json | 4 +-- public/language/ru/notifications.json | 2 +- public/language/ru/recent.json | 2 +- public/language/ru/search.json | 8 ++--- public/language/ru/tags.json | 2 +- public/language/sc/tags.json | 2 +- public/language/sk/tags.json | 2 +- public/language/sv/tags.json | 2 +- public/language/th/tags.json | 2 +- public/language/tr/category.json | 2 +- public/language/tr/error.json | 14 ++++---- public/language/tr/groups.json | 28 +++++++-------- public/language/tr/login.json | 6 ++-- public/language/tr/notifications.json | 2 +- public/language/tr/recent.json | 2 +- public/language/tr/search.json | 10 +++--- public/language/tr/tags.json | 2 +- public/language/tr/topic.json | 2 +- public/language/tr/users.json | 2 +- public/language/vi/category.json | 2 +- public/language/vi/email.json | 10 +++--- public/language/vi/error.json | 2 +- public/language/vi/notifications.json | 2 +- public/language/vi/tags.json | 2 +- public/language/zh_CN/category.json | 2 +- public/language/zh_CN/error.json | 16 ++++----- public/language/zh_CN/tags.json | 2 +- public/language/zh_TW/tags.json | 2 +- 90 files changed, 307 insertions(+), 307 deletions(-) diff --git a/public/language/ar/category.json b/public/language/ar/category.json index b4f3a40f7a..456ba908c2 100644 --- a/public/language/ar/category.json +++ b/public/language/ar/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "موضوع جديد", - "guest-login-post": "Log in to post", + "guest-login-post": "المرجو تسجيل الدخول أوَّلا", "no_topics": "لا توجد مواضيع في هذه الفئةلم لا تحاول إنشاء موضوع؟
    ", "browsing": "تصفح", "no_replies": "لم يرد أحد", diff --git a/public/language/ar/email.json b/public/language/ar/email.json index 98cb9c0b0d..d295a3a70f 100644 --- a/public/language/ar/email.json +++ b/public/language/ar/email.json @@ -9,9 +9,9 @@ "reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة السرالخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.", "reset.text2": "لمواصلة طلب إعاة تعيين كلمة السر، المرجو تتبع هذا الرابط.", "reset.cta": "انقر هنا لإعادة تعيين كلمة السر الخاصة بك.", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", - "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "reset.notify.subject": "تم تغيير كلمة المرور بنجاح", + "reset.notify.text1": "نحيطك علما أن كلمة مرورك قد تم تغييرها في %1", + "reset.notify.text2": "إن لم يكن لديك علم بهذا، المرجو إشعار مدبر النظام بأسرع مايمكن.", "digest.notifications": "لديك تنبيهات غير مقروءة من طرف %1:", "digest.latest_topics": "آخر المستجدات من %1", "digest.cta": "انقر هنا لمشاهدة %1", @@ -20,8 +20,8 @@ "notif.chat.subject": "هناك محادثة جديدة من %1", "notif.chat.cta": "انقر هنا لمتابعة المحادثة", "notif.chat.unsub.info": "تم إرسال هذا الإشعار بوجودة محادثة جديدة وفقا لخيارات تسجيلك.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "انقر هنا لقراءة الموضوع بأكمله", + "notif.post.unsub.info": "تم إشعارك بهذه المشاركة بناءً على الخيارات التي سبق وأن حددتها.", "test.text1": "هذه رسالة تجريبية للتأكد من صحة إعدادت الرسائل الإلكترونية في منتدى NodeBB خاصتك.", "unsub.cta": "انقر هنا لتغيير تلك الإعدادات", "closing": "شكرًا لك!" diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 51993e5f98..e5d2f8c856 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -18,9 +18,9 @@ "username-taken": "اسم المستخدم مأخوذ", "email-taken": "البريد الالكتروني مأخوذ", "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "email-not-confirmed-chat": "لايمكنك الدردشة إلا بعد تفعيل بريدك الإلكتروني", + "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.", + "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.", "username-too-short": "اسم المستخدم قصير.", "username-too-long": "اسم المستخدم طويل", "user-banned": "المستخدم محظور", @@ -35,10 +35,10 @@ "no-emailers-configured": "لا يمكن إرسال رسالة إلكترونية تجريبية لعدم وجود قوالب خاصة بالرسائل الإلكترونية،", "category-disabled": "قائمة معطلة", "topic-locked": "الموضوع مقفول", - "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", + "post-edit-duration-expired": "لايمكنك تعديل مشاركتك بعد مرور أكثر من %1 ثانية على كتابتها.", "still-uploading": "الرجاء انتظار الرفع", "content-too-short": "المرجو إدخال موضوع أطول من هذا. يجب أن تتوفر المواضيع على %1 حروف على الأقل.", - "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", + "content-too-long": "لا يمكن للمشاركات أن تتجاوز %1 حرفًا/أحرف.", "title-too-short": "المرجو إدخال عنوان أطول من هذا. يجب أن تتوفر العناوين على %1 حروف على الأقل.", "title-too-long": "المرجو إدخال عنوان أقصر من هذا. يجب ألا تتجاوز العناوين %1 حرفًا.", "too-many-posts": "يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية - المرجو الانتظار قليلا.", diff --git a/public/language/ar/groups.json b/public/language/ar/groups.json index 0975ca84ca..1c6a8f90e5 100644 --- a/public/language/ar/groups.json +++ b/public/language/ar/groups.json @@ -1,34 +1,34 @@ { "groups": "المجموعات", "view_group": "معاينة المجموعة", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "pending.accept": "Accept", - "pending.reject": "Reject", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", + "owner": "مالك المجموعة", + "new_group": "أنشئ مجموعة جديدة", + "no_groups_found": "لاوجدود لمجموعات يمكن معاينتها", + "pending.accept": "موافق", + "pending.reject": "رفض", + "cover-instructions": "اسحب وأسقِط صورة، اسحبها للموضع المرغوب، وانقر على حفظ", + "cover-change": "تغيير", + "cover-save": "حفظ", + "cover-saving": "جاري الحفظ", "details.title": "تفاصيل المجموعة", "details.members": "لائحة الأعضاء", - "details.pending": "Pending Members", + "details.pending": "المستخدمون في الانتظار", "details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة", "details.latest_posts": "آخر المشاركات", - "details.private": "Private", - "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", - "details.owner_options": "Group Administration", - "details.group_name": "Group Name", - "details.description": "Description", - "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", - "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", - "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", - "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "details.private": "خاص", + "details.grant": "منح/سحب المِلكية", + "details.kick": "طرد", + "details.owner_options": "تدبير المجموعة", + "details.group_name": "اسم المجموعة", + "details.description": "الوصف", + "details.badge_preview": "معاينة الوسام", + "details.change_icon": "تغيير الأيقونة", + "details.change_colour": "تغيير اللون", + "details.badge_text": "نص الوسام", + "details.userTitleEnabled": "إظهار الوسام", + "details.private_help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها", + "details.hidden": "مخفي", + "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة يدوية.", + "event.updated": "تم تحديث بيانات المجموعة", + "event.deleted": "تم حذف المجموعة %1" } \ No newline at end of file diff --git a/public/language/ar/login.json b/public/language/ar/login.json index f6575cf40a..878a32533c 100644 --- a/public/language/ar/login.json +++ b/public/language/ar/login.json @@ -1,7 +1,7 @@ { - "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username-email": "اسم المستخدم / البريد الإلكتروني", + "username": "اسم المستخدم", + "email": "البريد الإلكتروني", "remember_me": "تذكرني؟", "forgot_password": "نسيت كلمة المرور؟", "alternative_logins": "تسجيلات الدخول البديلة", diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 711a1a4450..98890331a5 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -2,7 +2,7 @@ "title": "تنبيهات", "no_notifs": "ليس لديك أية تنبيهات جديدة", "see_all": "معاينة كل التنبيهات", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "اجعل كل التنبيهات مقروءة", "back_to_home": "عودة إلى %1", "outgoing_link": "رابط خارجي", "outgoing_link_message": "أنت تغادر %1 حاليا.", diff --git a/public/language/ar/tags.json b/public/language/ar/tags.json index f2eccbd1c0..004681a32a 100644 --- a/public/language/ar/tags.json +++ b/public/language/ar/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "لاوجود لمواضيع تحمل هذا الوسم.", "tags": "بطاقات", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "أدخل البطاقات...", "no_tags": "لاتوجد هناك بطاقات بعد." } \ No newline at end of file diff --git a/public/language/bn/tags.json b/public/language/bn/tags.json index 86bbe70e75..e99c0f835d 100644 --- a/public/language/bn/tags.json +++ b/public/language/bn/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "এই ট্যাগ সম্বলিত কোন টপিক নেই", "tags": "ট্যাগসমূহ", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "ট্যাগ বসান", "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই" } \ No newline at end of file diff --git a/public/language/cs/tags.json b/public/language/cs/tags.json index 8fc07c7da2..f2003f978a 100644 --- a/public/language/cs/tags.json +++ b/public/language/cs/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Není zde žádné téma s tímto tagem.", "tags": "Tagy", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Vložte tagy ...", "no_tags": "Zatím tu není žádný tag." } \ No newline at end of file diff --git a/public/language/de/error.json b/public/language/de/error.json index a05417d878..f5c852c661 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -19,12 +19,12 @@ "email-taken": "Die E-Mail-Adresse ist bereits vergeben", "email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.", "email-not-confirmed-chat": "Der Chat ist deaktiviert bis Du deine E-Mail bestätigt hast", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "Dieses Forum setzt E-Mail-Bestätigung voraus, bitte klick hier um eine E-Mail-Adresse einzugeben", + "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal", "username-too-short": "Benutzername ist zu kurz", "username-too-long": "Der Benutzername ist zu lang", "user-banned": "Der Benutzer ist gesperrt", - "user-too-new": "Entschuldigung, du musst %1 Sekunden warten, bevor du deinen ersten Beitrag verfassen kannst!", + "user-too-new": "Tut uns leid, du musst %1 Sekunden warten, bevor du deinen ersten Beitrag verfassen kannst!", "no-category": "Die Kategorie existiert nicht", "no-topic": "Das Thema existiert nicht", "no-post": "Der Beitrag existiert nicht", @@ -35,7 +35,7 @@ "no-emailers-configured": "Es wurde keine E-Mail-Plugins geladen, weshalb eine Test-E-Mail nicht gesendet werden konnte.", "category-disabled": "Kategorie ist deaktiviert", "topic-locked": "Thema ist gesperrt", - "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", + "post-edit-duration-expired": "Du darfst Beiträge lediglich innerhalb von %1 Sekunden nach dem erstellen editieren", "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.", "content-too-short": "Bitte gib einen längeren Beitrag ein. Beiträge sollten mindestens %1 Zeichen enthalten.", "content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht mehr als %1 Zeichen enthalten.", @@ -43,16 +43,16 @@ "title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.", "too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen - bitte warte, bevor du einen neuen Beitrag erstellst", "too-many-posts-newbie": "Als neuer Benutzer kannst du nur alle %1 Sekunden einen Beitrag verfassen, bis du %2 Reputationspunkte hast - Bitte warte etwas, bevor du erneut einen Beitrag verfasst", - "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", - "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", - "file-too-big": "Die maximale Dateigröße beträgt %1 kbs - bitte lade eine kleinere Datei hoch", - "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten.", + "tag-too-short": "Bitte gib ein längeres Stichwort an. Stichwörter sollten aus mindestens %1 Zeichen bestehen.", + "tag-too-long": "Bitte gib ein kürzeres Stichwort ein. Stichwörter können nicht länger als %1 Zeichen sein.", + "file-too-big": "Die maximale Dateigröße beträgt %1 kB - bitte lade eine kleinere Datei hoch", + "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten", "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten", "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt", "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!", "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1", "invalid-image-extension": "Ungültige Dateinamenerweiterung", - "invalid-file-type": "Invalid file type. Allowed types are: %1", + "invalid-file-type": "Ungültiger Dateityp. Erlaubte Typen sind: %1", "group-name-too-short": "Gruppenname zu kurz", "group-already-exists": "Gruppe existiert bereits", "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern", @@ -75,7 +75,7 @@ "not-enough-reputation-to-flag": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden", "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.", "registration-error": "Registrierungsfehler", - "parse-error": "Ein Fehler ist beim Parsen der Server-Antwort aufgetreten", - "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "parse-error": "Beim auswerten der Serverantwort ist etwas schiefgegangen", + "wrong-login-type-email": "Bitte nutze deine E-Mail-Adresse zum einloggen", + "wrong-login-type-username": "Bitte nutze deinen Benutzernamen zum einloggen" } \ No newline at end of file diff --git a/public/language/de/groups.json b/public/language/de/groups.json index 3f81c9bfea..52fa359f53 100644 --- a/public/language/de/groups.json +++ b/public/language/de/groups.json @@ -4,31 +4,31 @@ "owner": "Gruppenbesitzer", "new_group": "Neue Gruppe erstellen", "no_groups_found": "Es sind keine Gruppen vorhanden", - "pending.accept": "Accept", - "pending.reject": "Reject", - "cover-instructions": "Drag and Drop ein Foto, bewege es in Position, dann drücke Speichern", + "pending.accept": "Annehmen", + "pending.reject": "Abweisen", + "cover-instructions": "Foto auf eine Position bewegen, und Speichern drücken", "cover-change": "Ändern", "cover-save": "Speichern", - "cover-saving": "Am speichern", + "cover-saving": "Speicherung läuft", "details.title": "Gruppendetails", "details.members": "Mitgliederliste", - "details.pending": "Ausstehende Mitglieder", + "details.pending": "Mitglieder in Schwebe", "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.", - "details.latest_posts": "Aktuelle Beiträge", - "details.private": "Private", - "details.grant": "Gewähre/Widerrufe Besitz", + "details.latest_posts": "Neueste Beiträge", + "details.private": "Privat", + "details.grant": "Gewähre/widerrufe Besitz", "details.kick": "Kick", "details.owner_options": "Gruppenadministration", - "details.group_name": "Group Name", - "details.description": "Description", - "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", - "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", - "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", - "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", + "details.group_name": "Gruppenname", + "details.description": "Beschreibung", + "details.badge_preview": "Abzeichenvorschau", + "details.change_icon": "Symbol ändern", + "details.change_colour": "Farbe ändern", + "details.badge_text": "Text für das Abzeichen", + "details.userTitleEnabled": "Abzeichen anzeigen", + "details.private_help": "Wenn aktiviert, setzt ein Gruppenbeitritt die Zustimmung eines Gruppenbesitzers voraus", + "details.hidden": "Versteckt", + "details.hidden_help": "Wenn aktiviert, wird diese Gruppe in der Gruppenliste nicht zu finden sein, und Benutzer werden manuell eingeladen werden müssen.", "event.updated": "Gruppendetails wurden aktualisiert", - "event.deleted": "Die Gruppe \"% 1\" wurde gelöscht" + "event.deleted": "Die Gruppe \"%1\" wurde gelöscht." } \ No newline at end of file diff --git a/public/language/de/login.json b/public/language/de/login.json index 4099772d0d..33d68113ca 100644 --- a/public/language/de/login.json +++ b/public/language/de/login.json @@ -1,10 +1,10 @@ { - "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username-email": "Benutzername / E-Mail-Adresse", + "username": "Benutzername", + "email": "E-Mail", "remember_me": "Eingeloggt bleiben?", "forgot_password": "Passwort vergessen?", - "alternative_logins": "Login Alternativen", + "alternative_logins": "Alternative Logins", "failed_login_attempt": " Anmeldeversuch fehlgeschlagen, versuche es erneut.", "login_successful": "Du hast dich erfolgreich eingeloggt!", "dont_have_account": "Sie haben noch kein Konto?" diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index f032f7151e..f500eefe5b 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -2,7 +2,7 @@ "title": "Benachrichtigungen", "no_notifs": "Du hast keine neuen Benachrichtigungen", "see_all": "Alle Benachrichtigungen ansehen", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Alle Benachrichtigungen als gelesen markieren", "back_to_home": "Zurück zu %1", "outgoing_link": "Externer Link", "outgoing_link_message": "Du verlässt nun %1.", diff --git a/public/language/de/recent.json b/public/language/de/recent.json index 3fb6fc7ea7..e64846b674 100644 --- a/public/language/de/recent.json +++ b/public/language/de/recent.json @@ -6,7 +6,7 @@ "year": "Jahr", "alltime": "Gesamter Zeitraum", "no_recent_topics": "Es gibt keine aktuellen Themen.", - "no_popular_topics": "There are no popular topics.", + "no_popular_topics": "Es gibt keine beliebten Themen.", "there-is-a-new-topic": "Es gibt ein neues Thema.", "there-is-a-new-topic-and-a-new-post": "Es gibt ein neues Thema und einen neuen Beitrag.", "there-is-a-new-topic-and-new-posts": "Es gibt ein neues Thema und %1 neue Beiträge.", @@ -15,5 +15,5 @@ "there-are-new-topics-and-new-posts": "Es gibt %1 neue Themen und %2 neue Beiträge.", "there-is-a-new-post": "Es gibt einen neuen Beitrag.", "there-are-new-posts": "Es gibt %1 neue Beiträge.", - "click-here-to-reload": "Hier klicken um neu zu laden." + "click-here-to-reload": "Hier klicken um zu aktualisieren." } \ No newline at end of file diff --git a/public/language/de/search.json b/public/language/de/search.json index 29a51edbe3..b803315a9d 100644 --- a/public/language/de/search.json +++ b/public/language/de/search.json @@ -1,5 +1,5 @@ { - "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)", + "results_matching": "%1 Ergebnis(se) stimmen mit \"%2\" überein, (%3 Sekunden)", "no-matches": "Keine Ergebnisse gefunden", "in": "In", "by": "Bei", @@ -8,13 +8,13 @@ "posted-by": "Geschrieben von", "in-categories": "In Kategorien", "search-child-categories": "Suche in Unterkategorien", - "reply-count": "Antwort Anzahl", + "reply-count": "Anzahl Antworten", "at-least": "Mindestens", "at-most": "Höchstens", - "post-time": "Beitrags Zeit", + "post-time": "Verfaßt am", "newer-than": "Neuer als", "older-than": "Älter als", - "any-date": "Jeder Zeitpunkt", + "any-date": "Beliebiger Zeitpunkt", "yesterday": "Gestern", "one-week": "Eine Woche", "two-weeks": "Zwei Wochen", @@ -23,18 +23,18 @@ "six-months": "Sechs Monate", "one-year": "Ein Jahr", "sort-by": "Sortieren nach", - "last-reply-time": "Letzter Antwort Zeitpunkt", + "last-reply-time": "Zeitpunkt der letzten Antwort", "topic-title": "Thementitel", - "number-of-replies": "Anzahl von Antworten", + "number-of-replies": "Anzahl an Antworten", "number-of-views": "Anzahl der Aufrufe", - "topic-start-date": "Thema Startdatum", + "topic-start-date": "Erstelldatum des Themas", "username": "Benutzername", "category": "Kategorie", "descending": "In absteigender Reihenfolge", "ascending": "In aufsteigender Reihenfolge", - "save-preferences": "Save preferences", - "clear-preferences": "Clear preferences", - "search-preferences-saved": "Search preferences saved", - "search-preferences-cleared": "Search preferences cleared", - "show-results-as": "Show results as" + "save-preferences": "Einstellungen speichern", + "clear-preferences": "Einstellungen löschen", + "search-preferences-saved": "Sucheinstellungen gespeichert", + "search-preferences-cleared": "Sucheinstellungen gelöscht", + "show-results-as": "Ergebnisse anzeigen als" } \ No newline at end of file diff --git a/public/language/de/tags.json b/public/language/de/tags.json index 898759f0b5..9c40b9cc9e 100644 --- a/public/language/de/tags.json +++ b/public/language/de/tags.json @@ -1,7 +1,7 @@ { - "no_tag_topics": "Es gibt keine Themen mit diesem Tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", - "enter_tags_here_short": "Gib Tags ein...", - "no_tags": "Es gibt bisher keine Tags." + "no_tag_topics": "Es gibt keine Themen mit diesem Stichwort.", + "tags": "Stichwörter", + "enter_tags_here": "Gib hier Stichwörter ein. %1-%2 Zeichen. Drücke Enter nach jedem Stichwort.", + "enter_tags_here_short": "Gib Stichwörter ein...", + "no_tags": "Es gibt bisher keine Stichwörter." } \ No newline at end of file diff --git a/public/language/el/tags.json b/public/language/el/tags.json index e3776579ed..4264ed78aa 100644 --- a/public/language/el/tags.json +++ b/public/language/el/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Δεν υπάρχουν θέματα με αυτή την ετικέτα.", "tags": "Ετικέτες", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Εισαγωγή ετικετών...", "no_tags": "Δεν υπάρχουν ακόμα ετικέτες." } \ No newline at end of file diff --git a/public/language/en@pirate/tags.json b/public/language/en@pirate/tags.json index c416d8d4ec..aa9f14c70c 100644 --- a/public/language/en@pirate/tags.json +++ b/public/language/en@pirate/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/en_US/tags.json b/public/language/en_US/tags.json index c416d8d4ec..aa9f14c70c 100644 --- a/public/language/en_US/tags.json +++ b/public/language/en_US/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/es/category.json b/public/language/es/category.json index ec2fdadcdc..8c6b0fd5ca 100644 --- a/public/language/es/category.json +++ b/public/language/es/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Nuevo tema", - "guest-login-post": "Log in to post", + "guest-login-post": "Acceder para poder escribir un mensaje", "no_topics": "No hay temas en esta categoría.
    ¿Por que no te animas y publicas uno?", "browsing": "viendo ahora", "no_replies": "Nadie ha respondido aún", diff --git a/public/language/es/error.json b/public/language/es/error.json index 1fd31a5b00..8be673f77d 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -19,8 +19,8 @@ "email-taken": "Correo electrónico ocupado", "email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.", "email-not-confirmed-chat": "No puedes hacer uso del chat hasta que confirmes tu email", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "Este foro requiere confirmación de su email, por favor pulse aquí para introducir un email", + "email-confirm-failed": "No se ha podido confirmar su email, por favor inténtelo de nuevo más tarde.", "username-too-short": "Nombre de usuario es demasiado corto", "username-too-long": "Nombre de usuario demasiado largo", "user-banned": "Usuario baneado", @@ -35,7 +35,7 @@ "no-emailers-configured": "No se ha cargado ningún plugin de email, así que no se pudo enviar el email de prueba.", "category-disabled": "Categoría deshabilitada", "topic-locked": "Tema bloqueado", - "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", + "post-edit-duration-expired": "Sólo puedes editar mensajes durante %1 segundos después de haberlo escrito", "still-uploading": "Por favor, espera a que terminen las subidas.", "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caracteres.", "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caracteres.", @@ -43,8 +43,8 @@ "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.", "too-many-posts": "Solo puedes publicar una vez cada %1 segundos - por favor espere antes de volver a publicar", "too-many-posts-newbie": "Como nuevo usuario, solo puedes publicar una vez cada %1 segundos hasta hayas ganado una reputación de %2 - por favor espere antes de volver a publicar", - "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", - "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", + "tag-too-short": "Por favor introduce una etiqueta más larga. Las etiquetas deben contener por lo menos %1 caracteres", + "tag-too-long": "Por favor introduce una etiqueta más pequeña. Las etiquetas no pueden exceder los %1 caracteres", "file-too-big": "El tamaño de fichero máximo es de %1 kbs - por favor, suba un fichero más pequeño", "cant-vote-self-post": "No puedes votar tus propios posts", "already-favourited": "Ya ha marcado esta publicación como favorita", @@ -52,7 +52,7 @@ "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!", "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1", "invalid-image-extension": "Extensión de imagen inválida", - "invalid-file-type": "Invalid file type. Allowed types are: %1", + "invalid-file-type": "Tipo de fichero inválido. Los tipos permitidos son: %1", "group-name-too-short": "Nombre del grupo es demasiado corto.", "group-already-exists": "El grupo ya existe.", "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.", @@ -76,6 +76,6 @@ "reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.", "registration-error": "Error de registro", "parse-error": "Algo ha ido mal mientras se parseaba la respuesta del servidor", - "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "wrong-login-type-email": "Por favor emplea tu email para acceder", + "wrong-login-type-username": "Por favor introduce tu nombre de usuario para acceder" } \ No newline at end of file diff --git a/public/language/es/groups.json b/public/language/es/groups.json index 112cce2994..22a80ba19a 100644 --- a/public/language/es/groups.json +++ b/public/language/es/groups.json @@ -4,8 +4,8 @@ "owner": "Propietario del Grupo", "new_group": "Crear Nuevo Grupo", "no_groups_found": "No hay grupos que ver", - "pending.accept": "Accept", - "pending.reject": "Reject", + "pending.accept": "Aceptar", + "pending.reject": "Rechazar", "cover-instructions": "Arrastra y suelta una foto, arrastra a la posición, y pulsa Guardar ", "cover-change": "Cambiar", "cover-save": "Guardar", @@ -15,20 +15,20 @@ "details.pending": "Miembros Pendientes", "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.", "details.latest_posts": "Últimas Publicaciones", - "details.private": "Private", - "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", + "details.private": "Privado", + "details.grant": "Conceder/Rescindir Propiedad", + "details.kick": "Expulsar", "details.owner_options": "Administración De Grupo", - "details.group_name": "Group Name", - "details.description": "Description", - "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", - "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", - "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", - "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", + "details.group_name": "Nombre de Grupo", + "details.description": "Descripción", + "details.badge_preview": "Previsualización de Insignia", + "details.change_icon": "Cambiar Icono", + "details.change_colour": "Cambiar Color", + "details.badge_text": "Texto de Insignia", + "details.userTitleEnabled": "Mostrar Insignia", + "details.private_help": "Si está habilitado, entrar en los grupos requiere aprobación de sus propietarios", + "details.hidden": "Oculto", + "details.hidden_help": "Si está habilitado, este grupo no aparecerá en los listados de grupos, y los usuarios tendrán que ser invitados manualmente", "event.updated": "Los detalles del grupo han sido actualizados", "event.deleted": "El grupo \"%1\" ha sido eliminado" } \ No newline at end of file diff --git a/public/language/es/login.json b/public/language/es/login.json index e30f15dff4..448ce31f43 100644 --- a/public/language/es/login.json +++ b/public/language/es/login.json @@ -1,7 +1,7 @@ { - "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username-email": "Usuario / Email", + "username": "Usuario", + "email": "Correo Electrónico", "remember_me": "¿Recordarme?", "forgot_password": "¿Olvidaste tu contraseña?", "alternative_logins": "Métodos alternativos", diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 630e9376fe..3a9e36bccb 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -2,7 +2,7 @@ "title": "Notificaciones", "no_notifs": "No tiene nuevas notificaciones", "see_all": "Ver todas las notificaciones", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Marcar todas las notificaciones cómo leídas", "back_to_home": "Volver a %1", "outgoing_link": "Enlace externo", "outgoing_link_message": "Ahora estás saliendo de %1.", diff --git a/public/language/es/recent.json b/public/language/es/recent.json index 1ff9669e51..fbfb6238c0 100644 --- a/public/language/es/recent.json +++ b/public/language/es/recent.json @@ -6,7 +6,7 @@ "year": "Año", "alltime": "Siempre", "no_recent_topics": "No hay publicaciones recientes.", - "no_popular_topics": "There are no popular topics.", + "no_popular_topics": "No hay tópicos populares", "there-is-a-new-topic": "Hay una nueva publicación.", "there-is-a-new-topic-and-a-new-post": "hay una nueva publicación y un nuevo mensaje.", "there-is-a-new-topic-and-new-posts": "Hay una nueva publicación y %1 nuevos mensajes.", diff --git a/public/language/es/search.json b/public/language/es/search.json index 2378430561..135144c2b3 100644 --- a/public/language/es/search.json +++ b/public/language/es/search.json @@ -32,9 +32,9 @@ "category": "Categoría", "descending": "En orden descendente", "ascending": "En orden ascendente", - "save-preferences": "Save preferences", - "clear-preferences": "Clear preferences", - "search-preferences-saved": "Search preferences saved", - "search-preferences-cleared": "Search preferences cleared", - "show-results-as": "Show results as" + "save-preferences": "Guardar preferencias", + "clear-preferences": "Descartar preferencias", + "search-preferences-saved": "Preferencias de búsqueda guardadas", + "search-preferences-cleared": "Preferencias de búsqueda descartadas", + "show-results-as": "Mostrar resultados como" } \ No newline at end of file diff --git a/public/language/es/tags.json b/public/language/es/tags.json index 260ff42eef..dc1f26a0ba 100644 --- a/public/language/es/tags.json +++ b/public/language/es/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "No hay temas con esta etiqueta.", "tags": "Etiquetas", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Introduce las etiquetas aquí. %1-%2 caracteres. Presiona enter después de cada etiqueta.", "enter_tags_here_short": "Introduzca las etiquetas...", "no_tags": "Aún no hay etiquetas." } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index 576220f99d..1938b05c7d 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -12,7 +12,7 @@ "notify_me": "Serás notificado cuando haya nuevas respuestas en este tema", "quote": "Citar", "reply": "Responder", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Accede para responder", "edit": "Editar", "delete": "Borrar", "purge": "Purgar", diff --git a/public/language/et/tags.json b/public/language/et/tags.json index 87b8332fad..5f63e2b3e7 100644 --- a/public/language/et/tags.json +++ b/public/language/et/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Teemasid, mis sisaldaksid seda märksõna, ei eksisteeri.", "tags": "Märksõnad", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Sisesta märksõnu...", "no_tags": "Siin ei ole veel ühtegi märksõna." } \ No newline at end of file diff --git a/public/language/fa_IR/tags.json b/public/language/fa_IR/tags.json index 26a393396b..82e477f4cc 100644 --- a/public/language/fa_IR/tags.json +++ b/public/language/fa_IR/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "جُستاری با این برچسب وجود ندارد.", "tags": "برچسب‌ها", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "هنوز برچسبی وجود ندارد." } \ No newline at end of file diff --git a/public/language/fi/tags.json b/public/language/fi/tags.json index 35903730b2..3d1cf1271b 100644 --- a/public/language/fi/tags.json +++ b/public/language/fi/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Ei viimeisimpiä aiheita tällä tagilla.", "tags": "Tagit", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Syötä tagit...", "no_tags": "Ei vielä yhtään tagia." } \ No newline at end of file diff --git a/public/language/fr/error.json b/public/language/fr/error.json index f6354486ff..51f03aa33f 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -19,8 +19,8 @@ "email-taken": "Email déjà utilisé", "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.", "email-not-confirmed-chat": "Vous ne pouver discuter tant que votre email n'est pas confirmé", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "Ce forum requiert une vérification de votre adresse email. Veuillez cliquer ici pour entrer une adresse.", + "email-confirm-failed": "Votre adresse email n'a pas pu être vérifiée. Veuillez ré-essayer plus tard.", "username-too-short": "Nom d'utilisateur trop court", "username-too-long": "Nom d'utilisateur trop long", "user-banned": "Utilisateur banni", @@ -35,7 +35,7 @@ "no-emailers-configured": "Un email de test n'a pas pu être envoyé car aucun plugin de gestion des emails n'était chargé", "category-disabled": "Catégorie désactivée", "topic-locked": "Sujet verrouillé", - "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", + "post-edit-duration-expired": "Vous ne pouvez modifier un post que %1 secondes après l'avoir posté.", "still-uploading": "Veuillez patienter pendant le téléchargement.", "content-too-short": "Veuillez entrer un message plus long. %1 caractères minimum.", "content-too-long": "Veuillez poster un message plus cours. Les messages ne peuvent être plus long que %1 caractères.", @@ -43,8 +43,8 @@ "title-too-long": "Veuillez entrer un titre plus court. Les titres ne peuvent excéder %1 caractères.", "too-many-posts": "Vous ne pouvez poster que toutes les %1 secondes.", "too-many-posts-newbie": "En tant que nouvel utilisateur, vous ne pouvez poster que toutes les %1 secondes jusqu'à ce que vous obteniez une réputation de %2 - patientez avant de publier de nouveau. ", - "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", - "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", + "tag-too-short": "Veuillez entrer un mot-clé plus long. Les mots-clés devraient contenir au moins %1 caractères.", + "tag-too-long": "Veuillez entrer un mot-clé plus court. Les mot-clés ne peuvent faire plus de %1 caractères.", "file-too-big": "La taille maximum des fichiers est de %1 kbs.", "cant-vote-self-post": "Vous ne pouvez pas voter pour vos propres messages", "already-favourited": "Vous avez déjà mis ce message en favoris", @@ -52,7 +52,7 @@ "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !", "invalid-image-type": "Type d'image invalide. Les types autorisés sont: %1", "invalid-image-extension": "Extension d'image invalide", - "invalid-file-type": "Invalid file type. Allowed types are: %1", + "invalid-file-type": "Type de fichier non valide. Les types autorisés sont : %1", "group-name-too-short": "Nom de groupe trop court", "group-already-exists": "Ce groupe existe déjà", "group-name-change-not-allowed": "Modification du nom de groupe non permise", @@ -76,6 +76,6 @@ "reload-failed": "NodeBB a rencontré un problème lors du rechargement : \"% 1\" . NodeBB continuera de fonctionner côté client, même si vous devez annuler ce que vous avez fait juste avant de recharger .", "registration-error": "Erreur d'enregistrement", "parse-error": "Une erreur est survenue en analysant la réponse du serveur", - "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "wrong-login-type-email": "Veuillez utiliser votre adresse email pour vous connecter", + "wrong-login-type-username": "Veuillez utiliser votre identifiant pour vous connecter" } \ No newline at end of file diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json index 03b25aebc8..ce980d472e 100644 --- a/public/language/fr/groups.json +++ b/public/language/fr/groups.json @@ -4,8 +4,8 @@ "owner": "Propriétaire du groupe", "new_group": "Créer un nouveau groupe", "no_groups_found": "Il n'y a aucun groupe", - "pending.accept": "Accept", - "pending.reject": "Reject", + "pending.accept": "Accepter", + "pending.reject": "Refuser", "cover-instructions": "Glissez-déposez une image, ajustez la position, et cliquez sur Enregistrer", "cover-change": "Modifier", "cover-save": "Enregistrer", @@ -15,20 +15,20 @@ "details.pending": "Membres en attente", "details.has_no_posts": "Les membres de ce groupe n'ont envoyé aucun message.", "details.latest_posts": "Derniers messages", - "details.private": "Private", + "details.private": "Privé", "details.grant": "Promouvoir/rétrograder comme propriétaire", "details.kick": "Exclure", "details.owner_options": "Administration du groupe", - "details.group_name": "Group Name", + "details.group_name": "Nom du groupe", "details.description": "Description", - "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", - "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", - "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", - "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", + "details.badge_preview": "Aperçu du badge", + "details.change_icon": "Modifier l'icône", + "details.change_colour": "Modifier la couleur", + "details.badge_text": "Texte du badge", + "details.userTitleEnabled": "Afficher le badge", + "details.private_help": "Si cette case est cochée, rejoindre un groupe nécessite l'accord d'un propriétaire du groupe.", + "details.hidden": "Masqué", + "details.hidden_help": "Si cette case est cochée, ce groupe n'est pas affiché dans la liste des groupes, et les utilisateurs devront être invités manuellement.", "event.updated": "Les détails du groupe ont été mis à jour", "event.deleted": "Le groupe é%1\" a été supprimé" } \ No newline at end of file diff --git a/public/language/fr/login.json b/public/language/fr/login.json index b34dda64b5..6470717691 100644 --- a/public/language/fr/login.json +++ b/public/language/fr/login.json @@ -1,6 +1,6 @@ { - "username-email": "Username / Email", - "username": "Username", + "username-email": "Identifiant ou email", + "username": "Identifiant", "email": "Email", "remember_me": "Se souvenir de moi ?", "forgot_password": "Mot de passe oublié ?", diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index 139b0a30da..e6c533a20e 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -2,7 +2,7 @@ "title": "Notifications", "no_notifs": "Vous n'avez aucune notification", "see_all": "Voir toutes les notifications.", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Marquer toutes les notifications comme lues", "back_to_home": "Revenir à %1", "outgoing_link": "Lien sortant", "outgoing_link_message": "Vous quittez %1.", diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json index bd3b216df0..6103856ee0 100644 --- a/public/language/fr/recent.json +++ b/public/language/fr/recent.json @@ -6,7 +6,7 @@ "year": "An", "alltime": "Toujours", "no_recent_topics": "Il n'y a aucun sujet récent.", - "no_popular_topics": "There are no popular topics.", + "no_popular_topics": "Il n'y a pas de sujet populaire.", "there-is-a-new-topic": "Il y a un nouveau sujet.", "there-is-a-new-topic-and-a-new-post": "Il y a un nouveau sujet et un nouveau message.", "there-is-a-new-topic-and-new-posts": "Il y a un nouveau sujet et %1 nouveaux messages.", diff --git a/public/language/fr/search.json b/public/language/fr/search.json index cd5f207136..f05eec953d 100644 --- a/public/language/fr/search.json +++ b/public/language/fr/search.json @@ -32,9 +32,9 @@ "category": "Catégorie", "descending": "Par ordre décroissant", "ascending": "Par ordre croissant", - "save-preferences": "Save preferences", - "clear-preferences": "Clear preferences", - "search-preferences-saved": "Search preferences saved", - "search-preferences-cleared": "Search preferences cleared", - "show-results-as": "Show results as" + "save-preferences": "Enregistrer les préférences", + "clear-preferences": "Réinitialiser les préférences", + "search-preferences-saved": "Préférences de recherche enregistrées", + "search-preferences-cleared": "Préférences de recherche réinitialisées", + "show-results-as": "Affichez les résultats comme" } \ No newline at end of file diff --git a/public/language/fr/tags.json b/public/language/fr/tags.json index 477f1a0b56..ef226f2efe 100644 --- a/public/language/fr/tags.json +++ b/public/language/fr/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé", "tags": "Mots-clés", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Entrez les mots-clés ici. %1-%2 caractères. Tapez sur \"Entrée\" après chaque mot-clé.", "enter_tags_here_short": "Entrez des mots-clés...", "no_tags": "Il n'y a pas encore de mots-clés." } \ No newline at end of file diff --git a/public/language/he/tags.json b/public/language/he/tags.json index 3061057672..54ead310ad 100644 --- a/public/language/he/tags.json +++ b/public/language/he/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "אין פוסטים עם תגית זו.", "tags": "תגיות", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "הכנס תגיות", "no_tags": "אין עדיין תגיות." } \ No newline at end of file diff --git a/public/language/hu/tags.json b/public/language/hu/tags.json index baddf9f8d6..aa7a02a772 100644 --- a/public/language/hu/tags.json +++ b/public/language/hu/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nem létezik témakör ezzel a címkével.", "tags": "Címkék", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Címke megadása...", "no_tags": "Nincs címke." } \ No newline at end of file diff --git a/public/language/id/tags.json b/public/language/id/tags.json index 8485344416..647542884e 100644 --- a/public/language/id/tags.json +++ b/public/language/id/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Tidak ada topik dengan tag ini.", "tags": "Tag", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Masukkan tag...", "no_tags": "Belum ada tag." } \ No newline at end of file diff --git a/public/language/it/tags.json b/public/language/it/tags.json index 5fcdf9ff47..c3364a0bbf 100644 --- a/public/language/it/tags.json +++ b/public/language/it/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Non ci sono discussioni con questo tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Inserisci i tags...", "no_tags": "Non ci sono ancora tags." } \ No newline at end of file diff --git a/public/language/ja/tags.json b/public/language/ja/tags.json index c416d8d4ec..aa9f14c70c 100644 --- a/public/language/ja/tags.json +++ b/public/language/ja/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/ko/tags.json b/public/language/ko/tags.json index 8e1011bd29..a50fc5e9e1 100644 --- a/public/language/ko/tags.json +++ b/public/language/ko/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "이 태그에 해당하는 주제가 없습니다.", "tags": "태그", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "태그 입력...", "no_tags": "아직 아무런 태그도 없습니다." } \ No newline at end of file diff --git a/public/language/lt/tags.json b/public/language/lt/tags.json index 2151f58d36..2f2b9e11d2 100644 --- a/public/language/lt/tags.json +++ b/public/language/lt/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Temų su šią žyma nėra.", "tags": "Žymos", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "Žymų kolkas nėra." } \ No newline at end of file diff --git a/public/language/ms/tags.json b/public/language/ms/tags.json index c416d8d4ec..aa9f14c70c 100644 --- a/public/language/ms/tags.json +++ b/public/language/ms/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/nb/tags.json b/public/language/nb/tags.json index 5287b6125a..d38e00a025 100644 --- a/public/language/nb/tags.json +++ b/public/language/nb/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Det er ingen emnet med denne taggen.", "tags": "Tagger", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Skriv tagger...", "no_tags": "Det finnes ingen tagger enda." } \ No newline at end of file diff --git a/public/language/nl/tags.json b/public/language/nl/tags.json index 281fd4a0a5..85c11b0476 100644 --- a/public/language/nl/tags.json +++ b/public/language/nl/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Er zijn geen onderwerpen met deze tag", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Voer uw tags in...", "no_tags": "Er zijn nog geen tags te vinden" } \ No newline at end of file diff --git a/public/language/pl/category.json b/public/language/pl/category.json index 09164c69bb..a6e6ec1b0f 100644 --- a/public/language/pl/category.json +++ b/public/language/pl/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Nowy wątek", - "guest-login-post": "Log in to post", + "guest-login-post": "Zaloguj się, aby napisać.", "no_topics": "W tej kategorii nie ma jeszcze żadnych wątków.
    Dlaczego ty nie utworzysz jakiegoś?", "browsing": "przegląda", "no_replies": "Nikt jeszcze nie odpowiedział", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index c09640123e..c967749eeb 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -19,8 +19,8 @@ "email-taken": "E-mail zajęty.", "email-not-confirmed": "Twój email nie został jeszcze potwierdzony. Proszę kliknąć tutaj by go potwierdzić.", "email-not-confirmed-chat": "Nie możesz rozmawiać do czasu, gdy twój email zostanie potwierdzony.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "To forum wymaga weryfikacji przez email. Proszę kliknąć tutaj, aby wprowadzić adres.", + "email-confirm-failed": "Nie byliśmy w stanie potwierdzić twojego email-a. Proszę spróbować później.", "username-too-short": "Nazwa użytkownika za krótka.", "username-too-long": "Zbyt długa nazwa użytkownika", "user-banned": "Użytkownik zbanowany", @@ -35,7 +35,7 @@ "no-emailers-configured": "Nie zainstalowano żadnego dodatku obsługującego e-mail, więc nie można wysłać testowej wiadomości.", "category-disabled": "Kategoria wyłączona.", "topic-locked": "Temat zamknięty", - "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", + "post-edit-duration-expired": "Możesz edytować posty przez %1 sekund po napisaniu.", "still-uploading": "Poczekaj na pełne załadowanie", "content-too-short": "Proszę wpisać dłuższy post. Posty powinny zawierać co najmniej %1 znaków.", "content-too-long": "Proszę wpisać krótszy post. Posty nie mogą zawierać więcej niż %1 znaków.", @@ -43,8 +43,8 @@ "title-too-long": "Wpisz krótszy tytuł, nie może być dłuższy niż %1 znaków.", "too-many-posts": "Możesz wysyłać posty co %1 sekund - proszę poczekać", "too-many-posts-newbie": "Jako nowy użytkownik, możesz wysyłać posty co %1 sekund, do chwili aż zbierzesz %2 reputacji - proszę poczekać przed ponownym wysłaniem posta", - "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", - "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", + "tag-too-short": "Proszę podać dłuższy tag. Tagi powinny zawierać co najmniej %1 znaków.", + "tag-too-long": "Proszę podać krótszy tag. Tagi nie mogą być dłuższe niż %1 znaków.", "file-too-big": "Maksymalny dozwolony rozmiar pliku to %1 kb - proszę wybrać mniejszy plik", "cant-vote-self-post": "Nie możesz głosować na własny post", "already-favourited": "Już polubiłeś ten post", @@ -52,7 +52,7 @@ "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", "invalid-image-type": "Błędny typ pliku. Dozwolone typy to: %1", "invalid-image-extension": "Błędne rozszerzenie pliku", - "invalid-file-type": "Invalid file type. Allowed types are: %1", + "invalid-file-type": "Błędny typ pliku. Dozwolone typy to: %1", "group-name-too-short": "Nazwa grupy za krótka", "group-already-exists": "Grupa już istnieje", "group-name-change-not-allowed": "Nie można zmieniać nazwy tej grupy.", @@ -76,6 +76,6 @@ "reload-failed": "NodeBB napotkał problem w czasie ładowania \"%1\". Forum będzie nadal dostarczać zasoby dostępne w kliencie, jednak powinieneś cofnąć ostatnią akcję.", "registration-error": "Błąd rejestracji", "parse-error": "Coś poszło nie tak podczas parsingu odpowiedzi serwera", - "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "wrong-login-type-email": "Zaloguj się używając adresu email", + "wrong-login-type-username": "Zaloguj się używając nazwy użytkownika" } \ No newline at end of file diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json index 19f43e2d89..b9c32948b9 100644 --- a/public/language/pl/groups.json +++ b/public/language/pl/groups.json @@ -4,8 +4,8 @@ "owner": "Właściciel grupy", "new_group": "Stwórz nową grupę", "no_groups_found": "Brak grup do wyświetlenia", - "pending.accept": "Accept", - "pending.reject": "Reject", + "pending.accept": "Przyjmij", + "pending.reject": "Odrzuć", "cover-instructions": "Przeciągnij i upuść zdjęcie, ustaw w odpowiedniej pozycji i kliknij Zapisz", "cover-change": "Zmień", "cover-save": "Zapisz", @@ -15,20 +15,20 @@ "details.pending": "Członkowie oczekujący", "details.has_no_posts": "Członkowie tej grupy nie napisali żadnych postów.", "details.latest_posts": "Ostatnie posty", - "details.private": "Private", + "details.private": "Prywatna", "details.grant": "Nadaj/Cofnij prawa Właściciela", "details.kick": "Wykop", "details.owner_options": "Administracja grupy", - "details.group_name": "Group Name", - "details.description": "Description", - "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", - "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", - "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", - "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", + "details.group_name": "Nazwa grupy", + "details.description": "Opis", + "details.badge_preview": "Podgląd plakietki", + "details.change_icon": "Zmień ikonę", + "details.change_colour": "Zmień kolor", + "details.badge_text": "Treść plakietki", + "details.userTitleEnabled": "Pokaż plakietkę", + "details.private_help": "Jeśli aktywowane, przystępowanie do grup wymaga zatwierdzenia przez właściciela grupy", + "details.hidden": "Ukryty", + "details.hidden_help": "Jeśli aktywowane, ta grupa nie będzie widoczna w wykazie grup, a użytkownicy będą musieli być zapraszani manualnie.", "event.updated": "Dane grupy zostały zaktualizowane", "event.deleted": "Grupa \"%1\" została skasowana" } \ No newline at end of file diff --git a/public/language/pl/login.json b/public/language/pl/login.json index 4a95c6d26e..1133f6afba 100644 --- a/public/language/pl/login.json +++ b/public/language/pl/login.json @@ -1,7 +1,7 @@ { - "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username-email": "Nazwa użytkownika lub adres e-mail", + "username": "Nazwa użytkownika", + "email": "Adres e-mail", "remember_me": "Zapamiętaj mnie", "forgot_password": "Zapomniałeś hasło?", "alternative_logins": "Alternatywne logowanie", diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index 5e84128ee9..2a24b7c122 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -2,7 +2,7 @@ "title": "Powiadomienia", "no_notifs": "Nie masz nowych powiadomień", "see_all": "Zobacz wszystkie powiadomienia", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Oznacz wszystkie powiadomienia jako przeczytane", "back_to_home": "Wróć do %1", "outgoing_link": "Łącze wychodzące", "outgoing_link_message": "Opuszczasz %1.", diff --git a/public/language/pl/recent.json b/public/language/pl/recent.json index d395ee5722..563533001f 100644 --- a/public/language/pl/recent.json +++ b/public/language/pl/recent.json @@ -6,7 +6,7 @@ "year": "Rok", "alltime": "Od początku", "no_recent_topics": "Brak ostatnich wątków.", - "no_popular_topics": "There are no popular topics.", + "no_popular_topics": "Brak popularnych wątków.", "there-is-a-new-topic": "Masz nowy wątek.", "there-is-a-new-topic-and-a-new-post": "Masz nowy wątek i nowy post.", "there-is-a-new-topic-and-new-posts": "Masz nowy wątek i %1 nowych postów.", diff --git a/public/language/pl/search.json b/public/language/pl/search.json index 7a055eb66c..52b4e5a137 100644 --- a/public/language/pl/search.json +++ b/public/language/pl/search.json @@ -32,9 +32,9 @@ "category": "Kategoria", "descending": "W kolejności malejącej", "ascending": "W kolejności rosnącej", - "save-preferences": "Save preferences", - "clear-preferences": "Clear preferences", - "search-preferences-saved": "Search preferences saved", - "search-preferences-cleared": "Search preferences cleared", - "show-results-as": "Show results as" + "save-preferences": "Zapisz ustawienia", + "clear-preferences": "Wyczyść ustawienia", + "search-preferences-saved": "Ustawienia wyszukiwania zapisane", + "search-preferences-cleared": "Ustawienia wyszukiwania wyczyszczone", + "show-results-as": "Pokaż wyniki jako" } \ No newline at end of file diff --git a/public/language/pl/tags.json b/public/language/pl/tags.json index a2247f39e7..3036b34e62 100644 --- a/public/language/pl/tags.json +++ b/public/language/pl/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nie ma tematów z tym tagiem", "tags": "Tagi", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Tutaj wpisz tagi. %1-%2 znaków. Naciśnij enter po każdym.", "enter_tags_here_short": "Wpisz tagi...", "no_tags": "Jeszcze nie ma tagów." } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index e9941d4abf..f27171c5fa 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -12,7 +12,7 @@ "notify_me": "Powiadamiaj mnie o nowych odpowiedziach w tym wątku", "quote": "Cytuj", "reply": "Odpowiedz", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Zaloguj się, aby odpowiedzieć.", "edit": "Edytuj", "delete": "Usuń", "purge": "Wymaż", diff --git a/public/language/pt_BR/tags.json b/public/language/pt_BR/tags.json index 1150d12f7f..267888cbfa 100644 --- a/public/language/pt_BR/tags.json +++ b/public/language/pt_BR/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Não há tópicos com esta tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Digite tags...", "no_tags": "Ainda não há tags." } \ No newline at end of file diff --git a/public/language/ro/tags.json b/public/language/ro/tags.json index 59edbb0063..483efa66f6 100644 --- a/public/language/ro/tags.json +++ b/public/language/ro/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Nu există nici un subiect cu acest tag.", "tags": "Taguri", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Introdu taguri...", "no_tags": "În acest moment nu există nici un tag." } \ No newline at end of file diff --git a/public/language/ru/category.json b/public/language/ru/category.json index 8a97af5a0d..4d70a82236 100644 --- a/public/language/ru/category.json +++ b/public/language/ru/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Создать тему", - "guest-login-post": "Log in to post", + "guest-login-post": "Войдите чтобы создавать сообщения", "no_topics": "В этой категории еще нет тем.
    Почему бы вам не создать первую?", "browsing": "просматривают", "no_replies": "Нет ответов", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index cb43902332..bca2535d19 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -19,8 +19,8 @@ "email-taken": "Email занят", "email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.", "email-not-confirmed-chat": "Вы не можете оставлять сообщения, пока Ваш email не подтверждён", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "Этот форум требует подтверждения по E-mail. Нажмите здесь для ввода E-mail.", + "email-confirm-failed": "Мы не можем подтвердить Ваш E-mail, попробуйте позже.", "username-too-short": "Слишком короткое имя пользователя", "username-too-long": "Имя пользователя слишком длинное", "user-banned": "Пользователь заблокирован", @@ -35,7 +35,7 @@ "no-emailers-configured": "Не подключен ни один плагин для отправки почты, поэтому тестовый email не может быть отправлен", "category-disabled": "Категория отключена", "topic-locked": "Тема закрыта", - "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", + "post-edit-duration-expired": "Вы можете редактировать сообщение в течении %1 секунд(ы) после написания.", "still-uploading": "Пожалуйста, подождите завершения загрузки.", "content-too-short": "Пост должен содержать минимум %1 симв.", "content-too-long": "Размер поста не должен превышать %1 символов. Пожалуйста, сделайте его короче.", @@ -43,8 +43,8 @@ "title-too-long": "Заголовок не может быть длиннее %1 символов.", "too-many-posts": "Вы можете делать пост один раз в %1 сек.", "too-many-posts-newbie": "Вы новый пользователь, поэтому можете делать пост раз в %1 сек., пока не заработаете %2 п. репутации.", - "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", - "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", + "tag-too-short": "Введите более длинный тэг. Тэги должны содержать как минимум %1 символа(ов).", + "tag-too-long": "Введите тэг покороче. Тэги должны быть короче %1 символов.", "file-too-big": "Максимальный разрешенный размер файла - %1 Кбайт. Пожалуйста, загрузите файл меньшего размера.", "cant-vote-self-post": "Вы не можете проголосовать за Ваш пост", "already-favourited": "Вы уже добавили этот пост в избранное", @@ -52,7 +52,7 @@ "cant-ban-other-admins": "Вы не можете забанить других администраторов!", "invalid-image-type": "Неверный формат изображения. Поддерживаемые форматы: %1", "invalid-image-extension": "Недопустимое расширение файла", - "invalid-file-type": "Invalid file type. Allowed types are: %1", + "invalid-file-type": "Неверный формат фаила. Поддерживаемые форматы : %1", "group-name-too-short": "Название группы слишком короткое", "group-already-exists": "Группа уже существует", "group-name-change-not-allowed": "Изменение названия группы запрещено", @@ -76,6 +76,6 @@ "reload-failed": "NodeBB обнаружил проблему при перезагрузке: \"%1\". NodeBB продолжит работать с существующими ресурсами клиента, но Вы должны отменить то, что сделали перед перезагрузкой.", "registration-error": "Ошибка при регистрации", "parse-error": "Похоже, что-то пошло не так в процессе обработки ответа сервера.", - "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "wrong-login-type-email": "Пожалуйста, используйте свой E-mail для входа.", + "wrong-login-type-username": "Пожалуйста, используйте своё имя пользователя для входа." } \ No newline at end of file diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json index c46e857368..8ef4e59089 100644 --- a/public/language/ru/groups.json +++ b/public/language/ru/groups.json @@ -4,8 +4,8 @@ "owner": "Администратор группы", "new_group": "Создать группу", "no_groups_found": "Нет групп для отображения", - "pending.accept": "Accept", - "pending.reject": "Reject", + "pending.accept": "Принять", + "pending.reject": "Отклонить", "cover-instructions": "Перетяните сюда изображение, переместите на нужную позицию и нажмите Сохранить", "cover-change": "Изменить", "cover-save": "Сохранить", @@ -15,20 +15,20 @@ "details.pending": "Заявки в группу", "details.has_no_posts": "Пользователями этой группы не публиковали никаких записей", "details.latest_posts": "Последние записи", - "details.private": "Private", + "details.private": "Частный (ая)", "details.grant": "Выдать/забрать администратора", "details.kick": "Исключить", "details.owner_options": "Настройки группы", - "details.group_name": "Group Name", - "details.description": "Description", - "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", - "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", - "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", - "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", + "details.group_name": "Имя группы", + "details.description": "Описание", + "details.badge_preview": "Предпросмотр Бейджа", + "details.change_icon": "Сменить иконку", + "details.change_colour": "Изменить цвет", + "details.badge_text": "Текст на Бейдже", + "details.userTitleEnabled": "Показать Бейдж", + "details.private_help": "Если включено, вступление в группы будет подтверждаться владельцем группы", + "details.hidden": "Скрыто", + "details.hidden_help": "Если включено, группа не будет показываться в списках, а пользователи должны приглашаться вручную", "event.updated": "Настройки группы обновлены", "event.deleted": "Группа \"%1\" удалена" } \ No newline at end of file diff --git a/public/language/ru/login.json b/public/language/ru/login.json index b371df159e..b0a5793412 100644 --- a/public/language/ru/login.json +++ b/public/language/ru/login.json @@ -1,6 +1,6 @@ { - "username-email": "Username / Email", - "username": "Username", + "username-email": "Имя пользователя / E-mail", + "username": "Имя пользователя", "email": "Email", "remember_me": "Запомнить меня", "forgot_password": "Забыли пароль?", diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 0618e808db..c3d1fa2bfc 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -2,7 +2,7 @@ "title": "Уведомления", "no_notifs": "Для Вас нет новых уведомлений", "see_all": "Просмотреть все уведомления", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Отметить все уведомления как прочитанные", "back_to_home": "Назад к %1", "outgoing_link": "Внешняя ссылка", "outgoing_link_message": "Вы покидаете %1.", diff --git a/public/language/ru/recent.json b/public/language/ru/recent.json index 83c1e01b53..bddea6644e 100644 --- a/public/language/ru/recent.json +++ b/public/language/ru/recent.json @@ -6,7 +6,7 @@ "year": "Год", "alltime": "За всё время", "no_recent_topics": "Нет свежих тем.", - "no_popular_topics": "There are no popular topics.", + "no_popular_topics": "Популярные темы отсутствуют.", "there-is-a-new-topic": "Опубликована новая тема.", "there-is-a-new-topic-and-a-new-post": "Опубликована новая тема и новое сообщение.", "there-is-a-new-topic-and-new-posts": "Опубликована новая тема и %1 новых сообщений.", diff --git a/public/language/ru/search.json b/public/language/ru/search.json index a3929d303b..8fa2f31ebd 100644 --- a/public/language/ru/search.json +++ b/public/language/ru/search.json @@ -32,9 +32,9 @@ "category": "Категория", "descending": "В порядке возрастания", "ascending": "В порядке убывания", - "save-preferences": "Save preferences", - "clear-preferences": "Clear preferences", - "search-preferences-saved": "Search preferences saved", + "save-preferences": "Сохранить настройки", + "clear-preferences": "Очистить настройки", + "search-preferences-saved": "Искать сохраненные настройки", "search-preferences-cleared": "Search preferences cleared", - "show-results-as": "Show results as" + "show-results-as": "Показать результаты как" } \ No newline at end of file diff --git a/public/language/ru/tags.json b/public/language/ru/tags.json index e923cccf2c..8b78464be4 100644 --- a/public/language/ru/tags.json +++ b/public/language/ru/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Нет топиков с таким тегом.", "tags": "Теги", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Укажите тэги здесь. %1-%2 символов(а). Нажимайте Enter после каждого тэга.", "enter_tags_here_short": "Введите теги...", "no_tags": "Здесь еще нет тегов." } \ No newline at end of file diff --git a/public/language/sc/tags.json b/public/language/sc/tags.json index c416d8d4ec..aa9f14c70c 100644 --- a/public/language/sc/tags.json +++ b/public/language/sc/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/sk/tags.json b/public/language/sk/tags.json index c416d8d4ec..aa9f14c70c 100644 --- a/public/language/sk/tags.json +++ b/public/language/sk/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "There are no topics with this tag.", "tags": "Tags", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Enter tags...", "no_tags": "There are no tags yet." } \ No newline at end of file diff --git a/public/language/sv/tags.json b/public/language/sv/tags.json index d846962ea4..fffe39ea0a 100644 --- a/public/language/sv/tags.json +++ b/public/language/sv/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Det finns inga ämnen med detta märkord.", "tags": "Märkord", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Ange taggar...", "no_tags": "Det finns inga märkord ännu." } \ No newline at end of file diff --git a/public/language/th/tags.json b/public/language/th/tags.json index e8bf52df2e..d2d0ff6fe0 100644 --- a/public/language/th/tags.json +++ b/public/language/th/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "ไม่มีหัวข้อสนทนาที่เกี่ยวข้องกับป้ายคำศัพท์นี้", "tags": "ป้ายคำศัพท์", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "ใส่ป้ายคำศัพท์ ...", "no_tags": "ยังไม่มีป้ายคำศัพท์" } \ No newline at end of file diff --git a/public/language/tr/category.json b/public/language/tr/category.json index 34ac645f32..518bd9dcb0 100644 --- a/public/language/tr/category.json +++ b/public/language/tr/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Yeni Başlık", - "guest-login-post": "Log in to post", + "guest-login-post": "Göndermek için giriş yapın", "no_topics": " Bu kategoride hiç konu yok.
    Yeni bir konu açmak istemez misiniz?", "browsing": "gözden geçiriliyor", "no_replies": "Kimse yanıtlamadı", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 69cd323a2f..d54bbce50a 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -19,8 +19,8 @@ "email-taken": "E-posta Alınmış", "email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.", "email-not-confirmed-chat": "Email adresiniz doğrulanmadan sohbet edemezsiniz.", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "Bu forum e-posta doğrulaması gerektirir, lütfen buraya bir e-posta adresi girin", + "email-confirm-failed": "E-posta adresinizi doğrulayamıyoruz. Lütfen daha sonra tekrar deneyin.", "username-too-short": "Kullanıcı ismi çok kısa", "username-too-long": "Kullanıcı ismi çok uzun.", "user-banned": "Kullanıcı Yasaklı", @@ -43,8 +43,8 @@ "title-too-long": "Lütfen daha kısa bir başlık girin. Başlıklar %1 karakterden uzun olamaz.", "too-many-posts": "Sadece %1 saniyede bir ileti gönderebilirsiniz.", "too-many-posts-newbie": "Yeni bir kullanıcı olarak, %2 saygınlığınız olana kadar sadece %1 saniyede bir mesaj gönderebilirsiniz. Lütfen tekrar ileti göndermeden önce bekleyin.", - "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", - "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", + "tag-too-short": "Lütfen daha uzun bir etiket giriniz. Etiketler en az %1 karakter uzunluğunda olmalı", + "tag-too-long": "Lütfen daha kısa bir etiket girin. Etiketler %1 karakterden daha uzun olamaz", "file-too-big": "İzin verilen en büyük dosya boyutu %1 kbs.", "cant-vote-self-post": "Kendi iletinize oy veremezsiniz", "already-favourited": "Bu iletiyi zaten favorilerinize eklediniz", @@ -52,7 +52,7 @@ "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!", "invalid-image-type": "Geçersiz resim uzantısı. Izin verilen uzantılar: %1", "invalid-image-extension": "Geçersiz resim uzantısı", - "invalid-file-type": "Invalid file type. Allowed types are: %1", + "invalid-file-type": "Geçersiz dosya türü. İzin verilenler şunlar : %1", "group-name-too-short": "Grup ismi çok kısa", "group-already-exists": "Grup zaten var", "group-name-change-not-allowed": "Grup ismini değiştiremezsiniz", @@ -76,6 +76,6 @@ "reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.", "registration-error": "Kayıt Hatası", "parse-error": "Sunucu yanıtı çözümlemesi sırasında bir şeyler ters gitti", - "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "wrong-login-type-email": "Lütfen giriş için e-posta adresinizi kullanın", + "wrong-login-type-username": "Lütfen giriş için kullanıcı adınızı kullanın" } \ No newline at end of file diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json index 7191d93c86..536921e7e5 100644 --- a/public/language/tr/groups.json +++ b/public/language/tr/groups.json @@ -4,8 +4,8 @@ "owner": "Grup Kurucusu", "new_group": "Yeni Grup Oluştur", "no_groups_found": "Henüz hiç grup yok", - "pending.accept": "Accept", - "pending.reject": "Reject", + "pending.accept": "Onayla", + "pending.reject": "Reddet", "cover-instructions": "Bir fotoğrafı Sürükleyin ve Bırakın, uygun yere sürükleyip Kaydet'e tıklayın.", "cover-change": "Değiştir", "cover-save": "Kaydet", @@ -15,20 +15,20 @@ "details.pending": "Üyeler bekleniyor", "details.has_no_posts": "Bu grubun üyeleri henüz bir ileti göndermedi.", "details.latest_posts": "En son iletiler", - "details.private": "Private", + "details.private": "Özel", "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", + "details.kick": "Dışarı at", "details.owner_options": "Grup Yöneticisi", - "details.group_name": "Group Name", - "details.description": "Description", - "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", - "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", - "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", - "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", + "details.group_name": "Grup ismi", + "details.description": "Tanımlama", + "details.badge_preview": "Rozet Önizlemesi", + "details.change_icon": "İkonu Değiştir", + "details.change_colour": "Rengi Değiştir", + "details.badge_text": "Rozet Yazısı", + "details.userTitleEnabled": "Rozeti Göster", + "details.private_help": "Gruba katılmak için eğer etkinse grup sahibini onayı gerekir, ", + "details.hidden": "Gizli", + "details.hidden_help": "Bu grup eğer etkinse grup listelerinde bulunmaz, ve kullanıcılar bizzat davet eder", "event.updated": "Grup detayları güncellenmiştir", "event.deleted": "\"%1\" grubu silinmiş" } \ No newline at end of file diff --git a/public/language/tr/login.json b/public/language/tr/login.json index e18bc769ca..bd13e81d46 100644 --- a/public/language/tr/login.json +++ b/public/language/tr/login.json @@ -1,7 +1,7 @@ { - "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username-email": "Kullancı Adı / E posta adresi", + "username": "Kullanıcı Adı", + "email": "E posta Adresi", "remember_me": "Beni Hatırla!", "forgot_password": "Şifrenizi mi unuttunuz?", "alternative_logins": "Alternatif Girişler", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index c87b3ec4ee..64ca790352 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -2,7 +2,7 @@ "title": "Bildirimler", "no_notifs": "Yeni bildirimleriniz yok", "see_all": "Bütün bildirimleri gör", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Okunmuş bütün bildirimleri işaretle", "back_to_home": "Geri dön %1", "outgoing_link": "Harici Link", "outgoing_link_message": "Bu forumdan ayrılıyorsunuz", diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json index 817a69b2f8..f91231966c 100644 --- a/public/language/tr/recent.json +++ b/public/language/tr/recent.json @@ -6,7 +6,7 @@ "year": "Yıl", "alltime": "Hepsi", "no_recent_topics": "Güncel konular yok.", - "no_popular_topics": "There are no popular topics.", + "no_popular_topics": "Popüler konu yok", "there-is-a-new-topic": "Yeni bir konu mevcut.", "there-is-a-new-topic-and-a-new-post": "Yeni bir konu ve yayın mevcut.", "there-is-a-new-topic-and-new-posts": "Bir adet yeni konu ve %1 adet yeni yayın var.", diff --git a/public/language/tr/search.json b/public/language/tr/search.json index 1819a07de3..2ffbbfe36e 100644 --- a/public/language/tr/search.json +++ b/public/language/tr/search.json @@ -32,9 +32,9 @@ "category": "Kategori", "descending": "Azalan düzene göre", "ascending": "Artan düzene göre", - "save-preferences": "Save preferences", - "clear-preferences": "Clear preferences", - "search-preferences-saved": "Search preferences saved", - "search-preferences-cleared": "Search preferences cleared", - "show-results-as": "Show results as" + "save-preferences": "Tercihleri Kaydet", + "clear-preferences": "Tercihleri Sil", + "search-preferences-saved": "Kaydedilmiş Arama tercihleri", + "search-preferences-cleared": "Silinmiş Arama Tercihleri", + "show-results-as": "Sonuçları göster : " } \ No newline at end of file diff --git a/public/language/tr/tags.json b/public/language/tr/tags.json index 9f614ce38c..344a4bfff6 100644 --- a/public/language/tr/tags.json +++ b/public/language/tr/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Bu etiketli başlık yok.", "tags": "Etiketler", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Etiketleri buraya girin. %1-%2 karakter. Her etiketten sonra enter tuşuna basın.", "enter_tags_here_short": "Etiketleri gir...", "no_tags": "Henüz etiket yok." } \ No newline at end of file diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index fa76fb4ee6..ef6276ca31 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -12,7 +12,7 @@ "notify_me": "Bu konudaki cevaplardan haberdar ol", "quote": "Alıntı", "reply": "Cevap", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Cevaplamak için giriş yapın", "edit": "Düzenle", "delete": "Sil", "purge": "Temizle", diff --git a/public/language/tr/users.json b/public/language/tr/users.json index 9e38f04530..ed6fd922fe 100644 --- a/public/language/tr/users.json +++ b/public/language/tr/users.json @@ -5,7 +5,7 @@ "search": "Ara", "enter_username": "Aramak için bir kullanıcı adı girin", "load_more": "Daha Fazla Yükle", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", + "users-found-search-took": "%1 kullanıcı(lar) bulundu! Arama %2 saniye sürdü.", "filter-by": "Şu şekilde filtrele", "online-only": "Sadece çevrimiçi", "picture-only": "Sadece resim" diff --git a/public/language/vi/category.json b/public/language/vi/category.json index e536a54efb..be80ee1583 100644 --- a/public/language/vi/category.json +++ b/public/language/vi/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Chủ đề mới", - "guest-login-post": "Log in to post", + "guest-login-post": "Đăng nhập để viết bài", "no_topics": "Không có bài viết trong danh mục này.
    Hãy đăng một bài viết mới.", "browsing": "đang xem", "no_replies": "Chưa có bình luận nào", diff --git a/public/language/vi/email.json b/public/language/vi/email.json index d0d376eb34..c7f5fd5b54 100644 --- a/public/language/vi/email.json +++ b/public/language/vi/email.json @@ -9,9 +9,9 @@ "reset.text1": "Chúng tôi nhận được yêu cầu khởi tạo lại mật khẩu của bạn, rất có thể vì bạn đã quên mất nó. Nếu bạn không gởi yêu cầu, hãy bỏ qua email này.", "reset.text2": "Để đặt lại mật khẩu, hãy click vào liên kết sau:", "reset.cta": "Click vào đây để khởi tạo lại mật khẩu", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", - "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "reset.notify.subject": "Thay đổi mật khẩu thành công", + "reset.notify.text1": "Chúng tôi thông báo với bạn trên %1, mật khẩu của bạn đã thay đổi thành công", + "reset.notify.text2": "Nếu bạn không cho phép điều này, vui lòng thông báo cho quản trị viên ngay lập tức", "digest.notifications": "Bạn có thông báo chưa đọc từ %1", "digest.latest_topics": "Chủ đề mới nhất từ %1", "digest.cta": "Click vào đây để truy cập %1", @@ -20,8 +20,8 @@ "notif.chat.subject": "Bạn có tin nhắn mới từ %1", "notif.chat.cta": "Nhấn vào đây để tiếp tục cuộc hội thoại", "notif.chat.unsub.info": "Thông báo tin nhắn này được gửi tới dựa theo cài đặt theo dõi của bạn.", - "notif.post.cta": "Click here to read the full topic", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.cta": "Nhấn vào đây để đọc toàn bộ chủ đề", + "notif.post.unsub.info": "Thông báo bài viết này được gửi cho bạn dựa tên thiết lập nhận thông báo của bạn", "test.text1": "Đây là email kiểm tra xem chức năng gửi mail trên hệ thống NodeBB của bạn có hoạt động tốt hay không.", "unsub.cta": "Nhấn vào đây để thay đổi cài đặt.", "closing": "Xin cảm ơn!" diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 65ddf93ba0..56d5a49788 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -18,7 +18,7 @@ "username-taken": "Tên đăng nhập đã tồn tại", "email-taken": "Email đã được đăng kí", "email-not-confirmed": "Email của bạn chưa được xác nhận, xin hãy nhấn vào đây để xác nhận địa chỉ này là của bạn", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", + "email-not-confirmed-chat": "Bạn không thể trò chuyện cho đến khi thư điện tử của bạn được xác nhận", "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", "email-confirm-failed": "We could not confirm your email, please try again later.", "username-too-short": "Tên đăng nhập quá ngắn", diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index d204c2fd0b..d218247ba7 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -2,7 +2,7 @@ "title": "Thông báo", "no_notifs": "Bạn không có thông báo nào mới", "see_all": "Xem tất cả thông báo", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Đánh dấu đã xem tất cả thông báo", "back_to_home": "Quay lại %1", "outgoing_link": "Liên kết ngoài", "outgoing_link_message": "Bạn đang rời khỏi %1.", diff --git a/public/language/vi/tags.json b/public/language/vi/tags.json index 7b8931883f..68f5639c02 100644 --- a/public/language/vi/tags.json +++ b/public/language/vi/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "Không có bài viết nào với thẻ này.", "tags": "Thẻ", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "Tên thẻ...", "no_tags": "Chưa có thẻ nào." } \ No newline at end of file diff --git a/public/language/zh_CN/category.json b/public/language/zh_CN/category.json index 21ea5d5acf..1d5d4fb2a5 100644 --- a/public/language/zh_CN/category.json +++ b/public/language/zh_CN/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "新主题", - "guest-login-post": "Log in to post", + "guest-login-post": "登陆后发表", "no_topics": "此版块还没有任何内容。
    赶紧来发帖吧！", "browsing": "正在浏览", "no_replies": "尚无回复", diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index 69ea834c58..b156a96793 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -19,8 +19,8 @@ "email-taken": "电子邮箱已被占用", "email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。", "email-not-confirmed-chat": "在确认您的邮箱之前，您不能使用聊天功能", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "本论坛需要电子邮箱确认，请点击这里输入一个电子邮箱地址", + "email-confirm-failed": "我们无法确认您的电子邮箱，请重试", "username-too-short": "用户名太短", "username-too-long": "用户名太长", "user-banned": "用户已禁止", @@ -35,7 +35,7 @@ "no-emailers-configured": "未加载任何电子邮箱插件，无法发送测试邮件", "category-disabled": "版块已禁用", "topic-locked": "主题已锁定", - "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", + "post-edit-duration-expired": "您只能在发表后 %1 秒内修改内容", "still-uploading": "请等待上传完成", "content-too-short": "请再输入一些内容，帖子至少要有 %1 个字符。", "content-too-long": "请输入更短的发帖。发帖字数不能超过 %1 个字符。", @@ -43,8 +43,8 @@ "title-too-long": "请输入更短的标题。不超过 %1 字。", "too-many-posts": "发帖间隔至少要 %1 秒 - 请稍候再发帖", "too-many-posts-newbie": "作为新用户，您必须每隔 %1 秒才能发帖一次，直到您有 %2 点威望为止 —— 请稍候再发帖", - "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters", - "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters", + "tag-too-short": "标签长度过短，标签长度至少为 %1 个字符", + "tag-too-long": "标签长度过长，标签长度至多为 %1 个字符", "file-too-big": "文件不能超过 %1k 字节 - 请上传更小的文件", "cant-vote-self-post": "您不能给自己的帖子投票。", "already-favourited": "您已收藏该帖", @@ -52,7 +52,7 @@ "cant-ban-other-admins": "您不能禁止其他管理员！", "invalid-image-type": "无效的图像类型。允许的类型有：%1", "invalid-image-extension": "无效的图像扩展", - "invalid-file-type": "Invalid file type. Allowed types are: %1", + "invalid-file-type": "无效文件格式，允许的格式有：%1", "group-name-too-short": "用户组名称太短", "group-already-exists": "用户组已存在", "group-name-change-not-allowed": "不允许更改用户组名称", @@ -76,6 +76,6 @@ "reload-failed": "NodeBB 重新加载时遇到问题: \"%1\"。NodeBB 会继续给已存在的客户端组件服务，虽然您应该撤销在重新加载前执行的操作。", "registration-error": "注册错误", "parse-error": "解析服务器响应时出错", - "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "wrong-login-type-email": "请输入您的电子邮箱地址登录", + "wrong-login-type-username": "请输入您的用户名登录" } \ No newline at end of file diff --git a/public/language/zh_CN/tags.json b/public/language/zh_CN/tags.json index 9802f9c79a..a50705d3d6 100644 --- a/public/language/zh_CN/tags.json +++ b/public/language/zh_CN/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "此话题还没有主题帖。", "tags": "话题", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "输入话题...", "no_tags": "尚无话题。" } \ No newline at end of file diff --git a/public/language/zh_TW/tags.json b/public/language/zh_TW/tags.json index ce9de5c88b..dc5c1601ba 100644 --- a/public/language/zh_TW/tags.json +++ b/public/language/zh_TW/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "沒有此標籤的主題。", "tags": "標籤", - "enter_tags_here": "Enter tags here, between %1 and %2 characters each.", + "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", "enter_tags_here_short": "輸入標籤...", "no_tags": "還沒有標籤呢。" } \ No newline at end of file From ca31ac882ca1177afdfb077adf4235c5c48924d0 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Mar 2015 19:47:14 -0400 Subject: [PATCH 748/897] added return true/false --- public/src/ajaxify.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index ee317d9133..2e81d837b6 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -65,8 +65,10 @@ $(document).ready(function() { // If ajaxifying into an admin route from regular site, do a cold load. url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); if (url.indexOf('admin') === 0 && window.location.pathname.indexOf('/admin') !== 0) { - return window.open(RELATIVE_PATH + '/' + url, '_blank'); + window.open(RELATIVE_PATH + '/' + url, '_blank'); + return true; } + return false; } ajaxify.start = function(url, quiet, search) { From f89741636cdad244d38bf2c8dca52054f65c335c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Mar 2015 21:56:33 -0400 Subject: [PATCH 749/897] return false to prevent default --- 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 2e81d837b6..e87bee7504 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -24,7 +24,7 @@ $(document).ready(function() { ajaxify.go = function (url, callback, quiet) { if (ajaxify.handleACPRedirect(url)) { - return; + return false; } app.enterRoom(''); From c63d5f4b7a6fab9a3cadec0ecb32a59e2e33ded8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Mar 2015 22:47:15 -0400 Subject: [PATCH 750/897] test --- src/groups.js | 6 +----- src/posts/user.js | 16 ++++++++++++---- src/topics.js | 42 +++++++++++++++++++++++++++++++++++++----- 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/src/groups.js b/src/groups.js index 3f1ba0ddf7..25c8ff1bdc 100644 --- a/src/groups.js +++ b/src/groups.js @@ -953,11 +953,7 @@ var async = require('async'), var memberOf = []; isMembers.forEach(function(isMember, index) { if (isMember) { - if (uids.length > 1) { - memberOf.push(util._extend({}, groupData[index])); - } else { - memberOf.push(groupData[index]); - } + memberOf.push(groupData[index]); } }); diff --git a/src/posts/user.js b/src/posts/user.js index 494b1dbc6f..8d64aeb621 100644 --- a/src/posts/user.js +++ b/src/posts/user.js @@ -33,10 +33,18 @@ module.exports = function(Posts) { var userData = results.userData; userData.forEach(function(userData, i) { - userData.groups = results.groups[i]; - - userData.groups.forEach(function(group) { - group.selected = group.name === results.userSettings[i].groupTitle; + userData.groups = []; + + results.groups[i].forEach(function(group, index) { + userData.groups[index] = { + name: group.name, + slug: group.slug, + labelColor: group.labelColor, + icon: group.icon, + userTitle: group.userTitle, + userTitleEnabled: group.userTitleEnabled, + selected: group.name === results.userSettings[i].groupTitle + }; }); userData.status = user.getStatus(userData.status, results.online[i]); }); diff --git a/src/topics.js b/src/topics.js index 3c22bcf30c..6dd1a6361a 100644 --- a/src/topics.js +++ b/src/topics.js @@ -216,11 +216,14 @@ var async = require('async'), } async.parallel({ - mainPost: function(next) { - getMainPosts([topicData.mainPid], uid, next); - }, + // mainPost: function(next) { + // getMainPosts([topicData.mainPid], uid, next); + // }, + // posts: function(next) { + // Topics.getTopicPosts(tid, set, start, end, uid, reverse, next); + // }, posts: function(next) { - Topics.getTopicPosts(tid, set, start, end, uid, reverse, next); + getMainPostAndReplies(topicData, set, uid, start, end, reverse, next); }, category: async.apply(Topics.getCategoryData, tid), threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}), @@ -231,7 +234,8 @@ var async = require('async'), return callback(err); } - topicData.posts = Array.isArray(results.mainPost) && results.mainPost.length ? [results.mainPost[0]].concat(results.posts) : results.posts; + //topicData.posts = Array.isArray(results.mainPost) && results.mainPost.length ? [results.mainPost[0]].concat(results.posts) : results.posts; + topicData.posts = results.posts; topicData.category = results.category; topicData.thread_tools = results.threadTools.tools; topicData.tags = results.tags; @@ -249,6 +253,34 @@ var async = require('async'), }); }; + function getMainPostAndReplies(topic, set, uid, start, end, reverse, callback) { + async.waterfall([ + function(next) { + posts.getPidsFromSet(set, start, end, reverse, next); + }, + function(pids, next) { + if ((!Array.isArray(pids) || !pids.length) && !topic.mainPid) { + return callback(null, []); + } + + if (topic.mainPid) { + pids.unshift(topic.mainPid); + } + posts.getPostsByPids(pids, uid, next); + }, + function(posts, next) { + var indices = Topics.calculatePostIndices(start, end, topic.postcount, reverse); + posts.forEach(function(post, index) { + if (post) { + post.index = indices[index] - 1; + } + }); + + Topics.addPostData(posts, uid, callback); + } + ]); + } + Topics.getMainPost = function(tid, uid, callback) { Topics.getMainPosts([tid], uid, function(err, mainPosts) { callback(err, Array.isArray(mainPosts) && mainPosts.length ? mainPosts[0] : null); From 2878bf6cfe12c4d962b1a4b75da639f00f6c0578 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 11 Mar 2015 23:37:25 -0400 Subject: [PATCH 751/897] removed commented out code --- src/topics.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/topics.js b/src/topics.js index 6dd1a6361a..8f8915ab69 100644 --- a/src/topics.js +++ b/src/topics.js @@ -216,15 +216,7 @@ var async = require('async'), } async.parallel({ - // mainPost: function(next) { - // getMainPosts([topicData.mainPid], uid, next); - // }, - // posts: function(next) { - // Topics.getTopicPosts(tid, set, start, end, uid, reverse, next); - // }, - posts: function(next) { - getMainPostAndReplies(topicData, set, uid, start, end, reverse, next); - }, + posts: async.apply(getMainPostAndReplies, topicData, set, uid, start, end, reverse), category: async.apply(Topics.getCategoryData, tid), threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}), tags: async.apply(Topics.getTopicTagsObjects, tid), @@ -234,7 +226,6 @@ var async = require('async'), return callback(err); } - //topicData.posts = Array.isArray(results.mainPost) && results.mainPost.length ? [results.mainPost[0]].concat(results.posts) : results.posts; topicData.posts = results.posts; topicData.category = results.category; topicData.thread_tools = results.threadTools.tools; From ec897be3e76fd45fe5eeef03259020197953a471 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 12 Mar 2015 01:34:10 -0400 Subject: [PATCH 752/897] jshint --- public/vendor/autosize.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/vendor/autosize.js b/public/vendor/autosize.js index 645826fcb6..b6a5c39af8 100644 --- a/public/vendor/autosize.js +++ b/public/vendor/autosize.js @@ -3,9 +3,9 @@ license: MIT http://www.jacklmoore.com/autosize */ +'use strict'; +/*globals define*/ (function (root, factory) { - 'use strict'; - if (typeof define === 'function' && define.amd) { // AMD. Register as an anonymous module. define('autosize', factory); From fd1b7bbd3a5ef1ce4314e7117642fe8e60b6cbe3 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 10:57:23 -0400 Subject: [PATCH 753/897] fix redirection --- 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 e87bee7504..0161d8a6ae 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -24,7 +24,7 @@ $(document).ready(function() { ajaxify.go = function (url, callback, quiet) { if (ajaxify.handleACPRedirect(url)) { - return false; + return true; } app.enterRoom(''); From 4cb58d976b5fee5ce0888205b8124330b5b28368 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 11:03:10 -0400 Subject: [PATCH 754/897] fix indices, main post always 0 --- src/topics.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/topics.js b/src/topics.js index 8f8915ab69..aecdcb1000 100644 --- a/src/topics.js +++ b/src/topics.js @@ -260,12 +260,20 @@ var async = require('async'), posts.getPostsByPids(pids, uid, next); }, function(posts, next) { + if (!posts.length) { + return next(null, []); + } + + if (topic.mainPid) { + posts[0].index = 0; + } + var indices = Topics.calculatePostIndices(start, end, topic.postcount, reverse); - posts.forEach(function(post, index) { - if (post) { - post.index = indices[index] - 1; + for (var i=1; i Date: Thu, 12 Mar 2015 12:30:00 -0400 Subject: [PATCH 755/897] closes #2839 and #2840 --- public/src/modules/composer/resize.js | 43 ++++++++++++++++----------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index 8f37b0f76e..e353971e2f 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -19,11 +19,13 @@ define('composer/resize', ['autosize'], function(autosize) { env = utils.findBootstrapEnvironment(); } - postContainer.percentage = percentage; - if (percentage) { + var max = getMaximumPercentage(); + if (percentage < 0.25) { percentage = 0.25; + } else if (percentage > max) { + percentage = max; } if (env === 'md' || env === 'lg') { @@ -31,6 +33,8 @@ define('composer/resize', ['autosize'], function(autosize) { } } + postContainer.percentage = percentage; + // todo, lump in browsers that don't support transform (ie8) here // at this point we should use modernizr if (env === 'sm' || env === 'xs' || window.innerHeight < 480) { @@ -94,7 +98,7 @@ define('composer/resize', ['autosize'], function(autosize) { function toggleMaximize(e) { if (e.clientY - resizeDown === 0 || snapToTop) { - var newPercentage = ($(window).height() - $('#header-menu').height() - 1) / $(window).height(); + var newPercentage = getMaximumPercentage(); if (!postContainer.hasClass('maximized') || !snapToTop) { oldPercentage = postContainer.percentage; @@ -132,8 +136,9 @@ define('composer/resize', ['autosize'], function(autosize) { } function resizeSavePosition(px) { - var percentage = px / $(window).height(); - localStorage.setItem('composer:resizePercentage', percentage); + var percentage = px / $(window).height(), + max = getMaximumPercentage(); + localStorage.setItem('composer:resizePercentage', percentage < max ? percentage : max); } var resizeActive = false, @@ -142,23 +147,27 @@ define('composer/resize', ['autosize'], function(autosize) { snapToTop = false, resizeEl = postContainer.find('.resizer'); - resizeEl.on('mousedown', resizeStart); - - resizeEl.on('touchstart', function(e) { - e.preventDefault(); - resizeStart(e.touches[0]); - }); - - resizeEl.on('touchend', function(e) { - e.preventDefault(); - resizeStop(); - }); + resizeEl + .on('mousedown', resizeStart) + .on('touchstart', function(e) { + e.preventDefault(); + resizeStart(e.touches[0]); + }) + .on('touchend', function(e) { + e.preventDefault(); + resizeStop(); + }); }; + function getMaximumPercentage() { + return ($(window).height() - $('#header-menu').height() - 1) / $(window).height(); + } function resizeWritePreview(postContainer) { var total = getFormattingHeight(postContainer); - postContainer.find('.write-preview-container').css('height', postContainer.percentage * $(window).height() - $('#header-menu').height() - total); + postContainer + .find('.write-preview-container') + .css('height', postContainer.percentage * $(window).height() - $('#header-menu').height() - total); } function getFormattingHeight(postContainer) { From dd06e8d7d81b03f684a0c0647889fef728a5bf48 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 13:26:29 -0400 Subject: [PATCH 756/897] return early if falsy --- public/src/utils.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/src/utils.js b/public/src/utils.js index 4efad224fd..3daa316117 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -75,7 +75,9 @@ //http://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/ slugify: function(str, preserveCase) { - if (!str) { str = ''; } + if (!str) { + return ''; + } str = str.replace(utils.trimRegex, ''); if(utils.isLatin.test(str)) { str = str.replace(utils.invalidLatinChars, '-'); @@ -276,7 +278,7 @@ } if (!hash[key]) { hash[key] = value; - } else { + } else { if (!$.isArray(hash[key])) { hash[key] = [hash[key]]; } From e9f82b7eeea69258dec01fffa61a34e1d0995787 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 13:39:04 -0400 Subject: [PATCH 757/897] updated isLatin check doggy.gif --- public/src/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/utils.js b/public/src/utils.js index 3daa316117..0c58817411 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -70,7 +70,7 @@ collapseDash: /-+/g, trimTrailingDash: /-$/g, trimLeadingDash: /^-/g, - isLatin: /^[\w]+$/, + isLatin: /^[\w\d\s.,\-@]+$/, languageKeyRegex: /\[\[[\w]+:.+\]\]/, //http://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/ From dfe48fffb1227604e98d54399a76d5052b5e9323 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 12 Mar 2015 14:49:18 -0400 Subject: [PATCH 758/897] composer fixes when resizing window horizontally --- public/src/modules/composer/resize.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/public/src/modules/composer/resize.js b/public/src/modules/composer/resize.js index e353971e2f..66f22462f3 100644 --- a/public/src/modules/composer/resize.js +++ b/public/src/modules/composer/resize.js @@ -5,8 +5,7 @@ define('composer/resize', ['autosize'], function(autosize) { var resize = {}, - oldPercentage = 0, - env; + oldPercentage = 0; resize.reposition = function(postContainer) { var percentage = localStorage.getItem('composer:resizePercentage') || 0.5; @@ -15,8 +14,17 @@ define('composer/resize', ['autosize'], function(autosize) { }; function doResize(postContainer, percentage) { - if (!env) { - env = utils.findBootstrapEnvironment(); + var env = utils.findBootstrapEnvironment(); + + + // todo, lump in browsers that don't support transform (ie8) here + // at this point we should use modernizr + if (env === 'sm' || env === 'xs' || window.innerHeight < 480) { + $('html').addClass('composing mobile'); + autosize(postContainer.find('textarea')[0]); + percentage = 1; + } else { + $('html').removeClass('composing mobile'); } if (percentage) { @@ -30,19 +38,13 @@ define('composer/resize', ['autosize'], function(autosize) { if (env === 'md' || env === 'lg') { postContainer.css('transform', 'translate(0, ' + (Math.abs(1-percentage) * 100) + '%)'); + } else { + postContainer.removeAttr('style'); } } postContainer.percentage = percentage; - // todo, lump in browsers that don't support transform (ie8) here - // at this point we should use modernizr - if (env === 'sm' || env === 'xs' || window.innerHeight < 480) { - $('html').addClass('composing mobile'); - postContainer.percentage = 1; - autosize(postContainer.find('textarea')[0]); - } - if (config.hasImageUploadPlugin) { postContainer.find('.img-upload-btn').removeClass('hide'); postContainer.find('#files.lt-ie9').removeClass('hide'); From 279bb62a3fb1783e36db3d44ba7a17a3d0fea43e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 15:01:50 -0400 Subject: [PATCH 759/897] cache parsed post content clear cache on plugin install/uninstall/activate/deactivate --- package.json | 1 + src/postTools.js | 29 ++++++++++++++++++++++++++--- src/socket.io/admin.js | 8 +++++--- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a1fac5f4de..24bc90bef9 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "heapdump": "^0.3.0", "less": "^2.0.0", "logrotate-stream": "^0.2.3", + "lru-cache": "^2.5.0", "mime": "^1.3.4", "mkdirp": "~0.5.0", "mmmagic": "^0.3.13", diff --git a/src/postTools.js b/src/postTools.js index 0fe8be23f8..9ddc7b999e 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -14,7 +14,14 @@ var winston = require('winston'), utils = require('../public/src/utils'), plugins = require('./plugins'), events = require('./events'), - meta = require('./meta'); + meta = require('./meta'), + LRU = require('lru-cache'); + +var cache = LRU({ + max: 1048576, + length: function (n) { return n.length }, + maxAge: 1000 * 60 * 60 +}); (function(PostTools) { @@ -100,6 +107,7 @@ var winston = require('winston'), }); }, postData: function(next) { + cache.del(postData.pid); PostTools.parsePost(postData, data.uid, next); } }, function(err, results) { @@ -148,6 +156,7 @@ var winston = require('winston'), } if (isDelete) { + cache.del(postData.pid); posts.delete(pid, callback); } else { posts.restore(pid, function(err, postData) { @@ -165,7 +174,7 @@ var winston = require('winston'), if (err || !canEdit) { return callback(err || new Error('[[error:no-privileges]]')); } - + cache.del(pid); posts.purge(pid, callback); }); }; @@ -173,8 +182,18 @@ var winston = require('winston'), PostTools.parsePost = function(postData, uid, callback) { postData.content = postData.content || ''; + var cachedContent = cache.get(postData.pid); + if (cachedContent) { + postData.content = cachedContent; + return callback(null, postData); + } + plugins.fireHook('filter:parse.post', {postData: postData, uid: uid}, function(err, data) { - callback(err, data ? data.postData : null); + if (err) { + return callback(err); + } + cache.set(data.postData.pid, data.postData.content); + callback(null, data.postData); }); }; @@ -184,4 +203,8 @@ var winston = require('winston'), plugins.fireHook('filter:parse.signature', {userData: userData, uid: uid}, callback); }; + PostTools.resetCache = function() { + cache.reset(); + }; + }(exports)); diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index dcbda783aa..6860fb6e66 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -104,10 +104,12 @@ SocketAdmin.themes.updateBranding = function(socket, data, callback) { }; SocketAdmin.plugins.toggleActive = function(socket, plugin_id, callback) { + require('../postTools').resetCache(); plugins.toggleActive(plugin_id, callback); }; SocketAdmin.plugins.toggleInstall = function(socket, data, callback) { + require('../postTools').resetCache(); plugins.toggleInstall(data.id, data.version, callback); }; @@ -121,7 +123,7 @@ SocketAdmin.plugins.orderActivePlugins = function(socket, data, callback) { db.sortedSetAdd('plugins:active', plugin.order || 0, plugin.name, next); } else { next(); - } + } }, callback); }; @@ -339,12 +341,12 @@ SocketAdmin.getMoreFlags = function(socket, data, callback) { posts.getUserFlags(byUsername, sortBy, socket.uid, start, end, function(err, posts) { callback(err, {posts: posts, next: end + 1}); }); - } else { + } else { var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged'; posts.getFlags(set, socket.uid, start, end, function(err, posts) { callback(err, {posts: posts, next: end + 1}); }); - } + } }; SocketAdmin.takeHeapSnapshot = function(socket, data, callback) { From b37bcc6dfe63c57d0fccbdb3b105030b6231328c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 16:26:33 -0400 Subject: [PATCH 760/897] closes #2853 --- public/src/modules/composer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 8a85846b0b..6c4bb65588 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -397,7 +397,7 @@ define('composer', [ var titleEl = postContainer.find('.title'); if (parseInt(postData.tid, 10) > 0) { - titleEl.translateVal('[[topic:composer.replying_to, ' + postData.title + ']]'); + titleEl.translateVal('[[topic:composer.replying_to, "' + postData.title + '"]]'); titleEl.prop('disabled', true); } else if (parseInt(postData.pid, 10) > 0) { titleEl.val(postData.title); @@ -531,7 +531,7 @@ define('composer', [ $('body').css({'margin-bottom': 0}); $('[data-action="post"]').removeAttr('disabled'); - + $('html').removeClass('composing mobile'); } } From 2f688136d173deb73fd25a357a7de97ff1dd9c66 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 16:30:08 -0400 Subject: [PATCH 761/897] closes #2852 --- public/src/modules/composer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 6c4bb65588..c36c42365e 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -314,12 +314,13 @@ define('composer', [ discard(post_uuid); return; } - + var btn = $(this).prop('disabled', true); translator.translate('[[modules:composer.discard]]', function(translated) { bootbox.confirm(translated, function(confirm) { if (confirm) { discard(post_uuid); } + btn.prop('disabled', false); }); }); }); From d3b2742da01a81bfa017c0aeb2d87c5a31db9c10 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 16:50:46 -0400 Subject: [PATCH 762/897] closes #2746 closes #2747 --- public/src/admin/modules/search.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js index dec438165d..781f4ade9e 100644 --- a/public/src/admin/modules/search.js +++ b/public/src/admin/modules/search.js @@ -103,11 +103,17 @@ define(function() { if (menuItems.html() !== '') { menuItems.append(''); + } else { + menuItems.append('    '); } } if (value.length > 0) { - menuItems.append('
  • Search the forum for ' + value + '
    • '); + if (config.searchEnabled) { + menuItems.append('
  • Search the forum for ' + value + '
    • '); + } else if (value.length < 3) { + menuItems.append('
  • Type more to see results...
    • '); + } } else { menuItems.append('
  • Start typing to see results...
    • '); } From e6c079406123d53040053803c595f20e2fd23c8d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 17:46:49 -0400 Subject: [PATCH 763/897] create tooltips for users on widgets --- public/src/widgets.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/public/src/widgets.js b/public/src/widgets.js index fea7814c9d..990a42c6f0 100644 --- a/public/src/widgets.js +++ b/public/src/widgets.js @@ -68,11 +68,16 @@ ajaxify.widgets.reposition(location); } } - + var widgetAreas = $('#content [widget-area]'); widgetAreas.find('img:not(.user-img)').addClass('img-responsive'); widgetAreas.find('span.timeago').timeago(); - + widgetAreas.find('img[title].teaser-pic,img[title].user-img').each(function() { + $(this).tooltip({ + placement: 'top', + title: $(this).attr('title') + }); + }); $(window).trigger('action:widgets.loaded', {}); if (typeof callback === 'function') { From 6e25724cfb31dd76273cf18b3368c1e1582d0db2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 19:27:53 -0400 Subject: [PATCH 764/897] removed unused requires --- src/routes/meta.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/routes/meta.js b/src/routes/meta.js index 6a7fe0566b..9f77a8fc7c 100644 --- a/src/routes/meta.js +++ b/src/routes/meta.js @@ -1,11 +1,6 @@ "use strict"; -var path = require('path'), - nconf = require('nconf'), - - meta = require('../meta'), - db = require('../database'), - plugins = require('../plugins'), +var meta = require('../meta'), middleware = require('../middleware'); From 58169aa6d92f0991d6a4dd6874252a43a9daf6c2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 12 Mar 2015 19:28:53 -0400 Subject: [PATCH 765/897] no need for return --- src/routes/meta.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/meta.js b/src/routes/meta.js index 9f77a8fc7c..e028adf63d 100644 --- a/src/routes/meta.js +++ b/src/routes/meta.js @@ -5,7 +5,7 @@ var meta = require('../meta'), function sendMinifiedJS(req, res, next) { - return res.type('text/javascript').send(meta.js.cache); + res.type('text/javascript').send(meta.js.cache); } function sendStylesheet(req, res, next) { From f7f048f06a6b3056c255c88b996ddaf6bbfdf8e4 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 12 Mar 2015 22:52:50 -0400 Subject: [PATCH 766/897] when toggling composer preview, autofocus on composer --- public/src/modules/composer.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index c36c42365e..71706704cb 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -348,7 +348,7 @@ define('composer', [ resize.handleResize(postContainer); handleHelp(postContainer); - handleToggle(postContainer); + handleTogglePreview(postContainer); $(window).trigger('action:composer.loaded', { post_uuid: post_uuid @@ -377,7 +377,7 @@ define('composer', [ }); } - function handleToggle(postContainer) { + function handleTogglePreview(postContainer) { var showBtn = postContainer.find('.write-container .toggle-preview'), hideBtn = postContainer.find('.preview-container .toggle-preview'); @@ -385,12 +385,16 @@ define('composer', [ $('.preview-container').addClass('hide'); $('.write-container').addClass('maximized'); showBtn.removeClass('hide'); + + $('.write').focus(); }); showBtn.on('click', function() { $('.preview-container').removeClass('hide'); $('.write-container').removeClass('maximized'); showBtn.addClass('hide'); + + $('.write').focus(); }); } From 89333ab339a2c371efdf8cff0941375e83827554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 13 Mar 2015 12:43:41 -0400 Subject: [PATCH 767/897] closes #2824 doggy.gif --- public/src/client/search.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index 44477cd06d..900a4d1d6d 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -116,19 +116,13 @@ define('forum/search', ['search', 'autocomplete'], function(searchModule, autoco if (!searchQuery) { return; } - var searchTerms = searchQuery.trim().split(' '); - var regexes = []; - for (var i=0; i' + regexes[i].term + ''); - } + var text = result.html().replace(regex, '$1'); result.html(text).find('img').addClass('img-responsive'); }); } From eda98a35eaded2a6d73d18a24bc8a6e534259512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 13 Mar 2015 15:01:52 -0400 Subject: [PATCH 768/897] closes #2862 --- .../textcomplete/jquery.textcomplete.css | 33 +++++++++++++++++++ .../textcomplete/jquery.textcomplete.min.js | 1 + src/meta/css.js | 1 + src/meta/js.js | 1 + 4 files changed, 36 insertions(+) create mode 100644 public/vendor/jquery/textcomplete/jquery.textcomplete.css create mode 100644 public/vendor/jquery/textcomplete/jquery.textcomplete.min.js diff --git a/public/vendor/jquery/textcomplete/jquery.textcomplete.css b/public/vendor/jquery/textcomplete/jquery.textcomplete.css new file mode 100644 index 0000000000..4c5643282b --- /dev/null +++ b/public/vendor/jquery/textcomplete/jquery.textcomplete.css @@ -0,0 +1,33 @@ +/* Sample */ + +.dropdown-menu { + border: 1px solid #ddd; + background-color: white; +} + +.dropdown-menu li { + border-top: 1px solid #ddd; + padding: 2px 5px; +} + +.dropdown-menu li:first-child { + border-top: none; +} + +.dropdown-menu li:hover, +.dropdown-menu .active { + background-color: rgb(110, 183, 219); +} + + +/* SHOULD not modify */ + +.dropdown-menu { + list-style: none; + padding: 0; + margin: 0; +} + +.dropdown-menu a:hover { + cursor: pointer; +} \ No newline at end of file diff --git a/public/vendor/jquery/textcomplete/jquery.textcomplete.min.js b/public/vendor/jquery/textcomplete/jquery.textcomplete.min.js new file mode 100644 index 0000000000..941ee008de --- /dev/null +++ b/public/vendor/jquery/textcomplete/jquery.textcomplete.min.js @@ -0,0 +1 @@ +/*! jquery-textcomplete - v0.4.0 - 2015-03-10 */if("undefined"==typeof jQuery)throw new Error("jQuery.textcomplete requires jQuery");+function(a){"use strict";var b=function(a){console.warn&&console.warn(a)};a.fn.textcomplete=function(c,d){var e=Array.prototype.slice.call(arguments);return this.each(function(){var f=a(this),g=f.data("textComplete");if(g||(g=new a.fn.textcomplete.Completer(this,d||{}),f.data("textComplete",g)),"string"==typeof c){if(!g)return;e.shift(),g[c].apply(g,e),"destroy"===c&&f.removeData("textComplete")}else a.each(c,function(c){a.each(["header","footer","placement","maxCount"],function(a){c[a]&&(g.option[a]=c[a],b(a+"as a strategy param is deprecated. Use option."),delete c[a])})}),g.register(a.fn.textcomplete.Strategy.parse(c))})}}(jQuery),+function(a){"use strict";function b(c,d){if(this.$el=a(c),this.id="textcomplete"+f++,this.strategies=[],this.views=[],this.option=a.extend({},b._getDefaults(),d),!this.$el.is("input[type=text]")&&!this.$el.is("textarea")&&!c.isContentEditable&&"true"!=c.contentEditable)throw new Error("textcomplete must be called on a Textarea or a ContentEditable.");if(c===document.activeElement)this.initialize();else{var e=this;this.$el.one("focus."+this.id,function(){e.initialize()})}}var c=function(a){var b,c;return function(){var d=Array.prototype.slice.call(arguments);if(b)return c=d,void 0;b=!0;var e=this;d.unshift(function f(){if(c){var d=c;c=void 0,d.unshift(f),a.apply(e,d)}else b=!1}),a.apply(this,d)}},d=function(a){return"[object String]"===Object.prototype.toString.call(a)},e=function(a){return"[object Function]"===Object.prototype.toString.call(a)},f=0;b._getDefaults=function(){return b.DEFAULTS||(b.DEFAULTS={appendTo:a("body"),zIndex:"100"}),b.DEFAULTS},a.extend(b.prototype,{id:null,option:null,strategies:null,adapter:null,dropdown:null,$el:null,initialize:function(){var b=this.$el.get(0);this.dropdown=new a.fn.textcomplete.Dropdown(b,this,this.option);var c,d;this.option.adapter?c=this.option.adapter:(d=this.$el.is("textarea")||this.$el.is("input[type=text]")?"number"==typeof b.selectionEnd?"Textarea":"IETextarea":"ContentEditable",c=a.fn.textcomplete[d]),this.adapter=new c(b,this,this.option)},destroy:function(){this.$el.off("."+this.id),this.adapter&&this.adapter.destroy(),this.dropdown&&this.dropdown.destroy(),this.$el=this.adapter=this.dropdown=null},trigger:function(a,b){this.dropdown||this.initialize(),null!=a||(a=this.adapter.getTextFromHeadToCaret());var c=this._extractSearchQuery(a);if(c.length){var d=c[1];if(b&&this._term===d)return;this._term=d,this._search.apply(this,c)}else this._term=null,this.dropdown.deactivate()},fire:function(a){var b=Array.prototype.slice.call(arguments,1);return this.$el.trigger(a,b),this},register:function(a){Array.prototype.push.apply(this.strategies,a)},select:function(a,b){this.adapter.select(a,b),this.fire("change").fire("textComplete:select",a,b),this.adapter.focus()},_clearAtNext:!0,_term:null,_extractSearchQuery:function(a){for(var b=0;b').css({display:"none",left:0,position:"absolute",zIndex:b.zIndex}).appendTo(c)),d}}),a.extend(b.prototype,{$el:null,$inputEl:null,completer:null,footer:null,header:null,id:null,maxCount:10,placement:"",shown:!1,data:[],className:"",destroy:function(){this.deactivate(),this.$el.off("."+this.id),this.$inputEl.off("."+this.id),this.clear(),this.$el=this.$inputEl=this.completer=null,delete d[this.id]},render:function(b){var c=this._buildContents(b),d=a.map(this.data,function(a){return a.value});this.data.length?(this._renderHeader(d),this._renderFooter(d),c&&(this._renderContents(c),this._activateIndexedItem()),this._setScroll()):this.shown&&this.deactivate()},setPosition:function(b){this.$el.css(this._applyPlacement(b));var b="absolute";return this.$inputEl.add(this.$inputEl.parents()).each(function(){return"absolute"===a(this).css("position")?!1:"fixed"===a(this).css("position")?(b="fixed",!1):void 0}),this.$el.css({position:b}),this},clear:function(){this.$el.html(""),this.data=[],this._index=0,this._$header=this._$footer=null},activate:function(){return this.shown||(this.clear(),this.$el.show(),this.className&&this.$el.addClass(this.className),this.completer.fire("textComplete:show"),this.shown=!0),this},deactivate:function(){return this.shown&&(this.$el.hide(),this.className&&this.$el.removeClass(this.className),this.completer.fire("textComplete:hide"),this.shown=!1),this},isUp:function(a){return 38===a.keyCode||a.ctrlKey&&80===a.keyCode},isDown:function(a){return 40===a.keyCode||a.ctrlKey&&78===a.keyCode},isEnter:function(a){var b=a.ctrlKey||a.altKey||a.metaKey||a.shiftKey;return!b&&(13===a.keyCode||9===a.keyCode||this.option.completeOnSpace===!0&&32===a.keyCode)},isPageup:function(a){return 33===a.keyCode},isPagedown:function(a){return 34===a.keyCode},isEscape:function(a){return 27===a.keyCode},_data:null,_index:null,_$header:null,_$footer:null,_bindEvents:function(){this.$el.on("mousedown."+this.id,".textcomplete-item",a.proxy(this._onClick,this)),this.$el.on("mouseover."+this.id,".textcomplete-item",a.proxy(this._onMouseover,this)),this.$inputEl.on("keydown."+this.id,a.proxy(this._onKeydown,this))},_onClick:function(b){var c=a(b.target);b.preventDefault(),b.originalEvent.keepTextCompleteDropdown=this.id,c.hasClass("textcomplete-item")||(c=c.closest(".textcomplete-item"));var d=this.data[parseInt(c.data("index"),10)];this.completer.select(d.value,d.strategy);var e=this;setTimeout(function(){e.deactivate()},0)},_onMouseover:function(b){var c=a(b.target);b.preventDefault(),c.hasClass("textcomplete-item")||(c=c.closest(".textcomplete-item")),this._index=parseInt(c.data("index"),10),this._activateIndexedItem()},_onKeydown:function(a){this.shown&&(this.isUp(a)?(a.preventDefault(),this._up()):this.isDown(a)?(a.preventDefault(),this._down()):this.isEnter(a)?(a.preventDefault(),this._enter()):this.isPageup(a)?(a.preventDefault(),this._pageup()):this.isPagedown(a)?(a.preventDefault(),this._pagedown()):this.isEscape(a)&&(a.preventDefault(),this.deactivate()))},_up:function(){0===this._index?this._index=this.data.length-1:this._index-=1,this._activateIndexedItem(),this._setScroll()},_down:function(){this._index===this.data.length-1?this._index=0:this._index+=1,this._activateIndexedItem(),this._setScroll()},_enter:function(){var a=this.data[parseInt(this._getActiveElement().data("index"),10)];this.completer.select(a.value,a.strategy),this.deactivate()},_pageup:function(){var b=0,c=this._getActiveElement().position().top-this.$el.innerHeight();this.$el.children().each(function(d){return a(this).position().top+a(this).outerHeight()>c?(b=d,!1):void 0}),this._index=b,this._activateIndexedItem(),this._setScroll()},_pagedown:function(){var b=this.data.length-1,c=this._getActiveElement().position().top+this.$el.innerHeight();this.$el.children().each(function(d){return a(this).position().top>c?(b=d,!1):void 0}),this._index=b,this._activateIndexedItem(),this._setScroll()},_activateIndexedItem:function(){this.$el.find(".textcomplete-item.active").removeClass("active"),this._getActiveElement().addClass("active")},_getActiveElement:function(){return this.$el.children(".textcomplete-item:nth("+this._index+")")},_setScroll:function(){var a=this._getActiveElement(),b=a.position().top,c=a.outerHeight(),d=this.$el.innerHeight(),e=this.$el.scrollTop();0===this._index||this._index==this.data.length-1||0>b?this.$el.scrollTop(b+e):b+c>d&&this.$el.scrollTop(b+c+e-d)},_buildContents:function(a){var b,d,e,f="";for(d=0;d',f+=b.strategy.template(b.value),f+="");return f},_renderHeader:function(b){if(this.header){this._$header||(this._$header=a('
  • ').prependTo(this.$el));var c=a.isFunction(this.header)?this.header(b):this.header;this._$header.html(c)}},_renderFooter:function(b){if(this.footer){this._$footer||(this._$footer=a('
  • ').appendTo(this.$el));var c=a.isFunction(this.footer)?this.footer(b):this.footer;this._$footer.html(c)}},_renderContents:function(a){this._$footer?this._$footer.before(a):this.$el.append(a)},_applyPlacement:function(a){return-1!==this.placement.indexOf("top")?a={top:"auto",bottom:this.$el.parent().height()-a.top+a.lineHeight,left:a.left}:(a.bottom="auto",delete a.lineHeight),-1!==this.placement.indexOf("absleft")?a.left=0:-1!==this.placement.indexOf("absright")&&(a.right=0,a.left="auto"),a}}),a.fn.textcomplete.Dropdown=b}(jQuery),+function(a){"use strict";function b(b){a.extend(this,b),this.cache&&(this.search=c(this.search))}var c=function(a){var b={};return function(c,d){b[c]?d(b[c]):a.call(this,c,function(a){b[c]=(b[c]||[]).concat(a),d.apply(null,arguments)})}};b.parse=function(c){return a.map(c,function(a){return new b(a)})},a.extend(b.prototype,{match:null,replace:null,search:null,cache:!1,context:function(){return!0},index:2,template:function(a){return a},idProperty:null}),a.fn.textcomplete.Strategy=b}(jQuery),+function(a){"use strict";function b(){}var c=Date.now||function(){return(new Date).getTime()},d=function(a,b){var d,e,f,g,h,i=function(){var j=c()-g;b>j?d=setTimeout(i,b-j):(d=null,h=a.apply(f,e),f=e=null)};return function(){return f=this,e=arguments,g=c(),d||(d=setTimeout(i,b)),h}};a.extend(b.prototype,{id:null,completer:null,el:null,$el:null,option:null,initialize:function(b,c,e){this.el=b,this.$el=a(b),this.id=c.id+this.constructor.name,this.completer=c,this.option=e,this.option.debounce&&(this._onKeyup=d(this._onKeyup,this.option.debounce)),this._bindEvents()},destroy:function(){this.$el.off("."+this.id),this.$el=this.el=this.completer=null},select:function(){throw new Error("Not implemented")},getCaretPosition:function(){var a=this._getCaretRelativePosition(),b=this.$el.offset();return a.top+=b.top,a.left+=b.left,a},focus:function(){this.$el.focus()},_bindEvents:function(){this.$el.on("keyup."+this.id,a.proxy(this._onKeyup,this))},_onKeyup:function(a){this._skipSearch(a)||this.completer.trigger(this.getTextFromHeadToCaret(),!0)},_skipSearch:function(a){switch(a.keyCode){case 13:case 40:case 38:return!0}if(a.ctrlKey)switch(a.keyCode){case 78:case 80:return!0}}}),a.fn.textcomplete.Adapter=b}(jQuery),+function(a){"use strict";function b(a,b,c){this.initialize(a,b,c)}b.DIV_PROPERTIES={left:-9999,position:"absolute",top:0,whiteSpace:"pre-wrap"},b.COPY_PROPERTIES=["border-width","font-family","font-size","font-style","font-variant","font-weight","height","letter-spacing","word-spacing","line-height","text-decoration","text-align","width","padding-top","padding-right","padding-bottom","padding-left","margin-top","margin-right","margin-bottom","margin-left","border-style","box-sizing","tab-size"],a.extend(b.prototype,a.fn.textcomplete.Adapter.prototype,{select:function(b,c){var d=this.getTextFromHeadToCaret(),e=this.el.value.substring(this.el.selectionEnd),f=c.replace(b);a.isArray(f)&&(e=f[1]+e,f=f[0]),d=d.replace(c.match,f),this.$el.val(d+e),this.el.selectionStart=this.el.selectionEnd=d.length},_getCaretRelativePosition:function(){var b=a("
    ").css(this._copyCss()).text(this.getTextFromHeadToCaret()),c=a("").text(".").appendTo(b);this.$el.before(b);var d=c.position();return d.top+=c.height()-this.$el.scrollTop(),d.lineHeight=c.height(),b.remove(),d},_copyCss:function(){return a.extend({overflow:this.el.scrollHeight>this.el.offsetHeight?"scroll":"auto"},b.DIV_PROPERTIES,this._getStyles())},_getStyles:function(a){var c=a("
    ").css(["color"]).color;return"undefined"!=typeof c?function(){return this.$el.css(b.COPY_PROPERTIES)}:function(){var c=this.$el,d={};return a.each(b.COPY_PROPERTIES,function(a,b){d[b]=c.css(b)}),d}}(a),getTextFromHeadToCaret:function(){return this.el.value.substring(0,this.el.selectionEnd)}}),a.fn.textcomplete.Textarea=b}(jQuery),+function(a){"use strict";function b(b,d,e){this.initialize(b,d,e),a(""+c+"").css({position:"absolute",top:-9999,left:-9999}).insertBefore(b)}var c="吶";a.extend(b.prototype,a.fn.textcomplete.Textarea.prototype,{select:function(b,c){var d=this.getTextFromHeadToCaret(),e=this.el.value.substring(d.length),f=c.replace(b);a.isArray(f)&&(e=f[1]+e,f=f[0]),d=d.replace(c.match,f),this.$el.val(d+e),this.el.focus();var g=this.el.createTextRange();g.collapse(!0),g.moveEnd("character",d.length),g.moveStart("character",d.length),g.select()},getTextFromHeadToCaret:function(){this.el.focus();var a=document.selection.createRange();a.moveStart("character",-this.el.value.length);var b=a.text.split(c);return 1===b.length?b[0]:b[1]}}),a.fn.textcomplete.IETextarea=b}(jQuery),+function(a){"use strict";function b(a,b,c){this.initialize(a,b,c)}a.extend(b.prototype,a.fn.textcomplete.Adapter.prototype,{select:function(b,c){var d=this.getTextFromHeadToCaret(),e=window.getSelection(),f=e.getRangeAt(0),g=f.cloneRange();g.selectNodeContents(f.startContainer);var h=g.toString(),i=h.substring(f.startOffset),j=c.replace(b);a.isArray(j)&&(i=j[1]+i,j=j[0]),d=d.replace(c.match,j),f.selectNodeContents(f.startContainer),f.deleteContents();var k=document.createTextNode(d+i);f.insertNode(k),f.setStart(k,d.length),f.collapse(!0),e.removeAllRanges(),e.addRange(f)},_getCaretRelativePosition:function(){var b=window.getSelection().getRangeAt(0).cloneRange(),c=document.createElement("span");b.insertNode(c),b.selectNodeContents(c),b.deleteContents();var d=a(c),e=d.offset();e.left-=this.$el.offset().left,e.top+=d.height()-this.$el.offset().top,e.lineHeight=d.height(),d.remove();var f=this.$el.attr("dir")||this.$el.css("direction");return"rtl"===f&&(e.left-=this.listView.$el.width()),e},getTextFromHeadToCaret:function(){var a=window.getSelection().getRangeAt(0),b=a.cloneRange();return b.selectNodeContents(a.startContainer),b.toString().substring(0,a.startOffset)}}),a.fn.textcomplete.ContentEditable=b}(jQuery); diff --git a/src/meta/css.js b/src/meta/css.js index e0f0412e1c..d45b61f280 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -49,6 +49,7 @@ module.exports = function(Meta) { source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css";'; source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";'; + source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/textcomplete/jquery.textcomplete.css";'; source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";'; acpSource = '\n@import "..' + path.sep + 'public/less/admin/admin";\n' + source; diff --git a/src/meta/js.js b/src/meta/js.js index 177d8b03c8..4373d21a1d 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -31,6 +31,7 @@ module.exports = function(Meta) { 'public/vendor/visibility/visibility.min.js', 'public/vendor/bootstrap/js/bootstrap.min.js', 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js', + 'public/vendor/jquery/textcomplete/jquery.textcomplete.min.js', 'public/vendor/requirejs/require.js', 'public/vendor/bootbox/bootbox.min.js', 'public/vendor/tinycon/tinycon.js', From bab8e6a10405086c43528c2b3a3a9d8b226ea214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 13 Mar 2015 15:04:24 -0400 Subject: [PATCH 769/897] closes #2858 --- src/postTools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/postTools.js b/src/postTools.js index 9ddc7b999e..3e9712699e 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -156,7 +156,7 @@ var cache = LRU({ } if (isDelete) { - cache.del(postData.pid); + cache.del(pid); posts.delete(pid, callback); } else { posts.restore(pid, function(err, postData) { From d3dca842cb2decb87107d0dc148053ca7ab34a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 13 Mar 2015 15:06:23 -0400 Subject: [PATCH 770/897] also #2858 --- src/socket.io/topics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index cd42d1fde4..b0f9d3b8c7 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -17,7 +17,7 @@ var nconf = require('nconf'), meta = require('../meta'), events = require('../events'), utils = require('../../public/src/utils'), - SocketPosts = require('./posts'), + SocketTopics = {}; @@ -312,7 +312,7 @@ SocketTopics.movePost = function(socket, data, callback) { return callback(err); } - SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, 'notifications:moved_your_post'); + require('./posts').sendNotificationToPostOwner(data.pid, socket.uid, 'notifications:moved_your_post'); callback(); }); }); From 64918dfcb41b911fc4686554ee210b4f172a227b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 13 Mar 2015 15:31:14 -0400 Subject: [PATCH 771/897] up mentions ver --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 24bc90bef9..1877079d6f 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "nodebb-plugin-dbsearch": "^0.1.0", "nodebb-plugin-emoji-extended": "^0.4.1-4", "nodebb-plugin-markdown": "^1.0.0", - "nodebb-plugin-mentions": "^0.10.0", + "nodebb-plugin-mentions": "^0.11.0", "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", "nodebb-theme-lavender": "^1.0.6", From abf27954d37855b25be0e3b958f9ff7c36855531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 13 Mar 2015 16:33:00 -0400 Subject: [PATCH 772/897] use topic.getMainPids --- src/search.js | 28 +++++----------------------- src/topics.js | 6 +++++- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/search.js b/src/search.js index 8ccdf77d78..e44dedc216 100644 --- a/src/search.js +++ b/src/search.js @@ -85,16 +85,14 @@ function searchInContent(query, data, callback) { async.waterfall([ function(next) { - getMainPids(results.tids, next); + topics.getMainPids(results.tids, next); }, function(mainPids, next) { - results.pids.forEach(function(pid) { - if (mainPids.indexOf(pid.toString()) === -1) { - mainPids.push(pid); - } + results.pids = mainPids.concat(results.pids).filter(function(pid, index, array) { + return pid && array.indexOf(pid) === index; }); - - privileges.posts.filter('read', mainPids, data.uid, next); + + privileges.posts.filter('read', results.pids, data.uid, next); }, function(pids, next) { filterAndSort(pids, data, results.searchCategories, next); @@ -460,22 +458,6 @@ function searchInTags(query, callback) { }); } -function getMainPids(tids, callback) { - if (!Array.isArray(tids) || !tids.length) { - return callback(null, []); - } - - topics.getTopicsFields(tids, ['mainPid'], function(err, topics) { - if (err) { - return callback(err); - } - topics = topics.map(function(topic) { - return topic && topic.mainPid && topic.mainPid.toString(); - }).filter(Boolean); - callback(null, topics); - }); -} - search.searchQuery = function(index, query, callback) { plugins.fireHook('filter:search.query', { index: index, diff --git a/src/topics.js b/src/topics.js index aecdcb1000..0cc153e85e 100644 --- a/src/topics.js +++ b/src/topics.js @@ -287,13 +287,17 @@ var async = require('async'), }; Topics.getMainPids = function(tids, callback) { + if (!Array.isArray(tids) || !tids.length) { + return callback(null, []); + } + Topics.getTopicsFields(tids, ['mainPid'], function(err, topicData) { if (err) { return callback(err); } var mainPids = topicData.map(function(topic) { - return topic ? topic.mainPid : null; + return topic && topic.mainPid; }); callback(null, mainPids); }); From f8f4a6e8444b3c31990e2598319487e626aaf8de Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Mar 2015 17:59:37 -0400 Subject: [PATCH 773/897] removed footer class --- src/views/admin/manage/flags.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl index a87f450a47..f463d829d2 100644 --- a/src/views/admin/manage/flags.tpl +++ b/src/views/admin/manage/flags.tpl @@ -50,7 +50,7 @@

  • No results...
    • - + Posted in {posts.category.name}, • Read More From 32369f61910be9cd9672b48471ebe16c7342b00c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Mar 2015 18:04:07 -0400 Subject: [PATCH 774/897] disabled textcomplete css for now --- public/vendor/jquery/textcomplete/jquery.textcomplete.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/vendor/jquery/textcomplete/jquery.textcomplete.css b/public/vendor/jquery/textcomplete/jquery.textcomplete.css index 4c5643282b..d33f066c5a 100644 --- a/public/vendor/jquery/textcomplete/jquery.textcomplete.css +++ b/public/vendor/jquery/textcomplete/jquery.textcomplete.css @@ -1,6 +1,6 @@ /* Sample */ -.dropdown-menu { +/*.dropdown-menu { border: 1px solid #ddd; background-color: white; } @@ -17,12 +17,12 @@ .dropdown-menu li:hover, .dropdown-menu .active { background-color: rgb(110, 183, 219); -} +}*/ /* SHOULD not modify */ -.dropdown-menu { +/*.dropdown-menu { list-style: none; padding: 0; margin: 0; @@ -30,4 +30,4 @@ .dropdown-menu a:hover { cursor: pointer; -} \ No newline at end of file +}*/ \ No newline at end of file From c448c8cc8cfeb14c9d6d57909f0364029f4a739c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Mar 2015 23:32:50 -0400 Subject: [PATCH 775/897] closes #2864 --- public/src/ajaxify.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 0161d8a6ae..6178587423 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -78,6 +78,10 @@ $(document).ready(function() { $(window).trigger('action:ajaxify.start', {url: url}); + if (!window.location.pathname.match(/\/(403|404)$/g)) { + app.previousUrl = window.location.href; + } + ajaxify.currentPage = url; if (window.history && window.history.pushState) { @@ -243,10 +247,6 @@ $(document).ready(function() { return e.preventDefault(); } - if (!window.location.pathname.match(/\/(403|404)$/g)) { - app.previousUrl = window.location.href; - } - if (!e.ctrlKey && !e.shiftKey && !e.metaKey && e.which === 1) { if (this.host === '' || this.host === window.location.host) { // Internal link From a73f34df4a2e327f5de72a1a6fe18ea8af3c317c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 13 Mar 2015 23:44:11 -0400 Subject: [PATCH 776/897] no need for ajaxify.end listener --- public/src/client/chats.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/public/src/client/chats.js b/public/src/client/chats.js index fe491b49c3..cde94aa71a 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -20,10 +20,8 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S, Chats.addEventListeners(); Chats.setActive(); - $(window).on('action:ajaxify.end', function() { - Chats.resizeMainWindow(); - Chats.scrollToBottom(containerEl); - }); + Chats.resizeMainWindow(); + Chats.scrollToBottom($('.expanded-chat ul')); Chats.initialised = true; }; From 203e69aa426077c599ad92d43d45494a59a49bca Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 14 Mar 2015 01:05:03 -0400 Subject: [PATCH 777/897] derp --- src/routes/index.js | 61 +++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/src/routes/index.js b/src/routes/index.js index 37ce391e54..5efca3f067 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -173,50 +173,51 @@ module.exports = function(app, middleware) { function handle404(app, middleware) { app.use(function(req, res, next) { - if (!plugins.hasListeners('action:meta.override404')) { - var relativePath = nconf.get('relative_path'); - var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'), - isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js'); - - if (isClientScript.test(req.url)) { - res.type('text/javascript').status(200).send(''); - } else if (isLanguage.test(req.url)) { - res.status(200).json({}); - } else if (req.accepts('html')) { - if (process.env.NODE_ENV === 'development') { - winston.warn('Route requested but not found: ' + req.url); - } - - res.status(404); - - if (res.locals.isAPI) { - return res.json({path: req.path, error: 'not-found'}); - } - - middleware.buildHeader(req, res, function() { - res.render('404', {path: req.path}); - }); - } else { - res.status(404).type('txt').send('Not found'); - } - } else { - plugins.fireHook('action:meta.override404', { + if (plugins.hasListeners('action:meta.override404')) { + return plugins.fireHook('action:meta.override404', { req: req, res: res, error: {} }); } + + var relativePath = nconf.get('relative_path'); + var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'), + isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js'); + + if (isClientScript.test(req.url)) { + res.type('text/javascript').status(200).send(''); + } else if (isLanguage.test(req.url)) { + res.status(200).json({}); + } else if (req.accepts('html')) { + if (process.env.NODE_ENV === 'development') { + winston.warn('Route requested but not found: ' + req.url); + } + + res.status(404); + + if (res.locals.isAPI) { + return res.json({path: req.path, error: 'not-found'}); + } + + middleware.buildHeader(req, res, function() { + res.render('404', {path: req.path}); + }); + } else { + res.status(404).type('txt').send('Not found'); + } }); } function handleErrors(app, middleware) { app.use(function(err, req, res, next) { - winston.error(req.path + '\n', err.stack); - if (err.code === 'EBADCSRFTOKEN') { + winston.error(req.path + '\n', err.message) return res.sendStatus(403); } + winston.error(req.path + '\n', err.stack); + if (parseInt(err.status, 10) === 302 && err.path) { return res.locals.isAPI ? res.status(302).json(err.path) : res.redirect(err.path); } From ec8fc8b97b0eec5481abec75bb2cac2dce4988f2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 14 Mar 2015 16:30:06 -0400 Subject: [PATCH 778/897] dont do anything if id is falsy added callback --- src/database/mongo/main.js | 5 ++++- src/database/redis/main.js | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 8509475bc4..029b8f1fee 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -41,7 +41,10 @@ module.exports = function(db, module) { module.searchRemove = function(key, id, callback) { callback = callback || helpers.noop; - db.collection('search').remove({key:key, id:id}, callback); + if (!id) { + return callback(); + } + db.collection('search').remove({key: key, id: id}, callback); }; module.flushdb = function(callback) { diff --git a/src/database/redis/main.js b/src/database/redis/main.js index ebad6ae8e6..094fa3b695 100644 --- a/src/database/redis/main.js +++ b/src/database/redis/main.js @@ -26,7 +26,12 @@ module.exports = function(redisClient, module) { }; module.searchRemove = function(key, id, callback) { - if(key === 'post') { + callback = callback || function() {}; + if (!id) { + return callback(); + } + + if (key === 'post') { module.postSearch.remove(id, callback); } else if(key === 'topic') { module.topicSearch.remove(id, callback); From 868b2ff2b66ecc9d4a8a859fe618d26b1454cb4b Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 14 Mar 2015 20:46:28 -0400 Subject: [PATCH 779/897] if no term is passed get count --- src/posts/recent.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/posts/recent.js b/src/posts/recent.js index 4a970a6435..d41ef5342e 100644 --- a/src/posts/recent.js +++ b/src/posts/recent.js @@ -13,16 +13,16 @@ module.exports = function(Posts) { }; Posts.getRecentPosts = function(uid, start, stop, term, callback) { - var since = terms.day; + var min = 0; if (terms[term]) { - since = terms[term]; + min = Date.now() - terms[term]; } var count = parseInt(stop, 10) === -1 ? stop : stop - start + 1; async.waterfall([ function(next) { - db.getSortedSetRevRangeByScore('posts:pid', start, count, '+inf', Date.now() - since, next); + db.getSortedSetRevRangeByScore('posts:pid', start, count, '+inf', min, next); }, function(pids, next) { privileges.posts.filter('read', pids, uid, next); From fd5f00459b0ec28e6bb3e81661ad90b30515fb4f Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 14 Mar 2015 21:10:36 -0400 Subject: [PATCH 780/897] fix admin events pagination --- src/socket.io/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index 6860fb6e66..6b61d523f3 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -304,7 +304,7 @@ SocketAdmin.getMoreEvents = function(socket, next, callback) { if (start < 0) { return callback(null, {data: [], next: next}); } - var end = next + 10; + var end = start + 10; events.getEvents(start, end, function(err, events) { if (err) { return callback(err); From c7128bcc989bac77bb810f3aaa2964892b59dd53 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 14 Mar 2015 23:00:24 -0400 Subject: [PATCH 781/897] part 1 of search change --- src/database/mongo.js | 2 + src/database/mongo/main.js | 38 +++++++--- src/database/redis.js | 12 ++-- src/database/redis/main.js | 22 ++---- src/search.js | 141 ++++++++++++++++++++----------------- src/user.js | 6 +- 6 files changed, 125 insertions(+), 96 deletions(-) diff --git a/src/database/mongo.js b/src/database/mongo.js index 0e69c12380..9e4399b031 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -112,6 +112,8 @@ createIndex('search', {content:'text'}, {background:true}); createIndex('search', {key: 1, id: 1}, {background:true}); + createIndex('search', {cid: 1}, {background:true}); + createIndex('search', {uid: 1}, {background:true}); if (typeof callback === 'function') { callback(); diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 029b8f1fee..a40567e2a6 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -5,15 +5,19 @@ var winston = require('winston'); module.exports = function(db, module) { var helpers = module.helpers.mongo; - module.searchIndex = function(key, content, id, callback) { + module.searchIndex = function(key, data, id, callback) { callback = callback || function() {}; - var data = { + var setData = { id: id, - key: key, - content: content + key: key }; + for(var field in data) { + if (data.hasOwnProperty(field)) { + setData[field] = data[field]; + } + } - db.collection('search').update({key:key, id:id}, {$set:data}, {upsert:true, w: 1}, function(err) { + db.collection('search').update({key: key, id: id}, {$set: setData}, {upsert:true, w: 1}, function(err) { if(err) { winston.error('Error indexing ' + err.message); } @@ -21,13 +25,29 @@ module.exports = function(db, module) { }); }; - module.search = function(key, term, limit, callback) { - db.collection('search').find({ $text: { $search: term }, key: key}, {limit: limit}).toArray(function(err, results) { - if(err) { + module.search = function(key, data, limit, callback) { + var searchQuery = { + key: key + }; + + if (data.content) { + searchQuery.$text = {$search: data.content}; + } + + if (data.cid) { + searchQuery.cid = data.cid; + } + + if (data.uid) { + searchQuery.uid = data.uid; + } + + db.collection('search').find(searchQuery, {limit: limit}).toArray(function(err, results) { + if (err) { return callback(err); } - if(!results || !results.length) { + if (!results || !results.length) { return callback(null, []); } diff --git a/src/database/redis.js b/src/database/redis.js index 727705c130..716a8fd715 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -9,7 +9,7 @@ utils = require('./../../public/src/utils.js'), redis, connectRedis, - reds, + redisSearch, redisClient, postSearch, topicSearch; @@ -41,7 +41,7 @@ try { redis = require('redis'); connectRedis = require('connect-redis')(session); - reds = require('reds'); + redisSearch = require('redisearch'); } catch (err) { winston.error('Unable to initialize Redis! Is Redis installed? Error :' + err.message); process.exit(); @@ -56,12 +56,8 @@ ttl: 60 * 60 * 24 * 14 }); - reds.createClient = function () { - return reds.client || (reds.client = redisClient); - }; - - module.postSearch = reds.createSearch('nodebbpostsearch'); - module.topicSearch = reds.createSearch('nodebbtopicsearch'); + module.postSearch = redisSearch.createSearch('nodebbpostsearch', redisClient); + module.topicSearch = redisSearch.createSearch('nodebbtopicsearch', redisClient); require('./redis/main')(redisClient, module); require('./redis/hash')(redisClient, module); diff --git a/src/database/redis/main.js b/src/database/redis/main.js index 094fa3b695..9ed956f0b3 100644 --- a/src/database/redis/main.js +++ b/src/database/redis/main.js @@ -1,27 +1,19 @@ "use strict"; module.exports = function(redisClient, module) { - module.searchIndex = function(key, content, id, callback) { + module.searchIndex = function(key, data, id, callback) { if (key === 'post') { - module.postSearch.index(content, id, callback); + module.postSearch.index(data, id, callback); } else if(key === 'topic') { - module.topicSearch.index(content, id, callback); + module.topicSearch.index(data, id, callback); } }; - module.search = function(key, term, limit, callback) { - function search(searchObj, callback) { - searchObj - .query(term) - .between(0, limit - 1) - .type('or') - .end(callback); - } - - if(key === 'post') { - search(module.postSearch, callback); + module.search = function(key, data, limit, callback) { + if (key === 'post') { + module.postSearch.query(data, 0, limit - 1, callback); } else if(key === 'topic') { - search(module.topicSearch, callback); + module.topicSearch.query(data, 0, limit - 1, callback); } }; diff --git a/src/search.js b/src/search.js index e44dedc216..a478d7f8e9 100644 --- a/src/search.js +++ b/src/search.js @@ -43,7 +43,7 @@ search.search = function(data, callback) { }; if (searchIn === 'posts' || searchIn === 'titles' || searchIn === 'titlesposts') { - searchInContent(query, data, done); + searchInContent(data, done); } else if (searchIn === 'users') { searchInUsers(query, data.uid, done); } else if (searchIn === 'tags') { @@ -53,77 +53,80 @@ search.search = function(data, callback) { } }; -function searchInContent(query, data, callback) { +function searchInContent(data, callback) { data.uid = data.uid || 0; async.parallel({ - pids: function(next) { - if (data.searchIn === 'posts' || data.searchIn === 'titlesposts') { - search.searchQuery('post', query, next); - } else { - next(null, []); - } - }, - tids: function(next) { - if (data.searchIn === 'titles' || data.searchIn === 'titlesposts') { - search.searchQuery('topic', query, next); - } else { - next(null, []); - } + searchCids: function(next) { + getSearchCids(data, next); }, - searchCategories: function(next) { - getSearchCategories(data, next); + searchUids: function(next) { + getSearchUids(data, next); } - }, function (err, results) { + }, function(err, results) { if (err) { return callback(err); } - var matchCount = 0; - if (!results || (!results.pids.length && !results.tids.length)) { - return callback(null, {matches: [], matchCount: matchCount}); - } - - async.waterfall([ - function(next) { - topics.getMainPids(results.tids, next); - }, - function(mainPids, next) { - results.pids = mainPids.concat(results.pids).filter(function(pid, index, array) { - return pid && array.indexOf(pid) === index; - }); - - privileges.posts.filter('read', results.pids, data.uid, next); - }, - function(pids, next) { - filterAndSort(pids, data, results.searchCategories, next); - }, - function(pids, next) { - matchCount = pids.length; - if (data.page) { - var start = Math.max(0, (data.page - 1)) * 10; - pids = pids.slice(start, start + 10); + async.parallel({ + pids: function(next) { + if (data.searchIn === 'posts' || data.searchIn === 'titlesposts') { + search.searchQuery('post', data.query, results.searchCids, results.searchUids, next); + } else { + next(null, []); } - - posts.getPostSummaryByPids(pids, data.uid, {stripTags: true, parse: false}, next); }, - function(posts, next) { - next(null, {matches: posts, matchCount: matchCount}); + tids: function(next) { + if (data.searchIn === 'titles' || data.searchIn === 'titlesposts') { + search.searchQuery('topic', data.query, results.searchCids, results.searchUids, next); + } else { + next(null, []); + } + } + }, function (err, results) { + if (err) { + return callback(err); + } +console.log(results) + var matchCount = 0; + if (!results || (!results.pids.length && !results.tids.length)) { + return callback(null, {matches: [], matchCount: matchCount}); } - ], callback); + + async.waterfall([ + function(next) { + topics.getMainPids(results.tids, next); + }, + function(mainPids, next) { + results.pids = mainPids.concat(results.pids).filter(function(pid, index, array) { + return pid && array.indexOf(pid) === index; + }); + + privileges.posts.filter('read', results.pids, data.uid, next); + }, + function(pids, next) { + filterAndSort(pids, data, results.searchCategories, next); + }, + function(pids, next) { + matchCount = pids.length; + if (data.page) { + var start = Math.max(0, (data.page - 1)) * 10; + pids = pids.slice(start, start + 10); + } + + posts.getPostSummaryByPids(pids, data.uid, {stripTags: true, parse: false}, next); + }, + function(posts, next) { + next(null, {matches: posts, matchCount: matchCount}); + } + ], callback); + }); }); } -function filterAndSort(pids, data, searchCategories, callback) { +function filterAndSort(pids, data, callback) { async.parallel({ posts: function(next) { - getMatchedPosts(pids, data, searchCategories, next); - }, - postedByUid: function(next) { - if (data.postedBy) { - user.getUidByUsername(data.postedBy, next); - } else { - next(); - } + getMatchedPosts(pids, data, next); } }, function(err, results) { if (err) { @@ -134,8 +137,6 @@ function filterAndSort(pids, data, searchCategories, callback) { } var posts = results.posts.filter(Boolean); - posts = filterByUser(posts, results.postedByUid); - posts = filterByCategories(posts, searchCategories); posts = filterByPostcount(posts, data.replies, data.repliesFilter); posts = filterByTimerange(posts, data.timeRange, data.timeFilter); @@ -149,7 +150,7 @@ function filterAndSort(pids, data, searchCategories, callback) { }); } -function getMatchedPosts(pids, data, searchCategories, callback) { +function getMatchedPosts(pids, data, callback) { var postFields = ['pid', 'tid', 'timestamp']; var topicFields = []; var categoryFields = []; @@ -158,7 +159,7 @@ function getMatchedPosts(pids, data, searchCategories, callback) { postFields.push('uid'); } - if (searchCategories.length || (data.sortBy && data.sortBy.startsWith('category.'))) { + if (data.sortBy && data.sortBy.startsWith('category.')) { topicFields.push('cid'); } @@ -389,7 +390,7 @@ function sortPosts(posts, data) { } } -function getSearchCategories(data, callback) { +function getSearchCids(data, callback) { if (!Array.isArray(data.categories) || !data.categories.length || data.categories.indexOf('all') !== -1) { return callback(null, []); } @@ -439,6 +440,18 @@ function getChildrenCids(cids, uid, callback) { }); } +function getSearchUids(data, callback) { + if (data.postedBy) { + if (Array.isArray(data.postedBy)) { + user.getUidsByUsernames(data.postedBy, callback); + } else { + user.getUidByUsername([data.postedBy], callback); + } + } else { + callback(null, []); + } +} + function searchInUsers(query, uid, callback) { user.search({query: query, uid: uid}, function(err, results) { if (err) { @@ -458,10 +471,12 @@ function searchInTags(query, callback) { }); } -search.searchQuery = function(index, query, callback) { +search.searchQuery = function(index, content, cids, uids, callback) { plugins.fireHook('filter:search.query', { index: index, - query: query + content: content, + cids: cids, + uids: uids }, callback); }; diff --git a/src/user.js b/src/user.js index 109e67a3f0..bd0eed4ef4 100644 --- a/src/user.js +++ b/src/user.js @@ -158,7 +158,7 @@ var async = require('async'), if (now - parseInt(userOnlineTime, 10) < 300000) { return callback(); } - db.sortedSetAdd('users:online', now, uid, next); + db.sortedSetAdd('users:online', now, uid, next); }, function(next) { topics.pushUnreadCount(uid); @@ -334,6 +334,10 @@ var async = require('async'), db.getObjectField('username:uid', username, callback); }; + User.getUidsByUsernames = function(usernames, callback) { + db.getObjectFields('username:uid', usernames, callback); + }; + User.getUidByUserslug = function(userslug, callback) { if (!userslug) { return callback(); From e2196af8ab38589504654f3b2cbe34f6aecd0ec2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 15 Mar 2015 00:12:52 -0400 Subject: [PATCH 782/897] part 2 of search changes --- src/database/mongo/main.js | 4 +++- src/database/redis/main.js | 27 ++++++++++----------- src/search.js | 48 ++++++++------------------------------ 3 files changed, 25 insertions(+), 54 deletions(-) diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index a40567e2a6..6302d76fb2 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -64,7 +64,9 @@ module.exports = function(db, module) { if (!id) { return callback(); } - db.collection('search').remove({key: key, id: id}, callback); + db.collection('search').remove({key: key, id: id}, function(err, res) { + callback(err); + }); }; module.flushdb = function(callback) { diff --git a/src/database/redis/main.js b/src/database/redis/main.js index 9ed956f0b3..b09574e10f 100644 --- a/src/database/redis/main.js +++ b/src/database/redis/main.js @@ -2,19 +2,17 @@ module.exports = function(redisClient, module) { module.searchIndex = function(key, data, id, callback) { - if (key === 'post') { - module.postSearch.index(data, id, callback); - } else if(key === 'topic') { - module.topicSearch.index(data, id, callback); - } + var method = key === 'post' ? module.postSearch : module.topicSearch; + + method.index(data, id, function(err, res) { + callback(err); + }); }; module.search = function(key, data, limit, callback) { - if (key === 'post') { - module.postSearch.query(data, 0, limit - 1, callback); - } else if(key === 'topic') { - module.topicSearch.query(data, 0, limit - 1, callback); - } + var method = key === 'post' ? module.postSearch : module.topicSearch; + + method.query(data, 0, limit - 1, callback); }; module.searchRemove = function(key, id, callback) { @@ -22,12 +20,11 @@ module.exports = function(redisClient, module) { if (!id) { return callback(); } + var method = key === 'post' ? module.postSearch : module.topicSearch; - if (key === 'post') { - module.postSearch.remove(id, callback); - } else if(key === 'topic') { - module.topicSearch.remove(id, callback); - } + method.remove(id, function(err, res) { + callback(err); + }); }; module.flushdb = function(callback) { diff --git a/src/search.js b/src/search.js index a478d7f8e9..8315312bec 100644 --- a/src/search.js +++ b/src/search.js @@ -104,7 +104,7 @@ console.log(results) privileges.posts.filter('read', results.pids, data.uid, next); }, function(pids, next) { - filterAndSort(pids, data, results.searchCategories, next); + filterAndSort(pids, data, next); }, function(pids, next) { matchCount = pids.length; @@ -124,18 +124,15 @@ console.log(results) } function filterAndSort(pids, data, callback) { - async.parallel({ - posts: function(next) { - getMatchedPosts(pids, data, next); - } - }, function(err, results) { + getMatchedPosts(pids, data, function(err, posts) { if (err) { return callback(err); } - if (!results.posts) { + + if (!Array.isArray(posts) || !posts.length) { return callback(null, pids); } - var posts = results.posts.filter(Boolean); + posts = posts.filter(Boolean); posts = filterByPostcount(posts, data.replies, data.repliesFilter); posts = filterByTimerange(posts, data.timeRange, data.timeFilter); @@ -155,20 +152,14 @@ function getMatchedPosts(pids, data, callback) { var topicFields = []; var categoryFields = []; - if (data.postedBy) { - postFields.push('uid'); - } - - if (data.sortBy && data.sortBy.startsWith('category.')) { - topicFields.push('cid'); - } - if (data.replies) { topicFields.push('postcount'); } if (data.sortBy) { - if (data.sortBy.startsWith('topic.')) { + if (data.sortBy.startsWith('category')) { + topicFields.push('cid'); + } else if (data.sortBy.startsWith('topic.')) { topicFields.push(data.sortBy.split('.')[1]); } else if (data.sortBy.startsWith('user.')) { postFields.push('uid'); @@ -281,25 +272,6 @@ function getMatchedPosts(pids, data, callback) { ], callback); } -function filterByUser(posts, postedByUid) { - if (postedByUid) { - postedByUid = parseInt(postedByUid, 10); - posts = posts.filter(function(post) { - return parseInt(post.uid, 10) === postedByUid; - }); - } - return posts; -} - -function filterByCategories(posts, searchCategories) { - if (searchCategories.length) { - posts = posts.filter(function(post) { - return post.topic && searchCategories.indexOf(post.topic.cid) !== -1; - }); - } - return posts; -} - function filterByPostcount(posts, postCount, repliesFilter) { postCount = parseInt(postCount, 10); if (postCount) { @@ -475,8 +447,8 @@ search.searchQuery = function(index, content, cids, uids, callback) { plugins.fireHook('filter:search.query', { index: index, content: content, - cids: cids, - uids: uids + cid: cids, + uid: uids }, callback); }; From 31da62ab2d78832fd987012892fc0501e4f23b03 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 15 Mar 2015 00:13:26 -0400 Subject: [PATCH 783/897] removed console.log --- src/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search.js b/src/search.js index 8315312bec..257ce6f352 100644 --- a/src/search.js +++ b/src/search.js @@ -86,7 +86,7 @@ function searchInContent(data, callback) { if (err) { return callback(err); } -console.log(results) + var matchCount = 0; if (!results || (!results.pids.length && !results.tids.length)) { return callback(null, {matches: [], matchCount: matchCount}); From 2b7744f9050151db0160483ee52983ce3da15a77 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 15 Mar 2015 00:24:08 -0400 Subject: [PATCH 784/897] fire action:topic.move after topic cid is changed --- src/threadTools.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/threadTools.js b/src/threadTools.js index 96d8198291..109a4215ce 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -183,13 +183,16 @@ var async = require('async'), categories.moveRecentReplies(tid, oldCid, cid); - topics.setTopicField(tid, 'cid', cid, callback); - - plugins.fireHook('action:topic.move', { - tid: tid, - fromCid: oldCid, - toCid: cid, - uid: uid + topics.setTopicField(tid, 'cid', cid, function(err) { + if (err) { + return callback(err); + } + plugins.fireHook('action:topic.move', { + tid: tid, + fromCid: oldCid, + toCid: cid, + uid: uid + }); }); }); }; From 78c65aee0518c23b3a393ebd353b6c4f1ed9a7c8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 15 Mar 2015 01:12:13 -0400 Subject: [PATCH 785/897] even more search changes --- src/categories/topics.js | 50 ++++++++++-------------- src/database/mongo/main.js | 4 +- src/postTools.js | 21 ++++++++-- src/posts/create.js | 8 +++- src/posts/delete.js | 79 ++++++++++++++++---------------------- src/threadTools.js | 2 +- 6 files changed, 81 insertions(+), 83 deletions(-) diff --git a/src/categories/topics.js b/src/categories/topics.js index 50dba67bbd..805ab30c4a 100644 --- a/src/categories/topics.js +++ b/src/categories/topics.js @@ -74,37 +74,29 @@ module.exports = function(Categories) { }); }; - Categories.onNewPostMade = function(postData, callback) { - topics.getTopicFields(postData.tid, ['cid', 'pinned'], function(err, topicData) { - if (err) { - return callback(err); - } - - if (!topicData || !topicData.cid) { - return callback(); - } - - var cid = topicData.cid; + Categories.onNewPostMade = function(cid, pinned, postData, callback) { + if (!cid || !postData) { + return callback(); + } - async.parallel([ - function(next) { - db.sortedSetAdd('cid:' + cid + ':pids', postData.timestamp, postData.pid, next); - }, - function(next) { - db.incrObjectField('category:' + cid, 'post_count', next); - }, - function(next) { - if (parseInt(topicData.pinned, 10) === 1) { - next(); - } else { - db.sortedSetAdd('cid:' + cid + ':tids', postData.timestamp, postData.tid, next); - } - }, - function(next) { - db.sortedSetIncrBy('cid:' + cid + ':tids:posts', 1, postData.tid, next); + async.parallel([ + function(next) { + db.sortedSetAdd('cid:' + cid + ':pids', postData.timestamp, postData.pid, next); + }, + function(next) { + db.incrObjectField('category:' + cid, 'post_count', next); + }, + function(next) { + if (parseInt(pinned, 10) === 1) { + next(); + } else { + db.sortedSetAdd('cid:' + cid + ':tids', postData.timestamp, postData.tid, next); } - ], callback); - }); + }, + function(next) { + db.sortedSetIncrBy('cid:' + cid + ':tids:posts', 1, postData.tid, next); + } + ], callback); }; }; diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 6302d76fb2..913696aa9c 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -12,8 +12,8 @@ module.exports = function(db, module) { key: key }; for(var field in data) { - if (data.hasOwnProperty(field)) { - setData[field] = data[field]; + if (data.hasOwnProperty(field) && data[field]) { + setData[field] = data[field].toString(); } } diff --git a/src/postTools.js b/src/postTools.js index 3e9712699e..647d796841 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -19,7 +19,7 @@ var winston = require('winston'), var cache = LRU({ max: 1048576, - length: function (n) { return n.length }, + length: function (n) { return n.length; }, maxAge: 1000 * 60 * 60 }); @@ -63,22 +63,32 @@ var cache = LRU({ }, topic: function(next) { var tid = postData.tid; - posts.isMain(data.pid, function(err, isMainPost) { + async.parallel({ + cid: function(next) { + topics.getTopicField(tid, 'cid', next); + }, + isMain: function(next) { + posts.isMain(data.pid, next); + } + }, function(err, results) { if (err) { return next(err); } options.tags = options.tags || []; - if (!isMainPost) { + if (!results.isMain) { return next(null, { tid: tid, + cid: results.cid, isMainPost: false }); } var topicData = { tid: tid, + cid: results.cid, + uid: postData.uid, mainPid: data.pid, title: title, slug: tid + '/' + utils.slugify(title) @@ -98,8 +108,10 @@ var cache = LRU({ topics.getTopicTagsObjects(tid, function(err, tags) { next(err, { tid: tid, + cid: results.cid, + uid: postData.uid, title: validator.escape(title), - isMainPost: isMainPost, + isMainPost: results.isMain, tags: tags }); }); @@ -114,6 +126,7 @@ var cache = LRU({ if (err) { return callback(err); } + postData.cid = results.topic.cid; results.content = results.postData.content; plugins.fireHook('action:post.edit', postData); diff --git a/src/posts/create.js b/src/posts/create.js index a235b2f3f0..1bce6e69c7 100644 --- a/src/posts/create.js +++ b/src/posts/create.js @@ -68,7 +68,13 @@ module.exports = function(Posts) { topics.onNewPostMade(postData, next); }, function(next) { - categories.onNewPostMade(postData, next); + topics.getTopicFields(tid, ['cid', 'pinned'], function(err, topicData) { + if (err) { + return next(err); + } + postData.cid = topicData.cid; + categories.onNewPostMade(topicData.cid, topicData.pinned, postData, next); + }); }, function(next) { db.sortedSetAdd('posts:pid', timestamp, postData.pid, next); diff --git a/src/posts/delete.js b/src/posts/delete.js index bd130ade46..f47ff28e88 100644 --- a/src/posts/delete.js +++ b/src/posts/delete.js @@ -9,16 +9,19 @@ var async = require('async'), module.exports = function(Posts) { Posts.delete = function(pid, callback) { - Posts.setPostField(pid, 'deleted', 1, function(err) { - if (err) { - return callback(err); - } - - Posts.getPostFields(pid, ['pid', 'tid', 'uid', 'timestamp'], function(err, postData) { - if (err) { - return callback(err); - } - + var postData; + async.waterfall([ + function(next) { + Posts.setPostField(pid, 'deleted', 1, next); + }, + function(next) { + Posts.getPostFields(pid, ['pid', 'tid', 'uid', 'timestamp'], next); + }, + function(_post, next) { + postData = _post; + topics.getTopicField(_post.tid, 'cid', next); + }, + function(cid, next) { plugins.fireHook('action:post.delete', pid); async.parallel([ @@ -26,7 +29,7 @@ module.exports = function(Posts) { updateTopicTimestamp(postData.tid, next); }, function(next) { - removeFromCategoryRecentPosts(pid, postData.tid, next); + db.sortedSetRemove('cid:' + cid + ':pids', pid, next); }, function(next) { Posts.dismissFlag(pid, next); @@ -34,21 +37,25 @@ module.exports = function(Posts) { ], function(err) { callback(err, postData); }); - }); - }); + } + ], callback); }; Posts.restore = function(pid, callback) { - Posts.setPostField(pid, 'deleted', 0, function(err) { - if (err) { - return callback(err); - } - - Posts.getPostFields(pid, ['pid', 'tid', 'uid', 'content', 'timestamp'], function(err, postData) { - if (err) { - return callback(err); - } - + var postData; + async.waterfall([ + function(next) { + Posts.setPostField(pid, 'deleted', 0, next); + }, + function(next) { + Posts.getPostFields(pid, ['pid', 'tid', 'uid', 'content', 'timestamp'], next); + }, + function(_post, next) { + postData = _post; + topics.getTopicField(_post.tid, 'cid', next); + }, + function(cid, next) { + postData.cid = cid; plugins.fireHook('action:post.restore', postData); async.parallel([ @@ -56,13 +63,13 @@ module.exports = function(Posts) { updateTopicTimestamp(postData.tid, next); }, function(next) { - addToCategoryRecentPosts(pid, postData.tid, postData.timestamp, next); + db.sortedSetAdd('cid:' + cid + ':pids', postData.timestamp, pid, next); } ], function(err) { callback(err, postData); }); - }); - }); + } + ], callback); }; function updateTopicTimestamp(tid, callback) { @@ -84,26 +91,6 @@ module.exports = function(Posts) { }); } - function removeFromCategoryRecentPosts(pid, tid, callback) { - topics.getTopicField(tid, 'cid', function(err, cid) { - if (err) { - return callback(err); - } - - db.sortedSetRemove('cid:' + cid + ':pids', pid, callback); - }); - } - - function addToCategoryRecentPosts(pid, tid, timestamp, callback) { - topics.getTopicField(tid, 'cid', function(err, cid) { - if (err) { - return callback(err); - } - - db.sortedSetAdd('cid:' + cid + ':pids', timestamp, pid, callback); - }); - } - Posts.purge = function(pid, callback) { Posts.exists(pid, function(err, exists) { if (err || !exists) { diff --git a/src/threadTools.js b/src/threadTools.js index 109a4215ce..76ea84c9df 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -21,7 +21,7 @@ var async = require('async'), }; function toggleDelete(tid, uid, isDelete, callback) { - topics.getTopicFields(tid, ['tid', 'cid', 'deleted', 'title', 'mainPid'], function(err, topicData) { + topics.getTopicFields(tid, ['tid', 'cid', 'uid', 'deleted', 'title', 'mainPid'], function(err, topicData) { if (err) { return callback(err); } From ec7caea36874f4c27c683e8b2c6c4978054a7911 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 15 Mar 2015 01:45:24 -0400 Subject: [PATCH 786/897] fix search on mongo --- src/database/mongo/main.js | 16 ++++++++++++---- src/search.js | 6 +----- src/user.js | 10 +++++++++- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 913696aa9c..469a9720d9 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -34,12 +34,20 @@ module.exports = function(db, module) { searchQuery.$text = {$search: data.content}; } - if (data.cid) { - searchQuery.cid = data.cid; + if (Array.isArray(data.cid) && data.cid.length) { + if (data.cid.length > 1) { + searchQuery.cid = {$in: data.cid.map(String)}; + } else { + searchQuery.cid = data.cid[0].toString(); + } } - if (data.uid) { - searchQuery.uid = data.uid; + if (Array.isArray(data.uid) && data.uid.length) { + if (data.uid.length > 1) { + searchQuery.uid = {$in: data.uid.map(String)}; + } else { + searchQuery.uid = data.uid[0].toString(); + } } db.collection('search').find(searchQuery, {limit: limit}).toArray(function(err, results) { diff --git a/src/search.js b/src/search.js index 257ce6f352..063ebfa142 100644 --- a/src/search.js +++ b/src/search.js @@ -414,11 +414,7 @@ function getChildrenCids(cids, uid, callback) { function getSearchUids(data, callback) { if (data.postedBy) { - if (Array.isArray(data.postedBy)) { - user.getUidsByUsernames(data.postedBy, callback); - } else { - user.getUidByUsername([data.postedBy], callback); - } + user.getUidsByUsernames(Array.isArray(data.postedBy) ? data.postedBy : [data.postedBy], callback); } else { callback(null, []); } diff --git a/src/user.js b/src/user.js index bd0eed4ef4..cb4492765a 100644 --- a/src/user.js +++ b/src/user.js @@ -335,7 +335,15 @@ var async = require('async'), }; User.getUidsByUsernames = function(usernames, callback) { - db.getObjectFields('username:uid', usernames, callback); + db.getObjectFields('username:uid', usernames, function(err, users) { + if (err) { + return callback(err); + } + var uids = usernames.map(function(username) { + return users[username]; + }); + callback(null, uids); + }); }; User.getUidByUserslug = function(userslug, callback) { From 518aec6e76180078269bb17ffb56af880d58f9bd Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sun, 15 Mar 2015 03:18:24 -0400 Subject: [PATCH 787/897] modified indices, removed key 2 collections now --- src/database/mongo.js | 12 ++++++++---- src/database/mongo/main.js | 13 +++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/database/mongo.js b/src/database/mongo.js index 9e4399b031..f97eeb6651 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -110,10 +110,14 @@ createIndex('objects', {_key: 1, value: -1}, {background:true}); createIndex('objects', {expireAt: 1}, {expireAfterSeconds:0, background:true}); - createIndex('search', {content:'text'}, {background:true}); - createIndex('search', {key: 1, id: 1}, {background:true}); - createIndex('search', {cid: 1}, {background:true}); - createIndex('search', {uid: 1}, {background:true}); + + createIndex('searchtopic', {content: 'text', uid: 1, cid: 1}, {background:true}); + createIndex('searchtopic', {id: 1}, {background:true}); + + + createIndex('searchpost', {content: 'text', uid: 1, cid: 1}, {background:true}); + createIndex('searchpost', {id: 1}, {background:true}); + if (typeof callback === 'function') { callback(); diff --git a/src/database/mongo/main.js b/src/database/mongo/main.js index 469a9720d9..5e027843e0 100644 --- a/src/database/mongo/main.js +++ b/src/database/mongo/main.js @@ -8,8 +8,7 @@ module.exports = function(db, module) { module.searchIndex = function(key, data, id, callback) { callback = callback || function() {}; var setData = { - id: id, - key: key + id: id }; for(var field in data) { if (data.hasOwnProperty(field) && data[field]) { @@ -17,7 +16,7 @@ module.exports = function(db, module) { } } - db.collection('search').update({key: key, id: id}, {$set: setData}, {upsert:true, w: 1}, function(err) { + db.collection('search' + key).update({id: id}, {$set: setData}, {upsert:true, w: 1}, function(err) { if(err) { winston.error('Error indexing ' + err.message); } @@ -26,9 +25,7 @@ module.exports = function(db, module) { }; module.search = function(key, data, limit, callback) { - var searchQuery = { - key: key - }; + var searchQuery = {}; if (data.content) { searchQuery.$text = {$search: data.content}; @@ -50,7 +47,7 @@ module.exports = function(db, module) { } } - db.collection('search').find(searchQuery, {limit: limit}).toArray(function(err, results) { + db.collection('search' + key).find(searchQuery, {limit: limit}).toArray(function(err, results) { if (err) { return callback(err); } @@ -72,7 +69,7 @@ module.exports = function(db, module) { if (!id) { return callback(); } - db.collection('search').remove({key: key, id: id}, function(err, res) { + db.collection('search' + key).remove({id: id}, function(err, res) { callback(err); }); }; From a3f167bfd24811ea6e062856da65fe1bdc1a6256 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 16 Mar 2015 13:49:47 -0400 Subject: [PATCH 788/897] default category should be col-xs-12 --- src/categories/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories/create.js b/src/categories/create.js index ce293d1c42..0db3cad0c3 100644 --- a/src/categories/create.js +++ b/src/categories/create.js @@ -32,7 +32,7 @@ module.exports = function(Categories) { order: order, link: '', numRecentReplies: 1, - class: 'col-md-3 col-xs-6', + class: 'col-md-3 col-xs-12', imageClass: 'auto' }; From 82ac542f558311e0b4be6d85fadb9f019827b40f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 16 Mar 2015 16:39:33 -0400 Subject: [PATCH 789/897] helpers.generateCategoryBackground --- public/src/modules/helpers.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index 9f643d8736..e09534b55d 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -43,6 +43,24 @@ return JSON.stringify(obj).replace(/&/gm,"&").replace(//gm,">").replace(/"/g, '"'); }; + helpers.generateCategoryBackground = function(category) { + var style = []; + + if (category.backgroundImage) { + style.push('background-image: url(' + category.backgroundImage + ')'); + } + + if (category.bgColor) { + style.push('background-color: ' + category.bgColor + ';'); + } + + if (category.color) { + style.push('color: ' + category.color + ';'); + } + + return style.join(' '); + }; + // Groups helpers helpers.membershipBtn = function(groupObj) { if (groupObj.isMember) { From 412c5360a6a4215309cdf9eda70d6a89a1130dc6 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 16 Mar 2015 17:22:44 -0400 Subject: [PATCH 790/897] allow timeago to be cast on other elements as well, ex. small --- public/src/app.js | 2 +- public/src/client/account/favourites.js | 2 +- public/src/client/account/posts.js | 2 +- public/src/client/account/profile.js | 2 +- public/src/client/account/topics.js | 2 +- public/src/client/account/watched.js | 2 +- public/src/client/categories.js | 2 +- public/src/client/category.js | 4 ++-- public/src/client/chats.js | 2 +- public/src/client/notifications.js | 2 +- public/src/client/recent.js | 2 +- public/src/client/topic/posts.js | 2 +- public/src/modules/chat.js | 2 +- public/src/translator.js | 2 +- public/src/widgets.js | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index fdfe7856b3..8974d2316a 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -234,7 +234,7 @@ app.cacheBuster = null; app.processPage = function () { highlightNavigationLink(); - $('span.timeago').timeago(); + $('.timeago').timeago(); utils.makeNumbersHumanReadable($('.human-readable-number')); diff --git a/public/src/client/account/favourites.js b/public/src/client/account/favourites.js index 6a08a814a5..f73e1d4f20 100644 --- a/public/src/client/account/favourites.js +++ b/public/src/client/account/favourites.js @@ -34,7 +34,7 @@ define('forum/account/favourites', ['forum/account/header', 'forum/infinitescrol infinitescroll.parseAndTranslate('account/favourites', 'posts', {posts: posts}, function(html) { $('.user-favourite-posts').append(html); html.find('img').addClass('img-responsive'); - html.find('span.timeago').timeago(); + html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); callback(); diff --git a/public/src/client/account/posts.js b/public/src/client/account/posts.js index 70410e0819..c4759b9016 100644 --- a/public/src/client/account/posts.js +++ b/public/src/client/account/posts.js @@ -35,7 +35,7 @@ define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], infinitescroll.parseAndTranslate('account/posts', 'posts', {posts: posts}, function(html) { $('.user-favourite-posts').append(html); html.find('img').addClass('img-responsive'); - html.find('span.timeago').timeago(); + html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); callback(); diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js index 89a555a702..5bbf48fe85 100644 --- a/public/src/client/account/profile.js +++ b/public/src/client/account/profile.js @@ -116,7 +116,7 @@ define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll'] infinitescroll.parseAndTranslate('account/profile', 'posts', {posts: posts}, function(html) { $('.user-recent-posts .loading-indicator').before(html); - html.find('span.timeago').timeago(); + html.find('.timeago').timeago(); callback(); }); diff --git a/public/src/client/account/topics.js b/public/src/client/account/topics.js index c556ef2891..107352db97 100644 --- a/public/src/client/account/topics.js +++ b/public/src/client/account/topics.js @@ -33,7 +33,7 @@ define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], function onTopicsLoaded(topics, callback) { infinitescroll.parseAndTranslate('account/topics', 'topics', {topics: topics}, function(html) { $('#topics-container').append(html); - html.find('span.timeago').timeago(); + html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); $(window).trigger('action:topics.loaded'); diff --git a/public/src/client/account/watched.js b/public/src/client/account/watched.js index 9a502b1ee8..3514301c4d 100644 --- a/public/src/client/account/watched.js +++ b/public/src/client/account/watched.js @@ -31,7 +31,7 @@ define('forum/account/watched', ['forum/account/header', 'forum/infinitescroll'] function onTopicsLoaded(topics, callback) { infinitescroll.parseAndTranslate('account/watched', 'topics', {topics: topics}, function(html) { $('#topics-container').append(html); - html.find('span.timeago').timeago(); + html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); $(window).trigger('action:topics.loaded'); diff --git a/public/src/client/categories.js b/public/src/client/categories.js index d3cf1cae43..9ef4bee6f6 100644 --- a/public/src/client/categories.js +++ b/public/src/client/categories.js @@ -67,7 +67,7 @@ define('forum/categories', function() { translator.translate(html, function(translatedHTML) { translatedHTML = $(translatedHTML); translatedHTML.find('img').addClass('img-responsive'); - translatedHTML.find('span.timeago').timeago(); + translatedHTML.find('.timeago').timeago(); callback(translatedHTML); }); }); diff --git a/public/src/client/category.js b/public/src/client/category.js index 3b6a0e69b9..9b44708fd1 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -228,7 +228,7 @@ define('forum/category', [ topic.hide().fadeIn('slow'); - topic.find('span.timeago').timeago(); + topic.find('.timeago').timeago(); app.createUserTooltips(); updateTopicCount(); @@ -304,7 +304,7 @@ define('forum/category', [ if (typeof callback === 'function') { callback(); } - html.find('span.timeago').timeago(); + html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); }); diff --git a/public/src/client/chats.js b/public/src/client/chats.js index cde94aa71a..9ea8beea57 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -122,7 +122,7 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S, function onMessagesParsed(html) { var newMessage = $(html); newMessage.insertBefore($('.user-typing')); - newMessage.find('span.timeago').timeago(); + newMessage.find('.timeago').timeago(); newMessage.find('img:not(".chat-user-image")').addClass('img-responsive'); Chats.scrollToBottom($('.expanded-chat .chat-content')); } diff --git a/public/src/client/notifications.js b/public/src/client/notifications.js index fb778ec18f..4e7244f83f 100644 --- a/public/src/client/notifications.js +++ b/public/src/client/notifications.js @@ -16,7 +16,7 @@ define('forum/notifications', function() { }); }); - $('span.timeago').timeago(); + $('.timeago').timeago(); $('.notifications .delete').on('click', function() { socket.emit('notifications.markAllRead', function(err) { diff --git a/public/src/client/recent.js b/public/src/client/recent.js index 05e936a577..2be859f65c 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -125,7 +125,7 @@ define('forum/recent', ['forum/infinitescroll', 'composer'], function(infinitesc $('#category-no-topics').remove(); $('#topics-container').append(html); - html.find('span.timeago').timeago(); + html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); $(window).trigger('action:topics.loaded'); diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 8731121de1..6fdb6282e9 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -224,7 +224,7 @@ define('forum/topic/posts', [ app.replaceSelfLinks(element.find('a')); utils.addCommasToNumbers(element.find('.formatted-number')); utils.makeNumbersHumanReadable(element.find('.human-readable-number')); - element.find('span.timeago').timeago(); + element.find('.timeago').timeago(); element.find('.post-content img:not(.emoji)').addClass('img-responsive').each(function() { var $this = $(this); if (!$this.parent().is('a')) { diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 5d60f2d411..760f19ca20 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -406,7 +406,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, Chats.parseMessage(data, function(html) { var message = $(html); message.find('img:not(".chat-user-image")').addClass('img-responsive'); - message.find('span.timeago').timeago(); + message.find('.timeago').timeago(); message.insertBefore(typingNotif); Chats.scrollToBottom(chatContent); diff --git a/public/src/translator.js b/public/src/translator.js index a6f4027faf..d1b85e300c 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -79,7 +79,7 @@ } $.getScript(RELATIVE_PATH + '/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '.js').success(function() { - $('span.timeago').timeago(); + $('.timeago').timeago(); }).fail(function() { $.getScript(RELATIVE_PATH + '/vendor/jquery/timeago/locales/jquery.timeago.en.js'); }); diff --git a/public/src/widgets.js b/public/src/widgets.js index 990a42c6f0..e83353ec1b 100644 --- a/public/src/widgets.js +++ b/public/src/widgets.js @@ -71,7 +71,7 @@ var widgetAreas = $('#content [widget-area]'); widgetAreas.find('img:not(.user-img)').addClass('img-responsive'); - widgetAreas.find('span.timeago').timeago(); + widgetAreas.find('.timeago').timeago(); widgetAreas.find('img[title].teaser-pic,img[title].user-img').each(function() { $(this).tooltip({ placement: 'top', From 0f59046392f71d6e23feed39490ba8dad9baa4fa Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 16 Mar 2015 16:35:22 -0400 Subject: [PATCH 791/897] added requirejs config partial, #2875 --- src/views/partials/requirejs-config.tpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/views/partials/requirejs-config.tpl diff --git a/src/views/partials/requirejs-config.tpl b/src/views/partials/requirejs-config.tpl new file mode 100644 index 0000000000..932c571f4a --- /dev/null +++ b/src/views/partials/requirejs-config.tpl @@ -0,0 +1,12 @@ + \ No newline at end of file From b83aa108f22e98cb2bcc62fb18504522a1e494be Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Mar 2015 10:47:02 -0400 Subject: [PATCH 792/897] requiring more recent vanilla and lavender dependencies, #2875 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1877079d6f..4f56cc91e1 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,8 @@ "nodebb-plugin-mentions": "^0.11.0", "nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-spam-be-gone": "^0.4.0", - "nodebb-theme-lavender": "^1.0.6", - "nodebb-theme-vanilla": "^1.0.28", + "nodebb-theme-lavender": "^1.0.22", + "nodebb-theme-vanilla": "^1.0.65", "nodebb-widget-essentials": "~0.2.12", "nodebb-rewards-essentials": "^0.0.1", "npm": "^2.1.4", From b81646477fd27f1cbbfc96a42204f0fc5c6c9397 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 11:17:00 -0400 Subject: [PATCH 793/897] remove hardcoded topic_row_size I can't believe this is still here haha --- src/categories.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/categories.js b/src/categories.js index 87c540aaf1..3061ef8425 100644 --- a/src/categories.js +++ b/src/categories.js @@ -62,7 +62,6 @@ var async = require('async'), category.nextStart = results.topics.nextStart; category.pageCount = results.pageCount; category.isIgnored = results.isIgnored[0]; - category.topic_row_size = 'col-md-9'; plugins.fireHook('filter:category.get', {category: category, uid: data.uid}, function(err, data) { callback(err, data ? data.category : null); From e08f34e79d357f4e4b99c13908db0f5562cb8b71 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 11:29:04 -0400 Subject: [PATCH 794/897] function.generateTopicClass --- public/src/modules/helpers.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index e09534b55d..5361099476 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -61,6 +61,28 @@ return style.join(' '); }; + helpers.generateTopicClass = function(topic) { + var style = []; + + if (topic.locked) { + style.push('locked'); + } + + if (topic.pinned) { + style.push('pinned'); + } + + if (topic.deleted) { + style.push('deleted'); + } + + if (topic.unread) { + style.push('unread'); + } + + return style.join(' '); + }; + // Groups helpers helpers.membershipBtn = function(groupObj) { if (groupObj.isMember) { From 521c454dde71cdde24327b14b1473aa554b4feeb Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Mar 2015 11:29:19 -0400 Subject: [PATCH 795/897] updated emailer to pass through "fromUid" if available --- src/emailer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/emailer.js b/src/emailer.js index b358e170fb..aeca1ecab8 100644 --- a/src/emailer.js +++ b/src/emailer.js @@ -62,7 +62,8 @@ var fs = require('fs'), plaintext: translated[1], template: template, uid: uid, - pid: params.pid + pid: params.pid, + fromUid: params.fromUid }); callback(); } else { From 9fc97ce92d24f22cf6f73776b1bcc22737ac6242 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Mar 2015 12:01:55 -0400 Subject: [PATCH 796/897] fixing handleACPRedirect on subfolder installs --- 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 6178587423..809d2d9db9 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -64,7 +64,7 @@ $(document).ready(function() { ajaxify.handleACPRedirect = function(url) { // If ajaxifying into an admin route from regular site, do a cold load. url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); - if (url.indexOf('admin') === 0 && window.location.pathname.indexOf('/admin') !== 0) { + if (url.indexOf('admin') === 0 && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0) { window.open(RELATIVE_PATH + '/' + url, '_blank'); return true; } From 406126536a4117d558cf06428ad20f5a541e03c2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Mar 2015 12:02:33 -0400 Subject: [PATCH 797/897] missing semicolon --- 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 809d2d9db9..75e341643e 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -69,7 +69,7 @@ $(document).ready(function() { return true; } return false; - } + }; ajaxify.start = function(url, quiet, search) { url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); From 8727c7be17e07f7ac2e6135e8ad9fb8d015a05c7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 12:25:02 -0400 Subject: [PATCH 798/897] moved all template variables to core --- src/views/partials/variables/account.tpl | 2 ++ src/views/partials/variables/account/edit.tpl | 3 +++ src/views/partials/variables/account/profile.tpl | 1 + src/views/partials/variables/category.tpl | 6 ++++++ src/views/partials/variables/groups/details.tpl | 2 ++ src/views/partials/variables/reset_code.tpl | 1 + src/views/partials/variables/tag.tpl | 1 + src/views/partials/variables/topic.tpl | 11 +++++++++++ 8 files changed, 27 insertions(+) create mode 100644 src/views/partials/variables/account.tpl create mode 100644 src/views/partials/variables/account/edit.tpl create mode 100644 src/views/partials/variables/account/profile.tpl create mode 100644 src/views/partials/variables/category.tpl create mode 100644 src/views/partials/variables/groups/details.tpl create mode 100644 src/views/partials/variables/reset_code.tpl create mode 100644 src/views/partials/variables/tag.tpl create mode 100644 src/views/partials/variables/topic.tpl diff --git a/src/views/partials/variables/account.tpl b/src/views/partials/variables/account.tpl new file mode 100644 index 0000000000..cc63770339 --- /dev/null +++ b/src/views/partials/variables/account.tpl @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/views/partials/variables/account/edit.tpl b/src/views/partials/variables/account/edit.tpl new file mode 100644 index 0000000000..d8e5d259cc --- /dev/null +++ b/src/views/partials/variables/account/edit.tpl @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/views/partials/variables/account/profile.tpl b/src/views/partials/variables/account/profile.tpl new file mode 100644 index 0000000000..be91685112 --- /dev/null +++ b/src/views/partials/variables/account/profile.tpl @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/partials/variables/category.tpl b/src/views/partials/variables/category.tpl new file mode 100644 index 0000000000..984002411a --- /dev/null +++ b/src/views/partials/variables/category.tpl @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/views/partials/variables/groups/details.tpl b/src/views/partials/variables/groups/details.tpl new file mode 100644 index 0000000000..0cefdde305 --- /dev/null +++ b/src/views/partials/variables/groups/details.tpl @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/views/partials/variables/reset_code.tpl b/src/views/partials/variables/reset_code.tpl new file mode 100644 index 0000000000..c139a7011d --- /dev/null +++ b/src/views/partials/variables/reset_code.tpl @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/partials/variables/tag.tpl b/src/views/partials/variables/tag.tpl new file mode 100644 index 0000000000..486ba8245c --- /dev/null +++ b/src/views/partials/variables/tag.tpl @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/partials/variables/topic.tpl b/src/views/partials/variables/topic.tpl new file mode 100644 index 0000000000..4f3c15180d --- /dev/null +++ b/src/views/partials/variables/topic.tpl @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From f5b701553c0faf4e964c27834a937135f1123371 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 12:30:50 -0400 Subject: [PATCH 799/897] moved post-row's wall of data-text into partial --- src/views/partials/data/topic.tpl | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/views/partials/data/topic.tpl diff --git a/src/views/partials/data/topic.tpl b/src/views/partials/data/topic.tpl new file mode 100644 index 0000000000..125926e94f --- /dev/null +++ b/src/views/partials/data/topic.tpl @@ -0,0 +1 @@ +data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}" data-index="{posts.index}" data-timestamp="{posts.timestamp}" data-votes="{posts.votes}" itemscope itemtype="http://schema.org/Comment" \ No newline at end of file From 54cbbe2844d5bb9a3cac6ffab69d0e318e22b455 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 12:47:40 -0400 Subject: [PATCH 800/897] components system --- public/src/client/topic/events.js | 2 +- public/src/components.js | 17 +++++++++++++++++ src/meta/js.js | 7 ++++--- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 public/src/components.js diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index c90dd149b5..25b872e649 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -96,7 +96,7 @@ define('forum/topic/events', [ } function onPostEdited(data) { - var editedPostEl = $('#content_' + data.pid), + var editedPostEl = components.get('post/content', data.pid), editedPostTitle = $('#topic_title_' + data.pid); if (editedPostTitle.length) { diff --git a/public/src/components.js b/public/src/components.js new file mode 100644 index 0000000000..2bd94b06f0 --- /dev/null +++ b/public/src/components.js @@ -0,0 +1,17 @@ +"use strict"; + +var components = components || {}; + +(function() { + components.core = { + 'post/content': function(pid) { + var el = $('[data-pid="' + pid + '"]').find('[component="post/content"]'); + return el.length ? el : $('[data-pid="' + pid + '"]').find('.post-content'); // deprecated after 0.7x + } + }; + + components.get = function() { + var args = Array.prototype.slice.call(arguments, 1); + return components.core[arguments[0]].apply(this, args); + }; +}()); \ No newline at end of file diff --git a/src/meta/js.js b/src/meta/js.js index 4373d21a1d..3d8ced839c 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -44,10 +44,11 @@ module.exports = function(Meta) { 'public/src/utils.js', 'public/src/app.js', 'public/src/ajaxify.js', - 'public/src/variables.js', - 'public/src/widgets.js', + 'public/src/components.js', + 'public/src/overrides.js', 'public/src/translator.js', - 'public/src/overrides.js' + 'public/src/variables.js', + 'public/src/widgets.js' ], rjs: [] } From d347e8836178c52363c0fadb9d6a923635fd9071 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 12:51:02 -0400 Subject: [PATCH 801/897] post/header component --- public/src/client/topic/events.js | 8 ++++---- public/src/components.js | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 25b872e649..b97d37bc51 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -97,11 +97,11 @@ define('forum/topic/events', [ function onPostEdited(data) { var editedPostEl = components.get('post/content', data.pid), - editedPostTitle = $('#topic_title_' + data.pid); + editedPostHeader = components.get('post/header', data.pid); - if (editedPostTitle.length) { - editedPostTitle.fadeOut(250, function() { - editedPostTitle.html(data.title).fadeIn(250); + if (editedPostHeader.length) { + editedPostHeader.fadeOut(250, function() { + editedPostHeader.html(data.title).fadeIn(250); }); } diff --git a/public/src/components.js b/public/src/components.js index 2bd94b06f0..89b21585be 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -6,7 +6,11 @@ var components = components || {}; components.core = { 'post/content': function(pid) { var el = $('[data-pid="' + pid + '"]').find('[component="post/content"]'); - return el.length ? el : $('[data-pid="' + pid + '"]').find('.post-content'); // deprecated after 0.7x + return el.length ? el : $('#content_' + pid); // deprecated after 0.7x + }, + 'post/header': function(pid) { + var el = $('[data-pid="' + pid + '"]').find('[component="post/header"]'); + return el.length ? el : $('#topic_title_' + pid); // deprecated after 0.7x } }; From eba0f32913308146949a2a80dbd8b18cb2ec2706 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 12:54:10 -0400 Subject: [PATCH 802/897] post/anchor component --- public/src/components.js | 4 ++++ public/src/modules/navigator.js | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/src/components.js b/public/src/components.js index 89b21585be..3b02cc04b6 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -11,6 +11,10 @@ var components = components || {}; 'post/header': function(pid) { var el = $('[data-pid="' + pid + '"]').find('[component="post/header"]'); return el.length ? el : $('#topic_title_' + pid); // deprecated after 0.7x + }, + 'post/anchor': function(pid) { + var el = $('[data-pid="' + pid + '"]').find('[component="post/anchor"]'); + return el.length ? el : $('#post_anchor_' + pid); // deprecated after 0.7x } }; diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index e7f78c980f..71fb90ac2d 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -161,7 +161,7 @@ define('navigator', ['forum/pagination'], function(pagination) { duration = duration !== undefined ? duration : 400; navigator.scrollActive = true; - if($('#post_anchor_' + postIndex).length) { + if(components.get('post/anchor', postIndex).length) { return scrollToPid(postIndex, highlight, duration, offset); } @@ -188,7 +188,7 @@ define('navigator', ['forum/pagination'], function(pagination) { }; function scrollToPid(postIndex, highlight, duration, offset) { - var scrollTo = $('#post_anchor_' + postIndex); + var scrollTo = components.get('post/anchor', postIndex); if (!scrollTo) { navigator.scrollActive = false; From 572765897669e22be7c3f87f97b53adab2e29d64 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 12:56:14 -0400 Subject: [PATCH 803/897] wrapper for grabbing components without modifiers --- public/src/components.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/src/components.js b/public/src/components.js index 3b02cc04b6..fe3fcec1fa 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -20,6 +20,11 @@ var components = components || {}; components.get = function() { var args = Array.prototype.slice.call(arguments, 1); - return components.core[arguments[0]].apply(this, args); + + if (components.core[arguments[0]]) { + return components.core[arguments[0]].apply(this, args); + } else { + return $('[component="' + arguments[0] + '"]'); + } }; }()); \ No newline at end of file From 56ed6d211250019ccb08f19e3e319daf036e5dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 17 Mar 2015 13:09:19 -0400 Subject: [PATCH 804/897] shorter bcrypt --- bcrypt.js | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/bcrypt.js b/bcrypt.js index 1445999a8a..ae81d09eb7 100644 --- a/bcrypt.js +++ b/bcrypt.js @@ -9,11 +9,10 @@ process.on('message', function(msg) { if (msg.type === 'hash') { hashPassword(msg.password, msg.rounds); } else if (msg.type === 'compare') { - compare(msg.password, msg.hash); + bcrypt.compare(msg.password, msg.hash, done); } }); - function hashPassword(password, rounds) { async.waterfall([ function(next) { @@ -22,23 +21,14 @@ function hashPassword(password, rounds) { function(salt, next) { bcrypt.hash(password, salt, next); } - ], function(err, hash) { - if (err) { - process.send({err: err.message}); - return process.disconnect(); - } - process.send({result: hash}); - process.disconnect(); - }); + ], done); } -function compare(password, hash) { - bcrypt.compare(password, hash, function(err, res) { - if (err) { - process.send({err: err.message}); - return process.disconnect(); - } - process.send({result: res}); - process.disconnect(); - }); +function done(err, result) { + if (err) { + process.send({err: err.message}); + return process.disconnect(); + } + process.send({result: result}); + process.disconnect(); } \ No newline at end of file From 839dd72a05354b7eb6485d275f9624f5defd2d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 17 Mar 2015 13:15:36 -0400 Subject: [PATCH 805/897] been a while since we stopped using hashes --- src/routes/feeds.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/routes/feeds.js b/src/routes/feeds.js index 0f2f6082b6..e015b91e21 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -84,7 +84,7 @@ function generateForTopic(req, res, next) { feed.item({ title: 'Reply to ' + topicData.title + ' on ' + dateStamp, description: postData.content, - url: nconf.get('url') + '/topic/' + topicData.slug + '#' + postData.pid, + url: nconf.get('url') + '/topic/' + topicData.slug + '/' + postData.index, author: postData.username, date: dateStamp }); @@ -144,8 +144,8 @@ function generateForCategory(req, res, next) { if (err) { return next(err); } - sendFeed(feed, res); - }); + sendFeed(feed, res); + }); }); } @@ -183,8 +183,8 @@ function generateForPopular(req, res, next) { return next(err); } sendFeed(feed, res); - }); - }); + }); + }); } function disabledRSS(req, res, next) { @@ -201,13 +201,13 @@ function generateForTopics(options, set, req, res, next) { if (err) { return next(err); } - + generateTopicsFeed(options, data.topics, function(err, feed) { if (err) { return next(err); } - sendFeed(feed, res); - }); + sendFeed(feed, res); + }); }); } @@ -215,7 +215,7 @@ function generateTopicsFeed(feedOptions, feedTopics, callback) { var tids = feedTopics.map(function(topic) { return topic ? topic.tid : null; }); - + topics.getMainPids(tids, function(err, pids) { if (err) { return callback(err); @@ -252,7 +252,7 @@ function generateTopicsFeed(feedOptions, feedTopics, callback) { }); callback(null, feed); }); - }); + }); } function generateForRecentPosts(req, res, next) { From 1df20465edcc0712d48b531122df34703394e4ad Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 13:15:49 -0400 Subject: [PATCH 806/897] fixes to components; added post component --- public/src/components.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/public/src/components.js b/public/src/components.js index fe3fcec1fa..550ef1e539 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -4,23 +4,26 @@ var components = components || {}; (function() { components.core = { + 'post': function(name, value) { + return $('[data-' + name + '="' + value + '"]'); + }, 'post/content': function(pid) { - var el = $('[data-pid="' + pid + '"]').find('[component="post/content"]'); + var el = components.core.post('pid', pid).find('[component="post/content"]'); return el.length ? el : $('#content_' + pid); // deprecated after 0.7x }, 'post/header': function(pid) { - var el = $('[data-pid="' + pid + '"]').find('[component="post/header"]'); + var el = components.core.post('pid', pid).find('[component="post/header"]'); return el.length ? el : $('#topic_title_' + pid); // deprecated after 0.7x }, - 'post/anchor': function(pid) { - var el = $('[data-pid="' + pid + '"]').find('[component="post/anchor"]'); - return el.length ? el : $('#post_anchor_' + pid); // deprecated after 0.7x + 'post/anchor': function(index) { + var el = components.core.post('index', index).find('[component="post/anchor"]'); + return el.length ? el : $('#post_anchor_' + index); // deprecated after 0.7x } }; components.get = function() { var args = Array.prototype.slice.call(arguments, 1); - + if (components.core[arguments[0]]) { return components.core[arguments[0]].apply(this, args); } else { From e45e204ba5f560e75a79fe5732f308787f1c8e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 17 Mar 2015 13:21:27 -0400 Subject: [PATCH 807/897] fix author field on topic feed #2872 --- src/routes/feeds.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/feeds.js b/src/routes/feeds.js index e015b91e21..58d44cbce5 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -84,8 +84,8 @@ function generateForTopic(req, res, next) { feed.item({ title: 'Reply to ' + topicData.title + ' on ' + dateStamp, description: postData.content, - url: nconf.get('url') + '/topic/' + topicData.slug + '/' + postData.index, - author: postData.username, + url: nconf.get('url') + '/topic/' + topicData.slug + (postData.index ? '/' + (postData.index + 1) : ''), + author: postData.user ? postData.user.username : '', date: dateStamp }); } From 8fcdae7f17ff140a5af2dece66136cffb62d9fb5 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 13:37:23 -0400 Subject: [PATCH 808/897] get a post component by any of its attributes --- public/src/components.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/components.js b/public/src/components.js index 550ef1e539..a31549e694 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -5,7 +5,7 @@ var components = components || {}; (function() { components.core = { 'post': function(name, value) { - return $('[data-' + name + '="' + value + '"]'); + return value ? $('[data-' + name + '="' + value + '"]') $('[data-' + name + ']'); }, 'post/content': function(pid) { var el = components.core.post('pid', pid).find('[component="post/content"]'); From 643914758673245d73a0aad7500fe58f8907399d Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 13:38:18 -0400 Subject: [PATCH 809/897] updated core to point #post_container and .post-row to its respective components --- public/src/client/topic.js | 4 ++-- public/src/client/topic/events.js | 5 +++-- public/src/client/topic/fork.js | 9 +++++---- public/src/client/topic/postTools.js | 8 ++++---- public/src/client/topic/posts.js | 12 ++++++------ public/src/client/topic/threadTools.js | 6 +++--- public/src/modules/navigator.js | 4 ++-- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 9acd1a4d73..22af7bb5f2 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -112,7 +112,7 @@ define('forum/topic', [ } function addBlockQuoteHandler() { - $('#post-container').on('click', 'blockquote .toggle', function() { + components.get('topic').on('click', 'blockquote .toggle', function() { var blockQuote = $(this).parent('blockquote'); var toggle = $(this); blockQuote.toggleClass('uncollapsed'); @@ -124,7 +124,7 @@ define('forum/topic', [ function enableInfiniteLoadingOrPagination() { if(!config.usePagination) { - infinitescroll.init(posts.loadMorePosts, $('#post-container .post-row[data-index="0"]').height()); + infinitescroll.init(posts.loadMorePosts, components.get('topic').find('.post-row[data-index="0"]').height()); } else { navigator.hide(); diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index b97d37bc51..9424f588b6 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -139,14 +139,15 @@ define('forum/topic/events', [ } function onPostPurged(pid) { - $('#post-container [data-pid="' + pid + '"]').fadeOut(500, function() { + components.get('post', 'pid', pid).fadeOut(500, function() { $(this).remove(); }); + postTools.updatePostCount(); } function togglePostDeleteState(data) { - var postEl = $('#post-container [data-pid="' + data.pid + '"]'); + var postEl = components.get('post', 'pid', data.pid); if (!postEl.length) { return; diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js index 216cc63f9f..54965b233a 100644 --- a/public/src/client/topic/fork.js +++ b/public/src/client/topic/fork.js @@ -35,7 +35,7 @@ define('forum/topic/fork', function() { forkModal.find('.close,#fork_thread_cancel').on('click', closeForkModal); forkModal.find('#fork-title').on('change', checkForkButtonEnable); - $('#post-container').on('click', '[data-pid]', function() { + components.get('topic').on('click', '[data-pid]', function() { togglePostSelection($(this)); }); @@ -58,7 +58,7 @@ define('forum/topic/fork', function() { pids: pids }, function(err, newTopic) { function fadeOutAndRemove(pid) { - $('#post-container [data-pid="' + pid + '"]').fadeOut(500, function() { + components.get('post', 'pid', pid).fadeOut(500, function() { $(this).remove(); }); } @@ -125,10 +125,11 @@ define('forum/topic/fork', function() { function closeForkModal() { for(var i=0; i 1 || !$('#post-container [data-index="0"]').length) { + if(components.get('post', 'index').length > 1 || !components.get('post', 'index', 0).length) { $('.bottom-post-bar').removeClass('hide'); } } diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index c3923e2720..ad98e9e921 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -97,7 +97,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func } ThreadTools.setLockedState = function(data) { - var threadEl = $('#post-container'); + var threadEl = components.get('topic'); if (parseInt(data.tid, 10) === parseInt(threadEl.attr('data-tid'), 10)) { var isLocked = data.isLocked && !app.user.isAdmin; @@ -116,7 +116,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func }; ThreadTools.setDeleteState = function(data) { - var threadEl = $('#post-container'); + var threadEl = components.get('topic'); if (parseInt(data.tid, 10) !== parseInt(threadEl.attr('data-tid'), 10)) { return; } @@ -137,7 +137,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func }; ThreadTools.setPinnedState = function(data) { - var threadEl = $('#post-container'); + var threadEl = components.get('topic'); if (parseInt(data.tid, 10) === parseInt(threadEl.attr('data-tid'), 10)) { translator.translate(' [[topic:thread_tools.' + (data.isPinned ? 'unpin' : 'pin') + ']]', function(translated) { $('.pin_thread').html(translated); diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 71fb90ac2d..76582775cf 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -153,7 +153,7 @@ define('navigator', ['forum/pagination'], function(pagination) { } navigator.scrollToPost = function(postIndex, highlight, duration, offset) { - if (!utils.isNumber(postIndex) || !$('#post-container').length) { + if (!utils.isNumber(postIndex) || !components.get('topic').length) { return; } @@ -222,7 +222,7 @@ define('navigator', ['forum/pagination'], function(pagination) { } } - if ($('#post-container').length) { + if (components.get('topic').length) { animateScroll(); } } From 567d171d2fae26aeeec97468c1e917bd793374b4 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 13:46:24 -0400 Subject: [PATCH 810/897] jshint --- public/src/client/topic.js | 2 +- public/src/client/topic/events.js | 2 +- public/src/client/topic/fork.js | 2 +- public/src/client/topic/postTools.js | 2 +- public/src/client/topic/posts.js | 2 +- public/src/client/topic/threadTools.js | 2 +- public/src/modules/navigator.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 22af7bb5f2..388ee8e136 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -1,7 +1,7 @@ 'use strict'; -/* globals define, app, templates, translator, socket, bootbox, config, ajaxify, RELATIVE_PATH, utils */ +/* globals define, app, components, templates, translator, socket, bootbox, config, ajaxify, RELATIVE_PATH, utils */ define('forum/topic', [ 'forum/pagination', diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 9424f588b6..f044f3f4f6 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -1,7 +1,7 @@ 'use strict'; -/* globals app, ajaxify, define, socket, translator, templates */ +/* globals app, ajaxify, components, define, socket, translator, templates */ define('forum/topic/events', [ 'forum/topic/browsing', diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js index 54965b233a..582c5f9a62 100644 --- a/public/src/client/topic/fork.js +++ b/public/src/client/topic/fork.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, ajaxify, translator, socket */ +/* globals define, app, ajaxify, components, translator, socket */ define('forum/topic/fork', function() { diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 779a22b629..46c9df18e7 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, utils, templates, translator, ajaxify, socket, bootbox */ +/* globals define, app, ajaxify, bootbox, components, socket, templates, translator, utils */ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(composer, share, navigator) { diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index b5d39579e4..49284b0cf3 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals config, app, ajaxify, define, socket, utils */ +/* globals config, app, ajaxify, components, define, socket, utils */ define('forum/topic/posts', [ 'forum/pagination', diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index ad98e9e921..43926c9379 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -1,6 +1,6 @@ 'use strict'; -/* globals define, app, translator, ajaxify, socket, bootbox */ +/* globals define, app, components, translator, ajaxify, socket, bootbox */ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], function(fork, move) { diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 76582775cf..49b7a8f7ca 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -1,7 +1,7 @@ 'use strict'; -/* globals app, define, ajaxify, utils, translator, config */ +/* globals app, components, define, ajaxify, utils, translator, config */ define('navigator', ['forum/pagination'], function(pagination) { From 901cb92941ae99e3ca6649a246598e1e7df7ecdb Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 13:52:32 -0400 Subject: [PATCH 811/897] if no args, get all components of that type --- public/src/components.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/components.js b/public/src/components.js index a31549e694..47a1023c27 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -5,7 +5,7 @@ var components = components || {}; (function() { components.core = { 'post': function(name, value) { - return value ? $('[data-' + name + '="' + value + '"]') $('[data-' + name + ']'); + return $('[data-' + name + '="' + value + '"]'); }, 'post/content': function(pid) { var el = components.core.post('pid', pid).find('[component="post/content"]'); @@ -24,7 +24,7 @@ var components = components || {}; components.get = function() { var args = Array.prototype.slice.call(arguments, 1); - if (components.core[arguments[0]]) { + if (components.core[arguments[0]] && args.length) { return components.core[arguments[0]].apply(this, args); } else { return $('[component="' + arguments[0] + '"]'); From 51745568dfea8789ad19cb7a98a8653c9c0b3334 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 13:59:25 -0400 Subject: [PATCH 812/897] removed the rest of the .post-row selectors in favour for components system --- public/src/client/topic/fork.js | 4 ++-- public/src/client/topic/postTools.js | 12 ++++++------ public/src/client/topic/posts.js | 12 ++++++------ public/src/modules/share.js | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js index 582c5f9a62..4c955889d9 100644 --- a/public/src/client/topic/fork.js +++ b/public/src/client/topic/fork.js @@ -18,11 +18,11 @@ define('forum/topic/fork', function() { } function disableClicksOnPosts() { - $('.post-row').on('click', 'button,a', disableClicks); + components.get('post').on('click', 'button,a', disableClicks); } function enableClicksOnPosts() { - $('.post-row').off('click', 'button,a', disableClicks); + components.get('post').off('click', 'button,a', disableClicks); } function onForkThreadClicked() { diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 46c9df18e7..f61fe4834f 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -38,13 +38,13 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com }; function addVoteHandler() { - components.get('topic').on('mouseenter', '.post-row .votes', function() { + components.get('topic').on('mouseenter', '[data-pid] .votes', function() { loadDataAndCreateTooltip($(this)); }); } function loadDataAndCreateTooltip(el) { - var pid = el.parents('.post-row').attr('data-pid'); + var pid = el.parents('[data-pid]').attr('data-pid'); socket.emit('posts.getUpvoters', [pid], function(err, data) { if (!err && data.length) { createTooltip(el, data[0]); @@ -185,7 +185,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com } function toggleVote(button, className, method) { - var post = button.parents('.post-row'), + var post = button.parents('[data-pid]'), currentState = post.find(className).length; socket.emit(currentState ? 'posts.unvote' : method , { @@ -222,7 +222,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com } function getData(button, data) { - return button.parents('.post-row').attr(data); + return button.parents('[data-pid]').attr(data); } function getUserName(button) { @@ -290,7 +290,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com }); moveBtn.on('click', function() { - movePost(button.parents('.post-row'), getData(button, 'data-pid'), topicId.val()); + movePost(button.parents('[data-pid]'), getData(button, 'data-pid'), topicId.val()); }); } @@ -338,7 +338,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com } function openChat(button) { - var post = button.parents('li.post-row'); + var post = button.parents('data-pid'); app.openChat(post.attr('data-username'), post.attr('data-uid')); button.parents('.btn-group').find('.dropdown-toggle').click(); diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 49284b0cf3..5b22ceb3df 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -26,7 +26,7 @@ define('forum/topic/posts', [ postcount.html(parseInt(postcount.html(), 10) + 1); } - createNewPosts(data, '.post-row[data-index!="0"]', function(html) { + createNewPosts(data, components.get('post').not('[data-index=0]'), function(html) { if (html) { html.addClass('new'); } @@ -43,7 +43,7 @@ define('forum/topic/posts', [ pagination.pageCount = Math.max(1, Math.ceil((posts[0].topic.postcount - 1) / config.postsPerPage)); if (pagination.currentPage === pagination.pageCount) { - createNewPosts(data, '.post-row[data-index!="0"]', scrollToPost); + createNewPosts(data, components.get('post').not('[data-index=0]'), scrollToPost); } else if (parseInt(posts[0].uid, 10) === parseInt(app.user.uid, 10)) { pagination.loadPage(pagination.pageCount, scrollToPost); } @@ -116,7 +116,7 @@ define('forum/topic/posts', [ // Save document height and position for future reference (about 5 lines down) var height = $(document).height(), scrollTop = $(document).scrollTop(), - originalPostEl = $('.post-row[data-index="0"]'); + originalPostEl = components.get('post', 'index', 0); // Insert the new post html.insertBefore(before); @@ -164,7 +164,7 @@ define('forum/topic/posts', [ } function toggleModTools(pid, privileges) { - var postEl = $('.post-row[data-pid="' + pid + '"]'); + var postEl = components.get('post', 'pid', pid); if (!privileges.editable) { postEl.find('.edit, .delete, .purge').remove(); @@ -208,7 +208,7 @@ define('forum/topic/posts', [ indicatorEl.fadeOut(); if (data && data.posts && data.posts.length) { - createNewPosts(data, '.post-row[data-index!="0"]:not(.new)', done); + createNewPosts(data, components.get('post').not('[data-index=0]').not('.new'), done); } else { if (app.user.uid) { socket.emit('topics.markAsRead', [tid]); @@ -244,7 +244,7 @@ define('forum/topic/posts', [ } function hidePostToolsForDeletedPosts(element) { - element.find('.post-row.deleted').each(function() { + element.find('[data-pid].deleted').each(function() { postTools.toggle($(this).attr('data-pid'), true); }); } diff --git a/public/src/modules/share.js b/public/src/modules/share.js index 3f26ebb9f8..83c2dce041 100644 --- a/public/src/modules/share.js +++ b/public/src/modules/share.js @@ -50,7 +50,7 @@ define('share', function() { function getPostUrl(clickedElement) { var parts = window.location.pathname.split('/'); - var postIndex = parseInt(clickedElement.parents('.post-row').attr('data-index'), 10); + var postIndex = parseInt(clickedElement.parents('data-index').attr('data-index'), 10); return '/' + parts[1] + '/' + parts[2] + (parts[3] ? '/' + parts[3] : '') + (postIndex ? '/' + (postIndex + 1) : ''); } From 15b54d6e43105f5ba74b88c8df03cd3a0e799099 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 13:59:52 -0400 Subject: [PATCH 813/897] removed more .post-row selectors --- public/src/client/topic.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 388ee8e136..012e6ba728 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -53,7 +53,7 @@ define('forum/topic', [ handleBookmark(tid); - navigator.init('.posts > .post-row', ajaxify.variables.get('postcount'), Topic.toTop, Topic.toBottom, Topic.navigatorCallback, Topic.calculateIndex); + navigator.init(components.get('post'), ajaxify.variables.get('postcount'), Topic.toTop, Topic.toBottom, Topic.navigatorCallback, Topic.calculateIndex); $(window).on('scroll', updateTopicTitle); @@ -124,7 +124,7 @@ define('forum/topic', [ function enableInfiniteLoadingOrPagination() { if(!config.usePagination) { - infinitescroll.init(posts.loadMorePosts, components.get('topic').find('.post-row[data-index="0"]').height()); + infinitescroll.init(posts.loadMorePosts, components.get('post', 'index', 0).height()); } else { navigator.hide(); From 0c4ffafca357ed57e69527596a75e345574627ac Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:09:08 -0400 Subject: [PATCH 814/897] topic buttons are now components --- public/src/client/topic/postTools.js | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index f61fe4834f..4d6ee457d4 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -70,57 +70,57 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com } function addPostHandlers(tid, threadState) { - $('.topic').on('click', '.post_reply', function() { + var postContainer = components.get('topic'); + + postContainer.on('click', '.quote, [component="post/quote"]', function() { if (!threadState.locked) { - onReplyClicked($(this), tid, topicName); + onQuoteClicked($(this), tid, topicName); } }); - var postContainer = components.get('topic'); - - postContainer.on('click', '.quote', function() { + postContainer.on('click', '.post_reply, [component="post/reply"]', function() { if (!threadState.locked) { - onQuoteClicked($(this), tid, topicName); + onReplyClicked($(this), tid, topicName); } }); - postContainer.on('click', '.favourite', function() { + postContainer.on('click', '.favourite, [component="post/favourite"]', function() { favouritePost($(this), getData($(this), 'data-pid')); }); - postContainer.on('click', '.upvote', function() { + postContainer.on('click', '.upvote, [component="post/upvote"]', function() { return toggleVote($(this), '.upvoted', 'posts.upvote'); }); - postContainer.on('click', '.downvote', function() { + postContainer.on('click', '.downvote, [component="post/downvote"]', function() { return toggleVote($(this), '.downvoted', 'posts.downvote'); }); - postContainer.on('click', '.votes', function() { + postContainer.on('click', '.votes, [component="post/voters"]', function() { showVotes(getData($(this), 'data-pid')); }); - postContainer.on('click', '.flag', function() { + postContainer.on('click', '.flag, [component="post/flag"]', function() { flagPost(getData($(this), 'data-pid')); }); - postContainer.on('click', '.edit', function(e) { + postContainer.on('click', '.edit, [component="post/edit"]', function(e) { composer.editPost(getData($(this), 'data-pid')); }); - postContainer.on('click', '.delete', function(e) { + postContainer.on('click', '.delete, [component="post/delete"]', function(e) { deletePost($(this), tid); }); - postContainer.on('click', '.purge', function(e) { + postContainer.on('click', '.purge, [component="post/purge"]', function(e) { purgePost($(this), tid); }); - postContainer.on('click', '.move', function(e) { + postContainer.on('click', '.move, [component="post/move"]', function(e) { openMovePostModal($(this)); }); - postContainer.on('click', '.chat', function(e) { + postContainer.on('click', '.chat, [component="user/chat"]', function(e) { openChat($(this)); }); } From 855e43ea1266c1edea17b3f6d292efe0494722c6 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:16:24 -0400 Subject: [PATCH 815/897] deprecation notices --- NOTES.md | 6 ++++++ public/src/client/topic/postTools.js | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 NOTES.md diff --git a/NOTES.md b/NOTES.md new file mode 100644 index 0000000000..dca0aec904 --- /dev/null +++ b/NOTES.md @@ -0,0 +1,6 @@ +Deprecation TODO's for post - 0.7x +====================================== + +- public/src/components.js: remove pre-0.7x compatibility code +- public/src/client/topic/postTools.js: remove selectors for every post button (ex. ".edit") +- remove all selectors for .post-content diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 4d6ee457d4..2a48e3008b 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -72,6 +72,12 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com function addPostHandlers(tid, threadState) { var postContainer = components.get('topic'); + /* + * Deprecation notice: + * post-0.7.0 .classname selectors will no longer be supported + * Use the components system instead. + */ + postContainer.on('click', '.quote, [component="post/quote"]', function() { if (!threadState.locked) { onQuoteClicked($(this), tid, topicName); @@ -129,7 +135,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com var selectionText = '', selection = window.getSelection ? window.getSelection() : document.selection.createRange(); - if ($(selection.baseNode).parents('.post-content').length > 0) { + if ($(selection.baseNode).parents('[component="post/content"]').length > 0) { var snippet = selection.toString(); if (snippet.length) { selectionText = '> ' + snippet.replace(/\n/g, '\n> ') + '\n\n'; From ec079afab10ea036cb929b4d252d117e4130370b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:16:41 -0400 Subject: [PATCH 816/897] post/content component --- public/src/client/topic/events.js | 4 ++-- public/src/client/topic/posts.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index f044f3f4f6..1a309b8eba 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -159,9 +159,9 @@ define('forum/topic/events', [ if (!app.user.isAdmin && parseInt(data.uid, 10) !== parseInt(app.user.uid, 10)) { if (isDeleted) { - postEl.find('.post-content').translateHtml('[[topic:post_is_deleted]]'); + postEl.find('[component="post/content"], .post-content').translateHtml('[[topic:post_is_deleted]]'); } else { - postEl.find('.post-content').html(data.content); + postEl.find('[component="post/content"], .post-content').html(data.content); } } } diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 5b22ceb3df..c34e0c4196 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -225,14 +225,14 @@ define('forum/topic/posts', [ utils.addCommasToNumbers(element.find('.formatted-number')); utils.makeNumbersHumanReadable(element.find('.human-readable-number')); element.find('.timeago').timeago(); - element.find('.post-content img:not(.emoji)').addClass('img-responsive').each(function() { + element.find('[component="post/content"] img:not(.emoji), .post-content img:not(.emoji)').addClass('img-responsive').each(function() { var $this = $(this); if (!$this.parent().is('a')) { $this.wrap(''); } }); postTools.updatePostCount(); - addBlockquoteEllipses(element.find('.post-content > blockquote')); + addBlockquoteEllipses(element.find('[component="post/content"] > blockquote, .post-content > blockquote')); hidePostToolsForDeletedPosts(element); showBottomPostBar(); }; From 61db112942c586dfba5b33c2cb1bf14a598abb8f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:26:12 -0400 Subject: [PATCH 817/897] topic/follow component --- public/src/client/topic/threadTools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 43926c9379..1f0db3232d 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -60,7 +60,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func fork.init(); - $('.posts').on('click', '.follow', function() { + components.get('topic').on('click', '[component="topic/follow"]', function() { socket.emit('topics.toggleFollow', tid, function(err, state) { if(err) { return app.alert({ @@ -152,7 +152,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func var iconClass = state ? 'fa fa-eye-slash' : 'fa fa-eye'; var text = state ? '[[topic:unwatch]]' : '[[topic:watch]]'; - var followEl = $('.posts .follow'); + var followEl = components.get('topic/follow'); translator.translate(title, function(titleTranslated) { followEl.attr('title', titleTranslated).find('i').attr('class', iconClass); From a740e8e98fef71dd78b47958212a61d6f64ccd89 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:31:32 -0400 Subject: [PATCH 818/897] post/header component --- NOTES.md | 4 +++- public/src/client/category.js | 2 +- public/src/client/topic/threadTools.js | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NOTES.md b/NOTES.md index dca0aec904..4d9c63d7fc 100644 --- a/NOTES.md +++ b/NOTES.md @@ -3,4 +3,6 @@ Deprecation TODO's for post - 0.7x - public/src/components.js: remove pre-0.7x compatibility code - public/src/client/topic/postTools.js: remove selectors for every post button (ex. ".edit") -- remove all selectors for .post-content +- remove all pre-0.7x compatibility selectors for: + .post-content + .topic-title \ No newline at end of file diff --git a/public/src/client/category.js b/public/src/client/category.js index 9b44708fd1..4e91b28afe 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -55,7 +55,7 @@ define('forum/category', [ navigator.init('#topics-container > .category-item', ajaxify.variables.get('topic_count'), Category.toTop, Category.toBottom, Category.navigatorCallback); } - $('#topics-container').on('click', '.topic-title', function() { + $('#topics-container').on('click', '[component="post/header"], .topic-title', function() { var clickedIndex = $(this).parents('[data-index]').attr('data-index'); $('#topics-container li.category-item').each(function(index, el) { if ($(el).offset().top - $(window).scrollTop() > 0) { diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 1f0db3232d..90fe941b81 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -110,7 +110,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func }); threadEl.find('.quote, .edit, .delete').toggleClass('hidden', isLocked); - $('.topic-title i.fa-lock').toggleClass('hide', !data.isLocked); + $('[component="post/header"] i.fa-lock, .topic-title i.fa-lock').toggleClass('hide', !data.isLocked); ThreadTools.threadState.locked = data.isLocked; } }; @@ -143,7 +143,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func $('.pin_thread').html(translated); ThreadTools.threadState.pinned = data.isPinned; }); - $('.topic-title i.fa-thumb-tack').toggleClass('hide', !data.isPinned); + $('[component="post/header"] i.fa-thumb-tack, .topic-title i.fa-thumb-tack').toggleClass('hide', !data.isPinned); } }; From 1d53365707839038160cc0e794ae2ed35b17b5d3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:37:53 -0400 Subject: [PATCH 819/897] post/reply component --- NOTES.md | 3 ++- public/src/client/topic/posts.js | 2 +- public/src/client/topic/threadTools.js | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NOTES.md b/NOTES.md index 4d9c63d7fc..256ac57163 100644 --- a/NOTES.md +++ b/NOTES.md @@ -5,4 +5,5 @@ Deprecation TODO's for post - 0.7x - public/src/client/topic/postTools.js: remove selectors for every post button (ex. ".edit") - remove all pre-0.7x compatibility selectors for: .post-content - .topic-title \ No newline at end of file + .topic-title + .post_reply \ No newline at end of file diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index c34e0c4196..b9e70cb34d 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -172,7 +172,7 @@ define('forum/topic/posts', [ if (!privileges.move) { postEl.find('.move').remove(); } - postEl.find('.reply, .quote').toggleClass('hidden', !$('.post_reply').length); + postEl.find('.reply, .quote').toggleClass('hidden', !$('.post_reply, [component="post/reply"]').length); var isSelfPost = parseInt(postEl.attr('data-uid'), 10) === parseInt(app.user.uid, 10); postEl.find('.chat, .flag').toggleClass('hidden', isSelfPost || !app.user.uid); } diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 90fe941b81..7831180d5f 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -105,8 +105,8 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func translator.translate(isLocked ? '[[topic:locked]]' : '[[topic:reply]]', function(translated) { var className = isLocked ? 'fa-lock' : 'fa-reply'; - threadEl.find('.post_reply').html(' ' + translated); - $('.topic-main-buttons .post_reply').attr('disabled', isLocked).html(isLocked ? ' ' + translated : translated); + threadEl.find('.post_reply, [component="post/reply"]').html(' ' + translated); + $('.post_reply, [component="post/reply"]').attr('disabled', isLocked).html(isLocked ? ' ' + translated : translated); }); threadEl.find('.quote, .edit, .delete').toggleClass('hidden', isLocked); From f8af900415677ac1798e2c0fbed82c1461b4c1e1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:45:06 -0400 Subject: [PATCH 820/897] post button components --- NOTES.md | 10 +++++++++- public/src/client/topic/posts.js | 12 +++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/NOTES.md b/NOTES.md index 256ac57163..0bc8d51d76 100644 --- a/NOTES.md +++ b/NOTES.md @@ -6,4 +6,12 @@ Deprecation TODO's for post - 0.7x - remove all pre-0.7x compatibility selectors for: .post-content .topic-title - .post_reply \ No newline at end of file + .post_reply + .edit + .delete + .purge + .move + .reply + .quote + .chat + .flag \ No newline at end of file diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index b9e70cb34d..e91494dc38 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -164,17 +164,19 @@ define('forum/topic/posts', [ } function toggleModTools(pid, privileges) { - var postEl = components.get('post', 'pid', pid); + var postEl = components.get('post', 'pid', pid), + isSelfPost = parseInt(postEl.attr('data-uid'), 10) === parseInt(app.user.uid, 10); if (!privileges.editable) { - postEl.find('.edit, .delete, .purge').remove(); + postEl.find('.edit, .delete, .purge, [component="post/edit"], [component="post/delete"], [component="post/purge"]').remove(); } + if (!privileges.move) { - postEl.find('.move').remove(); + postEl.find('.move, [component="post/move"]').remove(); } + postEl.find('.reply, .quote').toggleClass('hidden', !$('.post_reply, [component="post/reply"]').length); - var isSelfPost = parseInt(postEl.attr('data-uid'), 10) === parseInt(app.user.uid, 10); - postEl.find('.chat, .flag').toggleClass('hidden', isSelfPost || !app.user.uid); + postEl.find('.chat, .flag, [component="user/chat"], [component="post/flag"]').toggleClass('hidden', isSelfPost || !app.user.uid); } Posts.loadMorePosts = function(direction) { From 10b9919a496d2801e4b296b933036cb565d6a341 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:47:37 -0400 Subject: [PATCH 821/897] removed some possibly antiquated privs code --- public/src/client/topic/posts.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index e91494dc38..42b248b6d4 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -174,8 +174,7 @@ define('forum/topic/posts', [ if (!privileges.move) { postEl.find('.move, [component="post/move"]').remove(); } - - postEl.find('.reply, .quote').toggleClass('hidden', !$('.post_reply, [component="post/reply"]').length); + postEl.find('.chat, .flag, [component="user/chat"], [component="post/flag"]').toggleClass('hidden', isSelfPost || !app.user.uid); } From b9dd994a56b0635062a16db74314af103676fe33 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 14:57:10 -0400 Subject: [PATCH 822/897] user/postcount component --- public/src/client/topic/posts.js | 2 +- public/src/components.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 42b248b6d4..af7615f441 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -22,7 +22,7 @@ define('forum/topic/posts', [ } for (var i=0; i Date: Tue, 17 Mar 2015 15:08:52 -0400 Subject: [PATCH 823/897] topic/browsing/list and topic/browsing/count components --- NOTES.md | 27 ++++++++++++++++----------- public/src/client/topic/browsing.js | 16 ++++++++-------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/NOTES.md b/NOTES.md index 0bc8d51d76..79c8aceb34 100644 --- a/NOTES.md +++ b/NOTES.md @@ -4,14 +4,19 @@ Deprecation TODO's for post - 0.7x - public/src/components.js: remove pre-0.7x compatibility code - public/src/client/topic/postTools.js: remove selectors for every post button (ex. ".edit") - remove all pre-0.7x compatibility selectors for: - .post-content - .topic-title - .post_reply - .edit - .delete - .purge - .move - .reply - .quote - .chat - .flag \ No newline at end of file + Topics - + .post-content + .topic-title + .post_reply + .edit + .delete + .purge + .move + .reply + .quote + .chat + .flag + .thread_active_users + .browsing-users + .thread_active_users + .user-count \ No newline at end of file diff --git a/public/src/client/topic/browsing.js b/public/src/client/topic/browsing.js index 935439fa88..bdb5ee25dd 100644 --- a/public/src/client/topic/browsing.js +++ b/public/src/client/topic/browsing.js @@ -10,7 +10,7 @@ define('forum/topic/browsing', function() { Browsing.onUpdateUsersInRoom = function(data) { if (data && data.room.indexOf('topic_' + ajaxify.variables.get('topic_id')) !== -1) { - $('.browsing-users').toggleClass('hidden', !data.users.length); + $('.thread_active_users-users, [component="topic/browsing/list"]').parent().toggleClass('hidden', !data.users.length); for(var i=0; i
    '); } } @@ -99,11 +99,11 @@ define('forum/topic/browsing', function() { if (!count || count < 0) { count = 0; } - $('.user-count').text(count).parent().toggleClass('hidden', count === 0); + $('.user-count, [component="topic/browsing/count"]').text(count).parent().toggleClass('hidden', count === 0); } function increaseUserCount(incr) { - updateUserCount(parseInt($('.user-count').first().text(), 10) + incr); + updateUserCount(parseInt($('.user-count, [component="topic/browsing/count"]').first().text(), 10) + incr); } return Browsing; From c2a51696255e033bc84b684a10384df12e1d7ed1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 15:33:07 -0400 Subject: [PATCH 824/897] post/votes component, user/reputation component --- public/src/client/topic/events.js | 2 +- public/src/client/topic/postTools.js | 2 +- public/src/components.js | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 1a309b8eba..6c6887b71f 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -69,7 +69,7 @@ define('forum/topic/events', [ }; function updatePostVotesAndUserReputation(data) { - var votes = $('[data-pid="' + data.post.pid + '"] .votes'), + var votes = components.get('post/votes', data.post.pid), reputationElements = $('.reputation[data-uid="' + data.post.uid + '"]'); votes.html(data.post.votes).attr('data-votes', data.post.votes); diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 2a48e3008b..ef824fc3bf 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -102,7 +102,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com return toggleVote($(this), '.downvoted', 'posts.downvote'); }); - postContainer.on('click', '.votes, [component="post/voters"]', function() { + postContainer.on('click', '.votes, [component="post/votes"]', function() { showVotes(getData($(this), 'data-pid')); }); diff --git a/public/src/components.js b/public/src/components.js index 3d9eea5b47..d1d61e5769 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -19,9 +19,17 @@ var components = components || {}; var el = components.core.post('index', index).find('[component="post/anchor"]'); return el.length ? el : $('#post_anchor_' + index); // deprecated after 0.7x }, + 'post/votes': function(pid) { + var el = components.core.post('pid', pid).find('[component="post/votes"]'); + return el.length ? el : components.core.post('pid', pid).find('.votes'); // deprecated after 0.7x + }, 'user/postcount': function(uid) { var el = $('[component="user/postcount"][data-uid="' + uid + '"]'); return el.length ? el : $('.user_postcount_' + uid); // deprecated after 0.7x + }, + 'user/reputation': function(uid) { + var el = $('[component="user/reputation"][data-uid="' + uid + '"]'); + return el.length ? el : $('.reputation[data-uid="' + uid + '"]'); // deprecated after 0.7x } }; From fffed299137d46fc6d08fdd73face332d9aecdb7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 15:35:32 -0400 Subject: [PATCH 825/897] post/favourite-count component --- public/src/client/topic/events.js | 2 +- public/src/client/topic/postTools.js | 2 +- public/src/components.js | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 6c6887b71f..614202c160 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -69,7 +69,7 @@ define('forum/topic/events', [ }; function updatePostVotesAndUserReputation(data) { - var votes = components.get('post/votes', data.post.pid), + var votes = components.get('post/vote-count', data.post.pid), reputationElements = $('.reputation[data-uid="' + data.post.uid + '"]'); votes.html(data.post.votes).attr('data-votes', data.post.votes); diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index ef824fc3bf..247623943c 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -102,7 +102,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com return toggleVote($(this), '.downvoted', 'posts.downvote'); }); - postContainer.on('click', '.votes, [component="post/votes"]', function() { + postContainer.on('click', '.votes, [component="post/vote-count"]', function() { showVotes(getData($(this), 'data-pid')); }); diff --git a/public/src/components.js b/public/src/components.js index d1d61e5769..6014c14184 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -19,10 +19,15 @@ var components = components || {}; var el = components.core.post('index', index).find('[component="post/anchor"]'); return el.length ? el : $('#post_anchor_' + index); // deprecated after 0.7x }, - 'post/votes': function(pid) { - var el = components.core.post('pid', pid).find('[component="post/votes"]'); + 'post/vote-count': function(pid) { + var el = components.core.post('pid', pid).find('[component="post/vote-count"]'); return el.length ? el : components.core.post('pid', pid).find('.votes'); // deprecated after 0.7x }, + 'post/favourite-count': function(pid) { + var el = components.core.post('pid', pid).find('[component="post/favourite-count"]'); + return el.length ? el : components.core.post('pid', pid).find('.favouriteCount'); // deprecated after 0.7x + }, + 'user/postcount': function(uid) { var el = $('[component="user/postcount"][data-uid="' + uid + '"]'); return el.length ? el : $('.user_postcount_' + uid); // deprecated after 0.7x From 3bd42c8b7a95fbf29bd132891afc9367aa4968cb Mon Sep 17 00:00:00 2001 From: cismous Date: Wed, 18 Mar 2015 03:39:42 +0800 Subject: [PATCH 826/897] remove comma --- src/controllers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/index.js b/src/controllers/index.js index 6aba26bb1f..7c97292064 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -26,7 +26,7 @@ var Controllers = { accounts: require('./accounts'), static: require('./static'), api: require('./api'), - admin: require('./admin'), + admin: require('./admin') }; From 5e39d8df33917839ddeb4cddd35fce790275df01 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 15:48:08 -0400 Subject: [PATCH 827/897] thread tools components --- public/src/client/topic/fork.js | 2 +- public/src/client/topic/threadTools.js | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.js index 4c955889d9..91ec8a2be9 100644 --- a/public/src/client/topic/fork.js +++ b/public/src/client/topic/fork.js @@ -10,7 +10,7 @@ define('forum/topic/fork', function() { pids = []; Fork.init = function() { - $('.fork_thread').on('click', onForkThreadClicked); + components.get('topic/fork').on('click', onForkThreadClicked); }; function disableClicks() { diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 7831180d5f..193fe7c607 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -21,27 +21,27 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func ThreadTools.setPinnedState({tid: tid, isPinned: true}); } - $('.delete_thread').on('click', function() { + components.get('topic/delete').on('click', function() { topicCommand(threadState.deleted ? 'restore' : 'delete', tid); return false; }); - $('.purge_thread').on('click', function() { + components.get('topic/purge').on('click', function() { topicCommand('purge', tid); return false; }); - $('.lock_thread').on('click', function() { + components.get('topic/lock').on('click', function() { socket.emit(threadState.locked ? 'topics.unlock' : 'topics.lock', {tids: [tid], cid: ajaxify.variables.get('category_id')}); return false; }); - $('.pin_thread').on('click', function() { + components.get('topic/pin').on('click', function() { socket.emit(threadState.pinned ? 'topics.unpin' : 'topics.pin', {tids: [tid], cid: ajaxify.variables.get('category_id')}); return false; }); - $('.markAsUnreadForAll').on('click', function() { + components.get('topic/mark-unread-for-all').on('click', function() { var btn = $(this); socket.emit('topics.markAsUnreadForAll', [tid], function(err) { if(err) { @@ -53,7 +53,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func return false; }); - $('.move_thread').on('click', function(e) { + components.get('topic/move').on('click', function(e) { move.init([tid], ajaxify.variables.get('category_id')); return false; }); @@ -101,7 +101,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func if (parseInt(data.tid, 10) === parseInt(threadEl.attr('data-tid'), 10)) { var isLocked = data.isLocked && !app.user.isAdmin; - $('.lock_thread').translateHtml(' [[topic:thread_tools.' + (data.isLocked ? 'un': '') + 'lock]]'); + components.get('topic/lock').translateHtml(' [[topic:thread_tools.' + (data.isLocked ? 'un': '') + 'lock]]'); translator.translate(isLocked ? '[[topic:locked]]' : '[[topic:reply]]', function(translated) { var className = isLocked ? 'fa-lock' : 'fa-reply'; @@ -121,11 +121,12 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func return; } - $('.delete_thread span').translateHtml(' [[topic:thread_tools.' + (data.isDelete ? 'restore' : 'delete') + ']]'); + components.get('topic/delete').translateHtml(' [[topic:thread_tools.' + (data.isDelete ? 'restore' : 'delete') + ']]'); threadEl.toggleClass('deleted', data.isDelete); ThreadTools.threadState.deleted = data.isDelete; - $('.purge_thread').toggleClass('hidden', !data.isDelete); + + components.get('topic/purge').toggleClass('hidden', !data.isDelete); if (data.isDelete) { translator.translate('[[topic:deleted_message]]', function(translated) { @@ -140,7 +141,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func var threadEl = components.get('topic'); if (parseInt(data.tid, 10) === parseInt(threadEl.attr('data-tid'), 10)) { translator.translate(' [[topic:thread_tools.' + (data.isPinned ? 'unpin' : 'pin') + ']]', function(translated) { - $('.pin_thread').html(translated); + components.get('topic/pin').html(translated); ThreadTools.threadState.pinned = data.isPinned; }); $('[component="post/header"] i.fa-thumb-tack, .topic-title i.fa-thumb-tack').toggleClass('hide', !data.isPinned); From 37fe438c63359e9ce25a307aea48c752f0ce7c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 17 Mar 2015 15:53:05 -0400 Subject: [PATCH 828/897] reset fix for t.js bug :rage3: --- public/src/client/reset.js | 1 + public/src/client/reset_code.js | 16 +--------------- src/controllers/index.js | 7 +++++-- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/public/src/client/reset.js b/public/src/client/reset.js index 7e272c3284..568d0739a1 100644 --- a/public/src/client/reset.js +++ b/public/src/client/reset.js @@ -24,6 +24,7 @@ define('forum/reset', function() { successEl.addClass('hide').hide(); errorEl.removeClass('hide').show(); } + return false; }); }; diff --git a/public/src/client/reset_code.js b/public/src/client/reset_code.js index c0f46dc356..846feffb42 100644 --- a/public/src/client/reset_code.js +++ b/public/src/client/reset_code.js @@ -31,22 +31,8 @@ define('forum/reset_code', function() { window.location.href = RELATIVE_PATH + '/login'; }); } + return false; }); - - // socket.emit('user.reset.valid', reset_code, function(err, valid) { - // if(err) { - // return app.alertError(err.message); - // } - - // if (valid) { - // resetEl.prop('disabled', false); - // } else { - // var formEl = $('#reset-form'); - // // Show error message - // $('#error').show(); - // formEl.remove(); - // } - // }); }; return ResetCode; diff --git a/src/controllers/index.js b/src/controllers/index.js index 6aba26bb1f..02e2b4a672 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -52,15 +52,18 @@ Controllers.home = function(req, res, next) { Controllers.reset = function(req, res, next) { if (req.params.code) { user.reset.validate(req.params.code, function(err, valid) { + if (err) { + return next(err); + } res.render('reset_code', { valid: valid, - reset_code: req.params.code ? req.params.code : null, + code: req.params.code ? req.params.code : null, breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}]) }); }); } else { res.render('reset', { - reset_code: req.params.code ? req.params.code : null, + code: req.params.code ? req.params.code : null, breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]'}]) }); } From 2e33f1d400833e70be926573a3ff92fcd6ea2c32 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 16:12:06 -0400 Subject: [PATCH 829/897] navbar/title component --- public/src/client/topic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 012e6ba728..4a597b4853 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -20,7 +20,7 @@ define('forum/topic', [ $(window).on('action:ajaxify.start', function(ev, data) { if (ajaxify.currentPage !== data.url) { navigator.hide(); - $('.header-topic-title').find('span').text('').hide(); + components.get('navbar/title').find('span').text('').hide(); app.removeAlert('bookmark'); events.removeListeners(); @@ -135,9 +135,9 @@ define('forum/topic', [ function updateTopicTitle() { if($(window).scrollTop() > 50) { - $('.header-topic-title').find('span').text(ajaxify.variables.get('topic_name')).show(); + components.get('navbar/title').find('span').text(ajaxify.variables.get('topic_name')).show(); } else { - $('.header-topic-title').find('span').text('').hide(); + components.get('navbar/title').find('span').text('').hide(); } } From adbbbb3602e26a69adafa56e7a308b9dca5bff65 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 16:15:12 -0400 Subject: [PATCH 830/897] decided to go ahead and deprecate this for 0.7x instead of post-0.7x --- NOTES.md | 22 ----------------- public/src/client/category.js | 2 +- public/src/client/topic/browsing.js | 16 ++++++------ public/src/client/topic/events.js | 4 +-- public/src/client/topic/postTools.js | 34 ++++++++++++++------------ public/src/client/topic/posts.js | 10 ++++---- public/src/client/topic/threadTools.js | 10 ++++---- public/src/components.js | 21 ++++++---------- 8 files changed, 46 insertions(+), 73 deletions(-) delete mode 100644 NOTES.md diff --git a/NOTES.md b/NOTES.md deleted file mode 100644 index 79c8aceb34..0000000000 --- a/NOTES.md +++ /dev/null @@ -1,22 +0,0 @@ -Deprecation TODO's for post - 0.7x -====================================== - -- public/src/components.js: remove pre-0.7x compatibility code -- public/src/client/topic/postTools.js: remove selectors for every post button (ex. ".edit") -- remove all pre-0.7x compatibility selectors for: - Topics - - .post-content - .topic-title - .post_reply - .edit - .delete - .purge - .move - .reply - .quote - .chat - .flag - .thread_active_users - .browsing-users - .thread_active_users - .user-count \ No newline at end of file diff --git a/public/src/client/category.js b/public/src/client/category.js index 4e91b28afe..cdfb7495f5 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -55,7 +55,7 @@ define('forum/category', [ navigator.init('#topics-container > .category-item', ajaxify.variables.get('topic_count'), Category.toTop, Category.toBottom, Category.navigatorCallback); } - $('#topics-container').on('click', '[component="post/header"], .topic-title', function() { + $('#topics-container').on('click', '[component="post/header"]', function() { var clickedIndex = $(this).parents('[data-index]').attr('data-index'); $('#topics-container li.category-item').each(function(index, el) { if ($(el).offset().top - $(window).scrollTop() > 0) { diff --git a/public/src/client/topic/browsing.js b/public/src/client/topic/browsing.js index bdb5ee25dd..7c14fab158 100644 --- a/public/src/client/topic/browsing.js +++ b/public/src/client/topic/browsing.js @@ -10,7 +10,7 @@ define('forum/topic/browsing', function() { Browsing.onUpdateUsersInRoom = function(data) { if (data && data.room.indexOf('topic_' + ajaxify.variables.get('topic_id')) !== -1) { - $('.thread_active_users-users, [component="topic/browsing/list"]').parent().toggleClass('hidden', !data.users.length); + $('[component="topic/browsing/list"]').parent().toggleClass('hidden', !data.users.length); for(var i=0; i
    '); } } @@ -99,11 +99,11 @@ define('forum/topic/browsing', function() { if (!count || count < 0) { count = 0; } - $('.user-count, [component="topic/browsing/count"]').text(count).parent().toggleClass('hidden', count === 0); + $('[component="topic/browsing/count"]').text(count).parent().toggleClass('hidden', count === 0); } function increaseUserCount(incr) { - updateUserCount(parseInt($('.user-count, [component="topic/browsing/count"]').first().text(), 10) + incr); + updateUserCount(parseInt($('[component="topic/browsing/count"]').first().text(), 10) + incr); } return Browsing; diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 614202c160..c3ecf6d29a 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -159,9 +159,9 @@ define('forum/topic/events', [ if (!app.user.isAdmin && parseInt(data.uid, 10) !== parseInt(app.user.uid, 10)) { if (isDeleted) { - postEl.find('[component="post/content"], .post-content').translateHtml('[[topic:post_is_deleted]]'); + postEl.find('[component="post/content"]').translateHtml('[[topic:post_is_deleted]]'); } else { - postEl.find('[component="post/content"], .post-content').html(data.content); + postEl.find('[component="post/content"]').html(data.content); } } } diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 247623943c..15a8ac3163 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -20,10 +20,12 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com PostTools.toggle = function(pid, isDeleted) { var postEl = components.get('post', 'pid', pid); - postEl.find('.quote, .favourite, .post_reply, .chat, .flag').toggleClass('hidden', isDeleted); - postEl.find('.purge').toggleClass('hidden', !isDeleted); - postEl.find('.delete .i').toggleClass('fa-trash-o', !isDeleted).toggleClass('fa-history', isDeleted); - postEl.find('.delete span').translateHtml(isDeleted ? ' [[topic:restore]]' : ' [[topic:delete]]'); + postEl.find('[component="post/quote"], [component="post/favourite"], [component="post/reply"], [component="post/flag"], [component="user/chat"]') + .toggleClass('hidden', isDeleted); + + postEl.find('[component="post/purge"]').toggleClass('hidden', !isDeleted); + postEl.find('[component="post/delete"] .i').toggleClass('fa-trash-o', !isDeleted).toggleClass('fa-history', isDeleted); + postEl.find('[component="post/delete"] span').translateHtml(isDeleted ? ' [[topic:restore]]' : ' [[topic:delete]]'); }; PostTools.updatePostCount = function() { @@ -78,55 +80,55 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com * Use the components system instead. */ - postContainer.on('click', '.quote, [component="post/quote"]', function() { + postContainer.on('click', '[component="post/quote"]', function() { if (!threadState.locked) { onQuoteClicked($(this), tid, topicName); } }); - postContainer.on('click', '.post_reply, [component="post/reply"]', function() { + postContainer.on('click', '[component="post/reply"]', function() { if (!threadState.locked) { onReplyClicked($(this), tid, topicName); } }); - postContainer.on('click', '.favourite, [component="post/favourite"]', function() { + postContainer.on('click', '[component="post/favourite"]', function() { favouritePost($(this), getData($(this), 'data-pid')); }); - postContainer.on('click', '.upvote, [component="post/upvote"]', function() { + postContainer.on('click', '[component="post/upvote"]', function() { return toggleVote($(this), '.upvoted', 'posts.upvote'); }); - postContainer.on('click', '.downvote, [component="post/downvote"]', function() { + postContainer.on('click', '[component="post/downvote"]', function() { return toggleVote($(this), '.downvoted', 'posts.downvote'); }); - postContainer.on('click', '.votes, [component="post/vote-count"]', function() { + postContainer.on('click', '[component="post/vote-count"]', function() { showVotes(getData($(this), 'data-pid')); }); - postContainer.on('click', '.flag, [component="post/flag"]', function() { + postContainer.on('click', '[component="post/flag"]', function() { flagPost(getData($(this), 'data-pid')); }); - postContainer.on('click', '.edit, [component="post/edit"]', function(e) { + postContainer.on('click', '[component="post/edit"]', function(e) { composer.editPost(getData($(this), 'data-pid')); }); - postContainer.on('click', '.delete, [component="post/delete"]', function(e) { + postContainer.on('click', '[component="post/delete"]', function(e) { deletePost($(this), tid); }); - postContainer.on('click', '.purge, [component="post/purge"]', function(e) { + postContainer.on('click', '[component="post/purge"]', function(e) { purgePost($(this), tid); }); - postContainer.on('click', '.move, [component="post/move"]', function(e) { + postContainer.on('click', '[component="post/move"]', function(e) { openMovePostModal($(this)); }); - postContainer.on('click', '.chat, [component="user/chat"]', function(e) { + postContainer.on('click', '[component="user/chat"]', function(e) { openChat($(this)); }); } diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index af7615f441..e6dffa75c4 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -168,14 +168,14 @@ define('forum/topic/posts', [ isSelfPost = parseInt(postEl.attr('data-uid'), 10) === parseInt(app.user.uid, 10); if (!privileges.editable) { - postEl.find('.edit, .delete, .purge, [component="post/edit"], [component="post/delete"], [component="post/purge"]').remove(); + postEl.find('[component="post/edit"], [component="post/delete"], [component="post/purge"]').remove(); } if (!privileges.move) { - postEl.find('.move, [component="post/move"]').remove(); + postEl.find('[component="post/move"]').remove(); } - postEl.find('.chat, .flag, [component="user/chat"], [component="post/flag"]').toggleClass('hidden', isSelfPost || !app.user.uid); + postEl.find('[component="user/chat"], [component="post/flag"]').toggleClass('hidden', isSelfPost || !app.user.uid); } Posts.loadMorePosts = function(direction) { @@ -226,14 +226,14 @@ define('forum/topic/posts', [ utils.addCommasToNumbers(element.find('.formatted-number')); utils.makeNumbersHumanReadable(element.find('.human-readable-number')); element.find('.timeago').timeago(); - element.find('[component="post/content"] img:not(.emoji), .post-content img:not(.emoji)').addClass('img-responsive').each(function() { + element.find('[component="post/content"] img:not(.emoji)').addClass('img-responsive').each(function() { var $this = $(this); if (!$this.parent().is('a')) { $this.wrap(''); } }); postTools.updatePostCount(); - addBlockquoteEllipses(element.find('[component="post/content"] > blockquote, .post-content > blockquote')); + addBlockquoteEllipses(element.find('[component="post/content"] > blockquote')); hidePostToolsForDeletedPosts(element); showBottomPostBar(); }; diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 193fe7c607..c1900fc508 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -105,12 +105,12 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func translator.translate(isLocked ? '[[topic:locked]]' : '[[topic:reply]]', function(translated) { var className = isLocked ? 'fa-lock' : 'fa-reply'; - threadEl.find('.post_reply, [component="post/reply"]').html(' ' + translated); - $('.post_reply, [component="post/reply"]').attr('disabled', isLocked).html(isLocked ? ' ' + translated : translated); + threadEl.find('[component="post/reply"]').html(' ' + translated); + $('[component="post/reply"]').attr('disabled', isLocked).html(isLocked ? ' ' + translated : translated); }); - threadEl.find('.quote, .edit, .delete').toggleClass('hidden', isLocked); - $('[component="post/header"] i.fa-lock, .topic-title i.fa-lock').toggleClass('hide', !data.isLocked); + threadEl.find('[component="quote"], [component="edit"], [component="delete"]').toggleClass('hidden', isLocked); + $('[component="post/header"] i.fa-lock').toggleClass('hide', !data.isLocked); ThreadTools.threadState.locked = data.isLocked; } }; @@ -144,7 +144,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func components.get('topic/pin').html(translated); ThreadTools.threadState.pinned = data.isPinned; }); - $('[component="post/header"] i.fa-thumb-tack, .topic-title i.fa-thumb-tack').toggleClass('hide', !data.isPinned); + $('[component="post/header"] i.fa-thumb-tack').toggleClass('hide', !data.isPinned); } }; diff --git a/public/src/components.js b/public/src/components.js index 6014c14184..282e445167 100644 --- a/public/src/components.js +++ b/public/src/components.js @@ -8,33 +8,26 @@ var components = components || {}; return $('[data-' + name + '="' + value + '"]'); }, 'post/content': function(pid) { - var el = components.core.post('pid', pid).find('[component="post/content"]'); - return el.length ? el : $('#content_' + pid); // deprecated after 0.7x + return components.core.post('pid', pid).find('[component="post/content"]'); }, 'post/header': function(pid) { - var el = components.core.post('pid', pid).find('[component="post/header"]'); - return el.length ? el : $('#topic_title_' + pid); // deprecated after 0.7x + return components.core.post('pid', pid).find('[component="post/header"]'); }, 'post/anchor': function(index) { - var el = components.core.post('index', index).find('[component="post/anchor"]'); - return el.length ? el : $('#post_anchor_' + index); // deprecated after 0.7x + return components.core.post('index', index).find('[component="post/anchor"]'); }, 'post/vote-count': function(pid) { - var el = components.core.post('pid', pid).find('[component="post/vote-count"]'); - return el.length ? el : components.core.post('pid', pid).find('.votes'); // deprecated after 0.7x + return components.core.post('pid', pid).find('[component="post/vote-count"]'); }, 'post/favourite-count': function(pid) { - var el = components.core.post('pid', pid).find('[component="post/favourite-count"]'); - return el.length ? el : components.core.post('pid', pid).find('.favouriteCount'); // deprecated after 0.7x + return components.core.post('pid', pid).find('[component="post/favourite-count"]'); }, 'user/postcount': function(uid) { - var el = $('[component="user/postcount"][data-uid="' + uid + '"]'); - return el.length ? el : $('.user_postcount_' + uid); // deprecated after 0.7x + return $('[component="user/postcount"][data-uid="' + uid + '"]'); }, 'user/reputation': function(uid) { - var el = $('[component="user/reputation"][data-uid="' + uid + '"]'); - return el.length ? el : $('.reputation[data-uid="' + uid + '"]'); // deprecated after 0.7x + return $('[component="user/reputation"][data-uid="' + uid + '"]'); } }; From 60a70e4e62bad97fa96e21a19cee4fdadbf3a775 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 17 Mar 2015 16:23:18 -0400 Subject: [PATCH 831/897] moved 37fe438c63359e9ce25a307aea48c752f0ce7c2a into core --- src/views/partials/variables/reset_code.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/variables/reset_code.tpl b/src/views/partials/variables/reset_code.tpl index c139a7011d..ab630d7cff 100644 --- a/src/views/partials/variables/reset_code.tpl +++ b/src/views/partials/variables/reset_code.tpl @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 909fe660a910bd0448d615a1002e6dbcd052ee23 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 17 Mar 2015 20:19:24 -0400 Subject: [PATCH 832/897] decodeURIComponent for uploaded file/image --- src/file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.js b/src/file.js index 543c5011fa..c98da6c761 100644 --- a/src/file.js +++ b/src/file.js @@ -23,7 +23,7 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) { is.on('end', function () { callback(null, { - url: nconf.get('upload_url') + folder + '/' + filename + url: nconf.get('upload_url') + folder + '/' + encodeURIComponent(filename) }); }); From 3ed3612047c4f115da9bafc7aaaefd0ab19ec430 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 18 Mar 2015 13:54:43 -0400 Subject: [PATCH 833/897] file upload with spaces / general file upload fix wrt ajaxiy --- public/src/ajaxify.js | 11 +++++++++++ src/file.js | 13 +++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 75e341643e..0c4e191532 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -25,6 +25,8 @@ $(document).ready(function() { ajaxify.go = function (url, callback, quiet) { if (ajaxify.handleACPRedirect(url)) { return true; + } else if (ajaxify.handleNonAPIRoutes(url)) { + return true; } app.enterRoom(''); @@ -71,6 +73,15 @@ $(document).ready(function() { return false; }; + ajaxify.handleNonAPIRoutes = function(url) { + url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); + if (url.indexOf('uploads') === 0) { + window.open(RELATIVE_PATH + '/' + url, '_blank'); + return true; + } + return false; + }; + ajaxify.start = function(url, quiet, search) { url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); var hash = window.location.hash; diff --git a/src/file.js b/src/file.js index c98da6c761..6be1cd37c8 100644 --- a/src/file.js +++ b/src/file.js @@ -8,11 +8,20 @@ var fs = require('fs'), Magic = mmmagic.Magic, mime = require('mime'), - meta= require('./meta'); + meta = require('./meta'), + utils = require('../public/src/utils'); var file = {}; file.saveFileToLocal = function(filename, folder, tempPath, callback) { + /* + * remarkable doesn't allow spaces in hyperlinks, once that's fixed, remove this. + */ + filename = filename.split('.'); + filename.forEach(function(name, idx) { + filename[idx] = utils.slugify(name); + }); + filename = filename.join('.'); var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), folder, filename); @@ -23,7 +32,7 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) { is.on('end', function () { callback(null, { - url: nconf.get('upload_url') + folder + '/' + encodeURIComponent(filename) + url: nconf.get('upload_url') + folder + '/' + filename }); }); From 98c54c3ccbb34346a344eff3896e14ab81bc0d9b Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 18 Mar 2015 14:40:16 -0400 Subject: [PATCH 834/897] closes https://github.com/NodeBB/NodeBB/issues/2856 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f56cc91e1..8114176481 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "socket.io-redis": "^0.1.3", "socketio-wildcard": "~0.1.1", "string": "^3.0.0", - "templates.js": "^0.1.28", + "templates.js": "^0.1.30", "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git", "underscore": "~1.7.0", "validator": "^3.30.0", From e9d9e14eb40ad1db2151c3fc78bfcc9549f8eb25 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 18 Mar 2015 14:55:16 -0400 Subject: [PATCH 835/897] components - fixed a bug with bottom post bar now showing up --- public/src/client/topic/posts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index e6dffa75c4..c2ea3940ff 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -239,7 +239,7 @@ define('forum/topic/posts', [ }; function showBottomPostBar() { - if(components.get('post', 'index').length > 1 || !components.get('post', 'index', 0).length) { + if(components.get('post').length > 1 || !components.get('post', 'index', 0).length) { $('.bottom-post-bar').removeClass('hide'); } } From 6c58bd95205f3ee9905bff43728cd0ba813414ca Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Mar 2015 15:16:37 -0400 Subject: [PATCH 836/897] closes #2871 --- src/controllers/categories.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 18bbd57f8b..4524417712 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -249,6 +249,11 @@ categoriesController.get = function(req, res, next) { categories.getCategoryById(payload, next); }, function(categoryData, next) { + if (categoryData.link) { + db.incrObjectField('category:' + categoryData.cid, 'timesClicked'); + return res.redirect(categoryData.link); + } + var breadcrumbs = [ { text: categoryData.name, @@ -264,10 +269,6 @@ categoriesController.get = function(req, res, next) { }); }, function(categoryData, next) { - if (categoryData.link) { - return res.redirect(categoryData.link); - } - categories.getRecentTopicReplies(categoryData.children, uid, function(err) { next(err, categoryData); }); From 254fcff01f15fe03289b1021096df5c93e7af613 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Mar 2015 15:18:07 -0400 Subject: [PATCH 837/897] forgot db require --- src/controllers/categories.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 4524417712..735df5886d 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -4,6 +4,8 @@ var categoriesController = {}, async = require('async'), nconf = require('nconf'), validator = require('validator'), + + db = require('../database'), privileges = require('../privileges'), user = require('../user'), categories = require('../categories'), From 5951079926d5498f1dfe1cd56827938f02c300a5 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 18 Mar 2015 16:18:17 -0400 Subject: [PATCH 838/897] latest translations --- public/language/it/email.json | 4 +- public/language/it/error.json | 6 +-- public/language/it/notifications.json | 2 +- public/language/it/pages.json | 2 +- public/language/lt/category.json | 4 +- public/language/lt/email.json | 24 ++++----- public/language/lt/error.json | 54 ++++++++++---------- public/language/lt/global.json | 10 ++-- public/language/lt/groups.json | 46 ++++++++--------- public/language/lt/login.json | 6 +-- public/language/lt/modules.json | 6 +-- public/language/lt/notifications.json | 6 +-- public/language/lt/pages.json | 4 +- public/language/lt/recent.json | 22 ++++---- public/language/lt/reset_password.json | 4 +- public/language/lt/search.json | 64 ++++++++++++------------ public/language/lt/topic.json | 20 ++++---- public/language/lt/user.json | 24 ++++----- public/language/lt/users.json | 6 +-- public/language/nb/category.json | 2 +- public/language/nb/email.json | 6 +-- public/language/nb/error.json | 6 +-- public/language/nb/groups.json | 30 +++++------ public/language/nb/login.json | 6 +-- public/language/nb/search.json | 62 +++++++++++------------ public/language/th/category.json | 6 +-- public/language/th/error.json | 42 ++++++++-------- public/language/th/global.json | 8 +-- public/language/th/groups.json | 52 +++++++++---------- public/language/th/login.json | 6 +-- public/language/th/pages.json | 10 ++-- public/language/th/reset_password.json | 4 +- public/language/th/tags.json | 2 +- public/language/th/topic.json | 26 +++++----- public/language/th/unread.json | 8 +-- public/language/th/user.json | 14 +++--- public/language/zh_CN/groups.json | 12 ++--- public/language/zh_CN/login.json | 4 +- public/language/zh_CN/notifications.json | 2 +- 39 files changed, 311 insertions(+), 311 deletions(-) diff --git a/public/language/it/email.json b/public/language/it/email.json index be6567c1c2..e351a25036 100644 --- a/public/language/it/email.json +++ b/public/language/it/email.json @@ -11,7 +11,7 @@ "reset.cta": "Clicca qui per resettare la tua password", "reset.notify.subject": "Possword modificata con successo.", "reset.notify.text1": "Ti informiamo che in data %1, la password è stata cambiata con successo.", - "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "reset.notify.text2": "Se non hai autorizzato questo, per favore notifica immediatamente un amministratore.", "digest.notifications": "Hai una notifica non letta da %1:", "digest.latest_topics": "Ultimi argomenti su %1", "digest.cta": "Clicca qui per visitare %1", @@ -21,7 +21,7 @@ "notif.chat.cta": "Clicca qui per continuare la conversazione", "notif.chat.unsub.info": "Questa notifica di chat ti è stata inviata perché l'hai scelta nelle impostazioni.", "notif.post.cta": "Clicca qui per leggere il topic completo.", - "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", + "notif.post.unsub.info": "Questo post ti è stato notificato in base alle tue impostazioni di sottoscrizione.", "test.text1": "Questa è una email di test per verificare che il servizio di invio email è configurato correttamente sul tuo NodeBB.", "unsub.cta": "Clicca qui per modificare queste impostazioni", "closing": "Grazie!" diff --git a/public/language/it/error.json b/public/language/it/error.json index 777c76856c..cbcc20dedc 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -19,8 +19,8 @@ "email-taken": "Email già esistente", "email-not-confirmed": "La tua Email deve essere ancora confermata, per favore clicca qui per confermare la tua Email.", "email-not-confirmed-chat": "Non potrai chattare finchè non avrai confermato la tua email", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "Questo forum richiede la conferma dell'indirizzo email, per favore clicca qui per inserirne uno", + "email-confirm-failed": "Non possiamo confermare la tua email, per favore prova ancora più tardi.", "username-too-short": "Nome utente troppo corto", "username-too-long": "Nome utente troppo lungo", "user-banned": "Utente bannato", @@ -77,5 +77,5 @@ "registration-error": "Errore nella registrazione", "parse-error": "Qualcosa è andato storto durante l'analisi della risposta proveniente dal server", "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "wrong-login-type-username": "Per favore usa il tuo nome utente per accedere" } \ No newline at end of file diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index a52aabb969..c3f067b0cf 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -2,7 +2,7 @@ "title": "Notifiche", "no_notifs": "Non hai nuove notifiche", "see_all": "Vedi tutte le Notifiche", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Segna tutte le notifiche come già lette", "back_to_home": "Indietro a %1", "outgoing_link": "Link in uscita", "outgoing_link_message": "Stai lasciando %1.", diff --git a/public/language/it/pages.json b/public/language/it/pages.json index 72d2a3e042..3d3ed9865a 100644 --- a/public/language/it/pages.json +++ b/public/language/it/pages.json @@ -11,7 +11,7 @@ "user.followers": "Persone che seguono %1", "user.posts": "Post creati da %1", "user.topics": "Discussioni create da %1", - "user.groups": "%1's Groups", + "user.groups": "%1's Gruppi", "user.favourites": "Post Favoriti da %1", "user.settings": "Impostazioni Utente", "maintenance.text": "%1 è attualmente in manutenzione. Per favore ritorna più tardi.", diff --git a/public/language/lt/category.json b/public/language/lt/category.json index 149a102553..3694a767a7 100644 --- a/public/language/lt/category.json +++ b/public/language/lt/category.json @@ -1,9 +1,9 @@ { "new_topic_button": "Nauja tema", - "guest-login-post": "Log in to post", + "guest-login-post": "Prisijungti įrašų paskelbimui", "no_topics": "Šioje kategorijoje temų nėra.
    Kodėl gi jums nesukūrus naujos?", "browsing": "naršo", "no_replies": "Niekas dar neatsakė", "share_this_category": "Pasidalinti šią kategoriją", - "ignore": "Ignore" + "ignore": "Nepaisyti" } \ No newline at end of file diff --git a/public/language/lt/email.json b/public/language/lt/email.json index f290435e75..af0968b55e 100644 --- a/public/language/lt/email.json +++ b/public/language/lt/email.json @@ -1,28 +1,28 @@ { "password-reset-requested": "Password Reset Requested - %1!", - "welcome-to": "Welcome to %1", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", + "welcome-to": "Sveiki atvykę į %1", + "greeting_no_name": "Sveiki", + "greeting_with_name": "Sveiki %1", "welcome.text1": "Thank you for registering with %1!", "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", - "welcome.cta": "Click here to confirm your email address", + "welcome.cta": "El. adreso patvirtinimui spauskite čia", "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", "reset.text2": "To continue with the password reset, please click on the following link:", - "reset.cta": "Click here to reset your password", - "reset.notify.subject": "Password successfully changed", + "reset.cta": "Slaptažodžio atstatymui spauskite čia", + "reset.notify.subject": "Slaptažodis sėkmingai pakeistas", "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", - "digest.notifications": "You have unread notifications from %1:", + "digest.notifications": "Turite neskaitytų pranešimų nuo %1:", "digest.latest_topics": "Latest topics from %1", - "digest.cta": "Click here to visit %1", + "digest.cta": "Kad aplankyti %1, spauskite čia", "digest.unsub.info": "This digest was sent to you due to your subscription settings.", "digest.no_topics": "There have been no active topics in the past %1", "notif.chat.subject": "New chat message received from %1", - "notif.chat.cta": "Click here to continue the conversation", + "notif.chat.cta": "Pokalbio pratęsimui spauskite čia", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", - "notif.post.cta": "Click here to read the full topic", + "notif.post.cta": "Spauskite čia norėdami skaityti visą temą", "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.", "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", - "unsub.cta": "Click here to alter those settings", - "closing": "Thanks!" + "unsub.cta": "Spauskite čia norėdami pakeisti šiuos nustatymus", + "closing": "Ačiū!" } \ No newline at end of file diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 295af44ce4..08bf3c80a4 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -12,26 +12,26 @@ "invalid-title": "Neteisingas pavadinimas!", "invalid-user-data": "Klaidingi vartotojo duomenys", "invalid-password": "Klaidingas slaptažodis", - "invalid-username-or-password": "Please specify both a username and password", - "invalid-search-term": "Invalid search term", + "invalid-username-or-password": "Prašome nurodyti tiek vartotojo vardą, tiek ir slaptažodį", + "invalid-search-term": "Neteisingas paieškos terminas", "invalid-pagination-value": "Klaidinga puslapiavimo reikšmė", "username-taken": "Vartotojo vardas jau užimtas", "email-taken": "El. pašto adresas jau užimtas", - "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "email-not-confirmed": "Jūsų el. paštas nepatvirtintas, prašome paspausti čia norint jį patvirtinti.", + "email-not-confirmed-chat": "Jūs negalite kalbėtis, kol el. adresas nepatvirtintas", + "no-email-to-confirm": "Šis forumas reikalauja patvirtinimo el. paštu prašome spausti čia el. adreso įrašymui", + "email-confirm-failed": "Negalime patvirtinti jūsų el. adreso, prašom bandyti vėliau.", "username-too-short": "Slapyvardis per trumpas", - "username-too-long": "Username too long", + "username-too-long": "Vartotojo vardas per ilgas", "user-banned": "Vartotojas užblokuotas", - "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post", - "no-category": "Category does not exist", - "no-topic": "Topic does not exist", - "no-post": "Post does not exist", - "no-group": "Group does not exist", - "no-user": "User does not exist", + "user-too-new": "Atsiprašome, bet jums reikia laukti 1% sekundes prieš patalpinant savo pirmąjį įrašą", + "no-category": "Tokios kategorijos nėra", + "no-topic": "Tokios temos nėra", + "no-post": "Tokio įrašo nėra", + "no-group": "Grupė neegzistuoja", + "no-user": "Tokio vartotojo nėra", "no-teaser": "Teaser does not exist", - "no-privileges": "You do not have enough privileges for this action.", + "no-privileges": "Šiam veiksmui jūs neturite pakankamų privilegijų.", "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", "category-disabled": "Kategorija išjungta", "topic-locked": "Tema užrakinta", @@ -50,32 +50,32 @@ "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!", - "invalid-image-type": "Invalid image type. Allowed types are: %1", - "invalid-image-extension": "Invalid image extension", - "invalid-file-type": "Invalid file type. Allowed types are: %1", + "invalid-image-type": "Neteisingas vaizdo tipas. Leidžiami tipai :%1", + "invalid-image-extension": "Neteisingas vaizdo plėtinys", + "invalid-file-type": "Neteisingas failo tipas. Leidžiami tipai: %1", "group-name-too-short": "Grupės pavadinimas per trumpas", "group-already-exists": "Tokia grupė jau egzistuoja", "group-name-change-not-allowed": "Grupės pavadinimas keitimas neleidžiamas", - "group-already-member": "You are already part of this group", + "group-already-member": "Jūs jau priklausote šiai grupei", "group-needs-owner": "This group requires at least one owner", - "post-already-deleted": "This post has already been deleted", - "post-already-restored": "This post has already been restored", - "topic-already-deleted": "This topic has already been deleted", - "topic-already-restored": "This topic has already been restored", + "post-already-deleted": "Šis įrašas jau buvo ištrintas", + "post-already-restored": "Šis įrašas jau atstatytas", + "topic-already-deleted": "Ši tema jau ištrinta", + "topic-already-restored": "Ši tema jau atkurta", "topic-thumbnails-are-disabled": "Temos paveikslėliai neleidžiami.", "invalid-file": "Klaidingas failas", "uploads-are-disabled": "Įkėlimai neleidžiami", "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.", "cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", - "too-many-messages": "You have sent too many messages, please wait awhile.", - "reputation-system-disabled": "Reputation system is disabled.", + "too-many-messages": "Išsiuntėte per daug pranešimų, kurį laiką prašome palaukti.", + "reputation-system-disabled": "Reputacijos sistema išjungta.", "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", - "registration-error": "Registration Error", + "registration-error": "Registracijos klaida", "parse-error": "Something went wrong while parsing server response", - "wrong-login-type-email": "Please use your email to login", - "wrong-login-type-username": "Please use your username to login" + "wrong-login-type-email": "Prisijungimui prašom naudoti jūsų el. adresą", + "wrong-login-type-username": "Prisijungimui prašome naudoti vartotojo vardą" } \ No newline at end of file diff --git a/public/language/lt/global.json b/public/language/lt/global.json index c4bf81cf4b..8301db2346 100644 --- a/public/language/lt/global.json +++ b/public/language/lt/global.json @@ -27,7 +27,7 @@ "header.tags": "Žymos", "header.popular": "Populiarūs", "header.users": "Vartotojai", - "header.groups": "Groups", + "header.groups": "Grupės", "header.chats": "Susirašinėjimai", "header.notifications": "Pranešimai", "header.search": "Ieškoti", @@ -74,8 +74,8 @@ "guests": "Svečiai", "updated.title": "Forumas atnaujintas", "updated.message": "Forumas buvo atnaujintas iki naujausios versijos. Paspauskite čia norėdami perkrauti puslapį.", - "privacy": "Privacy", - "follow": "Follow", - "unfollow": "Unfollow", - "delete_all": "Delete All" + "privacy": "Privatumas", + "follow": "Sekti", + "unfollow": "Nebesekti", + "delete_all": "Viską ištrinti" } \ No newline at end of file diff --git a/public/language/lt/groups.json b/public/language/lt/groups.json index d2314fdc29..076154cf92 100644 --- a/public/language/lt/groups.json +++ b/public/language/lt/groups.json @@ -1,34 +1,34 @@ { - "groups": "Groups", - "view_group": "View Group", - "owner": "Group Owner", - "new_group": "Create New Group", + "groups": "Grupės", + "view_group": "Grupės peržiūra", + "owner": "Grupės savininkas", + "new_group": "Kurti naują grupę", "no_groups_found": "There are no groups to see", - "pending.accept": "Accept", - "pending.reject": "Reject", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", - "details.title": "Group Details", - "details.members": "Member List", - "details.pending": "Pending Members", - "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts", - "details.private": "Private", + "pending.accept": "Priimti", + "pending.reject": "Atmesti", + "cover-instructions": "Vilkite čia nuotrauką, perkelkite į reikalingą poziciją ir spauskite Save", + "cover-change": "Keisti", + "cover-save": "Saugoti", + "cover-saving": "Išsaugoma", + "details.title": "Grupės detalės", + "details.members": "Narių sąrašas", + "details.pending": "Laukiantys nariai", + "details.has_no_posts": "Šios grupės nariai neatliko jokių įrašų.", + "details.latest_posts": "Vėliausi įrašai", + "details.private": "Asmeniška", "details.grant": "Grant/Rescind Ownership", "details.kick": "Kick", "details.owner_options": "Group Administration", - "details.group_name": "Group Name", - "details.description": "Description", + "details.group_name": "Grupės pavadinimas", + "details.description": "Aprašymas", "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", + "details.change_icon": "Pakeisti paveikslėlį", + "details.change_colour": "Pakeisti spalvą", "details.badge_text": "Badge Text", "details.userTitleEnabled": "Show Badge", "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", + "details.hidden": "Paslėptas", "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", - "event.updated": "Group details have been updated", - "event.deleted": "The group \"%1\" has been deleted" + "event.updated": "Grupės informacija atnaujinta", + "event.deleted": "Grupė \"%1\" pašalinta" } \ No newline at end of file diff --git a/public/language/lt/login.json b/public/language/lt/login.json index ea6dab6e24..dd18d2949c 100644 --- a/public/language/lt/login.json +++ b/public/language/lt/login.json @@ -1,7 +1,7 @@ { - "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username-email": "Vartotojo vardas / El. paštas", + "username": "Vartotojo vardas", + "email": "El. paštas", "remember_me": "Prisiminti?", "forgot_password": "Užmiršote slaptažodį?", "alternative_logins": "Alternatyvūs prisijungimo būdai", diff --git a/public/language/lt/modules.json b/public/language/lt/modules.json index aefb40aed0..d7e012a412 100644 --- a/public/language/lt/modules.json +++ b/public/language/lt/modules.json @@ -12,9 +12,9 @@ "chat.message-history": "Žinučių istorija", "chat.pop-out": "Iššokančio lango pokalbiai", "chat.maximize": "Padininti", - "chat.seven_days": "7 Days", - "chat.thirty_days": "30 Days", - "chat.three_months": "3 Months", + "chat.seven_days": "7 dienos", + "chat.thirty_days": "30 dienų", + "chat.three_months": "3 mėnesiai", "composer.user_said_in": "%1 parašė į %2:", "composer.user_said": "%1 parašė:", "composer.discard": "Ar tikrai norite sunaikinti šį pranešimą?" diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index 0a38999bff..e7deae258e 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -2,12 +2,12 @@ "title": "Pranešimai", "no_notifs": "Jūs neturite naujų pranešimų", "see_all": "Peržiūrėti visus pranešimus", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "Žymėti visus perspėjimus kaip skaitytus", "back_to_home": "Atgal į %1", "outgoing_link": "Išeinanti nuoroda", "outgoing_link_message": "You are now leaving %1.", "continue_to": "Continue to %1", - "return_to": "Return to %1", + "return_to": "Grįžti į %1", "new_notification": "Naujas pranešimas", "you_have_unread_notifications": "Jūs turite neperskaitytų pranešimų.", "new_message_from": "Nauja žinutė nuo %1", @@ -17,7 +17,7 @@ "favourited_your_post_in": "%1 has favourited your post in %2.", "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 parašė atsaką %2", - "user_posted_topic": "%1 has posted a new topic: %2", + "user_posted_topic": "%1 paskelbė naują temą: %2", "user_mentioned_you_in": "%1 paminėjo Jus %2", "user_started_following_you": "%1 started following you.", "email-confirmed": "El. paštas patvirtintas", diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json index 338cd346f5..b317d51487 100644 --- a/public/language/lt/pages.json +++ b/public/language/lt/pages.json @@ -11,9 +11,9 @@ "user.followers": "Žmonės, kurie seka %1", "user.posts": "Pranešimai, kuriuos parašė %1", "user.topics": "Temos, kurias sukūrė %1", - "user.groups": "%1's Groups", + "user.groups": "%1's grupės", "user.favourites": "Vartotojo %1 mėgstami pranešimai", "user.settings": "Vartotojo nustatymai", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", - "maintenance.messageIntro": "Additionally, the administrator has left this message:" + "maintenance.messageIntro": "Be to, administratorius paliko šį pranešimą:" } \ No newline at end of file diff --git a/public/language/lt/recent.json b/public/language/lt/recent.json index ebb6269a19..bebb9353fa 100644 --- a/public/language/lt/recent.json +++ b/public/language/lt/recent.json @@ -4,16 +4,16 @@ "week": "Savaitė", "month": "Mėnesis", "year": "Metai", - "alltime": "All Time", + "alltime": "Per visą laiką", "no_recent_topics": "Paskutinių temų nėra", - "no_popular_topics": "There are no popular topics.", - "there-is-a-new-topic": "There is a new topic.", - "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.", - "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.", - "there-are-new-topics": "There are %1 new topics.", - "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.", - "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.", - "there-is-a-new-post": "There is a new post.", - "there-are-new-posts": "There are %1 new posts.", - "click-here-to-reload": "Click here to reload." + "no_popular_topics": "Populiarių temų nėra.", + "there-is-a-new-topic": "Yra nauja tema.", + "there-is-a-new-topic-and-a-new-post": "Yra nauja tema ir naujas įrašas.", + "there-is-a-new-topic-and-new-posts": "Yra nauja tema ir %1 nauji įrašai.", + "there-are-new-topics": "Yra %1 naujos temos.", + "there-are-new-topics-and-a-new-post": "Yra %1 naujos temos ir naujas įrašas.", + "there-are-new-topics-and-new-posts": "Yra %1 naujos temos ir %2 nauji įrašai.", + "there-is-a-new-post": "Yra naujas įrašas.", + "there-are-new-posts": "Yra %1 naujas pranešimas.", + "click-here-to-reload": "Spauskite čia norėdami perkrauti." } \ No newline at end of file diff --git a/public/language/lt/reset_password.json b/public/language/lt/reset_password.json index 104f75e6e3..b95f3800be 100644 --- a/public/language/lt/reset_password.json +++ b/public/language/lt/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "Įrašykite el. pašto adresą", "password_reset_sent": "Slaptažodžio atstatymas išsiųstas", "invalid_email": "Klaidingas arba neegzistuojantis el. pašto adresas!", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "Įvestas slaptažodis yra per trumpas, prašome pasirinkti kitą slaptažodį.", + "passwords_do_not_match": "Du slaptažodžiai, kuriuos įvedėte, nesutampa." } \ No newline at end of file diff --git a/public/language/lt/search.json b/public/language/lt/search.json index 9dad8b6eab..b31715a6b4 100644 --- a/public/language/lt/search.json +++ b/public/language/lt/search.json @@ -1,40 +1,40 @@ { "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", - "no-matches": "No matches found", + "no-matches": "Atitikmenų nerasta", "in": "In", "by": "By", - "titles": "Titles", - "titles-posts": "Titles and Posts", - "posted-by": "Posted by", - "in-categories": "In Categories", + "titles": "Antraštės", + "titles-posts": "Antraštės ir įrašai", + "posted-by": "Parašė", + "in-categories": "Kategorijose", "search-child-categories": "Search child categories", "reply-count": "Reply Count", - "at-least": "At least", - "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", + "at-least": "Mažiausiai", + "at-most": "Daugiausia", + "post-time": "Įrašo laikas", + "newer-than": "Naujesni kaip", + "older-than": "Senesni kaip", + "any-date": "Bet kokia data", + "yesterday": "Vakar", + "one-week": "Viena savaitė", + "two-weeks": "Dvi savaitės", + "one-month": "Mėnuo", + "three-months": "Trys mėnesiai", + "six-months": "Šeši mėnesiai", + "one-year": "Vieneri metai", + "sort-by": "Rūšiuoti pagal", "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", - "descending": "In descending order", - "ascending": "In ascending order", - "save-preferences": "Save preferences", - "clear-preferences": "Clear preferences", - "search-preferences-saved": "Search preferences saved", - "search-preferences-cleared": "Search preferences cleared", - "show-results-as": "Show results as" + "topic-title": "Temos pavadinimas", + "number-of-replies": "Atsakymų skaičius", + "number-of-views": "Peržiūrų skaičius", + "topic-start-date": "Temos pradžia", + "username": "Vartotojo vardas", + "category": "Kategorija", + "descending": "Mažėjančia tvarka", + "ascending": "Didėjančia tvarka", + "save-preferences": "Išsaugoti nustatymus", + "clear-preferences": "Išvalyti nustatymus", + "search-preferences-saved": "Paieškos nustatymai išsaugoti", + "search-preferences-cleared": "Paieškos nuostatos išvalytos", + "show-results-as": "Rodyti rezultatus kaip" } \ No newline at end of file diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index 5138bc2766..e79c869a1b 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -12,7 +12,7 @@ "notify_me": "Gauti pranešimus apie naujus atsakymus šioje temoje", "quote": "Cituoti", "reply": "Atsakyti", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "Norėdami atsakyti, prisijunkite", "edit": "Redaguoti", "delete": "Ištrinti", "purge": "Išvalyti", @@ -34,11 +34,11 @@ "login_to_subscribe": "Norėdami prenumeruoti šią temą, prašome prisiregistruoti arba prisijungti.", "markAsUnreadForAll.success": "Tema visiems vartotojams pažymėta kaip neskaityta.", "watch": "Žiūrėti", - "unwatch": "Unwatch", + "unwatch": "Nebesekti", "watch.title": "Gauti pranešimą apie naujus įrašus šioje temoje", - "unwatch.title": "Stop watching this topic", + "unwatch.title": "Baigti šios temos stebėjimą", "share_this_post": "Dalintis šiuo įrašu", - "thread_tools.title": "Topic Tools", + "thread_tools.title": "Temos priemonės", "thread_tools.markAsUnreadForAll": "Pažymėti kaip neskaitytą", "thread_tools.pin": "Prisegti temą", "thread_tools.unpin": "Atsegti temą", @@ -48,11 +48,11 @@ "thread_tools.move_all": "Perkelti visus", "thread_tools.fork": "Išskaidyti temą", "thread_tools.delete": "Ištrinti temą", - "thread_tools.delete_confirm": "Are you sure you want to delete this topic?", + "thread_tools.delete_confirm": "Ar jūs tikrai norite ištrinti šią temą?", "thread_tools.restore": "Atkurti temą", - "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", + "thread_tools.restore_confirm": "Ar jūs tikrai norite atkurti šią temą?", "thread_tools.purge": "Išvalyti temą", - "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", + "thread_tools.purge_confirm": "Ar tikrai norite išvalyti šią temą?", "topic_move_success": "Ši tema buvo sėkmingai perkelta į %1", "post_delete_confirm": "Ar jūs tikrai norite ištrinti šį įrašą?", "post_restore_confirm": "Ar jūs tikrai norite atkurti šį įrašą?", @@ -75,7 +75,7 @@ "fork_no_pids": "Nepasirinktas joks įrašas!", "fork_success": "Successfully forked topic! Click here to go to the forked topic.", "composer.title_placeholder": "Įrašykite temos pavadinimą...", - "composer.handle_placeholder": "Name", + "composer.handle_placeholder": "Vardas ir pavardė", "composer.discard": "Atšaukti", "composer.submit": "Patvirtinti", "composer.replying_to": "Atsakymas %1", @@ -90,10 +90,10 @@ "more_users_and_guests": "dar %1 vartotojai(-ų) ir %2 svečiai(-ių)", "more_users": "dar %1 vartotojai(-ų)", "more_guests": "dar %1 svečiai(-ių)", - "users_and_others": "%1 and %2 others", + "users_and_others": "%1 ir kiti %2", "sort_by": "Rūšiuoti pagal", "oldest_to_newest": "Nuo seniausių iki naujausių", "newest_to_oldest": "Nuo naujausių iki seniausių", "most_votes": "Daugiausiai balsų", - "most_posts": "Most posts" + "most_posts": "Daugiausia įrašų" } \ No newline at end of file diff --git a/public/language/lt/user.json b/public/language/lt/user.json index 7ec5d24423..2928033fc2 100644 --- a/public/language/lt/user.json +++ b/public/language/lt/user.json @@ -2,12 +2,12 @@ "banned": "Užblokuotas", "offline": "Atsijungęs", "username": "Vartotojo vardas", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "Prisijungimo data", + "postcount": "Įrašų kiekis", "email": "El. paštas", "confirm_email": "Patvirtinti el. paštą", - "delete_account": "Delete Account", - "delete_account_confirm": "Are you sure you want to delete your account?
    This action is irreversible and you will not be able to recover any of your data

    Enter your username to confirm that you wish to destroy this account.", + "delete_account": "Ištrinti paskyrą", + "delete_account_confirm": "Ar tikrai norite ištrinti savo paskyrą?
    Šis veiksmas yra negrįžtamas, ir jūs negalėsite susigrąžinti jokių duomenų

    Įveskite savo vardą, kad patvirtintumėte, jog norite panaikinti šią paskyrą.", "fullname": "Vardas ir pavardė", "website": "Tinklalapis", "location": "Vieta", @@ -32,7 +32,7 @@ "edit": "Redaguoti", "uploaded_picture": "Įkeltas paveikslėlis", "upload_new_picture": "Įkelti naują paveikslėlį", - "upload_new_picture_from_url": "Upload New Picture From URL", + "upload_new_picture_from_url": "Įkelti naują paveikslėlį iš URL", "current_password": "Dabartinis slaptažodis", "change_password": "Pakeisti slaptažodį", "change_password_error": "Negalimas slaptažodis!", @@ -50,21 +50,21 @@ "max": "maks.", "settings": "Nustatymai", "show_email": "Rodyti mano el. paštą viešai", - "show_fullname": "Show My Full Name", - "restrict_chats": "Only allow chat messages from users I follow", + "show_fullname": "Rodyti mano vardą ir pavardę", + "restrict_chats": "Gauti pokalbių žinutes tik iš tų narių, kuriuos seku", "digest_label": "Prenumeruoti įvykių santrauką", "digest_description": "Gauti naujienas apie naujus pranešimus ir temas į el. paštą pagal nustatytą grafiką", "digest_off": "Išjungta", "digest_daily": "Kas dieną", "digest_weekly": "Kas savaitę", "digest_monthly": "Kas mėnesį", - "send_chat_notifications": "Send an email if a new chat message arrives and I am not online", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_chat_notifications": "Jeigu gaunama nauja pokalbių žinutė ir aš neprisijungęs, siųsti el. laišką", + "send_post_notifications": "Atsiųsti el. laišką kai parašomi atsakymai į mano prenumeruojamas temas", "has_no_follower": "Šis vartotojas neturi jokių sekėjų :(", "follows_no_one": "Šis vartotojas nieko neseka :(", "has_no_posts": "Šis vartotojas dar neparašė nė vieno pranešimo.", "has_no_topics": "Šis vartotojas dar nesukūrė nė vienos temos.", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "Šis vartotojas dar neseka jokių temų", "email_hidden": "El. paštas paslėptas", "hidden": "paslėptas", "paginate_description": "Temose ir kategorijose naudoti numeraciją puslapiams vietoje begalinės slinkties.", @@ -75,6 +75,6 @@ "open_links_in_new_tab": "Atidaryti nuorodas naujame skirtuke?", "enable_topic_searching": "Enable In-Topic Searching", "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", - "follow_topics_you_reply_to": "Follow topics that you reply to.", - "follow_topics_you_create": "Follow topics you create." + "follow_topics_you_reply_to": "Sekite temas, į kurias jūs atsakėte.", + "follow_topics_you_create": "Sekite jūsų sukurtas temas." } \ No newline at end of file diff --git a/public/language/lt/users.json b/public/language/lt/users.json index 043ca55bcc..f4f4360022 100644 --- a/public/language/lt/users.json +++ b/public/language/lt/users.json @@ -5,8 +5,8 @@ "search": "Ieškoti", "enter_username": "Įrašykite vartotojo vardą paieškai", "load_more": "Įkelti daugiau", - "users-found-search-took": "%1 user(s) found! Search took %2 seconds.", - "filter-by": "Filter By", + "users-found-search-took": "Rasta %1 vartotojas(-ai)! Paieška užtruko %2 sekundes.", + "filter-by": "Filtruoti pagal", "online-only": "Online only", - "picture-only": "Picture only" + "picture-only": "Tik paveikslėlis" } \ No newline at end of file diff --git a/public/language/nb/category.json b/public/language/nb/category.json index 75f38d0df0..f8afafe14a 100644 --- a/public/language/nb/category.json +++ b/public/language/nb/category.json @@ -1,6 +1,6 @@ { "new_topic_button": "Nytt emne", - "guest-login-post": "Log in to post", + "guest-login-post": "Logg inn til innlegg", "no_topics": "Det er ingen emner i denne kategorien
    Hvorfor ikke lage ett?", "browsing": "leser", "no_replies": "Ingen har svart", diff --git a/public/language/nb/email.json b/public/language/nb/email.json index 65e1accaee..37b5df85d0 100644 --- a/public/language/nb/email.json +++ b/public/language/nb/email.json @@ -9,9 +9,9 @@ "reset.text1": "Vi har blir bedt om å tilbakestille passordet ditt, muligens fordi du har glemt det. Hvis dette ikke stemmer kan du ignorere denne eposten.", "reset.text2": "For å fortsette med tilbakestillingen, vennligst klikk på følgende lenke:", "reset.cta": "Klikk her for å tilbakestille passordet ditt", - "reset.notify.subject": "Password successfully changed", - "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.", - "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.", + "reset.notify.subject": "Passordet ble endret", + "reset.notify.text1": "Vi gir deg beskjed om at du endret passordet ditt den %1.", + "reset.notify.text2": "Hvis du ikke godkjenner dette, vennligst gi beskjed til en administrator omgående.", "digest.notifications": "Du har uleste varsler fra %1:", "digest.latest_topics": "Siste emner fra %1", "digest.cta": "Klikk her for å besøke %1", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 2fe73f83a4..2b47e8c8ca 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -19,8 +19,8 @@ "email-taken": "E-post opptatt", "email-not-confirmed": "E-posten din har ikke blitt bekreftet enda, vennligst klikk for å bekrefte din e-post.", "email-not-confirmed-chat": "Du kan ikke chatte før e-posten din har blitt bekreftet", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "no-email-to-confirm": "Dette forumet krever at e-postbekreftelse, vennligst klikk her for å skrive inn en e-post", + "email-confirm-failed": "Vi kunne ikke godkjenne e-posten din, vennligst prøv igjen senere.", "username-too-short": "Brukernavnet er for kort", "username-too-long": "Brukernavnet er for langt", "user-banned": "Bruker utestengt", @@ -35,7 +35,7 @@ "no-emailers-configured": "Ingen e-post-tillegg er lastet, så ingen test e-post kunne bli sendt", "category-disabled": "Kategori deaktivert", "topic-locked": "Emne låst", - "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", + "post-edit-duration-expired": "Du har bare lov til å endre innlegg i %1 sekunder etter at det ble skrevet", "still-uploading": "Vennligst vent til opplastingene blir fullført.", "content-too-short": "Vennligst skriv et lengere innlegg. Innlegg må inneholde minst %1 tegn.", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.", diff --git a/public/language/nb/groups.json b/public/language/nb/groups.json index e837ac8961..6ff3a9b71f 100644 --- a/public/language/nb/groups.json +++ b/public/language/nb/groups.json @@ -4,8 +4,8 @@ "owner": "Gruppe-eier", "new_group": "Opprett ny gruppe", "no_groups_found": "Det er ingen grupper å se", - "pending.accept": "Accept", - "pending.reject": "Reject", + "pending.accept": "Aksepter", + "pending.reject": "Avslå", "cover-instructions": "Dra og slipp et bilde, dra til posisjon, og trykk Lagre", "cover-change": "Endre", "cover-save": "Lagre", @@ -15,20 +15,20 @@ "details.pending": "Ventende meldemmer", "details.has_no_posts": "Medlemmene i denne gruppen har ikke skrevet noen innlegg.", "details.latest_posts": "Seneste innlegg", - "details.private": "Private", - "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", + "details.private": "Privat", + "details.grant": "Gi/Opphev Eierskap", + "details.kick": "Kast ut", "details.owner_options": "Gruppeadministrasjon", - "details.group_name": "Group Name", - "details.description": "Description", - "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", - "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", - "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", - "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", + "details.group_name": "Gruppenavn", + "details.description": "Beskrivelse", + "details.badge_preview": "Forhåndsvisning av skilt", + "details.change_icon": "Endre ikon", + "details.change_colour": "Endre farge", + "details.badge_text": "Skilt-tekst", + "details.userTitleEnabled": "Vis skilt", + "details.private_help": "Hvis aktivert, vil medlemskap i grupper kreve godkjennelse fra en gruppe-eier", + "details.hidden": "Skjult", + "details.hidden_help": "vis aktivert, vil denne gruppen ikke bli funnet i gruppelista, og brukere må inviteres manuellt", "event.updated": "Gruppedetaljer har blitt oppgradert", "event.deleted": "Gruppen \"%1\" har blitt slettet" } \ No newline at end of file diff --git a/public/language/nb/login.json b/public/language/nb/login.json index 2b51b10c6a..785a7defc4 100644 --- a/public/language/nb/login.json +++ b/public/language/nb/login.json @@ -1,7 +1,7 @@ { - "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username-email": "Brukernavn / E-post", + "username": "Brukernavn", + "email": "E-post", "remember_me": "Husk meg?", "forgot_password": "Glemt passord?", "alternative_logins": "Alternativ innlogging", diff --git a/public/language/nb/search.json b/public/language/nb/search.json index 74fdc462a6..2f06a88eb5 100644 --- a/public/language/nb/search.json +++ b/public/language/nb/search.json @@ -3,38 +3,38 @@ "no-matches": "Ingen matcher funnet", "in": "I", "by": "Av", - "titles": "Titles", - "titles-posts": "Titles and Posts", + "titles": "Titler", + "titles-posts": "Titler og innlegg", "posted-by": "Skapt av", - "in-categories": "In Categories", - "search-child-categories": "Search child categories", - "reply-count": "Reply Count", - "at-least": "At least", - "at-most": "At most", - "post-time": "Post time", - "newer-than": "Newer than", - "older-than": "Older than", - "any-date": "Any date", - "yesterday": "Yesterday", - "one-week": "One week", - "two-weeks": "Two weeks", - "one-month": "One month", - "three-months": "Three months", - "six-months": "Six months", - "one-year": "One year", - "sort-by": "Sort by", - "last-reply-time": "Last reply time", - "topic-title": "Topic title", - "number-of-replies": "Number of replies", - "number-of-views": "Number of views", - "topic-start-date": "Topic start date", - "username": "Username", - "category": "Category", + "in-categories": "I kategorier", + "search-child-categories": "Søk underkategorier", + "reply-count": "Mengde svar", + "at-least": "Minst", + "at-most": "Maks", + "post-time": "Innlegg-tid", + "newer-than": "Nyere enn", + "older-than": "Eldre en", + "any-date": "Alle datoer", + "yesterday": "I går", + "one-week": "En uke", + "two-weeks": "To uker", + "one-month": "En måned ", + "three-months": "Tre måneder", + "six-months": "Seks måneder", + "one-year": "Ett år", + "sort-by": "Sorter etter", + "last-reply-time": "Sise svartid", + "topic-title": "Emne-tittel", + "number-of-replies": "Antall svar", + "number-of-views": "Antall visninger", + "topic-start-date": "Starttid for emne", + "username": "Brukernavn", + "category": "Kategori", "descending": "In descending order", "ascending": "In ascending order", - "save-preferences": "Save preferences", - "clear-preferences": "Clear preferences", - "search-preferences-saved": "Search preferences saved", - "search-preferences-cleared": "Search preferences cleared", - "show-results-as": "Show results as" + "save-preferences": "Lagre innstillinger", + "clear-preferences": "Tøm innstillinnger", + "search-preferences-saved": "Søkeinnstillinger lagret", + "search-preferences-cleared": "Søkeinnstillinger tømt", + "show-results-as": "Vis resultateter som" } \ No newline at end of file diff --git a/public/language/th/category.json b/public/language/th/category.json index 387458a0dd..e5d6b1e0fc 100644 --- a/public/language/th/category.json +++ b/public/language/th/category.json @@ -1,9 +1,9 @@ { "new_topic_button": "กระทู้", - "guest-login-post": "Log in to post", + "guest-login-post": "เข้าสู่ระบบเพื่อโพส", "no_topics": "ยังไม่มีกระทู้ในหมวดนี้
    โพสต์กระทู้แรก?", "browsing": "เรียกดู", "no_replies": "ยังไม่มีใครตอบ", - "share_this_category": "Share this category", - "ignore": "Ignore" + "share_this_category": "แชร์ Category นี้", + "ignore": "ไม่ต้องสนใจอีก" } \ No newline at end of file diff --git a/public/language/th/error.json b/public/language/th/error.json index 064bd1b530..e265b9cb24 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -3,37 +3,37 @@ "not-logged-in": "คุณยังไม่ได้ลงชื่อเข้าระบบ", "account-locked": "บัญชีของคุณถูกระงับการใช้งานชั่วคราว", "search-requires-login": "ต้องลงทะเบียนบัญชีผู้ใช้สำหรับการค้นหา! โปรดลงชื่อเข้าระบบ หรือ ลงทะเบียน!", - "invalid-cid": "Invalid Category ID", - "invalid-tid": "Invalid Topic ID", - "invalid-pid": "Invalid Post ID", - "invalid-uid": "Invalid User ID", - "invalid-username": "Invalid Username", - "invalid-email": "Invalid Email", - "invalid-title": "Invalid title!", - "invalid-user-data": "Invalid User Data", - "invalid-password": "Invalid Password", - "invalid-username-or-password": "Please specify both a username and password", - "invalid-search-term": "Invalid search term", + "invalid-cid": "Category ID ไม่ถูกต้อง", + "invalid-tid": "Topic ID ไม่ถูกต้อง", + "invalid-pid": "Post ID ไม่ถูกต้อง", + "invalid-uid": "User ID ไม่ถูกต้อง", + "invalid-username": "ชื่อผู้ใช้ไม่ถูกต้อง", + "invalid-email": "อีเมลไม่ถูกต้อง", + "invalid-title": "คำนำหน้าชื่อไม่ถูกต้อง", + "invalid-user-data": "User Data ไม่ถูกต้อง", + "invalid-password": "รหัสผ่านไม่ถูกต้อง", + "invalid-username-or-password": "กรุณาระบุชื่อผู้ใช้และรหัสผ่าน", + "invalid-search-term": "ข้อความค้นหาไม่ถูกต้อง", "invalid-pagination-value": "Invalid pagination value", "username-taken": "ชื่อผู้ใช้นี้มีการใช้แล้ว", "email-taken": "อีเมลนี้มีการใช้แล้ว", "email-not-confirmed": "ยังไม่มีการยืนยันอีเมลของคุณ, โปรดกดยืนยันอีเมลของคุณตรงนี้", - "email-not-confirmed-chat": "You are unable to chat until your email is confirmed", - "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email", - "email-confirm-failed": "We could not confirm your email, please try again later.", + "email-not-confirmed-chat": "คุณไม่สามารถแชทได้ จนกว่าจะได้รับการยืนยันอีเมล", + "no-email-to-confirm": "Forum นี้ต้องการการยืนยันอีเมล กรุณากดที่นี่เพื่อระบุอีเมล", + "email-confirm-failed": "เราไม่สามารถยืนยันอีเมลของคุณ ณ ขณะนี้ กรุณาลองใหม่อีกครั้งภายหลัง", "username-too-short": "ชื่อบัญชีผู้ใช้ สั้นเกินไป", "username-too-long": "ชื่อบัญชีผู้ใช้ ยาวเกินไป", "user-banned": "User banned", "user-too-new": "Sorry, you are required to wait %1 seconds before making your first post", - "no-category": "Category does not exist", - "no-topic": "Topic does not exist", - "no-post": "Post does not exist", - "no-group": "Group does not exist", - "no-user": "User does not exist", + "no-category": "ยังไม่มี Category นี้", + "no-topic": "ยังไม่มี Topic นี้", + "no-post": "ยังไม่มี Post นี้", + "no-group": "ยังไม่มี Group นี้", + "no-user": "ยังไม่มีผู้ใช้งานนี้", "no-teaser": "Teaser does not exist", - "no-privileges": "You do not have enough privileges for this action.", + "no-privileges": "คุณมีสิทธิ์ไม่เพียงพอที่จะทำรายการนี้", "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", - "category-disabled": "Category disabled", + "category-disabled": "Category นี้ถูกปิดการใช้งานแล้ว", "topic-locked": "Topic Locked", "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting", "still-uploading": "Please wait for uploads to complete.", diff --git a/public/language/th/global.json b/public/language/th/global.json index af4ff3bfd0..d81b58b8eb 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -14,20 +14,20 @@ "please_log_in": "กรุณาเข้าสู่ระบบ", "logout": "ออกจากระบบ", "posting_restriction_info": "คุณต้องต้องเป็นสมาชิกเพื่อทำการโพสต์ คลิกที่นี่เพื่อเข้าสู่ระบบ", - "welcome_back": "Welcome Back", + "welcome_back": "ยินดีต้อนรับ", "you_have_successfully_logged_in": "คุณได้เข้าสู่ระบบแล้ว", "save_changes": "บันทึกการเปลี่ยนแปลง", "close": "ปิด", "pagination": "ให้เลขหน้า", - "pagination.out_of": "%1 out of %2", + "pagination.out_of": "%1 จาก %2", "pagination.enter_index": "Enter index", "header.admin": "ผู้ดูแลระบบ", "header.recent": "ล่าสุด", "header.unread": "ไม่ได้อ่าน", - "header.tags": "Tags", + "header.tags": "Tag", "header.popular": "ฮิต", "header.users": "ผู้ใช้", - "header.groups": "Groups", + "header.groups": "Group", "header.chats": "สนทนา", "header.notifications": "แจ้งเตือน", "header.search": "ค้นหา", diff --git a/public/language/th/groups.json b/public/language/th/groups.json index d2314fdc29..be94efdf0b 100644 --- a/public/language/th/groups.json +++ b/public/language/th/groups.json @@ -1,34 +1,34 @@ { - "groups": "Groups", - "view_group": "View Group", - "owner": "Group Owner", - "new_group": "Create New Group", - "no_groups_found": "There are no groups to see", - "pending.accept": "Accept", - "pending.reject": "Reject", - "cover-instructions": "Drag and Drop a photo, drag to position, and hit Save", - "cover-change": "Change", - "cover-save": "Save", - "cover-saving": "Saving", - "details.title": "Group Details", - "details.members": "Member List", - "details.pending": "Pending Members", - "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts", - "details.private": "Private", + "groups": "Group", + "view_group": "ดู Group", + "owner": "เจ้าของ Group", + "new_group": "สร้าง Group ใหม่", + "no_groups_found": "ยังไม่มี Group", + "pending.accept": "ยอมรับ", + "pending.reject": "ไม่ยอมรับ", + "cover-instructions": "ลากรูปภาพไปวางยังตำแหน่งที่ต้องการแล้วกดที่ปุ่ม บันทึก", + "cover-change": "ปรับปรุง", + "cover-save": "บันทึก", + "cover-saving": "กำลังบันทึก", + "details.title": "ข้อมูล Group", + "details.members": "รายชื่อสมาชิก", + "details.pending": "สมาชิกที่กำลังรอการตอบรับ", + "details.has_no_posts": "Group นี้ยังไม่มีโพสจากสมาชิก", + "details.latest_posts": "โพสล่าสุด", + "details.private": "ส่วนตัว", "details.grant": "Grant/Rescind Ownership", - "details.kick": "Kick", - "details.owner_options": "Group Administration", - "details.group_name": "Group Name", - "details.description": "Description", + "details.kick": "เตะออก", + "details.owner_options": "การจัดการ Group", + "details.group_name": "ชื่อ Group", + "details.description": "คำอธิบาย", "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", - "details.change_colour": "Change Colour", + "details.change_icon": "เปลี่ยนไอคอน", + "details.change_colour": "เปลี่ยนสี", "details.badge_text": "Badge Text", - "details.userTitleEnabled": "Show Badge", + "details.userTitleEnabled": "แสดง Badge", "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", + "details.hidden": "ซ่อน", "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", - "event.updated": "Group details have been updated", + "event.updated": "ข้อมูล Group ได้รับการบันทึกแล้ว", "event.deleted": "The group \"%1\" has been deleted" } \ No newline at end of file diff --git a/public/language/th/login.json b/public/language/th/login.json index f0aff3c796..5eba336a39 100644 --- a/public/language/th/login.json +++ b/public/language/th/login.json @@ -1,7 +1,7 @@ { - "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username-email": "ชื่อผู้ใช้ / อีเมล", + "username": "ชื่อผู้ใช้", + "email": "อีเมล", "remember_me": "จำไว้ในระบบ?", "forgot_password": "ลืมรหัสผ่าน?", "alternative_logins": "เข้าสู่ระบบโดยทางอื่น", diff --git a/public/language/th/pages.json b/public/language/th/pages.json index 44f8b127e1..4b4998d3bd 100644 --- a/public/language/th/pages.json +++ b/public/language/th/pages.json @@ -5,15 +5,15 @@ "recent": "กระทู้ล่าสุด", "users": "ผู้ใช้ที่ลงทะเบียน", "notifications": "แจ้งเตือน", - "tags": "Topics tagged under \"%1\"", + "tags": "หัวข้อที่ถูก Tag อยู่ภายใต้ \"%1\"", "user.edit": "แก้ไข \"%1\"", "user.following": "ผู้ใช้ที่ %1 ติดตาม", "user.followers": "ผู้ใช้ที่ติดตาม %1", "user.posts": "กระทู้โดย %1", - "user.topics": "Topics created by %1", - "user.groups": "%1's Groups", + "user.topics": "หัวข้อที่ถูกสร้างโดย %1", + "user.groups": "กลุ่มของ %1", "user.favourites": "กระทู้ที่ %1 ชอบ", "user.settings": "ตั้งค่าผู้ใช้", - "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", - "maintenance.messageIntro": "Additionally, the administrator has left this message:" + "maintenance.text": "%1 กำลังอยู่ระหว่างการปิดปรับปรุงชั่วคราว กรุณาลองใหม่อีกครั้งในภายหลัง", + "maintenance.messageIntro": "ผู้ดูแลระบบได้ฝากข้อความต่อไปนี้เอาไว้" } \ No newline at end of file diff --git a/public/language/th/reset_password.json b/public/language/th/reset_password.json index 499f2f7136..1b66d7dd33 100644 --- a/public/language/th/reset_password.json +++ b/public/language/th/reset_password.json @@ -11,6 +11,6 @@ "enter_email_address": "ใส่อีเมล์", "password_reset_sent": "รหัสรีเซ็ตถูกส่งออกไปแล้ว", "invalid_email": "อีเมล์ไม่ถูกต้อง / อีเมล์ไม่มีอยู่!", - "password_too_short": "The password entered is too short, please pick a different password.", - "passwords_do_not_match": "The two passwords you've entered do not match." + "password_too_short": "รหัสผ่านที่คุณกำหนดยังสั้นเกินไป กรุณากำหนดรหัสผ่านของคุณใหม่", + "passwords_do_not_match": "รหัสผ่านทั้ง 2 ที่ใส่ไม่ตรงกัน" } \ No newline at end of file diff --git a/public/language/th/tags.json b/public/language/th/tags.json index d2d0ff6fe0..bdb45d5eef 100644 --- a/public/language/th/tags.json +++ b/public/language/th/tags.json @@ -1,7 +1,7 @@ { "no_tag_topics": "ไม่มีหัวข้อสนทนาที่เกี่ยวข้องกับป้ายคำศัพท์นี้", "tags": "ป้ายคำศัพท์", - "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.", + "enter_tags_here": "ใส่ Tags ตรงนี้ได้ทั้งหมด %1-%2 ตัวอักษร และกรุณากดปุ่ม Enter ทุกครั้งเมื่อต้องการเพิ่ม Tag ใหม่", "enter_tags_here_short": "ใส่ป้ายคำศัพท์ ...", "no_tags": "ยังไม่มีป้ายคำศัพท์" } \ No newline at end of file diff --git a/public/language/th/topic.json b/public/language/th/topic.json index 652ebe5db5..ea6a1a8998 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -4,15 +4,15 @@ "topic_id_placeholder": "Enter topic ID", "no_topics_found": "ไม่พบกระทู้", "no_posts_found": "ไม่พบโพส", - "post_is_deleted": "This post is deleted!", + "post_is_deleted": "ลบ Post นี้เรียบร้อยแล้ว!", "profile": "รายละเอียด", - "posted_by": "Posted by %1", - "posted_by_guest": "Posted by Guest", + "posted_by": "โพสโดย %1", + "posted_by_guest": "โพสโดย Guest", "chat": "แชท", "notify_me": "แจ้งเตือนเมื่อการตอบใหม่ในกระทู้นี้", "quote": "คำอ้างอิง", "reply": "ตอบ", - "guest-login-reply": "Log in to reply", + "guest-login-reply": "เข้าสู่ระบบเพื่อตอบกลับ", "edit": "แก้ไข", "delete": "ลบ", "purge": "Purge", @@ -26,31 +26,31 @@ "locked": "Locked", "bookmark_instructions": "คลิกที่นี่เพื่อกลับคืนสู่ฐานะสุดท้าย หรือ คลิกปิดเพื่อยกเลิก", "flag_title": "ปักธงโพสต์นี้เพื่อดำเนินการ", - "flag_confirm": "Are you sure you want to flag this post?", + "flag_confirm": "มั่นใจแล้วหรือไม่ที่จะ Flag Post นี้?", "flag_success": "This post has been flagged for moderation.", - "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", + "deleted_message": "Topic นี้ถูกลบไปแล้ว เฉพาะผู้ใช้งานที่มีสิทธิ์ในการจัดการ Topic เท่านั้นที่จะมีสิทธิ์ในการเข้าชม", "following_topic.message": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนโพสต์ในกระทู้นี้", "not_following_topic.message": "คุณจะไม่รับการแจ้งเตือนจากกระทู้นี้", "login_to_subscribe": "กรุณาลงทะเบียนหรือเข้าสู่ระบบเพื่อที่จะติดตามกระทู้นี้", "markAsUnreadForAll.success": "ทำเครื่องหมายว่ายังไม่ได้อ่านทั้งหมด", "watch": "ติดตาม", - "unwatch": "Unwatch", - "watch.title": "Be notified of new replies in this topic", - "unwatch.title": "Stop watching this topic", + "unwatch": "ยังไม่ได้ติดตาม", + "watch.title": "ให้แจ้งเตือนเมื่อมีการตอบกลับ Topic นี้", + "unwatch.title": "ยกเลิกการติดตาม Topic นี้", "share_this_post": "แชร์โพสต์นี้", - "thread_tools.title": "Topic Tools", + "thread_tools.title": "เครื่องมือช่วยจัดการ Topic", "thread_tools.markAsUnreadForAll": "ทำหมายว่ายังไม่ได้อ่าน", "thread_tools.pin": "ปักหมุดกระทู้", "thread_tools.unpin": "เลิกปักหมุดกระทู้", "thread_tools.lock": "ล็อคกระทู้", "thread_tools.unlock": "ปลดล็อคกระทู้", "thread_tools.move": "ย้ายกระทู้", - "thread_tools.move_all": "Move All", + "thread_tools.move_all": "ย้ายทั้งหมด", "thread_tools.fork": "แยกกระทู้", "thread_tools.delete": "ลบกระทู้", - "thread_tools.delete_confirm": "Are you sure you want to delete this topic?", + "thread_tools.delete_confirm": "มั่นใจแล้วหรือไม่ที่จะลบ Topic นี้?", "thread_tools.restore": "กู้กระทู้", - "thread_tools.restore_confirm": "Are you sure you want to restore this topic?", + "thread_tools.restore_confirm": "มั่นใจแล้วหรือไม่ที่จะกู้คืน Topic นี้?", "thread_tools.purge": "Purge Topic", "thread_tools.purge_confirm": "Are you sure you want to purge this topic?", "topic_move_success": "This topic has been successfully moved to %1", diff --git a/public/language/th/unread.json b/public/language/th/unread.json index 37451a65ba..2595955dc7 100644 --- a/public/language/th/unread.json +++ b/public/language/th/unread.json @@ -2,8 +2,8 @@ "title": "ไม่ได้อ่าน", "no_unread_topics": "ไม่มีกระทู้ที่ยังไม่ได้อ่านเป็น", "load_more": "โหลดเพิ่มเติม", - "mark_as_read": "Mark as Read", - "selected": "Selected", - "all": "All", - "topics_marked_as_read.success": "Topics marked as read!" + "mark_as_read": "ทำเครื่องหมายว่าอ่านแล้ว", + "selected": "เลือก", + "all": "ทั้งหมด", + "topics_marked_as_read.success": "Topic ถูกทำเครื่องหมายว่าอ่านแล้วเรียบร้อย" } \ No newline at end of file diff --git a/public/language/th/user.json b/public/language/th/user.json index aaf5a74424..0e8de83da7 100644 --- a/public/language/th/user.json +++ b/public/language/th/user.json @@ -2,8 +2,8 @@ "banned": "เเบน", "offline": "ออฟไลน์", "username": "ชื่อผู้ใช้", - "joindate": "Join Date", - "postcount": "Post Count", + "joindate": "วันที่เข้าร่วม", + "postcount": "จำนวนโพส", "email": "อีเมล์", "confirm_email": "ยืนยันอีเมล", "delete_account": "ลบบัญชี", @@ -18,7 +18,7 @@ "profile_views": "ดูข้อมูลส่วนตัว", "reputation": "ชื่อเสียง", "favourites": "ชอบ", - "watched": "Watched", + "watched": "ดูแล้ว", "followers": "คนติดตาม", "following": "ติดตาม", "signature": "ลายเซ็น", @@ -59,12 +59,12 @@ "digest_weekly": "รายสัปดาห์", "digest_monthly": "รายเดือน", "send_chat_notifications": "ส่งอีเมลเมื่อมีข้อความใหม่เข้ามาขณะที่ฉันไม่ได้ออนไลน์", - "send_post_notifications": "Send an email when replies are made to topics I am subscribed to", + "send_post_notifications": "ส่งอีเมลให้ฉันเมื่อมีการตอบกลับในหัวข้อที่ฉันเคยบอกรับเป็นสมาชิกไว้", "has_no_follower": "ผู้ใช้รายนี้ไม่มีใครติดตาม :(", "follows_no_one": "ผู้ใช้รายนี้ไม่ติดตามใคร :(", "has_no_posts": "ผู้ใช้รายนี้ไม่ได้โพสต์อะไรเลย", "has_no_topics": "สมาชิกรายนี้ยังไม่ได้มีการโพสต์ข้อความ", - "has_no_watched_topics": "This user didn't watch any topics yet.", + "has_no_watched_topics": "ผู้ใช้นี้ยังไม่เคยเข้าชมในหัวข้อใดๆ", "email_hidden": "ซ่อนอีเมล์", "hidden": "ซ่อน", "paginate_description": "ให้เลขหน้ากระทู้และโพสต์แทนการใช้สกรอลล์ที่ไม่สิ้นสุด", @@ -73,8 +73,8 @@ "notification_sounds": "เตือนด้วยเสียงเมื่อมีข้อความแจ้งเตือน", "browsing": "เปิดดูการตั้งค่า", "open_links_in_new_tab": "เปิดลิงค์ในแท็บใหม่", - "enable_topic_searching": "Enable In-Topic Searching", - "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.", + "enable_topic_searching": "เปิดใช้การค้นหาแบบ In-Topic", + "topic_search_help": "เมื่อการค้นหาแบบ In-Topic ถูกเปิดใช้งาน การค้นหาแบบ In-Topic จะทำงานแทนการค้นหาในรูปแบบเดิม ซึ่งช่วยให้คุณสามารถทำการค้นหาจาก Topic ทั้งหมด เพิ่มเติมจากที่คุณกำลังเห็นอยู่บนหน้าจอ", "follow_topics_you_reply_to": "ติดตามกระทู้ที่คุณตอบ", "follow_topics_you_create": "ติดตามกระทู้ที่คุณตั้ง" } \ No newline at end of file diff --git a/public/language/zh_CN/groups.json b/public/language/zh_CN/groups.json index 39eb395078..e2fc6cdf7f 100644 --- a/public/language/zh_CN/groups.json +++ b/public/language/zh_CN/groups.json @@ -4,8 +4,8 @@ "owner": "用户组组长", "new_group": "创建新用户组", "no_groups_found": "还没有用户组", - "pending.accept": "Accept", - "pending.reject": "Reject", + "pending.accept": "接受", + "pending.reject": "取消", "cover-instructions": "拖放照片，拖动位置，然后点击 保存", "cover-change": "变更", "cover-save": "保存", @@ -15,19 +15,19 @@ "details.pending": "预备成员", "details.has_no_posts": "此用户组的会员尚未发表任何帖子。", "details.latest_posts": "最新帖子", - "details.private": "Private", + "details.private": "私有", "details.grant": "授予/取消所有权", "details.kick": "踢", "details.owner_options": "用户组管理", - "details.group_name": "Group Name", + "details.group_name": "用户组名", "details.description": "Description", "details.badge_preview": "Badge Preview", - "details.change_icon": "Change Icon", + "details.change_icon": "更改图标", "details.change_colour": "Change Colour", "details.badge_text": "Badge Text", "details.userTitleEnabled": "Show Badge", "details.private_help": "If enabled, joining of groups requires approval from a group owner", - "details.hidden": "Hidden", + "details.hidden": "隐藏", "details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually", "event.updated": "用户组信息已更新", "event.deleted": "用户组 \"%1\" 已被删除" diff --git a/public/language/zh_CN/login.json b/public/language/zh_CN/login.json index 3e8d54af50..b6d1c9926e 100644 --- a/public/language/zh_CN/login.json +++ b/public/language/zh_CN/login.json @@ -1,7 +1,7 @@ { "username-email": "Username / Email", - "username": "Username", - "email": "Email", + "username": "用户名", + "email": "邮件", "remember_me": "记住我？", "forgot_password": "忘记密码？", "alternative_logins": "使用合作网站帐号登录", diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index f8a88ca3fe..f20ee0f1e4 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -2,7 +2,7 @@ "title": "通知", "no_notifs": "您没有新的通知", "see_all": "查看全部通知", - "mark_all_read": "Mark all notifications read", + "mark_all_read": "标记全部为已读", "back_to_home": "返回 %1", "outgoing_link": "站外链接", "outgoing_link_message": "您正在离开 %1。", From 721ee09b19caecac242d68788cd42160af23ea85 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 18 Mar 2015 17:41:45 -0400 Subject: [PATCH 839/897] removed deprecation notice --- public/src/client/topic/postTools.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 15a8ac3163..7d648597ec 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -74,12 +74,6 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com function addPostHandlers(tid, threadState) { var postContainer = components.get('topic'); - /* - * Deprecation notice: - * post-0.7.0 .classname selectors will no longer be supported - * Use the components system instead. - */ - postContainer.on('click', '[component="post/quote"]', function() { if (!threadState.locked) { onQuoteClicked($(this), tid, topicName); From 41f5afa887a9d1a7df8430aa43fd2949d9f48e6c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 18 Mar 2015 17:48:14 -0400 Subject: [PATCH 840/897] fix for post-bar reply button --- public/src/client/topic/postTools.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 7d648597ec..260433d808 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -125,6 +125,12 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com postContainer.on('click', '[component="user/chat"]', function(e) { openChat($(this)); }); + + $('#content').on('click', '[component="topic/reply"]', function() { + if (!threadState.locked) { + onReplyClicked($(this), tid, topicName); + } + }); } function onReplyClicked(button, tid, topicName) { From 5bc2e7dac2dde57d692d8d032a32731926ae4935 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Mar 2015 17:50:47 -0400 Subject: [PATCH 841/897] closes #2309 --- public/language/en_GB/modules.json | 3 +- public/src/client/category.js | 6 -- public/src/modules/composer.js | 98 +++++++++++++++++++----------- src/socket.io/categories.js | 4 ++ src/socket.io/posts.js | 10 ++- src/socket.io/topics.js | 14 +++++ 6 files changed, 88 insertions(+), 47 deletions(-) diff --git a/public/language/en_GB/modules.json b/public/language/en_GB/modules.json index 00a2ba412d..12eeb0f660 100644 --- a/public/language/en_GB/modules.json +++ b/public/language/en_GB/modules.json @@ -18,5 +18,6 @@ "composer.user_said_in": "%1 said in %2:", "composer.user_said": "%1 said:", - "composer.discard": "Are you sure you wish to discard this post?" + "composer.discard": "Are you sure you wish to discard this post?", + "composer.submit_and_lock": "Submit and Lock" } \ No newline at end of file diff --git a/public/src/client/category.js b/public/src/client/category.js index cdfb7495f5..2a6a580323 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -20,12 +20,6 @@ define('forum/category', [ } }); - $(window).on('action:composer.topics.post', function(ev, data) { - localStorage.removeItem('category:' + data.data.cid + ':bookmark'); - localStorage.removeItem('category:' + data.data.cid + ':bookmark:clicked'); - ajaxify.go('topic/' + data.data.slug); - }); - function removeListeners() { socket.removeListener('event:new_topic', Category.onNewTopic); categoryTools.removeListeners(); diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index 71706704cb..33fa2ac208 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -43,6 +43,12 @@ define('composer', [ } }); + $(window).on('action:composer.topics.post', function(ev, data) { + localStorage.removeItem('category:' + data.data.cid + ':bookmark'); + localStorage.removeItem('category:' + data.data.cid + ':bookmark:clicked'); + ajaxify.go('topic/' + data.data.slug); + }); + // Query server for formatting options socket.emit('modules.composer.getFormattingOptions', function(err, options) { composer.formatting = options; @@ -131,12 +137,18 @@ define('composer', [ }; composer.newTopic = function(cid) { - push({ - cid: cid, - title: '', - body: '', - modified: false, - isMain: true + socket.emit('categories.isModerator', cid, function(err, isMod) { + if (err) { + return app.alertError(err.message); + } + push({ + cid: cid, + title: '', + body: '', + modified: false, + isMain: true, + isMod: isMod + }); }); }; @@ -166,14 +178,20 @@ define('composer', [ }; composer.newReply = function(tid, pid, title, text) { - translator.translate(text, config.defaultLang, function(translated) { - push({ - tid: tid, - toPid: pid, - title: title, - body: translated, - modified: false, - isMain: false + socket.emit('topics.isModerator', tid, function(err, isMod) { + if (err) { + return app.alertError(err.message); + } + translator.translate(text, config.defaultLang, function(translated) { + push({ + tid: tid, + toPid: pid, + title: title, + body: translated, + modified: false, + isMain: false, + isMod: isMod + }); }); }); }; @@ -247,11 +265,13 @@ define('composer', [ } function createNewComposer(post_uuid) { - var allowTopicsThumbnail = config.allowTopicsThumbnail && composer.posts[post_uuid].isMain && (config.hasImageUploadPlugin || config.allowFileUploads), - isTopic = composer.posts[post_uuid] ? !!composer.posts[post_uuid].cid : false, - isMain = composer.posts[post_uuid] ? !!composer.posts[post_uuid].isMain : false, - isEditing = composer.posts[post_uuid] ? !!composer.posts[post_uuid].pid : false, - isGuestPost = composer.posts[post_uuid] ? parseInt(composer.posts[post_uuid].uid, 10) === 0 : null; + var postData = composer.posts[post_uuid]; + + var allowTopicsThumbnail = config.allowTopicsThumbnail && postData.isMain && (config.hasImageUploadPlugin || config.allowFileUploads), + isTopic = postData ? !!postData.cid : false, + isMain = postData ? !!postData.isMain : false, + isEditing = postData ? !!postData.pid : false, + isGuestPost = postData ? parseInt(postData.uid, 10) === 0 : false; composer.bsEnvironment = utils.findBootstrapEnvironment(); @@ -262,9 +282,11 @@ define('composer', [ minimumTagLength: config.minimumTagLength, maximumTagLength: config.maximumTagLength, isTopic: isTopic, - showHandleInput: (app.user.uid === 0 || (isEditing && isGuestPost && app.user.isAdmin)) && config.allowGuestHandles, - handle: composer.posts[post_uuid] ? composer.posts[post_uuid].handle || '' : undefined, - formatting: composer.formatting + isEditing: isEditing, + showHandleInput: config.allowGuestHandles && (app.user.uid === 0 || (isEditing && isGuestPost && app.user.isAdmin)), + handle: postData ? postData.handle || '' : undefined, + formatting: composer.formatting, + isAdminOrMod: app.user.isAdmin || postData.isMod }; parseAndTranslate('composer', data, function(composerTemplate) { @@ -278,7 +300,6 @@ define('composer', [ $(document.body).append(composerTemplate); var postContainer = $(composerTemplate[0]), - postData = composer.posts[post_uuid], bodyEl = postContainer.find('textarea'), draft = drafts.getDraft(postData.save_id); @@ -309,6 +330,11 @@ define('composer', [ post(post_uuid); }); + postContainer.on('click', '[data-action="post-lock"]', function() { + $(this).attr('disabled', true); + post(post_uuid, {lock: true}); + }); + postContainer.on('click', '[data-action="discard"]', function() { if (!composer.posts[post_uuid].modified) { discard(post_uuid); @@ -438,7 +464,7 @@ define('composer', [ } } - function post(post_uuid) { + function post(post_uuid, options) { var postData = composer.posts[post_uuid], postContainer = $('#cmp-uuid-' + post_uuid), handleEl = postContainer.find('.handle'), @@ -446,6 +472,8 @@ define('composer', [ bodyEl = postContainer.find('textarea'), thumbEl = postContainer.find('input#topic-thumb-url'); + options = options || {}; + titleEl.val(titleEl.val().trim()); bodyEl.val(bodyEl.val().trim()); if (thumbEl.length) { @@ -471,28 +499,27 @@ define('composer', [ var composerData = {}, action; if (parseInt(postData.cid, 10) > 0) { + action = 'topics.post'; composerData = { handle: handleEl ? handleEl.val() : undefined, title: titleEl.val(), content: bodyEl.val(), topic_thumb: thumbEl.val() || '', category_id: postData.cid, - tags: tags.getTags(post_uuid) + tags: tags.getTags(post_uuid), + lock: options.lock || false }; - - action = 'topics.post'; - socket.emit(action, composerData, done); } else if (parseInt(postData.tid, 10) > 0) { + action = 'posts.reply'; composerData = { tid: postData.tid, handle: handleEl ? handleEl.val() : undefined, content: bodyEl.val(), - toPid: postData.toPid + toPid: postData.toPid, + lock: options.lock || false }; - - action = 'posts.reply'; - socket.emit(action, composerData, done); } else if (parseInt(postData.pid, 10) > 0) { + action = 'posts.edit'; composerData = { pid: postData.pid, handle: handleEl ? handleEl.val() : undefined, @@ -501,12 +528,9 @@ define('composer', [ topic_thumb: thumbEl.val() || '', tags: tags.getTags(post_uuid) }; - - action = 'posts.edit'; - socket.emit(action, composerData, done); } - function done(err, data) { + socket.emit(action, composerData, function (err, data) { $('[data-action="post"]').removeAttr('disabled'); if (err) { if (err.message === '[[error:email-not-confirmed]]') { @@ -520,7 +544,7 @@ define('composer', [ drafts.removeDraft(postData.save_id); $(window).trigger('action:composer.' + action, {composerData: composerData, data: data}); - } + }); } function discard(post_uuid) { diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js index 9f20697ef9..d98cb0c21f 100644 --- a/src/socket.io/categories.js +++ b/src/socket.io/categories.js @@ -118,4 +118,8 @@ SocketCategories.ignore = function(socket, cid, callback) { }); }; +SocketCategories.isModerator = function(socket, cid, callback) { + user.isModerator(socket.uid, cid, callback); +}; + module.exports = SocketCategories; diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index e8f5ef9a63..b49e796e7a 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -50,6 +50,10 @@ SocketPosts.reply = function(socket, data, callback) { socket.emit('event:new_post', result); SocketPosts.notifyOnlineUsers(socket.uid, result); + + if (data.lock) { + socketTopics.doTopicAction('lock', 'event:topic_locked', socket, {tids: [postData.topic.tid], cid: postData.topic.cid}); + } }); }; @@ -362,9 +366,9 @@ SocketPosts.purge = function(socket, data, callback) { }); callback(); - }); + }); } - + if (!data || !parseInt(data.pid, 10)) { return callback(new Error('[[error:invalid-data]]')); } @@ -500,7 +504,7 @@ SocketPosts.flag = function(socket, pid, callback) { } notifications.push(notification, results.admins.concat(results.moderators), next); }); - } + } ], callback); }; diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index b0f9d3b8c7..c270082953 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -41,6 +41,10 @@ SocketTopics.post = function(socket, data, callback) { return callback(err); } + if (data.lock) { + SocketTopics.doTopicAction('lock', 'event:topic_locked', socket, {tids: [result.topicData.tid], cid: result.topicData.cid}); + } + callback(null, result.topicData); socket.emit('event:new_post', {posts: [result.postData]}); socket.emit('event:new_topic', result.topicData); @@ -233,6 +237,7 @@ SocketTopics.unpin = function(socket, data, callback) { }; SocketTopics.doTopicAction = function(action, event, socket, data, callback) { + callback = callback || function() {}; if (!socket.uid) { return; } @@ -550,4 +555,13 @@ SocketTopics.loadMoreTags = function(socket, data, callback) { }); }; +SocketTopics.isModerator = function(socket, tid, callback) { + topics.getTopicField(tid, 'cid', function(err, cid) { + if (err) { + return callback(err); + } + user.isModerator(socket.uid, cid, callback); + }); +}; + module.exports = SocketTopics; From 783bcb9bd6d47d928582d5dc5d44d856438215da Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Mar 2015 20:20:32 -0400 Subject: [PATCH 842/897] some component fixes closes #2881 --- public/src/client/topic/threadTools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index c1900fc508..55f65c9129 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -106,10 +106,10 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func translator.translate(isLocked ? '[[topic:locked]]' : '[[topic:reply]]', function(translated) { var className = isLocked ? 'fa-lock' : 'fa-reply'; threadEl.find('[component="post/reply"]').html(' ' + translated); - $('[component="post/reply"]').attr('disabled', isLocked).html(isLocked ? ' ' + translated : translated); + $('[component="topic/reply"]').attr('disabled', isLocked).html(isLocked ? ' ' + translated : translated); }); - threadEl.find('[component="quote"], [component="edit"], [component="delete"]').toggleClass('hidden', isLocked); + threadEl.find('[component="post/quote"], [component="post/edit"], [component="post/delete"]').toggleClass('hidden', isLocked); $('[component="post/header"] i.fa-lock').toggleClass('hide', !data.isLocked); ThreadTools.threadState.locked = data.isLocked; } From a1b6019efe602ddf2c7fa151e8d2edb8a74c2b44 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 18 Mar 2015 20:43:57 -0400 Subject: [PATCH 843/897] disable/enable reply buttons on lock/unlock --- public/src/client/topic/threadTools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 55f65c9129..0d10cd844c 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -105,7 +105,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func translator.translate(isLocked ? '[[topic:locked]]' : '[[topic:reply]]', function(translated) { var className = isLocked ? 'fa-lock' : 'fa-reply'; - threadEl.find('[component="post/reply"]').html(' ' + translated); + threadEl.find('[component="post/reply"]').html(' ' + translated).attr('disabled', isLocked); $('[component="topic/reply"]').attr('disabled', isLocked).html(isLocked ? ' ' + translated : translated); }); From 8e388407682bb2432c98f79879cc2b0672625eea Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Mar 2015 11:34:51 -0400 Subject: [PATCH 844/897] also passing in uid in topic delete and restore hooks --- src/threadTools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/threadTools.js b/src/threadTools.js index 96d8198291..e4345ab0ee 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -21,7 +21,7 @@ var async = require('async'), }; function toggleDelete(tid, uid, isDelete, callback) { - topics.getTopicFields(tid, ['tid', 'cid', 'deleted', 'title', 'mainPid'], function(err, topicData) { + topics.getTopicFields(tid, ['tid', 'cid', 'uid', 'deleted', 'title', 'mainPid'], function(err, topicData) { if (err) { return callback(err); } From 0cc900bdcfc20db4de8ba29718ba8bfea5135b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Mar 2015 12:32:05 -0400 Subject: [PATCH 845/897] closes #2878 --- public/src/client/category.js | 4 ++-- public/src/client/topic.js | 14 +++++++------- public/src/modules/navigator.js | 18 +++++++++++++----- public/src/modules/share.js | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/public/src/client/category.js b/public/src/client/category.js index 2a6a580323..bf91059a25 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -89,8 +89,8 @@ define('forum/category', [ }); }; - Category.navigatorCallback = function(element, elementCount) { - return parseInt(element.attr('data-index'), 10) + 1; + Category.navigatorCallback = function(topIndex, bottomIndex, elementCount) { + return bottomIndex; }; $(window).on('action:popstate', function(ev, data) { diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 4a597b4853..cbf4074d4f 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -148,18 +148,18 @@ define('forum/topic', [ return index; }; - Topic.navigatorCallback = function(element, elementCount) { + Topic.navigatorCallback = function(topPostIndex, bottomPostIndex, elementCount) { var path = ajaxify.removeRelativePath(window.location.pathname.slice(1)); if (!path.startsWith('topic')) { return 1; } - var postIndex = parseInt(element.attr('data-index'), 10); - var index = postIndex + 1; + var postIndex = topPostIndex; + var index = bottomPostIndex; if (config.topicPostSort !== 'oldest_to_newest') { - if (postIndex === 0) { + if (bottomPostIndex === 0) { index = 1; } else { - index = Math.max(elementCount - postIndex + 1, 1); + index = Math.max(elementCount - bottomPostIndex + 2, 1); } } @@ -175,8 +175,8 @@ define('forum/topic', [ var topicId = parts[1], slug = parts[2]; var newUrl = 'topic/' + topicId + '/' + (slug ? slug : ''); - if (postIndex > 0) { - newUrl += '/' + (postIndex + 1); + if (postIndex > 1) { + newUrl += '/' + postIndex; } if (newUrl !== currentUrl) { diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 49b7a8f7ca..697046bd28 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -90,18 +90,26 @@ define('navigator', ['forum/pagination'], function(pagination) { navigator.update = function() { toggle(!!count); - $($(navigator.selector).get().reverse()).each(function() { + var topIndex = 0; + var bottomIndex = 0; + $(navigator.selector).each(function() { var el = $(this); if (elementInView(el)) { - if (typeof navigator.callback === 'function') { - index = navigator.callback(el, count); - navigator.updateTextAndProgressBar(); + if (!topIndex) { + topIndex = parseInt(el.attr('data-index'), 10) + 1; + } else { + bottomIndex = parseInt(el.attr('data-index'), 10) + 1; } - + } else if (topIndex && bottomIndex) { return false; } }); + + if (typeof navigator.callback === 'function' && topIndex && bottomIndex) { + index = navigator.callback(topIndex, bottomIndex, count); + navigator.updateTextAndProgressBar(); + } }; navigator.updateTextAndProgressBar = function() { diff --git a/public/src/modules/share.js b/public/src/modules/share.js index 83c2dce041..6665a30b8c 100644 --- a/public/src/modules/share.js +++ b/public/src/modules/share.js @@ -50,7 +50,7 @@ define('share', function() { function getPostUrl(clickedElement) { var parts = window.location.pathname.split('/'); - var postIndex = parseInt(clickedElement.parents('data-index').attr('data-index'), 10); + var postIndex = parseInt(clickedElement.parents('[data-index]').attr('data-index'), 10); return '/' + parts[1] + '/' + parts[2] + (parts[3] ? '/' + parts[3] : '') + (postIndex ? '/' + (postIndex + 1) : ''); } From 6417a559185c807b6491f015122b580cebddfecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Mar 2015 12:47:28 -0400 Subject: [PATCH 846/897] up dbsearch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8114176481..d6088f25d8 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "mmmagic": "^0.3.13", "morgan": "^1.3.2", "nconf": "~0.7.1", - "nodebb-plugin-dbsearch": "^0.1.0", + "nodebb-plugin-dbsearch": "^0.2.0", "nodebb-plugin-emoji-extended": "^0.4.1-4", "nodebb-plugin-markdown": "^1.0.0", "nodebb-plugin-mentions": "^0.11.0", From aeb7548a9d37f21df9f90eb5fcab25ffea734211 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 12:58:09 -0400 Subject: [PATCH 847/897] because this works --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d6088f25d8..7e03c304f3 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "mmmagic": "^0.3.13", "morgan": "^1.3.2", "nconf": "~0.7.1", - "nodebb-plugin-dbsearch": "^0.2.0", + "nodebb-plugin-dbsearch": "^0.2.1", "nodebb-plugin-emoji-extended": "^0.4.1-4", "nodebb-plugin-markdown": "^1.0.0", "nodebb-plugin-mentions": "^0.11.0", From 5a4fa18e98d41b7c0c5d162b3089d593a5f660bb Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Mar 2015 13:20:16 -0400 Subject: [PATCH 848/897] fixed digests so they aren't prematurely exiting, and will send again :shipit: --- src/user/digest.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/user/digest.js b/src/user/digest.js index 06ea1aa967..02799c0bf3 100644 --- a/src/user/digest.js +++ b/src/user/digest.js @@ -46,7 +46,6 @@ var async = require('async'), return topicObj; }); - return; data.interval = interval; From d05ef6ddbc6c372806d32d5daa4f28d013becb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Mar 2015 13:28:07 -0400 Subject: [PATCH 849/897] closes #2822 --- src/controllers/search.js | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/controllers/search.js b/src/controllers/search.js index 7ed16d8bb8..775d430783 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -23,26 +23,6 @@ searchController.search = function(req, res, next) { return next(err); } - if (!req.params.term) { - var results = { - time: 0, - search_query: '', - posts: [], - users: [], - tags: [], - categories: categories, - breadcrumbs: breadcrumbs, - expandSearch: true - }; - plugins.fireHook('filter:search.build', {data: {}, results: results}, function(err, data) { - if (err) { - return next(err); - } - res.render('search', data.results); - }); - return; - } - req.params.term = validator.escape(req.params.term); var page = Math.max(1, parseInt(req.query.page, 10)) || 1; if (req.query.categories && !Array.isArray(req.query.categories)) { @@ -77,7 +57,7 @@ searchController.search = function(req, res, next) { results.breadcrumbs = breadcrumbs; results.categories = categories; results.expandSearch = false; - + plugins.fireHook('filter:search.build', {data: data, results: results}, function(err, data) { if (err) { return next(err); From 10eb617c6d7972f544d0cbc3e035e714f6643a05 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 13:56:12 -0400 Subject: [PATCH 850/897] category and category/topic components; removed #topic-container selectors --- public/src/client/account/topics.js | 2 +- public/src/client/account/watched.js | 2 +- public/src/client/category.js | 49 ++++++++++++++++------------ public/src/client/categoryTools.js | 2 +- public/src/client/recent.js | 10 +++--- public/src/client/tag.js | 8 ++--- public/src/client/unread.js | 16 ++++----- public/src/components.js | 4 +++ public/src/modules/topicSelect.js | 4 +-- 9 files changed, 54 insertions(+), 43 deletions(-) diff --git a/public/src/client/account/topics.js b/public/src/client/account/topics.js index 107352db97..3d3923ceef 100644 --- a/public/src/client/account/topics.js +++ b/public/src/client/account/topics.js @@ -32,7 +32,7 @@ define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], function onTopicsLoaded(topics, callback) { infinitescroll.parseAndTranslate('account/topics', 'topics', {topics: topics}, function(html) { - $('#topics-container').append(html); + $('[component="category"]').append(html); html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); diff --git a/public/src/client/account/watched.js b/public/src/client/account/watched.js index 3514301c4d..c9d4bed788 100644 --- a/public/src/client/account/watched.js +++ b/public/src/client/account/watched.js @@ -30,7 +30,7 @@ define('forum/account/watched', ['forum/account/header', 'forum/infinitescroll'] function onTopicsLoaded(topics, callback) { infinitescroll.parseAndTranslate('account/watched', 'topics', {topics: topics}, function(html) { - $('#topics-container').append(html); + $('[component="category"]').append(html); html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); diff --git a/public/src/client/category.js b/public/src/client/category.js index bf91059a25..1e6c0e94c4 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -46,12 +46,12 @@ define('forum/category', [ enableInfiniteLoadingOrPagination(); if (!config.usePagination) { - navigator.init('#topics-container > .category-item', ajaxify.variables.get('topic_count'), Category.toTop, Category.toBottom, Category.navigatorCallback); + navigator.init('[component="category/topic"]', ajaxify.variables.get('topic_count'), Category.toTop, Category.toBottom, Category.navigatorCallback); } - $('#topics-container').on('click', '[component="post/header"]', function() { + $('[component="category"]').on('click', '[component="post/header"]', function() { var clickedIndex = $(this).parents('[data-index]').attr('data-index'); - $('#topics-container li.category-item').each(function(index, el) { + $('[component="category/topic"]').each(function(index, el) { if ($(el).offset().top - $(window).scrollTop() > 0) { localStorage.setItem('category:' + cid + ':bookmark', $(el).attr('data-index')); localStorage.setItem('category:' + cid + ':bookmark:clicked', clickedIndex); @@ -129,7 +129,7 @@ define('forum/category', [ bookmarkIndex = 0; } - $('#topics-container').empty(); + $('[component="category"]').empty(); loadTopicsAfter(bookmarkIndex, function() { Category.scrollToTopic(bookmarkIndex, clickedIndex, 0); @@ -139,7 +139,7 @@ define('forum/category', [ }); Category.highlightTopic = function(topicIndex) { - var highlight = $('#topics-container [data-index="' + topicIndex + '"]'); + var highlight = components.get('category/topic', 'index', topicIndex); if (highlight.length && !highlight.hasClass('highlight')) { highlight.addClass('highlight'); setTimeout(function() { @@ -157,7 +157,7 @@ define('forum/category', [ offset = 0; } - var scrollTo = $('#topics-container [data-index="' + bookmarkIndex + '"]'); + var scrollTo = components.get('category/topic', 'index', bookmarkIndex); var cid = ajaxify.variables.get('category_id'); if (scrollTo.length && cid) { $('html, body').animate({ @@ -192,11 +192,12 @@ define('forum/category', [ }, function(html) { translator.translate(html, function(translatedHTML) { var topic = $(translatedHTML), - container = $('#topics-container'), - topics = $('#topics-container').children('.category-item'), + container = $('[component="category"]'), + topics = $('[component="category/topic"]'), numTopics = topics.length; - $('#topics-container, .category-sidebar').removeClass('hidden'); + $('[component="category"]').removeClass('hidden'); + $('.category-sidebar').removeClass('hidden'); var noTopicsWarning = $('#category-no-topics'); if (noTopicsWarning.length) { @@ -247,7 +248,7 @@ define('forum/category', [ function removeAlreadyAddedTopics(topics) { return topics.filter(function(topic) { - return $('#topics-container li[data-tid="' + topic.tid +'"]').length === 0; + return components.get('category/topic', 'tid', topic.tid).length === 0; }); } @@ -255,16 +256,20 @@ define('forum/category', [ before = null; function findInsertionPoint() { - if (!$('#topics-container .category-item[data-tid]').length) { + var topics = components.get('category/topic'); + + if (!topics.length) { return; } - var last = $('#topics-container .category-item[data-tid]').last(); - var lastIndex = last.attr('data-index'); - var firstIndex = data.topics[data.topics.length - 1].index; + + var last = topics.last(), + lastIndex = last.attr('data-index'), + firstIndex = data.topics[data.topics.length - 1].index; + if (firstIndex > lastIndex) { after = last; } else { - before = $('#topics-container .category-item[data-tid]').first(); + before = topics.first(); } } @@ -277,10 +282,12 @@ define('forum/category', [ templates.parse('category', 'topics', data, function(html) { translator.translate(html, function(translatedHTML) { - var container = $('#topics-container'), + var container = $('[component="category"]'), html = $(translatedHTML); - $('#topics-container, .category-sidebar').removeClass('hidden'); + $('[component="category"]').removeClass('hidden'); + $('.category-sidebar').removeClass('hidden'); + $('#category-no-topics').remove(); if(config.usePagination) { @@ -306,11 +313,11 @@ define('forum/category', [ }; Category.loadMoreTopics = function(direction) { - if (!$('#topics-container').length || !$('#topics-container').children().length) { + if (!$('[component="category"]').length || !$('[component="category"]').children().length) { return; } - infinitescroll.calculateAfter(direction, '#topics-container .category-item[data-tid]', config.topicsPerPage, false, function(after, offset, el) { + infinitescroll.calculateAfter(direction, components.get('category/topic'), config.topicsPerPage, false, function(after, offset, el) { loadTopicsAfter(after, function() { if (direction < 0 && el) { Category.scrollToTopic(el.attr('data-index'), null, 0, offset); @@ -320,7 +327,7 @@ define('forum/category', [ }; function loadTopicsAfter(after, callback) { - if(!utils.isNumber(after) || (after === 0 && $('#topics-container li.category-item[data-index="0"]').length)) { + if(!utils.isNumber(after) || (after === 0 && components.get('category/topic', 'index', 0).length)) { return; } @@ -336,7 +343,7 @@ define('forum/category', [ done(); callback(); }); - $('#topics-container').attr('data-nextstart', data.nextStart); + $('[component="category"]').attr('data-nextstart', data.nextStart); } else { done(); } diff --git a/public/src/client/categoryTools.js b/public/src/client/categoryTools.js index 0e9bae608b..0464a3ee65 100644 --- a/public/src/client/categoryTools.js +++ b/public/src/client/categoryTools.js @@ -173,7 +173,7 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect'], function(move } function getTopicEl(tid) { - return $('#topics-container li[data-tid="' + tid + '"]'); + return components.get('category/topic', 'tid', tid); } function setDeleteState(data) { diff --git a/public/src/client/recent.js b/public/src/client/recent.js index 2be859f65c..30d635ea0d 100644 --- a/public/src/client/recent.js +++ b/public/src/client/recent.js @@ -94,17 +94,17 @@ define('forum/recent', ['forum/infinitescroll', 'composer'], function(infinitesc }; Recent.loadMoreTopics = function(direction) { - if(direction < 0 || !$('#topics-container').length) { + if(direction < 0 || !$('[component="category"]').length) { return; } infinitescroll.loadMore('topics.loadMoreFromSet', { - after: $('#topics-container').attr('data-nextstart'), + after: $('[component="category"]').attr('data-nextstart'), set: 'topics:recent' }, function(data, done) { if (data.topics && data.topics.length) { Recent.onTopicsLoaded('recent', data.topics, false, done); - $('#topics-container').attr('data-nextstart', data.nextStart); + $('[component="category"]').attr('data-nextstart', data.nextStart); } else { done(); } @@ -114,7 +114,7 @@ define('forum/recent', ['forum/infinitescroll', 'composer'], function(infinitesc Recent.onTopicsLoaded = function(templateName, topics, showSelect, callback) { topics = topics.filter(function(topic) { - return !$('#topics-container li[data-tid=' + topic.tid + ']').length; + return !components.get('category/topic', 'tid', topic.tid).length; }); if (!topics.length) { @@ -124,7 +124,7 @@ define('forum/recent', ['forum/infinitescroll', 'composer'], function(infinitesc infinitescroll.parseAndTranslate(templateName, 'topics', {topics: topics, showSelect: showSelect}, function(html) { $('#category-no-topics').remove(); - $('#topics-container').append(html); + $('[component="category"]').append(html); html.find('.timeago').timeago(); app.createUserTooltips(); utils.makeNumbersHumanReadable(html.find('.human-readable-number')); diff --git a/public/src/client/tag.js b/public/src/client/tag.js index 3565c7e151..7328934e2d 100644 --- a/public/src/client/tag.js +++ b/public/src/client/tag.js @@ -8,7 +8,7 @@ define('forum/tag', ['forum/recent', 'forum/infinitescroll'], function(recent, i Tag.init = function() { app.enterRoom('tags'); - if ($('body').height() <= $(window).height() && $('#topics-container').children().length >= 20) { + if ($('body').height() <= $(window).height() && $('[component="category"]').children().length >= 20) { $('#load-more-btn').show(); } @@ -19,17 +19,17 @@ define('forum/tag', ['forum/recent', 'forum/infinitescroll'], function(recent, i infinitescroll.init(loadMoreTopics); function loadMoreTopics(direction) { - if(direction < 0 || !$('#topics-container').length) { + if(direction < 0 || !$('[component="category"]').length) { return; } infinitescroll.loadMore('topics.loadMoreFromSet', { set: 'tag:' + ajaxify.variables.get('tag') + ':topics', - after: $('#topics-container').attr('data-nextstart') + after: $('[component="category"]').attr('data-nextstart') }, function(data, done) { if (data.topics && data.topics.length) { recent.onTopicsLoaded('tag', data.topics, false, done); - $('#topics-container').attr('data-nextstart', data.nextStart); + $('[component="category"]').attr('data-nextstart', data.nextStart); } else { done(); $('#load-more-btn').hide(); diff --git a/public/src/client/unread.js b/public/src/client/unread.js index 7e08037f5a..c8c1c96de9 100644 --- a/public/src/client/unread.js +++ b/public/src/client/unread.js @@ -42,7 +42,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], app.alertSuccess('[[unread:topics_marked_as_read.success]]'); - $('#topics-container').empty(); + $('[component="category"]').empty(); $('#category-no-topics').removeClass('hidden'); $('.markread').addClass('hidden'); }); @@ -51,7 +51,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], $('.markread').on('click', '.category', function() { function getCategoryTids(cid) { var tids = []; - $('#topics-container .category-item[data-cid="' + cid + '"]').each(function() { + components.get('category/topic', 'cid', cid).each(function() { tids.push($(this).attr('data-tid')); }); return tids; @@ -72,7 +72,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], topicSelect.init(); - if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) { + if ($("body").height() <= $(window).height() && $('[component="category"]').children().length >= 20) { $('#load-more-btn').show(); } @@ -83,16 +83,16 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], infinitescroll.init(loadMoreTopics); function loadMoreTopics(direction) { - if(direction < 0 || !$('#topics-container').length) { + if(direction < 0 || !$('[component="category"]').length) { return; } infinitescroll.loadMore('topics.loadMoreUnreadTopics', { - after: $('#topics-container').attr('data-nextstart') + after: $('[component="category"]').attr('data-nextstart') }, function(data, done) { if (data.topics && data.topics.length) { recent.onTopicsLoaded('unread', data.topics, true, done); - $('#topics-container').attr('data-nextstart', data.nextStart); + $('[component="category"]').attr('data-nextstart', data.nextStart); } else { done(); $('#load-more-btn').hide(); @@ -106,7 +106,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], app.alertSuccess('[[unread:topics_marked_as_read.success]]'); - if (!$('#topics-container').children().length) { + if (!$('[component="category"]').children().length) { $('#category-no-topics').removeClass('hidden'); $('.markread').addClass('hidden'); } @@ -114,7 +114,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll'], function removeTids(tids) { for(var i=0; i Date: Thu, 19 Mar 2015 13:58:29 -0400 Subject: [PATCH 851/897] removed .category-item selectors --- public/src/client/categories.js | 2 +- public/src/modules/topicSelect.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/src/client/categories.js b/public/src/client/categories.js index 9ef4bee6f6..e3882ff831 100644 --- a/public/src/client/categories.js +++ b/public/src/client/categories.js @@ -29,7 +29,7 @@ define('forum/categories', function() { }; function renderNewPost(cid, post) { - var category = $('.category-item[data-cid="' + cid + '"]'); + var category = components.get('category/topic', 'cid', cid); if (!category.length) { return; } diff --git a/public/src/modules/topicSelect.js b/public/src/modules/topicSelect.js index dd4ddbf5dc..3e3ae58d46 100644 --- a/public/src/modules/topicSelect.js +++ b/public/src/modules/topicSelect.js @@ -18,7 +18,7 @@ define('topicSelect', function() { var select = $(this); if (ev.shiftKey) { - selectRange($(this).parents('.category-item').attr('data-tid')); + selectRange($(this).parents('[component="category/topic"]').attr('data-tid')); lastSelected = select; return false; } @@ -35,32 +35,32 @@ define('topicSelect', function() { function toggleSelect(select, isSelected) { select.toggleClass('fa-check-square-o', isSelected); select.toggleClass('fa-square-o', !isSelected); - select.parents('.category-item').toggleClass('selected', isSelected); + select.parents('[component="category/topic"]').toggleClass('selected', isSelected); } TopicSelect.getSelectedTids = function() { var tids = []; - topicsContainer.find('.category-item.selected').each(function() { + topicsContainer.find('[component="category/topic"].selected').each(function() { tids.push($(this).attr('data-tid')); }); return tids; }; TopicSelect.unselectAll = function() { - topicsContainer.find('.category-item.selected').removeClass('selected'); + topicsContainer.find('[component="category/topic"].selected').removeClass('selected'); topicsContainer.find('.select').toggleClass('fa-check-square-o', false).toggleClass('fa-square-o', true); }; function selectRange(clickedTid) { if(!lastSelected) { - lastSelected = $('.category-item[data-tid]').first().find('.select'); + lastSelected = $('[component="category/topic"]').first().find('.select'); } - var isClickedSelected = $('.category-item[data-tid="' + clickedTid + '"]').hasClass('selected'); + var isClickedSelected = components.get('category/topic', 'tid', clickedTid).hasClass('selected'); var clickedIndex = getIndex(clickedTid); - var lastIndex = getIndex(lastSelected.parents('.category-item[data-tid]').attr('data-tid')); + var lastIndex = getIndex(lastSelected.parents('[component="category/topic"]').attr('data-tid')); selectIndexRange(clickedIndex, lastIndex, !isClickedSelected); } @@ -72,7 +72,7 @@ define('topicSelect', function() { } for(var i=start; i<=end; ++i) { - var topic = $('.category-item[data-tid]').eq(i); + var topic = $('[component="category/topic"]').eq(i); toggleSelect(topic.find('.select'), isSelected); } } From 87ffc2cff9c48093e2322da526aa94ff984b41aa Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 14:05:41 -0400 Subject: [PATCH 852/897] topic/pinned and topic/locked components --- public/src/client/categoryTools.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/client/categoryTools.js b/public/src/client/categoryTools.js index 0464a3ee65..e711bce436 100644 --- a/public/src/client/categoryTools.js +++ b/public/src/client/categoryTools.js @@ -179,20 +179,20 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect'], function(move function setDeleteState(data) { var topic = getTopicEl(data.tid); topic.toggleClass('deleted', data.isDeleted); - topic.find('.fa-lock').toggleClass('hide', !data.isDeleted); + topic.find('[component="topic/locked"]').toggleClass('hide', !data.isDeleted); } function setPinnedState(data) { var topic = getTopicEl(data.tid); topic.toggleClass('pinned', data.isPinned); - topic.find('.fa-thumb-tack').toggleClass('hide', !data.isPinned); + topic.find('[component="topic/pinned"]').toggleClass('hide', !data.isPinned); ajaxify.refresh(); } function setLockedState(data) { var topic = getTopicEl(data.tid); topic.toggleClass('locked', data.isLocked); - topic.find('.fa-lock').toggleClass('hide', !data.isLocked); + topic.find('[component="topic/locked"]').toggleClass('hide', !data.isLocked); } function onTopicMoved(data) { From 5d7ce0011aea8d773b8aa0bd5451f092098493b4 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 14:21:23 -0400 Subject: [PATCH 853/897] no need for setTimeout in ajaxify --- public/src/ajaxify.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 0c4e191532..2743405524 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -135,19 +135,17 @@ $(document).ready(function() { templates.parse(tpl_url, data, function(template) { translator.translate(template, function(translatedTemplate) { - setTimeout(function() { - $('#content').html(translatedTemplate); + $('#content').html(translatedTemplate); - ajaxify.end(url, tpl_url); + ajaxify.end(url, tpl_url); - if (typeof callback === 'function') { - callback(); - } + if (typeof callback === 'function') { + callback(); + } - $('#content, #footer').removeClass('ajaxifying'); + $('#content, #footer').removeClass('ajaxifying'); - app.refreshTitle(url); - }, animationDuration * 1000 - ((new Date()).getTime() - startTime)); + app.refreshTitle(url); }); }); } From bc056f0724376212eb2a8a5b58e5b71e640959d3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 14:22:00 -0400 Subject: [PATCH 854/897] can remove this line as well --- public/src/ajaxify.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 2743405524..ace00d134f 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -130,7 +130,6 @@ $(document).ready(function() { } function renderTemplate(url, tpl_url, data, startTime, callback) { - var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2; $(window).trigger('action:ajaxify.loadingTemplates', {}); templates.parse(tpl_url, data, function(template) { From 82f7ca5e0fd76fdf521bf08f7cafdba317962a8b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Mar 2015 14:56:27 -0400 Subject: [PATCH 855/897] added a path to follow notification --- src/socket.io/user.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 7170cf27d0..0771d44066 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -293,7 +293,8 @@ SocketUser.follow = function(socket, data, callback) { notifications.create({ bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]', nid: 'follow:' + data.uid + ':uid:' + socket.uid, - from: socket.uid + from: socket.uid, + path: 'user/' + userData.userslug }, next); }, function(notification, next) { From b1478ad5dafd7fabbd8f9d218322cad9e84d1fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Mar 2015 15:04:51 -0400 Subject: [PATCH 856/897] dont add events multiple timest to #content --- public/src/client/topic/postTools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 260433d808..a54f3f894f 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -126,7 +126,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com openChat($(this)); }); - $('#content').on('click', '[component="topic/reply"]', function() { + components.get('topic/reply').on('click', function() { if (!threadState.locked) { onReplyClicked($(this), tid, topicName); } From f2c220988b8a466111e15852dce0344b351a0775 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 15:05:11 -0400 Subject: [PATCH 857/897] fix for posting in multiple threads bug --- public/src/client/topic/postTools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 260433d808..cf810fbfd6 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -126,7 +126,7 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com openChat($(this)); }); - $('#content').on('click', '[component="topic/reply"]', function() { + $('[component="topic/reply"]').on('click', function() { if (!threadState.locked) { onReplyClicked($(this), tid, topicName); } From 8c0dfa121722f5fcae50c0d432ca5872326a3312 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 15:11:02 -0400 Subject: [PATCH 858/897] data/category partial --- src/views/partials/data/category.tpl | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/views/partials/data/category.tpl diff --git a/src/views/partials/data/category.tpl b/src/views/partials/data/category.tpl new file mode 100644 index 0000000000..2144c8a84c --- /dev/null +++ b/src/views/partials/data/category.tpl @@ -0,0 +1 @@ +data-tid="{topics.tid}" data-index="{topics.index}" data-cid="{topics.cid}" itemprop="itemListElement" \ No newline at end of file From cc92d09498df76f54f48bfe3e26cd70b9722df60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Mar 2015 15:24:38 -0400 Subject: [PATCH 859/897] generateNotificationPaths --- src/user/notifications.js | 46 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/user/notifications.js b/src/user/notifications.js index c3ea4b9c23..fe9ffc80b8 100644 --- a/src/user/notifications.js +++ b/src/user/notifications.js @@ -109,34 +109,38 @@ var async = require('async'), return callback(err); } - var pids = notifications.map(function(notification) { - return notification ? notification.pid : null; - }); + UserNotifications.generateNotificationPaths(notifications, uid, callback); + }); + }; - generatePostPaths(pids, uid, function(err, pidToPaths) { - if (err) { - return callback(err); - } + UserNotifications.generateNotificationPaths = function (notifications, uid, callback) { + var pids = notifications.map(function(notification) { + return notification ? notification.pid : null; + }); - notifications = notifications.map(function(notification, index) { - if (!notification) { - return null; - } + generatePostPaths(pids, uid, function(err, pidToPaths) { + if (err) { + return callback(err); + } - notification.path = pidToPaths[notification.pid] || notification.path || ''; + notifications = notifications.map(function(notification, index) { + if (!notification) { + return null; + } - if (notification.nid.startsWith('chat')) { - notification.path = nconf.get('relative_path') + '/chats/' + notification.user.userslug; - } else if (notification.nid.startsWith('follow')) { - notification.path = nconf.get('relative_path') + '/user/' + notification.user.userslug; - } + notification.path = pidToPaths[notification.pid] || notification.path || ''; - notification.datetimeISO = utils.toISOString(notification.datetime); - return notification; - }); + if (notification.nid.startsWith('chat')) { + notification.path = nconf.get('relative_path') + '/chats/' + notification.user.userslug; + } else if (notification.nid.startsWith('follow')) { + notification.path = nconf.get('relative_path') + '/user/' + notification.user.userslug; + } - callback(null, notifications); + notification.datetimeISO = utils.toISOString(notification.datetime); + return notification; }); + + callback(null, notifications); }); }; From 8b429a2e05787025520fb5bad8579ab1f93dc133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Mar 2015 15:26:51 -0400 Subject: [PATCH 860/897] removed path --- src/socket.io/user.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 0771d44066..7170cf27d0 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -293,8 +293,7 @@ SocketUser.follow = function(socket, data, callback) { notifications.create({ bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]', nid: 'follow:' + data.uid + ':uid:' + socket.uid, - from: socket.uid, - path: 'user/' + userData.userslug + from: socket.uid }, next); }, function(notification, next) { From 027f9e5a83035ece6195b23cd1ea5f139b469a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Mar 2015 15:27:27 -0400 Subject: [PATCH 861/897] dont need start time anymore --- public/src/ajaxify.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index ace00d134f..f5cca44ccf 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -41,8 +41,6 @@ $(document).ready(function() { $('#footer, #content').removeClass('hide').addClass('ajaxifying'); - var startTime = (new Date()).getTime(); - ajaxify.variables.flush(); ajaxify.loadData(url, function(err, data) { if (err) { @@ -53,7 +51,7 @@ $(document).ready(function() { translator.load(config.defaultLang, data.template.name); - renderTemplate(url, data.template.name, data, startTime, callback); + renderTemplate(url, data.template.name, data, callback); require(['search'], function(search) { search.topicDOM.end(); @@ -129,7 +127,7 @@ $(document).ready(function() { } } - function renderTemplate(url, tpl_url, data, startTime, callback) { + function renderTemplate(url, tpl_url, data, callback) { $(window).trigger('action:ajaxify.loadingTemplates', {}); templates.parse(tpl_url, data, function(template) { From eee2aa80512cae97fe86d07d460d4be66fb2528b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 19 Mar 2015 15:46:33 -0400 Subject: [PATCH 862/897] making sure to pass in userData to notifications.create on user follow --- src/socket.io/user.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 7170cf27d0..4f4064ec91 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -293,7 +293,8 @@ SocketUser.follow = function(socket, data, callback) { notifications.create({ bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]', nid: 'follow:' + data.uid + ':uid:' + socket.uid, - from: socket.uid + from: socket.uid, + user: userData }, next); }, function(notification, next) { From 6acfec9d2532f4db3c882269fb1a91e781f43199 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 15:50:21 -0400 Subject: [PATCH 863/897] add teaser content to category view --- src/topics/teaser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/topics/teaser.js b/src/topics/teaser.js index 87e2baa86f..0d67ad6360 100644 --- a/src/topics/teaser.js +++ b/src/topics/teaser.js @@ -27,7 +27,7 @@ module.exports = function(Topics) { } }); - posts.getPostsFields(teaserPids, ['pid', 'uid', 'timestamp', 'tid'], function(err, postData) { + posts.getPostsFields(teaserPids, ['pid', 'uid', 'timestamp', 'tid', 'content'], function(err, postData) { if (err) { return callback(err); } From 9edfcb005392817116b97776c73e9ab8ca963a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 19 Mar 2015 15:55:56 -0400 Subject: [PATCH 864/897] dont save user obj in db --- src/socket.io/user.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/socket.io/user.js b/src/socket.io/user.js index 4f4064ec91..807666ff18 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -281,7 +281,7 @@ SocketUser.follow = function(socket, data, callback) { if (!socket.uid || !data) { return; } - + var userData; async.waterfall([ function(next) { toggleFollow('follow', socket.uid, data.uid, next); @@ -289,15 +289,16 @@ SocketUser.follow = function(socket, data, callback) { function(next) { user.getUserFields(socket.uid, ['username', 'userslug'], next); }, - function(userData, next) { + function(_userData, next) { + userData = _userData; notifications.create({ bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]', nid: 'follow:' + data.uid + ':uid:' + socket.uid, - from: socket.uid, - user: userData + from: socket.uid }, next); }, function(notification, next) { + notification.user = userData; notifications.push(notification, [data.uid], next); } ], callback); From d2dae2d62f7dd272cac75e51198eb237e353faf3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 16:15:31 -0400 Subject: [PATCH 865/897] standardize showSelect amongst category and topic_list routes --- src/controllers/categories.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/categories.js b/src/controllers/categories.js index 735df5886d..8896894680 100644 --- a/src/controllers/categories.js +++ b/src/controllers/categories.js @@ -277,6 +277,7 @@ categoriesController.get = function(req, res, next) { }, function (categoryData, next) { categoryData.privileges = userPrivileges; + categoryData.showSelect = categoryData.privileges.editable; res.locals.metaTags = [ { From 358f6f61f7832f64d3832311fe37c725cddcf367 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Mar 2015 21:43:53 -0400 Subject: [PATCH 866/897] closes #2803, closes #2883 options.unescape was not used correctly fix groups.update so it doesnt overwrite data if some fields are not passed in --- src/groups.js | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/src/groups.js b/src/groups.js index 25c8ff1bdc..718e022dbf 100644 --- a/src/groups.js +++ b/src/groups.js @@ -226,9 +226,9 @@ var async = require('async'), return callback(err); } results.base.name = !options.unescape ? validator.escape(results.base.name) : results.base.name; - results.base.description = options.unescape ? validator.escape(results.base.description) : results.base.description; + results.base.description = !options.unescape ? validator.escape(results.base.description) : results.base.description; results.base.descriptionParsed = descriptionParsed; - results.base.userTitle = options.unescape ? validator.escape(results.base.userTitle) : results.base.userTitle; + results.base.userTitle = !options.unescape ? validator.escape(results.base.userTitle) : results.base.userTitle; results.base.userTitleEnabled = results.base.userTitleEnabled ? !!parseInt(results.base.userTitleEnabled, 10) : true; results.base.createtimeISO = utils.toISOString(results.base.createtime); results.base.members = results.users.filter(Boolean); @@ -538,14 +538,26 @@ var async = require('async'), } var payload = { - userTitle: values.userTitle || '', - userTitleEnabled: values.userTitleEnabled === true ? '1' : '0', - description: values.description || '', - icon: values.icon || '', - labelColor: values.labelColor || '#000000', - hidden: values.hidden === true ? '1' : '0', - 'private': values.private === false ? '0' : '1' - }; + description: values.description || '', + icon: values.icon || '', + labelColor: values.labelColor || '#000000' + }; + + if (values.hasOwnProperty('userTitle')) { + payload.userTitle = values.userTitle || ''; + } + + if (values.hasOwnProperty('userTitleEnabled')) { + payload.userTitleEnabled = values.userTitleEnabled ? '1' : '0'; + } + + if (values.hasOwnProperty('hidden')) { + payload.hidden = values.hidden ? '1' : '0'; + } + + if (values.hasOwnProperty('private')) { + payload.private = values.private ? '1' : '0'; + } async.series([ async.apply(updatePrivacy, groupName, values.private), @@ -566,9 +578,15 @@ var async = require('async'), }; function updatePrivacy(groupName, newValue, callback) { - // Grab the group's current privacy value + if (!newValue) { + return callback(); + } + Groups.getGroupFields(groupName, ['private'], function(err, currentValue) { - currentValue = currentValue.private === '1'; // Now a Boolean + if (err) { + return callback(err); + } + currentValue = currentValue.private === '1'; if (currentValue !== newValue && currentValue === true) { // Group is now public, so all pending users are automatically considered members From e4431f62b2b41c9da42d8c03b0b615e64c331680 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Mar 2015 22:07:36 -0400 Subject: [PATCH 867/897] fix group update text --- src/groups.js | 2 +- tests/groups.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/groups.js b/src/groups.js index 718e022dbf..a3d4b0c933 100644 --- a/src/groups.js +++ b/src/groups.js @@ -499,7 +499,7 @@ var async = require('async'), deleted: '0', hidden: data.hidden || '0', system: system ? '1' : '0', - 'private': data.private || '1' + private: data.private || '1' }, tasks = [ async.apply(db.sortedSetAdd, 'groups:createtime', now, data.name), diff --git a/tests/groups.js b/tests/groups.js index 0025000828..a7389079f4 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -186,6 +186,9 @@ describe('Groups', function() { }); describe('.update()', function() { + before(function(done) { + Groups.join('foobar', 1, done); + }); it('should change an aspect of a group', function(done) { Groups.update('foo', { description: 'baz' From 649ef9376808e0d4b3a1421ea9fe7466bf4edf0e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Mar 2015 22:21:08 -0400 Subject: [PATCH 868/897] its called foo :dull --- tests/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/groups.js b/tests/groups.js index a7389079f4..ff057d8b99 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -187,7 +187,7 @@ describe('Groups', function() { describe('.update()', function() { before(function(done) { - Groups.join('foobar', 1, done); + Groups.join('foo', 1, done); }); it('should change an aspect of a group', function(done) { Groups.update('foo', { From e5bea19f5637a0d7ab1c94c83b5d7ada8f4c7f72 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Mar 2015 22:35:24 -0400 Subject: [PATCH 869/897] renamed groupname --- tests/groups.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/groups.js b/tests/groups.js index ff057d8b99..9c122f7883 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -187,10 +187,14 @@ describe('Groups', function() { describe('.update()', function() { before(function(done) { - Groups.join('foo', 1, done); + Groups.create({ + name: 'updateTestGroup', + description: 'bar' + }, done); }); + it('should change an aspect of a group', function(done) { - Groups.update('foo', { + Groups.update('updateTestGroup', { description: 'baz' }, function(err) { if (err) return done(err); @@ -206,16 +210,16 @@ describe('Groups', function() { }); it('should rename a group if the name was updated', function(done) { - Groups.update('foo', { - name: 'foobar?' + Groups.update('updateTestGroup', { + name: 'updateTestGroup?' }, function(err) { if (err) return done(err); Groups.get('foobar?', {}, function(err, groupObj) { if (err) return done(err); - assert.strictEqual('foobar?', groupObj.name); - assert.strictEqual('foobar', groupObj.slug); + assert.strictEqual('updateTestGroup?', groupObj.name); + assert.strictEqual('updateTestGroup', groupObj.slug); done(); }); From 8b5643fe901bb1f3e373129f3eebe9955edec719 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Mar 2015 22:42:16 -0400 Subject: [PATCH 870/897] system and hidden groups cant be renamed --- tests/groups.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/groups.js b/tests/groups.js index 9c122f7883..72f18e6969 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -189,7 +189,9 @@ describe('Groups', function() { before(function(done) { Groups.create({ name: 'updateTestGroup', - description: 'bar' + description: 'bar', + system: 0, + hidden: 0 }, done); }); From a51b7257c7ad081335d55ea404405f7cba21b5a9 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Mar 2015 22:46:40 -0400 Subject: [PATCH 871/897] fix group name in tests --- tests/groups.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/groups.js b/tests/groups.js index 72f18e6969..338528d795 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -201,7 +201,7 @@ describe('Groups', function() { }, function(err) { if (err) return done(err); - Groups.get('foo', {}, function(err, groupObj) { + Groups.get('updateTestGroup', {}, function(err, groupObj) { if (err) return done(err); assert.strictEqual('baz', groupObj.description); @@ -217,7 +217,7 @@ describe('Groups', function() { }, function(err) { if (err) return done(err); - Groups.get('foobar?', {}, function(err, groupObj) { + Groups.get('updateTestGroup?', {}, function(err, groupObj) { if (err) return done(err); assert.strictEqual('updateTestGroup?', groupObj.name); From 9d62709f7cea88040197b8ee7bbb7c54184c2d2e Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Mar 2015 22:59:12 -0400 Subject: [PATCH 872/897] doggy.gif --- src/groups.js | 12 +++++++----- src/meta.js | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/groups.js b/src/groups.js index a3d4b0c933..43a376106f 100644 --- a/src/groups.js +++ b/src/groups.js @@ -440,7 +440,6 @@ var async = require('async'), return ephemeralGroups.indexOf(slug) !== -1; })); }, - async.apply(db.isObjectFields, 'groupslug:groupname', slugs), async.apply(db.isSortedSetMembers, 'groups:createtime', name) ], function(err, results) { if (err) { @@ -448,7 +447,7 @@ var async = require('async'), } callback(null, results.map(function(result) { - return result[0] || result[1] || result[2]; + return result[0] || result[1]; })); }); } else { @@ -457,16 +456,19 @@ var async = require('async'), function(next) { next(null, ephemeralGroups.indexOf(slug) !== -1); }, - async.apply(db.isObjectField, 'groupslug:groupname', slug), async.apply(db.isSortedSetMember, 'groups:createtime', name) ], function(err, results) { - callback(err, !err ? (results[0] || results[1] || results[2]) : null); + callback(err, !err ? (results[0] || results[1]) : null); }); } }; Groups.existsBySlug = function(slug, callback) { - db.isObjectField('groupslug:groupname', slug, callback); + if (Array.isArray(slug)) { + db.isObjectFields('groupslug:groupName', slug, callback); + } else { + db.isObjectField('groupslug:groupname', slug, callback); + } }; Groups.create = function(data, callback) { diff --git a/src/meta.js b/src/meta.js index b58ac1a9b2..4aa65f6719 100644 --- a/src/meta.js +++ b/src/meta.js @@ -29,7 +29,7 @@ var async = require('async'), Meta.userOrGroupExists = function(slug, callback) { async.parallel([ async.apply(user.exists, slug), - async.apply(groups.exists, slug) + async.apply(groups.existsBySlug, slug) ], function(err, results) { callback(err, results ? results.some(function(result) { return result; }) : false); }); From ea91518f30ead3ff11ca432ff680f23ba91805bd Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 19 Mar 2015 23:03:32 -0400 Subject: [PATCH 873/897] slugs lowercase duh --- tests/groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/groups.js b/tests/groups.js index 338528d795..a4d5c9da30 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -221,7 +221,7 @@ describe('Groups', function() { if (err) return done(err); assert.strictEqual('updateTestGroup?', groupObj.name); - assert.strictEqual('updateTestGroup', groupObj.slug); + assert.strictEqual('updatetestgroup', groupObj.slug); done(); }); From 7dde2295178e92077522331c176e1da8da39b188 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 20 Mar 2015 12:21:27 -0400 Subject: [PATCH 874/897] added filter:teasers.get --- src/topics/teaser.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/topics/teaser.js b/src/topics/teaser.js index 0d67ad6360..adb4f77b5c 100644 --- a/src/topics/teaser.js +++ b/src/topics/teaser.js @@ -7,6 +7,7 @@ var async = require('async'), db = require('../database'), user = require('../user'), posts = require('../posts'), + plugins = require('../plugins'), utils = require('../../public/src/utils'); @@ -61,7 +62,9 @@ module.exports = function(Topics) { return tidToPost[topic.tid]; }); - callback(null, teasers); + plugins.fireHook('filter:teasers.get', {teasers: teasers}, function(err, data) { + callback(err, data ? data.teasers : null); + }); }); }); }; From c8e0eab34e933ae64178936be5d17fd78b5a9971 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 20 Mar 2015 13:46:05 -0400 Subject: [PATCH 875/897] escape data on room enter --- src/socket.io/meta.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index c801381a1f..21fdeca35e 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -70,6 +70,10 @@ SocketMeta.rooms.enter = function(socket, data, callback) { socket.currentRoom = data.enter; if (data.enter.indexOf('topic') !== -1) { data.uid = socket.uid; + data.picture = validator.escape(data.picture); + data.username = validator.escape(data.username); + data.userslug = validator.escape(data.userslug); + websockets.in(data.enter).emit('event:user_enter', data); } } From 04ed79e587e6639340d8912ca4f982059b22b6bf Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 20 Mar 2015 14:48:19 -0400 Subject: [PATCH 876/897] fix profile image upload on subfolder install --- src/controllers/accounts.js | 4 ++-- src/user.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 8b966fbd26..51cc3daf82 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -356,7 +356,7 @@ accountsController.accountSettings = function(req, res, next) { }, userGroups: function(next) { groups.getUserGroups([userData.uid], next); - }, + }, languages: function(next) { languages.list(next); } @@ -434,7 +434,7 @@ accountsController.uploadPicture = function (req, res, next) { user.setUserFields(updateUid, {uploadedpicture: image.url, picture: image.url}); - res.json([{name: userPhoto.name, url: nconf.get('relative_path') + image.url}]); + res.json([{name: userPhoto.name, url: image.url.startsWith('http') ? image.url : nconf.get('relative_path') + image.url}]); } if (err) { diff --git a/src/user.js b/src/user.js index cb4492765a..2b9c411ab8 100644 --- a/src/user.js +++ b/src/user.js @@ -120,7 +120,7 @@ var async = require('async'), if (user.picture) { if (user.picture === user.uploadedpicture) { - user.picture = user.uploadedpicture = user.picture.indexOf('http') === -1 ? nconf.get('relative_path') + user.picture : user.picture; + user.picture = user.uploadedpicture = user.picture.startsWith('http') ? user.picture : nconf.get('relative_path') + user.picture; } else { user.picture = User.createGravatarURLFromEmail(user.email); } From 38726243feea12afdd4a85c468bd00efb502ae7a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 20 Mar 2015 16:13:34 -0400 Subject: [PATCH 877/897] closes #2879 --- public/src/client/topic/postTools.js | 20 ++++++++++++-------- src/topics/create.js | 22 +++++++--------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index a54f3f894f..4e561b036c 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -72,16 +72,26 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com } function addPostHandlers(tid, threadState) { + function canPost() { + return !threadState.locked || app.user.isAdmin; + } + var postContainer = components.get('topic'); postContainer.on('click', '[component="post/quote"]', function() { - if (!threadState.locked) { + if (canPost()) { onQuoteClicked($(this), tid, topicName); } }); postContainer.on('click', '[component="post/reply"]', function() { - if (!threadState.locked) { + if (canPost()) { + onReplyClicked($(this), tid, topicName); + } + }); + + components.get('topic/reply').on('click', function() { + if (canPost()) { onReplyClicked($(this), tid, topicName); } }); @@ -125,12 +135,6 @@ define('forum/topic/postTools', ['composer', 'share', 'navigator'], function(com postContainer.on('click', '[component="user/chat"]', function(e) { openChat($(this)); }); - - components.get('topic/reply').on('click', function() { - if (!threadState.locked) { - onReplyClicked($(this), tid, topicName); - } - }); } function onReplyClicked(button, tid, topicName) { diff --git a/src/topics/create.js b/src/topics/create.js index 36a73948d7..5988f637e2 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -93,7 +93,6 @@ module.exports = function(Topics) { Topics.post = function(data, callback) { var uid = data.uid, - handle = data.handle, title = data.title, content = data.content, cid = data.cid; @@ -135,7 +134,7 @@ module.exports = function(Topics) { Topics.create({uid: uid, title: title, cid: cid, thumb: data.thumb, tags: data.tags}, next); }, function(tid, next) { - Topics.reply({uid:uid, tid:tid, handle: handle, content:content, req: data.req}, next); + Topics.reply({uid:uid, tid:tid, handle: data.handle, content:content, req: data.req}, next); }, function(postData, next) { async.parallel({ @@ -185,30 +184,23 @@ module.exports = function(Topics) { Topics.reply = function(data, callback) { var tid = data.tid, uid = data.uid, - toPid = data.toPid, - handle = data.handle, content = data.content, postData; async.waterfall([ function(next) { async.parallel({ - exists: function(next) { - Topics.exists(tid, next); - }, - locked: function(next) { - Topics.isLocked(tid, next); - }, - canReply: function(next) { - privileges.topics.can('topics:reply', tid, uid, next); - } + exists: async.apply(Topics.exists, tid), + locked: async.apply(Topics.isLocked, tid), + canReply: async.apply(privileges.topics.can, 'topics:reply', tid, uid), + isAdmin: async.apply(user.isAdministrator, uid) }, next); }, function(results, next) { if (!results.exists) { return next(new Error('[[error:no-topic]]')); } - if (results.locked) { + if (results.locked && !results.isAdmin) { return next(new Error('[[error:topic-locked]]')); } if (!results.canReply) { @@ -229,7 +221,7 @@ module.exports = function(Topics) { checkContentLength(content, next); }, function(next) { - posts.create({uid: uid, tid: tid, handle: handle, content: content, toPid: toPid, ip: data.req ? data.req.ip : null}, next); + posts.create({uid: uid, tid: tid, handle: data.handle, content: content, toPid: data.toPid, ip: data.req ? data.req.ip : null}, next); }, function(data, next) { postData = data; From 4c31535c4bbd841d9ef37cd70c3ef6b8b90bc080 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 20 Mar 2015 18:47:08 -0400 Subject: [PATCH 878/897] closes #2799 --- public/src/modules/notifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 52e4c42c8c..43ba05ed1b 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -48,7 +48,7 @@ define('notifications', ['sounds'], function(sound) { }); }); - notifList.on('click', '.mark-all-read', function() { + notifContainer.on('click', '.mark-all-read', function() { socket.emit('notifications.markAllRead', function(err) { if (err) { app.alertError(err.message); From 810d3be5126fd83c753841d932d3f4178d2f9057 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 20 Mar 2015 19:36:18 -0400 Subject: [PATCH 879/897] closes #2593 --- public/src/utils.js | 12 +++++ src/meta/css.js | 111 ++++++++++++++++++++++++++++++-------------- src/meta/js.js | 2 +- 3 files changed, 90 insertions(+), 35 deletions(-) diff --git a/public/src/utils.js b/public/src/utils.js index 0c58817411..b48b4345ae 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -365,6 +365,18 @@ } return i < 0; }; + + String.prototype.endsWith = function(suffix) { + if (this.length < suffix.length) { + return false; + } + var len = this.length; + var suffixLen = suffix.length; + for (var i=1; (i <= suffixLen && this[len - i] === suffix[suffixLen - i]); ++i) { + continue; + } + return i > suffixLen; + }; } if ('undefined' !== typeof window) { diff --git a/src/meta/css.js b/src/meta/css.js index d45b61f280..a8682b1038 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -10,7 +10,8 @@ var winston = require('winston'), plugins = require('../plugins'), emitter = require('../emitter'), - db = require('../database'); + db = require('../database'), + utils = require('../../public/src/utils'); module.exports = function(Meta) { @@ -21,30 +22,46 @@ module.exports = function(Meta) { Meta.css.defaultBranding = {}; Meta.css.minify = function(callback) { - if (nconf.get('isPrimary') === 'true') { - winston.verbose('[meta/css] Minifying LESS/CSS'); - db.getObjectFields('config', ['theme:type', 'theme:id'], function(err, themeData) { - var themeId = (themeData['theme:id'] || 'nodebb-theme-vanilla'), - baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-vanilla')), - paths = [ - baseThemePath, - path.join(__dirname, '../../node_modules'), - path.join(__dirname, '../../public/vendor/fontawesome/less'), - path.join(__dirname, '../../public/vendor/bootstrap/less') - ], - source = '@import "font-awesome";', - acpSource, - x; - - - plugins.lessFiles = filterMissingFiles(plugins.lessFiles); - for(x=0; x Date: Fri, 20 Mar 2015 19:42:59 -0400 Subject: [PATCH 880/897] fix endsWith if check --- public/src/utils.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/src/utils.js b/public/src/utils.js index b48b4345ae..930e03501f 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -365,7 +365,9 @@ } return i < 0; }; + } + if (typeof String.prototype.endsWith != 'function') { String.prototype.endsWith = function(suffix) { if (this.length < suffix.length) { return false; From 4ec43f662c4459abecad8d3d1dc148dc1802c18f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 21 Mar 2015 13:10:23 -0400 Subject: [PATCH 881/897] don't actually need to restart nodebb to apply skins --- public/src/admin/appearance/skins.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js index b67842b1b5..374b88a7b4 100644 --- a/public/src/admin/appearance/skins.js +++ b/public/src/admin/appearance/skins.js @@ -32,12 +32,9 @@ define('admin/appearance/skins', function() { app.alert({ alert_id: 'admin:theme', type: 'info', - title: 'Theme Changed', - message: 'Please restart your NodeBB to fully activate this theme', - timeout: 5000, - clickfn: function() { - socket.emit('admin.restart'); - } + title: 'Skin Updated', + message: themeId + ' skin was successfully applied', + timeout: 5000 }); }); } From 9754dc8be073368bec56357e169db74671efe7b0 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Sat, 21 Mar 2015 15:32:07 -0400 Subject: [PATCH 882/897] open user link in new tab --- src/views/admin/advanced/events.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index d5942f4225..747f9e03db 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -10,7 +10,7 @@
    #{events.eid} {events.type} - {events.user.username} (uid {events.user.uid}) (IP {events.ip}) + {events.user.username} (uid {events.user.uid}) (IP {events.ip}) {events.timestampISO} 

    {events.jsonString}
    From 7c9e76132d3576ca59901b7f6768c8e62e383da9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 23 Mar 2015 14:42:17 -0400 Subject: [PATCH 883/897] topic/follow component fix --- public/src/client/topic/threadTools.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 0d10cd844c..fe8bc1fcfb 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -60,7 +60,10 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func fork.init(); - components.get('topic').on('click', '[component="topic/follow"]', function() { + components.get('topic').on('click', '[component="topic/follow"]', follow); + components.get('topic/follow').off('click').on('click', follow); + + function follow() { socket.emit('topics.toggleFollow', tid, function(err, state) { if(err) { return app.alert({ @@ -83,7 +86,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func }); return false; - }); + } }; function topicCommand(command, tid) { From b268927cf98049cc6a0e6197d87e51981d34798c Mon Sep 17 00:00:00 2001 From: barisusakli Date: Mon, 23 Mar 2015 19:32:32 -0400 Subject: [PATCH 884/897] removedu if from filter:parse,post, parse strip teaser content --- src/postTools.js | 8 ++++---- src/posts.js | 2 +- src/posts/summary.js | 2 +- src/socket.io/posts.js | 4 ++-- src/topics/create.js | 2 +- src/topics/teaser.js | 33 ++++++++++++++++++++++----------- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/postTools.js b/src/postTools.js index 647d796841..cb3b1da938 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -120,7 +120,7 @@ var cache = LRU({ }, postData: function(next) { cache.del(postData.pid); - PostTools.parsePost(postData, data.uid, next); + PostTools.parsePost(postData, next); } }, function(err, results) { if (err) { @@ -176,7 +176,7 @@ var cache = LRU({ if (err) { return callback(err); } - PostTools.parsePost(postData, uid, callback); + PostTools.parsePost(postData, callback); }); } }); @@ -192,7 +192,7 @@ var cache = LRU({ }); }; - PostTools.parsePost = function(postData, uid, callback) { + PostTools.parsePost = function(postData, callback) { postData.content = postData.content || ''; var cachedContent = cache.get(postData.pid); @@ -201,7 +201,7 @@ var cache = LRU({ return callback(null, postData); } - plugins.fireHook('filter:parse.post', {postData: postData, uid: uid}, function(err, data) { + plugins.fireHook('filter:parse.post', {postData: postData}, function(err, data) { if (err) { return callback(err); } diff --git a/src/posts.js b/src/posts.js index 2c7ca82737..53931d75f7 100644 --- a/src/posts.js +++ b/src/posts.js @@ -52,7 +52,7 @@ var async = require('async'), postData.relativeTime = utils.toISOString(postData.timestamp); postData.relativeEditTime = parseInt(postData.edited, 10) !== 0 ? utils.toISOString(postData.edited) : ''; - postTools.parsePost(postData, uid, next); + postTools.parsePost(postData, next); }, function(err, posts) { if (err) { return callback(err); diff --git a/src/posts/summary.js b/src/posts/summary.js index 962a51aaa6..6d098cd829 100644 --- a/src/posts/summary.js +++ b/src/posts/summary.js @@ -86,7 +86,7 @@ module.exports = function(Posts) { return next(null, post); } - postTools.parsePost(post, uid, function(err, post) { + postTools.parsePost(post, function(err, post) { if (err) { return next(err); } diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index b49e796e7a..94f6be7a37 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -232,7 +232,7 @@ SocketPosts.sendNotificationToPostOwner = function(pid, fromuid, notification) { async.parallel({ username: async.apply(user.getUserField, fromuid, 'username'), topicTitle: async.apply(topics.getTopicField, postData.tid, 'title'), - postObj: async.apply(postTools.parsePost, postData, postData.uid) + postObj: async.apply(postTools.parsePost, postData) }, function(err, results) { if (err) { return; @@ -479,7 +479,7 @@ SocketPosts.flag = function(socket, pid, callback) { function(topic, next) { post.topic = topic; message = '[[notifications:user_flagged_post_in, ' + userName + ', ' + topic.title + ']]'; - postTools.parsePost(post, socket.uid, next); + postTools.parsePost(post, next); }, function(post, next) { async.parallel({ diff --git a/src/topics/create.js b/src/topics/create.js index 5988f637e2..f7af1d0c5e 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -245,7 +245,7 @@ module.exports = function(Topics) { posts.getPidIndex(postData.pid, uid, next); }, content: function(next) { - postTools.parsePost(postData, uid, next); + postTools.parsePost(postData, next); } }, next); }, diff --git a/src/topics/teaser.js b/src/topics/teaser.js index adb4f77b5c..5946eef988 100644 --- a/src/topics/teaser.js +++ b/src/topics/teaser.js @@ -3,11 +3,13 @@ 'use strict'; var async = require('async'), + S = require('string'), db = require('../database'), user = require('../user'), posts = require('../posts'), plugins = require('../plugins'), + postTools = require('../postTools'), utils = require('../../public/src/utils'); @@ -49,21 +51,30 @@ module.exports = function(Topics) { users[user.uid] = user; }); var tidToPost = {}; - postData.forEach(function(post) { + + async.each(postData, function(post, next) { post.user = users[post.uid]; post.timestamp = utils.toISOString(post.timestamp); tidToPost[post.tid] = post; - }); - - var teasers = topics.map(function(topic, index) { - if (tidToPost[topic.tid]) { - tidToPost[topic.tid].index = counts[index]; + postTools.parsePost(post, next); + }, function(err) { + if (err) { + return callback(err); } - return tidToPost[topic.tid]; - }); - - plugins.fireHook('filter:teasers.get', {teasers: teasers}, function(err, data) { - callback(err, data ? data.teasers : null); + var teasers = topics.map(function(topic, index) { + if (tidToPost[topic.tid]) { + tidToPost[topic.tid].index = counts[index]; + if (tidToPost[topic.tid].content) { + var s = S(tidToPost[topic.tid].content); + tidToPost[topic.tid].content = s.stripTags.apply(s, utils.stripTags).s; + } + } + return tidToPost[topic.tid]; + }); + + plugins.fireHook('filter:teasers.get', {teasers: teasers}, function(err, data) { + callback(err, data ? data.teasers : null); + }); }); }); }); From 06d547a6cba1972595a3f58189f325c692f20e56 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 24 Mar 2015 10:51:32 -0400 Subject: [PATCH 885/897] fixed bug in privilege settings where categories near the end of a list were not having their permissions read properly if earlier categories were disabled, #2887 --- src/privileges/categories.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/privileges/categories.js b/src/privileges/categories.js index 4a623eaa27..ca7542960c 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -101,18 +101,19 @@ module.exports = function(privileges) { return callback(err); } - cids = cids.filter(function(cid, index) { - return !results.categories[index].disabled; + cids = cids.map(function(cid, index) { + return !results.categories[index].disabled ? cid : null; }); if (results.isAdmin) { - return callback(null, cids); + return callback(null, cids.filter(Boolean)); } - cids = cids.filter(function(cid, index) { - return results.allowedTo[index] || results.isModerators[index]; + cids = cids.map(function(cid, index) { + return (results.allowedTo[index] || results.isModerators[index]) ? cid : null; }); - callback(null, cids); + + callback(null, cids.filter(Boolean)); }); }; From fc28cbf8878d4709c6396848c3ac51c188712c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 24 Mar 2015 10:59:21 -0400 Subject: [PATCH 886/897] filter cids with a single .filter thanks @julianlam --- src/privileges/categories.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/privileges/categories.js b/src/privileges/categories.js index ca7542960c..67d71d1002 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -101,16 +101,9 @@ module.exports = function(privileges) { return callback(err); } - cids = cids.map(function(cid, index) { - return !results.categories[index].disabled ? cid : null; - }); - - if (results.isAdmin) { - return callback(null, cids.filter(Boolean)); - } - - cids = cids.map(function(cid, index) { - return (results.allowedTo[index] || results.isModerators[index]) ? cid : null; + cids = cids.filter(function(cid, index) { + return !results.categories[index].disabled || + (results.allowedTo[index] || results.isAdmin || results.isModerators[index]); }); callback(null, cids.filter(Boolean)); From 4dbb1c08b6ac979b10b8c1bc43681e4475bc6da0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 24 Mar 2015 11:08:02 -0400 Subject: [PATCH 887/897] added default host port and db settings for mongo, if not set in config file --- src/database/mongo.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/database/mongo.js b/src/database/mongo.js index f97eeb6651..8d18f94a80 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -59,6 +59,17 @@ usernamePassword = nconf.get('mongo:username') + ':' + nconf.get('mongo:password') + '@'; } + // Sensible defaults for Mongo, if not set + if (!nconf.get('mongo:host')) { + nconf.set('mongo:host', '127.0.0.1'); + } + if (!nconf.get('mongo:port')) { + nconf.set('mongo:port', 27017); + } + if (!nconf.get('mongo:database')) { + nconf.set('mongo:database', '0'); + } + var connString = 'mongodb://' + usernamePassword + nconf.get('mongo:host') + ':' + nconf.get('mongo:port') + '/' + nconf.get('mongo:database'); var connOptions = { server: { From 705111a1d98c634cbf99398bc51cb250c57bd217 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Mar 2015 12:21:04 -0400 Subject: [PATCH 888/897] chat/icon component --- public/src/client/footer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/footer.js b/public/src/client/footer.js index 6462e3e39a..4e7c2fa9ee 100644 --- a/public/src/client/footer.js +++ b/public/src/client/footer.js @@ -22,7 +22,7 @@ define('forum/footer', ['notifications', 'chat'], function(Notifications, Chat) return console.warn('Error updating unread count', err); } - $('#chat-count') + components.get('chat/icon') .toggleClass('unread-count', count > 0) .attr('data-content', count > 20 ? '20+' : count); } From 29fd89407c2e9958d656302430134cbaaa9d23e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 24 Mar 2015 12:55:27 -0400 Subject: [PATCH 889/897] closes #2872 show the last posts content and user in topic feeds --- src/routes/feeds.js | 53 +++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/src/routes/feeds.js b/src/routes/feeds.js index 58d44cbce5..86d9cbb82d 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -212,47 +212,30 @@ function generateForTopics(options, set, req, res, next) { } function generateTopicsFeed(feedOptions, feedTopics, callback) { - var tids = feedTopics.map(function(topic) { - return topic ? topic.tid : null; - }); - - topics.getMainPids(tids, function(err, pids) { - if (err) { - return callback(err); - } - posts.getPostsFields(pids, ['content'], function(err, posts) { - if (err) { - return callback(err); - } - feedTopics.forEach(function(topic, index) { - if (topic && posts[index]) { - topic.mainPost = posts[index].content; - } - }); - - feedOptions.ttl = 60; - feedOptions.feed_url = nconf.get('url') + feedOptions.feed_url; - feedOptions.site_url = nconf.get('url') + feedOptions.site_url; + feedOptions.ttl = 60; + feedOptions.feed_url = nconf.get('url') + feedOptions.feed_url; + feedOptions.site_url = nconf.get('url') + feedOptions.site_url; - var feed = new rss(feedOptions); + var feed = new rss(feedOptions); - if (feedTopics.length > 0) { - feed.pubDate = new Date(parseInt(feedTopics[0].lastposttime, 10)).toUTCString(); - } + if (feedTopics.length > 0) { + feed.pubDate = new Date(parseInt(feedTopics[0].lastposttime, 10)).toUTCString(); + } - feedTopics.forEach(function(topicData) { - feed.item({ - title: topicData.title, - description: topicData.mainPost, - url: nconf.get('url') + '/topic/' + topicData.slug, - author: topicData.username, - date: new Date(parseInt(topicData.lastposttime, 10)).toUTCString() - }); + feedTopics.forEach(function(topicData) { + if (topicData && topicData.teaser && topicData.teaser.user) { + feed.item({ + title: topicData.title, + description: topicData.teaser.content, + url: nconf.get('url') + '/topic/' + topicData.slug, + author: topicData.teaser.user.username, + date: new Date(parseInt(topicData.lastposttime, 10)).toUTCString() }); - callback(null, feed); - }); + } }); + callback(null, feed); + } function generateForRecentPosts(req, res, next) { From d39c2924e4b0daf0972bc8fae64d71fcd2006dd7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Mar 2015 12:55:49 -0400 Subject: [PATCH 890/897] found a rogue topic class selector --- public/src/modules/navigator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index 697046bd28..f4f4d74a59 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -223,9 +223,9 @@ define('navigator', ['forum/pagination'], function(pagination) { function highlightPost() { if (highlight) { - scrollTo.parent().find('.topic-item').addClass('highlight'); + scrollTo.parents('[component="post"]').addClass('highlight'); setTimeout(function() { - scrollTo.parent().find('.topic-item').removeClass('highlight'); + scrollTo.parents('[component="post"]').removeClass('highlight'); }, 3000); } } From c7b5cd48bae54f67fe93e523f53aeb86587092fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 24 Mar 2015 13:10:10 -0400 Subject: [PATCH 891/897] closes #2773 --- src/topics/unread.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/topics/unread.js b/src/topics/unread.js index e6910b9b5a..be4a548226 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -12,6 +12,8 @@ var async = require('async'), module.exports = function(Topics) { + var unreadCutoff = 86400000; + Topics.getTotalUnread = function(uid, callback) { Topics.getUnreadTids(uid, 0, 20, function(err, tids) { callback(err, tids ? tids.length : 0); @@ -54,17 +56,17 @@ module.exports = function(Topics) { return callback(null, []); } - var yesterday = Date.now() - 86400000; + var cutoff = Date.now() - unreadCutoff; async.parallel({ ignoredCids: function(next) { user.getIgnoredCategories(uid, next); }, recentTids: function(next) { - db.getSortedSetRevRangeByScoreWithScores('topics:recent', 0, -1, '+inf', yesterday, next); + db.getSortedSetRevRangeByScoreWithScores('topics:recent', 0, -1, '+inf', cutoff, next); }, userScores: function(next) { - db.getSortedSetRevRangeByScoreWithScores('uid:' + uid + ':tids_read', 0, -1, '+inf', yesterday, next); + db.getSortedSetRevRangeByScoreWithScores('uid:' + uid + ':tids_read', 0, -1, '+inf', cutoff, next); } }, function(err, results) { if (err) { @@ -247,8 +249,9 @@ module.exports = function(Topics) { if (err) { return callback(err); } + var cutoff = Date.now() - unreadCutoff; var result = tids.map(function(tid, index) { - return !!(results.userScores[index] && results.userScores[index] >= results.recentScores[index]); + return results.recentScores[index] < cutoff || !!(results.userScores[index] && results.userScores[index] >= results.recentScores[index]); }); callback(null, result); From 203d4d052ab01569f9a97aef51d41efeb7c545f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 24 Mar 2015 13:21:54 -0400 Subject: [PATCH 892/897] fixed my logic fail --- src/privileges/categories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/privileges/categories.js b/src/privileges/categories.js index 67d71d1002..d2f4938a7b 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -102,7 +102,7 @@ module.exports = function(privileges) { } cids = cids.filter(function(cid, index) { - return !results.categories[index].disabled || + return !results.categories[index].disabled && (results.allowedTo[index] || results.isAdmin || results.isModerators[index]); }); From fcbc02d48a4d3cc0babd6d23ead9b50f5fc51e8b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 24 Mar 2015 13:47:47 -0400 Subject: [PATCH 893/897] better local function name in install.js --- src/install.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/install.js b/src/install.js index ded2921a0b..be1c322267 100644 --- a/src/install.js +++ b/src/install.js @@ -234,13 +234,13 @@ function setupDefaultConfigs(next) { }); if (install.values) { - setOnEmpty('social:twitter:key', 'social:twitter:secret'); - setOnEmpty('social:google:id', 'social:google:secret'); - setOnEmpty('social:facebook:app_id', 'social:facebook:secret'); + setIfPaired('social:twitter:key', 'social:twitter:secret'); + setIfPaired('social:google:id', 'social:google:secret'); + setIfPaired('social:facebook:app_id', 'social:facebook:secret'); } } -function setOnEmpty(key1, key2) { +function setIfPaired(key1, key2) { var meta = require('./meta'); if (install.values[key1] && install.values[key2]) { meta.configs.setOnEmpty(key1, install.values[key1]); From 11710987a4a6ada1022f72f5258d63680c2744ad Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Mar 2015 14:19:47 -0400 Subject: [PATCH 894/897] fixed navigator pagination --- public/src/client/topic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic.js b/public/src/client/topic.js index cbf4074d4f..f28a9097c8 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -53,7 +53,7 @@ define('forum/topic', [ handleBookmark(tid); - navigator.init(components.get('post'), ajaxify.variables.get('postcount'), Topic.toTop, Topic.toBottom, Topic.navigatorCallback, Topic.calculateIndex); + navigator.init('[component="post"]', ajaxify.variables.get('postcount'), Topic.toTop, Topic.toBottom, Topic.navigatorCallback, Topic.calculateIndex); $(window).on('scroll', updateTopicTitle); From 0fcd4dee584d5bf8752ee3e7262297341830bcbb Mon Sep 17 00:00:00 2001 From: EvSpirit Date: Tue, 24 Mar 2015 21:39:28 +0300 Subject: [PATCH 895/897] #2886 Check subcategories when showing category recent topics --- src/categories/recentreplies.js | 3 ++- src/posts/summary.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js index 596bd6882e..11b16897fc 100644 --- a/src/categories/recentreplies.js +++ b/src/categories/recentreplies.js @@ -61,7 +61,8 @@ module.exports = function(Categories) { function assignPostsToCategory(category, posts) { category.posts = posts.filter(function(post) { - return post.category && parseInt(post.category.cid, 10) === parseInt(category.cid, 10); + return !!(post.category && (parseInt(post.category.cid, 10) === parseInt(category.cid, 10) + ) || (parseInt(post.category.parentCid, 10) === parseInt(category.cid, 10))); }).sort(function(a, b) { return b.timestamp - a.timestamp; }).slice(0, parseInt(category.numRecentReplies, 10)); diff --git a/src/posts/summary.js b/src/posts/summary.js index 6d098cd829..15f2f645ad 100644 --- a/src/posts/summary.js +++ b/src/posts/summary.js @@ -120,7 +120,7 @@ module.exports = function(Posts) { return topic && array.indexOf(topic) === index; }); - categories.getMultipleCategoryFields(cids, ['cid', 'name', 'icon', 'slug'], function(err, categories) { + categories.getMultipleCategoryFields(cids, ['cid', 'name', 'icon', 'slug', 'parentCid'], function(err, categories) { callback(err, {topics: topics, categories: categories}); }); }); From 2ea840e65dc0925271403f2e402ec0f8399c008a Mon Sep 17 00:00:00 2001 From: EvSpirit Date: Tue, 24 Mar 2015 21:58:35 +0300 Subject: [PATCH 896/897] #2886 Check subcategories when showing category recent topics --- src/categories/recentreplies.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js index 11b16897fc..bd6871ce99 100644 --- a/src/categories/recentreplies.js +++ b/src/categories/recentreplies.js @@ -61,8 +61,8 @@ module.exports = function(Categories) { function assignPostsToCategory(category, posts) { category.posts = posts.filter(function(post) { - return !!(post.category && (parseInt(post.category.cid, 10) === parseInt(category.cid, 10) - ) || (parseInt(post.category.parentCid, 10) === parseInt(category.cid, 10))); + return post.category && (parseInt(post.category.cid, 10) === parseInt(category.cid, 10) + || parseInt(post.category.parentCid, 10) === parseInt(category.cid, 10)); }).sort(function(a, b) { return b.timestamp - a.timestamp; }).slice(0, parseInt(category.numRecentReplies, 10)); From f928b87997f2d7f9fa405482506f9dcede0f0b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 24 Mar 2015 15:46:15 -0400 Subject: [PATCH 897/897] use component, add user.watch title --- public/language/en_GB/pages.json | 1 + public/src/client/account/topics.js | 4 ++-- public/src/client/account/watched.js | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/language/en_GB/pages.json b/public/language/en_GB/pages.json index 4095ae38a3..74e24a2e79 100644 --- a/public/language/en_GB/pages.json +++ b/public/language/en_GB/pages.json @@ -14,6 +14,7 @@ "user.groups": "%1's Groups", "user.favourites": "%1's Favourite Posts", "user.settings": "User Settings", + "user.watched": "Topics watched by %1", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.messageIntro": "Additionally, the administrator has left this message:" diff --git a/public/src/client/account/topics.js b/public/src/client/account/topics.js index 3d3923ceef..c6c93f4262 100644 --- a/public/src/client/account/topics.js +++ b/public/src/client/account/topics.js @@ -18,12 +18,12 @@ define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], infinitescroll.loadMore('topics.loadMoreFromSet', { set: 'uid:' + $('.account-username-box').attr('data-uid') + ':topics', - after: $('.user-topics').attr('data-nextstart') + after: $('[component="category"]').attr('data-nextstart') }, function(data, done) { if (data.topics && data.topics.length) { onTopicsLoaded(data.topics, done); - $('.user-topics').attr('data-nextstart', data.nextStart); + $('[component="category"]').attr('data-nextstart', data.nextStart); } else { done(); } diff --git a/public/src/client/account/watched.js b/public/src/client/account/watched.js index c9d4bed788..08feb89344 100644 --- a/public/src/client/account/watched.js +++ b/public/src/client/account/watched.js @@ -17,11 +17,11 @@ define('forum/account/watched', ['forum/account/header', 'forum/infinitescroll'] infinitescroll.loadMore('topics.loadMoreFromSet', { set: 'uid:' + $('.account-username-box').attr('data-uid') + ':followed_tids', - after: $('.user-topics').attr('data-nextstart') + after: $('[component="category"]').attr('data-nextstart') }, function(data, done) { if (data.topics && data.topics.length) { onTopicsLoaded(data.topics, done); - $('.user-topics').attr('data-nextstart', data.nextStart); + $('[component="category"]').attr('data-nextstart', data.nextStart); } else { done(); }