| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 6 | ||||
| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 8 |
3 files changed, 16 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index fd2da1a..f9b79ae 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -12,2 +12,5 @@ Fix for displaying month names of an utf8 translated language (like Russian). Th +KA/Pi: +Added for vCard import the option to import contact data in Latin1 format. + ********** VERSION 2.2.3 ************ diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index ece26d2..8dd0a52 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -815,2 +815,8 @@ { "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" },
+{ "Import Format","Import Format" },
+{ "Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages.","Wähle Import Format!\nDefault und Standard ist Utf8.\nLatin1 kann das richtige für\nWesteuropäische Sprachen sein." },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
{ "","" },
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 91df96d..9a8fa68 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -213,3 +213,9 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const #endif - addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); + int ret = KMessageBox::warningYesNoCancel( 0, i18n("Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages."), i18n("Import Format"), i18n("Utf8"), i18n("Latin1") ); + if ( ret == KMessageBox::Cancel ) + return addrList; + if ( ret == KMessageBox::Yes ) + addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); + else + addrList = parseVCard( QString::fromLatin1( rawData.data() ) ); } |