fix email language select

Author: visualjerk

email-templates/account/reset-password/de/html.hbs

@@ -20,12 +20,12 @@
 			</tr>
 			<tr>
 				<td class="aligncenter content-block">
-					Wenn du diese Nachricht ignorierst bleibt dein Passwort, wie es ist.
+					Wenn du diese Nachricht ignorierst, bleibt dein Passwort wie es ist.
 				</td>
 			</tr>
 			<tr>
 				<td class="aligncenter content-block" itemprop="handler" itemscope itemtype="http://schema.org/HttpActionHandler">
-          Wenn du es nicht warst, der dein Passwort zurücksetzen wollte <a href='mailto:{{returnEmail}}?subject=I did not reset my password&body=Someone unauthorized sent this reset password request.'>lass es uns wissen!</a>
+          Wenn du es nicht warst, der dein Passwort zurücksetzen wollte, <a href='mailto:{{returnEmail}}?subject=I did not reset my password&body=Someone unauthorized sent this reset password request.'>lass es uns wissen!</a>
 				</td>
 			</tr>
 			<tr>

server/services/auth-management/notifier.js

@@ -37,11 +37,14 @@ module.exports = function (app) {
       )
     );
 
+    let language = user.userSettings && user.userSettings.uiLanguage ?
+      user.userSettings.uiLanguage : 'en';
+
     const templatePath = path.join(
       __dirname,
       '../../../email-templates/account',
       templatename,
-      user.language || 'en'
+      language
     );
 
     let token;

server/services/users/users.hooks.js

@@ -49,12 +49,25 @@ const candosSchema = {
   }
 };
 
+const userSettingsPrivateSchema = {
+  include: {
+    service: 'usersettings',
+    nameAs: 'userSettings',
+    parentField: '_id',
+    childField: 'userId',
+    asArray: false
+  }
+};
+
 const userSettingsSchema = {
   include: {
     service: 'usersettings',
     nameAs: 'userSettings',
     parentField: '_id',
     childField: 'userId',
+    query: {
+      $select: ['uiLanguage', 'contentLanguages'],
+    },
     asArray: false
   }
 };
@@ -139,6 +152,7 @@ module.exports = {
     all: [
       populate({ schema: badgesSchema }),
       populate({ schema: candosSchema }),
+      populate({ schema: userSettingsSchema }),
       cleanupBasicData
     ],
     find: [
@@ -147,15 +161,12 @@ module.exports = {
     ],
     get: [
       thumbnails(thumbnailOptions),
-
       // remove personal data if its not the current authenticated user
-      iff(isProvider('external'),
-        when(isOwnEntry(false), [
-          cleanupPersonalData
-        ])
+      iff(isOwnEntry(false),
+        cleanupPersonalData,
       ),
       iff(isOwnEntry(),
-        populate({ schema: userSettingsSchema })
+        populate({ schema: userSettingsPrivateSchema })
       )
     ],
     create: [