fix #305676: Repeat barline tooltips in Repeats & Jumps palette are not getting translated #6096
Conversation
Jojo-Schmitz
force-pushed
the
barline-heavy
branch
4 times, most recently
from
c07d278 to
445ea48
Compare
Jojo-Schmitz
force-pushed
the
barline-heavy
branch
from
a0fbc59 to
521aa89
Compare
Jojo-Schmitz
changed the title
Jojo-Schmitz
changed the title
Jojo-Schmitz
force-pushed
the
barline-heavy
branch
4 times, most recently
from
521aa89 to
00e8e92
Compare
|
Hmm, Travis CI fails, but what the heck is https://travis-ci.org/github/musescore/MuseScore/jobs/688906064#L4338-L4339 trying to tell me? Ah, https://travis-ci.org/github/musescore/MuseScore/jobs/688906064#L13216-L13248 The (dirty) trick to avoid that prior to this PR here was to aooend the word "barline" to the description in for repeats in barline.cpp but not use change texts of the repeats palette (introduced in #5760), but that also leads to them not getting translated, so can't stay that way anyhow. |
Jojo-Schmitz
force-pushed
the
barline-heavy
branch
2 times, most recently
from
a5ddd30 to
edcab48
Compare
| @@ -3331,7 +3331,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { { | |||
| "Smooth lift, short", | |||
| QT_TRANSLATE_NOOP("symUserNames", "Muted (closed)"), | |||
| "Half-muted (half-closed)", | |||
| QT_TRANSLATE_NOOP("symUserNames", "Opened"), | |||
| QT_TRANSLATE_NOOP("symUserNames", "Open"), | |||
There was a problem hiding this comment.
We should not be changing SMuFL names, unless we absolutely have to, might be better to raise an issue with them about this particular text, but my past experience with this are... hmm... mixed, to put it mildly.
We could resort to 'translate' this string to "Opened" for en_US and en_GB (we do similar thing with "bar" vs. measure and "ledger" vs "leger" already, as a result of above mentioned 'experience'), as that does seem make more sense, vs. the "closed" strings above.
Jojo-Schmitz
force-pushed
the
barline-heavy
branch
3 times, most recently
from
5e3ab34 to
500bf71
Compare
| // Exceptions - allowed duplicates | ||
| if (name.key().endsWith(" repeat sign") // repeat barlines in "Barlines" and "Repeats & Jumps" palette | ||
| || name.key() == "Open" // articulations in "Articulations" and channel switch text in "Text" palette | ||
| || name.key() == "Line" // bracket type in "Brackets" and line type in "Lines" palette | ||
| || name.key().startsWith("Add parentheses to ") // "Noteheads" and "Accidentals" palette | ||
| ) | ||
| continue; |
There was a problem hiding this comment.
Instead of if(cond) continue; we could do if(!cond) duplicates = true; That would make the debug statement below print out the duplicates if you run the test. However, IIRC, Travis doesn't show debug output if the tests pass (and no one would check it anyway even if it did), so I don't know how we could show the warnings.
There was a problem hiding this comment.
If the warnings don't show, they won't be worth being added
|
@anatoly-os let me know whether you'd like these 2 commits being disentangled, at least the 2nd should make it into 3.x, but in the current form won't without the 1st, and creating 2 PRs from it would mean merge conflicts needed to get sorted later |
|
@Jojo-Schmitz I think this PR should go to master, since the changes are not the fixes, but the new functionality. You can make a new PR to 3.x including only the second commit. |
|
OK, done, see #6119. Next step is to change this here ;-), done now too. |
Jojo-Schmitz
changed the title
…ot getting translated by fixing the mtest to allow certain duplicates and reverting some earlier changes to make those textx different
Jojo-Schmitz
force-pushed
the
barline-heavy
branch
from
500bf71 to
93b4b1a
Compare
Resolves https://musescore.org/en/node/305676