[Pkg-owncloud-commits] [owncloud-client] 09/89: Add translatable error messages for individual file errors.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 861de89e9c96785d43e4dbd67aeb50579d11170b
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Dec 4 12:19:38 2013 +0100

    Add translatable error messages for individual file errors.
    
    The error messages coming out of the csync updater and were
    string based before which could not be translated.
---
 src/mirall/csyncthread.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp
index 91c2026..69d552b 100644
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@ -266,8 +266,21 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
     // record the seen files to be able to clean the journal later
     _seenFiles[item._file] = QString();
 
-    if(file->error_string) {
-        item._errorString = QString::fromUtf8(file->error_string);
+    switch(file->error_status) {
+    case CSYNC_STATUS_OK:
+        break;
+    case CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK:
+        item._errorString = tr("Symbolic links are not supported in syncing.");
+        break;
+    case CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST:
+        item._errorString = tr("File is listed on the ignore list.");
+        break;
+    case CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS:
+        item._errorString = tr("File contains invalid characters that can not be synced cross platform.");
+        break;
+    default:
+        Q_ASSERT("Non handled error-status");
+        /* No error string */
     }
 
     item._isDirectory = file->type == CSYNC_FTW_TYPE_DIR;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git