e2e test fix?

cathysarisky · Oct 29, 2024 · 869ea0b · 869ea0b
1 parent 01e5bdb
commit 869ea0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
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,19 +14,13 @@ module.exports.init = function () {
     if (labs.isSet('i18n')) {
         locale = settingsCache.get('locale');
     }
-    i18nInstance = i18n(locale, 'ghost');
-    i18nInstanceNewsletter = i18n(locale, 'newsletter');
 
-    module.exports = {
-        i18nInstance,
-        i18nInstanceNewsletter
-    };
+    module.exports = i18nInstance = i18n(locale, 'ghost');
 
     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');
@@ -37,7 +31,6 @@ 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/lib/EmailRenderer.js b/ghost/email-service/lib/EmailRenderer.js
@@ -43,7 +43,6 @@ function escapeHtml(unsafe) {
 }
 
 function formatDateLong(date, timezone, locale = 'en-gb') {
-
     return DateTime.fromJSDate(date).setZone(timezone).setLocale(locale).toLocaleString({
         year: 'numeric',
         month: 'long',