From 816f0c55c0c6cdace7bde67b200a32317fb9796a Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 31 Oct 2018 11:42:00 +0100
Subject: [PATCH] Adds new social share partial for proposals

---
 app/views/proposals/_social_share.html.erb | 10 ++++++++++
 app/views/proposals/_votes.html.erb        |  9 +++------
 app/views/proposals/show.html.erb          |  8 ++------
 app/views/shared/_social_share.html.erb    | 14 +++++++++-----
 config/locales/en/general.yml              |  3 +++
 5 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 app/views/proposals/_social_share.html.erb

diff --git a/app/views/proposals/_social_share.html.erb b/app/views/proposals/_social_share.html.erb
new file mode 100644
index 000000000..b675fe192
--- /dev/null
+++ b/app/views/proposals/_social_share.html.erb
@@ -0,0 +1,10 @@
+<%= render 'shared/social_share',
+            share_title: share_title,
+            title: proposal.title,
+            url: proposal_url(proposal),
+            description: t("proposals.share.message",
+                            summary: proposal.summary,
+                            org: setting['org_name']),
+            mobile: t("proposals.share.message_mobile",
+                        summary: proposal.summary,
+                        handle: setting['twitter_handle']) %>
diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb
index 92b680493..6624448fe 100644
--- a/app/views/proposals/_votes.html.erb
+++ b/app/views/proposals/_votes.html.erb
@@ -10,7 +10,8 @@
     <%= t("proposals.proposal.supports", count: proposal.total_votes) %>&nbsp;
     <span>
       <abbr>
-        <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %>
+        <%= t("proposals.proposal.supports_necessary",
+               number: number_with_delimiter(Proposal.votes_needed_for_success)) %>
       </abbr>
     </span>
   </span>
@@ -60,11 +61,7 @@
 
   <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %>
     <div class="share-supported">
-      <%= render partial: 'shared/social_share', locals: {
-          title: proposal.title,
-          url: proposal_url(proposal),
-          description: proposal.summary
-      } %>
+      <%= render 'proposals/social_share', proposal: proposal, share_title: false %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 9794c0365..2c40a7075 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -192,12 +192,8 @@
                       { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %>
           <% end %>
         </div>
-        <%= render partial: 'shared/social_share', locals: {
-          share_title: t("proposals.show.share"),
-          title: @proposal.title,
-          url: proposal_url(@proposal),
-          description: @proposal.summary
-        } %>
+
+        <%= render 'proposals/social_share', proposal: @proposal, share_title: t("proposals.show.share") %>
 
         <% if current_user %>
           <div class="sidebar-divider"></div>
diff --git a/app/views/shared/_social_share.html.erb b/app/views/shared/_social_share.html.erb
index 7148f4f0a..f2346c30c 100644
--- a/app/views/shared/_social_share.html.erb
+++ b/app/views/shared/_social_share.html.erb
@@ -1,13 +1,17 @@
+<% description = local_assigns.fetch(:description, '') %>
+<% description = truncate(ActionView::Base.full_sanitizer.sanitize(description), length: 140) %>
 <% if local_assigns[:share_title].present? %>
   <div id="social-share" class="sidebar-divider"></div>
   <p class="sidebar-title"><%= share_title %></p>
 <% end %>
 <div class="social-share-full">
-  <%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}",
-                              :url => local_assigns[:url],
-                              :image => local_assigns[:image_url].present? ? local_assigns[:image_url] : '',
-			      :desc => local_assigns[:description].present? ? local_assigns[:description] : '' ) %>
-  <a href="whatsapp://send?text=<%= CGI.escape(title) %>&nbsp;<%= url %>"
+  <%= social_share_button_tag("#{title} #{setting['twitter_hashtag']} #{setting['twitter_handle']}",
+                              url: local_assigns[:url],
+                              image: local_assigns.fetch(:image_url, ''),
+                              desc: description,
+                              'data-twitter-title': local_assigns[:mobile],
+                              'data-telegram-title': local_assigns[:mobile])%>
+  <a href="whatsapp://send?text=<%= local_assigns[:mobile]%>&nbsp;<%= url %>"
      class="show-for-small-only" data-action="share/whatsapp/share">
     <span class="icon-whatsapp whatsapp"></span>
     <span class="show-for-sr"><%= t("social.whatsapp") %></span>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 5de10978f..096fbc83e 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -450,6 +450,9 @@ en:
     update:
       form:
         submit_button: Save changes
+    share:
+      message: "I supported the proposal %{summary} in %{org}. If you're interested, support it too!"
+      message_mobile: "I supported the proposal %{summary} in %{handle}. If you're interested, support it too!"
   polls:
     all: "All"
     no_dates: "no date assigned"