From 36e6516c33596066f702818c635f6831b460ace6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 20 Aug 2020 03:32:43 +0300 Subject: [PATCH] lokalize: use KLocale API to obtain language names Signed-off-by: Ivailo Monev --- lokalize/src/catalog/gettextheader.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lokalize/src/catalog/gettextheader.cpp b/lokalize/src/catalog/gettextheader.cpp index bea90d77..8e0de430 100644 --- a/lokalize/src/catalog/gettextheader.cpp +++ b/lokalize/src/catalog/gettextheader.cpp @@ -307,12 +307,6 @@ void updateHeader(QString& header, QString language; //initialized with preexisting value or later QString mailingList; //initialized with preexisting value or later - static KConfig* allLanguagesConfig=0; - if (!allLanguagesConfig) - { - allLanguagesConfig = new KConfig("all_languages", KConfig::NoGlobals, "locale"); - allLanguagesConfig->setLocale(QString()); - } QRegExp langTeamRegExp("^ *Language-Team:.*"); for ( it = headerList.begin(),found=false; it != headerList.end() && !found; ++it ) { @@ -323,11 +317,8 @@ void updateHeader(QString& header, QMap map; foreach (const QString &runningLangCode, KGlobal::locale()->allLanguagesList()) { - KConfigGroup cg(allLanguagesConfig, runningLangCode); - map[cg.readEntry("Name")]=runningLangCode; + map[KGlobal::locale()->languageCodeToName(runningLangCode)]=runningLangCode; } - if (map.size()<16) //may be just "en_US" and "" - kWarning()<<"seems that all_languages file is missing (usually located under /usr/share/locale)"; QRegExp re("^ *Language-Team: *(.*) *<([^>]*)>"); if (re.indexIn(*it) != -1 ) @@ -347,8 +338,7 @@ void updateHeader(QString& header, if (language.isEmpty()) { //language=locale.languageCodeToName(d->_langCode); - KConfigGroup cg(allLanguagesConfig, langCode); - language=cg.readEntry("Name"); + language=KGlobal::locale()->languageCodeToName(langCode); if (language.isEmpty()) language=langCode; } -- 2.11.0