From ca1c7d11e65a0f14fd9b2f440072708ddd2dc6e4 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 6 Aug 2024 13:12:03 +0200 Subject: [PATCH] SquishTests: Adapt to changed language display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iff286316a26807e383073980de7ca58186a7de2e Reviewed-by: Jukka Nokso Reviewed-by: Robert Löhning --- tests/system/suite_general/tst_installed_languages/test.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_general/tst_installed_languages/test.py b/tests/system/suite_general/tst_installed_languages/test.py index e48abed67f9..7037e92b0f5 100644 --- a/tests/system/suite_general/tst_installed_languages/test.py +++ b/tests/system/suite_general/tst_installed_languages/test.py @@ -12,10 +12,13 @@ def main(): mouseClick(waitForObjectItem(":Options_QListView", "Environment")) clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Interface") languageName = testData.field(lang, "language") + locale = QLocale(testData.field(lang, "ISO")) if "%1" in languageName: - country = str(QLocale.countryToString(QLocale(testData.field(lang, "ISO")).country())) + country = str(QLocale.countryToString(locale.country())) languageName = languageName.replace("%1", country) - selectFromCombo(":User Interface.languageBox_QComboBox", languageName) + natName = "%s (%s)" % (str(locale.nativeLanguageName()), str(locale.nativeTerritoryName())) + comboLanguageName = natName + " - " + languageName + selectFromCombo(":User Interface.languageBox_QComboBox", comboLanguageName) clickButton(waitForObject(":Options.OK_QPushButton")) clickButton(waitForObject(":Restart required.Later_QPushButton")) test.verify(waitFor("not object.exists(':Options_Core::Internal::SettingsDialog')", 5000),