From a48059fd8f6f7e1e471b77e7fb4fc6254c6e6d98 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 22 Aug 2018 18:13:29 +0200
Subject: [PATCH] FIX: uses localized string for 429 in reports (#6302)

NGINX was retuning an html page instead of single string for some users. Seems safer to not risk showing anything from server anyways.
---
 .../javascripts/admin/components/admin-report.js.es6     | 9 ++++-----
 config/locales/client.en.yml                             | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6
index d0004997ce3..ca14a197a23 100644
--- a/app/assets/javascripts/admin/components/admin-report.js.es6
+++ b/app/assets/javascripts/admin/components/admin-report.js.es6
@@ -318,11 +318,10 @@ export default Ember.Component.extend({
       })
       .catch(data => {
         if (data.jqXHR && data.jqXHR.status === 429) {
-          const error = data.jqXHR.responseJSON
-            ? data.jqXHR.responseJSON.errors[0]
-            : data.jqXHR.responseText;
-
-          this.set("rateLimitationString", error);
+          this.set(
+            "rateLimitationString",
+            I18n.t("admin.dashboard.too_many_requests")
+          );
         }
       })
       .finally(() => {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d2863997e52..c339487ea79 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2808,6 +2808,7 @@ en:
         disabled: Disabled
         timeout_error: Sorry, query is taking too long, please pick a shorter interval
         exception_error: Sorry, an error occurred while executing the query
+        too_many_requests: You’ve performed this action too many times. Please wait before trying again.
 
         reports:
           trend_title: "%{percent} change. Currently %{current}, was %{prev} in previous period."