[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/akonadi/migration/kres
From:       Volker Krause <vkrause () kde ! org>
Date:       2008-11-01 11:34:42
Message-ID: 1225539282.266880.7642.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 878472 by vkrause:

Since the binary format which is offered by the old vcard resource
doesn't work, both practically (I'm not even able to create a simple
test file) and theoretically (no support for photos and sounds, various
backward compatibility issues, etc.), we will not provide migration
for that and probably drop it for KDE5. Until then the compat bridge
can be used to manually move contacts for the extremely unlikely case
someone is still using this format.


 M  +5 -3      kabcmigrator.cpp  
 M  +1 -1      kcalmigrator.cpp  


--- trunk/KDE/kdepim/akonadi/migration/kres/kabcmigrator.cpp #878471:878472
@@ -49,8 +49,10 @@
 void KABCMigrator::migrateFileResource(KABC::Resource * res)
 {
   const KConfigGroup kresCfg = kresConfig( res );
-  if ( kresCfg.readEntry( "FileFormat", "" ) != "vcard" ) {
-    migrationFailed( "Unsupported file format found." );
+  const QString format = kresCfg.readEntry( "FileFormat", "" );
+  if ( format != "vcard" ) {
+    migrationFailed( i18n("Unsupported file format found. "
+        "The file format '%1' is no longer supported, please convert to another one.", format ) );
     return;
   }
   const AgentType type = AgentManager::self()->type( "akonadi_vcard_resource" );
@@ -66,7 +68,7 @@
 void KABCMigrator::fileResourceCreated(KJob * job)
 {
   if ( job->error() ) {
-    migrationFailed( "Failed to create resource: " + job->errorText() );
+    migrationFailed( i18n("Failed to create resource: %1", job->errorText()) );
     return;
   }
   KABC::Resource *res = currentResource();
--- trunk/KDE/kdepim/akonadi/migration/kres/kcalmigrator.cpp #878471:878472
@@ -62,7 +62,7 @@
 void KCalMigrator::fileResourceCreated(KJob * job)
 {
   if ( job->error() ) {
-    migrationFailed( "Failed to create resource: " + job->errorText() );
+    migrationFailed( i18n("Failed to create resource: %1", job->errorText()) );
     return;
   }
   KCal::ResourceCalendar *res = currentResource();
[prev in list] [next in list] [prev in thread] [next in thread]