From 6fd48949977f899173d661c20a1453a64e87c54a Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Sat, 31 May 2014 21:06:47 +0300
Subject: [PATCH] Add error flash message to publisher on error from server

---
 app/assets/javascripts/app/views/publisher_view.js | 1 +
 config/locales/javascript/javascript.en.yml        | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js
index e54737660..da32dd286 100644
--- a/app/assets/javascripts/app/views/publisher_view.js
+++ b/app/assets/javascripts/app/views/publisher_view.js
@@ -183,6 +183,7 @@ app.views.Publisher = Backbone.View.extend({
         self.setInputEnabled(true);
         self.setButtonsEnabled(true);
         self.$('#publisher_spinner').addClass('hidden');
+        Diaspora.page.flashMessages.render({ 'success':false, 'notice':Diaspora.I18n.t('failed_to_post_message') });
       }
     });
   },
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index a9647a999..6ca5e7330 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -50,6 +50,9 @@ en:
       limited: "Limited - your post will only be seen by people you are sharing with"
       public: "Public - your post will be visible to everyone and found by search engines"
       near_from: "Posted from: <%= location %>"
+      option: "Option <%= nr %>"
+      add_option: "Add option"
+      question: "Question"
     bookmarklet:
       post_submit: "Submitting post..."
       post_success: "Posted! Closing popup window..."
@@ -110,11 +113,6 @@ en:
       mark_read: "Mark read"
       mark_unread: "Mark unread"
 
-    publisher:
-      option: "Option <%= nr %>"
-      add_option: "Add option"
-      question: "Question"
-
     stream:
       hide: "Hide"
       public: "Public"