Commit e36981ca3097692376f5ee54db8e421297d1e215
1 parent
3660383a
Exists in
profile_api_improvements
and in
1 other branch
should not escape welcome message html code
Showing
1 changed file
with
5 additions
and
5 deletions
Show diff stats
app/views/home/welcome.html.erb
| @@ -10,20 +10,20 @@ | @@ -10,20 +10,20 @@ | ||
| 10 | <p><%= _("Firstly, some tips for getting started:") %></p> | 10 | <p><%= _("Firstly, some tips for getting started:") %></p> |
| 11 | <h4><%= _("Confirm your account!") %></h4> | 11 | <h4><%= _("Confirm your account!") %></h4> |
| 12 | <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p> | 12 | <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p> |
| 13 | - <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p> | 13 | + <p><%= _("You won't appear as %s until your account is confirmed.").html_safe % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p> |
| 14 | <% else %> | 14 | <% else %> |
| 15 | <h4><%= _("Wait for admin approvement!") %></h4> | 15 | <h4><%= _("Wait for admin approvement!") %></h4> |
| 16 | <p><%= _("The administrators will evaluate your signup request for approvement.") %></p> | 16 | <p><%= _("The administrators will evaluate your signup request for approvement.") %></p> |
| 17 | - <p><%= _("You won't appear as %s until your account is approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p> | 17 | + <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> |
| 18 | <% end %> | 18 | <% end %> |
| 19 | <h4><%= _("What to do next?") %></h4> | 19 | <h4><%= _("What to do next?") %></h4> |
| 20 | <p><%= _("Access your %s and see your face on the network!") % | 20 | <p><%= _("Access your %s and see your face on the network!") % |
| 21 | (user.present? ? link_to(_('Profile'), {:controller => 'profile', :profile => user.identifier}, :target => '_blank') : 'Profile') %> | 21 | (user.present? ? link_to(_('Profile'), {:controller => 'profile', :profile => user.identifier}, :target => '_blank') : 'Profile') %> |
| 22 | - <%= _("You can also explore your %s to customize your profile. Here are some %s on what you can do there.") % | 22 | + <%= _("You can also explore your %s to customize your profile. Here are some %s on what you can do there.").html_safe % |
| 23 | [user.present? ? link_to(_('Control Panel'), {:controller => 'profile_editor', :profile => user.identifier}, :target => '_blank') : 'Control Panel', | 23 | [user.present? ? link_to(_('Control Panel'), {:controller => 'profile_editor', :profile => user.identifier}, :target => '_blank') : 'Control Panel', |
| 24 | link_to(_('tips'), {:controller => 'doc', :action => 'topic', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank')] %></p> | 24 | link_to(_('tips'), {:controller => 'doc', :action => 'topic', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank')] %></p> |
| 25 | - <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :action => 'topic', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p> | ||
| 26 | - <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p> | 25 | + <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!").html_safe % link_to(_('Invite and find'), {:controller => 'doc', :action => 'topic', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p> |
| 26 | + <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> | ||
| 27 | <p><%= _("Start exploring and have fun!") %></p> | 27 | <p><%= _("Start exploring and have fun!") %></p> |
| 28 | <% end %> | 28 | <% end %> |
| 29 | <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @person_template, :header => _("What can I do as a %s?")} %> | 29 | <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @person_template, :header => _("What can I do as a %s?")} %> |