muck-friends 0.1.9 → 0.1.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. data/Rakefile +1 -0
  2. data/VERSION +1 -1
  3. data/app/controllers/muck/friends_controller.rb +40 -1
  4. data/app/helpers/muck_friends_helper.rb +17 -2
  5. data/app/views/friend_mailer/follow.text.html.erb +3 -3
  6. data/app/views/friend_mailer/follow.text.plain.erb +3 -3
  7. data/app/views/friend_mailer/friend_request.text.html.erb +3 -3
  8. data/app/views/friend_mailer/friend_request.text.plain.erb +3 -3
  9. data/lib/active_record/acts/muck_friend.rb +28 -1
  10. data/lib/active_record/acts/muck_friend_user.rb +8 -0
  11. data/locales/ar.yml +29 -24
  12. data/locales/bg.yml +27 -22
  13. data/locales/ca.yml +30 -25
  14. data/locales/cs.yml +36 -31
  15. data/locales/da.yml +25 -20
  16. data/locales/de.yml +28 -23
  17. data/locales/el.yml +31 -26
  18. data/locales/en.yml +5 -0
  19. data/locales/es.yml +31 -26
  20. data/locales/et.yml +33 -28
  21. data/locales/fa.yml +27 -22
  22. data/locales/fi.yml +31 -26
  23. data/locales/fr.yml +26 -21
  24. data/locales/gl.yml +36 -31
  25. data/locales/hi.yml +30 -25
  26. data/locales/hr.yml +33 -28
  27. data/locales/hu.yml +32 -27
  28. data/locales/id.yml +34 -29
  29. data/locales/it.yml +32 -27
  30. data/locales/iw.yml +29 -24
  31. data/locales/ja.yml +33 -28
  32. data/locales/ko.yml +29 -24
  33. data/locales/lt.yml +28 -23
  34. data/locales/lv.yml +32 -27
  35. data/locales/mt.yml +27 -22
  36. data/locales/nl.yml +28 -23
  37. data/locales/no.yml +29 -24
  38. data/locales/pl.yml +35 -30
  39. data/locales/pt-PT.yml +31 -26
  40. data/locales/ro.yml +32 -27
  41. data/locales/ru.yml +29 -24
  42. data/locales/sk.yml +36 -31
  43. data/locales/sl.yml +34 -29
  44. data/locales/sq.yml +30 -25
  45. data/locales/sr.yml +34 -29
  46. data/locales/sv.yml +33 -28
  47. data/locales/th.yml +35 -30
  48. data/locales/tl.yml +32 -27
  49. data/locales/tr.yml +29 -24
  50. data/locales/uk.yml +30 -25
  51. data/locales/vi.yml +29 -24
  52. data/locales/zh-CN.yml +27 -22
  53. data/locales/zh-TW.yml +26 -21
  54. data/locales/zh.yml +27 -22
  55. data/muck-friends.gemspec +5 -6
  56. data/test/rails_root/app/views/default/block_user_link.html.erb +1 -0
  57. data/test/rails_root/test/functional/default_controller_test.rb +43 -0
  58. data/test/rails_root/test/functional/friends_controller_test.rb +34 -1
  59. data/test/rails_root/test/unit/friend_test.rb +7 -0
  60. data/test/rails_root/test/unit/user_test.rb +14 -4
  61. metadata +7 -5
  62. data/locales/pt.yml +0 -6
data/locales/tl.yml CHANGED
@@ -2,43 +2,48 @@
2
2
  tl:
3
3
  muck:
4
4
  activity_templates:
5
- follow: Mga
5
+ follow: "Mga tagasunod"
6
6
  friends_with: "Mga kaibigan"
7
7
  friends:
8
- acccept_friend_request: "Tanggapin Kaibigan Kahilingan Mula {{user}}"
8
+ acccept_friend_request: "Tanggapin Friend Request Mula {{user}}"
9
9
  accept: (tanggapin)
10
+ block: "Block {{user}}"
11
+ block_problem: "Mayroong mali sa pagharang ng {{user}}"
12
+ blocked: "Blocked {{user}}"
10
13
  delete: (tanggalin)
11
- follow_activity: "{{inviter}} is now following {{invited}}"
12
- followers: Mga
14
+ follow_activity: "{{inviter}} Na ngayon ang mga sumusunod na {{invited}}"
15
+ followers: "Mga tagasunod"
13
16
  following: Sumusunod
14
- following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
- friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
+ following_you: "{{name}} Na ngayon ang mga sumusunod na kayo sa {{application_name}}"
18
+ friend_request: "{{name}} Ay nagpadala sa inyo ng friend request sa {{application_name}}"
19
+ friend_request_links: "{{profile}} Nagpadala sa inyo ng friend request {{accept}} {{ignore}}"
17
20
  friend_request_pending: "Friend request pending {{link}}"
18
21
  friend_request_prompt: "Magpadala ng {{user}} isang Kaibigan Kahilingan"
19
- friend_request_sent: "Kaibigan Naipadalang Kahilingan"
22
+ friend_request_sent: "Friend Naipadalang Kahilingan"
20
23
  friends: "Mga kaibigan"
21
- friends_title: "Aking Kaibigan"
22
- friends_with: "{{inviter}} is now friends with {{invited}}"
23
- ignore: "(huwag pansinin)"
24
+ friends_title: "Aking mga kaibigan"
25
+ friends_with: "{{inviter}} Na ngayon ang mga kaibigan na may {{invited}}"
26
+ ignore: (pansinin)
24
27
  login: login
25
- login_or_sign_up_to_follow: "{{login}} or {{signup}} Na sundin ang user na ito"
26
- login_or_sign_up_to_friend: "{{login}} or {{signup}} Na magpadala ng mga kahilingan ng kaibigan"
27
- mutual_friends: "Mutual Kaibigan"
28
- no_followers: "Walang mga"
29
- no_friends: "Ikaw ay hindi kasalukuyan ay may anumang mga kaibigan"
30
- no_mutual_friends: "Walang nahanap na mga kaibigan ng isa sa isa"
31
- not_following_anyone: "Hindi Kasunod ng sinuman"
32
- problem_adding_follow: "Nagkaroon ng problema sa pagdagdag ng {{user}} sa iyong sundin listahan. Mangyaring subukan ulit."
33
- problem_sending_friend_request: "Nagkaroon ng problema sa pagpapadala ng isang kaibigan kahilingan sa {{user}}. Mangyaring subukan ulit."
34
- removed_following_error: "Ang isang problema naganap habang sinusubukang unfollow {{user}}"
28
+ login_or_sign_up_to_follow: "{{login}} O {{signup}} na sundin ang user na ito"
29
+ login_or_sign_up_to_friend: "{{login}} O {{signup}} na magpadala ng mga friend requests"
30
+ mutual_friends: "Mutual Friends"
31
+ no_followers: "Walang Followers"
32
+ no_friends: "Walang mga kaibigan"
33
+ no_mutual_friends: "Walang mga kapwa kaibigan natagpuan"
34
+ not_following_anyone: "Hindi pagsunod sa kahit sino"
35
+ problem_adding_follow: "Nagkaroon ng problema sa pagdagdag ng {{user}} sa iyong sundin ang listahan. Mangyaring subukan ulit."
36
+ problem_sending_friend_request: "Nagkaroon ng problema sa pagpapadala ng isang friend request sa {{user}}. Mangyaring subukan ulit."
37
+ removed_following_error: "Problema sa isang naganap habang sinusubukang unfollow {{user}}"
35
38
  removed_friendship: "Tinanggal {{user}} mula sa iyong mga kaibigan"
36
- removed_friendship_error: "Nagkaroon ng problema sa pagtatanggal ng {{user}} mula sa iyong listahan ng mga kaibigan"
37
- same_inviter_error_message: "User ay maaaring hindi maging mga kaibigan na may themself."
38
- signup: signup
39
+ removed_friendship_error: "Nagkaroon ng problema sa pag-alis {{user}} mula sa iyong listahan ng mga kaibigan"
40
+ same_inviter_error_message: "User hindi maaaring maging mga kaibigan na may themself."
41
+ signup: pagpapalista
39
42
  start_following: "Sundin {{user}}"
40
43
  stop_being_friends_with: "Unfriend {{user}}"
41
- stop_following: "Itigil Kasunod ng {{user}}"
44
+ stop_following: "Ihinto ang pagsunod sa {{user}}"
42
45
  stopped_following: "Matagumpay na tumigil sa mga sumusunod na {{user}}"
43
- view_all: "Tingnan ang lahat ng"
44
- you_are_now_following: "Kayo ngayon ay sumusunod {{user}}"
46
+ unblock: "Huwag hadlangan si {{user}}"
47
+ unblocked: "I-unblock ng {{user}}"
48
+ view_all: "Tingnan ang lahat ng mga"
49
+ you_are_now_following: "Ngayon Ikaw ay sumusunod {{user}}"
data/locales/tr.yml CHANGED
@@ -2,43 +2,48 @@
2
2
  tr:
3
3
  muck:
4
4
  activity_templates:
5
- follow: Taraftar
5
+ follow: Takipçileri
6
6
  friends_with: Arkadaşlar
7
7
  friends:
8
- acccept_friend_request: "Kabul Arkadaşına İstek {{user}} Gönderen"
8
+ acccept_friend_request: "Kabul Friend Request {{user}} Gönderen"
9
9
  accept: "() kabul"
10
+ block: "Blok {{user}}"
11
+ block_problem: "Bir hata {{user}} bloke edildi"
12
+ blocked: "Bloke {{user}}"
10
13
  delete: (sil)
11
- follow_activity: "{{inviter}} is now following {{invited}}"
12
- followers: Taraftar
14
+ follow_activity: "{{inviter}} Şimdi {{invited}} şudur"
15
+ followers: Takipçileri
13
16
  following: Sonraki
14
- following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
- friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
- friend_request_pending: "Arkadaş isteğini bekleyen {{link}}"
17
+ following_you: "{{name}} Şimdi {{application_name}} sizi takip eden"
18
+ friend_request: "{{name}} Size {{application_name}} bir arkadaş isteği gönderdi"
19
+ friend_request_links: "{{profile}} Size {{accept}} {{ignore}} bir arkadaş isteği gönderdi"
20
+ friend_request_pending: "Friend request bekleyen {{link}}"
18
21
  friend_request_prompt: "Arkadaşına Gönder İstek {{user}}"
19
- friend_request_sent: "Arkadaş isteği gönderdi"
22
+ friend_request_sent: "Arkadaşıma İstek Gönderildi"
20
23
  friends: Arkadaşlar
21
24
  friends_title: Arkadaşlar
22
- friends_with: "{{inviter}} is now friends with {{invited}}"
23
- ignore: "() yok saymak"
25
+ friends_with: "{{inviter}} Is now {{invited}} ile arkadaş"
26
+ ignore: "() ignore"
24
27
  login: "oturum açmak"
25
- login_or_sign_up_to_follow: "Bu kullanıcı takip {{login}} or {{signup}}"
26
- login_or_sign_up_to_friend: "Arkadaş istekleri göndermek için {{login}} or {{signup}}"
28
+ login_or_sign_up_to_follow: "{{login}} Veya {{signup}} bu kullanıcı takip"
29
+ login_or_sign_up_to_friend: "{{login}} Veya {{signup}} arkadaş istekleri göndermek için"
27
30
  mutual_friends: "Karşılıklı Arkadaşlar"
28
- no_followers: "Hayır taraftar"
29
- no_friends: "Şu anda herhangi bir arkadaş yok"
31
+ no_followers: "No Followers"
32
+ no_friends: "No friends"
30
33
  no_mutual_friends: "Hayır ortak arkadaşlarımız bulundu"
31
- not_following_anyone: "Değil herkes sonrasında"
32
- problem_adding_follow: "Bir sorun listesini izleyin sizin için {{user}} eklenmesi oldu. Lütfen tekrar deneyin."
33
- problem_sending_friend_request: "Bir sorun {{user}}. Bir arkadaşa talepte oldu Lütfen tekrar deneyin."
34
- removed_following_error: "Süre {{user}} unfollow çalıştığınız bir sorun oluştu"
35
- removed_friendship: "Arkadaşlarınızdan {{user}} Kaldırıldı"
36
- removed_friendship_error: "Bir sorun Arkadaş listenizden {{user}} çıkarmadan oldu"
37
- same_inviter_error_message: "Kullanıcı kendilerini arkadaş olamaz."
34
+ not_following_anyone: "Kimsenin ardından"
35
+ problem_adding_follow: "Bir sorun listesini izleyin için {{user}} ekleme oldu. Lütfen tekrar deneyin."
36
+ problem_sending_friend_request: "Bir sorun {{user}}. için bir arkadaş isteği gönderilirken Lütfen tekrar deneyin."
37
+ removed_following_error: "Süre {{user}} unfollow çalışırken bir sorun oluştu"
38
+ removed_friendship: "Arkadaşlarınızdan {{user}} kaldırıldı"
39
+ removed_friendship_error: "Bir sorun Arkadaş listenizden {{user}} izale oldu"
40
+ same_inviter_error_message: "Kullanıcı kendilerini dost olamaz."
38
41
  signup: kayıt
39
42
  start_following: "{{user}} Izleyin"
40
43
  stop_being_friends_with: "Unfriend {{user}}"
41
44
  stop_following: "Aşağıdaki {{user}} Dur"
42
- stopped_following: "Başarıyla {{user}} aşağıdaki durduruldu"
45
+ stopped_following: "Başarıyla {{user}} aşağıdaki durdu"
46
+ unblock: "Unblock {{user}}"
47
+ unblocked: "Unblocked {{user}}"
43
48
  view_all: Tüm
44
- you_are_now_following: "Artık {{user}} aşağıdadır"
49
+ you_are_now_following: "Şimdi {{user}} şunlardır"
data/locales/uk.yml CHANGED
@@ -7,38 +7,43 @@ uk:
7
7
  friends:
8
8
  acccept_friend_request: "Прийняти пропозицію дружби від {{user}}"
9
9
  accept: (прийняти)
10
+ block: "Блок {{user}}"
11
+ block_problem: "Був помилка блокує {{user}}"
12
+ blocked: "Заблоковані {{user}}"
10
13
  delete: (видалення)
11
- follow_activity: "{{inviter}} is now following {{invited}}"
14
+ follow_activity: "{{inviter}} Тепер наступні {{invited}}"
12
15
  followers: Послідовники
13
- following: Наступне
14
- following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
- friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
- friend_request_pending: "Інший запит до {{link}}"
16
+ following: Наступний
17
+ following_you: "{{name}} Тепер вас на наступний {{application_name}}"
18
+ friend_request: "{{name}} Прислав Вам запит про дружбу на {{application_name}}"
19
+ friend_request_links: "{{profile}} Послав Вам запит про дружбу {{accept}} {{ignore}}"
20
+ friend_request_pending: "Друг прохання до {{link}}"
18
21
  friend_request_prompt: "Відправити {{user}} запит про дружбу"
19
- friend_request_sent: "Інший Запит надіслано"
22
+ friend_request_sent: "Друг Запит надіслано"
20
23
  friends: Друзі
21
24
  friends_title: "Мої друзі"
22
- friends_with: "{{inviter}} is now friends with {{invited}}"
25
+ friends_with: "{{inviter}} Тепер друзі з {{invited}}"
23
26
  ignore: (ігнорувати)
24
- login: вхід
25
- login_or_sign_up_to_follow: "{{login}} or {{signup}} Послідувати цьому користувачу"
26
- login_or_sign_up_to_friend: "{{login}} or {{signup}} Відіслати другові запити"
27
- mutual_friends: "Спільні друзі"
27
+ login: Увійти
28
+ login_or_sign_up_to_follow: "{{login}} Або {{signup}} послідувати цьому користувачу"
29
+ login_or_sign_up_to_friend: "{{login}} Або {{signup}} направити запити про дружбу"
30
+ mutual_friends: "Взаємні друзі"
28
31
  no_followers: "Ні Послідовники"
29
- no_friends: "Ви в даний час не мають яких-небудь друзі"
30
- no_mutual_friends: "Немає спільних друзів знайти"
31
- not_following_anyone: "Будь-яка особа, не варто"
32
- problem_adding_follow: "Був проблему додавши {{user}} вашої наступної списку. Будь ласка, спробуйте ще раз."
33
- problem_sending_friend_request: "Був проблема відправлення одного з проханням до {{user}}. Будь ласка, спробуйте ще раз."
34
- removed_following_error: "А проблема виникла при спробі unfollow {{user}}"
35
- removed_friendship: "Вилучено {{user}} від ваших друзів"
36
- removed_friendship_error: "Був проблема видалення {{user}} зі списку друзів"
37
- same_inviter_error_message: "Користувач не може дружити з себе."
38
- signup: Signup
39
- start_following: "Наступні {{user}}"
32
+ no_friends: "Немає друзів"
33
+ no_mutual_friends: "Ні спільних друзів знайшов"
34
+ not_following_anyone: "Не слід Будь-яке"
35
+ problem_adding_follow: "Був проблема {{user}} додавання до вашого стежити список. Будь ласка, спробуйте ще раз."
36
+ problem_sending_friend_request: "Був проблема з поданням другого запиту {{user}}. Будь ласка, спробуйте ще раз."
37
+ removed_following_error: "Виникла проблема при спробі unfollow {{user}}"
38
+ removed_friendship: "Вилучений {{user}} від ваших друзів"
39
+ removed_friendship_error: "Був {{user}} проблема видалення зі списку друзів"
40
+ same_inviter_error_message: "Користувач не може дружити з themself."
41
+ signup: Реєстрація
42
+ start_following: "Подальшою {{user}}"
40
43
  stop_being_friends_with: "Unfriend {{user}}"
41
44
  stop_following: "Зупинка Після {{user}}"
42
- stopped_following: "Успішно зупинені наступні {{user}}"
43
- view_all: "Переглянути всі"
45
+ stopped_following: "Успішне зупинили наступні {{user}}"
46
+ unblock: "Розблокувати {{user}}"
47
+ unblocked: "Розблоковані {{user}}"
48
+ view_all: "Дивитися всі"
44
49
  you_are_now_following: "Тепер наступний {{user}}"
data/locales/vi.yml CHANGED
@@ -2,43 +2,48 @@
2
2
  vi:
3
3
  muck:
4
4
  activity_templates:
5
- follow: Những
5
+ follow: Followers
6
6
  friends_with: "Bạn bè"
7
7
  friends:
8
8
  acccept_friend_request: "Chấp nhận yêu cầu từ bạn bè {{user}}"
9
9
  accept: "(chấp nhận)"
10
+ block: "Khối {{user}}"
11
+ block_problem: "Có một lỗi chặn {{user}}"
12
+ blocked: "Bị chặn {{user}}"
10
13
  delete: (xóa)
11
- follow_activity: "{{inviter}} is now following {{invited}}"
12
- followers: Những
14
+ follow_activity: "{{inviter}} Bây giờ sau {{invited}}"
15
+ followers: Followers
13
16
  following: Sau
14
- following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
- friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
- friend_request_pending: "Bạn đang chờ giải quyết yêu cầu {{link}}"
18
- friend_request_prompt: "Gửi {{user}} một người bạn Yêu cầu"
17
+ following_you: "{{name}} Bây giờ sau bạn vào {{application_name}}"
18
+ friend_request: "{{name}} Đã gửi cho bạn một yêu cầu kết bạn trên {{application_name}}"
19
+ friend_request_links: "{{profile}} Gửi cho bạn một yêu cầu kết bạn {{accept}} {{ignore}}"
20
+ friend_request_pending: "Người bạn yêu cầu đang chờ {{link}}"
21
+ friend_request_prompt: "Gửi một Yêu cầu {{user}} bạn "
19
22
  friend_request_sent: "Yêu cầu người bạn đã gửi"
20
23
  friends: "Bạn bè"
21
- friends_title: "Bạn bè của tôi"
22
- friends_with: "{{inviter}} is now friends with {{invited}}"
24
+ friends_title: "My Friends"
25
+ friends_with: "{{inviter}} Bây giờ bạn bè với {{invited}}"
23
26
  ignore: "(bỏ qua)"
24
27
  login: "đăng nhập"
25
- login_or_sign_up_to_follow: "{{login}} or {{signup}} Theo người dùng này"
26
- login_or_sign_up_to_friend: "{{login}} or {{signup}} Để gửi yêu cầu kết bạn"
27
- mutual_friends: "Cùng bạn bè"
28
- no_followers: "Không những"
29
- no_friends: "Bạn hiện tại không bất cứ bạn bè"
30
- no_mutual_friends: "Không có bạn bè chung được tìm thấy"
31
- not_following_anyone: "Bất cứ ai không Sau"
32
- problem_adding_follow: "Có một vấn đề khi thêm {{user}} của bạn hãy thực hiện theo danh sách. Xin vui lòng thử lại."
33
- problem_sending_friend_request: "Có một vấn đề khi gửi một yêu cầu kết bạn để {{user}}. Xin vui lòng thử lại."
28
+ login_or_sign_up_to_follow: "{{login}} Hoặc {{signup}} làm theo người dùng này"
29
+ login_or_sign_up_to_friend: "{{login}} Hoặc {{signup}} để gửi yêu cầu kết bạn"
30
+ mutual_friends: "Mutual Friends"
31
+ no_followers: "Không theo tôi"
32
+ no_friends: "Không có bạn bè"
33
+ no_mutual_friends: "Không có bạn bè chung hàng"
34
+ not_following_anyone: "Bất cứ ai cũng không Sau"
35
+ problem_adding_follow: "Có vấn đề thêm {{user}} để bạn thực hiện theo danh sách. Hãy thử lại."
36
+ problem_sending_friend_request: "Có vấn đề gửi một yêu cầu kết bạn để {{user}}. Hãy thử lại."
34
37
  removed_following_error: "Một vấn đề xảy ra trong khi đang cố gắng unfollow {{user}}"
35
- removed_friendship: "Xoá {{user}} từ bạn bè của bạn"
36
- removed_friendship_error: "Có một vấn đề khi gỡ bỏ {{user}} từ danh sách bạn bè của bạn"
37
- same_inviter_error_message: "Người này không thể trở thành bạn bè với themself."
38
+ removed_friendship: "Removed {{user}} từ bạn bè của bạn"
39
+ removed_friendship_error: "Có vấn đề {{user}} loại bỏ khỏi danh sách bạn bè"
40
+ same_inviter_error_message: "Người dùng không thể trở thành bạn bè với themself."
38
41
  signup: "đăng ký"
39
42
  start_following: "Làm theo {{user}}"
40
43
  stop_being_friends_with: "Unfriend {{user}}"
41
- stop_following: "Dừng Sau {{user}}"
44
+ stop_following: "Dừng {{user}} Sau"
42
45
  stopped_following: "Ngừng lại sau thành công {{user}}"
46
+ unblock: "Bỏ cấm {{user}}"
47
+ unblocked: "Cấm {{user}}"
43
48
  view_all: "Xem tất cả"
44
- you_are_now_following: "Bạn bây giờ đang theo {{user}}"
49
+ you_are_now_following: "Bạn bây giờ sau {{user}}"
data/locales/zh-CN.yml CHANGED
@@ -5,40 +5,45 @@ zh-CN:
5
5
  follow: 追随者
6
6
  friends_with: 朋友们
7
7
  friends:
8
- acccept_friend_request: "接受好友请求{{user}}"
8
+ acccept_friend_request: "接受好友请求从{{user}}"
9
9
  accept: (接受)
10
+ block: "块{{user}}"
11
+ block_problem: "有一个错误阻止{{user}}"
12
+ blocked: "封锁{{user}}"
10
13
  delete: (删除)
11
- follow_activity: "{{inviter}} is now following {{invited}}"
14
+ follow_activity: "{{inviter}}现正跟进{{invited}}"
12
15
  followers: 追随者
13
16
  following: 下列的
14
- following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
- friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
+ following_you: "{{name}}现正就{{application_name}}"
18
+ friend_request: "{{name}}向您发出交友请求的{{application_name}}"
19
+ friend_request_links: "{{profile}}向您发出交友请求{{accept}} {{ignore}}"
17
20
  friend_request_pending: "朋友的要求待{{link}}"
18
- friend_request_prompt: "发送{{user}}朋友的要求"
19
- friend_request_sent: 朋友要求传送
21
+ friend_request_prompt: "发送{{user}}好友请求"
22
+ friend_request_sent: 好友请求已发送
20
23
  friends: 朋友们
21
24
  friends_title: 我的朋友
22
- friends_with: "{{inviter}} is now friends with {{invited}}"
25
+ friends_with: "{{inviter}}现在交朋友{{invited}}"
23
26
  ignore: (忽略)
24
27
  login: 注册
25
- login_or_sign_up_to_follow: "{{login}} or {{signup}}遵循此用户"
26
- login_or_sign_up_to_friend: "{{login}} or {{signup}}发送交友请求"
28
+ login_or_sign_up_to_follow: "{{login}}{{signup}}遵循此用户"
29
+ login_or_sign_up_to_friend: "{{login}}{{signup}}发送交友请求"
27
30
  mutual_friends: 共同的朋友
28
31
  no_followers: 没有追随者
29
- no_friends: 您目前还没有任何朋友
30
- no_mutual_friends: 没有共同的朋友发现
31
- not_following_anyone: 不遵守任何人
32
- problem_adding_follow: "有问题还{{user}}到您的后续名单。请再试一次。"
33
- problem_sending_friend_request: "有问题的朋友发送请求{{user}}.请再试一次。"
34
- removed_following_error: "出现了问题,而试图unfollow {{user}}"
35
- removed_friendship: "删除{{user}}从您的朋友"
36
- removed_friendship_error: "有一个问题,消除{{user}}从您的列表中的朋友"
37
- same_inviter_error_message: "用户不能成为朋友themself 。"
32
+ no_friends: 没有朋友
33
+ no_mutual_friends: 没有共同的朋友找到
34
+ not_following_anyone: 不按任何
35
+ problem_adding_follow: "有一个问题,你的加入{{user}}遵循清单。请再试一次。"
36
+ problem_sending_friend_request: "有一个问题,一个朋友发送请求{{user}}.请再试一次。"
37
+ removed_following_error: "问题发生在试图unfollow {{user}}"
38
+ removed_friendship: "删除从您的朋友{{user}}"
39
+ removed_friendship_error: "有一个问题,清除您的朋友列表{{user}}"
40
+ same_inviter_error_message: 用户不能成为themself朋友。
38
41
  signup: 注册
39
- start_following: "后续{{user}}"
42
+ start_following: "按照{{user}}"
40
43
  stop_being_friends_with: "Unfriend {{user}}"
41
- stop_following: "不要再跟着{{user}}"
42
- stopped_following: "成功地阻止以下{{user}}"
44
+ stop_following: "停止以下{{user}}"
45
+ stopped_following: "以下{{user}},成功制止"
46
+ unblock: "解除封锁{{user}}"
47
+ unblocked: "畅通{{user}}"
43
48
  view_all: 查看全部
44
49
  you_are_now_following: "您现在以下{{user}}"
data/locales/zh-TW.yml CHANGED
@@ -5,40 +5,45 @@ zh-TW:
5
5
  follow: 追隨者
6
6
  friends_with: 朋友們
7
7
  friends:
8
- acccept_friend_request: "接受好友請求{{user}}"
8
+ acccept_friend_request: "接受好友請求從{{user}}"
9
9
  accept: (接受)
10
+ block: "塊{{user}}"
11
+ block_problem: "有一個錯誤阻止{{user}}"
12
+ blocked: "封鎖{{user}}"
10
13
  delete: (刪除)
11
- follow_activity: "{{inviter}} is now following {{invited}}"
14
+ follow_activity: "{{inviter}}現正跟進{{invited}}"
12
15
  followers: 追隨者
13
16
  following: 下列的
14
- following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
- friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
+ following_you: "{{name}}正按照您{{application_name}}"
18
+ friend_request: "{{name}}向您發出交友請求{{application_name}}"
19
+ friend_request_links: "{{profile}}向您發出交友請求{{accept}} {{ignore}}"
17
20
  friend_request_pending: "朋友的要求待{{link}}"
18
- friend_request_prompt: "發送{{user}}朋友的要求"
19
- friend_request_sent: 朋友要求傳送
21
+ friend_request_prompt: "發送{{user}}好友請求"
22
+ friend_request_sent: 好友請求已發送
20
23
  friends: 朋友們
21
24
  friends_title: 我的朋友
22
- friends_with: "{{inviter}} is now friends with {{invited}}"
25
+ friends_with: "{{inviter}}現在交朋友{{invited}}"
23
26
  ignore: (忽略)
24
27
  login: 註冊
25
- login_or_sign_up_to_follow: "{{login}} or {{signup}}遵循此用戶"
26
- login_or_sign_up_to_friend: "{{login}} or {{signup}}發送交友請求"
28
+ login_or_sign_up_to_follow: "{{login}}{{signup}}遵循此用戶"
29
+ login_or_sign_up_to_friend: "{{login}}{{signup}}發送交友請求"
27
30
  mutual_friends: 共同的朋友
28
31
  no_followers: 沒有追隨者
29
- no_friends: 您目前還沒有任何朋友
30
- no_mutual_friends: 沒有共同的朋友發現
31
- not_following_anyone: 不遵守任何人
32
- problem_adding_follow: "有問題還{{user}}到您的後續名單。請再試一次。"
33
- problem_sending_friend_request: "有問題的朋友發送請求{{user}}.請再試一次。"
34
- removed_following_error: "出現了問題,而試圖unfollow {{user}}"
32
+ no_friends: 沒有朋友
33
+ no_mutual_friends: 沒有共同的朋友找到
34
+ not_following_anyone: 不按任何
35
+ problem_adding_follow: "有一個問題,你的加入{{user}}遵循清單。請再試一次。"
36
+ problem_sending_friend_request: "有一個問題,一個朋友發送請求{{user}}.請再試一次。"
37
+ removed_following_error: "問題發生在試圖unfollow {{user}}"
35
38
  removed_friendship: "刪除{{user}}從您的朋友"
36
- removed_friendship_error: "有一個問題,消除{{user}}從您的列表中的朋友"
37
- same_inviter_error_message: "用戶不能成為朋友themself "
39
+ removed_friendship_error: "有一個問題,消除{{user}}從您的朋友列表"
40
+ same_inviter_error_message: 用戶不能成為朋友的themself。
38
41
  signup: 註冊
39
- start_following: "後續{{user}}"
42
+ start_following: "按照{{user}}"
40
43
  stop_being_friends_with: "Unfriend {{user}}"
41
- stop_following: "不要再跟著{{user}}"
42
- stopped_following: "成功地阻止以下{{user}}"
44
+ stop_following: "停止以下{{user}}"
45
+ stopped_following: "以下{{user}},成功制止"
46
+ unblock: "解除封鎖{{user}}"
47
+ unblocked: "暢通{{user}}"
43
48
  view_all: 查看全部
44
49
  you_are_now_following: "您現在以下{{user}}"
data/locales/zh.yml CHANGED
@@ -5,40 +5,45 @@ zh:
5
5
  follow: 追随者
6
6
  friends_with: 朋友们
7
7
  friends:
8
- acccept_friend_request: "接受好友请求{{user}}"
8
+ acccept_friend_request: "接受好友请求从{{user}}"
9
9
  accept: (接受)
10
+ block: "块{{user}}"
11
+ block_problem: "有一个错误阻止{{user}}"
12
+ blocked: "封锁{{user}}"
10
13
  delete: (删除)
11
- follow_activity: "{{inviter}} is now following {{invited}}"
14
+ follow_activity: "{{inviter}}现正跟进{{invited}}"
12
15
  followers: 追随者
13
16
  following: 下列的
14
- following_you: "{{name}} is now following you on {{application_name}}"
15
- friend_request: "{{name}} has sent you a friend request on {{application_name}}"
16
- friend_request_links: "{{profile}} sent you a friend request {{accept}} {{ignore}}"
17
+ following_you: "{{name}}现正就{{application_name}}"
18
+ friend_request: "{{name}}向您发出交友请求的{{application_name}}"
19
+ friend_request_links: "{{profile}}向您发出交友请求{{accept}} {{ignore}}"
17
20
  friend_request_pending: "朋友的要求待{{link}}"
18
- friend_request_prompt: "发送{{user}}朋友的要求"
19
- friend_request_sent: 朋友要求传送
21
+ friend_request_prompt: "发送{{user}}好友请求"
22
+ friend_request_sent: 好友请求已发送
20
23
  friends: 朋友们
21
24
  friends_title: 我的朋友
22
- friends_with: "{{inviter}} is now friends with {{invited}}"
25
+ friends_with: "{{inviter}}现在交朋友{{invited}}"
23
26
  ignore: (忽略)
24
27
  login: 注册
25
- login_or_sign_up_to_follow: "{{login}} or {{signup}}遵循此用户"
26
- login_or_sign_up_to_friend: "{{login}} or {{signup}}发送交友请求"
28
+ login_or_sign_up_to_follow: "{{login}}{{signup}}遵循此用户"
29
+ login_or_sign_up_to_friend: "{{login}}{{signup}}发送交友请求"
27
30
  mutual_friends: 共同的朋友
28
31
  no_followers: 没有追随者
29
- no_friends: 您目前还没有任何朋友
30
- no_mutual_friends: 没有共同的朋友发现
31
- not_following_anyone: 不遵守任何人
32
- problem_adding_follow: "有问题还{{user}}到您的后续名单。请再试一次。"
33
- problem_sending_friend_request: "有问题的朋友发送请求{{user}}.请再试一次。"
34
- removed_following_error: "出现了问题,而试图unfollow {{user}}"
35
- removed_friendship: "删除{{user}}从您的朋友"
36
- removed_friendship_error: "有一个问题,消除{{user}}从您的列表中的朋友"
37
- same_inviter_error_message: "用户不能成为朋友themself 。"
32
+ no_friends: 没有朋友
33
+ no_mutual_friends: 没有共同的朋友找到
34
+ not_following_anyone: 不按任何
35
+ problem_adding_follow: "有一个问题,你的加入{{user}}遵循清单。请再试一次。"
36
+ problem_sending_friend_request: "有一个问题,一个朋友发送请求{{user}}.请再试一次。"
37
+ removed_following_error: "问题发生在试图unfollow {{user}}"
38
+ removed_friendship: "删除从您的朋友{{user}}"
39
+ removed_friendship_error: "有一个问题,清除您的朋友列表{{user}}"
40
+ same_inviter_error_message: 用户不能成为themself朋友。
38
41
  signup: 注册
39
- start_following: "后续{{user}}"
42
+ start_following: "按照{{user}}"
40
43
  stop_being_friends_with: "Unfriend {{user}}"
41
- stop_following: "不要再跟着{{user}}"
42
- stopped_following: "成功地阻止以下{{user}}"
44
+ stop_following: "停止以下{{user}}"
45
+ stopped_following: "以下{{user}},成功制止"
46
+ unblock: "解除封锁{{user}}"
47
+ unblocked: "畅通{{user}}"
43
48
  view_all: 查看全部
44
49
  you_are_now_following: "您现在以下{{user}}"