Skip to content

undo formating that causes some i18n strings to be missed #4776

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 4 commits into from
Oct 19, 2025
Merged

undo formating that causes some i18n strings to be missed #4776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b8ca68
undo formating that causes some i18n strings to be missed
Oct 19, 2025
e5ca183
updated with new and missing strings
Oct 19, 2025
d9aa917
fix parsing error introduced by reformating
Oct 19, 2025
304896f
fix parsing error introduced by reformating
Oct 19, 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
4 changes: 1 addition & 3 deletions js/activity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6572,9 +6572,7 @@ class Activity {
that.refreshCanvas();
} catch (e) {
that.errorMsg(
_(
"Cannot load project from the file. Please check the file type."
)
_("Cannot load project from the file. Please check the file type.")
);
// eslint-disable-next-line no-console
console.error(e);
Expand Down
8 changes: 2 additions & 6 deletions js/blocks/ActionBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,9 +1207,7 @@ function setupActionBlocks(activity) {
this.setHelpString([
_("Each Start block is a separate voice.") +
" " +
_(
"All of the Start blocks run at the same time when the Play button is pressed."
),
_("All of the Start blocks run at the same time when the Play button is pressed."),
"documentation",
""
]);
Expand Down Expand Up @@ -1297,9 +1295,7 @@ function setupActionBlocks(activity) {
* @type {string[]}
*/
this.setHelpString([
_(
"The Action block is used to group together blocks so that they can be used more than once."
) +
_("The Action block is used to group together blocks so that they can be used more than once.") +
" " +
_("It is often used for storing a phrase of music that is repeated."),
"documentation",
Expand Down
16 changes: 4 additions & 12 deletions js/blocks/BooleanBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,7 @@ function setupBooleanBlocks(activity) {
* @type {string[]}
*/
this.setHelpString([
_(
"The Greater-than block returns True if the top number is greater than the bottom number."
),
_("The Greater-than block returns True if the top number is greater than the bottom number."),
"documentation",
""
]);
Expand Down Expand Up @@ -495,9 +493,7 @@ function setupBooleanBlocks(activity) {
* @type {string[]}
*/
this.setHelpString([
_(
"The Less-than block returns True if the top number is less than the bottom number."
),
_("The Less-than block returns True if the top number is less than the bottom number."),
"documentation",
""
]);
Expand Down Expand Up @@ -596,9 +592,7 @@ function setupBooleanBlocks(activity) {
* @type {string[]}
*/
this.setHelpString([
_(
"The Less-than-or-equal-to block returns True if the top number is less than or equal to the bottom number."
),
_("The Less-than-or-equal-to block returns True if the top number is less than or equal to the bottom number."),
"documentation",
""
]);
Expand Down Expand Up @@ -697,9 +691,7 @@ function setupBooleanBlocks(activity) {
* @type {string[]}
*/
this.setHelpString([
_(
"The Greater-than-or-equal-to block returns True if the top number is greater than or equal to the bottom number."
),
_("The Greater-than-or-equal-to block returns True if the top number is greater than or equal to the bottom number."),
"documentation",
""
]);
Expand Down
4 changes: 1 addition & 3 deletions js/blocks/DictBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ function setupDictBlocks(activity) {
* @type {string[]}
*/
this.setHelpString([
_(
"The Show-dictionary block displays the contents of the dictionary at the top of the screen."
),
_("The Show-dictionary block displays the contents of the dictionary at the top of the screen."),
"documentation",
""
]);
Expand Down
8 changes: 2 additions & 6 deletions js/blocks/DrumBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,18 +379,14 @@ function setupDrumBlocks(activity) {
*/
if (activity.beginnerMode && this.lang === "ja") {
this.setHelpString([
_(
"The Set drum block will select a drum sound to replace the pitch of any contained notes."
),
_("The Set drum block will select a drum sound to replace the pitch of any contained notes."),
"documentation",
null,
"rhythmruler2"
]);
} else {
this.setHelpString([
_(
"The Set drum block will select a drum sound to replace the pitch of any contained notes."
) +
_("The Set drum block will select a drum sound to replace the pitch of any contained notes.") +
" " +
_("In the example above, a kick drum sound will be played instead of sol."),
"documentation",
Expand Down
4 changes: 1 addition & 3 deletions js/blocks/ExtrasBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,9 +422,7 @@ function setupExtrasBlocks(activity) {
super("comment");
this.setPalette("extras", activity);
this.setHelpString([
_(
"The Comment block prints a comment at the top of the screen when the program is running in slow mode."
),
_("The Comment block prints a comment at the top of the screen when the program is running in slow mode."),
"documentation",
""
]);
Expand Down
28 changes: 7 additions & 21 deletions js/blocks/FlowBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@ function setupFlowBlocks(activity) {
this.setHelpString([
_("The Duplicate block will run each block multiple times.") +
" " +
_(
"The output of the example is: Sol, Sol, Sol, Sol, Re, Re, Re, Re, Sol, Sol, Sol, Sol."
),
_("The output of the example is: Sol, Sol, Sol, Sol, Re, Re, Re, Re, Sol, Sol, Sol, Sol."),
"documentation",
null,
"duphelp"
Expand Down Expand Up @@ -896,9 +894,7 @@ function setupFlowBlocks(activity) {

if (activity.beginnerMode && this.lang === "ja") {
this.setHelpString([
_(
"Conditionals lets your program take different actions depending on the condition."
) +
_("Conditionals lets your program take different actions depending on the condition.") +
" " +
_("In this example if the mouse button is pressed a snare drum will play."),
"documentation",
Expand All @@ -907,13 +903,9 @@ function setupFlowBlocks(activity) {
]);
} else {
this.setHelpString([
_(
"Conditionals lets your program take different actions depending on the condition."
) +
_("Conditionals lets your program take different actions depending on the condition.") +
" " +
_(
"In this example if the mouse button is pressed a snare drum will play, else a kick drum will play."
),
_("In this example if the mouse button is pressed a snare drum will play, else a kick drum will play."),
"documentation",
null,
"elifhelp"
Expand Down Expand Up @@ -961,9 +953,7 @@ function setupFlowBlocks(activity) {

if (activity.beginnerMode && this.lang === "ja") {
this.setHelpString([
_(
"Conditionals lets your program take different actions depending on the condition."
) +
_("Conditionals lets your program take different actions depending on the condition.") +
" " +
_("In this example if the mouse button is pressed a snare drum will play."),
"documentation",
Expand All @@ -972,9 +962,7 @@ function setupFlowBlocks(activity) {
]);
} else {
this.setHelpString([
_(
"Conditionals lets your program take different actions depending on the condition."
) +
_("Conditionals lets your program take different actions depending on the condition.") +
" " +
_("In this example if the mouse button is pressed a snare drum will play."),
"documentation",
Expand Down Expand Up @@ -1024,9 +1012,7 @@ function setupFlowBlocks(activity) {
this.setHelpString([
_("The Forever block will repeat the contained blocks forever.") +
" " +
_(
"In this example of a simple drum machine a kick drum will play 1/4 notes forever."
),
_("In this example of a simple drum machine a kick drum will play 1/4 notes forever."),
"documentation",
null,
"foreverhelp"
Expand Down
4 changes: 1 addition & 3 deletions js/blocks/GraphicsBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,9 +1150,7 @@ function setupGraphicsBlocks(activity) {

// Set the help string for the Wrap block
this.setHelpString([
_(
"The Wrap block enables or disables screen wrapping for the graphics actions within it."
),
_("The Wrap block enables or disables screen wrapping for the graphics actions within it."),
"documentation",
null,
"wraphelp"
Expand Down
4 changes: 1 addition & 3 deletions js/blocks/HeapBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,7 @@ function setupHeapBlocks(activity) {
* @param {string[]} [] - An array with help string information.
*/
this.setHelpString([
_(
"The Show-heap block displays the contents of the heap at the top of the screen."
),
_("The Show-heap block displays the contents of the heap at the top of the screen."),
"documentation",
""
]);
Expand Down
40 changes: 10 additions & 30 deletions js/blocks/IntervalsBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ function setupIntervalsBlocks(activity) {

// Set the help string for the SetTemperament block
this.setHelpString([
_(
"The Set temperament block is used to choose the tuning system used by Music Blocks."
),
_("The Set temperament block is used to choose the tuning system used by Music Blocks."),
"documentation",
""
]);
Expand Down Expand Up @@ -264,9 +262,7 @@ function setupIntervalsBlocks(activity) {
// Set the palette, activity, help string, beginner block, hidden status, and form the block with specific parameters
this.setPalette("intervals", activity);
this.setHelpString([
_(
"The Interval number block returns the number of scalar steps in the current interval."
),
_("The Interval number block returns the number of scalar steps in the current interval."),
"documentation",
""
]);
Expand Down Expand Up @@ -319,9 +315,7 @@ function setupIntervalsBlocks(activity) {
// Set the palette, activity, help string, beginner block, hidden status, and form the block with specific parameters
this.setPalette("intervals", activity);
this.setHelpString([
_(
"The Current interval block returns the name of scalar steps in the current interval."
),
_("The Current interval block returns the name of scalar steps in the current interval."),
"documentation",
""
]);
Expand Down Expand Up @@ -376,9 +370,7 @@ function setupIntervalsBlocks(activity) {
// Set the palette, activity, help string, and form the block with specific parameters
this.setPalette("intervals", activity);
this.setHelpString([
_(
"The Semi-tone interval block measures the distance between two notes in semi-tones."
),
_("The Semi-tone interval block measures the distance between two notes in semi-tones."),
"documentation",
""
]);
Expand Down Expand Up @@ -671,9 +663,7 @@ function setupIntervalsBlocks(activity) {
11, 12
];
this.setHelpString([
_(
"The Semi-tone interval block calculates a relative interval based on half steps."
) +
_("The Semi-tone interval block calculates a relative interval based on half steps.") +
" " +
_("In the figure, we add sol# to sol."),
"documentation",
Expand Down Expand Up @@ -726,9 +716,7 @@ function setupIntervalsBlocks(activity) {
super("arpeggio");
this.setPalette("intervals", activity);
this.setHelpString([
_(
"The Arpeggio block will run each note block multiple times, adding a transposition based on the specified chord."
) +
_("The Arpeggio block will run each note block multiple times, adding a transposition based on the specified chord.") +
" " +
_("The output of the example is: do, mi, sol, sol, ti, mi"),
"documentation",
Expand Down Expand Up @@ -1057,9 +1045,7 @@ function setupIntervalsBlocks(activity) {
this.piemenuValuesC1 = [-7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7];
this.beginnerBlock(true);
this.setHelpString([
_(
"The Scalar interval block calculates a relative interval based on the current mode, skipping all notes outside of the mode."
) +
_("The Scalar interval block calculates a relative interval based on the current mode, skipping all notes outside of the mode.") +
" " +
_("In the figure, we add la to sol."),
"documentation",
Expand Down Expand Up @@ -1108,9 +1094,7 @@ function setupIntervalsBlocks(activity) {
super("definemode");
this.setPalette("intervals", activity);
this.setHelpString([
_(
"The Define mode block allows you to define a custom mode by specifying pitch numbers."
),
_("The Define mode block allows you to define a custom mode by specifying pitch numbers."),
"documentation",
null,
"definemode"
Expand Down Expand Up @@ -1174,13 +1158,9 @@ function setupIntervalsBlocks(activity) {
this.setPalette("intervals", activity);
this.beginnerBlock(true);
this.setHelpString([
_(
"When Movable do is false, the solfege note names are always tied to specific pitches,"
) +
_("When Movable do is false, the solfege note names are always tied to specific pitches,") +
" " +
_(
'eg "do" is always "C-natural" when Movable do is true, the solfege note names are assigned to scale degrees "do" is always the first degree of the major scale.'
),
_('eg "do" is always "C-natural" when Movable do is true, the solfege note names are assigned to scale degrees "do" is always the first degree of the major scale.'),
"documentation",
null,
"moveablehelp"
Expand Down
Loading