From 366ca2f51444ff852bd335e6a65dc59fd860936b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 4 Sep 2007 10:59:05 +0000 Subject: [PATCH] Convert locale from old documents to localized language name. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=708265 --- keduvocdocument/keduvockvtmlreader.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) 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; -- 2.47.3