From eab769b6549c337740a2f57bdbccfb3894343ca4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 20 Feb 2017 18:00:42 +0100
Subject: [PATCH] Move status strings to connector backend

---
 cli/application.cpp        | 40 ++++----------------------------------
 connector/syncthingdev.cpp | 22 ++++++++++++++++++++-
 connector/syncthingdev.h   |  2 ++
 connector/syncthingdir.cpp | 21 ++++++++++++++++++++
 connector/syncthingdir.h   |  2 ++
 5 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/cli/application.cpp b/cli/application.cpp
index bc18e7d..7204aa1 100644
--- a/cli/application.cpp
+++ b/cli/application.cpp
@@ -327,24 +327,7 @@ void Application::printStatus(const ArgumentOccurrence &)
             setStyle(cout);
             printProperty("Label", dir->label);
             printProperty("Path", dir->path);
-            const char *status;
-            switch(dir->status) {
-            case SyncthingDirStatus::Idle:
-                status = "idle"; break;
-            case SyncthingDirStatus::Unshared:
-                status = "unshared"; break;
-            case SyncthingDirStatus::Scanning:
-                status = "scanning"; break;
-            case SyncthingDirStatus::Synchronizing:
-                status = "synchronizing"; break;
-            case SyncthingDirStatus::Paused:
-                status = "paused"; break;
-            case SyncthingDirStatus::OutOfSync:
-                status = "out of sync"; break;
-            default:
-                status = "unknown";
-            }
-            printProperty("Status", status);
+            printProperty("Status", statusString(dir->status));
             printProperty("Last scan time", dir->lastScanTime);
             printProperty("Last file time", dir->lastFileTime);
             printProperty("Last file name", dir->lastFileName);
@@ -377,26 +360,11 @@ void Application::printStatus(const ArgumentOccurrence &)
             cout << dev->name.toLocal8Bit().data() << '\n';
             setStyle(cout);
             printProperty("ID", dev->id);
-            const char *status;
+            QString status;
             if(dev->paused) {
-                status = "paused";
+                status = QStringLiteral("paused");
             } else {
-                switch(dev->status) {
-                case SyncthingDevStatus::Disconnected:
-                    status = "disconnected"; break;
-                case SyncthingDevStatus::OwnDevice:
-                    status = "own device"; break;
-                case SyncthingDevStatus::Idle:
-                    status = "idle"; break;
-                case SyncthingDevStatus::Synchronizing:
-                    status = "synchronizing"; break;
-                case SyncthingDevStatus::OutOfSync:
-                    status = "out of sync"; break;
-                case SyncthingDevStatus::Rejected:
-                    status = "rejected"; break;
-                default:
-                    status = "unknown";
-                }
+                status = statusString(dev->status);
             }
             printProperty("Status", status);
             printProperty("Addresses", dev->addresses);
diff --git a/connector/syncthingdev.cpp b/connector/syncthingdev.cpp
index 9c7bce5..98aead4 100644
--- a/connector/syncthingdev.cpp
+++ b/connector/syncthingdev.cpp
@@ -1,7 +1,27 @@
 #include "./syncthingdev.h"
 
+#include <QCoreApplication>
+
 namespace Data {
 
-
+QString statusString(SyncthingDevStatus status)
+{
+    switch(status) {
+    case SyncthingDevStatus::Unknown:
+        return QCoreApplication::translate("SyncthingDevStatus", "unknown");
+    case SyncthingDevStatus::Disconnected:
+        return QCoreApplication::translate("SyncthingDevStatus", "disconnected");
+    case SyncthingDevStatus::OwnDevice:
+        return QCoreApplication::translate("SyncthingDevStatus", "own device");
+    case SyncthingDevStatus::Idle:
+        return QCoreApplication::translate("SyncthingDevStatus", "idle");
+    case SyncthingDevStatus::Synchronizing:
+        return QCoreApplication::translate("SyncthingDevStatus", "synchronizing");
+    case SyncthingDevStatus::OutOfSync:
+        return QCoreApplication::translate("SyncthingDevStatus", "out of sync");
+    case SyncthingDevStatus::Rejected:
+        return QCoreApplication::translate("SyncthingDevStatus", "rejected");
+    }
+}
 
 } // namespace Data
diff --git a/connector/syncthingdev.h b/connector/syncthingdev.h
index 5474f56..6e5d47e 100644
--- a/connector/syncthingdev.h
+++ b/connector/syncthingdev.h
@@ -21,6 +21,8 @@ enum class SyncthingDevStatus
     Rejected
 };
 
+QString statusString(SyncthingDevStatus status);
+
 struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDev
 {
     SyncthingDev(const QString &id = QString(), const QString &name = QString());
diff --git a/connector/syncthingdir.cpp b/connector/syncthingdir.cpp
index fd40af6..45c5702 100644
--- a/connector/syncthingdir.cpp
+++ b/connector/syncthingdir.cpp
@@ -4,12 +4,33 @@
 
 #include <QStringBuilder>
 #include <QJsonObject>
+#include <QCoreApplication>
 
 using namespace ChronoUtilities;
 using namespace ConversionUtilities;
 
 namespace Data {
 
+QString statusString(SyncthingDirStatus status)
+{
+    switch(status) {
+    case SyncthingDirStatus::Unknown:
+        return QCoreApplication::translate("SyncthingDirStatus", "unknown");
+    case SyncthingDirStatus::Idle:
+        return QCoreApplication::translate("SyncthingDirStatus", "idle");
+    case SyncthingDirStatus::Unshared:
+        return QCoreApplication::translate("SyncthingDirStatus", "unshared");
+    case SyncthingDirStatus::Scanning:
+        return QCoreApplication::translate("SyncthingDirStatus", "scanning");
+    case SyncthingDirStatus::Synchronizing:
+        return QCoreApplication::translate("SyncthingDirStatus", "synchronizing");
+    case SyncthingDirStatus::Paused:
+        return QCoreApplication::translate("SyncthingDirStatus", "paused");
+    case SyncthingDirStatus::OutOfSync:
+        return QCoreApplication::translate("SyncthingDirStatus", "out of sync");
+    }
+}
+
 /*!
  * \brief Assigns the status from the specified status string.
  * \returns Returns whether the status has actually changed.
diff --git a/connector/syncthingdir.h b/connector/syncthingdir.h
index 196a207..2ae1331 100644
--- a/connector/syncthingdir.h
+++ b/connector/syncthingdir.h
@@ -23,6 +23,8 @@ enum class SyncthingDirStatus
     OutOfSync
 };
 
+QString statusString(SyncthingDirStatus status);
+
 struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDirError
 {
     SyncthingDirError(const QString &message, const QString &path) :