fix moment locale for en-us

Automattic · Sep 19, 2024 · e0156ea · e0156ea
1 parent 4851662
commit e0156ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/apps/odyssey-stats/src/app.tsx b/apps/odyssey-stats/src/app.tsx
@@ -16,6 +16,7 @@ import currentUser from 'calypso/state/current-user/reducer';
 import wpcomApiMiddleware from 'calypso/state/data-layer/wpcom-api-middleware';
 import { setStore } from 'calypso/state/redux-store';
 import sites from 'calypso/state/sites/reducer';
+import { isSimpleSite } from 'calypso/state/sites/selectors';
 import { combineReducers, addReducerEnhancer } from 'calypso/state/utils';
 import config from './lib/config-api';
 import initSentry from './lib/init-sentry';
@@ -46,6 +47,8 @@ async function AppBoot() {
 		},
 	};
 
+	const isSmiple = isSimpleSite( initialState, siteId );
+
 	const queryClient = new QueryClient();
 
 	const middlewares = [ thunkMiddleware, analyticsMiddleware, wpcomApiMiddleware as Middleware ];
@@ -70,7 +73,7 @@ async function AppBoot() {
 	}
 
 	// Ensure locale files are loaded before rendering.
-	setLocale( localeSlug ).then( () => {
+	setLocale( localeSlug, isSmiple ).then( () => {
 		registerStatsPages( window.location.pathname + window.location.search );
 
 		// HACK: getPathWithUpdatedQueryString filters duplicate query parameters added by `page.js`.

diff --git a/apps/odyssey-stats/src/lib/set-locale.ts b/apps/odyssey-stats/src/lib/set-locale.ts
@@ -119,7 +119,7 @@ const fixLongDateFormatForEn = ( localeSlug: string ) => {
 	}
 };
 
-const loadMomentLocale = async ( localeSlug: string, languageCode: string ) => {
+const loadMomentLocale = async ( localeSlug: string, languageCode: string, isSimple: boolean ) => {
 	return import( `moment/locale/${ localeSlug }` )
 		.catch( ( error: Error ) => {
 			debug(
@@ -141,7 +141,7 @@ const loadMomentLocale = async ( localeSlug: string, languageCode: string ) => {
 			);
 			// Fallback 2 to the default US date time format.
 			// Interestingly `en` here represents `en-us` locale.
-			fixLongDateFormatForEn( localeSlug );
+			isSimple && fixLongDateFormatForEn( localeSlug );
 			localeSlug = DEFAULT_MOMENT_LOCALE;
 		} )
 		.then( () => moment.locale( localeSlug ) );
@@ -162,7 +162,7 @@ const loadLanguageFile = ( languageFileName: string ) => {
 	} );
 };
 
-export default ( localeSlug: string ) => {
+export default ( localeSlug: string, isSimple = false ) => {
 	const languageCode = getLanguageCodeFromLocale( localeSlug );
 
 	// Load tranlation file if it's not English.
@@ -183,5 +183,5 @@ export default ( localeSlug: string ) => {
 
 	// We have to wait for moment locale to load before rendering the page, because otherwise the rendered date time wouldn't get re-rendered.
 	// This could be improved in the future with hooks.
-	return loadMomentLocale( localeSlug, languageCode );
+	return loadMomentLocale( localeSlug, languageCode, isSimple );
 };