Merge branch '37-tweet-it-button' into develop

mysociety · Mar 26, 2024 · d46be24 · d46be24
2 parents 012010d + 42d7e23
commit d46be24
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/app/assets/images/next-step-twitter.png b/app/assets/images/next-step-twitter.png
diff --git a/app/views/general/blog.html.erb b/app/views/general/blog.html.erb
@@ -1,4 +1,4 @@
-<% @title = _("{{site_name}} blog and tweets", :site_name => site_name) %>
+<% @title = _("{{site_name}} blog", :site_name => site_name) %>
 
 <div id="left_column" class="left_column">
   <h1><%=@title %></h1>
@@ -58,7 +58,7 @@
   <% if !@twitter_user.empty? %>
     <div class="act_link">
       <i class="act-link-icon act-link-icon--twitter"></i>
-      <a href="https://twitter.com/<%= @twitter_user %>"><%= _("Follow us on twitter") %></a>
+      <a href="https://twitter.com/<%= @twitter_user %>"><%= _("Follow us on X") %></a>
     </div>
   <% end %>
 

diff --git a/app/views/info_request_batch/_batch_sent.html.erb b/app/views/info_request_batch/_batch_sent.html.erb
@@ -17,10 +17,10 @@
       <h2><%= _("Share your batch request") %></h2>
 
       <%= link_to image_tag("next-step-twitter.png",
-                            :alt => _("Tweet it"),
+                            :alt => _("Share on X"),
                             :width => "120",
                             :height => "37"),
-                            "https://twitter.com/intent/tweet?" << {
+                            "https://twitter.com/intent/post?" << {
                               :url => request.url,
                               :via => AlaveteliConfiguration.twitter_username,
                               :text => "'#{ @info_request_batch.title }'",

diff --git a/app/views/request/_act.html.erb b/app/views/request/_act.html.erb
@@ -2,15 +2,15 @@
 
 <div class="act_link">
   <i class="act-link-icon act-link-icon--twitter"></i>
-  <% tweet_link = "https://twitter.com/share?" << {
+  <% tweet_link = "https://twitter.com/intent/post?" << {
     :url => request.url,
     :via => AlaveteliConfiguration.twitter_username,
     :text => "'#{ info_request.title }'",
     :related => _('mySociety:Helping people set up sites like {{site_name}} all over the world', :site_name => site_name)
     }.to_query
   %>
 
-  <%= link_to _("Tweet this request"),
+  <%= link_to _("Share on X"),
               tweet_link,
               :onclick => track_analytics_event(
                 AnalyticsEvent::Category::OUTBOUND,

diff --git a/app/views/request/_request_sent.html.erb b/app/views/request/_request_sent.html.erb
@@ -17,10 +17,10 @@
         <h2><%= _("Share your request") %></h2>
 
         <%= link_to image_tag("next-step-twitter.png",
-                              :alt => _("Tweet it"),
+                              :alt => _("Share on X"),
                               :width => "120",
                               :height => "37"),
-                              "https://twitter.com/intent/tweet?" << {
+                              "https://twitter.com/intent/post?" << {
                                 :url => request.url,
                                 :via => AlaveteliConfiguration.twitter_username,
                                 :text => "'#{ @info_request.title }'",

diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Highlighted Features
 
+* Update Twitter/X logos and wording (Lucas Cumsille Montesinos)
 * Fix missing headers when exporting Project data (Gareth Rees)
 * Reduce amount of storage related background jobs (Graeme Porteous)
 * Add automatic parsing of emails contain Excel spreadsheets (Graeme Porteous)