Remove support for russian language.
This commit is contained in:
parent
06a2e69a67
commit
6d77f3ebc0
|
@ -5,6 +5,7 @@
|
||||||
- [smart-pattern/valentina#171] System identifies two of the same curve.
|
- [smart-pattern/valentina#171] System identifies two of the same curve.
|
||||||
- [smart-pattern/valentina#170] Incorrect work with curves.
|
- [smart-pattern/valentina#170] Incorrect work with curves.
|
||||||
- Suspend use of qt_ntfs_permission_lookup. QTBUG-101168
|
- Suspend use of qt_ntfs_permission_lookup. QTBUG-101168
|
||||||
|
- Remove support for russian language.
|
||||||
|
|
||||||
# Valentina 0.7.50 February 14, 2022
|
# Valentina 0.7.50 February 14, 2022
|
||||||
- Fix regression. Minimal seam allowance width is less than the point accuracy values.
|
- Fix regression. Minimal seam allowance width is less than the point accuracy values.
|
||||||
|
|
|
@ -19,13 +19,13 @@ NUMBER=${#NUMBER[@]}
|
||||||
|
|
||||||
# Certant languages like he_IL and zh_CN are not supported by math parser
|
# Certant languages like he_IL and zh_CN are not supported by math parser
|
||||||
for ((i=0;i<NUMBER;i++)); do
|
for ((i=0;i<NUMBER;i++)); do
|
||||||
tx pull -r valentina-project.measurements_p${i}${MEASUREMENTS_BRANCH}ts --mode=developer -f --skip -l "ru_RU,uk,de_DE,cs,he_IL,fr_FR,it_IT,nl,id,es,fi,en_US,en_CA,en_IN,ro_RO,zh_CN,pt_BR,el_GR,pl_PL" &
|
tx pull -r valentina-project.measurements_p${i}${MEASUREMENTS_BRANCH}ts --mode=developer -f --skip -l "uk,de_DE,cs,he_IL,fr_FR,it_IT,nl,id,es,fi,en_US,en_CA,en_IN,ro_RO,zh_CN,pt_BR,el_GR,pl_PL" &
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
tx pull -r valentina-project.valentina_${VALENTINA_BRANCH}ts --mode=developer -f --skip &
|
tx pull -r valentina-project.valentina_${VALENTINA_BRANCH}ts --mode=developer -f --skip &
|
||||||
sleep 1
|
sleep 1
|
||||||
tx pull -r valentina-project.measurements_p998${MEASUREMENTS_BRANCH}ts --mode=developer -f --skip -l "ru_RU,uk,de_DE,cs,he_IL,fr_FR,it_IT,nl,id,es,fi,en_US,en_CA,en_IN,ro_RO,zh_CN,pt_BR,el_GR,pl_PL" &
|
tx pull -r valentina-project.measurements_p998${MEASUREMENTS_BRANCH}ts --mode=developer -f --skip -l "uk,de_DE,cs,he_IL,fr_FR,it_IT,nl,id,es,fi,en_US,en_CA,en_IN,ro_RO,zh_CN,pt_BR,el_GR,pl_PL" &
|
||||||
|
|
||||||
wait
|
wait
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -48,7 +48,6 @@ include(../../src/libs/vwidgets/vwidgets.pri)
|
||||||
# When adding a translation here, also add it in the macx part (translations.pri).
|
# When adding a translation here, also add it in the macx part (translations.pri).
|
||||||
|
|
||||||
LANGUAGES += \
|
LANGUAGES += \
|
||||||
ru_RU \
|
|
||||||
uk_UA \
|
uk_UA \
|
||||||
de_DE \
|
de_DE \
|
||||||
cs_CZ \
|
cs_CZ \
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -12,7 +12,6 @@ PMSYSTEMS += \
|
||||||
# An example of using LOCALES="de_DE nl_NL"
|
# An example of using LOCALES="de_DE nl_NL"
|
||||||
isEmpty(LOCALES){
|
isEmpty(LOCALES){
|
||||||
LANGUAGES += \
|
LANGUAGES += \
|
||||||
ru_RU \
|
|
||||||
uk_UA \
|
uk_UA \
|
||||||
de_DE \
|
de_DE \
|
||||||
cs_CZ \
|
cs_CZ \
|
||||||
|
@ -83,17 +82,6 @@ macx{
|
||||||
RESOURCES_DIR = "Contents/Resources"
|
RESOURCES_DIR = "Contents/Resources"
|
||||||
|
|
||||||
# Copy in bundle translation files.
|
# Copy in bundle translation files.
|
||||||
exists($${TRANSLATIONS_PATH}/valentina_ru_RU.qm){
|
|
||||||
TRANSLATION_ru_RU.files += \
|
|
||||||
$$files($${TRANSLATIONS_PATH}/*_ru_RU.qm) \
|
|
||||||
$$[QT_INSTALL_TRANSLATIONS]/qtbase_ru.qm \
|
|
||||||
$$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \
|
|
||||||
$$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_ru.qm \
|
|
||||||
$${TRANSLATIONS_PATH}/Localizable.strings
|
|
||||||
TRANSLATION_ru_RU.path = "$$RESOURCES_DIR/translations/ru_RU.lproj"
|
|
||||||
QMAKE_BUNDLE_DATA += TRANSLATION_ru_RU
|
|
||||||
}
|
|
||||||
|
|
||||||
exists($${TRANSLATIONS_PATH}/valentina_uk_UA.qm){
|
exists($${TRANSLATIONS_PATH}/valentina_uk_UA.qm){
|
||||||
TRANSLATION_uk_UA.files += \
|
TRANSLATION_uk_UA.files += \
|
||||||
$$files($${TRANSLATIONS_PATH}/*_uk_UA.qm) \
|
$$files($${TRANSLATIONS_PATH}/*_uk_UA.qm) \
|
||||||
|
|
|
@ -103,7 +103,6 @@ QStringList SupportedLocales()
|
||||||
{
|
{
|
||||||
return QStringList
|
return QStringList
|
||||||
{
|
{
|
||||||
"ru_RU",
|
|
||||||
"uk_UA",
|
"uk_UA",
|
||||||
"de_DE",
|
"de_DE",
|
||||||
"cs_CZ",
|
"cs_CZ",
|
||||||
|
@ -491,6 +490,11 @@ void InitLanguages(QComboBox *combobox)
|
||||||
locale.truncate(locale.lastIndexOf('.')); // "valentina_de_De"
|
locale.truncate(locale.lastIndexOf('.')); // "valentina_de_De"
|
||||||
locale.remove(0, locale.indexOf('_') + 1); // "de_De"
|
locale.remove(0, locale.indexOf('_') + 1); // "de_De"
|
||||||
|
|
||||||
|
if (locale.startsWith(QLatin1String("ru")))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (not englishUS)
|
if (not englishUS)
|
||||||
{
|
{
|
||||||
englishUS = (en_US == locale);
|
englishUS = (en_US == locale);
|
||||||
|
|
|
@ -204,6 +204,12 @@ void VAbstractApplication::LoadTranslation(const QString &locale)
|
||||||
qDebug()<<"Locale is empty.";
|
qDebug()<<"Locale is empty.";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (locale.startsWith(QLatin1String("ru")))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
qDebug()<<"Checked locale:"<<locale;
|
qDebug()<<"Checked locale:"<<locale;
|
||||||
|
|
||||||
ClearTranslation();
|
ClearTranslation();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user