Download as
Browse Code »

Commit ba453de5bf87f21f3cd21ac2bd5e3cf7777c4d50

Authored by André Guedes
Committed by Tallys Martins
1 parent bdeb37d3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixed welcome message when the feature is on. 

(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Showing 1 changed file with 4 additions and 5 deletions   Show diff stats
app/views/account/signup.html.erb
  Diff comments   View file @ba453de
... ... @@ -3,19 +3,18 @@
3 3 <% if environment.has_custom_welcome_screen? %>
4 4 <%= environment.settings[:signup_welcome_screen_body].html_safe %>
5 5 <% elsif environment.enabled?('admin_must_approve_new_users')%>
6   - <h1><%= _("The environment %s has a registration moderated policy!") % environment.name %></h1>
7   - <h3><%= _("Your registration was sent to the environment administrator!") %></h3>
8   - <h3><%= _("Once your registration is accepted you can start doing the cool stuffs bellow!") %></h3>
  6 + <h1><%= _("Welcome to %s!") % environment.name %></h1>
  7 + <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
9 8 <p><%= _("Firstly, some tips for getting started:") %></p>
10 9 <h4><%= _("Confirm your account!") %></h4>
11 10 <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 won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
  11 + <p><%= _("After your confirmation the administrators will be able to approve your signup request.") %></p>
  12 + <p><%= _("You won't appear as %s until your account is confirmed and approved.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
13 13 <h4><%= _("What to do next?") %></h4>
14 14 <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
15 15 <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>
16 16 <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
17 17 <p><%= _("Start exploring and have fun!") %></p>
18   - <h3><%= _("If by any chance your registration wasn't successful and you should be registred, send an email for the administrator!")%></h3>
19 18 <% else %>
20 19 <h1><%= _("Welcome to %s!") % environment.name %></h1>
21 20 <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
... ...