From 0875d645ff02be6ff3460e310d22b18a9256ec44 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Sun, 2 Oct 2016 23:36:00 +0200 Subject: [PATCH] Fixed the conditional localization strings --- .../Server/webroot/ngax/templates/about.html | 6 ++++-- .../Server/webroot/ngax/templates/addoredit.html | 8 ++++++-- .../webroot/ngax/templates/backends/file.html | 5 ++++- Duplicati/Server/webroot/ngax/templates/home.html | 6 ++++-- .../webroot/ngax/templates/localdatabase.html | 5 ++++- Duplicati/Server/webroot/ngax/templates/log.html | 15 ++++++++++++--- .../Server/webroot/ngax/templates/restore.html | 10 ++++++++-- .../webroot/ngax/templates/updatechangelog.html | 3 ++- .../Server/webroot/ngax/templates/waitarea.html | 3 ++- 9 files changed, 46 insertions(+), 15 deletions(-) diff --git a/Duplicati/Server/webroot/ngax/templates/about.html b/Duplicati/Server/webroot/ngax/templates/about.html index 80335a459..13ffb7e93 100644 --- a/Duplicati/Server/webroot/ngax/templates/about.html +++ b/Duplicati/Server/webroot/ngax/templates/about.html @@ -28,11 +28,13 @@
 
-
{{Acknowledgements || Localization.localize('Loading ...')}}
+
{{Acknowledgements}}
+
Loading ...
-
{{ChangeLog || Localization.localize('Loading ...')}}
+
{{ChangeLog}}
+
Loading ...
diff --git a/Duplicati/Server/webroot/ngax/templates/addoredit.html b/Duplicati/Server/webroot/ngax/templates/addoredit.html index e5b85e217..5642bd2b2 100755 --- a/Duplicati/Server/webroot/ngax/templates/addoredit.html +++ b/Duplicati/Server/webroot/ngax/templates/addoredit.html @@ -67,7 +67,8 @@
- {{validatingSourcePath ? 'Validating ...' : 'Add path' | localize}} + + Validating ... + Add path +
diff --git a/Duplicati/Server/webroot/ngax/templates/backends/file.html b/Duplicati/Server/webroot/ngax/templates/backends/file.html index 5f1d87f02..7c398ee9e 100644 --- a/Duplicati/Server/webroot/ngax/templates/backends/file.html +++ b/Duplicati/Server/webroot/ngax/templates/backends/file.html @@ -11,7 +11,10 @@
- {{ShowHiddenFolders ? 'Hide hidden folders' : 'Show hidden folders' | localize}} + + Hide hidden folders + Show hidden folders + Manually type path
diff --git a/Duplicati/Server/webroot/ngax/templates/home.html b/Duplicati/Server/webroot/ngax/templates/home.html index 138fcc6fd..f8ec73ae2 100644 --- a/Duplicati/Server/webroot/ngax/templates/home.html +++ b/Duplicati/Server/webroot/ngax/templates/home.html @@ -11,7 +11,8 @@ {{'Running task:' | translate}} {{activeBackup.Backup.Name}} - {{StopReqId == state.activeTask.Item1 ? 'Force stop' : 'Stop' | localize}} + Force stop + Stop @@ -20,7 +21,8 @@
Running task - {{StopReqId == state.activeTask.Item1 ? 'Force stop' : 'Stop' | localize}} + Force stop + Stop
diff --git a/Duplicati/Server/webroot/ngax/templates/localdatabase.html b/Duplicati/Server/webroot/ngax/templates/localdatabase.html index 386752351..9a5ce9a90 100644 --- a/Duplicati/Server/webroot/ngax/templates/localdatabase.html +++ b/Duplicati/Server/webroot/ngax/templates/localdatabase.html @@ -1,5 +1,8 @@
-

{{'Local database for' | translate}} {{Backup.Backup.Name || Localization.localize('...loading...')}}

+

{{'Local database for' | translate}} + {{Backup.Backup.Name}} + ...loading... +

{{'Each backup has a local database associated with it, which stores information about the remote backup on the local machine.\nThis makes it faster to perform many operations, and reduces the amount of data that needs to be downloaded for each operation.' | translate}} diff --git a/Duplicati/Server/webroot/ngax/templates/log.html b/Duplicati/Server/webroot/ngax/templates/log.html index a30b3a3da..a0e772c61 100644 --- a/Duplicati/Server/webroot/ngax/templates/log.html +++ b/Duplicati/Server/webroot/ngax/templates/log.html @@ -17,7 +17,10 @@
{{item.Exception}}
-
{{LoadingData ? 'Loading ...' : 'Load older data' | localize}}}}
+
+ Loading ... + Load older data +
@@ -45,7 +48,10 @@
{{item.Exception}}
-
{{LoadingData ? 'Loading ...' : 'Load older data' | localize}}}}
+
+ Loading ... + Load older data +
@@ -56,6 +62,9 @@
{{item.Data}}
-
{{LoadingData ? 'Loading ...' : 'Load older data' | localize}}}}
+
+ Loading ... + Load older data +
diff --git a/Duplicati/Server/webroot/ngax/templates/restore.html b/Duplicati/Server/webroot/ngax/templates/restore.html index b95895d35..6470f993f 100644 --- a/Duplicati/Server/webroot/ngax/templates/restore.html +++ b/Duplicati/Server/webroot/ngax/templates/restore.html @@ -16,7 +16,10 @@
- {{ Searching ? 'Busy...' : 'Search' | localize}} + + Busy ... + Search +
@@ -52,7 +55,10 @@
- {{ShowHiddenFolders ? 'Hide hidden folders' : 'Show hidden folders' | localize}} + + Hide hidden folders + Show hidden folders + Manually type path
diff --git a/Duplicati/Server/webroot/ngax/templates/updatechangelog.html b/Duplicati/Server/webroot/ngax/templates/updatechangelog.html index df3186e06..1cb771033 100644 --- a/Duplicati/Server/webroot/ngax/templates/updatechangelog.html +++ b/Duplicati/Server/webroot/ngax/templates/updatechangelog.html @@ -5,7 +5,8 @@ {{'Current version is {0} ({1})' | translate | args: systeminfo.ServerVersionName: systeminfo.ServerVersion}}
-
{{ChangeLog || Localization.localize('Loading ...')}}
+
{{ChangeLog}}
+
Loading ...
Install diff --git a/Duplicati/Server/webroot/ngax/templates/waitarea.html b/Duplicati/Server/webroot/ngax/templates/waitarea.html index 51106c28a..7001e753d 100644 --- a/Duplicati/Server/webroot/ngax/templates/waitarea.html +++ b/Duplicati/Server/webroot/ngax/templates/waitarea.html @@ -1,7 +1,8 @@
Waiting for task to begin
-
{{text || Localization.localize('Task is running')}}
+
{{text}}
+
Task is running
{{ServerStatus.progress_state_text[serverstate.lastPgEvent.Phase] || serverstate.lastPgEvent.Phase}}