public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Further work on localization

Browse source
This commit is contained in:
Tomas Bures 2018-12-15 15:15:48 +01:00
parent fa451fc8da
commit cb1fc5b28d
35 changed files with 430 additions and 2796 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/models/files.js
View file

@ -29,7 +29,7 @@ function getFilePath(type, subType, entityId, filename) {
}
function getFileUrl(context, type, subType, entityId, filename) {
return getPublicUrl(`files/${type}/${subType}/${entityId}/${filename}`, context)
return getPublicUrl(`files/${type}/${subType}/${entityId}/${filename}`)
}
function getFilesTable(type, subType) {
@ -109,7 +109,7 @@ async function getFileByFilename(context, type, subType, entityId, name) {
}
async function getFileByUrl(context, url) {
const urlPrefix = getPublicUrl('files/', context);
const urlPrefix = getPublicUrl('files/');
if (url.startsWith(urlPrefix)) {
const path = url.substring(urlPrefix.length);
const pathElem = path.split('/');

11
server/models/users.js
View file

@ -286,7 +286,7 @@ async function resetAccessToken(userId) {
return token;
}
async function sendPasswordReset(language, usernameOrEmail) {
async function sendPasswordReset(locale, usernameOrEmail) {
enforce(passport.isAuthMethodLocal, 'Local user management is required');
await knex.transaction(async tx => {
@ -310,12 +310,13 @@ async function sendPasswordReset(language, usernameOrEmail) {
to: {
address: user.email
},
subject: tUI('mailerPasswordChangeRequest', language)
subject: tUI('mailerPasswordChangeRequest', locale)
}, {
html: 'emails/password-reset-html.hbs',
text: 'emails/password-reset-text.hbs',
html: 'users/password-reset-html.hbs',
text: 'users/password-reset-text.hbs',
locale,
data: {
title: 'Mailtrain',
title: tUI('Mailtrain', locale),
username: user.username,
name: user.name,
confirmUrl: getTrustedUrl(`/account/reset/${encodeURIComponent(user.username)}/${encodeURIComponent(resetToken)}`)