From 3f4f6d5787e09b1beaf2ca4fc83e63050b3be19c Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Wed, 7 Feb 2018 13:46:27 +0100
Subject: [PATCH] gui: Handle paused folders and fix translation strings for fs
 watcher (ref #4713) (#4740)

---
 gui/default/assets/lang/lang-en.json |  9 +++--
 gui/default/index.html               | 52 +++++++++++++++-------------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json
index 27839293c..0179bead5 100644
--- a/gui/default/assets/lang/lang-en.json
+++ b/gui/default/assets/lang/lang-en.json
@@ -65,7 +65,9 @@
    "Device that last modified the item": "Device that last modified the item",
    "Devices": "Devices",
    "Disabled": "Disabled",
-   "Disabled periodic scanning": "Disabled periodic scanning",
+   "Disabled periodic scanning and disabled watching for changes": "Disabled periodic scanning and disabled watching for changes",
+   "Disabled periodic scanning and enabled watching for changes": "Disabled periodic scanning and enabled watching for changes",
+   "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:": "Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:",
    "Disconnected": "Disconnected",
    "Discovered": "Discovered",
    "Discovery": "Discovery",
@@ -83,6 +85,7 @@
    "Editing {%path%}.": "Editing {{path}}.",
    "Enable NAT traversal": "Enable NAT traversal",
    "Enable Relaying": "Enable Relaying",
+   "Enabled": "Enabled",
    "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.": "Enter a non-negative number (e.g., \"2.35\") and select a unit. Percentages are as part of the total disk size.",
    "Enter a non-privileged port number (1024 - 65535).": "Enter a non-privileged port number (1024 - 65535).",
    "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.": "Enter comma separated  (\"tcp://ip:port\", \"tcp://host:port\") addresses or \"dynamic\" to perform automatic discovery of the address.",
@@ -185,7 +188,9 @@
    "Pause": "Pause",
    "Pause All": "Pause All",
    "Paused": "Paused",
-   "Periodic scan every": "Periodic scan every",
+   "Periodic scanning at given interval and disabled watching for changes": "Periodic scanning at given interval and disabled watching for changes",
+   "Periodic scanning at given interval and enabled watching for changes": "Periodic scanning at given interval and enabled watching for changes",
+   "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:": "Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:",
    "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
    "Please set a GUI Authentication User and Password in the Settings dialog.": "Please set a GUI Authentication User and Password in the Settings dialog.",
    "Please wait": "Please wait",
diff --git a/gui/default/index.html b/gui/default/index.html
index 803d93038..fb7d644b3 100644
--- a/gui/default/index.html
+++ b/gui/default/index.html
@@ -374,30 +374,34 @@
                     <tr>
                       <th><span class="fa fa-fw fa-refresh"></span>&nbsp;<span translate>Rescans</span></th>
                       <td class="text-right">
-                        <span ng-if="folder.rescanIntervalS > 0 && !folder.fsWatcherEnabled" tooltip data-original-title="{{'Periodic scan every' | translate}} {{folder.rescanIntervalS | duration}} {{'and disabled watching for changes' | translate}}">
-                          <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
-                          <span class="fa fa-eye-slash"></span><span translate>Disabled</span>
-                        </span>
-                        <span ng-if="folder.rescanIntervalS > 0 && folder.fsWatcherEnabled && !model[folder.id].watchError" tooltip data-original-title="{{'Periodic scan every' | translate}} {{folder.rescanIntervalS | duration}} {{'and watching for changes' | translate}}">
-                          <span class="fa fa-clock-o"></span>{{folder.rescanIntervalS | duration}}&ensp;
-                          <span class="fa fa-eye"></span>&nbsp;<span translate>Running</span>
-                        </span>
-                        <span ng-if="folder.rescanIntervalS > 0 && folder.fsWatcherEnabled && model[folder.id].watchError" tooltip data-original-title="{{'Periodic scan every' | translate}} {{folder.rescanIntervalS | duration}} {{'and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
-                          <span class="fa fa-clock-o"></span>{{folder.rescanIntervalS | duration}}&ensp;
-                          <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
-                        </span>
-                        <span ng-if="folder.rescanIntervalS <= 0 && !folder.fsWatcherEnabled" tooltip data-original-title="{{'Disabled periodic scanning' | translate}} {{'and disabled watching for changes' | translate}}">
-                          <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
-                          <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
-                        </span>
-                        <span ng-if="folder.rescanIntervalS <= 0 && folder.fsWatcherEnabled && !model[folder.id].watchError" tooltip data-original-title="{{'Disabled periodic scanning' | translate}} {{'and watching for changes' | translate}}">
-                          <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
-                          <span class="fa fa-eye"></span>&nbsp;<span translate>Running</span>
-                        </span>
-                        <span ng-if="folder.rescanIntervalS <= 0 && folder.fsWatcherEnabled && model[folder.id].watchError" tooltip data-original-title="{{'Disabled periodic scanning' | translate}} {{'and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
-                          <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
-                          <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
-                        </span>
+                        <div ng-if="folder.rescanIntervalS > 0">
+                          <span ng-if="!folder.fsWatcherEnabled" tooltip data-original-title="{{'Periodic scanning at given interval and disabled watching for changes' | translate}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
+                          </span>
+                          <span ng-if="folder.fsWatcherEnabled && (!model[folder.id].watchError || folder.paused)" tooltip data-original-title="{{'Periodic scanning at given interval and enabled watching for changes' | translate}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fa fa-eye"></span>&nbsp;<span translate>Enabled</span>
+                          </span>
+                          <span ng-if="folder.fsWatcherEnabled && !folder.paused && model[folder.id].watchError" tooltip data-original-title="{{'Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
+                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
+                          </span>
+                        </div>
+                        <div ng-if="folder.rescanIntervalS <= 0">
+                          <span ng-if="!folder.fsWatcherEnabled" tooltip data-original-title="{{'Disabled periodic scanning and disabled watching for changes' | translate}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Disabled</span>
+                          </span>
+                          <span ng-if="folder.fsWatcherEnabled && (!model[folder.id].watchError || folder.paused)" tooltip data-original-title="{{'Disabled periodic scanning and enabled watching for changes' | translate}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fa fa-eye"></span>&nbsp;<span translate>Enabled</span>
+                          </span>
+                          <span ng-if="folder.fsWatcherEnabled && !folder.paused && model[folder.id].watchError" tooltip data-original-title="{{'Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
+                            <span class="fa fa-clock-o"></span>&nbsp;<span translate>Disabled</span>&ensp;
+                            <span class="fa fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr ng-if="folder.order != 'random'">