diff --git a/config/env/torrents.js b/config/env/torrents.js
index e3f434eb..b315fd7d 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -55,8 +55,8 @@ module.exports = {
*
*/
language: [
- {name: 'en', index: 0, class: 'flag-icon-gb', title: 'English'},
- {name: 'zh', index: 1, class: 'flag-icon-cn', title: '中文'}
+ {name: 'zh', index: 0, class: 'flag-icon-cn', title: '中文'},
+ {name: 'en', index: 1, class: 'flag-icon-gb', title: 'English'}
],
/**
diff --git a/config/lib/common.js b/config/lib/common.js
index 5e7f1ea1..b8e2d4b0 100644
--- a/config/lib/common.js
+++ b/config/lib/common.js
@@ -6,6 +6,7 @@ var path = require('path'),
var querystring = require('querystring');
var examinationConfig = config.meanTorrentConfig.examination;
+var languageConfig = config.meanTorrentConfig.language;
/**
* binaryToHex
@@ -69,3 +70,15 @@ module.exports.examinationIsValid = function (user) {
return false;
}
};
+
+/**
+ * getRequestLanguage
+ * @param req
+ */
+module.exports.getRequestLanguage = function (req) {
+ var mtLang = languageConfig.map(function (l) {
+ return l.name;
+ });
+ var lang = req.acceptsLanguages(mtLang);
+ return lang || 'en';
+};
diff --git a/modules/users/server/controllers/users/users.authentication.server.controller.js b/modules/users/server/controllers/users/users.authentication.server.controller.js
index a0664996..bdbfdfc9 100644
--- a/modules/users/server/controllers/users/users.authentication.server.controller.js
+++ b/modules/users/server/controllers/users/users.authentication.server.controller.js
@@ -5,6 +5,7 @@
*/
var path = require('path'),
config = require(path.resolve('./config/config')),
+ common = require(path.resolve('./config/lib/common')),
errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller')),
mongoose = require('mongoose'),
passport = require('passport'),
@@ -68,7 +69,8 @@ exports.signup = function (req, res) {
user.salt = undefined;
/* send an account active mail */
- res.render(path.resolve('modules/users/server/templates/sign-up-active-email'), {
+ var lang = common.getRequestLanguage(req);
+ res.render(path.resolve('modules/users/server/templates/sign-up-active-email-' + lang), {
name: user.displayName,
appName: config.app.title,
hours: mtConfig.sign.signUpActiveTokenExpires / (60 * 60 * 1000),
diff --git a/modules/users/server/controllers/users/users.password.server.controller.js b/modules/users/server/controllers/users/users.password.server.controller.js
index 2365fe3a..5b86b583 100644
--- a/modules/users/server/controllers/users/users.password.server.controller.js
+++ b/modules/users/server/controllers/users/users.password.server.controller.js
@@ -5,6 +5,7 @@
*/
var path = require('path'),
config = require(path.resolve('./config/config')),
+ common = require(path.resolve('./config/lib/common')),
errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller')),
mongoose = require('mongoose'),
User = mongoose.model('User'),
@@ -77,7 +78,9 @@ exports.forgot = function (req, res, next) {
}
},
function (token, user, done) {
- res.render(path.resolve('modules/users/server/templates/reset-password-email'), {
+ var lang = common.getRequestLanguage(req);
+
+ res.render(path.resolve('modules/users/server/templates/reset-password-email-' + lang), {
name: user.displayName,
appName: config.app.title,
url: appConfig.domain + '/api/auth/reset/' + token
@@ -213,7 +216,9 @@ exports.reset = function (req, res, next) {
});
},
function (user, done) {
- res.render('modules/users/server/templates/reset-password-confirm-email', {
+ var lang = common.getRequestLanguage(req);
+
+ res.render(path.resolve('modules/users/server/templates/reset-password-confirm-email-' + lang), {
name: user.displayName,
appName: config.app.title
}, function (err, emailHTML) {
diff --git a/modules/users/server/templates/reset-password-confirm-email.server.view.html b/modules/users/server/templates/reset-password-confirm-email-en.server.view.html
similarity index 100%
rename from modules/users/server/templates/reset-password-confirm-email.server.view.html
rename to modules/users/server/templates/reset-password-confirm-email-en.server.view.html
diff --git a/modules/users/server/templates/reset-password-confirm-email-zh.server.view.html b/modules/users/server/templates/reset-password-confirm-email-zh.server.view.html
new file mode 100644
index 00000000..a4bac132
--- /dev/null
+++ b/modules/users/server/templates/reset-password-confirm-email-zh.server.view.html
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+ Dear {{name}},
+
+ This is a confirmation that the password for your account has just been changed
+
+
+ The {{appName}} Support Team
+
+
+
diff --git a/modules/users/server/templates/reset-password-email.server.view.html b/modules/users/server/templates/reset-password-email-en.server.view.html
similarity index 100%
rename from modules/users/server/templates/reset-password-email.server.view.html
rename to modules/users/server/templates/reset-password-email-en.server.view.html
diff --git a/modules/users/server/templates/reset-password-email-zh.server.view.html b/modules/users/server/templates/reset-password-email-zh.server.view.html
new file mode 100644
index 00000000..4377bb44
--- /dev/null
+++ b/modules/users/server/templates/reset-password-email-zh.server.view.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+ Dear {{name}},
+
+
+ You have requested to have your password reset for your account at {{appName}}
+
+ Please visit this url to reset your password:
+ {{url}}
+ If you didn't make this request, you can ignore this email.
+
+
+ The {{appName}} Support Team
+
+
+
diff --git a/modules/users/server/templates/sign-up-active-email.server.view.html b/modules/users/server/templates/sign-up-active-email-en.server.view.html
similarity index 100%
rename from modules/users/server/templates/sign-up-active-email.server.view.html
rename to modules/users/server/templates/sign-up-active-email-en.server.view.html
diff --git a/modules/users/server/templates/sign-up-active-email-zh.server.view.html b/modules/users/server/templates/sign-up-active-email-zh.server.view.html
new file mode 100644
index 00000000..0dfe238e
--- /dev/null
+++ b/modules/users/server/templates/sign-up-active-email-zh.server.view.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+ Dear {{name}},
+
+
+ You have requested to sign up and register for your account at {{appName}}
+
+ We should verify your email address, Please visit this url to active your account in {{hours}} hours:
+ {{url}}
+ If you didn't make this request, you can ignore this email.
+
+
+ The {{appName}} Support Team
+
+
+