Download as
Browse Code »

Commit ec6a779510d070673d1b6773e06d007850b21f53

Authored by Daniela Feitosa
1 parent 2cad0a73
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

invite-members: fix broken tests 

Also changed message to be easier to translate
Showing 2 changed files with 4 additions and 5 deletions   Show diff stats
app/controllers/public/invite_controller.rb
  Diff comments   View file @ec6a779
... ... @@ -8,7 +8,7 @@ class InviteController < PublicController
8 8 @import_from = params[:import_from] || "manual"
9 9 @mail_template = params[:mail_template] || environment.invitation_mail_template(profile)
10 10  
11   - labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { |name,info| info[:label] }
  11 + labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { |name,info| info[:label].downcase }
12 12 last = labels.pop
13 13 label = labels.join(', ')
14 14 @search_friend_fields = "#{label} #{_('or')} #{last}"
... ... @@ -72,7 +72,6 @@ class InviteController < PublicController
72 72 else
73 73 redirect_to :controller => 'profile', :action => 'members'
74 74 end
75   - return
76 75 else
77 76 redirect_to :action => 'invite_friends'
78 77 session[:notice] = _('Please enter a valid profile.')
... ...
app/views/invite/invite_friends.html.erb
  Diff comments   View file @ec6a779
... ... @@ -4,13 +4,13 @@
4 4 <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
5 5 <% end %>
6 6  
7   -<% unless profile.person? %>
8   - <h2><%= _('Invite other registered users') %></h2>
  7 +<% if profile.community? %>
  8 + <h2><%= _('Invite registered users') %></h2>
9 9 <p><%= _('You can search for user profiles and invite them to join this community.') %></p>
10 10 <%= form_tag :action => 'invite_registered_friend' do %>
11 11 <% search_action = url_for(:action => 'search_friend') %>
12 12 <%= token_input_field_tag(:q, 'search-friends', search_action,
13   - { :hint_text => _('Type in your friend\'s ') + @search_friend_fields,
  13 + { :hint_text => _('Type in your friend\'s %{search_fields}') % {:search_fields => @search_friend_fields},
14 14 :focus => false }) %>
15 15  
16 16 <% button_bar do %>
... ...