fix wrong html parser

Leandro Santos
1 parent 26c8903c
Showing 25 changed files with 59 additions and 59 deletions Show diff stats
app/api/helpers.rb
app/controllers/admin/categories_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/profile_controller.rb
app/mailers/contact.rb
app/models/abuse_complaint.rb
app/views/account/activation_question.html.erb
app/views/admin_panel/_signup_welcome_text.html.erb
app/views/cms/_blog.html.erb
app/views/enterprise_validation/view_processed.html.erb
app/views/favorite_enterprises/add.html.erb
app/views/friends/remove.html.erb
app/views/home/welcome.html.erb
app/views/person_notifier/mailer/_profile_comments.html.erb
app/views/profile/_private_profile.html.erb
app/views/profile/_profile_comments.html.erb
app/views/profile/_profile_scraps.html.erb
app/views/profile_editor/edit.html.erb
app/views/search/_search_content.html.erb
@@ -302,12 +302,12 @@ module Api
     end
     def cant_be_saved_request!(attribute)
-      message = _("(Invalid request) %s can't be saved") % attribute
+      message = _("(Invalid request) %s can't be saved").html_safe % attribute
       render_api_error!(message, 400)
     end
     def bad_request!(attribute)
-      message = _("(Invalid request) %s not given") % attribute
+      message = _("(Invalid request) %s not given").html_safe % attribute
       render_api_error!(message, 400)
     end
@@ -44,7 +44,7 @@ class CategoriesController &lt; AdminController
       if request.post?
         @category.update!(params[:category])
         @saved = true
-        session[:notice] = _("Category %s saved." % @category.name)
+        session[:notice] = _("Category %s saved." % @category.name).html_safe
         redirect_to :action => 'index'
       end
     rescue Exception => e
@@ -109,7 +109,7 @@ class BoxOrganizerController &lt; ApplicationController
   def show_block_type_info
     type = params[:type]
     if type.blank? || !available_blocks.map(&:name).include?(type)
-      raise ArgumentError.new("Type %s is not allowed. Go away." % type)
+      raise ArgumentError.new("Type %s is not allowed. Go away.".html_safe % type)
     end
     @block = type.constantize.new
     @block.box = Box.new(:owner => boxes_holder)
@@ -122,7 +122,7 @@ class BoxOrganizerController &lt; ApplicationController
   def new_block(type, box)
     if !available_blocks.map(&:name).include?(type)
-      raise ArgumentError.new("Type %s is not allowed. Go away." % type)
+      raise ArgumentError.new("Type %s is not allowed. Go away.".html_safe % type)
     end
     block = type.constantize.new
     box.blocks << block
@@ -205,7 +205,7 @@ class AccountController &lt; ApplicationController
         if params[:value].blank?
           @change_password.errors[:base] << _('Can not recover user password with blank value.')
         else
-          @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
+          @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".').html_safe % [fields_label, params[:value]]
         end
       rescue ActiveRecord::RecordInvalid
         @change_password.errors[:base] << _('Could not perform password recovery for the user.')
@@ -42,8 +42,8 @@ class ProfileController &lt; PublicController
     feed_writer = FeedWriter.new
     data = feed_writer.write(
       tagged,
-      :title => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],
-      :description => _("%s's contents tagged with \"%s\"") % [profile.name, @tag],
+      :title => _("%s's contents tagged with \"%s\"").html_safe % [profile.name, @tag],
+      :description => _("%s's contents tagged with \"%s\"").html_safe % [profile.name, @tag],
       :link => url_for(profile.url)
     )
     render :text => data, :content_type => "text/xml"
@@ -88,7 +88,7 @@ class ProfileController &lt; PublicController
   def join_modal
       profile.add_member(user)
-      session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name
+      session[:notice] = _('%s administrator still needs to accept you as member.').html_safe % profile.name
       redirect_to :action => :index
   end
@@ -98,12 +98,12 @@ class ProfileController &lt; PublicController
       profile.add_member(user)
       if !profile.members.include?(user)
-        render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json
+        render :text => {:message => _('%s administrator still needs to accept you as member.').html_safe % profile.name}.to_json
       else
-        render :text => {:message => _('You just became a member of %s.') % profile.name}.to_json
+        render :text => {:message => _('You just became a member of %s.').html_safe % profile.name}.to_json
       end
     else
-      render :text => {:message => _('You are already a member of %s.') % profile.name}.to_json
+      render :text => {:message => _('You are already a member of %s.').html_safe % profile.name}.to_json
     end
   end
@@ -125,7 +125,7 @@ class ProfileController &lt; PublicController
         render :text => current_person.leave(profile, params[:reload])
       end
     else
-      render :text => {:message => _('You are not a member of %s.') % profile.name}.to_json
+      render :text => {:message => _('You are not a member of %s.').html_safe % profile.name}.to_json
     end
   end
@@ -145,9 +145,9 @@ class ProfileController &lt; PublicController
     # FIXME this shouldn't be in Person model?
     if !user.memberships.include?(profile)
       AddFriend.create!(:person => user, :friend => profile)
-      render :text => _('%s still needs to accept being your friend.') % profile.name
+      render :text => _('%s still needs to accept being your friend.').html_safe % profile.name
     else
-      render :text => _('You are already a friend of %s.') % profile.name
+      render :text => _('You are already a friend of %s.').html_safe % profile.name
     end
   end
@@ -178,7 +178,7 @@ class ProfileController &lt; PublicController
   def unblock
     if current_user.person.is_admin?(profile.environment)
       profile.unblock
-      session[:notice] = _("You have unblocked %s successfully. ") % profile.name
+      session[:notice] = _("You have unblocked %s successfully. ").html_safe % profile.name
       redirect_to :controller => 'profile', :action => 'index'
     else
       message = _('You are not allowed to unblock enterprises in this environment.')
@@ -47,7 +47,7 @@ class Contact
         content_type: 'text/html',
         to: contact.dest.notification_emails,
         reply_to: contact.email,
-        subject: "[#{contact.dest.short_name(30)}] #{contact.subject,}".html_safe,
+        subject: "[#{contact.dest.short_name(30)}] #{contact.subject}".html_safe,
         from: "#{contact.name} <#{contact.dest.environment.noreply_email}>".html_safe
       }
@@ -25,7 +25,7 @@ class AbuseComplaint &lt; Task
   end
   def title
-    abuse_reports.count > 1 ? (_('Abuse complaint (%s)') % abuse_reports.count) :_('Abuse complaint')
+    abuse_reports.count > 1 ? (_('Abuse complaint (%s)').html_safe % abuse_reports.count) :_('Abuse complaint')
   end
   def linked_subject
@@ -57,15 +57,15 @@ class AbuseComplaint &lt; Task
   end
   def task_activated_message
-    _('Your profile was reported by the users of %s due to inappropriate behavior. The administrators of the environment are now reviewing the report. To solve this misunderstanding, please contact the administrators.') % environment.name
+    _('Your profile was reported by the users of %s due to inappropriate behavior. The administrators of the environment are now reviewing the report. To solve this misunderstanding, please contact the administrators.').html_safe % environment.name
   end
   def task_finished_message
-    _('Your profile was disabled by the administrators of %s due to inappropriate behavior. To solve this misunderstanding please contact them.') % environment.name
+    _('Your profile was disabled by the administrators of %s due to inappropriate behavior. To solve this misunderstanding please contact them.').html_safe % environment.name
   end
   def target_notification_description
-    _('%s was reported due to inappropriate behavior.') % reported.name
+    _('%s was reported due to inappropriate behavior.').html_safe % reported.name
   end
   def target_notification_message
@@ -3,7 +3,7 @@
     var answer = parseInt(form.answer.value);
     var val = form.answer.value;
     if (!answer || (val.length != 4) || val > <%= Time.now.year %> || val < 1900) {
-      alert(<%= (_('The year must be between %d and %d') % [1900, Time.now.year]).inspect %>);
+      alert(<%= (_('The year must be between %d and %d').html_safe % [1900, Time.now.year]).inspect %>);
       return false;
     } else {
       return true;
@@ -28,9 +28,9 @@
   <p>  <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
-  <p><%= _("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
+  <p><%= _("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.").html_safe % environment.name %> </p>
-  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (_("What year your enterprise was founded? It must have 4 digits, eg 1990. %s") % environment.tip_message_enterprise_activation_question) : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
+  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (_("What year your enterprise was founded? It must have 4 digits, eg 1990. %s").html_safe % environment.tip_message_enterprise_activation_question) : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
 <div class='description'>
   <%= _('This text will be sent to new users if the feature "Send welcome e-mail to new users" is enabled on environment.') %><br/><br/>
-  <%= _('Including %s on body, it will be replaced by the real name of the e-mail recipient.') % content_tag('code', '{user_name}') %>
+  <%= _('Including %s on body, it will be replaced by the real name of the e-mail recipient.').html_safe % content_tag('code', '{user_name}') %>
 </div>
 <%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>
@@ -58,7 +58,7 @@
 <div id="blog-image-builder">
   <%= f.fields_for :image_builder, @article.image do |i| %>
     <%= file_field_or_thumbnail(_('Cover image:'), @article.image, i)%>
-    <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+    <%= _("Max size: %s (.jpg, .gif, .png)").html_safe % Image.max_size.to_humanreadable %>
   <% end %>
 </div>
-<h2><%= _('Processed validation request for %s ') % @processed.name %> (<%= status(@processed) %>)</h2>
+<h2><%= _('Processed validation request for %s ').html_safe % @processed.name %> (<%= status(@processed) %>)</h2>
 <%= link_to _('Back'), :action => 'index' %>
-<h1><%= _('Adding %s as a favorite enterprise') % @favorite_enterprise.name %></h1>
+<h1><%= _('Adding %s as a favorite enterprise').html_safe % @favorite_enterprise.name %></h1>
 <p>
-<%= _('Are you sure you want to add %s as your favorite enterprise?') % @favorite_enterprise.name %>
+<%= _('Are you sure you want to add %s as your favorite enterprise?').html_safe % @favorite_enterprise.name %>
 </p>
 <%= form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, _("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
+  <%= submit_button(:ok, _("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise").html_safe % @favorite_enterprise.name) %>
   <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
 <% end %>
 <div id="remove_friend">
-<h1><%= _('Removing friend: %s') % @friend.name %></h1>
+<h1><%= _('Removing friend: %s').html_safe % @friend.name %></h1>
 <%= profile_image @friend, :thumb, :class => 'friend_picture' %>
 <p>
-<%= _('Are you sure you want to remove %s from your friends list?') % @friend.name %>
+<%= _('Are you sure you want to remove %s from your friends list?').html_safe % @friend.name %>
 </p>
 <p>
 <em>
-<%= _('Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.') % @friend.name %>
+<%= _('Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.').html_safe % @friend.name %>
 </em>
 </p>
 <% default_message = defined?(default_message) ? default_message : false %>
 <div id='thanks-for-signing'>
-  <h1><%= _("Welcome to %s!") % environment.name %></h1>
+  <h1><%= _("Welcome to %s!").html_safe % environment.name %></h1>
   <% if environment.has_custom_welcome_screen? && !default_message %>
     <%= environment.settings[:signup_welcome_screen_body].html_safe %>
   <% else %>
@@ -17,7 +17,7 @@
         <p><%= _("You won't appear as %s until your account is approved.").html_safe % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
       <% end %>
       <h4><%= _("What to do next?") %></h4>
-      <p><%= _("Access your %s and see your face on the network!") %
+      <p><%= _("Access your %s and see your face on the network!").html_safe %
         (user.present? ? link_to(_('Profile'), {:controller => 'profile', :profile => user.identifier}, :target => '_blank') : 'Profile') %>
       <%= _("You can also explore your %s to customize your profile. Here are some %s on what you can do there.").html_safe %
         [user.present? ? link_to(_('Control Panel'), {:controller => 'profile_editor', :profile => user.identifier}, :target => '_blank') : 'Control Panel',
@@ -26,5 +26,5 @@
       <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!").html_safe % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
       <p><%= _("Start exploring and have fun!") %></p>
   <% end %>
-  <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @person_template, :header => _("What can I do as a %s?")} %>
+  <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @person_template, :header => _("What can I do as a %s?").html_safe} %>
 </div>
 <% if activity.comments_count > 2 %>
   <div style="font-size: 10px;">
     <% if activity.params['url'].blank?  %>
-      <%= _("%s comments") % activity.comments_count %>
+      <%= _("%s comments").html_safe % activity.comments_count %>
     <% else %>
-      <%= link_to(_("View all %s comments") % activity.comments_count, activity.params['url']) %>
+      <%= link_to(_("View all %s comments").html_safe % activity.comments_count, activity.params['url']) %>
     <% end %>
   </div>
 <% else %>
@@ -13,5 +13,5 @@
     <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
   <% end %>
   <%= button :back, _('Go back'), :back %>
-  <%= button :home, _("Go to %s home page") % environment.name, :controller => 'home' %>
+  <%= button :home, _("Go to %s home page").html_safe % environment.name, :controller => 'home' %>
 <% end %>
@@ -5,7 +5,7 @@
 <% if activity.comments_count > 0 %>
 <div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments" >
   <div class='view-all-comments icon-chat'>
-     <%= link_to(n_('View comment', "View all %s comments", activity.comments_count) % activity.comments_count, :profile => profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (1)) %>
+     <%= link_to(n_('View comment', "View all %s comments".html_safe, activity.comments_count) % activity.comments_count, :profile => profile.identifier, :controller => 'profile', :action => 'more_comments', :activity => activity, :comment_page => (1)) %>
   </div>
 </div>
 <% end %>
@@ -23,7 +23,7 @@
   <% if scrap.replies.count > 0 %>
     <div id="profile-wall-activities-comments-more-<%= activity.id %>" class="profile-wall-activities-comments">
       <div class='view-all-comments icon-chat'>
-        <%= link_to(n_('View comment', "View all %s comments", scrap.replies.count) % scrap.replies.count, :profile => profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (1)) %>
+        <%= link_to(n_('View comment', "View all %s comments".html_safe, scrap.replies.count) % scrap.replies.count, :profile => profile.identifier, :controller => 'profile', :action => 'more_replies', :activity => activity, :comment_page => (1)) %>
       </div>
     </div>
   <% end %>
-<h1><%= _('Profile settings for %s') % profile.name %></h1>
+<h1><%= _('Profile settings for %s').html_safe % profile.name %></h1>
 <%= error_messages_for :profile_data %>
@@ -18,7 +18,7 @@
   </div>
   <div id="profile_change_picture">
     <%= f.fields_for :image_builder, @profile.image do |i| %>
-      <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+      <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)").html_safe % Image.max_size.to_humanreadable %>
     <% end %>
   </div>
 <div id='search-content'>
   <div class='total'>
-    <%= n_('Total of 1 result', 'Total of %s results', @searches[@asset][:results].total_entries) % @searches[@asset][:results].total_entries.inspect %>
+    <%= n_('Total of 1 result', 'Total of %s results'.html_safe, @searches[@asset][:results].total_entries) % @searches[@asset][:results].total_entries.inspect %>
   </div>
 <%= display_results(@searches, @asset) %>
-<%= render :partial => 'search_form', :locals => { :hint => _("Type words about the %s you're looking for") % _(@asset.to_s.singularize) } %>
+<%= render :partial => 'search_form', :locals => { :hint => _("Type words about the %s you're looking for").html_safe % _(@asset.to_s.singularize) } %>
 <%= render :partial => 'search_content' %>
 <div style="clear: both"></div>
 <%= profile_image suggestion, :thumb, :class => 'suggestion_picture' %>
 <p>
-<%= _('Are you sure you want to remove %s from your suggestions list?') % suggestion.name %>
+<%= _('Are you sure you want to remove %s from your suggestions list?').html_safe % suggestion.name %>
 </p>
 <%= form_tag do %>
-  <%= submit_button(:ok, _("Yes, I want to remove %s") % suggestion.name) %>
+  <%= submit_button(:ok, _("Yes, I want to remove %s").html_safe % suggestion.name) %>
   <%= button(:cancel, _("No"), :action => 'suggest') %>
 <% end %>
-<h2><%= _('Ticket: %s') % @ticket.name %></h2>
+<h2><%= _('Ticket: %s').html_safe % @ticket.name %></h2>
 <p><small>
-  <%= _('Created at %s by %s') % [@ticket.created_at.to_date, link_to(@ticket.requestor.name, @ticket.requestor.url)] %><br/>
-  <%= _('Owner: %s') %  link_to(@ticket.target.name, @ticket.target.url) %>
+  <%= _('Created at %s by %s').html_safe % [@ticket.created_at.to_date, link_to(@ticket.requestor.name, @ticket.requestor.url)] %><br/>
+  <%= _('Owner: %s').html_safe %  link_to(@ticket.target.name, @ticket.target.url) %>
 </small></p>
-<p><%= _('Status: %s') % gettext(Task::Status.names[@ticket.status]) %></p>
+<p><%= _('Status: %s').html_safe % gettext(Task::Status.names[@ticket.status]) %></p>
 <div>
-  <p><%= _('Description: %s') % @ticket.description %></p>
+  <p><%= _('Description: %s').html_safe % @ticket.description %></p>
 </div>
 <% if @ticket.closing_statment %>
-  <p><%= _('Closing statement: %s') % @ticket.closing_statment %></p>
+  <p><%= _('Closing statement: %s').html_safe % @ticket.closing_statment %></p>
 <% end %>
 <%= button_bar do %>
@@ -10,7 +10,7 @@
 <% list_of_templates.each do |title, templates, kind|%>
   <div class='template-kind'>
     <h2><%= title %></h2>
-    <%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s") % title.downcase %>
+    <%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s").html_safe % title.downcase %>
     <table class='actions'>
       <tr>
         <th><%= _('Template') %></th>
@@ -20,11 +20,11 @@
         <tr>
           <td>
             <%#= image_tag "icons-app/#{kind}-icon.png" %>
-            <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
+            <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"').html_safe % template.name ) %>
             <% if environment.is_default_template?(template) %>
               <%= _('is the default template') %>
             <% else %>
-              <%= link_to(_('Set as default'), {:action => "set_#{kind}_as_default", :template_id => template.id}, :title => _('Set %s template as default') % template.name ) %>
+              <%= link_to(_('Set as default'), {:action => "set_#{kind}_as_default", :template_id => template.id}, :title => _('Set %s template as default').html_safe % template.name ) %>
             <% end %>
           </td>
           <td>
-<%= _('Hello %s,') % @name  %>
+<%= _('Hello %s,').html_safe % @name  %>
-<%= _('Your email %s was just activated.') % [@email] %>
+<%= _('Your email %s was just activated.').html_safe % [@email] %>
 <%= _('You can access your e-mail from anywhere, using the following address:') %>
 <%= @webmail %>
@@ -8,5 +8,5 @@
 <%= _('Greetings,') %>
 --
-<%= _('%s team.') % @environment.name %>
+<%= _('%s team.').html_safe % @environment.name %>
 <%= @url %>
	@@ -302,12 +302,12 @@ module Api		@@ -302,12 +302,12 @@ module Api
302	end	302	end
303		303
304	def cant_be_saved_request!(attribute)	304	def cant_be_saved_request!(attribute)
305	- message = _("(Invalid request) %s can't be saved") % attribute	305	+ message = _("(Invalid request) %s can't be saved").html_safe % attribute
306	render_api_error!(message, 400)	306	render_api_error!(message, 400)
307	end	307	end
308		308
309	def bad_request!(attribute)	309	def bad_request!(attribute)
310	- message = _("(Invalid request) %s not given") % attribute	310	+ message = _("(Invalid request) %s not given").html_safe % attribute
311	render_api_error!(message, 400)	311	render_api_error!(message, 400)
312	end	312	end
313		313
	@@ -44,7 +44,7 @@ class CategoriesController < AdminController		@@ -44,7 +44,7 @@ class CategoriesController < AdminController
44	if request.post?	44	if request.post?
45	@category.update!(params[:category])	45	@category.update!(params[:category])
46	@saved = true	46	@saved = true
47	- session[:notice] = _("Category %s saved." % @category.name)	47	+ session[:notice] = _("Category %s saved." % @category.name).html_safe
48	redirect_to :action => 'index'	48	redirect_to :action => 'index'
49	end	49	end
50	rescue Exception => e	50	rescue Exception => e
	@@ -109,7 +109,7 @@ class BoxOrganizerController < ApplicationController		@@ -109,7 +109,7 @@ class BoxOrganizerController < ApplicationController
109	def show_block_type_info	109	def show_block_type_info
110	type = params[:type]	110	type = params[:type]
111	if type.blank? \|\| !available_blocks.map(&:name).include?(type)	111	if type.blank? \|\| !available_blocks.map(&:name).include?(type)
112	- raise ArgumentError.new("Type %s is not allowed. Go away." % type)	112	+ raise ArgumentError.new("Type %s is not allowed. Go away.".html_safe % type)
113	end	113	end
114	@block = type.constantize.new	114	@block = type.constantize.new
115	@block.box = Box.new(:owner => boxes_holder)	115	@block.box = Box.new(:owner => boxes_holder)
	@@ -122,7 +122,7 @@ class BoxOrganizerController < ApplicationController		@@ -122,7 +122,7 @@ class BoxOrganizerController < ApplicationController
122		122
123	def new_block(type, box)	123	def new_block(type, box)
124	if !available_blocks.map(&:name).include?(type)	124	if !available_blocks.map(&:name).include?(type)
125	- raise ArgumentError.new("Type %s is not allowed. Go away." % type)	125	+ raise ArgumentError.new("Type %s is not allowed. Go away.".html_safe % type)
126	end	126	end
127	block = type.constantize.new	127	block = type.constantize.new
128	box.blocks << block	128	box.blocks << block
	@@ -205,7 +205,7 @@ class AccountController < ApplicationController		@@ -205,7 +205,7 @@ class AccountController < ApplicationController
205	if params[:value].blank?	205	if params[:value].blank?
206	@change_password.errors[:base] << _('Can not recover user password with blank value.')	206	@change_password.errors[:base] << _('Can not recover user password with blank value.')
207	else	207	else
208	- @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]	208	+ @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".').html_safe % [fields_label, params[:value]]
209	end	209	end
210	rescue ActiveRecord::RecordInvalid	210	rescue ActiveRecord::RecordInvalid
211	@change_password.errors[:base] << _('Could not perform password recovery for the user.')	211	@change_password.errors[:base] << _('Could not perform password recovery for the user.')
	@@ -47,7 +47,7 @@ class Contact		@@ -47,7 +47,7 @@ class Contact
47	content_type: 'text/html',	47	content_type: 'text/html',
48	to: contact.dest.notification_emails,	48	to: contact.dest.notification_emails,
49	reply_to: contact.email,	49	reply_to: contact.email,
50	- subject: "[#{contact.dest.short_name(30)}] #{contact.subject,}".html_safe,	50	+ subject: "[#{contact.dest.short_name(30)}] #{contact.subject}".html_safe,
51	from: "#{contact.name} <#{contact.dest.environment.noreply_email}>".html_safe	51	from: "#{contact.name} <#{contact.dest.environment.noreply_email}>".html_safe
52	}	52	}
53		53
	@@ -25,7 +25,7 @@ class AbuseComplaint < Task		@@ -25,7 +25,7 @@ class AbuseComplaint < Task
25	end	25	end
26		26
27	def title	27	def title
28	- abuse_reports.count > 1 ? (_('Abuse complaint (%s)') % abuse_reports.count) :_('Abuse complaint')	28	+ abuse_reports.count > 1 ? (_('Abuse complaint (%s)').html_safe % abuse_reports.count) :_('Abuse complaint')
29	end	29	end
30		30
31	def linked_subject	31	def linked_subject
	@@ -57,15 +57,15 @@ class AbuseComplaint < Task		@@ -57,15 +57,15 @@ class AbuseComplaint < Task
57	end	57	end
58		58
59	def task_activated_message	59	def task_activated_message
60	- _('Your profile was reported by the users of %s due to inappropriate behavior. The administrators of the environment are now reviewing the report. To solve this misunderstanding, please contact the administrators.') % environment.name	60	+ _('Your profile was reported by the users of %s due to inappropriate behavior. The administrators of the environment are now reviewing the report. To solve this misunderstanding, please contact the administrators.').html_safe % environment.name
61	end	61	end
62		62
63	def task_finished_message	63	def task_finished_message
64	- _('Your profile was disabled by the administrators of %s due to inappropriate behavior. To solve this misunderstanding please contact them.') % environment.name	64	+ _('Your profile was disabled by the administrators of %s due to inappropriate behavior. To solve this misunderstanding please contact them.').html_safe % environment.name
65	end	65	end
66		66
67	def target_notification_description	67	def target_notification_description
68	- _('%s was reported due to inappropriate behavior.') % reported.name	68	+ _('%s was reported due to inappropriate behavior.').html_safe % reported.name
69	end	69	end
70		70
71	def target_notification_message	71	def target_notification_message
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	var answer = parseInt(form.answer.value);	3	var answer = parseInt(form.answer.value);
4	var val = form.answer.value;	4	var val = form.answer.value;
5	if (!answer \|\| (val.length != 4) \|\| val > <%= Time.now.year %> \|\| val < 1900) {	5	if (!answer \|\| (val.length != 4) \|\| val > <%= Time.now.year %> \|\| val < 1900) {
6	- alert(<%= (_('The year must be between %d and %d') % [1900, Time.now.year]).inspect %>);	6	+ alert(<%= (_('The year must be between %d and %d').html_safe % [1900, Time.now.year]).inspect %>);
7	return false;	7	return false;
8	} else {	8	} else {
9	return true;	9	return true;
	@@ -28,9 +28,9 @@		@@ -28,9 +28,9 @@
28		28
29	<p> <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>	29	<p> <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
30		30
31	- <p><%= _("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>	31	+ <p><%= _("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.").html_safe % environment.name %> </p>
32		32
33	- <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (_("What year your enterprise was founded? It must have 4 digits, eg 1990. %s") % environment.tip_message_enterprise_activation_question) : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>	33	+ <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (_("What year your enterprise was founded? It must have 4 digits, eg 1990. %s").html_safe % environment.tip_message_enterprise_activation_question) : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
34		34
35	<%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>	35	<%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
36		36
1	<div class='description'>	1	<div class='description'>
2	<%= _('This text will be sent to new users if the feature "Send welcome e-mail to new users" is enabled on environment.') %><br/><br/>	2	<%= _('This text will be sent to new users if the feature "Send welcome e-mail to new users" is enabled on environment.') %><br/><br/>
3	- <%= _('Including %s on body, it will be replaced by the real name of the e-mail recipient.') % content_tag('code', '{user_name}') %>	3	+ <%= _('Including %s on body, it will be replaced by the real name of the e-mail recipient.').html_safe % content_tag('code', '{user_name}') %>
4	</div>	4	</div>
5		5
6	<%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>	6	<%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>
	@@ -58,7 +58,7 @@		@@ -58,7 +58,7 @@
58	<div id="blog-image-builder">	58	<div id="blog-image-builder">
59	<%= f.fields_for :image_builder, @article.image do \|i\| %>	59	<%= f.fields_for :image_builder, @article.image do \|i\| %>
60	<%= file_field_or_thumbnail(_('Cover image:'), @article.image, i)%>	60	<%= file_field_or_thumbnail(_('Cover image:'), @article.image, i)%>
61	- <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>	61	+ <%= _("Max size: %s (.jpg, .gif, .png)").html_safe % Image.max_size.to_humanreadable %>
62	<% end %>	62	<% end %>
63	</div>	63	</div>
64		64
1	-<h2><%= _('Processed validation request for %s ') % @processed.name %> (<%= status(@processed) %>)</h2>	1	+<h2><%= _('Processed validation request for %s ').html_safe % @processed.name %> (<%= status(@processed) %>)</h2>
2		2
3	<%= link_to _('Back'), :action => 'index' %>	3	<%= link_to _('Back'), :action => 'index' %>
4		4