From 37699a982076a2e9cb2644d2e263a84f32f70f5a Mon Sep 17 00:00:00 2001
From: Neel Patel <neel.patel@enterprisedb.com>
Date: Mon, 18 Apr 2016 08:39:25 -0400
Subject: [PATCH] Don't try to use the template engine's gettext on Javascript
 variables, as it won't work as the templates are evaluated before any JS is
 executed.

---
 .../databases/casts/templates/cast/js/casts.js        |  5 ++---
 .../databases/templates/databases/js/databases.js     |  9 +++++++--
 .../servers/templates/servers/servers.js              | 11 ++++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js
index 690a6d5e9..0ec6ffe70 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/js/casts.js
@@ -211,8 +211,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
                    try {
                      var err = $.parseJSON(xhr.responseText);
                      if (err.success == 0) {
-                       msg = S('{{ _(' + err.errormsg + ')}}').value();
-                       alertify.error("{{ _('" + err.errormsg + "') }}");
+                       alertify.error(err.errormsg);
                      }
                    } catch (e) {}
                  }
@@ -306,4 +305,4 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
 
   }
     return pgBrowser.Nodes['coll-cast'];
-});
\ No newline at end of file
+});
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
index a6bfb90aa..0408a5266 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js
@@ -151,13 +151,18 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) {
                     t.unload(i);
                     t.setInode(i);
                   }
+                  else {
+                    try {
+                      Alertify.error(res.errormsg);
+                    } catch (e) {}
+                    t.unload(i);
+                  }
                 },
                 error: function(xhr, status, error) {
                   try {
                     var err = $.parseJSON(xhr.responseText);
                     if (err.success == 0) {
-                      msg = S('{{ _(' + err.errormsg + ')}}').value();
-                      Alertify.error("{{ _('" + err.errormsg + "') }}");
+                      Alertify.error(err.errormsg);
                     }
                   } catch (e) {}
                   t.unload(i);
diff --git a/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js b/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
index f7e093b08..5423e9848 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
+++ b/web/pgadmin/browser/server_groups/servers/templates/servers/servers.js
@@ -87,7 +87,7 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
                 type:'DELETE',
                 success: function(res) {
                   if (res.success == 1) {
-                    alertify.success("{{ _('" + res.info + "') }}");
+                    alertify.success(res.info);
                     d = t.itemData(i);
                     t.removeIcon(i);
                     d.connected = false;
@@ -99,13 +99,18 @@ function($, _, S, pgAdmin, pgBrowser, alertify) {
                     }
                     obj.trigger('server-disconnected', obj, i, d);
                   }
+                  else {
+                    try {
+                        alertify.error(res.errormsg);
+                    } catch (e) {}
+                    t.unload(i);
+                  }
                 },
                 error: function(xhr, status, error) {
                   try {
                     var err = $.parseJSON(xhr.responseText);
                     if (err.success == 0) {
-                      msg = S('{{ _(' + err.errormsg + ')}}').value();
-                      alertify.error("{{ _('" + err.errormsg + "') }}");
+                      alertify.error(err.errormsg);
                     }
                   } catch (e) {}
                   t.unload(i);