Merge pull request #3748 from consul/locales_html

Sanitize translations instead of using `_html`

app/controllers/follows_controller.rb

@@ -4,14 +4,14 @@ class FollowsController < ApplicationController
 
   def create
     @follow = Follow.create(user: current_user, followable: find_followable)
-    flash.now[:notice] = t("shared.followable.#{followable_translation_key(@follow.followable)}.create.notice_html")
+    flash.now[:notice] = t("shared.followable.#{followable_translation_key(@follow.followable)}.create.notice")
     render :refresh_follow_button
   end
 
   def destroy
     @follow = Follow.find(params[:id])
     @follow.destroy
-    flash.now[:notice] = t("shared.followable.#{followable_translation_key(@follow.followable)}.destroy.notice_html")
+    flash.now[:notice] = t("shared.followable.#{followable_translation_key(@follow.followable)}.destroy.notice")
     render :refresh_follow_button
   end
 

app/helpers/globalize_helper.rb

@@ -64,7 +64,7 @@ module GlobalizeHelper
   end
 
   def selected_languages_description(resource)
-    t("shared.translations.languages_in_use_html", count: active_languages_count(resource))
+    sanitize(t("shared.translations.languages_in_use", count: active_languages_count(resource)))
   end
 
   def select_language_error(resource)

app/models/budget/investment.rb

@@ -267,12 +267,12 @@ class Budget
     end
 
     def reason_for_not_being_ballotable_by(user, ballot)
-      return permission_problem(user)         if permission_problem?(user)
+      return permission_problem(user)    if permission_problem?(user)
-      return :not_selected                    unless selected?
+      return :not_selected               unless selected?
-      return :no_ballots_allowed              unless budget.balloting?
+      return :no_ballots_allowed         unless budget.balloting?
-      return :different_heading_assigned_html unless ballot.valid_heading?(heading)
+      return :different_heading_assigned unless ballot.valid_heading?(heading)
-      return :not_enough_money_html           if ballot.present? && !enough_money?(ballot)
+      return :not_enough_money           if ballot.present? && !enough_money?(ballot)
-      return :casted_offline                  if ballot.casted_offline?
+      return :casted_offline             if ballot.casted_offline?
     end
 
     def permission_problem(user)

app/views/admin/budget_investments/_filters_description.html.erb

@@ -1,16 +1,16 @@
 <% if params[:filter].present? && params[:advanced_filters].present? %>
-  <p class="inline-block"><%= t("#{i18n_namespace}.filters.two_filters_html",
+  <p class="inline-block"><%= sanitize(t("#{i18n_namespace}.filters.two_filters",
                               filter: t("#{i18n_namespace}.filters.#{params[:filter]}"),
-                              advanced_filters: budget_investments_advanced_filters(params[:advanced_filters])) %></p>
+                              advanced_filters: budget_investments_advanced_filters(params[:advanced_filters]))) %></p>
 
 <% elsif params[:filter].present? %>
 
-  <p class="inline-block"><%= t("#{i18n_namespace}.filters.one_filter_html",
+  <p class="inline-block"><%= sanitize(t("#{i18n_namespace}.filters.one_filter",
-                              filter: t("#{i18n_namespace}.filters.#{params[:filter]}")) %></p>
+                              filter: t("#{i18n_namespace}.filters.#{params[:filter]}"))) %></p>
 
 <% elsif params[:advanced_filters].present? %>
 
-  <p class="inline-block"><%= t("#{i18n_namespace}.filters.one_filter_html",
+  <p class="inline-block"><%= sanitize(t("#{i18n_namespace}.filters.one_filter",
-                              filter: budget_investments_advanced_filters(params[:advanced_filters])) %></p>
+                              filter: budget_investments_advanced_filters(params[:advanced_filters]))) %></p>
 
 <% end %>

app/views/admin/legislation/draft_versions/_form.html.erb

@@ -36,9 +36,9 @@
       <div class="markdown-editor clear">
         <div class="small-12 medium-8 column fullscreen-container">
           <div class="markdown-editor-header truncate">
-            <%= t("admin.legislation.draft_versions.form.title_html",
+            <%= sanitize(t("admin.legislation.draft_versions.form.title",
                    draft_version_title: @draft_version.title,
-                   process_title: @process.title) %>
+                   process_title: @process.title)) %>
           </div>
 
           <div class="markdown-editor-buttons">

app/views/admin/newsletters/new.html.erb

@@ -1,9 +1,9 @@
 <%= back_link_to %>
 <h2><%= t("admin.newsletters.new.title") %></h2>
 <p>
-  <%= t("admin.newsletters.new.header_footer_help_text_html",
+  <%= sanitize(t("admin.newsletters.new.header_footer_help_text",
          link: link_to(t("admin.newsletters.new.image_link"),
-                       admin_site_customization_images_path)) %>
+                       admin_site_customization_images_path))) %>
 </p>
 
 <%= render "form" %>

app/views/admin/organizations/index.html.erb

@@ -67,7 +67,7 @@
 
   <% if hidden > 0 %>
     <div class="callout warning">
-      <%= t("admin.organizations.index.hidden_count_html", count: hidden) %>
+      <%= sanitize(t("admin.organizations.index.hidden_count", count: hidden)) %>
     </div>
   <% end %>
 

app/views/admin/site_customization/pages/_form.html.erb

@@ -32,7 +32,7 @@
 
     <div class="small-12 medium-6 column">
       <%= f.text_field :slug, size: 80, maxlength: 80,
-        hint: t("admin.site_customization.pages.new.slug_help_html") %>
+        hint: sanitize(t("admin.site_customization.pages.new.slug_help")) %>
     </div>
   </div>
 

app/views/budgets/ballot/_ballot.html.erb

@@ -6,8 +6,7 @@
 
     <div class="small-12 medium-8 column small-centered text-center">
       <h2>
-        <%= t("budgets.ballots.show.voted_html",
+        <%= sanitize(t("budgets.ballots.show.voted", count: @ballot.investments.count)) %>
-            count: @ballot.investments.count) %>
       </h2>
       <p class="confirmed">
         <%= t("budgets.ballots.show.voted_info") %>

app/views/budgets/investments/_header.html.erb

@@ -36,8 +36,8 @@
               </h2>
               <div class="small-12 medium-9">
                 <div class="callout warning margin-top">
-                  <%= t("budgets.investments.header.different_heading_assigned_html",
+                  <%= sanitize(t("budgets.investments.header.different_heading_assigned",
-                        heading_link: heading_link(@assigned_heading, @budget)) %>
+                        heading_link: heading_link(@assigned_heading, @budget))) %>
                   <br>
                   <small>
                     <%= sanitize(t("budgets.investments.header.change_ballot",

app/views/budgets/investments/_investment_detail.erb

@@ -19,7 +19,7 @@
 <%= render_image(investment.image, :large, true) if investment.image.present? %>
 
 <p id="investment_code">
-  <%= t("budgets.investments.show.code_html", code: investment.id) %>
+  <%= sanitize(t("budgets.investments.show.code", code: investment.id)) %>
 </p>
 
 <%= auto_link_already_sanitized_html investment.description %>
@@ -32,13 +32,13 @@
 
 <% if investment.location.present? %>
   <p>
-    <%= t("budgets.investments.show.location_html", location: investment.location) %>
+    <%= sanitize(t("budgets.investments.show.location", location: investment.location)) %>
   </p>
 <% end %>
 
 <% if investment.organization_name.present? %>
   <p>
-    <%= t("budgets.investments.show.organization_name_html", name: investment.organization_name) %>
+    <%= sanitize(t("budgets.investments.show.organization_name", name: investment.organization_name)) %>
   </p>
 <% end %>
 

app/views/budgets/investments/_investment_show.html.erb

@@ -75,7 +75,7 @@
 
         <% if investment.unfeasible? && investment.valuation_finished? %>
           <div class="callout warning">
-            <%= t("budgets.investments.show.project_unfeasible_html") %>
+            <%= sanitize(t("budgets.investments.show.project_unfeasible")) %>
           </div>
         <% elsif investment.winner? && @budget.finished? %>
           <div class="callout success">
@@ -83,11 +83,11 @@
           </div>
         <% elsif investment.selected? %>
           <div class="callout success">
-            <%= t("budgets.investments.show.project_selected_html") %>
+            <%= sanitize(t("budgets.investments.show.project_selected")) %>
           </div>
         <% elsif @budget.balloting_or_later? %>
           <div class="callout warning">
-            <%= t("budgets.investments.show.project_not_selected_html") %>
+            <%= sanitize(t("budgets.investments.show.project_not_selected")) %>
           </div>
         <% else %>
           <br>

app/views/budgets/investments/_sidebar.html.erb

@@ -40,16 +40,16 @@
   <% if @ballot.investments.by_heading(@heading.id).count > 0 %>
     <p>
       <em>
-        <%= t("budgets.investments.index.sidebar.voted_html",
+        <%= sanitize(t("budgets.investments.index.sidebar.voted",
             count: @ballot.investments.by_heading(@heading.id).count,
-            amount_spent: @ballot.formatted_amount_spent(@heading)) %>
+            amount_spent: @ballot.formatted_amount_spent(@heading))) %>
       </em>
     </p>
   <% elsif @assigned_heading.present? %>
     <p>
-      <%= t("budgets.investments.index.sidebar.different_heading_assigned_html",
+      <%= sanitize(t("budgets.investments.index.sidebar.different_heading_assigned",
               heading_link: heading_link(@assigned_heading, @budget)
-            ) %>
+            )) %>
       <br>
       <small>
         <%= sanitize(t("budgets.investments.index.sidebar.change_ballot",

app/views/budgets/investments/index.html.erb

@@ -28,9 +28,9 @@
           <h2><%= t("shared.search_results") %></h2>
           <p>
             <%= page_entries_info @investments %>
-            <%= t("budgets.investments.index.search_results_html",
+            <%= sanitize(t("budgets.investments.index.search_results",
                    count: @investments.size,
-                   search_term: params[:search]) %>
+                   search_term: params[:search])) %>
           </p>
         </div>
       </div>

app/views/budgets/stats/_advanced_stats.html.erb

@@ -34,7 +34,7 @@
       <thead>
         <tr>
           <th scope="col" rowspan="2"><%= t("stats.budgets.heading") %></th>
-          <th scope="col" rowspan="2"><%= t("stats.budgets.investments_sent_html") %></th>
+          <th scope="col" rowspan="2"><%= sanitize(t("stats.budgets.investments_sent")) %></th>
 
           <% stats.all_phases.each do |phase| %>
             <th scope="col" colspan="3">

app/views/dashboard/mailer/forward.html.erb

@@ -8,7 +8,7 @@
           <%= image_tag "quote_before_white.png", style: "max-width: 40px; vertical-align: top;" %>
           <h1 style="color: #fff; font-size: 60px; line-height: 90px; display: inline;"><%= @proposal.title %></h1>
           <%= image_tag "quote_after_white.png", style: "max-width: 40px; vertical-align: top;" %>
-          <h2 style="color: #fff; font-size: 40px; line-height: 60px"><%= t("dashboard.mailer.forward.subtitle_html") %></h2>
+          <h2 style="color: #fff; font-size: 40px; line-height: 60px"><%= sanitize(t("dashboard.mailer.forward.subtitle")) %></h2>
         </td>
       </tr>
     </tbody>

app/views/dashboard/mailing/index.html.erb

@@ -5,7 +5,7 @@
       <%= image_tag "quote_before_white.png" %>
       <h1 class="inline"><%= proposal.title %></h1>
       <%= image_tag "quote_after_white.png" %>
-      <h2><%= t("dashboard.mailer.forward.subtitle_html") %></h2>
+      <h2><%= sanitize(t("dashboard.mailer.forward.subtitle")) %></h2>
     </div>
 
     <div class="margin-bottom">

app/views/dashboard/poster/index.html.erb

@@ -10,7 +10,7 @@
           <%= t("dashboard.poster.index.poster_subtitle") %>
         </h1>
         <p class="intro">
-          <%= t("dashboard.poster.index.intro_text_html", org: Setting["org_name"]) %>
+          <%= sanitize(t("dashboard.poster.index.intro_text", org: Setting["org_name"])) %>
         </p>
 
         <p class="text-center">
@@ -29,7 +29,7 @@
             <h3><%= proposal.title %></h3>
             <%= image_tag "quote_after_blue.png" %>
           <p class="poster-footer">
-            <%= t("dashboard.poster.index.footer_html", link: proposal_url(proposal)) %>
+            <%= sanitize(t("dashboard.poster.index.footer", link: proposal_url(proposal))) %>
           </p>
         </div>
       </div>

app/views/dashboard/poster/index.pdf.erb

@@ -16,7 +16,7 @@
       </strong>
     </h1>
     <p class="intro">
-      <%= t("dashboard.poster.index.intro_text_html", org: Setting["org_name"]) %>
+      <%= sanitize(t("dashboard.poster.index.intro_text", org: Setting["org_name"])) %>
     </p>
     <p class="text-center proposal-code">
       <strong><%= t("dashboard.poster.index.proposal_code", code: proposal.code) %></strong>
@@ -34,7 +34,7 @@
       <h3><strong><%= proposal.title %></strong></h3>
       <%= wicked_pdf_image_tag "quote_after_blue.png" %>
       <p class="poster-footer">
-        <%= t("dashboard.poster.index.footer_html", link: proposal_url(proposal)) %>
+        <%= sanitize(t("dashboard.poster.index.footer", link: proposal_url(proposal))) %>
       </p>
     </div>
   </div>

app/views/debates/index.html.erb

@@ -18,7 +18,9 @@
             <p>
               <%= page_entries_info @debates %>
               <% if !@advanced_search_terms %>
-                <%= t("debates.index.search_results_html", count: @debates.size, search_term: @search_terms) %>
+                <%= sanitize(
+                  t("debates.index.search_results", count: @debates.size, search_term: @search_terms)
+                ) %>
               <% end %>
             </p>
           <% elsif @tag_filter %>

app/views/devise/confirmations/show.html.erb

@@ -1,7 +1,7 @@
 <% provide :title do %><%= t("devise_views.confirmations.show.title") %><% end %>
 <h1 class="text-center"><%= t("devise_views.confirmations.show.title") %></h1>
 
-<p><%= t("devise_views.confirmations.show.instructions_html", email: resource.email) %></p>
+<p><%= sanitize(t("devise_views.confirmations.show.instructions", email: resource.email)) %></p>
 
 <%= form_for(resource,
              as: resource_name,

app/views/documents/_nested_documents.html.erb

@@ -18,6 +18,6 @@
                               } %>
 
   <div id="max-documents-notice" class="max-documents-notice callout primary text-center <%= "hide" unless max_documents_allowed?(documentable) %>">
-    <%= t "documents.max_documents_allowed_reached_html" %>
+    <%= sanitize(t("documents.max_documents_allowed_reached")) %>
   </div>
 </div>

app/views/mailer/budget_investment_created.html.erb

@@ -16,7 +16,7 @@
   </p>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-    <%= sanitize(t("mailers.budget_investment_created.follow_html",
+    <%= sanitize(t("mailers.budget_investment_created.follow",
            link: link_to(t("mailers.budget_investment_created.follow_link"), budgets_url))) %>
   </p>
 

app/views/mailer/budget_investment_unfeasible.html.erb

@@ -9,9 +9,9 @@
   </p>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-  <%= t("mailers.budget_investment_unfeasible.new_html",
+  <%= sanitize(t("mailers.budget_investment_unfeasible.new",
       url: link_to(t("mailers.budget_investment_unfeasible.new_href"),
-      new_budget_investment_url(@investment.budget), style: "color: #2895F1; text-decoration: underline;")) %>
+      new_budget_investment_url(@investment.budget), style: "color: #2895F1; text-decoration: underline;"))) %>
   </p>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">

app/views/mailer/comment.html.erb

@@ -9,7 +9,8 @@
   </p>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-    <%= t("mailers.comment.new_comment_by_html", commenter: @comment.author.name) %> <%= link_to @commentable.title, commentable_url(@commentable), style: "color: #2895F1; text-decoration:none;" %>
+    <%= sanitize(t("mailers.comment.new_comment_by", commenter: @comment.author.name)) %>
+    <%= link_to @commentable.title, commentable_url(@commentable), style: "color: #2895F1; text-decoration:none;" %>
   </p>
 
   <p style="border-left: 2px solid #DEE0E3;font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-style: italic;font-weight: normal;line-height: 24px;margin-left: 20px;padding: 10px;">

app/views/mailer/direct_message_for_sender.html.erb

@@ -1,8 +1,8 @@
 <td style="padding-bottom: 20px; padding-left: 10px;">
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; font-size: 20px;">
-    <%= t("mailers.direct_message_for_sender.title_html",
+    <%= sanitize(t("mailers.direct_message_for_sender.title",
-        receiver: @direct_message.receiver.name) %>
+        receiver: @direct_message.receiver.name)) %>
   </p>
 
   <h2 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; font-size: 18px;">

app/views/mailer/email_verification.html.erb

@@ -4,16 +4,16 @@
   </h1>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-  <%= t("mailers.email_verification.instructions_html",
+  <%= sanitize(t("mailers.email_verification.instructions",
         verification_link: link_to(
           t("mailers.email_verification.click_here_to_verify"),
-          email_url(email_verification_token: @token))) %>
+          email_url(email_verification_token: @token)))) %>
   </p>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-  <%= t("mailers.email_verification.instructions_2_html",
+  <%= sanitize(t("mailers.email_verification.instructions_2",
         document_type: humanize_document_type(@document_type),
-        document_number: @document_number) %>
+        document_number: @document_number)) %>
   </p>
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
     <%= t("mailers.email_verification.thanks") %>

app/views/mailer/evaluation_comment.html.erb

@@ -9,7 +9,11 @@
   </p>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-    <%= t("mailers.evaluation_comment.new_comment_by_html", commenter: @email.comment.author.name, investment: valuation_comments_link(@email.commentable)) %>
+    <%= sanitize(t(
+      "mailers.evaluation_comment.new_comment_by",
+      commenter: @email.comment.author.name,
+      investment: valuation_comments_link(@email.commentable)
+    )) %>
   </p>
 
   <%= t("mailers.evaluation_comment.commenter_info", commenter: @email.comment.author.name, time: l(@email.comment.created_at)) %>

app/views/mailer/reply.html.erb

@@ -9,7 +9,8 @@
   </p>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-    <%= t("mailers.reply.new_reply_by_html", commenter: @email.reply.author.name) %> <%= link_to @email.commentable.title, comment_url(@email.reply.id), style: "color: #2895F1; text-decoration:none;" %>
+    <%= sanitize(t("mailers.reply.new_reply_by", commenter: @email.reply.author.name)) %>
+    <%= link_to @email.commentable.title, comment_url(@email.reply.id), style: "color: #2895F1; text-decoration:none;" %>
   </p>
 
   <div style="border-left: 2px solid #DEE0E3;font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-style: italic;font-weight: normal;line-height: 24px;margin-left: 20px;padding: 10px;">

app/views/management/document_verifications/invalid_document.html.erb

@@ -11,6 +11,6 @@
       permissions: [:debates, :create_proposals] %>
 
 <p>
-  <%= sanitize(t("management.document_verifications.has_no_account_html",
+  <%= sanitize(t("management.document_verifications.has_no_account",
       link: link_to(t("management.document_verifications.link"), root_path, target: "_blank"))) %>
 </p>

app/views/management/proposals/index.html.erb

@@ -10,7 +10,9 @@
         <% if @search_terms %>
           <h3>
             <%= page_entries_info @proposals %>
-            <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %>
+            <%= sanitize(
+              t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms)
+            ) %>
           </h3>
         <% end %>
 

app/views/management/user_invites/create.html.erb

@@ -4,6 +4,6 @@
   <h2><%= t("management.user_invites.create.title") %></h2>
 
   <div class="callout success">
-    <%= t("management.user_invites.create.success_html", count: @emails.count) %>
+    <%= sanitize(t("management.user_invites.create.success", count: @emails.count)) %>
   </div>
 </div>

app/views/management/users/show.html.erb

@@ -1,7 +1,7 @@
 <% if @user.email.blank? %>
-  <p><%= t("management.users.autogenerated_password_html", password: @user.password) %></p>
+  <p><%= sanitize(t("management.users.autogenerated_password", password: @user.password)) %></p>
 <% else %>
-  <p><%= t("management.users.create_user_success_html", email: @user.email) %></p>
+  <p><%= sanitize(t("management.users.create_user_success", email: @user.email)) %></p>
 <% end %>
 
 <%= render "management/user_permissions",

app/views/organizations/registrations/success.html.erb

@@ -1,7 +1,7 @@
 <h2><%= t("devise_views.organizations.registrations.success.title") %></h2>
-<p><%= t("devise_views.organizations.registrations.success.thank_you_html") %></p>
+<p><%= sanitize(t("devise_views.organizations.registrations.success.thank_you")) %></p>
-<p><%= t("devise_views.organizations.registrations.success.instructions_1_html") %></p>
+<p><%= sanitize(t("devise_views.organizations.registrations.success.instructions_1")) %></p>
-<p><%= t("devise_views.organizations.registrations.success.instructions_2_html") %></p>
+<p><%= sanitize(t("devise_views.organizations.registrations.success.instructions_2")) %></p>
 <p><%= t("devise_views.organizations.registrations.success.instructions_3") %></p>
 <p>
   <%= link_to t("devise_views.organizations.registrations.success.back_to_index"),

app/views/pages/help/_debates.html.erb

@@ -11,7 +11,7 @@
     </p>
     <ul class="features">
       <li>
-        <%= sanitize(t("pages.help.debates.feature_html",
+        <%= sanitize(t("pages.help.debates.feature",
               link: link_to(t("pages.help.debates.feature_link", org: setting["org_name"]),
                                new_user_registration_path))) %>
       </li>

app/views/polls/_callout.html.erb

@@ -7,8 +7,8 @@
     </div>
   <% elsif current_user.unverified? %>
     <div class="callout warning">
-      <%= t("polls.show.cant_answer_verify_html",
+      <%= sanitize(t("polls.show.cant_answer_verify",
-            verify_link: link_to(t("polls.show.verify_link"), verification_path)) %>
+            verify_link: link_to(t("polls.show.verify_link"), verification_path))) %>
     </div>
   <% elsif @poll.expired? %>
     <div class="callout alert">

app/views/proposal_notifications/new.html.erb

@@ -6,7 +6,7 @@
 
     <div class="callout primary">
       <p>
-        <%= sanitize(t("proposal_notifications.new.info_about_receivers_html",
+        <%= sanitize(t("proposal_notifications.new.info_about_receivers",
               count: @proposal.users_to_notify.count,
               proposal_page: link_to(t("proposal_notifications.new.proposal_page"),
                                      proposal_path(@proposal, anchor: "comments")))) %>

app/views/proposals/created.html.erb

@@ -4,7 +4,7 @@
       <h2><%= t("proposals.created.title") %></h2>
 
       <p><%= t("proposals.created.motivation") %></p>
-      <p><%= t("proposals.created.motivation_2_html") %></p>
+      <p><%= sanitize(t("proposals.created.motivation_2")) %></p>
 
       <% if can?(:dashboard, @proposal) %>
         <%= link_to t("proposals.created.dashboard"),

app/views/proposals/index.html.erb

@@ -24,7 +24,9 @@
             <p>
               <%= page_entries_info @proposals %>
               <% if !@advanced_search_terms %>
-                <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %>
+                <%= sanitize(
+                  t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms)
+                ) %>
               <% end %>
             <p>
           <% elsif @tag_filter %>

app/views/shared/_common_globalize_locales.html.erb

@@ -1,7 +1,7 @@
 <div class="row globalize-languages column padding-top <%= highlight_translation_html_class %>"
-     data-zero-languages-description="<%= t("shared.translations.languages_in_use_html", count: 0) %>"
+     data-zero-languages-description="<%= sanitize(t("shared.translations.languages_in_use", count: 0)) %>"
-     data-one-languages-description="<%= t("shared.translations.languages_in_use_html", count: 1) %>"
+     data-one-languages-description="<%= sanitize(t("shared.translations.languages_in_use", count: 1)) %>"
-     data-other-languages-description="<%= t("shared.translations.languages_in_use_html", count: 2) %>">
+     data-other-languages-description="<%= sanitize(t("shared.translations.languages_in_use", count: 2)) %>">
   <div class="small-6 large-3 column">
     <span class="small">
       <strong class="js-languages-description"><%= selected_languages_description(resource) %></strong>

app/views/shared/_errors.html.erb

@@ -10,7 +10,7 @@
       <% if local_assigns[:message].present? %>
         <%= message %>
       <% else %>
-        <%= t("form.not_saved_html", resource: t("form.#{resource.class.to_s.underscore}")) %>
+        <%= sanitize(t("form.not_saved", resource: t("form.#{resource.class.to_s.underscore}"))) %>
       <% end %>
     </strong>
   </div>

app/views/users/registrations/success.html.erb

@@ -1,6 +1,6 @@
 <h2><%= t("devise_views.users.registrations.success.title") %></h2>
-<p><%= t("devise_views.users.registrations.success.thank_you_html") %></p>
+<p><%= sanitize(t("devise_views.users.registrations.success.thank_you")) %></p>
-<p><%= t("devise_views.users.registrations.success.instructions_1_html") %></p>
+<p><%= sanitize(t("devise_views.users.registrations.success.instructions_1")) %></p>
 <p><%= t("devise_views.users.registrations.success.instructions_2") %></p>
 <p>
   <%= link_to t("devise_views.users.registrations.success.back_to_index"),

app/views/valuation/budget_investments/_dossier_detail.html.erb

@@ -13,7 +13,9 @@
   <%= investment.unfeasibility_explanation.presence || "-" %>
 </p>
 <p>
-  <strong><%= t("valuation.budget_investments.edit.price_html", currency: budget.currency_symbol) %>:</strong>
+  <strong>
+    <%= sanitize(t("valuation.budget_investments.edit.price", currency: budget.currency_symbol)) %>:
+  </strong>
   <%= investment.price.presence || "-" %>
 </p>
 <p>

app/views/valuation/budget_investments/_dossier_form.html.erb

@@ -41,13 +41,13 @@
     <div class="row">
       <div class="small-12 medium-6 column">
         <%= f.number_field :price,
-          label: t("valuation.budget_investments.edit.price_html", currency: budget.currency_symbol),
+          label: t("valuation.budget_investments.edit.price", currency: budget.currency_symbol),
           max: 1000000000000000 %>
       </div>
 
       <div class="small-12 medium-6 column end">
         <%= f.number_field :price_first_year,
-          label: t("valuation.budget_investments.edit.price_first_year_html", currency:  budget.currency_symbol),
+          label: t("valuation.budget_investments.edit.price_first_year", currency:  budget.currency_symbol),
           max: 1000000000000000 %>
       </div>
     </div>

app/views/verification/letter/show.html.erb

@@ -7,7 +7,7 @@
     <h1><%= t("verification.letter.edit.title") %></h1>
 
     <div data-alert class="callout success">
-      <%= t("verification.letter.create.flash.success_html") %>
+      <%= sanitize(t("verification.letter.create.flash.success")) %>
     </div>
 
     <%= link_to t("verification.letter.edit.see_all"), proposals_path, class: "button warning" %>

app/views/verification/residence/new.html.erb

@@ -54,7 +54,7 @@
 
           <div class="dropdown-pane" id="info-document-number" data-dropdown
                data-hover="true" data-hover-pane="true">
-            <%= t("verification.residence.new.document_number_help_text_html") %>
+            <%= sanitize(t("verification.residence.new.document_number_help_text")) %>
           </div>
 
           <%= f.text_field :document_number, label: false %>

app/views/verification/sms/new.html.erb

@@ -27,7 +27,7 @@
 
       <div class="small-12 medium-6">
         <%= f.label :phone, t("verification.sms.new.phone"), class: "inline-block" %>
-        <span class="inline-block"><%= t("verification.sms.new.phone_format_html") %></span>
+        <span class="inline-block"><%= sanitize(t("verification.sms.new.phone_format")) %></span>
         <p class="help-text" id="phone-text-help"><%= t("verification.sms.new.phone_note") %></p>
         <%= f.text_field :phone, label: false,
                                  placeholder: t("verification.sms.new.phone_placeholder"),

config/locales/en/admin.yml

@@ -198,8 +198,8 @@ en:
           min_total_supports: Minimum supports
           max_total_supports: Maximum supports
           winners: Winners
-          one_filter_html: "Current applied filters: <b><em>%{filter}</em></b>"
+          one_filter: "Current applied filters: <b><em>%{filter}</em></b>"
-          two_filters_html: "Current applied filters: <b><em>%{filter}, %{advanced_filters}</em></b>"
+          two_filters: "Current applied filters: <b><em>%{filter}, %{advanced_filters}</em></b>"
         buttons:
           filter: Filter
         download_current_selection: "Download current selection"
@@ -555,7 +555,7 @@ en:
           form:
             error: Error
         form:
-          title_html: 'Editing <span class="strong">%{draft_version_title}</span> from the process <span class="strong">%{process_title}</span>'
+          title: 'Editing <span class="strong">%{draft_version_title}</span> from the process <span class="strong">%{process_title}</span>'
           launch_text_editor: Launch text editor
           close_text_editor: Close text editor
           use_markdown: Use Markdown to format the text
@@ -767,7 +767,7 @@ en:
         empty_newsletters: There are no newsletters to show
       new:
         title: New newsletter
-        header_footer_help_text_html: "The heading and footer are the same for all emails, you can modify them on <code>app/views/layouts/mailer_header</code> and <code>app/views/layouts/mailer_footer</code>.<br>You can replace header image on %{link}."
+        header_footer_help_text: "The heading and footer are the same for all emails, you can modify them on <code>app/views/layouts/mailer_header</code> and <code>app/views/layouts/mailer_footer</code>.<br>You can replace header image on %{link}."
         image_link: "custom images"
       edit:
         title: Edit newsletter
@@ -1187,7 +1187,7 @@ en:
           pending: Pending
           rejected: Rejected
           verified: Verified
-        hidden_count_html:
+        hidden_count:
           one: There is also <strong>one organisation</strong> with no users or with a hidden user.
           other: There are <strong>%{count} organisations</strong> with no users or with a hidden user.
         name: Name
@@ -1542,7 +1542,7 @@ en:
           see_page: See page
         new:
           title: Create new custom page
-          slug_help_html: "Text to identify this page on URL, for example <code>https://consulproject.org/page-slug</code>"
+          slug_help: "Text to identify this page on URL, for example <code>https://consulproject.org/page-slug</code>"
         page:
           created_at: Created at
           status: Status

config/locales/en/budgets.yml

@@ -7,7 +7,7 @@ en:
         remaining: "You still have <span>%{amount}</span> to invest."
         no_balloted_group_yet: "You have not voted on this group yet, go vote!"
         remove: Remove vote
-        voted_html:
+        voted:
           one: "You have voted <span>one</span> investment."
           other: "You have voted <span>%{count}</span> investments."
         voted_info: "Your ballot is confirmed!"
@@ -18,9 +18,9 @@ en:
         not_verified: Only verified users can vote on investments; %{verify_account}.
         organization: Organizations are not permitted to vote
         not_selected: Unselected investment projects can not be supported
-        not_enough_money_html: "You have already assigned the available budget.<br><small>Remember you can %{change_ballot} at any time</small>"
+        not_enough_money: "You have already assigned the available budget.<br><small>Remember you can %{change_ballot} at any time</small>"
         no_ballots_allowed: Selecting phase is closed
-        different_heading_assigned_html: "You have already voted a different heading: %{heading_link}"
+        different_heading_assigned: "You have already voted a different heading: %{heading_link}"
         change_ballot: change your votes
         casted_offline: You have already participated offline
     groups:
@@ -79,17 +79,17 @@ en:
           button: Search
           placeholder: Search investment projects...
           title: Search
-        search_results_html:
+        search_results:
           one: " containing the term <strong>'%{search_term}'</strong>"
           other: " containing the term <strong>'%{search_term}'</strong>"
         sidebar:
           my_ballot: My ballot
-          voted_html:
+          voted:
             one: "<strong>You voted one proposal with a cost of %{amount_spent}</strong>"
             other: "<strong>You voted %{count} proposals with a cost of %{amount_spent}</strong>"
           voted_info: You can %{link} at any time until the close of this phase. No need to spend all the money available.
           voted_info_link: change your vote
-          different_heading_assigned_html: "You have active votes in another heading: %{heading_link}"
+          different_heading_assigned: "You have active votes in another heading: %{heading_link}"
           change_ballot: "If your change your mind you can remove your votes in %{check_ballot} and start again."
           check_ballot_link: "check and confirm my ballot"
           zero: You have not voted any investment project in this group.
@@ -109,9 +109,9 @@ en:
         author_deleted: User deleted
         price_explanation: Price explanation
         unfeasibility_explanation: Unfeasibility explanation
-        code_html: "Investment project code: <strong>%{code}</strong>"
+        code: "Investment project code: <strong>%{code}</strong>"
-        location_html: "Location: <strong>%{location}</strong>"
+        location: "Location: <strong>%{location}</strong>"
-        organization_name_html: "Proposed on behalf of: <strong>%{name}</strong>"
+        organization_name: "Proposed on behalf of: <strong>%{name}</strong>"
         share: Share
         title: Investment project
         supports: Supports
@@ -120,10 +120,10 @@ en:
         comments_tab: Comments
         milestones_tab: Milestones
         author: Author
-        project_unfeasible_html: "This investment project <strong>has been marked as not feasible</strong> and will not go to balloting phase."
+        project_unfeasible: "This investment project <strong>has been marked as not feasible</strong> and will not go to balloting phase."
-        project_selected_html: "This investment project <strong>has been selected</strong> for balloting phase."
+        project_selected: "This investment project <strong>has been selected</strong> for balloting phase."
         project_winner: "Winning investment project"
-        project_not_selected_html: "This investment project <strong>has not been selected</strong> for balloting phase."
+        project_not_selected: "This investment project <strong>has not been selected</strong> for balloting phase."
         see_price_explanation: See price explanation
       wrong_price_format: Only integer numbers
       investment:
@@ -141,7 +141,7 @@ en:
         give_support: Support
       header:
         check_ballot: Check and confirm my ballot
-        different_heading_assigned_html: "You have active votes in another heading: %{heading_link}"
+        different_heading_assigned: "You have active votes in another heading: %{heading_link}"
         change_ballot: "If your change your mind you can remove your votes in %{check_ballot} and start again."
         check_ballot_link: "check and confirm my ballot"
         price: "This heading has a budget of"

config/locales/en/devise_views.yml

@@ -6,7 +6,7 @@ en:
         submit: Re-send instructions
         title: Re-send confirmation instructions
       show:
-        instructions_html: Confirming the account with email %{email}
+        instructions: Confirming the account with email %{email}
         new_password_confirmation_label: Repeat access password
         new_password_label: New access password
         please_set_password: Please choose your new pasword (it will allow you to login with the email above)
@@ -50,10 +50,10 @@ en:
           title: Register as an organisation or collective
         success:
           back_to_index: I understand; go back to main page
-          instructions_1_html: "<strong>We will contact you soon</strong> to verify that you do in fact represent this collective."
+          instructions_1: "<strong>We will contact you soon</strong> to verify that you do in fact represent this collective."
-          instructions_2_html: While your <strong>email is reviewed</strong>, we have sent you a <strong>link to confirm your account</strong>.
+          instructions_2: While your <strong>email is reviewed</strong>, we have sent you a <strong>link to confirm your account</strong>.
           instructions_3: Once confirmed, you may begin to participate as an unverified collective.
-          thank_you_html: Thank you for registering your collective on the website. It is now <strong>pending verification</strong>.
+          thank_you: Thank you for registering your collective on the website. It is now <strong>pending verification</strong>.
           title: Registration of organisation / collective
     passwords:
       edit:
@@ -123,7 +123,7 @@ en:
           username_note: Name that appears next to your posts
         success:
           back_to_index: I understand; go back to main page
-          instructions_1_html: Please <b>check your email</b> - we have sent you a <b>link to confirm your account</b>.
+          instructions_1: Please <b>check your email</b> - we have sent you a <b>link to confirm your account</b>.
           instructions_2: Once confirmed, you may begin participation.
-          thank_you_html: Thank you for registering for the website. You must now <b>confirm your email address</b>.
+          thank_you: Thank you for registering for the website. You must now <b>confirm your email address</b>.
           title: Confirm your email address

config/locales/en/documents.yml

@@ -1,7 +1,7 @@
 en:
   documents:
     title: Documents
-    max_documents_allowed_reached_html: You have reached the maximum number of documents allowed! <strong>You have to delete one before you can upload another.</strong>
+    max_documents_allowed_reached: You have reached the maximum number of documents allowed! <strong>You have to delete one before you can upload another.</strong>
     additional: Additional documentation
     form:
       title: Documents

config/locales/en/general.yml

@@ -116,7 +116,7 @@ en:
         button: Search
         placeholder: Search debates...
         title: Search
-      search_results_html:
+      search_results:
         one: " containing the term <strong>'%{search_term}'</strong>"
         other: " containing the term <strong>'%{search_term}'</strong>"
       select_order: Order by
@@ -169,7 +169,7 @@ en:
     direct_message: private message
     error: error
     errors: errors
-    not_saved_html: "prevented this %{resource} from being saved. <br>Please check the marked fields to know how to correct them:"
+    not_saved: "prevented this %{resource} from being saved. <br>Please check the marked fields to know how to correct them:"
     policy: Privacy Policy
     proposal: Proposal
     proposal_notification: "Notification"
@@ -302,7 +302,7 @@ en:
     created:
       title: Congratulations! You have taken the first step.
       motivation: "It is important to prepare the launch campaign for your proposal to be successful. The first few days are decisive."
-      motivation_2_html: "<strong>If you want recommendations to prepare the publishing leave your proposal as a draft and we will guide you.</strong>"
+      motivation_2: "<strong>If you want recommendations to prepare the publishing leave your proposal as a draft and we will guide you.</strong>"
       publish: No, I want to publish the proposal
       dashboard: Yes, I want help and I'll publish later
       preview_title: This is how your proposal will look when you publish it
@@ -376,7 +376,7 @@ en:
         button: Search
         placeholder: Search proposals...
         title: Search
-      search_results_html:
+      search_results:
         one: " containing the term <strong>'%{search_term}'</strong>"
         other: " containing the term <strong>'%{search_term}'</strong>"
       select_order: Order by
@@ -570,12 +570,12 @@ en:
         title: Poster preview
         poster_title: "Do not keep looking,"
         poster_subtitle: "back me up! ;)"
-        intro_text_html:
+        intro_text:
           "<strong>I am participating in %{org}</strong> with my own citizen proposal and only if you also add you can I achieve the
           necessary support to make the city we all want."
         proposal_code: "Code of the proposal: %{code}"
         support: Support my proposal
-        footer_html: "<strong>Visit %{link} and support this proposal.</strong> We need to be many. Decide your too. Thank you!"
+        footer: "<strong>Visit %{link} and support this proposal.</strong> We need to be many. Decide your too. Thank you!"
       new:
         title: Poster of your proposal
       options:
@@ -593,7 +593,7 @@ en:
         sent: The email has been sent
     mailer:
       forward:
-        subtitle_html: "If you support me, <br>we will achieve it."
+        subtitle: "If you support me, <br>we will achieve it."
         support_button: Support this proposal
         share_in: Share in
         hi: "Hello!"
@@ -644,7 +644,7 @@ en:
       back: Back to voting
       cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
       comments_tab: Comments
-      cant_answer_verify_html: "You must %{verify_link} in order to answer."
+      cant_answer_verify: "You must %{verify_link} in order to answer."
       verify_link: "verify your account"
       cant_answer_expired: "This poll has finished."
       cant_answer_wrong_geozone: "This question is not available on your geozone."
@@ -693,7 +693,7 @@ en:
     new:
       title: "Send message"
       submit_button: "Send message"
-      info_about_receivers_html: "This message will be sent to <strong>%{count} people</strong> and it will be visible in %{proposal_page}.<br> Messages are not sent immediately, users will receive periodically an email with all proposal notifications."
+      info_about_receivers: "This message will be sent to <strong>%{count} people</strong> and it will be visible in %{proposal_page}.<br> Messages are not sent immediately, users will receive periodically an email with all proposal notifications."
       proposal_page: "the proposal's page"
     show:
       back: "Go back to my content"
@@ -736,14 +736,14 @@ en:
     followable:
       budget_investment:
         create:
-          notice_html: "You are now following this investment project! <br> We will notify you of changes as they occur so that you are up-to-date."
+          notice: "You are now following this investment project! <br> We will notify you of changes as they occur so that you are up-to-date."
         destroy:
-          notice_html: "You have stopped following this investment project! <br> You will no longer receive notifications related to this project."
+          notice: "You have stopped following this investment project! <br> You will no longer receive notifications related to this project."
       proposal:
           create:
-            notice_html: "Now you are following this citizen proposal! <br> We will notify you of changes as they occur so that you are up-to-date."
+            notice: "Now you are following this citizen proposal! <br> We will notify you of changes as they occur so that you are up-to-date."
           destroy:
-            notice_html: "You have stopped following this citizen proposal! <br> You will no longer receive notifications related to this proposal."
+            notice: "You have stopped following this citizen proposal! <br> You will no longer receive notifications related to this proposal."
     hide: Hide
     print:
       print_button: Print this info
@@ -805,7 +805,7 @@ en:
       select_language_prompt: Choose language
       remove_language: Remove language
       add_language: Add language
-      languages_in_use_html:
+      languages_in_use:
         zero: "<span class='js-languages-count'>0</span> languages in use"
         one: "<span class='js-languages-count'>1</span> language in use"
         other: "<span class='js-languages-count'>%{count}</span> languages in use"

config/locales/en/mailers.yml

@@ -4,21 +4,21 @@ en:
     no_reply: "This message was sent from an email address that does not accept replies."
     comment:
       hi: Hi
-      new_comment_by_html: There is a new comment from <strong>%{commenter}</strong>
+      new_comment_by: There is a new comment from <strong>%{commenter}</strong>
       subject: Someone has commented on your %{commentable}
       title: New comment
     config:
       manage_email_subscriptions: To stop receiving these emails change your settings in
     email_verification:
       click_here_to_verify: this link
-      instructions_2_html: This email will verify your account with <b>%{document_type} %{document_number}</b>. If these don't belong to you, please don't click on the previous link and ignore this email.
+      instructions_2: This email will verify your account with <b>%{document_type} %{document_number}</b>. If these don't belong to you, please don't click on the previous link and ignore this email.
-      instructions_html: To complete the verification of your user account you must click %{verification_link}.
+      instructions: To complete the verification of your user account you must click %{verification_link}.
       subject: Confirm your email
       thanks: Thank you very much.
       title: Confirm your account using the following link
     reply:
       hi: Hi
-      new_reply_by_html: There is a new response from <strong>%{commenter}</strong> to your comment on
+      new_reply_by: There is a new response from <strong>%{commenter}</strong> to your comment on
       subject: Someone has responded to your comment
       title: New response to your comment
     proposal_notification_digest:
@@ -35,7 +35,7 @@ en:
       unsubscribe_account: My account
     direct_message_for_sender:
       subject: "You have sent a new private message"
-      title_html: "You have sent a new private message to <strong>%{receiver}</strong> with the content:"
+      title: "You have sent a new private message to <strong>%{receiver}</strong> with the content:"
     user_invite:
       ignore: "If you have not requested this invitation don't worry, you can ignore this email."
       text: "Thank you for applying to join %{org}! In seconds you can start to participate, just fill the form below:"
@@ -48,13 +48,13 @@ en:
       title: "Thank you for creating an investment!"
       intro: "Hi <strong>%{author}</strong>,"
       text: "Thank you for creating your investment <strong>%{investment}</strong> for Participatory Budgets <strong>%{budget}</strong>."
-      follow_html: "We will inform you about how the process progresses, which you can also follow on <strong>%{link}</strong>."
+      follow: "We will inform you about how the process progresses, which you can also follow on <strong>%{link}</strong>."
       follow_link: "Participatory Budgets"
       sincerely: "Sincerely,"
       share: "Share your project"
     budget_investment_unfeasible:
       hi: "Dear user,"
-      new_html: "For all these, we invite you to elaborate a <strong>new investment</strong> that adjusts to the conditions of this process. You can do it following this link: %{url}."
+      new: "For all these, we invite you to elaborate a <strong>new investment</strong> that adjusts to the conditions of this process. You can do it following this link: %{url}."
       new_href: "new investment project"
       sincerely: "Sincerely"
       sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation."
@@ -75,7 +75,7 @@ en:
       subject: "New evaluation comment"
       title: New evaluation comment for %{investment}
       hi: Hi
-      new_comment_by_html: There is a new evaluation comment from <strong>%{commenter}</strong> to the budget investment %{investment}
+      new_comment_by: There is a new evaluation comment from <strong>%{commenter}</strong> to the budget investment %{investment}
       commenter_info: "%{commenter}, %{time}:"
     new_actions_notification_rake_created:
       subject: "More news about your citizen proposal"

config/locales/en/management.yml

@@ -34,7 +34,7 @@ en:
         info: Here you can manage users through all actions listed in the left menu.
     document_verifications:
       already_verified: This user account is already verified.
-      has_no_account_html: In order to create an account, go to %{link} and click in <b>"Register"</b> in the upper-left part of the screen.
+      has_no_account: In order to create an account, go to %{link} and click in <b>"Register"</b> in the upper-left part of the screen.
       link: CONSUL
       in_census_has_following_permissions: "This user can participate in the website with the following permissions:"
       not_in_census: This document is not registered.
@@ -112,8 +112,8 @@ en:
       create_user: Create a new account
       create_user_info: We will create an account with the following data
       create_user_submit: Create user
-      create_user_success_html: We have sent an email to the email address <b>%{email}</b> in order to verify that it belongs to this user. It contains a link they have to click. Then they will have to set their access password before being able to log in to the website
+      create_user_success: We have sent an email to the email address <b>%{email}</b> in order to verify that it belongs to this user. It contains a link they have to click. Then they will have to set their access password before being able to log in to the website
-      autogenerated_password_html: "Autogenerated password is <b>%{password}</b>, you can change it in the 'My account' section of the web"
+      autogenerated_password: "Autogenerated password is <b>%{password}</b>, you can change it in the 'My account' section of the web"
       email_optional_label: Email (optional)
       erased_notice: User account deleted.
       erased_by_manager: "Deleted by manager: %{manager}"
@@ -128,5 +128,5 @@ en:
         submit: Send invitations
         title: Send invitations
       create:
-        success_html: <strong>%{count} invitations</strong> have been sent.
+        success: <strong>%{count} invitations</strong> have been sent.
         title: Send invitations

config/locales/en/pages.yml

@@ -18,7 +18,7 @@ en:
         title: "Debates"
         description: "In the %{link} section you can present and share your opinion with other people on issues of concern to you related to the city. It is also a place to generate ideas that through the other sections of %{org} lead to concrete actions by the City Council."
         link: "citizen debates"
-        feature_html: "You can open debates, comment and evaluate them with the <strong>I agree</strong> or <strong>I don't agree</strong>. For that you have to %{link}."
+        feature: "You can open debates, comment and evaluate them with the <strong>I agree</strong> or <strong>I don't agree</strong>. For that you have to %{link}."
         feature_link: "register in %{org}"
         image_alt: "Buttons to rate the debates"
         figcaption: '"I agree" and "I disagree" buttons to rate the debates.'
@@ -139,7 +139,7 @@ en:
               description_column: Decreases text size
       compatibility:
         title: Compatibility with standards and visual design
-        description_html: 'All pages of this website comply with the <strong>Accessibility Guidelines</strong> or General Principles of Accessible Design established by the Working Group <abbr title="Web Accessibility Initiative" lang="en">WAI</abbr> belonging to W3C.'
+        description: 'All pages of this website comply with the <strong>Accessibility Guidelines</strong> or General Principles of Accessible Design established by the Working Group <abbr title="Web Accessibility Initiative" lang="en">WAI</abbr> belonging to W3C.'
     titles:
       help: "What is %{org}? - Citizen participation"
     verify:

config/locales/en/stats.yml

@@ -27,7 +27,7 @@ en:
       by_heading: "Participants by phase and heading"
       total: "Total"
       heading: "Heading"
-      investments_sent_html: "Investment proposals sent"
+      investments_sent: "Investment proposals sent"
       participants_support_phase: "Participants support phase"
       participants_vote_phase: "Participants voting phase"
       participants_every_phase: "Total participants"

config/locales/en/valuation.yml

@@ -56,8 +56,8 @@ en:
         preview: Investment preview
       edit:
         dossier: Dossier
-        price_html: "Price (%{currency})"
+        price: "Price (%{currency})"
-        price_first_year_html: "Cost during the first year (%{currency}) <small>(optional, data not public)</small>"
+        price_first_year: "Cost during the first year (%{currency}) <small>(optional, data not public)</small>"
         feasibility: Feasibility
         valuation_finished_alert: "Are you sure you want to mark this report as completed? If you do it, it can no longer be modified."
         not_feasible_alert: "An email will be sent immediately to the author of the project with the report of unfeasibility."

config/locales/en/verification.yml

@@ -19,7 +19,7 @@ en:
         unconfirmed_code: You have not yet entered the confirmation code
       create:
         flash:
-          success_html: Thank you for requesting your <b>maximum security code (only required for the final votes)</b>. In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the Citizen Support Offices.
+          success: Thank you for requesting your <b>maximum security code (only required for the final votes)</b>. In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the Citizen Support Offices.
       edit:
         see_all: See proposals
         title: Letter requested
@@ -49,7 +49,7 @@ en:
         accept_terms_text_title: I accept the terms and conditions of access of the Census
         document_number: Document number
         document_number_help_title: Help
-        document_number_help_text_html: "<strong>DNI</strong>: 12345678A<br> <strong>Passport</strong>: AAA000001<br> <strong>Residence card</strong>: X1234567P"
+        document_number_help_text: "<strong>DNI</strong>: 12345678A<br> <strong>Passport</strong>: AAA000001<br> <strong>Residence card</strong>: X1234567P"
         document_type:
           passport: Passport
           residence_card: Residence card
@@ -73,7 +73,7 @@ en:
         title: Security code confirmation
       new:
         phone: Enter your mobile phone number to receive the code
-        phone_format_html: "<strong><em>(Example: 612345678 or +34612345678)</em></strong>"
+        phone_format: "<strong><em>(Example: 612345678 or +34612345678)</em></strong>"
         phone_note: We only use your phone to send you a code, never to contact you.
         phone_placeholder: "Example: 612345678 or +34612345678"
         submit_button: Send

config/locales/es/admin.yml

@@ -198,8 +198,8 @@ es:
           min_total_supports: Apoyos mínimos
           max_total_supports: Apoyos máximos
           winners: Ganadores
-          one_filter_html: "Filtros en uso: <b><em>%{filter}</em></b>"
+          one_filter: "Filtros en uso: <b><em>%{filter}</em></b>"
-          two_filters_html: "Filtros en uso: <b><em>%{filter}, %{advanced_filters}</em></b>"
+          two_filters: "Filtros en uso: <b><em>%{filter}, %{advanced_filters}</em></b>"
         buttons:
           filter: Filtrar
         download_current_selection: "Descargar selección actual"
@@ -554,7 +554,7 @@ es:
           form:
             error: Error
         form:
-          title_html: 'Editando <span class="strong">%{draft_version_title}</span> del proceso <span class="strong">%{process_title}</span>'
+          title: 'Editando <span class="strong">%{draft_version_title}</span> del proceso <span class="strong">%{process_title}</span>'
           launch_text_editor: Lanzar editor de texto
           close_text_editor: Cerrar editor de texto
           use_markdown: Usa Markdown para formatear el texto
@@ -766,7 +766,7 @@ es:
         empty_newsletters: No hay newsletters para mostrar
       new:
         title: Nueva newsletter
-        header_footer_help_text_html: "El encabezado y pie son los mismos en todos los emails, puedes modificarlos en <code>app/views/layouts/mailer_header</code> y <code>app/views/layouts/mailer_footer</code>.<br>Puedes reemplazar la imagen del encabezado en %{link}."
+        header_footer_help_text: "El encabezado y pie son los mismos en todos los emails, puedes modificarlos en <code>app/views/layouts/mailer_header</code> y <code>app/views/layouts/mailer_footer</code>.<br>Puedes reemplazar la imagen del encabezado en %{link}."
         image_link: "personalizar imágenes"
       edit:
         title: Editar newsletter
@@ -1186,7 +1186,7 @@ es:
           pending: Pendientes
           rejected: Rechazadas
           verified: Verificadas
-        hidden_count_html:
+        hidden_count:
           one: Hay además <strong>una organización</strong> sin usuario o con el usuario bloqueado.
           other: Hay <strong>%{count} organizaciones</strong> sin usuario o con el usuario bloqueado.
         name: Nombre
@@ -1541,7 +1541,7 @@ es:
           see_page: Ver página
         new:
           title: Página nueva
-          slug_help_html: "Texto que identifica esta página en la URL, por ejemplo <code>https://consulproject.org/slug-de-pagina</code>"
+          slug_help: "Texto que identifica esta página en la URL, por ejemplo <code>https://consulproject.org/slug-de-pagina</code>"
         page:
           created_at: Creada
           status: Estado

config/locales/es/budgets.yml

@@ -7,7 +7,7 @@ es:
         remaining: "Te quedan <span>%{amount}</span> para invertir"
         no_balloted_group_yet: "Todavía no has votado proyectos de este grupo, ¡vota!"
         remove: Quitar voto
-        voted_html:
+        voted:
           one: "Has votado <span>un</span> proyecto."
           other: "Has votado <span>%{count}</span> proyectos."
         voted_info: "¡Tus votos están confirmados!"
@@ -18,9 +18,9 @@ es:
         not_verified: Los proyectos de gasto sólo pueden ser apoyados por usuarios verificados, %{verify_account}.
         organization: Las organizaciones no pueden votar.
         not_selected: No se pueden votar proyectos inviables.
-        not_enough_money_html: "Ya has asignado el presupuesto disponible.<br><small>Recuerda que puedes %{change_ballot} en cualquier momento</small>"
+        not_enough_money: "Ya has asignado el presupuesto disponible.<br><small>Recuerda que puedes %{change_ballot} en cualquier momento</small>"
         no_ballots_allowed: El periodo de votación está cerrado.
-        different_heading_assigned_html: "Ya has votado proyectos de otra partida: %{heading_link}"
+        different_heading_assigned: "Ya has votado proyectos de otra partida: %{heading_link}"
         change_ballot: cambiar tus votos
         casted_offline: Ya has participado presencialmente
     groups:
@@ -79,17 +79,17 @@ es:
           button: Buscar
           placeholder: Buscar proyectos de gasto...
           title: Buscar
-        search_results_html:
+        search_results:
           one: " que contiene <strong>'%{search_term}'</strong>"
           other: " que contienen <strong>'%{search_term}'</strong>"
         sidebar:
           my_ballot: Mis votos
-          voted_html:
+          voted:
             one: "<strong>Has votado un proyecto por un valor de %{amount_spent}</strong>"
             other: "<strong>Has votado %{count} proyectos por un valor de %{amount_spent}</strong>"
           voted_info: Puedes %{link} en cualquier momento hasta el cierre de esta fase. No hace falta que gastes todo el dinero disponible.
           voted_info_link: cambiar tus votos
-          different_heading_assigned_html: "Ya apoyaste proyectos de otra sección del presupuesto: %{heading_link}"
+          different_heading_assigned: "Ya apoyaste proyectos de otra sección del presupuesto: %{heading_link}"
           change_ballot: "Si cambias de opinión puedes borrar tus votos en %{check_ballot} y volver a empezar."
           check_ballot_link: "revisar y confirmar mis votos"
           zero: Todavía no has votado ningún proyecto de gasto en este ámbito del presupuesto.
@@ -109,9 +109,9 @@ es:
         author_deleted: Usuario eliminado
         price_explanation: Informe de coste
         unfeasibility_explanation: Informe de inviabilidad
-        code_html: "Código proyecto de gasto: <strong>%{code}</strong>"
+        code: "Código proyecto de gasto: <strong>%{code}</strong>"
-        location_html: "Ubicación: <strong>%{location}</strong>"
+        location: "Ubicación: <strong>%{location}</strong>"
-        organization_name_html: "Propuesto en nombre de: <strong>%{name}</strong>"
+        organization_name: "Propuesto en nombre de: <strong>%{name}</strong>"
         share: Compartir
         title: Proyecto de gasto
         supports: Apoyos
@@ -120,10 +120,10 @@ es:
         comments_tab: Comentarios
         milestones_tab: Seguimiento
         author: Autor
-        project_unfeasible_html: "Este proyecto de gasto <strong>ha sido marcado como inviable</strong> y no pasará a la fase de votación."
+        project_unfeasible: "Este proyecto de gasto <strong>ha sido marcado como inviable</strong> y no pasará a la fase de votación."
-        project_selected_html: "Este proyecto de gasto <strong>ha sido seleccionado</strong> para la fase de votación."
+        project_selected: "Este proyecto de gasto <strong>ha sido seleccionado</strong> para la fase de votación."
         project_winner: "Proyecto de gasto ganador"
-        project_not_selected_html: "Este proyecto de gasto <strong>no ha sido seleccionado</strong> para la fase de votación."
+        project_not_selected: "Este proyecto de gasto <strong>no ha sido seleccionado</strong> para la fase de votación."
         see_price_explanation: Ver informe de coste
       wrong_price_format: Solo puede incluir caracteres numéricos
       investment:
@@ -141,7 +141,7 @@ es:
         give_support: Apoyar
       header:
         check_ballot: Revisar y confirmar mis votos
-        different_heading_assigned_html: "Ya apoyaste proyectos de otra sección del presupuesto: %{heading_link}"
+        different_heading_assigned: "Ya apoyaste proyectos de otra sección del presupuesto: %{heading_link}"
         change_ballot: "Si cambias de opinión puedes borrar tus votos en %{check_ballot} y volver a empezar."
         check_ballot_link: "revisar y confirmar mis votos"
         price: "Esta partida tiene un presupuesto de"

config/locales/es/devise_views.yml

@@ -6,7 +6,7 @@ es:
         submit: Reenviar instrucciones
         title: Reenviar instrucciones de confirmación
       show:
-        instructions_html: Vamos a proceder a confirmar la cuenta con el email <b>%{email}</b>
+        instructions: Vamos a proceder a confirmar la cuenta con el email <b>%{email}</b>
         new_password_confirmation_label: Repite la clave de nuevo
         new_password_label: Nueva clave de acceso
         please_set_password: Por favor introduce una nueva clave de acceso para su cuenta (te permitirá hacer login con el email de más arriba)
@@ -50,10 +50,10 @@ es:
           title: Registrarse como organización / colectivo
         success:
           back_to_index: Entendido, volver a la página principal
-          instructions_1_html: "En breve <b>nos pondremos en contacto contigo</b> para verificar que realmente representas a este colectivo."
+          instructions_1: "En breve <b>nos pondremos en contacto contigo</b> para verificar que realmente representas a este colectivo."
-          instructions_2_html: Mientras <b>revisa tu correo electrónico</b>, te hemos enviado un <b>enlace para confirmar tu cuenta</b>.
+          instructions_2: Mientras <b>revisa tu correo electrónico</b>, te hemos enviado un <b>enlace para confirmar tu cuenta</b>.
           instructions_3: Una vez confirmado, podrás empezar a participar como colectivo no verificado.
-          thank_you_html: Gracias por registrar tu colectivo en la web. Ahora está <b>pendiente de verificación</b>.
+          thank_you: Gracias por registrar tu colectivo en la web. Ahora está <b>pendiente de verificación</b>.
           title: Registro de organización / colectivo
     passwords:
       edit:
@@ -123,7 +123,7 @@ es:
           username_note: Nombre público que aparecerá en tus publicaciones
         success:
           back_to_index: Entendido, volver a la página principal
-          instructions_1_html: Por favor <b>revisa tu correo electrónico</b> - te hemos enviado un <b>enlace para confirmar tu cuenta</b>.
+          instructions_1: Por favor <b>revisa tu correo electrónico</b> - te hemos enviado un <b>enlace para confirmar tu cuenta</b>.
           instructions_2: Una vez confirmado, podrás empezar a participar.
-          thank_you_html: Gracias por registrarte en la web. Ahora debes <b>confirmar tu correo</b>.
+          thank_you: Gracias por registrarte en la web. Ahora debes <b>confirmar tu correo</b>.
           title: Revisa tu correo

config/locales/es/documents.yml

@@ -1,7 +1,7 @@
 es:
   documents:
     title: Documentos
-    max_documents_allowed_reached_html: '¡Has alcanzado el número máximo de documentos permitidos! <strong>Tienes que eliminar uno antes de poder subir otro.</strong>'
+    max_documents_allowed_reached: '¡Has alcanzado el número máximo de documentos permitidos! <strong>Tienes que eliminar uno antes de poder subir otro.</strong>'
     additional: Documentación adicional
     form:
       title: Documentos

config/locales/es/general.yml

@@ -116,7 +116,7 @@ es:
         button: Buscar
         placeholder: Buscar debates...
         title: Buscar
-      search_results_html:
+      search_results:
         one: " que contiene <strong>'%{search_term}'</strong>"
         other: " que contienen <strong>'%{search_term}'</strong>"
       select_order: Ordenar por
@@ -169,7 +169,7 @@ es:
     direct_message: el mensaje privado
     error: error
     errors: errores
-    not_saved_html: "impidieron guardar %{resource}. <br>Por favor revisa los campos marcados para saber cómo corregirlos:"
+    not_saved: "impidieron guardar %{resource}. <br>Por favor revisa los campos marcados para saber cómo corregirlos:"
     policy: Política de privacidad
     proposal: la propuesta
     proposal_notification: "la notificación"
@@ -302,7 +302,7 @@ es:
     created:
       title: '¡Enhorabuena! Has dado el primer paso.'
       motivation: "Es importante preparar la campaña de lanzamiento de tu propuesta para que tenga éxito. Los primeros días son decisivos."
-      motivation_2_html: "<strong>Si quieres recomendaciones para preparar la publicación deja tu propuesta como borrador y te guiaremos.</strong>"
+      motivation_2: "<strong>Si quieres recomendaciones para preparar la publicación deja tu propuesta como borrador y te guiaremos.</strong>"
       publish: No, quiero publicar la propuesta ya
       dashboard: Si, quiero ayuda y publicaré mas tarde
       preview_title: Así es como quedará tu propuesta cuando la publiques
@@ -376,7 +376,7 @@ es:
         button: Buscar
         placeholder: Buscar propuestas...
         title: Buscar
-      search_results_html:
+      search_results:
         one: " que contiene <strong>'%{search_term}'</strong>"
         other: " que contienen <strong>'%{search_term}'</strong>"
       select_order: Ordenar por
@@ -570,10 +570,10 @@ es:
         title: Previsualización del poster
         poster_title: "No te quedes mirando,"
         poster_subtitle: "¡apóyame! ;)"
-        intro_text_html: "<strong>Estoy participando en %{org}</strong> con mi propia propuesta ciudadana y sólo si tú también te sumas podré lograr el apoyo necesario para hacer la ciudad que todos queremos."
+        intro_text: "<strong>Estoy participando en %{org}</strong> con mi propia propuesta ciudadana y sólo si tú también te sumas podré lograr el apoyo necesario para hacer la ciudad que todos queremos."
         proposal_code: "Código de la propuesta: %{code}"
         support: Apoya mi propuesta
-        footer_html: "<strong>Entra en %{link} y apoya esta propuesta.</strong> Necesitamos ser muchos. Decide tu también. ¡Gracias!"
+        footer: "<strong>Entra en %{link} y apoya esta propuesta.</strong> Necesitamos ser muchos. Decide tu también. ¡Gracias!"
       new:
         title: Póster de tu propuesta
       options:
@@ -591,7 +591,7 @@ es:
         sent: El e-mail ha sido enviado
     mailer:
       forward:
-        subtitle_html: "Si me apoyas, <br>lo conseguiremos."
+        subtitle: "Si me apoyas, <br>lo conseguiremos."
         support_button: Apoyar esta propuesta
         share_in: Compartir en
         hi: "¡Hola!"
@@ -642,7 +642,7 @@ es:
       back: Volver a votaciones
       cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."
       comments_tab: Comentarios
-      cant_answer_verify_html: "Por favor %{verify_link} para poder responder."
+      cant_answer_verify: "Por favor %{verify_link} para poder responder."
       verify_link: "verifica tu cuenta"
       cant_answer_expired: "Esta votación ha terminado."
       cant_answer_wrong_geozone: "Esta votación no está disponible en tu zona."
@@ -690,7 +690,7 @@ es:
     new:
       title: "Enviar mensaje"
       submit_button: "Enviar mensaje"
-      info_about_receivers_html: "Este mensaje se enviará a <strong>%{count} usuarios</strong> y se publicará en %{proposal_page}.<br> El mensaje no se enviará inmediatamente, los usuarios recibirán periódicamente un email con todas las notificaciones de propuestas."
+      info_about_receivers: "Este mensaje se enviará a <strong>%{count} usuarios</strong> y se publicará en %{proposal_page}.<br> El mensaje no se enviará inmediatamente, los usuarios recibirán periódicamente un email con todas las notificaciones de propuestas."
       proposal_page: "la página de la propuesta"
     show:
       back: "Volver a mi contenido"
@@ -733,14 +733,14 @@ es:
     followable:
       budget_investment:
         create:
-          notice_html: "¡Ahora estás siguiendo este proyecto de gasto! <br> Te notificaremos los cambios a medida que se produzcan para que estés al día."
+          notice: "¡Ahora estás siguiendo este proyecto de gasto! <br> Te notificaremos los cambios a medida que se produzcan para que estés al día."
         destroy:
-          notice_html: "¡Has dejado de seguir este proyecto de gasto! <br> Ya no recibirás más notificaciones relacionadas con este proyecto."
+          notice: "¡Has dejado de seguir este proyecto de gasto! <br> Ya no recibirás más notificaciones relacionadas con este proyecto."
       proposal:
         create:
-          notice_html: "¡Ahora estás siguiendo esta propuesta ciudadana! <br> Te notificaremos los cambios a medida que se produzcan para que estés al día."
+          notice: "¡Ahora estás siguiendo esta propuesta ciudadana! <br> Te notificaremos los cambios a medida que se produzcan para que estés al día."
         destroy:
-          notice_html: "¡Has dejado de seguir esta propuesta ciudadana! <br> Ya no recibirás más notificaciones relacionadas con esta propuesta."
+          notice: "¡Has dejado de seguir esta propuesta ciudadana! <br> Ya no recibirás más notificaciones relacionadas con esta propuesta."
     hide: Ocultar
     print:
       print_button: Imprimir esta información
@@ -802,7 +802,7 @@ es:
       select_language_prompt: Seleccionar idioma
       remove_language: Eliminar idioma
       add_language: Añadir idioma
-      languages_in_use_html:
+      languages_in_use:
         zero: "<span class='js-languages-count'>0</span> idiomas en uso"
         one: "<span class='js-languages-count'>1</span> idioma en uso"
         other: "<span class='js-languages-count'>%{count}</span> idiomas en uso"

config/locales/es/mailers.yml

@@ -4,21 +4,21 @@ es:
     no_reply: "Este mensaje se ha enviado desde una dirección de correo electrónico que no admite respuestas."
     comment:
       hi: Hola
-      new_comment_by_html: Hay un nuevo comentario de <strong>%{commenter}</strong> en
+      new_comment_by: Hay un nuevo comentario de <strong>%{commenter}</strong> en
       subject: Alguien ha comentado en tu %{commentable}
       title: Nuevo comentario
     config:
       manage_email_subscriptions: Puedes dejar de recibir estos emails cambiando tu configuración en
     email_verification:
       click_here_to_verify: en este enlace
-      instructions_2_html: Este email es para verificar tu cuenta con <b>%{document_type} %{document_number}</b>. Si esos no son tus datos, por favor no pulses el enlace anterior e ignora este email.
+      instructions_2: Este email es para verificar tu cuenta con <b>%{document_type} %{document_number}</b>. Si esos no son tus datos, por favor no pulses el enlace anterior e ignora este email.
-      instructions_html: Para terminar de verificar tu cuenta de usuario pulsa %{verification_link}.
+      instructions: Para terminar de verificar tu cuenta de usuario pulsa %{verification_link}.
       subject: Verifica tu email
       thanks: Muchas gracias.
       title: Verifica tu cuenta con el siguiente enlace
     reply:
       hi: Hola
-      new_reply_by_html: Hay una nueva respuesta de <strong>%{commenter}</strong> a tu comentario en
+      new_reply_by: Hay una nueva respuesta de <strong>%{commenter}</strong> a tu comentario en
       subject: Alguien ha respondido a tu comentario
       title: Nueva respuesta a tu comentario
     proposal_notification_digest:
@@ -35,7 +35,7 @@ es:
       unsubscribe_account: Mi cuenta
     direct_message_for_sender:
       subject: "Has enviado un nuevo mensaje privado"
-      title_html: "Has enviado un nuevo mensaje privado a <strong>%{receiver}</strong> con el siguiente contenido:"
+      title: "Has enviado un nuevo mensaje privado a <strong>%{receiver}</strong> con el siguiente contenido:"
     user_invite:
       ignore: "Si no has solicitado esta invitación no te preocupes, puedes ignorar este correo."
       text: "¡Gracias por solicitar unirte a %{org}! En unos segundos podrás empezar a participar, sólo tienes que rellenar el siguiente formulario:"
@@ -48,13 +48,13 @@ es:
       title: "¡Gracias por crear un proyecto!"
       intro: "Hola <strong>%{author}</strong>,"
       text: "Muchas gracias por crear tu proyecto <strong>%{investment}</strong> para los Presupuestos Participativos <strong>%{budget}</strong>."
-      follow_html: "Te informaremos de cómo avanza el proceso, que también puedes seguir en la página de <strong>%{link}</strong>."
+      follow: "Te informaremos de cómo avanza el proceso, que también puedes seguir en la página de <strong>%{link}</strong>."
       follow_link: "Presupuestos participativos"
       sincerely: "Atentamente,"
       share: "Comparte tu proyecto"
     budget_investment_unfeasible:
       hi: "Estimado/a usuario/a"
-      new_html: "Por todo ello, te invitamos a que elabores un <strong>nuevo proyecto de gasto</strong> que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}."
+      new: "Por todo ello, te invitamos a que elabores un <strong>nuevo proyecto de gasto</strong> que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}."
       new_href: "nuevo proyecto de gasto"
       sincerely: "Atentamente"
       sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación."
@@ -75,7 +75,7 @@ es:
       subject: "Nuevo comentario de evaluación"
       title: Nuevo comentario de evaluación para %{investment}
       hi: Hola
-      new_comment_by_html: Hay un nuevo comentario de evaluación de <strong>%{commenter}</strong> en el presupuesto participativo %{investment}
+      new_comment_by: Hay un nuevo comentario de evaluación de <strong>%{commenter}</strong> en el presupuesto participativo %{investment}
       commenter_info: "%{commenter}, %{time}"
     new_actions_notification_rake_created:
       subject: "Más novedades de tu propuesta ciudadana"

config/locales/es/management.yml

@@ -34,7 +34,7 @@ es:
         info: Desde aquí puedes gestionar usuarios a través de las acciones listadas en el menú de la izquierda.
     document_verifications:
       already_verified: Esta cuenta de usuario ya está verificada.
-      has_no_account_html: Para crear un usuario entre en %{link} y haga clic en la opción <b>'Registrarse'</b> en la parte superior derecha de la pantalla.
+      has_no_account: Para crear un usuario entre en %{link} y haga clic en la opción <b>'Registrarse'</b> en la parte superior derecha de la pantalla.
       link: CONSUL
       in_census_has_following_permissions: "Este usuario puede participar en el Portal de Gobierno Abierto con las siguientes posibilidades:"
       not_in_census: Este documento no está registrado.
@@ -112,8 +112,8 @@ es:
       create_user: Crear nueva cuenta de usuario
       create_user_info: Procedemos a crear un usuario con la siguiente información
       create_user_submit: Crear usuario
-      create_user_success_html: Hemos enviado un correo electrónico a <b>%{email}</b> para verificar que es suya. El correo enviado contiene un link que el usuario deberá pulsar. Entonces podrá seleccionar una clave de acceso, y entrar en la web de participación.
+      create_user_success: Hemos enviado un correo electrónico a <b>%{email}</b> para verificar que es suya. El correo enviado contiene un link que el usuario deberá pulsar. Entonces podrá seleccionar una clave de acceso, y entrar en la web de participación.
-      autogenerated_password_html: "Se ha asignado la contraseña <b>%{password}</b> a este usuario. Puede modificarla desde el apartado 'Mi cuenta' de la web."
+      autogenerated_password: "Se ha asignado la contraseña <b>%{password}</b> a este usuario. Puede modificarla desde el apartado 'Mi cuenta' de la web."
       email_optional_label: Email (recomendado pero opcional)
       erased_notice: Cuenta de usuario borrada.
       erased_by_manager: "Borrada por el manager: %{manager}"
@@ -128,5 +128,5 @@ es:
         submit: Enviar invitaciones
         title: Enviar invitaciones
       create:
-        success_html: Se han enviado <strong>%{count} invitaciones</strong>.
+        success: Se han enviado <strong>%{count} invitaciones</strong>.
         title: Enviar invitaciones

config/locales/es/pages.yml

@@ -18,7 +18,7 @@ es:
         title: "Debates"
         description: "En la sección de %{link} puedes exponer y compartir tu opinión con otras personas sobre temas que te preocupan relacionados con la ciudad. También es un espacio donde generar ideas que a través de las otras secciones de %{org} lleven a actuaciones concretas por parte del Ayuntamiento."
         link: "debates ciudadanos"
-        feature_html: "Puedes abrir debates, comentarlos y valorarlos con los botones de <strong>Estoy de acuerdo</strong> o <strong>No estoy de acuerdo</strong>. Para ello tienes que %{link}."
+        feature: "Puedes abrir debates, comentarlos y valorarlos con los botones de <strong>Estoy de acuerdo</strong> o <strong>No estoy de acuerdo</strong>. Para ello tienes que %{link}."
         feature_link: "registrarte en %{org}"
         image_alt: "Botones para valorar los debates"
         figcaption: 'Botones "Estoy de acuerdo" y "No estoy de acuerdo" para valorar los debates.'
@@ -157,7 +157,7 @@ es:
               description_column: para reducir el tamaño del texto
       compatibility:
         title: Compatibilidad con estándares y diseño visual
-        description_html: 'Todas las páginas de este sitio web cumplen con las <strong>Pautas de Accesibilidad</strong> o Principios Generales de Diseño Accesible establecidas por el Grupo de Trabajo <abbr title="Web Accessibility Initiative" lang="en">WAI</abbr> perteneciente al W3C.'
+        description: 'Todas las páginas de este sitio web cumplen con las <strong>Pautas de Accesibilidad</strong> o Principios Generales de Diseño Accesible establecidas por el Grupo de Trabajo <abbr title="Web Accessibility Initiative" lang="en">WAI</abbr> perteneciente al W3C.'
     titles:
       help: "¿Qué es %{org}? - Participación ciudadana"
     verify:

config/locales/es/stats.yml

@@ -26,7 +26,7 @@ es:
       by_heading: "Participantes por distritos y fase"
       total: "Total"
       heading: "Distrito"
-      investments_sent_html: "Propuestas<br>enviadas"
+      investments_sent: "Propuestas<br>enviadas"
       participants_support_phase: "Participantes fase apoyos"
       participants_vote_phase: "Participantes fase votación"
       participants_every_phase: "Total de participantes"

config/locales/es/valuation.yml

@@ -56,8 +56,8 @@ es:
         preview: Vista previa de presupuesto
       edit:
         dossier: Informe
-        price_html: "Coste (%{currency}) <small>(dato público)</small>"
+        price: "Coste (%{currency}) <small>(dato público)</small>"
-        price_first_year_html: "Coste en el primer año (%{currency}) <small>(opcional, dato no público)</small>"
+        price_first_year: "Coste en el primer año (%{currency}) <small>(opcional, dato no público)</small>"
         feasibility: Viabilidad
         valuation_finished_alert: "¿Estás seguro/a de querer marcar este informe como completado? Una vez hecho, no se puede deshacer la acción."
         not_feasible_alert: "Un email será enviado inmediatamente al autor del proyecto con el informe de inviabilidad."

config/locales/es/verification.yml

@@ -19,7 +19,7 @@ es:
         unconfirmed_code: Todavía no has introducido el código de confirmación
       create:
         flash:
-          success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las Oficinas de Atención al Ciudadano.
+          success: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las Oficinas de Atención al Ciudadano.
       edit:
         see_all: Ver propuestas
         title: Carta solicitada
@@ -49,7 +49,7 @@ es:
         accept_terms_text_title: Acepto los términos de acceso al Padrón
         document_number: Número de documento
         document_number_help_title: Ayuda
-        document_number_help_text_html: "<strong>DNI</strong>: 12345678A<br> <strong>Pasaporte</strong>: AAA000001<br> <strong>Tarjeta de residencia</strong>: X1234567P"
+        document_number_help_text: "<strong>DNI</strong>: 12345678A<br> <strong>Pasaporte</strong>: AAA000001<br> <strong>Tarjeta de residencia</strong>: X1234567P"
         document_type:
           passport: Pasaporte
           residence_card: Tarjeta de residencia
@@ -73,7 +73,7 @@ es:
         title: SMS de confirmación
       new:
         phone: Introduce tu teléfono móvil para recibir el código
-        phone_format_html: "<strong><em>(Ejemplo: 612345678 ó +34612345678)</em></strong>"
+        phone_format: "<strong><em>(Ejemplo: 612345678 ó +34612345678)</em></strong>"
         phone_note: Sólo usaremos tu teléfono para enviarte un código, nunca te contactaremos.
         phone_placeholder: "Ejemplo: 612345678 ó +34612345678"
         submit_button: Enviar

db/pages/accessibility.rb

@@ -89,7 +89,7 @@ if SiteCustomization::Page.find_by_slug("accessibility").nil?
   end
   content << "</ul>
               <h2>#{I18n.t("pages.accessibility.compatibility.title")}</h2>
-              <p>#{I18n.t("pages.accessibility.compatibility.description_html")}</p>"
+              <p>#{I18n.t("pages.accessibility.compatibility.description")}</p>"
 
   page.content = content
   page.save!

lib/consul_form_builder.rb

@@ -21,7 +21,7 @@ class ConsulFormBuilder < FoundationRailsHelper::FormBuilder
 
   def check_box(attribute, options = {})
     if options[:label] != false
-      label = content_tag(:span, label_text(object, attribute, options[:label]), class: "checkbox")
+      label = content_tag(:span, sanitize(label_text(object, attribute, options[:label]), class: "checkbox"))
 
       super(attribute, options.merge(label: label, label_options: label_options_for(options)))
     else

spec/features/budgets/investments_spec.rb

@@ -874,7 +874,7 @@ describe "Budget Investments" do
       fill_in "Title", with: "I am a bot"
       fill_in "budget_investment_subtitle", with: "This is the honeypot"
       fill_in "Description", with: "This is the description"
-      check   "budget_investment_terms_of_service"
+      check   "I agree to the Privacy Policy and the Terms and conditions of use"
 
       click_button "Create Investment"
 

spec/models/budget/investment_spec.rb

@@ -1079,7 +1079,7 @@ describe Budget::Investment do
           inv2 = create(:budget_investment, :selected, budget: budget, heading: new_york)
           ballot = create(:budget_ballot, user: user, budget: budget, investments: [inv1])
 
-          expect(inv2.reason_for_not_being_ballotable_by(user, ballot)).to eq(:different_heading_assigned_html)
+          expect(inv2.reason_for_not_being_ballotable_by(user, ballot)).to eq(:different_heading_assigned)
         end
 
         it "rejects proposals with price higher than current available money" do
@@ -1091,7 +1091,7 @@ describe Budget::Investment do
 
           ballot = create(:budget_ballot, user: user, budget: budget, investments: [inv1])
 
-          expect(inv2.reason_for_not_being_ballotable_by(user, ballot)).to eq(:not_enough_money_html)
+          expect(inv2.reason_for_not_being_ballotable_by(user, ballot)).to eq(:not_enough_money)
         end
 
       end

spec/shared/features/followable.rb

@@ -56,7 +56,7 @@ shared_examples "followable" do |followable_class_name, followable_path, followa
     scenario "Should display new follower notice after user clicks on follow button", :js do
       user = create(:user)
       login_as(user)
-      create_notice_message = t("shared.followable.#{followable_class_name}.create.notice_html")
+      create_notice_message = t("shared.followable.#{followable_class_name}.create.notice")
 
       visit send(followable_path, arguments)
       within "##{dom_id(followable)}" do
@@ -91,7 +91,7 @@ shared_examples "followable" do |followable_class_name, followable_path, followa
     scenario "Should display destroy follower notice after user clicks on unfollow button", :js do
       user = create(:user, followables: [followable])
       login_as(user)
-      destroy_notice_message = t("shared.followable.#{followable_class_name}.destroy.notice_html")
+      destroy_notice_message = t("shared.followable.#{followable_class_name}.destroy.notice")
 
       visit send(followable_path, arguments)
       within "##{dom_id(followable)}" do