try building, probably fail lint.

cathysarisky · Oct 28, 2024 · c1100c8 · c1100c8
1 parent 3afc818
commit c1100c8
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 29 deletions.
diff --git a/ghost/core/core/server/services/email-service/EmailServiceWrapper.js b/ghost/core/core/server/services/email-service/EmailServiceWrapper.js
@@ -27,7 +27,7 @@ class EmailServiceWrapper {
         const limitService = require('../limits');
         const labs = require('../../../shared/labs');
         const emailAddressService = require('../email-address');
-
+        const i18nLib = require('@tryghost/i18n');
         const mobiledocLib = require('../../lib/mobiledoc');
         const lexicalLib = require('../../lib/lexical');
         const urlUtils = require('../../../shared/url-utils');
@@ -49,6 +49,8 @@ class EmailServiceWrapper {
         const mailgunClient = new MailgunClient({
             config: configService, settings: settingsCache
         });
+        const i18nLanguage = settingsCache.get('locale') || 'en';
+        const i18n = i18nLib(i18nLanguage, 'newsletter');
 
         const mailgunEmailProvider = new MailgunEmailProvider({
             mailgunClient,
@@ -73,7 +75,8 @@ class EmailServiceWrapper {
             outboundLinkTagger: memberAttribution.outboundLinkTagger,
             emailAddressService: emailAddressService.service,
             labs,
-            models: {Post}
+            models: {Post},
+            t: i18n.t.bind(i18n)
         });
 
         const sendingService = new SendingService({

diff --git a/ghost/core/core/server/services/i18n.js b/ghost/core/core/server/services/i18n.js
@@ -2,7 +2,7 @@ const debug = require('@tryghost/debug')('i18n');
 
 /** @type {import('i18next').i18n} */
 let i18nInstance;
-
+let i18nInstanceNewsletter;
 module.exports.init = function () {
     const i18n = require('@tryghost/i18n');
     const events = require('../lib/common/events');
@@ -14,13 +14,19 @@ module.exports.init = function () {
     if (labs.isSet('i18n')) {
         locale = settingsCache.get('locale');
     }
+    i18nInstance = i18n(locale, 'ghost');
+    i18nInstanceNewsletter = i18n(locale, 'newsletter');
 
-    module.exports = i18nInstance = i18n(locale, 'ghost');
+    module.exports = {
+        i18nInstance,
+        i18nInstanceNewsletter
+    };
 
     events.on('settings.labs.edited', () => {
         if (labs.isSet('i18n')) {
             debug('labs i18n enabled, updating i18n to', settingsCache.get('locale'));
             i18nInstance.changeLanguage(settingsCache.get('locale'));
+            i18nInstanceNewsletter.changeLanguage(settingsCache.get('locale'));
         } else {
             debug('labs i18n disabled, updating i18n to en');
             i18nInstance.changeLanguage('en');
@@ -31,6 +37,7 @@ module.exports.init = function () {
         if (labs.isSet('i18n')) {
             debug('locale changed, updating i18n to', model.get('value'));
             i18nInstance.changeLanguage(model.get('value'));
+            i18nInstanceNewsletter.changeLanguage(model.get('value'));
         }
     });
 };
diff --git a/ghost/email-service/i18n-setup.js b/ghost/email-service/i18n-setup.js
diff --git a/ghost/email-service/lib/EmailRenderer.js b/ghost/email-service/lib/EmailRenderer.js
@@ -11,7 +11,6 @@ const tpl = require('@tryghost/tpl');
 const {EmailAddressParser} = require('@tryghost/email-addresses');
 const {registerHelpers} = require('./helpers/register-helpers');
 const crypto = require('crypto');
-const {t, locale} = require('../i18n-setup');
 
 const messages = {
     subscriptionStatus: {
@@ -133,6 +132,7 @@ class EmailRenderer {
     #emailAddressService;
     #labs;
     #models;
+    #t;
 
     /**
      * @param {object} dependencies
@@ -153,6 +153,7 @@ class EmailRenderer {
      * @param {object} dependencies.outboundLinkTagger
      * @param {object} dependencies.labs
      * @param {{Post: object}} dependencies.models
+     * 
      */
     constructor({
         settingsCache,
@@ -169,7 +170,8 @@ class EmailRenderer {
         emailAddressService,
         outboundLinkTagger,
         labs,
-        models
+        models,
+        t
     }) {
         this.#settingsCache = settingsCache;
         this.#settingsHelpers = settingsHelpers;
@@ -186,8 +188,9 @@ class EmailRenderer {
         this.#outboundLinkTagger = outboundLinkTagger;
         this.#labs = labs;
         this.#models = models;
+        this.#t = t;
     }
-
+    
     getSubject(post, isTestEmail = false) {
         const subject = post.related('posts_meta')?.get('email_subject') || post.get('title');
         return isTestEmail ? `[TEST] ${subject}` : subject;
@@ -775,7 +778,7 @@ class EmailRenderer {
         this.#handlebars = require('handlebars').create();
 
         // Register helpers
-        registerHelpers(this.#handlebars, labs);
+        registerHelpers(this.#handlebars, labs, this.#t);
 
         // Partials
         const cssPartialSource = await fs.readFile(path.join(__dirname, './email-templates/partials/', `styles.hbs`), 'utf8');

diff --git a/ghost/email-service/lib/helpers/register-helpers.js b/ghost/email-service/lib/helpers/register-helpers.js
@@ -1,5 +1,5 @@
 module.exports = {
-    registerHelpers(handlebars, labs) {
+    registerHelpers(handlebars, labs, thist) {
         handlebars.registerHelper('if', function (conditional, options) {
             if (conditional) {
                 return options.fn(this);
@@ -51,10 +51,8 @@ module.exports = {
                 return options.inverse(this);
             }
         });
-
         handlebars.registerHelper('t', function (key, options) {
-            let i18n = require('../../i18n-setup');
-            return i18n.t(key, options);
+            return thist(key, options);
         });
     }
 };
diff --git a/ghost/email-service/package.json b/ghost/email-service/package.json
@@ -15,8 +15,7 @@
   },
   "files": [
     "index.js",
-    "lib",
-    "i18n-setup.js"
+    "lib"
   ],
   "devDependencies": {
     "c8": "8.0.1",