kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-07-30 07:44:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #537 from DieterMayerOSS/fix-collection-names-base-language

Browse Source 
Fall back to the base language for element and folder names
This commit is contained in:
Laurent Trinques
2026-07-11 23:15:12 +02:00
committed by GitHub
parent 81d0045514 c211b68139
commit b97a87c889
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/NameList/nameslist.cpp
+7
View File
@@ -263,6 +263,13 @@ QString NamesList::name(const QString &fallback_name) const
QString system_language = QETApp::langFromSetting();
if (! map_names[system_language].isEmpty())
return (map_names[system_language]);
// langFromSetting() may return a full locale (e.g. "de_DE") while element
// and folder names are keyed by the 2-letter language code ("de"). Try the
// base language before falling back to English, mirroring what setLanguage()
// does for the UI translations.
const QString base_language = system_language.section('_', 0, 0);
if (base_language != system_language && ! map_names[base_language].isEmpty())
return (map_names[base_language]);
if (! map_names["en"].isEmpty()) return (map_names["en"]);
if (! fallback_name.isEmpty()) return (fallback_name);
if (map_names.count()) return (map_names.begin().value());