%{description}
'), + { :message => _('%{requestor} wants to create community %{subject} with this description:%{description}
').html_safe, :variables => {:description => description} } end end diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb index 0cbc00c..d415d0c 100644 --- a/app/models/create_enterprise.rb +++ b/app/models/create_enterprise.rb @@ -163,7 +163,7 @@ class CreateEnterprise < Task end def information - {:message => _('%{requestor} wants to create enterprise %{subject}.')} + {:message => _('%{requestor} wants to create enterprise %{subject}.').html_safe} end def reject_details diff --git a/app/models/doc_item.rb b/app/models/doc_item.rb index 9c68e06..84a50a3 100644 --- a/app/models/doc_item.rb +++ b/app/models/doc_item.rb @@ -17,7 +17,7 @@ class DocItem else match end - end + end.html_safe end private diff --git a/app/models/environment.rb b/app/models/environment.rb index b59dce4..10998a2 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -729,7 +729,7 @@ class Environment < ActiveRecord::Base url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname) url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port) url << Noosfero.root('') - url + url.html_safe end def to_s diff --git a/app/models/invite_friend.rb b/app/models/invite_friend.rb index b74b0bc..f845901 100644 --- a/app/models/invite_friend.rb +++ b/app/models/invite_friend.rb @@ -13,7 +13,7 @@ class InviteFriend < Invitation end def information - {:message => _('%{requestor} wants to be your friend.')} + {:message => _('%{requestor} wants to be your friend.').html_safe} end def accept_details @@ -25,7 +25,7 @@ class InviteFriend < Invitation end def target_notification_description - _('%{requestor} wants to be your friend.') % {:requestor => requestor.name} + (_('%{requestor} wants to be your friend.') % {:requestor => requestor.name}).html_safe end def permission diff --git a/app/models/invite_member.rb b/app/models/invite_member.rb index 69212b7..b7eceed 100644 --- a/app/models/invite_member.rb +++ b/app/models/invite_member.rb @@ -25,7 +25,7 @@ class InviteMember < Invitation end def information - {:message => _('%{requestor} invited you to join %{linked_subject}.')} + {:message => _('%{requestor} invited you to join %{linked_subject}.').html_safe} end def url @@ -37,7 +37,7 @@ class InviteMember < Invitation end def target_notification_description - _('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name} + (_('%{requestor} invited you to join %{community}.') % {:requestor => requestor.name, :community => community.name}).html_safe end def target_notification_message diff --git a/app/models/profile.rb b/app/models/profile.rb index d99354a..ca2b4c2 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -646,7 +646,7 @@ class Profile < ActiveRecord::Base url << url_options[:host] url << ':' << url_options[:port].to_s if url_options.key?(:port) url << Noosfero.root('') - url + url.html_safe end private :generate_url, :url_options diff --git a/app/models/suggest_article.rb b/app/models/suggest_article.rb index a858b83..63e87b8 100644 --- a/app/models/suggest_article.rb +++ b/app/models/suggest_article.rb @@ -65,7 +65,7 @@ class SuggestArticle < Task def information variables = requestor.blank? ? {:requestor => sender} : {} - { :message => _('%{requestor} suggested the publication of the article: %{subject}.'), + { :message => _('%{requestor} suggested the publication of the article: %{subject}.').html_safe, :variables => variables } end @@ -78,7 +78,7 @@ class SuggestArticle < Task end def target_notification_description - _('%{requestor} suggested the publication of the article: %{article}.') % + _('%{requestor} suggested the publication of the article: %{article}.').html_safe % {:requestor => sender, :article => article_name} end diff --git a/app/views/account/_signup_form.html.erb b/app/views/account/_signup_form.html.erb index 49c08d1..310f616 100644 --- a/app/views/account/_signup_form.html.erb +++ b/app/views/account/_signup_form.html.erb @@ -107,7 +107,7 @@ <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %> <% end %> - <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %> + <%= safe_join(@plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }, "") %> <%= template_options(:people, 'profile_data') %> diff --git a/app/views/account/activate_enterprise.html.erb b/app/views/account/activate_enterprise.html.erb index 192013d..1735603 100644 --- a/app/views/account/activate_enterprise.html.erb +++ b/app/views/account/activate_enterprise.html.erb @@ -14,7 +14,7 @@ - <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_exec(&content) }.join("") %> + <%= safe_join(@plugins.dispatch(:login_extra_contents).collect { |content| instance_exec(&content) }, "") %> <% button_bar do %> <%= submit_button( 'login', _('Log in') )%> diff --git a/app/views/account/login_block.html.erb b/app/views/account/login_block.html.erb index 85ecf78..8298c96 100644 --- a/app/views/account/login_block.html.erb +++ b/app/views/account/login_block.html.erb @@ -15,7 +15,7 @@ <%= f.password_field :password %> - <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %> + <%= safe_join(@plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }, "") %> <% button_bar do %> <%= submit_button( 'login', _('Log in') )%> diff --git a/app/views/account/new_password_ok.html.erb b/app/views/account/new_password_ok.html.erb index 2bed21a..64d0694 100644 --- a/app/views/account/new_password_ok.html.erb +++ b/app/views/account/new_password_ok.html.erb @@ -5,5 +5,5 @@-<%= _("You can login now.") % url_for(:action => 'login') %> +<%= _("You can login now.").html_safe % url_for(:action => 'login') %>
diff --git a/app/views/blocks/blog_archives.html.erb b/app/views/blocks/blog_archives.html.erb index 624e27f..0934105 100644 --- a/app/views/blocks/blog_archives.html.erb +++ b/app/views/blocks/blog_archives.html.erb @@ -6,7 +6,7 @@ <%= content_tag('li', content_tag('strong', "#{year.to_i} (#{count})")) %><%= _('Numbered lists:') %>
# <%= _('first item') %>
# <%= _('second item') %>
- <%= h(_('For code, use HTML tags
and , and indent the code inside them:')) %>
+ <%= h(_('For code, use HTML tags
and , and indent the code inside them:').html_safe) %>
<pre>
@@ -23,7 +23,7 @@
</code>
</pre>
- <%= _('See also a more complete Textile Reference.') % 'http://redcloth.org/hobix.com/textile/' %>
+ <%= _('See also a more complete Textile Reference.').html_safe % 'http://redcloth.org/hobix.com/textile/' %>
<%= _('Changes from %s → %s') % [show_time(@v1.updated_at), show_time(@v2.updated_at)] %>
+<%= _('Changes from %s → %s').html_safe % [show_time(@v1.updated_at), show_time(@v2.updated_at)] %>
<% diffContent = Diffy::Diff.new(@v1.body, @v2.body, :context => 1) %> <% if diffContent.to_s(:text).blank? %> @@ -12,5 +12,5 @@ <%= _('These versions range have no differences.')%> <% else %> - <%= diffContent.to_s(:html) %> + <%= diffContent.to_s(:html).html_safe %> <% end %> diff --git a/app/views/content_viewer/view_page.html.erb b/app/views/content_viewer/view_page.html.erb index 4805d73..cdf2f47 100644 --- a/app/views/content_viewer/view_page.html.erb +++ b/app/views/content_viewer/view_page.html.erb @@ -45,24 +45,24 @@ <% if ! @page.categories.empty? %><%= _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it. -Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the "Save changes" button to confirm your changes.') %> +Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the "Save changes" button to confirm your changes.').html_safe %>
<%= labelled_form_for(:environment, :url => {:action => 'update'}) do |f| %> diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index f2d3bd2..2ae6e58 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -7,7 +7,7 @@<%= link_to(_('Read more'), highlighted.url) %>
@@ -49,7 +49,7 @@ <% end %> <% end %> <% else %> - <%= environment.description %> + <%= environment.description.html_safe %> <% end %> <% if environment.enabled?('search_in_home') %> diff --git a/app/views/invite/_select_address_book.html.erb b/app/views/invite/_select_address_book.html.erb index 07a567c..285cc64 100644 --- a/app/views/invite/_select_address_book.html.erb +++ b/app/views/invite/_select_address_book.html.erb @@ -3,12 +3,12 @@ <%= form_tag do %> - <%= [ + <%= safe_join([ radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"), radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Gmail', :for => 'import_from_gmail'), radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"), radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password(this.value)') + content_tag('label', 'Hotmail', :for => "import_from_hotmail") - ].join("\n
> +
> <%= display_number_of_comments(@comments_count) %>
diff --git a/app/views/doc/_toc.html.erb b/app/views/doc/_toc.html.erb index 4cb2a06..4182240 100644 --- a/app/views/doc/_toc.html.erb +++ b/app/views/doc/_toc.html.erb @@ -5,5 +5,5 @@