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 142a3985f8ab22e20cdc6be9db7f0b345755b553..8f5d3654fcb1f8f2fdf904147c1c2b63aab51308 100644 (file)
--- 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;