Merge branch 'master' into frontend-next

1 files changed, 3 insertions, 2 deletions

diff --git a/app.js b/app.js
index c6ee8ace..f096ab64 100644
--- a/app.js
+++ b/app.js
@@ -11,6 +11,7 @@ var compression = require('compression')
 var session = require('express-session');
 var SequelizeStore = require('connect-session-sequelize')(session.Store);
 var fs = require('fs');
+var url = require('url');
 var path = require('path');
 var imgur = require('imgur');
 var formidable = require('formidable');
@@ -102,7 +103,7 @@ app.use(helmet.hsts({
 }));
 
 i18n.configure({
-    locales: ['en', 'zh', 'fr', 'de', 'ja', 'es', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv'],
+    locales: ['en', 'zh', 'fr', 'de', 'ja', 'es', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv', 'eo'],
     cookie: 'locale',
     directory: __dirname + '/locales'
 });
@@ -487,7 +488,7 @@ app.post('/uploadimage', function (req, res) {
                 switch (config.imageUploadType) {
                 case 'filesystem':
                     res.send({
-                        link: path.join(config.serverurl, files.image.path.match(/^public(.+$)/)[1])
+                        link: url.resolve(config.serverurl, files.image.path.match(/^public(.+$)/)[1])
                     });
 
                     break;