Merge remote-tracking branch 'upstream/pull/5510'

[rails.git] / app / views / dashboards / show.html.erb

diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb
index c4b595e9b931dc6ba5e79be030105f082433a3d3..be4461a00221c21d1a45b78532df5a00aa9fd861 100644 (file)
--- a/app/views/dashboards/show.html.erb
+++ b/app/views/dashboards/show.html.erb
@@ -22,24 +22,24 @@
         <%= tag.div "", :id => "map", :class => "content_map border border-secondary-subtle rounded z-0", :data => { :user => user_data } %>
       <% end %>
 
-      <% friends = @user.friends %>
+      <% friends = @user.followings %>
       <% nearby = @user.nearby - friends %>
     </div>
 
     <div class="col-md">
-      <h2><%= t ".my friends" %></h2>
+      <h2><%= t ".followings" %></h2>
 
       <% if friends.empty? %>
-        <%= t ".no friends" %>
+        <%= t ".no followings" %>
       <% else %>
         <nav class='secondary-actions mb-3'>
           <ul class='clearfix'>
-            <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
-            <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
+            <li><%= link_to t(".followed_changesets"), friend_changesets_path %></li>
+            <li><%= link_to t(".followed_diaries"), friends_diary_entries_path %></li>
           </ul>
         </nav>
         <div>
-          <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
+          <%= render :partial => "contact", :collection => friends, :locals => { :type => "following" } %>
         </div>
       <% end %>