From 91ac730129f9c6036bf5c81e8c4ac89179511e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20J=C3=B6nsson?= <fjo@kth.se>
Date: Mon, 9 Feb 2015 11:03:47 +0100
Subject: [PATCH] Translate loading popyps in client page.

---
 .../src/main/webapp/resources/js/client.js    | 22 ++++++++++---------
 .../resources/js/locale/en/messages.json      |  3 ++-
 .../resources/js/locale/sv/messages.json      |  3 ++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
index 514dfba93..ae2ae3690 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
@@ -438,11 +438,12 @@ var ClientListView = Backbone.View.extend({
     	}
     	
     	$('#loadingbox').sheet('show');
-    	$('#loading').html('<span class="label" id="loading-clients">Clients</span> ' +
-    			'<span class="label" id="loading-whitelist">Whitelist</span> ' + 
-    			'<span class="label" id="loading-scopes">Scopes</span> ' +
-    			'<span class="label" id="loading-stats">Statistics</span> ' 
-    			);
+        $('#loading').html(
+                '<span class="label" id="loading-clients">' + $.t("common.clients") + '</span>' +
+                '<span class="label" id="loading-whitelist">' + $.t("whitelist.whitelist") + '</span> ' + 
+                '<span class="label" id="loading-scopes">' + $.t("common.scopes") + '</span> ' + 
+                '<span class="label" id="loading-stats">' + $.t("common.statistics") + '</span> ' 
+                );
 
     	$.when(this.model.fetchIfNeeded({success:function(e) {$('#loading-clients').addClass('label-success');}}),
     			this.options.whiteListList.fetchIfNeeded({success:function(e) {$('#loading-whitelist').addClass('label-success');}}),
@@ -548,10 +549,11 @@ var ClientListView = Backbone.View.extend({
     refreshTable:function(e) {
     	e.preventDefault();
     	$('#loadingbox').sheet('show');
-    	$('#loading').html('<span class="label" id="loading-clients">Clients</span> ' +
-    			'<span class="label" id="loading-whitelist">Whitelist</span> ' + 
-    			'<span class="label" id="loading-scopes">Scopes</span> ' + 
-    			'<span class="label" id="loading-stats">Statistics</span> ' 
+    	$('#loading').html(
+    	        '<span class="label" id="loading-clients">' + $.t("common.clients") + '</span>' +
+    			'<span class="label" id="loading-whitelist">' + $.t("whitelist.whitelist") + '</span> ' + 
+    			'<span class="label" id="loading-scopes">' + $.t("common.scopes") + '</span> ' + 
+    			'<span class="label" id="loading-stats">' + $.t("common.statistics") + '</span> ' 
     			);
 
     	var _self = this;
@@ -649,7 +651,7 @@ var ClientFormView = Backbone.View.extend({
     	if (this.model.get('id') == null) {
     		// only show the box if this is a new client, otherwise the box is already showing
 	    	$('#loadingbox').sheet('show');
-	    	$('#loading').html('<span class="label" id="loading-scopes">Scopes</span> ');
+	    	$('#loading').html('<span class="label" id="loading-scopes">' + $.t("common.scopes") + '</span> ');
     	}
 
     	$.when(this.options.systemScopeList.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
index ff34c0eba..4191ab10b 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
@@ -92,7 +92,8 @@
         "information": "Information",
         "revoke": "Revoke",
         "save": "Save",
-        "scopes": "Scopes"
+        "scopes": "Scopes",
+        "statistics": "Statistics"
     },
     "grant": {
         "more-info": "more information",
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
index 0e6c723d0..80e6b183a 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
@@ -93,7 +93,8 @@
         "refresh": "Uppdatera",
         "revoke": "Återkalla",
         "save": "Spara",
-        "scopes": "Scope"
+        "scopes": "Scope",
+        "statistics": "Statistik"
     },
     "grant": {
         "refresh": "Uppdatera",