Skip to content

feat: [IPR-1063] Add locale to editor state props #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2025
Merged

feat: [IPR-1063] Add locale to editor state props #325

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeb69be
feat: [IPR-1063] Add locale to editor state props
MiroslavDionisiev Sep 23, 2025
eed6b5f
feat: [IPR-1063] Add warning for unsupported locacale
MiroslavDionisiev Sep 24, 2025
a28aa46
feat: [IPR-1063] Move jq command from publish workflow to script
MiroslavDionisiev Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/scratch-gui/src/exported-reducers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ScratchPaintReducer} from 'scratch-paint';
import LocalesReducer, {localesInitialState, initLocale} from './reducers/locales.js';
import LocalesReducer, {localesInitialState, initLocale, selectLocale} from './reducers/locales.js';
import GuiReducer, {buildInitialState, guiMiddleware, initEmbedded, initFullScreen, initPlayer} from './reducers/gui';
import {setFullScreen, setPlayer, setEmbedded} from './reducers/mode.js';
import {activateDeck} from './reducers/cards.js';
Expand Down Expand Up @@ -49,5 +49,6 @@ export {
setFullScreen,
setPlayer,
setEmbedded,
activateDeck
activateDeck,
selectLocale
};
9 changes: 3 additions & 6 deletions packages/scratch-gui/src/lib/app-state-provider-hoc.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import PropTypes from 'prop-types';

import {EditorState} from './editor-state';
import {setPlayer, setFullScreen, setEmbedded} from '../reducers/mode.js';
import ConnectedIntlProvider from './connected-intl-provider.jsx';

/**
* Wraps the editor into the redux state contained within an EditorState instance.
Expand Down Expand Up @@ -39,11 +38,9 @@ export const AppStateProviderHOC = function (WrappedComponent) {
} = this.props;
return (
<Provider store={appState.store}>
<ConnectedIntlProvider>
<WrappedComponent
{...componentProps}
/>
</ConnectedIntlProvider>
<WrappedComponent
{...componentProps}
/>
</Provider>
);
}
Expand Down
11 changes: 10 additions & 1 deletion packages/scratch-gui/src/lib/editor-state.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export interface EditorStateParams {
isPlayerOnly?: boolean;
showTelemetryModal?: boolean;
isEmbedded?: boolean;
locale?: string;
}

/**
Expand All @@ -40,10 +41,18 @@ export class EditorState {
let enhancer;

let initializedLocales = localesInitialState;
const locale = detectLocale(Object.keys(locales));

let locale = 'en';
if (params.locale && Object.keys(locales).includes(params.locale)) {
Copy link
Contributor

@georgyangelov georgyangelov Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember we talked about having a console.warn if Object.keys(locales).includes(params.locale) is false.

Copy link
Contributor Author

@MiroslavDionisiev MiroslavDionisiev Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot about it. Will add it

locale = params.locale;
} else {
locale = detectLocale(Object.keys(locales));
}

if (locale !== 'en') {
initializedLocales = initLocale(initializedLocales, locale);
}

if (params.localesOnly) {
// Used for instantiating minimal state for the unsupported
// browser modal
Expand Down