From e4a81fbc8aa950dbd17b291cdeab082ddfaddaf4 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <andrej@kacian.sk>
Date: Wed, 27 Jul 2011 23:09:05 +0200
Subject: [PATCH] Use "Sending..." instead of "Posting..." for new
 conversation.

---
 app/views/conversations/new.haml | 2 +-
 config/locales/diaspora/en.yml   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml
index 4589d3e7d5..aeaa9b79b5 100644
--- a/app/views/conversations/new.haml
+++ b/app/views/conversations/new.haml
@@ -51,4 +51,4 @@
 
       .bottom_submit_section
         = submit_tag t('cancel'), :class => 'button', :type => :reset, :rel => "close", :confirm => t('.abandon_changes')
-        = conversation.submit t('.send'), :disable_with => t('shared.publisher.posting'), :class => 'button creation'
+        = conversation.submit t('.send'), :disable_with => t('.sending'), :class => 'button creation'
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 9e49d7e239..7d85cba130 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -234,6 +234,7 @@ en:
       to: "to"
       subject: "subject"
       send: "Send"
+      sending: "Sending..."
       abandon_changes: "Abandon changes?"
     helper:
       new_messages: 
-- 
GitLab