From d152b073a6dc330d9ca50c31bece65bb73eb6385 Mon Sep 17 00:00:00 2001
From: Jonathan Labreuille <jonathan@mailpoet.com>
Date: Tue, 5 Jul 2016 13:58:12 +0200
Subject: [PATCH] fixed onSuccess on bulk actions and locale formatted numbers
 in success messages

---
 assets/js/src/listing/bulk_actions.jsx |  6 +++---
 assets/js/src/listing/listing.jsx      |  4 ++--
 assets/js/src/subscribers/list.jsx     | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/assets/js/src/listing/bulk_actions.jsx b/assets/js/src/listing/bulk_actions.jsx
index 10e74eb9e3..053054d1fa 100644
--- a/assets/js/src/listing/bulk_actions.jsx
+++ b/assets/js/src/listing/bulk_actions.jsx
@@ -47,13 +47,13 @@ function(
 
       data.action = this.state.action;
 
-      var callback = function() {};
+      var onSuccess = function() {};
       if(action['onSuccess'] !== undefined) {
-        callback = action.onSuccess;
+        onSuccess = action.onSuccess;
       }
 
       if(data.action) {
-        this.props.onBulkAction(selected_ids, data, callback);
+        this.props.onBulkAction(selected_ids, data).then(onSuccess);
       }
 
       this.setState({
diff --git a/assets/js/src/listing/listing.jsx b/assets/js/src/listing/listing.jsx
index 0221ddac8c..7f60d05e8f 100644
--- a/assets/js/src/listing/listing.jsx
+++ b/assets/js/src/listing/listing.jsx
@@ -546,9 +546,9 @@ const Listing = React.createClass({
       endpoint: this.props.endpoint,
       action: 'bulkAction',
       data: data
-    }).done(function() {
+    }).done(() => {
       this.getItems();
-    }.bind(this));
+    });
   },
   handleSearch: function(search) {
     this.setState({
diff --git a/assets/js/src/subscribers/list.jsx b/assets/js/src/subscribers/list.jsx
index 9dae357317..b338e6ff9f 100644
--- a/assets/js/src/subscribers/list.jsx
+++ b/assets/js/src/subscribers/list.jsx
@@ -47,7 +47,7 @@ const messages = {
       } else if (~~response > 1) {
         message = (
           MailPoet.I18n.t('multipleSubscribersTrashed')
-        ).replace('%$1d', ~~response);
+        ).replace('%$1d', (~~response).toLocaleString());
       }
 
       if (message !== null) {
@@ -83,7 +83,7 @@ const messages = {
       } else if (~~response > 1) {
         message = (
           MailPoet.I18n.t('multipleSubscribersRestored')
-        ).replace('%$1d', ~~response);
+        ).replace('%$1d', (~~response).toLocaleString());
       }
 
       if (message !== null) {
@@ -120,7 +120,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersMovedToList')
-        .replace('%$1d', ~~(response.subscribers))
+        .replace('%$1d', (~~(response.subscribers)).toLocaleString())
         .replace('%$2s', response.segment)
       );
     }
@@ -151,7 +151,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersAddedToList')
-        .replace('%$1d', ~~response.subscribers)
+        .replace('%$1d', (~~response.subscribers).toLocaleString())
         .replace('%$2s', response.segment)
       );
     }
@@ -182,7 +182,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersRemovedFromList')
-        .replace('%$1d', ~~response.subscribers)
+        .replace('%$1d', (~~response.subscribers).toLocaleString())
         .replace('%$2s', response.segment)
       );
     }
@@ -193,7 +193,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersRemovedFromAllLists')
-        .replace('%$1d', ~~response)
+        .replace('%$1d', (~~response).toLocaleString())
       );
     }
   },
@@ -203,7 +203,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleConfirmationEmailsSent')
-        .replace('%$1d', ~~response)
+        .replace('%$1d', (~~response).toLocaleString())
       );
     }
   },