muck-friends 0.1.9 → 0.1.10

data/Rakefile

@@ -8,6 +8,7 @@ task :default => :test
 desc 'Translate this gem'
 task :translate do
   file = File.join(File.dirname(__FILE__), 'locales', 'en.yml')
+  #system("babelphish -o -y #{file} -s es,fr,ja,de") # Can specify specific languages to translate to.
   system("babelphish -o -y #{file}")
 end
 

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/app/controllers/muck/friends_controller.rb

@@ -37,6 +37,32 @@ class Muck::FriendsController < ApplicationController
 
   end
   
+  def update
+    if params[:block]
+      success = @user.block_user(@target)
+    elsif params[:unblock]
+      success = @user.unblock_user(@target)
+    end
+    
+    if success
+      if params[:block] == true
+        message = t('muck.friends.blocked', :user => @target.display_name)
+      elsif params[:block] == false
+        message = t('muck.friends.unblocked', :user => @target.display_name)
+      end
+    else
+      message = t('muck.friends.block_problem', :user => @target.display_name)
+    end
+    
+    respond_to do |format|
+      format.html { render_after_update_html(success, message) }
+      format.js { render_after_update_js(success, message) }
+      format.pjs { render_after_update_js(success, message) }
+      format.json { render :json => { :success => success, :message => message, :friend_user => @target } }
+    end
+    
+  end
+  
   def destroy
 
     success = true
@@ -77,6 +103,19 @@ class Muck::FriendsController < ApplicationController
       render(:update){|page| page.alert message}
     end
   end
+  
+  def render_after_update_html(success, message)
+    flash[:notice] = message
+    redirect_to profile_path(@target)
+  end
+
+  def render_after_update_js(success, message)
+    if success
+      render(:update){|page| page.replace make_block_id(@user, @target), block_user_link(@user, @target)}
+    else
+      render(:update){|page| page.alert message}
+    end
+  end
     
   def render_after_destroy_html(success, message)
     flash[:notice] = message
@@ -101,7 +140,7 @@ class Muck::FriendsController < ApplicationController
     else
       @user = current_user
     end
-    @target = User.find(params[:id])
+    @target = User.find(params[:target_id] || params[:id])
   end
   
 end

data/app/helpers/muck_friends_helper.rb

@@ -74,6 +74,17 @@ module MuckFriendsHelper
     end
   end
   
+  def block_user_link(user, target)
+    friend = user.friendship_with(target)
+    return '' if friend.blank?
+    dom_id = make_block_id(user, target)
+    if friend.blocked?
+      return wrap_friend_link(link_to_remote( I18n.t('muck.friends.unblock', :user => target.display_name), :url => user_friend_path(user, friend, :target_id => target, :unblock => true), :method => :put), dom_id, 'friendship-block')
+    else
+      return wrap_friend_link(link_to_remote( I18n.t('muck.friends.block', :user => target.display_name), :url => user_friend_path(user, friend, :target_id => target, :block => true), :method => :put), dom_id, 'friendship-block')
+    end
+  end
+  
   # Render a follow/unfollow/friend request link appropriate to the current application settings and user relationship
   # Requires enable_following and enable_friending be set in global_config.yml
   #   If enable_following is true and enable_friending is false then only follow/unfollow links will be shown
@@ -149,12 +160,16 @@ module MuckFriendsHelper
     end
   end
   
-  def wrap_friend_link(link, dom_id = '')
-    content_tag(:span, link, :id => dom_id, :class => 'friendship-description')
+  def wrap_friend_link(link, dom_id = '', css = 'friendship-description')
+    content_tag(:span, link, :id => dom_id, :class => css)
   end
 
   def make_id(user, target)
     user.dom_id(target.dom_id + '_friendship_')
   end
   
+  def make_block_id(user, target)
+    user.dom_id(target.dom_id + '_block_')
+  end
+  
 end

data/app/views/friend_mailer/follow.text.html.erb

@@ -1,8 +1,8 @@
-<p>Hi <%= h(@invited.login) %></p>
+<p>Hi <%= h(@invited.display_name) %></p>
 
-<p><%= h(@inviter.login) %> is now following your updates on <%= GlobalConfig.application_name %>.</p>
+<p><%= h(@inviter.display_name) %> is now following your updates on <%= GlobalConfig.application_name %>.</p>
 
-<p>You may find more information about <%= h(@inviter.login) %> on their profile <%= profile_url(@inviter) %></p>
+<p>You may find more information about <%= h(@inviter.display_name) %> on their profile <%= profile_url(@inviter) %></p>
 
 <p>Thanks, <br />
 The <%= GlobalConfig.application_name %> Team</p>

data/app/views/friend_mailer/follow.text.plain.erb

@@ -1,8 +1,8 @@
-Hi <%= h(invited.login) %>
+Hi <%= h(invited.display_name) %>
 
-<%= h(inviter.login) %> is now following your updates on <%= GlobalConfig.application_name %>.
+<%= h(inviter.display_name) %> is now following your updates on <%= GlobalConfig.application_name %>.
 
-You may find more information about <%= h(inviter.login) %> on their profile <%= profile_url(inviter) %>
+You may find more information about <%= h(inviter.display_name) %> on their profile <%= profile_url(inviter) %>
 
 Thanks,
 The <%= GlobalConfig.application_name %> Team

data/app/views/friend_mailer/friend_request.text.html.erb

@@ -1,8 +1,8 @@
-<p>Hi <%= h(@invited.login) %></p>
+<p>Hi <%= h(@invited.display_name) %></p>
 
-<p><%= h(@inviter.login) %> has sent you a friend request on <%= GlobalConfig.application_name %>.</p>
+<p><%= h(@inviter.display_name) %> has sent you a friend request on <%= GlobalConfig.application_name %>.</p>
 
-<p>You may find more information about <%= h(@inviter.login) %> on their profile <%= profile_url(@inviter) %></p>
+<p>You may find more information about <%= h(@inviter.display_name) %> on their profile <%= profile_url(@inviter) %></p>
 
 <p>Thanks, <br />
 The <%= GlobalConfig.application_name %> Team</p>

data/app/views/friend_mailer/friend_request.text.plain.erb

@@ -1,8 +1,8 @@
-Hi <%= h(invited.login) %>
+Hi <%= h(invited.display_name) %>
 
-<%= h(inviter.login) %> has sent you a friend request on <%= GlobalConfig.application_name %>.
+<%= h(inviter.display_name) %> has sent you a friend request on <%= GlobalConfig.application_name %>.
 
-You may find more information about <%= h(inviter.login) %> on their profile <%= profile_url(inviter) %>
+You may find more information about <%= h(inviter.display_name) %> on their profile <%= profile_url(inviter) %>
 
 Thanks,
 The <%= GlobalConfig.application_name %> Team

data/lib/active_record/acts/muck_friend.rb

@@ -93,7 +93,12 @@ module ActiveRecord
           return false if user.blank? || target.blank?
           friend = Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id})
           friend.destroy if friend
-          Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id}).update_attribute(:status, MuckFriends::BLOCKED)
+          friend = Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id})
+          if friend
+            friend.update_attribute(:status, MuckFriends::BLOCKED)
+          else
+            false
+          end
         end
         
         def unblock_user(user, target)
@@ -106,10 +111,17 @@ module ActiveRecord
           end
         end
 
+        def blocked?(user, target)
+          !Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id, :status => MuckFriends::BLOCKED}).blank?
+        end
+        
         def has_network?(user)
           !self.find(:first, :conditions => ["invited_id = ? or inviter_id = ?", user.id, user.id]).blank?
         end
         
+        def friendship_with(user, target)
+          Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id})
+        end
       end
 
       # All the methods available to a record that has had <tt>acts_as_muck_friend</tt> specified.
@@ -119,6 +131,21 @@ module ActiveRecord
           FriendMailer.deliver_follow(inviter, invited)
         end
         
+        def block
+          self.update_attribute(:status, MuckFriends::BLOCKED)
+        end
+        
+        def unblock
+          self.update_attribute(:status, MuckFriends::FOLLOWING)
+        end
+        
+        def blocked?
+          # TODO status is a reserved word in mysql.  self.status won't work here (just returns nil).
+          # Consider setting up 'friend' to use a state machine instead of numeric values
+          # doing so would cleanup transitions between states.
+          self[:status] == MuckFriends::BLOCKED
+        end
+        
         # Add activity that indicates user is following another user
         def add_follow_activity
           return unless GlobalConfig.enable_friend_activity

data/lib/active_record/acts/muck_friend_user.rb

@@ -62,6 +62,14 @@ module ActiveRecord
           Friend.add_follower(self, user)
         end
         
+        def blocked?(user)
+          Friend.blocked?(self, user)
+        end
+        
+        def friendship_with(user)
+          Friend.friendship_with(self, user)
+        end 
+        
         # Call to stop following another user
         def stop_following(user)
           Friend.stop_following(self, user)

data/locales/ar.yml

@@ -7,38 +7,43 @@ ar:
     friends: 
       acccept_friend_request: "قبول طلب من صديق {{user}}"
       accept: (قبول)
+      block: "كتلة {{user}}"
+      block_problem: "كان هناك خطأ حجب {{user}}"
+      blocked: "منعت {{user}}"
       delete: (حذف)
-      follow_activity: "{{inviter}} is now following {{invited}}"
+      follow_activity: "{{inviter}}الآن التالية {{invited}}"
       followers: أتباع
       following: تال
-      following_you: "{{name}} is now following you on {{application_name}}"
-      friend_request: "{{name}} has sent you a friend request on {{application_name}}"
-      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
-      friend_request_pending: "طلب صديق في انتظار {{link}}"
-      friend_request_prompt: "ارسال طلب {{user}}صديق"
-      friend_request_sent: "تم إرسال طلب صديق"
+      following_you: "{{name}}الآن على ما يلي كنت {{application_name}}"
+      friend_request: "{{name}}لقد أرسلت لك طلب صديق على {{application_name}}"
+      friend_request_links: "{{profile}}أرسال طلب لصديق {{accept}}{{ignore}}"
+      friend_request_pending: "صديق طلب معلق {{link}}"
+      friend_request_prompt: "{{user}}ارسال طلب لصديق"
+      friend_request_sent: "صديق إرسال طلب"
       friends: أصدقاء
       friends_title: أصدقائي
-      friends_with: "{{inviter}} is now friends with {{invited}}"
+      friends_with: "{{inviter}}الآن مع أصدقاء {{invited}}"
       ignore: (تجاهل)
       login: "تسجيل الدخول"
-      login_or_sign_up_to_follow: "{{login}} or {{signup}}لمتابعة هذا المستخدم"
-      login_or_sign_up_to_friend: "{{login}} or {{signup}}إرسال طلبات الأصدقاء"
-      mutual_friends: "تبادل الأصدقاء"
+      login_or_sign_up_to_follow: "{{login}}أو {{signup}}لمتابعة هذا المستخدم"
+      login_or_sign_up_to_friend: "{{login}}أو {{signup}}لارسال طلبات صديق"
+      mutual_friends: "أصدقاء مشتركون"
       no_followers: "لا أتباع"
-      no_friends: "أنت ليست لديها حاليا أي الأصدقاء"
-      no_mutual_friends: "لا أصدقاء للطرفين ، وجدت"
+      no_friends: "لا أصدقاء"
+      no_mutual_friends: "العثور على أي أصدقاء مشتركون"
       not_following_anyone: "لا وبعد كل"
-      problem_adding_follow: "هناك مشكلة واضاف {{user}}لمتابعة القائمة الخاصة بك. يرجى المحاولة مرة أخرى."
-      problem_sending_friend_request: "هناك مشكلة في ارسال طلب لصديق {{user}}. يرجى المحاولة مرة أخرى."
-      removed_following_error: "وثمة مشكلة وقعت بينما كان يحاول فولو غير {{user}}"
+      problem_adding_follow: "كانت هناك مشكلة مضيفا {{user}}إلى حسابك اتبع قائمة. يرجى المحاولة مرة أخرى."
+      problem_sending_friend_request: "كانت هناك مشكلة ارسال طلب لصديق {{user}}. يرجى المحاولة مرة أخرى."
+      removed_following_error: "حدثت مشكلة أثناء محاولة فولو {{user}}"
       removed_friendship: "إزالة {{user}}من أصدقائك"
-      removed_friendship_error: "هناك مشكلة في إزالة {{user}}من قائمة الأصدقاء"
-      same_inviter_error_message: "المستخدم لا يمكن أن يصبح صديقا لذاتهما."
+      removed_friendship_error: "كانت هناك مشكلة إزالة {{user}}من قائمة الأصدقاء"
+      same_inviter_error_message: "لا يمكن للمستخدم أن تصبح صداقات مع ذاتهما."
       signup: الاشتراك
-      start_following: "يتبع {{user}}"
-      stop_being_friends_with: "العدو {{user}}"
-      stop_following: "وبعد توقف {{user}}"
-      stopped_following: "بنجاح بعد توقف {{user}}"
-      view_all: "وبالنظر إلى جميع"
-      you_are_now_following: "أنت الآن بعد {{user}}"
+      start_following: "اتبع {{user}}"
+      stop_being_friends_with: "Unfriend {{user}}"
+      stop_following: "وعقب وقف {{user}}"
+      stopped_following: "نجحت جهود وقف التالية {{user}}"
+      unblock: "الافراج عن {{user}}"
+      unblocked: "{{user}}الافراج"
+      view_all: "عرض الكل"
+      you_are_now_following: "أنت الآن التالية {{user}}"

data/locales/bg.yml

@@ -7,38 +7,43 @@ bg:
     friends: 
       acccept_friend_request: "Приеми приятел искане от {{user}}"
       accept: (приеме)
+      block: "Блок {{user}}"
+      block_problem: "Имаше грешка при блокиране {{user}}"
+      blocked: "Блокирани {{user}}"
       delete: (изтриване)
-      follow_activity: "{{inviter}} is now following {{invited}}"
+      follow_activity: "{{inviter}} Е сега след {{invited}}"
       followers: Последователи
       following: Следващ
-      following_you: "{{name}} is now following you on {{application_name}}"
-      friend_request: "{{name}} has sent you a friend request on {{application_name}}"
-      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
-      friend_request_pending: "Приятел запитване до {{link}}"
-      friend_request_prompt: "Изпрати на приятел {{user}} Запитване"
-      friend_request_sent: "Приятел Искане Изпратени"
+      following_you: "{{name}} Е сега продължение на {{application_name}}"
+      friend_request: "{{name}} Ви е изпратил молба за приятелство на {{application_name}}"
+      friend_request_links: "{{profile}} Ви изпрати молба за приятелство {{accept}} {{ignore}}"
+      friend_request_pending: "Приятел искане до {{link}}"
+      friend_request_prompt: "Изпрати на приятел {{user}} Заявка"
+      friend_request_sent: "Заявката е изпратена приятел"
       friends: Приятели
       friends_title: "Моите приятели"
-      friends_with: "{{inviter}} is now friends with {{invited}}"
-      ignore: (пренебрегни)
+      friends_with: "{{inviter}} Сега е приятел с {{invited}}"
+      ignore: (игнорира)
       login: влизам
-      login_or_sign_up_to_follow: "{{login}} or {{signup}} Да следват този потребител"
-      login_or_sign_up_to_friend: "{{login}} or {{signup}} Да изпратят молби за приятелство"
+      login_or_sign_up_to_follow: "{{login}} Или {{signup}} да последват този потребител"
+      login_or_sign_up_to_friend: "{{login}} Или {{signup}} да изпращат молби за приятелство"
       mutual_friends: "Общи приятели"
-      no_followers: "Не последователите"
-      no_friends: "Вие в момента не са никакви приятели"
-      no_mutual_friends: "Не намери общи приятели"
-      not_following_anyone: "Не След Всеки"
-      problem_adding_follow: "Имаше проблем при добавянето {{user}} да ви следват списък. Моля опитайте отново."
+      no_followers: "Не Последователи"
+      no_friends: "Няма приятели"
+      no_mutual_friends: "Не общи приятели намерени"
+      not_following_anyone: "Всеки, който не следват"
+      problem_adding_follow: "Имаше проблем при добавянето на {{user}} да следват вашия списък. Моля опитайте отново."
       problem_sending_friend_request: "Имаше проблем при изпращането на молба за приятелство с {{user}}. Моля опитайте отново."
-      removed_following_error: "Актуален проблем се наблюдава, докато се опитва да unfollow {{user}}"
+      removed_following_error: "Един от проблемите, възникнали при опит да unfollow {{user}}"
       removed_friendship: "Премахнато {{user}} от приятелите си"
-      removed_friendship_error: "Имаше проблем при премахването {{user}} от своя списък с приятели"
-      same_inviter_error_message: "Потребителят може да не станат приятели с themself."
-      signup: логване
+      removed_friendship_error: "Имаше проблем при премахването на {{user}} от своя списък с приятели"
+      same_inviter_error_message: "Потребителите не могат да станат приятели с themself."
+      signup: регистрация
       start_following: "Следвайте {{user}}"
       stop_being_friends_with: "Unfriend {{user}}"
       stop_following: "Спри След {{user}}"
-      stopped_following: "Успешно е спряна след {{user}}"
-      view_all: "View All"
+      stopped_following: "Успешно спря след {{user}}"
+      unblock: "Unblock {{user}}"
+      unblocked: "Разблокирани {{user}}"
+      view_all: "Виж всички"
       you_are_now_following: "Сега след {{user}}"

data/locales/ca.yml

@@ -5,40 +5,45 @@ ca:
       follow: Seguidors
       friends_with: Amics
     friends: 
-      acccept_friend_request: "D'acceptar la sol licitud d'amistat {{user}}"
+      acccept_friend_request: "Acceptar Amic De {{user}}"
       accept: (acceptar)
+      block: "Bloc {{user}}"
+      block_problem: "Hi va haver un error de bloqueig {{user}}"
+      blocked: "Bloquejats {{user}}"
       delete: (eliminar)
-      follow_activity: "{{inviter}} is now following {{invited}}"
+      follow_activity: "{{inviter}} Està seguint {{invited}}"
       followers: Seguidors
       following: Següent
-      following_you: "{{name}} is now following you on {{application_name}}"
-      friend_request: "{{name}} has sent you a friend request on {{application_name}}"
-      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
-      friend_request_pending: "A l'espera de sol licitud d'amistat {{link}}"
-      friend_request_prompt: "Enviar a un amic Demana {{user}}"
-      friend_request_sent: "La sol licitud s'ha enviat un amic"
+      following_you: "{{name}} Està seguint vostè en {{application_name}}"
+      friend_request: "{{name}} Ha enviat una sol licitud d'amic a {{application_name}}"
+      friend_request_links: "{{profile}} Enviat una sol licitud d'amic {{accept}} {{ignore}}"
+      friend_request_pending: "Sol.licitud d'amic {{link}} espera"
+      friend_request_prompt: "Enviar {{user}} una sol licitud d'amistat"
+      friend_request_sent: "Friend Request Sent"
       friends: Amics
       friends_title: "Els meus amics"
-      friends_with: "{{inviter}} is now friends with {{invited}}"
+      friends_with: "{{inviter}} Ara és amic de {{invited}}"
       ignore: (ignorar)
       login: "inici de sessió"
-      login_or_sign_up_to_follow: "{{login}} or {{signup}} A aquest usuari"
-      login_or_sign_up_to_friend: "{{login}} or {{signup}} Per enviar sol licituds d'amistat"
+      login_or_sign_up_to_follow: "{{login}} O {{signup}} a seguir aquest usuari"
+      login_or_sign_up_to_friend: "{{login}} O {{signup}} per enviar automàticament peticions d'amistat"
       mutual_friends: "Amics mutus"
-      no_followers: "Els seguidors no"
-      no_friends: "Vostè no té actualment cap amic"
-      no_mutual_friends: "No va trobar amics"
-      not_following_anyone: "Després no Qualsevol"
-      problem_adding_follow: "Hi ha hagut un problema {{user}} afegir a la seva llista de seguiment. Torneu-ho de nou."
-      problem_sending_friend_request: "Hi ha hagut un problema l'enviament d'una sol licitud d'amistat {{user}}. Torneu-ho de nou."
-      removed_following_error: "Un problema es va produir en intentar unfollow {{user}}"
-      removed_friendship: "{{user}} Esborrat dels teus amics"
-      removed_friendship_error: "Hi ha hagut un problema {{user}} eliminar de la llista d'amics"
-      same_inviter_error_message: "L'usuari no pot convertir-se en amics amb ell mateix."
-      signup: registre
+      no_followers: "No followers"
+      no_friends: "No hi ha amics"
+      no_mutual_friends: "No hi ha amics en comú trobat"
+      not_following_anyone: "No seguir a ningú"
+      problem_adding_follow: "Hi va haver un problema en afegir {{user}} a la teva llista de seguiment. Si us plau, torneu-ho de nou."
+      problem_sending_friend_request: "Hi va haver un problema en enviar una sol licitud d'amistat a {{user}}. Si us plau, torneu-ho de nou."
+      removed_following_error: "Hi ha un problema en intentar unfollow {{user}}"
+      removed_friendship: "Esborrat {{user}} dels teus amics"
+      removed_friendship_error: "Hi va haver un problema en treure {{user}} de la vostra llista d'amics"
+      same_inviter_error_message: "L'usuari no pot ser amic de si mateixos."
+      signup: signup
       start_following: "Siga {{user}}"
       stop_being_friends_with: "Unfriend {{user}}"
-      stop_following: "Després d'aturar {{user}}"
-      stopped_following: "Èxit detingut després {{user}}"
+      stop_following: "Després de deixar de {{user}}"
+      stopped_following: "Detingut amb èxit els següents {{user}}"
+      unblock: "Desbloca {{user}}"
+      unblocked: "{{user}} Unblocked"
       view_all: "Veure tots"
-      you_are_now_following: "Ara està després {{user}}"
+      you_are_now_following: "Vostè està seguint ara {{user}}"

data/locales/cs.yml

@@ -2,43 +2,48 @@
 cs: 
   muck: 
     activity_templates: 
-      follow: Následovníci
+      follow: Followers
       friends_with: Kamarádi
     friends: 
-      acccept_friend_request: "Přijměte přítele žádost {{user}}"
-      accept: (přijmout)
+      acccept_friend_request: "Accept-mailem žádost {{user}}"
+      accept: (přijetí)
+      block: "Blok {{user}}"
+      block_problem: "Došlo k chybě při blokování {{user}}"
+      blocked: "Blokované {{user}}"
       delete: (smazat)
-      follow_activity: "{{inviter}} is now following {{invited}}"
-      followers: Následovníci
+      follow_activity: "{{inviter}} Je nyní po {{invited}}"
+      followers: Followers
       following: Následující
-      following_you: "{{name}} is now following you on {{application_name}}"
-      friend_request: "{{name}} has sent you a friend request on {{application_name}}"
-      friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
-      friend_request_pending: "Přátelství čeká {{link}}"
-      friend_request_prompt: "Poslat {{user}} přítele Žádost"
-      friend_request_sent: "Zaslat příteli Posláno"
+      following_you: "{{name}} Je nyní po vás {{application_name}}"
+      friend_request: "{{name}} Vám poslal žádost o přátelství o {{application_name}}"
+      friend_request_links: "{{profile}} Vám poslal žádost o přátelství {{accept}} {{ignore}}"
+      friend_request_pending: "Přátelství až do {{link}}"
+      friend_request_prompt: "Poslat mailem {{user}} Poptávka"
+      friend_request_sent: "Friend Požadavek byl odeslán"
       friends: Kamarádi
-      friends_title: "Moji kamarádi"
-      friends_with: "{{inviter}} is now friends with {{invited}}"
+      friends_title: "My Friends"
+      friends_with: "{{inviter}} Je nyní přátelé s {{invited}}"
       ignore: (ignorovat)
       login: přihlásit
-      login_or_sign_up_to_follow: "{{login}} or {{signup}} Následovat tohoto uživatele"
-      login_or_sign_up_to_friend: "{{login}} or {{signup}} Poslat kamarádovi žádostí"
-      mutual_friends: "Vzájemné Přátelé"
-      no_followers: "Ne následovníci"
-      no_friends: "Nemusíte mít v současné době žádné přátele"
-      no_mutual_friends: "No nalézt společné přátele"
-      not_following_anyone: "Po ne Kdokoliv"
-      problem_adding_follow: "Došlo k problému {{user}} přidáte do svého seznamu následovat. Prosím, zkuste to znovu."
-      problem_sending_friend_request: "Došlo k problému při odesílání příteli žádost {{user}}. Prosím, zkuste to znovu."
-      removed_following_error: "A problém nastal při pokusu o unfollow {{user}}"
-      removed_friendship: "Odstraněny {{user}} z vašich přátel"
-      removed_friendship_error: "Došlo k problému odstranění {{user}} z vašeho seznamu přátel"
-      same_inviter_error_message: "Uživatel se nemůže stát přítelem themself."
-      signup: přihlášení
+      login_or_sign_up_to_follow: "{{login}} Nebo {{signup}} následovat tohoto uživatele"
+      login_or_sign_up_to_friend: "{{login}} Nebo {{signup}} poslat přátelství"
+      mutual_friends: "Vzájemné Friends"
+      no_followers: "No Followers"
+      no_friends: "Žádní přátelé"
+      no_mutual_friends: "Nalezeny žádné společné přátele"
+      not_following_anyone: "Po někdo není"
+      problem_adding_follow: "Tam byl problém {{user}} přidat do svého seznamu následovat. Prosím, zkuste to znovu."
+      problem_sending_friend_request: "Došlo k problému při odesílání přátelství na {{user}}. Prosím, zkuste to znovu."
+      removed_following_error: "Problém nastal při pokusu o unfollow {{user}}"
+      removed_friendship: "{{user}} Odstraněny z vašich přátel"
+      removed_friendship_error: "Tam byl problém odstranit {{user}} z vašeho seznamu přátel"
+      same_inviter_error_message: "Uživatel se nemůže stát s přáteli themself."
+      signup: registrace
       start_following: "Postupujte {{user}}"
       stop_being_friends_with: "Unfriend {{user}}"
-      stop_following: "Stop Po {{user}}"
-      stopped_following: "Úspěšně zastavil po {{user}}"
-      view_all: "Zobrazit vše"
-      you_are_now_following: "Ty jsou nyní tyto {{user}}"
+      stop_following: "Po zastavení {{user}}"
+      stopped_following: "Úspěšně se zastavil po {{user}}"
+      unblock: "Odblokovat {{user}}"
+      unblocked: "Odblokovány {{user}}"
+      view_all: "Zobrazit všechny"
+      you_are_now_following: "Nyní po {{user}}"