Skip to content

fix: rename file with debug modal messages to .js #227

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
Apr 7, 2025
Merged

fix: rename file with debug modal messages to .js #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6f8370
fix: rename file with debug modal messages to .js
KManolov3 Apr 4, 2025
f2a2472
fix: move default project messages in .js file
KManolov3 Apr 4, 2025
56ecba2
fix: add newline at end of messages.js
KManolov3 Apr 7, 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
3 changes: 3 additions & 0 deletions ...mponents/debug-modal/sections/messages.ts → ...mponents/debug-modal/sections/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import {defineMessages} from 'react-intl';

// TODO: These are not detected by the `i18n:src` script if the file is with `.ts` extension.
// This issue might be affecting other .ts files as well.
// https://scratchfoundation.atlassian.net/browse/UEPR-221
export const messages = defineMessages({
readAloudTitle: {
id: 'gui.debugModal.readAloud.title',
Expand Down
2 changes: 1 addition & 1 deletion packages/scratch-gui/src/components/debug-modal/sections/sections.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {FormattedMessage} from 'react-intl';
import {messages} from './messages.ts';
import {messages} from './messages.js';

import addSoundCheckpoints from '../icons/icon--add-sound-checkpoints.svg';
import askForHelp from '../icons/icon--ask-for-help.svg';
Expand Down
16 changes: 16 additions & 0 deletions packages/scratch-gui/src/lib/default-project/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import {defineMessages} from 'react-intl';

const messages = defineMessages({
meow: {
defaultMessage: 'Meow',
description: 'Name for the meow sound',
id: 'gui.defaultProject.meow'
},
variable: {
defaultMessage: 'my variable',
description: 'Name for the default variable',
id: 'gui.defaultProject.variable'
}
});

export default messages;
17 changes: 2 additions & 15 deletions packages/scratch-gui/src/lib/default-project/project-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
import {defineMessages} from 'react-intl';
import projectDataMessages from './messages';
import sharedMessages from '../shared-messages';
import {MessageObject, TranslatorFunction} from '../../gui-config';

let messages = defineMessages({
meow: {
defaultMessage: 'Meow',
description: 'Name for the meow sound',
id: 'gui.defaultProject.meow'
},
variable: {
defaultMessage: 'my variable',
description: 'Name for the default variable',
id: 'gui.defaultProject.variable'
}
});

messages = {...messages, ...sharedMessages};
const messages = {...projectDataMessages, ...sharedMessages};

// use the default message if a translation function is not passed
const defaultTranslator = (msgObj: MessageObject) => msgObj.defaultMessage;
Expand Down