Skip to content

Fix: Prevent unnecessary title-case conversion in i18n helper function #4782

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

Fix: Prevent unnecessary title-case conversion in i18n helper function #4782

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
4ffa6a0
Simplify translation fallback mechanism
ac-mmi Oct 25, 2025
88c1b94
Update utils.js
ac-mmi Oct 25, 2025
23db807
Updated _getPitch(c) in block.js
ac-mmi Oct 26, 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
29 changes: 18 additions & 11 deletions js/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2471,28 +2471,35 @@ class Block {
c2 = this.blocks.blockList[c].connections[2];
if (this.blocks.blockList[c2].name === "number") {
if (this.blocks.blockList[c1].name === "solfege") {
const solfnotes_ = _("ti la sol fa mi re do").split(" ");
// English reference for logic
const solfnotesRef = ["ti", "la", "sol", "fa", "mi", "re", "do"];
// Localized notes for display
const solfnotesLocalized = _("ti la sol fa mi re do").split(" ");

const stripped = this.blocks.blockList[c1].value
.replace(SHARP, "")
.replace(FLAT, "")
.replace(DOUBLESHARP, "")
.replace(DOUBLEFLAT, "");
const i = ["ti", "la", "sol", "fa", "mi", "re", "do"].indexOf(stripped);

const i = solfnotesRef.indexOf(stripped);
if (i === -1) {
// fallback if note not found
return stripped + " " + this.blocks.blockList[c2].value;
}

if (this.blocks.blockList[c1].value.includes(SHARP)) {
return solfnotes_[i] + SHARP + " " + this.blocks.blockList[c2].value;
return solfnotesLocalized[i] + SHARP + " " + this.blocks.blockList[c2].value;
} else if (this.blocks.blockList[c1].value.includes(FLAT)) {
return solfnotes_[i] + FLAT + " " + this.blocks.blockList[c2].value;
return solfnotesLocalized[i] + FLAT + " " + this.blocks.blockList[c2].value;
} else if (this.blocks.blockList[c1].value.includes(DOUBLESHARP)) {
return (
solfnotes_[i] + DOUBLESHARP + " " + this.blocks.blockList[c2].value
);
return solfnotesLocalized[i] + DOUBLESHARP + " " + this.blocks.blockList[c2].value;
} else if (this.blocks.blockList[c1].value.includes(DOUBLEFLAT)) {
return (
solfnotes_[i] + DOUBLEFLAT + " " + this.blocks.blockList[c2].value
);
return solfnotesLocalized[i] + DOUBLEFLAT + " " + this.blocks.blockList[c2].value;
} else {
return solfnotes_[i] + " " + this.blocks.blockList[c2].value;
return solfnotesLocalized[i] + " " + this.blocks.blockList[c2].value;
}

} else if (this.blocks.blockList[c1].name === "notename") {
return (
this.blocks.blockList[c1].value + " " + this.blocks.blockList[c2].value
Expand Down
22 changes: 1 addition & 21 deletions js/utils/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,8 @@ function _(text, options = {}) {
};

translated = resolveObj(text);
if (!translated || translated === text) translated = resolveObj(cleanedText);
if (!translated || translated === text) translated = resolveObj(text.toLowerCase());
if (!translated || translated === text) {
const titleCase = text.charAt(0).toUpperCase() + text.slice(1).toLowerCase();
translated = resolveObj(titleCase);
}
if (!translated || translated === text) {
const hyphenatedText = cleanedText.replace(/ /g, "-");
translated = resolveObj(hyphenatedText);
}
} else {
translated = i18next.t(text, options);
if (!translated || translated === text) translated = i18next.t(cleanedText, options);
if (!translated || translated === text) translated = i18next.t(text.toLowerCase(), options);
if (!translated || translated === text) {
const titleCase = text.charAt(0).toUpperCase() + text.slice(1).toLowerCase();
translated = i18next.t(titleCase, options);
}
if (!translated || translated === text) {
const hyphenatedText = cleanedText.replace(/ /g, "-");
translated = i18next.t(hyphenatedText, options);
}
}

return translated || text;
Expand Down Expand Up @@ -1649,4 +1629,4 @@ if (typeof module !== "undefined" && module.exports) {
hexToRGB,
hex2rgb
};
}
}