From: Frederik Gladhorn <gladhorn@kde.org>
Date: Tue, 4 Sep 2007 10:59:05 +0000 (+0000)
Subject: Convert locale from old documents to localized language name.
X-Git-Tag: v3.94.0~80
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=366ca2f51444ff852bd335e6a65dc59fd860936b;p=libqmvoc.git

Convert locale from old documents to localized language name.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=708265
---

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index 142a398..8f5d365 100644
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -1081,20 +1081,26 @@ bool KEduVocKvtmlReader::readExpression( QDomElement &domElementParent )
 }
 
 
-bool KEduVocKvtmlReader::addLanguage( int languageId, const QString& language)
+bool KEduVocKvtmlReader::addLanguage( int languageId, const QString& locale)
 {
-
-kDebug() << "addLanguage( " << languageId << ", " << language << ")";
     if ( m_doc->identifierCount() <= languageId ) {
         m_doc->appendIdentifier();
         // first entry
-        if ( !language.isEmpty() ) {      // no definition in first entry
-            m_doc->identifier(languageId).setLocale(language);
-            m_doc->identifier(languageId).setName(language);
+        if ( !locale.isEmpty() ) {      // no definition in first entry
+            m_doc->identifier(languageId).setLocale(locale);
+
+            QString languageName = KGlobal::locale()->languageCodeToName(locale);
+            if ( languageName.isEmpty() ) {
+                languageName = locale;
+            }
+
+            m_doc->identifier(languageId).setName(languageName);
+            kDebug() << "addLanguage( " << languageId << ", " << locale << "): " << languageName;
+
         }
     } else {
-        if ( !language.isEmpty() ) {
-            if ( language != m_doc->identifier(languageId).locale() ) {
+        if ( !locale.isEmpty() ) {
+            if ( locale != m_doc->identifier(languageId).locale() ) {
                 // different originals ?
                 m_errorMessage = i18n( "Ambiguous definition of language code" );
                 return false;