From 04a303108dd44990aa86b38a70da51b138f6a023 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 2 Jul 2015 16:12:17 -0700
Subject: [PATCH] GUAC-1172: Work around
 angular-translate/angular-translate#788 by using the translate directive (no
 filter). Current scope is not available to filters as of AngularJS 1.3.

---
 .../webapp/app/client/templates/guacFileTransfer.html  |  4 +++-
 .../src/main/webapp/app/home/templates/connection.html |  6 +++---
 .../webapp/app/manage/templates/manageConnection.html  |  4 +++-
 .../app/notification/templates/guacNotification.html   | 10 ++++++++--
 .../main/webapp/app/settings/templates/connection.html |  6 +++---
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/templates/guacFileTransfer.html b/guacamole/src/main/webapp/app/client/templates/guacFileTransfer.html
index 26cb1dee7..2587421ca 100644
--- a/guacamole/src/main/webapp/app/client/templates/guacFileTransfer.html
+++ b/guacamole/src/main/webapp/app/client/templates/guacFileTransfer.html
@@ -25,7 +25,9 @@
     <div class="filename">{{transfer.filename}}</div>
 
     <!-- Progress/status text -->
-    <div class="text">{{'CLIENT.TEXT_FILE_TRANSFER_PROGRESS' | translate:'{PROGRESS: getProgressValue(), UNIT: getProgressUnit()}'}}</div>
+    <div class="text"
+         translate="CLIENT.TEXT_FILE_TRANSFER_PROGRESS"
+         translate-values="{PROGRESS: getProgressValue(), UNIT: getProgressUnit()}"></div>
 
     <!-- Progress bar -->
     <div class="progress"><div ng-style="{'width': getPercentDone() + '%'}" class="bar"></div></div>
diff --git a/guacamole/src/main/webapp/app/home/templates/connection.html b/guacamole/src/main/webapp/app/home/templates/connection.html
index 9187c4f25..33c5aec7e 100644
--- a/guacamole/src/main/webapp/app/home/templates/connection.html
+++ b/guacamole/src/main/webapp/app/home/templates/connection.html
@@ -32,9 +32,9 @@
         <span class="name">{{item.name}}</span>
         
         <!-- Active user count -->
-        <span class="activeUserCount" ng-show="item.getActiveConnections()">
-            {{'HOME.INFO_ACTIVE_USER_COUNT' | translate:'{USERS: item.getActiveConnections()}'}}
-        </span>
+        <span class="activeUserCount" ng-show="item.getActiveConnections()"
+            translate="HOME.INFO_ACTIVE_USER_COUNT"
+            translate-values="{USERS: item.getActiveConnections()}"></span>
 
     </div>
 </a>
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
index 1ea45baa5..76360514f 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
@@ -96,7 +96,9 @@ <h2 class="header">{{'MANAGE_CONNECTION.SECTION_HEADER_HISTORY' | translate}}</h
                 <tr ng-repeat="wrapper in wrapperPage">
                     <td class="username">{{wrapper.entry.username}}</td>
                     <td class="start">{{wrapper.entry.startDate | date:historyDateFormat}}</td>
-                    <td class="duration">{{wrapper.durationText | translate:"{VALUE: wrapper.duration.value, UNIT: wrapper.duration.unit}"}}</td>
+                    <td class="duration"
+                        translate="{{wrapper.durationText}}"
+                        translate-values="{VALUE: wrapper.duration.value, UNIT: wrapper.duration.unit}"></td>
                 </tr>
             </tbody>
         </table>
diff --git a/guacamole/src/main/webapp/app/notification/templates/guacNotification.html b/guacamole/src/main/webapp/app/notification/templates/guacNotification.html
index a31cff250..1b1cae6f6 100644
--- a/guacamole/src/main/webapp/app/notification/templates/guacNotification.html
+++ b/guacamole/src/main/webapp/app/notification/templates/guacNotification.html
@@ -32,10 +32,16 @@
         <p ng-show="notification.text" class="text">{{notification.text | translate}}</p>
 
         <!-- Current progress -->
-        <div ng-show="notification.progress" class="progress"><div ng-show="progressPercent" ng-style="{'width': progressPercent + '%'}" class="bar"></div><div ng-show="notification.progress.text" class="text">{{notification.progress.text | translate:"{ PROGRESS: notification.progress.value, UNIT: notification.progress.unit}"}}</div></div>
+        <div class="progress" ng-show="notification.progress"><div class="bar" ng-show="progressPercent" ng-style="{'width': progressPercent + '%'}"></div><div
+                ng-show="notification.progress.text"
+                translate="{{notification.progress.text}}"
+                translate-values="{PROGRESS: notification.progress.value, UNIT: notification.progress.unit}"></div></div>
 
         <!-- Default action countdown text -->
-        <p ng-show="notification.countdown.text" class="countdown-text">{{notification.countdown.text | translate:"{ REMAINING: timeRemaining}"}}</p>
+        <p class="countdown-text"
+           ng-show="notification.countdown.text"
+           translate="{{notification.countdown.text}}"
+           translate-values="{REMAINING: timeRemaining}"></p>
 
     </div>
 
diff --git a/guacamole/src/main/webapp/app/settings/templates/connection.html b/guacamole/src/main/webapp/app/settings/templates/connection.html
index 97960a2dd..f2d1a5550 100644
--- a/guacamole/src/main/webapp/app/settings/templates/connection.html
+++ b/guacamole/src/main/webapp/app/settings/templates/connection.html
@@ -32,9 +32,9 @@
         <span class="name">{{item.name}}</span>
 
         <!-- Active user count -->
-        <span class="activeUserCount" ng-show="item.getActiveConnections()">
-            {{'SETTINGS_CONNECTIONS.INFO_ACTIVE_USER_COUNT' | translate:'{USERS: item.getActiveConnections()}'}}
-        </span>
+        <span class="activeUserCount" ng-show="item.getActiveConnections()"
+            translate="SETTINGS_CONNECTIONS.INFO_ACTIVE_USER_COUNT"
+            translate-values="{USERS: item.getActiveConnections()}"></span>
         
     </div>
 </a>