Fix #243516: Untranslated strings, from Qt #3272
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jojo-Schmitz
force-pushed
the
qt-translations
branch
from
e58887e
to
1e1c08f
Compare
Jojo-Schmitz
commented
Aug 10, 2017
share/locale/CMakeLists.txt
Outdated
| DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}locale | ||
| FILES_MATCHING | ||
| REGEX ".*\\.qm" | ||
| REGEX "qt_blank\\.qm" EXCLUDE |
There was a problem hiding this comment.
This could probably removed too, just need to find out why it does get generated in the first place, regardless not being mentioned in build/gen-qt-projectfile or build/gen-qt-projectfile.bat.
Hmm, seems it gets generated by lrelease, from https://github.com/musescore/MuseScore/blob/master/CMakeLists.txt#L660, but lupdate is never run on it and it doesn't really serve any purpose, so we'd better remove it, esp. as we now should no longer need this as a template for yet unsupported languages
Jojo-Schmitz
commented
Aug 10, 2017
build/gen-qt-projectfile
Outdated
| @@ -64,42 +64,17 @@ echo " $1/share/locale/mscore_uz@Latn.ts \\" | |||
| echo " $1/share/locale/mscore_vi.ts \\" | |||
| echo " $1/share/locale/mscore_zh_CN.ts \\" | |||
| echo " $1/share/locale/mscore_zh_TW.ts \\" | |||
| echo " $1/share/locale/qt_ar.ts \\" | |||
| echo " $1/share/locale/qt_bg.ts \\" | |||
There was a problem hiding this comment.
Bulgarian not needed as of Qt-5.9.1, but doesn't harm either, it'll get overwritten if available in Qt.
But I wonder whether this script can get rewritten and simplified using wildcards rather then a list of files.
Same for build/gen-qt-projectfile.bat
Jojo-Schmitz
force-pushed
the
qt-translations
branch
2 times, most recently
from
0d1d8b4
to
1fc876e
Compare
Jojo-Schmitz
commented
Aug 10, 2017
| REGEX ".*\\.qm") | ||
|
|
||
| if (MINGW) | ||
| install(DIRECTORY ${CROSSQT}/translations/ |
Jojo-Schmitz
force-pushed
the
qt-translations
branch
2 times, most recently
from
e7a8031
to
4ad3d59
Compare
Remove all Qt translations from the MuseScore repository that are also part of Qt 5.4 and later, and deploy Qt's instead. Also , as a side effect, deploy our Bulgarian translation for Qt (seems a day one ommision and not needed for Qt-5.9.1 and later) Simplify the whole process for adding languages and running lupdate Should be good for master and 2.2
Jojo-Schmitz
force-pushed
the
qt-translations
branch
2 times, most recently
from
63763ce
to
41b7906
Compare
Jojo-Schmitz
force-pushed
the
qt-translations
branch
from
78a9368
to
6561a3a
Compare
|
Still needs https://github.com/musescore/tx2s3/pull/4 for "Update translations" to show Kabyle. |
Jojo-Schmitz
commented
Aug 14, 2017
| echo " $1/share/locale/qt_uk.ts \\" | ||
| echo " $1/share/locale/qt_vi.ts \\" | ||
| echo " $1/share/locale/qt_zh_CN.ts \\" | ||
| echo " $1/share/locale/qt_zh_TW.tsTW.ts" |
There was a problem hiding this comment.
Funny, another bug fixed in the passing
There was a problem hiding this comment.
true. I just wonder why this went unnoticed
lasconic
reviewed
Aug 15, 2017
| @@ -114,5 +19,8 @@ uis=`find $1 -name "*.cpp"` | |||
| for a in $uis; do | |||
| echo " " $a \\; | |||
| done | |||
| uis=`find $1/share/instruments -name "*.h"` | |||
| for a in $uis; do | |||
Jojo-Schmitz
commented
Aug 15, 2017
| mscore_vi.qm | ||
| mscore_zh_CN.qm | ||
| mscore_zh_TW.qm | ||
| languages.xml |
There was a problem hiding this comment.
Tada! here's another problem, we still need languages.xml. See #3278
Jojo-Schmitz
commented
Aug 15, 2017
| @@ -37,6 +37,7 @@ | |||
| <language code="it" name="Italiano" /> | |||
| <language code="ja" name="日本語" /> | |||
| <language code="ka" name="ქართული" /> | |||
| <language code="kab" name="ⵜⴰⵇⴱⴰⵢⵍⵉⵜ" /> | |||
There was a problem hiding this comment.
Another issue: this string doesn't display in MuseScore's languages selection dialog, not on Windows 7 and 10 at least. It does show when opening that file with IE11 (Windows 10 also with Edge), as does in QtCreator and GitHub for Windows.
Might be some font issue on Windows, with MuseScore's default menu font?
There was a problem hiding this comment.
On Windows, I believe MuseScore menu fonts is the default windows font. I don't see this string here on mac on github.
There was a problem hiding this comment.
I would probably be better to use one of the transliteration https://en.wikipedia.org/wiki/Kabyle_language There is only one string translated on transifex but it "looks" a bit like "Tamaziɣt Taqbaylit"
There was a problem hiding this comment.
Let's go for just "Taqbaylit", see also https://de.wikipedia.org/wiki/Kabylische_Sprache
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 15, 2017
but put mscore translations into mscore_*.ts only, instruments translations into instruments_*.ts only and don't run lupdate against qt*.ts all all. The latter seems to have been done wrongly since quite a while, the former since PR musescore#3272 , 41b7906 (master) and d1b606e (2.2)
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 15, 2017
but put mscore translations into mscore_*.ts only, instruments translations into instruments_*.ts only and don't run lupdate against qt*.ts at all. The latter seems to have been done wrongly since quite a while, the former since PR musescore#3272 , 41b7906 (master) and d1b606e (2.2)
rjmatthews62
pushed a commit
to rjmatthews62/MuseScore
that referenced
this pull request
Sep 23, 2017
but put mscore translations into mscore_*.ts only, instruments translations into instruments_*.ts only and don't run lupdate against qt*.ts at all. The latter seems to have been done wrongly since quite a while, the former since PR musescore#3272 , 41b7906 (master) and d1b606e (2.2)
rjmatthews62
pushed a commit
to rjmatthews62/MuseScore
that referenced
this pull request
Sep 26, 2017
…template more frets for steel and 12 string guitars and adjust professional range to match the possible max. frets Fix #213391: add G clarinet and Lupophone, extend ranges of oboe, contra* clarinets and contrabass update harmony layout fix for auto layout lyrics/slurs Fix lupdate step to not put all translations into all ts files but put mscore translations into mscore_*.ts only, instruments translations into instruments_*.ts only and don't run lupdate against qt*.ts at all. The latter seems to have been done wrongly since quite a while, the former since PR musescore#3272 , 41b7906 (master) and d1b606e (2.2) try new Qt::AA_EnableHighDpiScaling app attribute try new Qt::AA_EnableHighDpiScaling app attribute again Implemented TimeSig wrapper so random.qml would work. Modified timesig help * Improved support for MuseScore 3.0 plugins * Added a "set" to ElementW for setting properties. * Added a buildWrapper static function to allow different wrapper descendants. * Converted "random.qml" to work with MuseScore 3.0 * Added a TimeSigW class to support added features required to manipulate TimeSig * Added support for lists of valid property names for use with "get" and "set" Implemented TimeSig wrapper so random.qml would work. Modified timesig help colornotes.qml now works with Musescore 3.0 * Improved support for MuseScore 3.0 plugins * Added a "set" to ElementW for setting properties. * Added a buildWrapper static function to allow different wrapper descendants. * Converted "random.qml" to work with MuseScore 3.0 * Added a TimeSigW class to support added features required to manipulate TimeSig * Added support for lists of valid property names for use with "get" and "set" * Modified timesig help colornotes.qml and random.qml now works with Musescore 3.0 Added proplist.qml to demonstrate readProperties and writeProperties Formatting and Indenting tidy up. Sorted out cursor.element() call, fixed elementWrapper linking. Tidied up tests, incorporated previous mods to colornotes.qml, code indenting and formatting.
rjmatthews62
pushed a commit
to rjmatthews62/MuseScore
that referenced
this pull request
Sep 26, 2017
…template more frets for steel and 12 string guitars and adjust professional range to match the possible max. frets Fix #213391: add G clarinet and Lupophone, extend ranges of oboe, contra* clarinets and contrabass update harmony layout fix for auto layout lyrics/slurs Fix lupdate step to not put all translations into all ts files but put mscore translations into mscore_*.ts only, instruments translations into instruments_*.ts only and don't run lupdate against qt*.ts at all. The latter seems to have been done wrongly since quite a while, the former since PR musescore#3272 , 41b7906 (master) and d1b606e (2.2) try new Qt::AA_EnableHighDpiScaling app attribute try new Qt::AA_EnableHighDpiScaling app attribute again Implemented TimeSig wrapper so random.qml would work. Modified timesig help * Improved support for MuseScore 3.0 plugins * Added a "set" to ElementW for setting properties. * Added a buildWrapper static function to allow different wrapper descendants. * Converted "random.qml" to work with MuseScore 3.0 * Added a TimeSigW class to support added features required to manipulate TimeSig * Added support for lists of valid property names for use with "get" and "set" Implemented TimeSig wrapper so random.qml would work. Modified timesig help colornotes.qml now works with Musescore 3.0 * Improved support for MuseScore 3.0 plugins * Added a "set" to ElementW for setting properties. * Added a buildWrapper static function to allow different wrapper descendants. * Converted "random.qml" to work with MuseScore 3.0 * Added a TimeSigW class to support added features required to manipulate TimeSig * Added support for lists of valid property names for use with "get" and "set" * Modified timesig help colornotes.qml and random.qml now works with Musescore 3.0 Added proplist.qml to demonstrate readProperties and writeProperties Formatting and Indenting tidy up. Sorted out cursor.element() call, fixed elementWrapper linking. Tidied up tests, incorporated previous mods to colornotes.qml, code indenting and formatting.
blackears
pushed a commit
to blackears/MuseScore
that referenced
this pull request
Jul 4, 2018
but put mscore translations into mscore_*.ts only, instruments translations into instruments_*.ts only and don't run lupdate against qt*.ts at all. The latter seems to have been done wrongly since quite a while, the former since PR musescore#3272 , 41b7906 (master) and d1b606e (2.2)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Should be good for master and 2.2
Not really sure the CMakeLists.txt change works for Linux and Mac (I tested this only for Windows), but judging from https://travis-ci.org/musescore/MuseScore/jobs/263144588#L4246-L4346 it seems to work just fine for Linux