From 002f555fc1a0e9e26d4de9ed53c9fb2a78f54483 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 31 May 2017 13:18:50 +0200
Subject: [PATCH] improves text and titles of social network links

---
 app/views/layouts/_footer.html.erb | 42 +++++++++++++++++-------------
 config/locales/en.yml              | 12 ++++-----
 config/locales/es.yml              | 12 ++++-----
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 1c54ea617..7c913f698 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -48,49 +48,55 @@
         <ul>
           <% if setting['twitter_handle'] %>
             <li class="inline-block">
-              <%= link_to "https://twitter.com/#{setting['twitter_handle']}", target: "_blank", title: t("social.twitter") + t('shared.target_blank_html') do %>
-                <span class="sr-only"><%= t("social.twitter") %></span>
-                <span class="icon-twitter" aria-hidden="true"></span>
+              <%= link_to "https://twitter.com/#{setting['twitter_handle']}", target: "_blank",
+                           title: t("social.twitter", org: setting['org_name']) + t('shared.target_blank_html') do %>
+                              <span class="sr-only"><%= t("social.twitter, org: setting['org_name']") %></span>
+                              <span class="icon-twitter" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
           <% if setting['facebook_handle'] %>
             <li class="inline-block">
-              <%= link_to "https://www.facebook.com/#{setting['facebook_handle']}/", target: "_blank", title: t("social.facebook") + t('shared.target_blank_html') do %>
-                <span class="sr-only"><%= t("social.facebook") %></span>
-                <span class="icon-facebook" aria-hidden="true"></span>
+              <%= link_to "https://www.facebook.com/#{setting['facebook_handle']}/", target: "_blank",
+                          title: t("social.facebook", org: setting['org_name']) + t('shared.target_blank_html') do %>
+                          <span class="sr-only"><%= t("social.facebook, org: setting['org_name']") %></span>
+                          <span class="icon-facebook" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
           <%  if setting['blog_url'] %>
             <li class="inline-block">
-              <%= link_to setting['blog_url'], target: "_blank", title: t("social.blog") + t('shared.target_blank_html') do %>
-                <span class="sr-only"><%= t("social.blog") %></span>
-                <span class="icon-blog" aria-hidden="true"></span>
+              <%= link_to setting['blog_url'], target: "_blank",
+                          title: t("social.blog", org: setting['org_name']) + t('shared.target_blank_html') do %>
+                          <span class="sr-only"><%= t("social.blog, org: setting['org_name']") %></span>
+                          <span class="icon-blog" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
           <% if setting['youtube_handle'] %>
             <li class="inline-block">
-              <%= link_to "https://www.youtube.com/#{setting['youtube_handle']}", target: "_blank", title: t("social.youtube") + t('shared.target_blank_html') do %>
-                <span class="sr-only"><%= t("social.youtube") %></span>
-                <span class="icon-youtube" aria-hidden="true"></span>
+              <%= link_to "https://www.youtube.com/#{setting['youtube_handle']}", target: "_blank",
+                          title: t("social.youtube", org: setting['org_name']) + t('shared.target_blank_html') do %>
+                          <span class="sr-only"><%= t("social.youtube", org: setting['org_name']) %></span>
+                          <span class="icon-youtube" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
           <% if setting['telegram_handle'] %>
             <li class="inline-block">
-              <%= link_to "https://www.telegram.me/#{setting['telegram_handle']}", target: "_blank", title: t("social.telegram") + t('shared.target_blank_html') do %>
-                <span class="sr-only"><%= t("social.telegram") %></span>
-                <span class="icon-telegram" aria-hidden="true"></span>
+              <%= link_to "https://www.telegram.me/#{setting['telegram_handle']}", target: "_blank",
+                          title: t("social.telegram", org: setting['org_name']) + t('shared.target_blank_html') do %>
+                          <span class="sr-only"><%= t("social.telegram") %></span>
+                          <span class="icon-telegram" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
           <% if setting['instagram_handle'] %>
             <li class="inline-block">
-              <%= link_to "https://www.instagram.com/#{setting['instagram_handle']}", target: "_blank", title: t("social.instagram") + t('shared.target_blank_html') do %>
-                <span class="sr-only"><%= t("social.instagram") %></span>
-                <span class="icon-instagram" aria-hidden="true"></span>
+              <%= link_to "https://www.instagram.com/#{setting['instagram_handle']}", target: "_blank",
+                          title: t("social.instagram", org: setting['org_name']) + t('shared.target_blank_html') do %>
+                          <span class="sr-only"><%= t("social.instagram", org: setting['org_name']) %></span>
+                          <span class="icon-instagram" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9e9c1ad36..4b4f77d2d 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -528,13 +528,13 @@ en:
       budget: Participatory budget
       searcher: Searcher
   social:
-    blog: Blog
-    facebook: Facebook
-    twitter: Twitter
-    youtube: YouTube
+    blog: "%{org} Blog"
+    facebook: "%{org} Facebook"
+    twitter: "%{org} Twitter"
+    youtube: "%{org} YouTube"
     whatsapp: WhatsApp
-    telegram: Telegram
-    instagram: Instagram
+    telegram: "%{org} Telegram"
+    instagram: "%{org} Instagram"
   spending_proposals:
     form:
       association_name_label: 'If you propose in name of an assocation or collective add the name here'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 22fbeaf7a..12cb9693f 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -528,13 +528,13 @@ es:
       budget: Presupuestos participativos
       searcher: Buscador
   social:
-    blog: Blog
-    facebook: Facebook
-    twitter: Twitter
-    youtube: YouTube
+    blog: "Blog de %{org}"
+    facebook: "Facebook de %{org}"
+    twitter: "Twitter de %{org}"
+    youtube: "YouTube de %{org}"
     whatsapp: WhatsApp
-    telegram: Telegram
-    instagram: Instagram
+    telegram: "Telegram de %{org}"
+    instagram: "Instagram de %{org}"
   spending_proposals:
     form:
       association_name_label: 'Si propones en nombre de una asociación o colectivo añade el nombre aquí'