Skip to content

Commit 577631b

Browse files
walterbenderWalter Bender
walterbender
and
Walter Bender
authored
undo formating that causes some i18n strings to be missed (#4776)
* undo formating that causes some i18n strings to be missed * updated with new and missing strings * fix parsing error introduced by reformating * fix parsing error introduced by reformating --------- Co-authored-by: Walter Bender <[email protected]>
1 parent c15f619 commit 577631b

19 files changed

+4892
-4417
lines changed

‎js/activity.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6572,9 +6572,7 @@ class Activity {
65726572
that.refreshCanvas();
65736573
} catch (e) {
65746574
that.errorMsg(
6575-
_(
6576-
"Cannot load project from the file. Please check the file type."
6577-
)
6575+
_("Cannot load project from the file. Please check the file type.")
65786576
);
65796577
// eslint-disable-next-line no-console
65806578
console.error(e);

‎js/blocks/ActionBlocks.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,9 +1207,7 @@ function setupActionBlocks(activity) {
12071207
this.setHelpString([
12081208
_("Each Start block is a separate voice.") +
12091209
" " +
1210-
_(
1211-
"All of the Start blocks run at the same time when the Play button is pressed."
1212-
),
1210+
_("All of the Start blocks run at the same time when the Play button is pressed."),
12131211
"documentation",
12141212
""
12151213
]);
@@ -1297,9 +1295,7 @@ function setupActionBlocks(activity) {
12971295
* @type {string[]}
12981296
*/
12991297
this.setHelpString([
1300-
_(
1301-
"The Action block is used to group together blocks so that they can be used more than once."
1302-
) +
1298+
_("The Action block is used to group together blocks so that they can be used more than once.") +
13031299
" " +
13041300
_("It is often used for storing a phrase of music that is repeated."),
13051301
"documentation",

‎js/blocks/BooleanBlocks.js‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,7 @@ function setupBooleanBlocks(activity) {
389389
* @type {string[]}
390390
*/
391391
this.setHelpString([
392-
_(
393-
"The Greater-than block returns True if the top number is greater than the bottom number."
394-
),
392+
_("The Greater-than block returns True if the top number is greater than the bottom number."),
395393
"documentation",
396394
""
397395
]);
@@ -495,9 +493,7 @@ function setupBooleanBlocks(activity) {
495493
* @type {string[]}
496494
*/
497495
this.setHelpString([
498-
_(
499-
"The Less-than block returns True if the top number is less than the bottom number."
500-
),
496+
_("The Less-than block returns True if the top number is less than the bottom number."),
501497
"documentation",
502498
""
503499
]);
@@ -596,9 +592,7 @@ function setupBooleanBlocks(activity) {
596592
* @type {string[]}
597593
*/
598594
this.setHelpString([
599-
_(
600-
"The Less-than-or-equal-to block returns True if the top number is less than or equal to the bottom number."
601-
),
595+
_("The Less-than-or-equal-to block returns True if the top number is less than or equal to the bottom number."),
602596
"documentation",
603597
""
604598
]);
@@ -697,9 +691,7 @@ function setupBooleanBlocks(activity) {
697691
* @type {string[]}
698692
*/
699693
this.setHelpString([
700-
_(
701-
"The Greater-than-or-equal-to block returns True if the top number is greater than or equal to the bottom number."
702-
),
694+
_("The Greater-than-or-equal-to block returns True if the top number is greater than or equal to the bottom number."),
703695
"documentation",
704696
""
705697
]);

‎js/blocks/DictBlocks.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ function setupDictBlocks(activity) {
5959
* @type {string[]}
6060
*/
6161
this.setHelpString([
62-
_(
63-
"The Show-dictionary block displays the contents of the dictionary at the top of the screen."
64-
),
62+
_("The Show-dictionary block displays the contents of the dictionary at the top of the screen."),
6563
"documentation",
6664
""
6765
]);

‎js/blocks/DrumBlocks.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,18 +379,14 @@ function setupDrumBlocks(activity) {
379379
*/
380380
if (activity.beginnerMode && this.lang === "ja") {
381381
this.setHelpString([
382-
_(
383-
"The Set drum block will select a drum sound to replace the pitch of any contained notes."
384-
),
382+
_("The Set drum block will select a drum sound to replace the pitch of any contained notes."),
385383
"documentation",
386384
null,
387385
"rhythmruler2"
388386
]);
389387
} else {
390388
this.setHelpString([
391-
_(
392-
"The Set drum block will select a drum sound to replace the pitch of any contained notes."
393-
) +
389+
_("The Set drum block will select a drum sound to replace the pitch of any contained notes.") +
394390
" " +
395391
_("In the example above, a kick drum sound will be played instead of sol."),
396392
"documentation",

‎js/blocks/ExtrasBlocks.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,7 @@ function setupExtrasBlocks(activity) {
422422
super("comment");
423423
this.setPalette("extras", activity);
424424
this.setHelpString([
425-
_(
426-
"The Comment block prints a comment at the top of the screen when the program is running in slow mode."
427-
),
425+
_("The Comment block prints a comment at the top of the screen when the program is running in slow mode."),
428426
"documentation",
429427
""
430428
]);

‎js/blocks/FlowBlocks.js‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ function setupFlowBlocks(activity) {
123123
this.setHelpString([
124124
_("The Duplicate block will run each block multiple times.") +
125125
" " +
126-
_(
127-
"The output of the example is: Sol, Sol, Sol, Sol, Re, Re, Re, Re, Sol, Sol, Sol, Sol."
128-
),
126+
_("The output of the example is: Sol, Sol, Sol, Sol, Re, Re, Re, Re, Sol, Sol, Sol, Sol."),
129127
"documentation",
130128
null,
131129
"duphelp"
@@ -896,9 +894,7 @@ function setupFlowBlocks(activity) {
896894

897895
if (activity.beginnerMode && this.lang === "ja") {
898896
this.setHelpString([
899-
_(
900-
"Conditionals lets your program take different actions depending on the condition."
901-
) +
897+
_("Conditionals lets your program take different actions depending on the condition.") +
902898
" " +
903899
_("In this example if the mouse button is pressed a snare drum will play."),
904900
"documentation",
@@ -907,13 +903,9 @@ function setupFlowBlocks(activity) {
907903
]);
908904
} else {
909905
this.setHelpString([
910-
_(
911-
"Conditionals lets your program take different actions depending on the condition."
912-
) +
906+
_("Conditionals lets your program take different actions depending on the condition.") +
913907
" " +
914-
_(
915-
"In this example if the mouse button is pressed a snare drum will play, else a kick drum will play."
916-
),
908+
_("In this example if the mouse button is pressed a snare drum will play, else a kick drum will play."),
917909
"documentation",
918910
null,
919911
"elifhelp"
@@ -961,9 +953,7 @@ function setupFlowBlocks(activity) {
961953

962954
if (activity.beginnerMode && this.lang === "ja") {
963955
this.setHelpString([
964-
_(
965-
"Conditionals lets your program take different actions depending on the condition."
966-
) +
956+
_("Conditionals lets your program take different actions depending on the condition.") +
967957
" " +
968958
_("In this example if the mouse button is pressed a snare drum will play."),
969959
"documentation",
@@ -972,9 +962,7 @@ function setupFlowBlocks(activity) {
972962
]);
973963
} else {
974964
this.setHelpString([
975-
_(
976-
"Conditionals lets your program take different actions depending on the condition."
977-
) +
965+
_("Conditionals lets your program take different actions depending on the condition.") +
978966
" " +
979967
_("In this example if the mouse button is pressed a snare drum will play."),
980968
"documentation",
@@ -1024,9 +1012,7 @@ function setupFlowBlocks(activity) {
10241012
this.setHelpString([
10251013
_("The Forever block will repeat the contained blocks forever.") +
10261014
" " +
1027-
_(
1028-
"In this example of a simple drum machine a kick drum will play 1/4 notes forever."
1029-
),
1015+
_("In this example of a simple drum machine a kick drum will play 1/4 notes forever."),
10301016
"documentation",
10311017
null,
10321018
"foreverhelp"

‎js/blocks/GraphicsBlocks.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,9 +1150,7 @@ function setupGraphicsBlocks(activity) {
11501150

11511151
// Set the help string for the Wrap block
11521152
this.setHelpString([
1153-
_(
1154-
"The Wrap block enables or disables screen wrapping for the graphics actions within it."
1155-
),
1153+
_("The Wrap block enables or disables screen wrapping for the graphics actions within it."),
11561154
"documentation",
11571155
null,
11581156
"wraphelp"

‎js/blocks/HeapBlocks.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,7 @@ function setupHeapBlocks(activity) {
115115
* @param {string[]} [] - An array with help string information.
116116
*/
117117
this.setHelpString([
118-
_(
119-
"The Show-heap block displays the contents of the heap at the top of the screen."
120-
),
118+
_("The Show-heap block displays the contents of the heap at the top of the screen."),
121119
"documentation",
122120
""
123121
]);

‎js/blocks/IntervalsBlocks.js‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ function setupIntervalsBlocks(activity) {
5050

5151
// Set the help string for the SetTemperament block
5252
this.setHelpString([
53-
_(
54-
"The Set temperament block is used to choose the tuning system used by Music Blocks."
55-
),
53+
_("The Set temperament block is used to choose the tuning system used by Music Blocks."),
5654
"documentation",
5755
""
5856
]);
@@ -264,9 +262,7 @@ function setupIntervalsBlocks(activity) {
264262
// Set the palette, activity, help string, beginner block, hidden status, and form the block with specific parameters
265263
this.setPalette("intervals", activity);
266264
this.setHelpString([
267-
_(
268-
"The Interval number block returns the number of scalar steps in the current interval."
269-
),
265+
_("The Interval number block returns the number of scalar steps in the current interval."),
270266
"documentation",
271267
""
272268
]);
@@ -319,9 +315,7 @@ function setupIntervalsBlocks(activity) {
319315
// Set the palette, activity, help string, beginner block, hidden status, and form the block with specific parameters
320316
this.setPalette("intervals", activity);
321317
this.setHelpString([
322-
_(
323-
"The Current interval block returns the name of scalar steps in the current interval."
324-
),
318+
_("The Current interval block returns the name of scalar steps in the current interval."),
325319
"documentation",
326320
""
327321
]);
@@ -376,9 +370,7 @@ function setupIntervalsBlocks(activity) {
376370
// Set the palette, activity, help string, and form the block with specific parameters
377371
this.setPalette("intervals", activity);
378372
this.setHelpString([
379-
_(
380-
"The Semi-tone interval block measures the distance between two notes in semi-tones."
381-
),
373+
_("The Semi-tone interval block measures the distance between two notes in semi-tones."),
382374
"documentation",
383375
""
384376
]);
@@ -671,9 +663,7 @@ function setupIntervalsBlocks(activity) {
671663
11, 12
672664
];
673665
this.setHelpString([
674-
_(
675-
"The Semi-tone interval block calculates a relative interval based on half steps."
676-
) +
666+
_("The Semi-tone interval block calculates a relative interval based on half steps.") +
677667
" " +
678668
_("In the figure, we add sol# to sol."),
679669
"documentation",
@@ -726,9 +716,7 @@ function setupIntervalsBlocks(activity) {
726716
super("arpeggio");
727717
this.setPalette("intervals", activity);
728718
this.setHelpString([
729-
_(
730-
"The Arpeggio block will run each note block multiple times, adding a transposition based on the specified chord."
731-
) +
719+
_("The Arpeggio block will run each note block multiple times, adding a transposition based on the specified chord.") +
732720
" " +
733721
_("The output of the example is: do, mi, sol, sol, ti, mi"),
734722
"documentation",
@@ -1057,9 +1045,7 @@ function setupIntervalsBlocks(activity) {
10571045
this.piemenuValuesC1 = [-7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7];
10581046
this.beginnerBlock(true);
10591047
this.setHelpString([
1060-
_(
1061-
"The Scalar interval block calculates a relative interval based on the current mode, skipping all notes outside of the mode."
1062-
) +
1048+
_("The Scalar interval block calculates a relative interval based on the current mode, skipping all notes outside of the mode.") +
10631049
" " +
10641050
_("In the figure, we add la to sol."),
10651051
"documentation",
@@ -1108,9 +1094,7 @@ function setupIntervalsBlocks(activity) {
11081094
super("definemode");
11091095
this.setPalette("intervals", activity);
11101096
this.setHelpString([
1111-
_(
1112-
"The Define mode block allows you to define a custom mode by specifying pitch numbers."
1113-
),
1097+
_("The Define mode block allows you to define a custom mode by specifying pitch numbers."),
11141098
"documentation",
11151099
null,
11161100
"definemode"
@@ -1174,13 +1158,9 @@ function setupIntervalsBlocks(activity) {
11741158
this.setPalette("intervals", activity);
11751159
this.beginnerBlock(true);
11761160
this.setHelpString([
1177-
_(
1178-
"When Movable do is false, the solfege note names are always tied to specific pitches,"
1179-
) +
1161+
_("When Movable do is false, the solfege note names are always tied to specific pitches,") +
11801162
" " +
1181-
_(
1182-
'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.'
1183-
),
1163+
_('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.'),
11841164
"documentation",
11851165
null,
11861166
"moveablehelp"

0 commit comments

Comments
 (0)