From fdc717a18528bffaa7b597fb417cc70df0cb266b Mon Sep 17 00:00:00 2001
From: imajit <ajit.171it233@nitk.edu.in>
Date: Tue, 1 Jun 2021 01:28:18 +0530
Subject: [PATCH 1/3] Adding some more corrected tags

---
 app/views/like/index.html.erb     | 2 +-
 app/views/users/list.html.erb     | 2 +-
 app/views/users/profile.html.erb  | 4 ++--
 app/views/wiki/revisions.html.erb | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/like/index.html.erb b/app/views/like/index.html.erb
index 1bf86771e5..e31f325b84 100644
--- a/app/views/like/index.html.erb
+++ b/app/views/like/index.html.erb
@@ -33,7 +33,7 @@
 						<b> - </b>
 					<% else %>
 						<% if like.user.status == 1 %>
-							<a data-confirm="<%= translation('users.profile.confirm_ban_user') %>" href="/ban/<%= like.user.id %>" class="btn btn-outline-secondary"><i class="fa fa-ban"></i> <%= translation('users.profile.ban_user') %></a>
+							<a data-confirm="<%= translation('users.profile.confirm_ban_user',{},false) %>" href="/ban/<%= like.user.id %>" class="btn btn-outline-secondary"><i class="fa fa-ban"></i> <%= translation('users.profile.ban_user') %></a>
 			          	<% else %>
 			          		<a href="/unban/<%= like.user.id %>" class="btn btn-outline-secondary"><i class="fa fa-thumbs-up"></i> <%= translation('users.profile.unban_user') %></a>
 			          	<% end %>
diff --git a/app/views/users/list.html.erb b/app/views/users/list.html.erb
index 08d838fc48..047a6a5482 100644
--- a/app/views/users/list.html.erb
+++ b/app/views/users/list.html.erb
@@ -54,7 +54,7 @@
                            <i class='fa fa-ban' style="color:#a00;"></i> <%= translation('users.list.banned') %>
                            <% elsif user.status == 1 && user != current_user %>
                              <li><a href="/profile/<%= user.username %>">See Full Profile</a></li>
-                             <li class="btn-danger"><a style="color: white;" data-confirm="<%= translation('users.list.are_you_sure') %>" href="/ban/<%= user.uid %>" ><i class="fa fa-ban fa-white"></i> <%= translation('users.list.ban') %></a></li>
+                             <li class="btn-danger"><a style="color: white;" data-confirm="<%= translation('users.list.are_you_sure',{},false) %>" href="/ban/<%= user.uid %>" ><i class="fa fa-ban fa-white"></i> <%= translation('users.list.ban') %></a></li>
                          <% end %>
                        <% end %>
                      </ul>
diff --git a/app/views/users/profile.html.erb b/app/views/users/profile.html.erb
index 3d13085d83..a05b9509cd 100644
--- a/app/views/users/profile.html.erb
+++ b/app/views/users/profile.html.erb
@@ -141,13 +141,13 @@
     <% if logged_in_as(['admin', 'moderator']) && @profile_user.status == 0 %>
       <a href="/unban/<%= @profile_user.id %>" class="btn btn-outline-secondary btn-block"><i class="fa fa-thumbs-up"></i> <%= translation('users.profile.unban_user') %></a>
     <% elsif logged_in_as(['admin', 'moderator']) && @profile_user.status == 1 && @profile_user != current_user %>
-      <a data-confirm="<%= translation('users.profile.confirm_ban_user') %>" href="/ban/<%= @profile_user.id %>" class="btn btn-outline-secondary btn-block"><i class="fa fa-ban"></i> <%= translation('users.profile.ban_user') %></a>
+      <a data-confirm="<%= translation('users.profile.confirm_ban_user',{},false) %>" href="/ban/<%= @profile_user.id %>" class="btn btn-outline-secondary btn-block"><i class="fa fa-ban"></i> <%= translation('users.profile.ban_user') %></a>
     <% end %>
 
     <% if logged_in_as(['admin', 'moderator']) && @profile_user.status == 5 %>
       <a href="/admin/unmoderate/<%= @profile_user.id %>" class="btn btn-outline-secondary btn-block"><i class="fa fa-thumbs-up"></i> <%= translation('users.profile.unmoderate_user') %></a>
     <% elsif logged_in_as(['admin', 'moderator']) && @profile_user.status == 1 %>
-      <a rel="tooltip" title="Prevent author from logging in, without hiding their work or profile." data-confirm="<%= translation('users.profile.confirm_moderate_user') %>" href="/admin/moderate/<%= @profile_user.id %>" class="btn btn-outline-secondary btn-block"><i class="fa fa-ban"></i> <%= translation('users.profile.moderate_user') %></a>
+      <a rel="tooltip" title="Prevent author from logging in, without hiding their work or profile." data-confirm="<%= translation('users.profile.confirm_moderate_user',{},false) %>" href="/admin/moderate/<%= @profile_user.id %>" class="btn btn-outline-secondary btn-block"><i class="fa fa-ban"></i> <%= translation('users.profile.moderate_user') %></a>
     <% end %>
 
     <% if @profile_user && !@profile_user.reset_key.nil? && logged_in_as(['admin']) %>
diff --git a/app/views/wiki/revisions.html.erb b/app/views/wiki/revisions.html.erb
index e727011a9f..0af0dec9f8 100644
--- a/app/views/wiki/revisions.html.erb
+++ b/app/views/wiki/revisions.html.erb
@@ -28,10 +28,10 @@
 	  | <%= distance_of_time_in_words(revision.created_at, Time.current, { include_seconds: false, scope: 'datetime.time_ago_in_words' }) %>
           <div style="display:none;" id="body_<%= @node.revisions.length-1-index %>"><%= raw RDiscount.new(revision.body).to_html %></div>
         </td>
-        <td><small><a class="btn btn-sm btn-outline-secondary btn-revert" href="/wiki/revert/<%= revision.vid %>" data-confirm="<%= translation('wiki.revisions.are_you_sure') %>"><i class="fa fa-arrow-reload"></i> <%= translation('wiki.revisions.revert') %></a></small></td>
+        <td><small><a class="btn btn-sm btn-outline-secondary btn-revert" href="/wiki/revert/<%= revision.vid %>" data-confirm="<%= translation('wiki.revisions.are_you_sure',{},false) %>"><i class="fa fa-arrow-reload"></i> <%= translation('wiki.revisions.revert') %></a></small></td>
         <% if logged_in_as(['admin', 'moderator']) %>
           <% if revision.status == 1 %>
-            <td><small><a class='btn btn-sm btn-outline-secondary' data-toggle="tooltip" title="Mark as Spam" data-placement="top" href='/moderate/revision/spam/<%= revision.vid %>' data-confirm="<%= translation('wiki.revisions.are_you_sure') %>"><i class='fa fa-ban'></i></a></small></td>
+            <td><small><a class='btn btn-sm btn-outline-secondary' data-toggle="tooltip" title="Mark as Spam" data-placement="top" href='/moderate/revision/spam/<%= revision.vid %>' data-confirm="<%= translation('wiki.revisions.are_you_sure',{},false) %>"><i class='fa fa-ban'></i></a></small></td>
           <% elsif revision.status == 0 %>
             <td><small><a class='btn btn-sm btn-outline-secondary' href='/moderate/revision/publish/<%= revision.vid %>'><i class='fa fa-plus-circle'></i> <%= translation('wiki.revisions.republish') %></a></small></td>
           <% end %>

From 438c7b763487dcbb4a23fc8872842491020ffe91 Mon Sep 17 00:00:00 2001
From: imajit <ajit.171it233@nitk.edu.in>
Date: Sun, 30 May 2021 18:06:59 +0530
Subject: [PATCH 2/3] Changed translation function

---
 app/views/dashboard/_wiki.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/dashboard/_wiki.html.erb b/app/views/dashboard/_wiki.html.erb
index 9b106938b2..4e913bd5df 100644
--- a/app/views/dashboard/_wiki.html.erb
+++ b/app/views/dashboard/_wiki.html.erb
@@ -5,7 +5,6 @@
     <div class="input-group">
       <form class="search-form-wiki form-inline" role="search" autocomplete="off">
         <input type="text" class="search-wiki form-control form-control-sm" id="sidebar-searchform-input" style="width:70%;" placeholder="<%= translation('dashboard._wiki.search',{},false) %>" required>
-
         <div class="input-group-append">
           <button class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-search"></i></button>
         </div>

From 51ceaaa35810171140c41fab65ca3e0baa0406a6 Mon Sep 17 00:00:00 2001
From: imajit <ajit.171it233@nitk.edu.in>
Date: Thu, 3 Jun 2021 01:50:08 +0530
Subject: [PATCH 3/3] Changed all translation function inside html tag

---
 app/views/dashboard_v2/_blog.html.erb      | 6 +++---
 app/views/dashboard_v2/_topicCard.html.erb | 4 ++--
 app/views/home/subscriptions.html.erb      | 4 ++--
 app/views/layouts/_header.html.erb         | 4 ++--
 app/views/sidebar/_post_button.html.erb    | 2 +-
 app/views/tag/_contributors.html.erb       | 4 ++--
 app/views/tag/_profileCard.html.erb        | 4 ++--
 app/views/tag/_topicCard.html.erb          | 6 +++---
 app/views/tag/blog.html.erb                | 2 +-
 app/views/tag/show.html.erb                | 2 +-
 app/views/tag/show/_user_controls.html.erb | 2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/dashboard_v2/_blog.html.erb b/app/views/dashboard_v2/_blog.html.erb
index ee5d092a41..3219ef20f2 100644
--- a/app/views/dashboard_v2/_blog.html.erb
+++ b/app/views/dashboard_v2/_blog.html.erb
@@ -7,17 +7,17 @@
         <div aria-hidden = 'true' class="img" style="background-image: url('<%= @blog.scraped_image %>')">
       <% end %>
       <%# subscribe to blog updates possibly via email %>
-      <a class="ellipsis pull-right pl-2" data-toggle="dropdown" rel="tooltip" title="<%= translation('tag.show.blog_updates') %>" style="cursor:pointer; background-color: #444" aria-expanded="true"><i class="fa fa-ellipsis-h" style="color:#ccc;font-size:18px;margin-right:10px;"></i></a>
+      <a class="ellipsis pull-right pl-2" data-toggle="dropdown" rel="tooltip" title="<%= translation('tag.show.blog_updates',{},false) %>" style="cursor:pointer; background-color: #444" aria-expanded="true"><i class="fa fa-ellipsis-h" style="color:#ccc;font-size:18px;margin-right:10px;"></i></a>
       <div class="dropdown-menu">
         <div class="dropdown-item">
-          <a style="margin-top:-8px;" rel="tooltip" title="<%= translation('tag.show.blog_updates') %>" href="/subscribe/tag/blog">
+          <a style="margin-top:-8px;" rel="tooltip" title="<%= translation('tag.show.blog_updates',{},false) %>" href="/subscribe/tag/blog">
             <%= translation('tag.show.subscribe') %>
           </a>
         </div>
       </div>
       <%# blog caption %>
       <div style="padding-top: 220px">
-          <h4 class="blog-caption tabindex="1"">
+          <h4 class="blog-caption tabindex='1'">
             <small style="font-size: 13px;" class="float-right d-none d-lg-inline"><%= raw translation('dashboard_v2.dashboard.from_blog', :url => '/blog') %></small>
             <a style="color: #444;" href="/blog"><%= @blog.title %></a>
             <small style="font-size: 13px;"><%= translation('dashboard_v2.dashboard.by') %>
diff --git a/app/views/dashboard_v2/_topicCard.html.erb b/app/views/dashboard_v2/_topicCard.html.erb
index 745e07a3cb..f59b0b42cd 100644
--- a/app/views/dashboard_v2/_topicCard.html.erb
+++ b/app/views/dashboard_v2/_topicCard.html.erb
@@ -14,7 +14,7 @@
                 <a class="ellipsis pull-right" data-toggle="dropdown" style="cursor:pointer" aria-expanded="true"><i class="fa fa-ellipsis-h" style="color:#ccc;font-size:18px;margin-right:10px;"></i></a>
                 <div class="dropdown-menu">
                   <div class="dropdown-item">
-                    <a style="margin-top:-8px;" data-method="delete" data-confirm="Are you sure you'd like to unfollow this topic?" rel="tooltip" title="<%= translation('tag.show.unfollow') %>" href="/unsubscribe/tag/<%= tag_name %>">
+                    <a style="margin-top:-8px;" data-method="delete" data-confirm="Are you sure you'd like to unfollow this topic?" rel="tooltip" title="<%= translation('tag.show.unfollow',{},false) %>" href="/unsubscribe/tag/<%= tag_name %>">
                       <%= translation('tag.show.unfollow_text') %>
                     </a>
                   </div>
@@ -60,7 +60,7 @@
               <% end %>
               <div id="new-post" style="float:right;margin:10px 0 10px 10px;">
                 <% if current_user %>
-                  <a rel="tooltip" title="<%= translation('sidebar._post_button.share_your_work') %>" data-placement="bottom" href="/post?tags=<%= tag_name %>" class="btn btn-primary btn-sm requireLogin"><%= translation('tag.show.new_post') %> <i class="fa fa-plus fa-white"></i></a>
+                  <a rel="tooltip" title="<%= translation('sidebar._post_button.share_your_work',{},false) %>" data-placement="bottom" href="/post?tags=<%= tag_name %>" class="btn btn-primary btn-sm requireLogin"><%= translation('tag.show.new_post') %> <i class="fa fa-plus fa-white"></i></a>
                 <% else %>
                   <a class="btn btn-primary btn-sm index-follow-buttons follow-btn-remote requireLogin" href="/subscribe/tag/<%= tag_name %>" data-remote="true"><%= translation('tag.index.follow') %></a>
                 <% end %>
diff --git a/app/views/home/subscriptions.html.erb b/app/views/home/subscriptions.html.erb
index e47d7a11a4..ef15efd0ac 100644
--- a/app/views/home/subscriptions.html.erb
+++ b/app/views/home/subscriptions.html.erb
@@ -21,7 +21,7 @@
 
   <p>
     <% if current_user.following("everything") %>
-      <a rel="tooltip" title="<%= translation('home.subscriptions.click_unfollow') %>" class="btn btn-outline-secondary active" href="/unsubscribe/tag/everything" data-method="delete"><i class="fa fa-user-plus" aria-hidden="true"></i> <%= translation('home.subscriptions.following') %> <b><%= translation('home.subscriptions.research_notes') %></b></a>
+      <a rel="tooltip" title="<%= translation('home.subscriptions.click_unfollow',{},false) %>" class="btn btn-outline-secondary active" href="/unsubscribe/tag/everything" data-method="delete"><i class="fa fa-user-plus" aria-hidden="true"></i> <%= translation('home.subscriptions.following') %> <b><%= translation('home.subscriptions.research_notes') %></b></a>
     <% else %>
       <a href="/subscribe/tag/everything" class="btn btn-outline-secondary"><i class="fa fa-tag"></i> <%= translation('home.subscriptions.subscribe_to') %> <b><%= translation('home.subscriptions.all') %></b> <%= translation('home.subscriptions.notes') %></a>
     <% end %>
@@ -70,7 +70,7 @@
           <a rel="tooltip" title="Once per day" class="btn btn-default btn-xs" href="javascript:void(0)"><i class="fa fa-list"></i> Digest</a>
           -->
           <script> input_<%= subscription.tid %> = '#share-<%= subscription.tid %>'</script>
-          <a class="btn btn-outline-secondary btn-sm" rel="popover"  data-toggle="popover" data-placement="left" title="<%= translation('home.subscriptions.share_subscription_link') %>" data-html="true" data-content="<div style='margin-top:10px;'><a style='padding-left:3px;' href='https://twitter.com/intent/tweet?text=🎈 Public Lab: Subscriptions&url=https://publiclab.org/subscriptions/tag/<%= subscription.tagname %>' class='twitter-share-button'>Tweet</a></div> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src='//platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document,'script','twitter-wjs');</script>
+          <a class="btn btn-outline-secondary btn-sm" rel="popover"  data-toggle="popover" data-placement="left" title="<%= translation('home.subscriptions.share_subscription_link',{},false) %>" data-html="true" data-content="<div style='margin-top:10px;'><a style='padding-left:3px;' href='https://twitter.com/intent/tweet?text=🎈 Public Lab: Subscriptions&url=https://publiclab.org/subscriptions/tag/<%= subscription.tagname %>' class='twitter-share-button'>Tweet</a></div> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src='//platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document,'script','twitter-wjs');</script>
           <i class="fa fa-share"></i> <%= translation('home.subscriptions.share') %></a>
           <a class="btn btn-outline-secondary btn-sm" href="/unsubscribe/tag/<%= subscription.tagname %>" data-method="delete"><i class="fa fa-remove"></i> <%= translation('home.subscriptions.unsubscribe') %></a>
         </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index ce243b87b1..8dd5911d0c 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -209,9 +209,9 @@
             <a class="dropdown-item d-lg-none"  href="/donate"><%= translation('layout._header.donate') %></a>
             <!--These menu items will only appear in the "More" dropdown menu. -->
             <% if current_user %>
-              <a class="dropdown-item d-xl-none" rel="tooltip" title="<%= translation('layout._header.your_dashboard') %>" data-placement="bottom" href="/dashboard">Dashboard</a>
+              <a class="dropdown-item d-xl-none" rel="tooltip" title="<%= translation('layout._header.your_dashboard',{},false) %>" data-placement="bottom" href="/dashboard">Dashboard</a>
             <% else %>
-              <a class="dropdown-item d-xl-none" rel="tooltip" title="<%= translation('layout._header.become_part_community') %>" href="/signup"><%= translation('layout._header.join') %></a>
+              <a class="dropdown-item d-xl-none" rel="tooltip" title="<%= translation('layout._header.become_part_community',{},false) %>" href="/signup"><%= translation('layout._header.join') %></a>
             <% end %>
           </div>
         </li>
diff --git a/app/views/sidebar/_post_button.html.erb b/app/views/sidebar/_post_button.html.erb
index 0f4c2b18bb..3719f0c116 100644
--- a/app/views/sidebar/_post_button.html.erb
+++ b/app/views/sidebar/_post_button.html.erb
@@ -1,4 +1,4 @@
-<a style="margin-bottom:6px;white-space: normal;" rel="tooltip" title="<%= translation('sidebar._post_button.share_your_work') %>" data-placement="bottom" href="/post" class="btn btn-primary btn-lg btn-block d-lg-none d-xl-block"><i class="fa fa-pencil fa-white"></i> <%= translation('sidebar._post_button.write_research_note') %></a>
+<a style="margin-bottom:6px;white-space: normal;" rel="tooltip" title="<%= translation('sidebar._post_button.share_your_work',{},false) %>" data-placement="bottom" href="/post" class="btn btn-primary btn-lg btn-block d-lg-none d-xl-block"><i class="fa fa-pencil fa-white"></i> <%= translation('sidebar._post_button.write_research_note') %></a>
 <div class="btn-group d-none d-lg-block d-xl-none" style="margin-bottom:6px;">
   <a rel="tooltip" title="Share your work with others" data-placement="bottom" href="/post" class="btn btn-primary btn-lg"><i class="fa fa-pencil fa fa-white"></i> <%= translation('sidebar._post_button.post_research') %></a>
 
diff --git a/app/views/tag/_contributors.html.erb b/app/views/tag/_contributors.html.erb
index 4da49e0a52..ae4b3239f5 100644
--- a/app/views/tag/_contributors.html.erb
+++ b/app/views/tag/_contributors.html.erb
@@ -17,11 +17,11 @@
     <div class="btn-group">
       <a class="btn btn-outline-secondary btn-sm" href="/feed/tag/<%= params[:id] %>.rss"><i class="fa fa-rss"></i> RSS</a>
       <% if current_user.following(params[:id]) %>
-        <a rel="tooltip" title="<%= translation('tag.contributors.unfollow') %>" class="btn btn-outline-secondary btn-sm" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-user-plus" aria-hidden="true"></i> <%= translation('tag.contributors.following') %> <b><%= params[:id] %></b></a>
+        <a rel="tooltip" title="<%= translation('tag.contributors.unfollow',{},false) %>" class="btn btn-outline-secondary btn-sm" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-user-plus" aria-hidden="true"></i> <%= translation('tag.contributors.following') %> <b><%= params[:id] %></b></a>
       <% else %>
         <a class="btn btn-outline-secondary btn-sm" href="/subscribe/tag/<%= params[:id] %>"><i class="fa fa-user-plus" aria-hidden="true"></i> <%= translation('tag.contributors.follow') %> <b><%= params[:id] %></b></a>
       <% end %>
-      <a class="btn btn-outline-secondary btn-sm" rel="popover" data-placement="bottom" data-html="true" data-title="<%= translation('tag.show.users_following_tag') %>" data-content="<% Tag.followers(params[:id]).each do |user| %><i class='fa fa-star-o'></i> <a href='/profile/<%= user.username %>'><%= user.username %></a><br /><% end %><% if Tag.follower_count(params[:id]) == 0 %><i><%= translation('tag.show.none') %></i><% end %>"><%= Tag.follower_count(params[:id]) %> <i class="fa fa-user"></i> <span class="caret"></span></a>
+      <a class="btn btn-outline-secondary btn-sm" rel="popover" data-placement="bottom" data-html="true" data-title="<%= translation('tag.show.users_following_tag',{},false) %>" data-content="<% Tag.followers(params[:id]).each do |user| %><i class='fa fa-star-o'></i> <a href='/profile/<%= user.username %>'><%= user.username %></a><br /><% end %><% if Tag.follower_count(params[:id]) == 0 %><i><%= translation('tag.show.none') %></i><% end %>"><%= Tag.follower_count(params[:id]) %> <i class="fa fa-user"></i> <span class="caret"></span></a>
     </div>
     <br /><br />
     <!-- AJAXify -->
diff --git a/app/views/tag/_profileCard.html.erb b/app/views/tag/_profileCard.html.erb
index ab4ff0448e..ba84a10463 100644
--- a/app/views/tag/_profileCard.html.erb
+++ b/app/views/tag/_profileCard.html.erb
@@ -32,11 +32,11 @@
       </div>
 
       <div class="col">
-        <a style="float: right;  width: 100px;" rel="tooltip" title="<%= translation('sidebar._post_button.share_your_work') %>" data-placement="bottom" href="/post?tags=<%= tag.name %>" class="btn btn-primary btn-sm">New post <i class="fa fa-plus fa-white"></i></a>
+        <a style="float: right;  width: 100px;" rel="tooltip" title="<%= translation('sidebar._post_button.share_your_work',{},false) %>" data-placement="bottom" href="/post?tags=<%= tag.name %>" class="btn btn-primary btn-sm">New post <i class="fa fa-plus fa-white"></i></a>
         <% if current_user %>
         <div id="follow-unfollow-column-<%=tag.tid%>" style="float: right; margin-right: 10px;">
           <% if current_user.following(tag.name) %>
-            <a style="width: 100px;" rel="tooltip" title="<%= translation('tag.show.unfollow') %>" class="btn btn-light btn-sm active" href="/unsubscribe/tag/<%= tag.name %>"></i> <%= translation('tag.index.unfollow') %></a>
+            <a style="width: 100px;" rel="tooltip" title="<%= translation('tag.show.unfollow',{},false) %>" class="btn btn-light btn-sm active" href="/unsubscribe/tag/<%= tag.name %>"></i> <%= translation('tag.index.unfollow') %></a>
           <% else %>
             <a style="width: 100px;" class="btn btn-outline-secondary btn-sm index-follow-buttons follow-btn-remote" href="/subscribe/tag/<%= tag.name %>" data-remote="true"><%= translation('tag.index.follow') %></a>
           <% end %>
diff --git a/app/views/tag/_topicCard.html.erb b/app/views/tag/_topicCard.html.erb
index ba4b4ca720..215835abff 100644
--- a/app/views/tag/_topicCard.html.erb
+++ b/app/views/tag/_topicCard.html.erb
@@ -5,7 +5,7 @@
     <div class="card shadow-sm p-2 mb-3 bg-white rounded" >
       <div class="card-header mt-2" style=" padding:0.8em; background-color: inherit; border:none;">
         <% if current_user && current_user.following(tag.name) && controller.controller_name != 'tag' %>
-          <a style="margin-top:-8px;" data-method="delete" data-confirm="Are you sure you'd like to unfollow this topic?" rel="tooltip" title="<%= translation('tag.show.unfollow') %>" class="pull-right" href="/unsubscribe/tag/<%= tag.name %>"><i style="color:#ccc;" class="fa fa-times"></i></a>
+          <a style="margin-top:-8px;" data-method="delete" data-confirm="Are you sure you'd like to unfollow this topic?" rel="tooltip" title="<%= translation('tag.show.unfollow',{},false) %>" class="pull-right" href="/unsubscribe/tag/<%= tag.name %>"><i style="color:#ccc;" class="fa fa-times"></i></a>
         <% end %>
         <h4 style="display: inline-block;"><a href="<%= tag.name %>"><%= tag.name %></a></h4>
         <p style="display: inline-block; color: #808080;"><a style="text-decoration: underline; color: #808080;" href="/tag/<%= tag.name %>"><%= Tag.follower_count(tag.name) %> following</a></p>
@@ -45,12 +45,12 @@
               <a style="width: 100px;"
                  data-method="delete"
                  data-confirm="Are you sure you'd like to unfollow this topic?"
-                 rel="tooltip" title="<%= translation('tag.show.unfollow') %>"
+                 rel="tooltip" title="<%= translation('tag.show.unfollow',{},false) %>"
                  class="btn btn-outline-secondary btn-sm index-follow-buttons follow-btn-remote"
                  href="/unsubscribe/tag/<%= tag.name %>">Unfollow</a>
             <% end %>
 
-            <a rel="tooltip" title="<%= translation('sidebar._post_button.share_your_work') %>" data-placement="bottom" href="/post?tags=<%= tag.name %>" class="btn btn-primary btn-sm requireLogin">New post <i class="fa fa-plus fa-white"></i></a>
+            <a rel="tooltip" title="<%= translation('sidebar._post_button.share_your_work',{},false) %>" data-placement="bottom" href="/post?tags=<%= tag.name %>" class="btn btn-primary btn-sm requireLogin">New post <i class="fa fa-plus fa-white"></i></a>
           <% else %>
             <a class="btn btn-primary btn-sm index-follow-buttons follow-btn-remote requireLogin" href="/subscribe/tag/<%= tag.name %>" data-remote="true"><%= translation('tag.index.follow') %></a>
           <% end %>
diff --git a/app/views/tag/blog.html.erb b/app/views/tag/blog.html.erb
index 39f8548808..ef7d7cf24f 100644
--- a/app/views/tag/blog.html.erb
+++ b/app/views/tag/blog.html.erb
@@ -15,7 +15,7 @@
       <% if current_user %>
         <a class="btn btn-outline-secondary btn-sm" href="/feed/tag/<%= params[:id] %>.rss"><i class="fa fa-rss"></i> RSS</a>
         <% if current_user.following(params[:id]) %>
-          <a rel="tooltip" title="<%= translation('tag.blog.unfollow') %>" class="btn btn-outline-secondary btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-user-plus" aria-hidden="true"></i> <%= translation('tag.blog.following') %> <b><%= params[:id] %></b></a>
+          <a rel="tooltip" title="<%= translation('tag.blog.unfollow',{},false) %>" class="btn btn-outline-secondary btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"><i class="fa fa-user-plus" aria-hidden="true"></i> <%= translation('tag.blog.following') %> <b><%= params[:id] %></b></a>
         <% else %>
           <br><br>
           <div class="alert alert-success" role="alert">
diff --git a/app/views/tag/show.html.erb b/app/views/tag/show.html.erb
index de836cb116..c9d1eae2fa 100644
--- a/app/views/tag/show.html.erb
+++ b/app/views/tag/show.html.erb
@@ -119,7 +119,7 @@
                     <div class="tag-buttons">
                         <div class="btn-group" role="group">
                             <% if current_user && current_user.following(params[:id]) %>
-                                <a data-toggle="tooltip" title="<%= translation('sidebar._post_button.share_your_work') %>" data-placement="bottom" href="/post?tags=<%= @title %>" class="btn btn-primary requireLogin">New post <i class="fa fa-plus fa-white"></i></a>
+                                <a data-toggle="tooltip" title="<%= translation('sidebar._post_button.share_your_work',{},false) %>" data-placement="bottom" href="/post?tags=<%= @title %>" class="btn btn-primary requireLogin">New post <i class="fa fa-plus fa-white"></i></a>
                             <% else %>
                                 <a class="btn btn-primary requireLogin" target="_blank" href="/subscribe/tag/<%= params[:id] %>"> Follow</a>
                                 <% if @related_tags %>
diff --git a/app/views/tag/show/_user_controls.html.erb b/app/views/tag/show/_user_controls.html.erb
index ed9eecf715..af85657cb9 100644
--- a/app/views/tag/show/_user_controls.html.erb
+++ b/app/views/tag/show/_user_controls.html.erb
@@ -5,7 +5,7 @@
     <% unless @wildcard %>
       <% if current_user.following(params[:id]) %>
         <div class="dropdown-item">
-          <a style="width: 100px;" data-method="delete" rel="tooltip" title="<%= translation('tag.show.unfollow') %>" class="btn btn-light btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"> <%= translation('tag.index.unsubscribe') %></a>
+          <a style="width: 100px;" data-method="delete" rel="tooltip" title="<%= translation('tag.show.unfollow',{},false) %>" class="btn btn-light btn-sm active" href="/unsubscribe/tag/<%= params[:id] %>"> <%= translation('tag.index.unsubscribe') %></a>
         </div>
         <div class="dropdown-divider"></div>
       <% else %>