message explaining that we're populating things in the background
This commit is contained in:
parent
2d4e6e4915
commit
f3183a11e1
3 changed files with 9 additions and 2 deletions
|
|
@ -66,8 +66,8 @@ class ServicesController < ApplicationController
|
|||
|
||||
def finder
|
||||
@finder = true
|
||||
service = current_user.services.where(:type => "Services::#{params[:provider].titleize}").first
|
||||
@friends = service ? service.finder(:remote => params[:remote]).paginate( :page => params[:page], :per_page => 15) : []
|
||||
@service = current_user.services.where(:type => "Services::#{params[:provider].titleize}").first
|
||||
@friends = @service ? @service.finder(:remote => params[:remote]).paginate( :page => params[:page], :per_page => 15) : []
|
||||
end
|
||||
|
||||
def inviter
|
||||
|
|
|
|||
|
|
@ -20,6 +20,12 @@
|
|||
= render :partial => 'remote_friend', :collection => @friends, :as => :friend
|
||||
|
||||
= will_paginate @friends
|
||||
- elsif @service
|
||||
.no_contacts
|
||||
%br
|
||||
%br
|
||||
%h4
|
||||
= t('.fetching_contacts', :service => params[:provider].titleize)
|
||||
- else
|
||||
.no_contacts
|
||||
= link_to(image_tag("social_media_logos/facebook-48x48.png"), "/auth/facebook")
|
||||
|
|
|
|||
|
|
@ -717,6 +717,7 @@ en:
|
|||
join_me_on_diaspora: "Join me on DIASPORA*"
|
||||
click_link_to_accept_invitation: "Follow this link to accept your invitation"
|
||||
finder:
|
||||
fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
|
||||
service_friends: "%{service} Friends"
|
||||
no_friends: "No Facebook friends found."
|
||||
remote_friend:
|
||||
|
|
|
|||
Loading…
Reference in a new issue