muck-friends 0.1.6 → 0.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. data/Rakefile +0 -1
  2. data/VERSION +1 -1
  3. data/app/controllers/muck/friends_controller.rb +65 -45
  4. data/app/helpers/muck_friends_helper.rb +2 -2
  5. data/app/models/friend_mailer.rb +1 -0
  6. data/app/views/friends/_friend_icon.html.erb +1 -1
  7. data/app/views/friends/_friend_tiny_icon.html.erb +1 -0
  8. data/lib/active_record/acts/muck_friend.rb +24 -14
  9. data/lib/active_record/acts/muck_friend_user.rb +4 -5
  10. data/lib/muck_friends.rb +2 -2
  11. data/locales/ar.yml +17 -9
  12. data/locales/bg.yml +18 -10
  13. data/locales/ca.yml +17 -9
  14. data/locales/cs.yml +17 -9
  15. data/locales/da.yml +17 -9
  16. data/locales/de.yml +17 -9
  17. data/locales/el.yml +17 -9
  18. data/locales/en.yml +2 -2
  19. data/locales/es.yml +17 -9
  20. data/locales/et.yml +17 -9
  21. data/locales/fa.yml +17 -9
  22. data/locales/fi.yml +17 -9
  23. data/locales/fr.yml +17 -9
  24. data/locales/gl.yml +18 -10
  25. data/locales/hi.yml +17 -9
  26. data/locales/hr.yml +17 -9
  27. data/locales/hu.yml +17 -9
  28. data/locales/id.yml +17 -9
  29. data/locales/it.yml +17 -9
  30. data/locales/iw.yml +17 -9
  31. data/locales/ja.yml +17 -9
  32. data/locales/ko.yml +17 -9
  33. data/locales/lt.yml +17 -9
  34. data/locales/lv.yml +17 -9
  35. data/locales/mt.yml +17 -9
  36. data/locales/nl.yml +17 -9
  37. data/locales/no.yml +17 -9
  38. data/locales/pl.yml +17 -9
  39. data/locales/pt-PT.yml +17 -9
  40. data/locales/ro.yml +17 -9
  41. data/locales/ru.yml +17 -9
  42. data/locales/sk.yml +17 -9
  43. data/locales/sl.yml +17 -9
  44. data/locales/sq.yml +17 -9
  45. data/locales/sr.yml +17 -9
  46. data/locales/sv.yml +17 -9
  47. data/locales/th.yml +17 -9
  48. data/locales/tl.yml +17 -9
  49. data/locales/tr.yml +18 -10
  50. data/locales/uk.yml +17 -9
  51. data/locales/vi.yml +17 -9
  52. data/locales/zh-CN.yml +17 -9
  53. data/locales/zh-TW.yml +17 -9
  54. data/locales/zh.yml +17 -9
  55. data/muck-friends.gemspec +3 -2
  56. data/test/rails_root/test/functional/default_controller_test.rb +3 -3
  57. data/test/rails_root/test/unit/friend_test.rb +118 -125
  58. data/test/rails_root/test/unit/user_test.rb +3 -3
  59. metadata +3 -2
data/Rakefile CHANGED
@@ -35,7 +35,6 @@ rescue LoadError
35
35
  end
36
36
  end
37
37
 
38
-
39
38
  desc 'Generate documentation for the muck_friends plugin.'
40
39
  Rake::RDocTask.new(:rdoc) do |rdoc|
41
40
  rdoc.rdoc_dir = 'rdoc'
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.6
1
+ 0.1.7
@@ -12,65 +12,85 @@ class Muck::FriendsController < ApplicationController
12
12
  end
13
13
 
14
14
  def create
15
- respond_to do |format|
16
- if Friend.make_friends(@user, @target)
17
- friend = current_user.reload.friend_of?(@target)
18
- format.html do
19
- if GlobalConfig.enable_following
20
- flash[:notice] = t('muck.friends.you_are_now_following', :user => @target.display_name)
21
- else
22
- flash[:notice] = t('muck.friends.friend_request_sent')
23
- end
24
- redirect_to profile_path(@target)
25
- end
26
- format.js { render(:update) {|page| page.replace make_id(@user, @target), friend_link(@user, @target)}}
27
- else
28
- if GlobalConfig.enable_following
29
- message = t('muck.friends.problem_adding_follow', :user => @target.display_name)
30
- else
31
- message = t('muck.friends.problem_sending_friend_request', :user => @target.display_name)
32
- end
33
- format.html do
34
- flash[:notice] = message
35
- redirect_to profile_path(@target)
36
- end
37
- format.js {render(:update){|page| page.alert message}}
38
- end
39
- end
40
- end
15
+ success = Friend.make_friends(@user, @target)
41
16
 
42
- def destroy
43
- success = @user.drop_friend(@target)
44
- if GlobalConfig.enable_friending
17
+ if GlobalConfig.enable_following
45
18
  if success
46
- message = t('muck.friends.removed_friendship', :user => @target.display_name)
19
+ message = t('muck.friends.you_are_now_following', :user => @target.display_name)
47
20
  else
48
- message = t('muck.friends.removed_friendship_error', :user => @target.display_name)
21
+ message = t('muck.friends.problem_adding_follow', :user => @target.display_name)
49
22
  end
50
- elsif GlobalConfig.enable_following
23
+ elsif GlobalConfig.enable_friending
51
24
  if success
52
- message = t('muck.friends.stopped_following', :user => @target.display_name)
25
+ message = t('muck.friends.friend_request_sent')
53
26
  else
54
- message = t('muck.friends.removed_following_error', :user => @target.display_name)
27
+ message = t('muck.friends.problem_sending_friend_request', :user => @target.display_name)
55
28
  end
56
29
  end
30
+
57
31
  respond_to do |format|
58
- format.html do
59
- flash[:notice] = message
60
- redirect_to profile_path(@target)
61
- end
62
- format.js do
63
- if success
64
- render(:update){|page| page.replace make_id(@user, @target), friend_link(@user, @target)}
65
- else
66
- format.js {render(:update){|page| page.alert message}}
67
- end
68
- end
32
+ format.html { render_after_create_html(success, message) }
33
+ format.js { render_after_create_js(success, message) }
34
+ format.pjs { render_after_create_js(success, message) }
35
+ format.json { render :json => { :success => success, :message => message, :friend_user => @target } }
36
+ end
37
+
38
+ end
39
+
40
+ def destroy
41
+
42
+ success = true
43
+ # Other user may or may not be a friend. If they weren't then revert_to_follower will return false.
44
+ # We don't care that the other user wasn't reverted to a follower (since they might not have been a friend) so return true
45
+ @user.drop_friend(@target)
46
+ if GlobalConfig.enable_friending
47
+ message = t('muck.friends.removed_friendship', :user => @target.display_name)
48
+ elsif GlobalConfig.enable_following
49
+ message = t('muck.friends.stopped_following', :user => @target.display_name)
50
+ end
51
+
52
+ # if GlobalConfig.enable_friending
53
+ # message = t('muck.friends.removed_friendship_error', :user => @target.display_name)
54
+ # elsif GlobalConfig.enable_following
55
+ # message = t('muck.friends.removed_following_error', :user => @target.display_name)
56
+ # end
57
+
58
+ respond_to do |format|
59
+ format.html { render_after_destroy_html(success, message) }
60
+ format.js { render_after_destroy_js(success, message) }
61
+ format.pjs { render_after_destroy_js(success, message) }
62
+ format.json { render :json => { :success => success, :message => message } }
69
63
  end
70
64
  end
71
65
 
72
66
  protected
73
67
 
68
+ def render_after_create_html(success, message)
69
+ flash[:notice] = message
70
+ redirect_to profile_path(@target)
71
+ end
72
+
73
+ def render_after_create_js(success, message)
74
+ if success
75
+ render(:update){|page| page.replace make_id(@user, @target), friend_link(@user, @target)}
76
+ else
77
+ render(:update){|page| page.alert message}
78
+ end
79
+ end
80
+
81
+ def render_after_destroy_html(success, message)
82
+ flash[:notice] = message
83
+ redirect_to profile_path(@target)
84
+ end
85
+
86
+ def render_after_destroy_js(success, message)
87
+ if success
88
+ render(:update){|page| page.replace make_id(@user, @target), friend_link(@user, @target)}
89
+ else
90
+ render(:update){|page| page.alert message}
91
+ end
92
+ end
93
+
74
94
  def make_id(user, target)
75
95
  user.dom_id(target.dom_id + '_friendship_')
76
96
  end
@@ -138,10 +138,10 @@ module MuckFriendsHelper
138
138
 
139
139
  # Handles render friend partials
140
140
  def render_friends(users, partial, no_friends_content)
141
- if users
141
+ if users.length > 0
142
142
  render :partial => "friends/#{partial}", :collection => users
143
143
  else
144
- if no_friends_content.length > 0
144
+ if no_friends_content.length > 0 # Do this so that a user can pass ' ' to get a blank string output
145
145
  no_friends_content
146
146
  else
147
147
  "<p class=\"no_friends_found\">#{no_friends_content}</p>"
@@ -20,6 +20,7 @@ class FriendMailer < ActionMailer::Base
20
20
  recipients email
21
21
  from "#{GlobalConfig.from_email_name} <#{GlobalConfig.from_email}>"
22
22
  sent_on Time.now
23
+ content_type "text/html" # There is a bug in Rails that prevents multipart emails from working inside an engine. See: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2263-rails-232-breaks-implicit-multipart-actionmailer-tests#ticket-2263-22
23
24
  end
24
25
 
25
26
  end
@@ -1 +1 @@
1
- <%= icon friend_simple %>
1
+ <%= icon friend_icon %>
@@ -0,0 +1 @@
1
+ <%= icon(friend_tiny_icon, :tiny) %>
@@ -28,7 +28,7 @@ module ActiveRecord
28
28
  return false if inviter.blank? || invited.blank? || inviter == invited
29
29
  success = false
30
30
  transaction do
31
- friend = Friend.create(:inviter => inviter, :invited => invited, :status => MuckFriends::PENDING)
31
+ friend = Friend.create(:inviter => inviter, :invited => invited, :status => MuckFriends::FOLLOWING)
32
32
  friend.add_follow_activity
33
33
  success = !friend.new_record?
34
34
  end
@@ -40,8 +40,8 @@ module ActiveRecord
40
40
  return false if user.blank? || target.blank? || user == target
41
41
  transaction do
42
42
  begin
43
- Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id, :status => MuckFriends::PENDING}).update_attribute(:status, MuckFriends::ACCEPTED)
44
- friend = Friend.create!(:inviter_id => target.id, :invited_id => user.id, :status => MuckFriends::ACCEPTED)
43
+ Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id, :status => MuckFriends::FOLLOWING}).update_attribute(:status, MuckFriends::FRIENDING)
44
+ friend = Friend.create!(:inviter_id => target.id, :invited_id => user.id, :status => MuckFriends::FRIENDING)
45
45
  friend.add_friends_with_activity
46
46
  rescue Exception
47
47
  return make_friends(target, user) if user.followed_by?(target)
@@ -67,33 +67,43 @@ module ActiveRecord
67
67
  def revert_to_follower(user, target)
68
68
  return false if user.blank? || target.blank?
69
69
  transaction do
70
- Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id}).destroy
70
+ friend = Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id})
71
+ friend.destroy if friend
71
72
  friend = Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id})
72
- return friend.update_attribute(:status, MuckFriends::PENDING) if friend
73
+ if friend
74
+ return friend.update_attribute(:status, MuckFriends::FOLLOWING)
75
+ else
76
+ return false
77
+ end
73
78
  end
74
- true
75
79
  end
76
80
 
81
+ # User stops following target
77
82
  def stop_following(user, target)
78
83
  return false if user.blank? || target.blank?
79
- Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id}).destroy
80
- end
81
-
82
- def block_user(user, target)
83
- return false if user.blank? || target.blank?
84
- Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id}).update_attribute(:status, MuckFriends::BLOCKED)
85
84
  friend = Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id})
86
85
  if friend
87
86
  friend.destroy
88
87
  else
89
- true
88
+ false
90
89
  end
91
90
  end
92
91
 
92
+ def block_user(user, target)
93
+ return false if user.blank? || target.blank?
94
+ friend = Friend.find(:first, :conditions => {:inviter_id => user.id, :invited_id => target.id})
95
+ friend.destroy if friend
96
+ Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id}).update_attribute(:status, MuckFriends::BLOCKED)
97
+ end
98
+
93
99
  def unblock_user(user, target)
94
100
  return false if user.blank? || target.blank?
95
101
  friend = Friend.find(:first, :conditions => {:inviter_id => target.id, :invited_id => user.id})
96
- friend.update_attribute(:status, MuckFriends::PENDING) if friend
102
+ if friend
103
+ friend.update_attribute(:status, MuckFriends::FOLLOWING)
104
+ else
105
+ false
106
+ end
97
107
  end
98
108
 
99
109
  def has_network?(user)
@@ -10,9 +10,9 @@ module ActiveRecord
10
10
 
11
11
  def acts_as_muck_friend_user(options = {})
12
12
 
13
- has_many :friendships, :class_name => "Friend", :foreign_key => 'inviter_id', :conditions => "status = #{MuckFriends::ACCEPTED}", :dependent => :destroy
14
- has_many :follower_friends, :class_name => "Friend", :foreign_key => "invited_id", :conditions => "status = #{MuckFriends::PENDING}", :dependent => :destroy
15
- has_many :following_friends, :class_name => "Friend", :foreign_key => "inviter_id", :conditions => "status = #{MuckFriends::PENDING}", :dependent => :destroy
13
+ has_many :friendships, :class_name => "Friend", :foreign_key => 'inviter_id', :conditions => "status = #{MuckFriends::FRIENDING}", :dependent => :destroy
14
+ has_many :follower_friends, :class_name => "Friend", :foreign_key => "invited_id", :conditions => "status = #{MuckFriends::FOLLOWING}", :dependent => :destroy
15
+ has_many :following_friends, :class_name => "Friend", :foreign_key => "inviter_id", :conditions => "status = #{MuckFriends::FOLLOWING}", :dependent => :destroy
16
16
  has_many :blocked_friends, :class_name => "Friend", :foreign_key => "invited_id", :conditions => "status = #{MuckFriends::BLOCKED}", :dependent => :destroy
17
17
 
18
18
  has_many :friends, :through => :friendships, :source => :invited
@@ -68,8 +68,7 @@ module ActiveRecord
68
68
  end
69
69
 
70
70
  # Call to remove friend or follower. If following is enabled
71
- # the user specified by 'user' will become a follower of
72
- # self.
71
+ # the user specified by 'user' will become a follower of self.
73
72
  def drop_friend(user)
74
73
  if GlobalConfig.enable_following
75
74
  Friend.revert_to_follower(self, user)
data/lib/muck_friends.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  module MuckFriends
2
2
  # Statuses Array
3
3
  BLOCKED = 2
4
- ACCEPTED = 1
5
- PENDING = 0
4
+ FRIENDING = 1
5
+ FOLLOWING = 0
6
6
  end
7
7
 
8
8
  ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckFriend }
data/locales/ar.yml CHANGED
@@ -5,32 +5,40 @@ ar:
5
5
  follow: أتباع
6
6
  friends_with: أصدقاء
7
7
  friends:
8
- acccept_friend_request: "قبول طلب صديق"
8
+ acccept_friend_request: "قبول طلب من صديق {{user}}"
9
9
  accept: (قبول)
10
10
  delete: (حذف)
11
11
  follow_activity: "{{inviter}} is now following {{invited}}"
12
12
  followers: أتباع
13
13
  following: تال
14
14
  following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "طلب صديق"
15
+ friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
16
  friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
17
  friend_request_pending: "طلب صديق في انتظار {{link}}"
18
+ friend_request_prompt: "ارسال طلب {{user}}صديق"
18
19
  friend_request_sent: "تم إرسال طلب صديق"
19
20
  friends: أصدقاء
20
21
  friends_title: أصدقائي
21
22
  friends_with: "{{inviter}} is now friends with {{invited}}"
22
23
  ignore: (تجاهل)
24
+ login: "تسجيل الدخول"
25
+ login_or_sign_up_to_follow: "{{login}} or {{signup}}لمتابعة هذا المستخدم"
26
+ login_or_sign_up_to_friend: "{{login}} or {{signup}}إرسال طلبات الأصدقاء"
23
27
  mutual_friends: "تبادل الأصدقاء"
24
- no_followers: "أنت ليست لديها حاليا أي أتباع"
28
+ no_followers: "لا أتباع"
25
29
  no_friends: "أنت ليست لديها حاليا أي الأصدقاء"
26
- not_following_anyone: "انك لم تتابع حاليا أحدا"
30
+ no_mutual_friends: "لا أصدقاء للطرفين ، وجدت"
31
+ not_following_anyone: "لا وبعد كل"
27
32
  problem_adding_follow: "هناك مشكلة واضاف {{user}}لمتابعة القائمة الخاصة بك. يرجى المحاولة مرة أخرى."
28
33
  problem_sending_friend_request: "هناك مشكلة في ارسال طلب لصديق {{user}}. يرجى المحاولة مرة أخرى."
29
- removed_friendship: "إزالة العلاقة صديق"
34
+ removed_following_error: "وثمة مشكلة وقعت بينما كان يحاول فولو غير {{user}}"
35
+ removed_friendship: "إزالة {{user}}من أصدقائك"
36
+ removed_friendship_error: "هناك مشكلة في إزالة {{user}}من قائمة الأصدقاء"
30
37
  same_inviter_error_message: "المستخدم لا يمكن أن يصبح صديقا لذاتهما."
31
- sign_up_to_follow: "تسجيل الدخول لمتابعة"
32
- start_following: "وبعد بدء"
33
- stop_being_friends: "الكف عن أصدقاء"
34
- stop_following: "وبعد توقف"
38
+ signup: الاشتراك
39
+ start_following: "يتبع {{user}}"
40
+ stop_being_friends_with: "العدو {{user}}"
41
+ stop_following: "وبعد توقف {{user}}"
42
+ stopped_following: "بنجاح بعد توقف {{user}}"
35
43
  view_all: "وبالنظر إلى جميع"
36
44
  you_are_now_following: "أنت الآن بعد {{user}}"
data/locales/bg.yml CHANGED
@@ -5,32 +5,40 @@ bg:
5
5
  follow: Последователи
6
6
  friends_with: Приятели
7
7
  friends:
8
- acccept_friend_request: "Приеми приятел Запитване"
8
+ acccept_friend_request: "Приеми приятел искане от {{user}}"
9
9
  accept: (приеме)
10
10
  delete: (изтриване)
11
11
  follow_activity: "{{inviter}} is now following {{invited}}"
12
12
  followers: Последователи
13
13
  following: Следващ
14
14
  following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "Приятел Запитване"
15
+ friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
16
  friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
17
  friend_request_pending: "Приятел запитване до {{link}}"
18
+ friend_request_prompt: "Изпрати на приятел {{user}} Запитване"
18
19
  friend_request_sent: "Приятел Искане Изпратени"
19
20
  friends: Приятели
20
21
  friends_title: "Моите приятели"
21
22
  friends_with: "{{inviter}} is now friends with {{invited}}"
22
23
  ignore: (пренебрегни)
24
+ login: влизам
25
+ login_or_sign_up_to_follow: "{{login}} or {{signup}} Да следват този потребител"
26
+ login_or_sign_up_to_friend: "{{login}} or {{signup}} Да изпратят молби за приятелство"
23
27
  mutual_friends: "Общи приятели"
24
- no_followers: "Не е в момента имате някакви последователите"
25
- no_friends: "Не Понастоящем приятели"
26
- not_following_anyone: "Вие сте в момента не след никого"
28
+ no_followers: "Не последователите"
29
+ no_friends: "Вие в момента не са никакви приятели"
30
+ no_mutual_friends: "Не намери общи приятели"
31
+ not_following_anyone: "Не След Всеки"
27
32
  problem_adding_follow: "Имаше проблем при добавянето {{user}} да ви следват списък. Моля опитайте отново."
28
33
  problem_sending_friend_request: "Имаше проблем при изпращането на молба за приятелство с {{user}}. Моля опитайте отново."
29
- removed_friendship: "Премахнато приятел отношения"
34
+ removed_following_error: "Актуален проблем се наблюдава, докато се опитва да unfollow {{user}}"
35
+ removed_friendship: "Премахнато {{user}} от приятелите си"
36
+ removed_friendship_error: "Имаше проблем при премахването {{user}} от своя списък с приятели"
30
37
  same_inviter_error_message: "Потребителят може да не станат приятели с themself."
31
- sign_up_to_follow: "Sign-до Следвайте"
32
- start_following: "Започнете След"
33
- stop_being_friends: "Спри приятелство"
34
- stop_following: "Спри След"
38
+ signup: логване
39
+ start_following: "Следвайте {{user}}"
40
+ stop_being_friends_with: "Unfriend {{user}}"
41
+ stop_following: "Спри След {{user}}"
42
+ stopped_following: "Успешно е спряна след {{user}}"
35
43
  view_all: "View All"
36
44
  you_are_now_following: "Сега след {{user}}"
data/locales/ca.yml CHANGED
@@ -5,32 +5,40 @@ ca:
5
5
  follow: Seguidors
6
6
  friends_with: Amics
7
7
  friends:
8
- acccept_friend_request: "Acceptar la sol licitud d&#39;amistat"
8
+ acccept_friend_request: "D&#39;acceptar la sol licitud d&#39;amistat {{user}}"
9
9
  accept: (acceptar)
10
10
  delete: (eliminar)
11
11
  follow_activity: "{{inviter}} is now following {{invited}}"
12
12
  followers: Seguidors
13
13
  following: Següent
14
14
  following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "Sol licitud amic"
15
+ friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
16
  friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
17
  friend_request_pending: "A l&#39;espera de sol licitud d&#39;amistat {{link}}"
18
+ friend_request_prompt: "Enviar a un amic Demana {{user}}"
18
19
  friend_request_sent: "La sol licitud s&#39;ha enviat un amic"
19
20
  friends: Amics
20
21
  friends_title: "Els meus amics"
21
22
  friends_with: "{{inviter}} is now friends with {{invited}}"
22
23
  ignore: (ignorar)
24
+ login: "inici de sessió"
25
+ login_or_sign_up_to_follow: "{{login}} or {{signup}} A aquest usuari"
26
+ login_or_sign_up_to_friend: "{{login}} or {{signup}} Per enviar sol licituds d&#39;amistat"
23
27
  mutual_friends: "Amics mutus"
24
- no_followers: "Que actualment no té cap seguidors"
28
+ no_followers: "Els seguidors no"
25
29
  no_friends: "Vostè no té actualment cap amic"
26
- not_following_anyone: "Vostè no està actualment següents a ningú"
30
+ no_mutual_friends: "No va trobar amics"
31
+ not_following_anyone: "Després no Qualsevol"
27
32
  problem_adding_follow: "Hi ha hagut un problema {{user}} afegir a la seva llista de seguiment. Torneu-ho de nou."
28
33
  problem_sending_friend_request: "Hi ha hagut un problema l&#39;enviament d&#39;una sol licitud d&#39;amistat {{user}}. Torneu-ho de nou."
29
- removed_friendship: "Esborrat relació amic"
34
+ removed_following_error: "Un problema es va produir en intentar unfollow {{user}}"
35
+ removed_friendship: "{{user}} Esborrat dels teus amics"
36
+ removed_friendship_error: "Hi ha hagut un problema {{user}} eliminar de la llista d&#39;amics"
30
37
  same_inviter_error_message: "L&#39;usuari no pot convertir-se en amics amb ell mateix."
31
- sign_up_to_follow: "Subscriu-te a seguir"
32
- start_following: "Després d&#39;iniciar"
33
- stop_being_friends: "Deixar de ser amics"
34
- stop_following: "Després de deixar de"
38
+ signup: registre
39
+ start_following: "Siga {{user}}"
40
+ stop_being_friends_with: "Unfriend {{user}}"
41
+ stop_following: "Després d&#39;aturar {{user}}"
42
+ stopped_following: "Èxit detingut després {{user}}"
35
43
  view_all: "Veure tots"
36
44
  you_are_now_following: "Ara està després {{user}}"
data/locales/cs.yml CHANGED
@@ -5,32 +5,40 @@ cs:
5
5
  follow: Následovníci
6
6
  friends_with: Kamarádi
7
7
  friends:
8
- acccept_friend_request: "Přijměte přátelství"
8
+ acccept_friend_request: "Přijměte přítele žádost {{user}}"
9
9
  accept: (přijmout)
10
10
  delete: (smazat)
11
11
  follow_activity: "{{inviter}} is now following {{invited}}"
12
12
  followers: Následovníci
13
13
  following: Následující
14
14
  following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "Zaslat příteli"
15
+ friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
16
  friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
17
  friend_request_pending: "Přátelství čeká {{link}}"
18
+ friend_request_prompt: "Poslat {{user}} přítele Žádost"
18
19
  friend_request_sent: "Zaslat příteli Posláno"
19
20
  friends: Kamarádi
20
21
  friends_title: "Moji kamarádi"
21
22
  friends_with: "{{inviter}} is now friends with {{invited}}"
22
23
  ignore: (ignorovat)
24
+ login: přihlásit
25
+ login_or_sign_up_to_follow: "{{login}} or {{signup}} Následovat tohoto uživatele"
26
+ login_or_sign_up_to_friend: "{{login}} or {{signup}} Poslat kamarádovi žádostí"
23
27
  mutual_friends: "Vzájemné Přátelé"
24
- no_followers: "Nemusíte mít v současné době žádné následovníky"
28
+ no_followers: "Ne následovníci"
25
29
  no_friends: "Nemusíte mít v současné době žádné přátele"
26
- not_following_anyone: "Ty v současné době nejsou tyto kdokoliv"
30
+ no_mutual_friends: "No nalézt společné přátele"
31
+ not_following_anyone: "Po ne Kdokoliv"
27
32
  problem_adding_follow: "Došlo k problému {{user}} přidáte do svého seznamu následovat. Prosím, zkuste to znovu."
28
33
  problem_sending_friend_request: "Došlo k problému při odesílání příteli žádost {{user}}. Prosím, zkuste to znovu."
29
- removed_friendship: "Odstraněny příteli vztah"
34
+ removed_following_error: "A problém nastal při pokusu o unfollow {{user}}"
35
+ removed_friendship: "Odstraněny {{user}} z vašich přátel"
36
+ removed_friendship_error: "Došlo k problému odstranění {{user}} z vašeho seznamu přátel"
30
37
  same_inviter_error_message: "Uživatel se nemůže stát přítelem themself."
31
- sign_up_to_follow: "Zaregistruj-až Následná"
32
- start_following: "Start Po"
33
- stop_being_friends: "Stop Být Přátelé"
34
- stop_following: "Stop Po"
38
+ signup: přihlášení
39
+ start_following: "Postupujte {{user}}"
40
+ stop_being_friends_with: "Unfriend {{user}}"
41
+ stop_following: "Stop Po {{user}}"
42
+ stopped_following: "Úspěšně zastavil po {{user}}"
35
43
  view_all: "Zobrazit vše"
36
44
  you_are_now_following: "Ty jsou nyní tyto {{user}}"