Revert "Changed theme i18n to use i18next (#23161)"

This reverts commit 36b3e1c.

Author: ErisDS

apps/admin-x-settings/src/components/settings/advanced/labs/BetaFeatures.tsx

@@ -71,10 +71,6 @@ const BetaFeatures: React.FC = () => {
                 action={<FeatureToggle flag="additionalPaymentMethods" />}
                 detail={<>Enable support for CashApp, iDEAL, Bancontact, and others. <a className='text-green' href="https://ghost.org/help/payment-methods" rel="noopener noreferrer" target="_blank">Learn more &rarr;</a></>}
                 title='Additional payment methods' />
-            <LabItem
-                action={<FeatureToggle flag="themeTranslation" />}
-                detail={<>Enable theme translation using i18next instead of the old translation package.</>}
-                title='Updated theme Translation (beta)' />
             <LabItem
                 action={<div className='flex flex-col items-end gap-1'>
                     <FileUpload

ghost/core/core/frontend/helpers/t.js

@@ -11,10 +11,6 @@
 // {{tags prefix=(t " on ")}}
 
 const {themeI18n} = require('../services/handlebars');
-const {themeI18next} = require('../services/handlebars');
-const labs = require('../../shared/labs');
-const config = require('../../shared/config');
-const settingsCache = require('../../shared/settings-cache');
 
 module.exports = function t(text, options = {}) {
     if (!text || text.length === 0) {
@@ -30,29 +26,5 @@ module.exports = function t(text, options = {}) {
         }
     }
 
-    if (labs.isSet('themeTranslation')) {
-        // Use the new translation package when feature flag is enabled
-        
-        // Initialize only if needed
-        if (!themeI18next._i18n) {
-            themeI18next.init({
-                activeTheme: settingsCache.get('active_theme'),
-                locale: config.get('locale')
-            });
-        }
-        
-        return themeI18next.t(text, bindings);
-    } else {
-        // Use the existing translation package when feature flag is disabled
-        
-        // Initialize only if needed
-        if (!themeI18n._strings) {
-            themeI18n.init({
-                activeTheme: settingsCache.get('active_theme'),
-                locale: config.get('locale')
-            });
-        }
-        
-        return themeI18n.t(text, bindings);
-    }
+    return themeI18n.t(text, bindings);
 };

ghost/core/core/frontend/services/handlebars.js

@@ -19,7 +19,7 @@ module.exports = {
     // Theme i18n
     // @TODO: this should live somewhere else...
     themeI18n: require('./theme-engine/i18n'),
-    themeI18next: require('./theme-engine/i18next'),
+
     // TODO: these need a more sensible home
     localUtils: require('./theme-engine/handlebars/utils')
 };

ghost/core/core/frontend/services/theme-engine/active.js

@@ -18,8 +18,6 @@ const themeConfig = require('./config');
 const config = require('../../../shared/config');
 const engine = require('./engine');
 const themeI18n = require('./i18n');
-const themeI18next = require('./i18next');
-const labs = require('../../../shared/labs');
 
 // Current instance of ActiveTheme
 let currentActiveTheme;
@@ -103,13 +101,7 @@ class ActiveTheme {
         options.activeTheme = options.activeTheme || this._name;
         options.locale = options.locale || this._locale;
 
-        if (labs.isSet('themeTranslation')) {
-            // Initialize the new translation service
-            themeI18next.init(options);
-        } else {
-            // Initialize the legacy translation service
-            themeI18n.init(options);
-        }
+        themeI18n.init(options);
     }
 
     mount(siteApp) {

ghost/core/core/frontend/services/theme-engine/i18next/ThemeI18n.js

@@ -34,8 +34,7 @@ const PUBLIC_BETA_FEATURES = [
     'ActivityPub',
     'superEditors',
     'editorExcerpt',
-    'additionalPaymentMethods',
-    'themeTranslation'
+    'additionalPaymentMethods'
 ];
 
 // These features are considered private they live in the private tab of the labs settings page

ghost/core/core/frontend/services/theme-engine/i18next/index.js

@@ -27,7 +27,6 @@ Object {
       "stripeAutomaticTax": true,
       "superEditors": true,
       "themeErrorsNotification": true,
-      "themeTranslation": true,
       "trafficAnalytics": true,
       "ui60": true,
       "urlCache": true,