muck-activities 0.1.19 → 0.1.20

Sign up to get free protection for your applications and to get access to all the features.
Files changed (66) hide show
  1. data/README.rdoc +5 -0
  2. data/VERSION +1 -1
  3. data/app/controllers/muck/activities_controller.rb +2 -2
  4. data/app/helpers/muck_activity_helper.rb +38 -13
  5. data/app/views/activities/_activity_feed.html.erb +2 -6
  6. data/app/views/activities/_activity_scripts.html.erb +5 -0
  7. data/app/views/activities/_cached_activities.html.erb +2 -3
  8. data/app/views/activities/_contribute.html.erb +22 -0
  9. data/app/views/activity_templates/_generic.html.erb +1 -1
  10. data/db/migrate/20090818204527_add_activity_indexes.rb +9 -0
  11. data/db/migrate/20090819030523_add_attachable_to_activities.rb +13 -0
  12. data/lib/active_record/acts/muck_activity.rb +4 -0
  13. data/lib/muck_activities/muck_activity_sources.rb +7 -2
  14. data/locales/ar.yml +15 -11
  15. data/locales/bg.yml +17 -13
  16. data/locales/ca.yml +18 -14
  17. data/locales/cs.yml +16 -12
  18. data/locales/da.yml +12 -8
  19. data/locales/de.yml +17 -13
  20. data/locales/el.yml +15 -11
  21. data/locales/en.yml +4 -0
  22. data/locales/es.yml +15 -11
  23. data/locales/et.yml +17 -13
  24. data/locales/fa.yml +17 -13
  25. data/locales/fi.yml +19 -15
  26. data/locales/fr.yml +15 -11
  27. data/locales/gl.yml +21 -17
  28. data/locales/hi.yml +11 -7
  29. data/locales/hr.yml +15 -11
  30. data/locales/hu.yml +18 -14
  31. data/locales/id.yml +19 -15
  32. data/locales/it.yml +20 -16
  33. data/locales/iw.yml +16 -12
  34. data/locales/ja.yml +17 -13
  35. data/locales/ko.yml +13 -9
  36. data/locales/lt.yml +13 -9
  37. data/locales/lv.yml +15 -11
  38. data/locales/mt.yml +20 -16
  39. data/locales/nl.yml +15 -11
  40. data/locales/no.yml +16 -12
  41. data/locales/pl.yml +13 -9
  42. data/locales/pt-PT.yml +17 -13
  43. data/locales/ro.yml +18 -14
  44. data/locales/ru.yml +14 -10
  45. data/locales/sk.yml +16 -12
  46. data/locales/sl.yml +17 -13
  47. data/locales/sq.yml +19 -15
  48. data/locales/sr.yml +20 -16
  49. data/locales/sv.yml +17 -13
  50. data/locales/th.yml +18 -14
  51. data/locales/tl.yml +12 -8
  52. data/locales/tr.yml +17 -13
  53. data/locales/uk.yml +15 -11
  54. data/locales/vi.yml +15 -11
  55. data/locales/zh-CN.yml +13 -9
  56. data/locales/zh-TW.yml +12 -8
  57. data/locales/zh.yml +13 -9
  58. data/muck-activities.gemspec +12 -5
  59. data/public/javascripts/muck_activities.js +1 -2
  60. data/test/rails_root/config/environment.rb +1 -1
  61. data/test/rails_root/config/global_config.yml +4 -0
  62. data/test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb +9 -0
  63. data/test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb +13 -0
  64. data/test/rails_root/test/unit/activity_test.rb +24 -1
  65. data/test/rails_root/test/unit/share_test.rb +1 -1
  66. metadata +14 -4
data/locales/sr.yml CHANGED
@@ -2,29 +2,33 @@
2
2
  sr:
3
3
  muck:
4
4
  activities:
5
- activity_feed_title: "Рецент Ацтивиты"
6
- adding_comment_message: "Додавање коментар ..."
5
+ activity_feed_title: "Задња активност"
6
+ add_photos: "Додај фотографије"
7
+ add_videos: "Поделите Видео"
8
+ adding_comment_message: "Додавање коментара ..."
7
9
  all_activities: "Све активности"
8
- clear: Јасно
9
- create_error: "Дошло је до проблема у додавању тражену делатност: {{error}}"
10
+ clear: Избрисати
11
+ create_error: "Дошло је до проблема додавањем захтева активност: {{error}}"
10
12
  delete: Избрисати
11
13
  invite_friends: "Позови пријатеље"
12
- item_could_not_be_removed: "Предмет није могао бити скинут са списка недавних активности."
13
- item_created: "Аддед активност"
14
- item_removed: "Ставка успешно уклоњен из недавне активности листе."
15
- joined_status: "{{name}} joined {{application_name}}"
14
+ item_could_not_be_removed: "Ставка се не може бити уклоњен из листе недавних активности."
15
+ item_created: "Додато активност"
16
+ item_removed: "Ставка успешно уклоњен из листе недавних активности."
17
+ joined_status: "{{name}} Придружио {{application_name}}"
16
18
  make_comment: Коментар
17
- paging_newer: «Новија
19
+ paging_newer: «Новије
18
20
  paging_older: "Старије »"
19
- permission_denied: "Нажалост, не можете да урадите."
20
- post: Делити
21
+ permission_denied: "Жао нам је, не могу да урадим."
22
+ post: Поделити
21
23
  problem_with_status: "Дошло је до проблема мења ваш статус"
22
24
  status_indicator: је
23
- status_update_prompt: "Шта то радиш сада?"
24
- template_or_item_required: "Активност захтева шаблон или ставке приказати исправно"
25
+ status_update_prompt: "Шта радиш сада?"
26
+ template_or_item_required: "Активности захтева предложак или ставку за исправно приказивање"
25
27
  update_error: "Упс ... Дошло је до проблема. {{errors}}"
26
- update_status_message: "ажурирајте свој статус!"
28
+ update_status_message: "Ажурирајте свој статус!"
27
29
  updating_status_message: "Ажурирање вашег статуса. Молимо сачекајте."
28
- write_prompt: "Урите а цоммент ..."
30
+ upload_files: "Отпреми датотеке"
31
+ write: Писати
32
+ write_prompt: "Напишите коментар ..."
29
33
  activity_templates:
30
- status_update: "Статус Упдатес"
34
+ status_update: "Ажурирање статуса"
data/locales/sv.yml CHANGED
@@ -2,29 +2,33 @@
2
2
  sv:
3
3
  muck:
4
4
  activities:
5
- activity_feed_title: "Senaste aktiviteter"
5
+ activity_feed_title: "Recent Activity"
6
+ add_photos: "Lägg till foton"
7
+ add_videos: "Dela videoklipp"
6
8
  adding_comment_message: "Lägga kommentar ..."
7
9
  all_activities: "Alla aktiviteter"
8
10
  clear: Klar
9
- create_error: "Det uppstod ett problem att lägga till den anmodade Verksamhetsområde: {{error}}"
11
+ create_error: "Det var ett problem att lägga den efterfrågade aktivitet: {{error}}"
10
12
  delete: "Ta bort"
11
- invite_friends: "Bjud in vänner"
12
- item_could_not_be_removed: "Punkt kunde inte flyttas från den senaste listan över verksamhetsområden."
13
- item_created: "Tillagd verksamhet"
14
- item_removed: "Punkt tagits bort från den senaste listan över verksamhetsområden."
15
- joined_status: "{{name}} joined {{application_name}}"
16
- make_comment: Kommentera
13
+ invite_friends: "Bjud vänner"
14
+ item_could_not_be_removed: "Punkt kunde inte tas bort från den senaste listan över verksamhetsområden."
15
+ item_created: "Tillsatt aktivitet"
16
+ item_removed: "Punkt framgångsrikt bort från den senaste listan över verksamhetsområden."
17
+ joined_status: "{{name}} Gick {{application_name}}"
18
+ make_comment: Kommentar
17
19
  paging_newer: «Nyare
18
20
  paging_older: "Äldre »"
19
21
  permission_denied: "Tyvärr kan du inte göra det."
20
22
  post: Del
21
- problem_with_status: "Det uppstod ett problem med att ändra din status"
23
+ problem_with_status: "Det uppstod ett problem att ändra din status"
22
24
  status_indicator: är
23
25
  status_update_prompt: "Vad gör du just nu?"
24
- template_or_item_required: "En verksamhet kräver en mall eller ett objekt för att visas korrekt"
25
- update_error: "Oj ... Det uppstod ett problem. {{errors}}"
26
+ template_or_item_required: "En aktivitet kräver en mall eller ett objekt som visas korrekt"
27
+ update_error: "Oops ... Fanns ett problem. {{errors}}"
26
28
  update_status_message: "uppdatera din status!"
27
- updating_status_message: "Uppdatera din status. Vänta."
29
+ updating_status_message: "Uppdatera din status. Please wait."
30
+ upload_files: "Ladda upp filer"
31
+ write: Skriva
28
32
  write_prompt: "Skriv en kommentar ..."
29
33
  activity_templates:
30
- status_update: "Status Updates"
34
+ status_update: Statusrapporter
data/locales/th.yml CHANGED
@@ -3,28 +3,32 @@ th:
3
3
  muck:
4
4
  activities:
5
5
  activity_feed_title: กิจกรรมล่าสุด
6
+ add_photos: เพิ่มภาพถ่าย
7
+ add_videos: วิดีโอแบ่งปัน
6
8
  adding_comment_message: "เพิ่มความคิดเห็น ..."
7
- all_activities: ทุกกิจกรรม
9
+ all_activities: กิจกรรมทั้งหมด
8
10
  clear: ชัดเจน
9
- create_error: "มีปัญหาในการเพิ่มขอกิจกรรม: {{error}}"
11
+ create_error: "มีปัญหาเพิ่มกิจกรรมขอ: {{error}} คือ"
10
12
  delete: ลบ
11
13
  invite_friends: เชิญเพื่อน
12
- item_could_not_be_removed: รายการไม่สามารถลบออกจากรายการล่าสุดกิจกรรม.
13
- item_created: เพิ่มกิจกรรม
14
- item_removed: รายการสำเร็จลบออกจากรายการล่าสุดกิจกรรม.
15
- joined_status: "{{name}} joined {{application_name}}"
14
+ item_could_not_be_removed: รายการที่ไม่สามารถออกจากรายชื่อกิจกรรมล่าสุด.
15
+ item_created: กิจกรรมเพิ่ม
16
+ item_removed: รายการลบสำเร็จจากรายการกิจกรรมล่าสุด.
17
+ joined_status: "{{name}} ร่วม {{application_name}}"
16
18
  make_comment: ความคิดเห็น
17
19
  paging_newer: «ใหม่กว่า
18
20
  paging_older: "เก่ากว่า »"
19
- permission_denied: ขออภัยคุณไม่สามารถทำที่.
21
+ permission_denied: ขออภัยคุณไม่สามารถทำ.
20
22
  post: แบ่งปัน
21
- problem_with_status: มีปัญหาในการเปลี่ยนสถานะของคุณ
23
+ problem_with_status: มีปัญหาการเปลี่ยนสถานะของคุณคือ
22
24
  status_indicator: เป็น
23
- status_update_prompt: คุณกำลังทำอะไรในขณะนี้?
24
- template_or_item_required: มีกิจกรรมที่ต้องใช้เทมเพลทหรือรายการที่จะแสดงอย่างถูกต้อง
25
- update_error: "โอ๊ะ ... มีปัญหา. {{errors}}"
26
- update_status_message: อัปเดทสถานะ!
27
- updating_status_message: "อัปเดทสถานะ. โปรดรอ."
25
+ status_update_prompt: คุณกำลังทำตอนนี้?
26
+ template_or_item_required: กิจกรรมที่ต้องใช้แม่แบบหรือรายการที่จะแสดงอย่างถูกต้อง
27
+ update_error: "โอ๊ะ ... มีปัญหาคือ. {{errors}}"
28
+ update_status_message: "update สถานะของคุณ"
29
+ updating_status_message: "ปรับปรุงสถานะของ. โปรดรอ."
30
+ upload_files: อัปโหลดไฟล์
31
+ write: เขียน
28
32
  write_prompt: "เขียนความคิดเห็น ..."
29
33
  activity_templates:
30
- status_update: สถานะการปรับปรุง
34
+ status_update: ปรับปรุงสถานะ
data/locales/tl.yml CHANGED
@@ -2,29 +2,33 @@
2
2
  tl:
3
3
  muck:
4
4
  activities:
5
- activity_feed_title: "Kamakailan-lamang na Aktibidad"
5
+ activity_feed_title: "Recent Aktibidad"
6
+ add_photos: "Magdagdag ng mga Larawan"
7
+ add_videos: "Share Videos"
6
8
  adding_comment_message: "Pagdaragdag ng puna ..."
7
- all_activities: "Ang lahat ng gawain"
9
+ all_activities: "Lahat ng mga gawain"
8
10
  clear: Malinaw
9
11
  create_error: "Nagkaroon ng problema ang pagdaragdag ng hiniling na aktibidad: {{error}}"
10
12
  delete: Tanggalin
11
13
  invite_friends: "Imbitahan ang mga Kaibigan"
12
14
  item_could_not_be_removed: "Item ay hindi maaaring tanggalin mula sa listahan ng mga kamakailan-lamang na mga gawain."
13
15
  item_created: "Added aktibidad"
14
- item_removed: "Item na matagumpay na tinanggal mula sa listahan ng mga kamakailan-lamang na mga gawain."
15
- joined_status: "{{name}} joined {{application_name}}"
16
+ item_removed: "Item matagumpay na tinanggal mula sa listahan ng mga kamakailan-lamang na mga gawain."
17
+ joined_status: "{{name}} Sumali {{application_name}}"
16
18
  make_comment: Comment
17
19
  paging_newer: "«Mas bagong"
18
20
  paging_older: "Mas luma »"
19
- permission_denied: "Paumanhin, hindi mo maaaring gawin na."
21
+ permission_denied: "Paumanhin, hindi mo maaaring gawin iyon."
20
22
  post: Ibahagi
21
23
  problem_with_status: "Nagkaroon ng problema sa pagbabago ng iyong kalagayan"
22
24
  status_indicator: ay
23
25
  status_update_prompt: "Ano ang ginagawa mo ngayon?"
24
- template_or_item_required: "An aktibidad ay nangangailangan ng isang template o sa isang bagay upang ipakita ng maayos"
26
+ template_or_item_required: "Ang aktibidad ay nangangailangan ng isang template o isang bagay upang ipakita ang tama"
25
27
  update_error: "Oops ... Nagkaroon ng problema. {{errors}}"
26
- update_status_message: "i-update ang iyong kalagayan!"
28
+ update_status_message: "i-update ang iyong katayuan!"
27
29
  updating_status_message: "Ina-update ang iyong kalagayan. Mangyaring maghintay."
28
- write_prompt: "Magsulat ng komento ..."
30
+ upload_files: "Mag-upload ng file"
31
+ write: Magsulat
32
+ write_prompt: "Sumulat ng puna ..."
29
33
  activity_templates:
30
34
  status_update: "Status Updates"
data/locales/tr.yml CHANGED
@@ -2,29 +2,33 @@
2
2
  tr:
3
3
  muck:
4
4
  activities:
5
- activity_feed_title: "Son Etkinlik"
6
- adding_comment_message: "Yorum Ekleniyor ..."
5
+ activity_feed_title: "Son Aktivite"
6
+ add_photos: "Fotoğraf ekle"
7
+ add_videos: "Share Videolar"
8
+ adding_comment_message: "Yorum ekleniyor ..."
7
9
  all_activities: "Tüm Etkinlikler"
8
10
  clear: Temizlemek
9
- create_error: "Bir sorun istenen etkinliği ekledi: {{error}} oldu"
11
+ create_error: "Bir sorun istenen etkinliği ekleyerek: {{error}} oldu"
10
12
  delete: Silmek
11
13
  invite_friends: "Davet Arkadaşlar"
12
- item_could_not_be_removed: "Öğe son faaliyetleri listesinden could not be removed."
13
- item_created: "Added etkinliği"
14
- item_removed: "Öğe başarıyla son faaliyetleri listesinden kaldırıldı."
15
- joined_status: "{{name}} joined {{application_name}}"
14
+ item_could_not_be_removed: "Öğe son faaliyetleri listeden çıkarılır olamazdı."
15
+ item_created: "Ekledi etkinliği"
16
+ item_removed: "Öğe başarıyla son faaliyetleri listeden kaldırılır."
17
+ joined_status: "{{name}} {{application_name}} Katıldı"
16
18
  make_comment: Yorum
17
- paging_newer: "«Daha yeni"
19
+ paging_newer: «Newer
18
20
  paging_older: "Eski »"
19
- permission_denied: "Maalesef, yapamazsın."
21
+ permission_denied: "Maalesef, bunu yapamazlar."
20
22
  post: Paylaşmak
21
- problem_with_status: "Bir sorun durum değiştirdiğini"
23
+ problem_with_status: "Bir sorun durum değişiyordu"
22
24
  status_indicator: olmak
23
25
  status_update_prompt: "Şu anda ne yapıyorsun?"
24
26
  template_or_item_required: "Bir faaliyet veya bir madde düzgün görüntülemek için şablon gerektirir"
25
- update_error: "Ayyy ... Burada bir sorun var. {{errors}}"
27
+ update_error: "Oops ... Orada bir sorun var. {{errors}}"
26
28
  update_status_message: "Durum güncelleme!"
27
29
  updating_status_message: "Durum güncelleniyor. Lütfen bekleyin."
28
- write_prompt: "Bana bir yorum ..."
30
+ upload_files: "Upload Dosya"
31
+ write: Yazmak
32
+ write_prompt: "Yorum yazın ..."
29
33
  activity_templates:
30
- status_update: "Durumu Güncelleştirmeler"
34
+ status_update: "Durum Güncellemeleri"
data/locales/uk.yml CHANGED
@@ -3,17 +3,19 @@ uk:
3
3
  muck:
4
4
  activities:
5
5
  activity_feed_title: "Останні дії"
6
- adding_comment_message: "Додати коментар ..."
6
+ add_photos: "Додати фотографії"
7
+ add_videos: "Відправити відео"
8
+ adding_comment_message: "Додавання коментарю ..."
7
9
  all_activities: "Усі заходи"
8
10
  clear: Ясний
9
- create_error: "Був проблема додавши просив діяльності: {{error}}"
11
+ create_error: "Був проблемою додаванні просив діяльності: {{error}}"
10
12
  delete: Видалити
11
13
  invite_friends: "Запросити друзів"
12
- item_could_not_be_removed: "Пункт не може бути виключена зі списку останніх заходів."
14
+ item_could_not_be_removed: "Пункт не може бути вилучений з останнього списку видів діяльності."
13
15
  item_created: "Додано діяльності"
14
- item_removed: "Пункт успішно вилучено з недавніх заходів списку."
15
- joined_status: "{{name}} joined {{application_name}}"
16
- make_comment: Комментировать
16
+ item_removed: "Пункт успішно вилучено з останнього списку видів діяльності."
17
+ joined_status: "{{name}} Набрав {{application_name}}"
18
+ make_comment: Коментарі
17
19
  paging_newer: «Пізніше
18
20
  paging_older: "Раніше »"
19
21
  permission_denied: "На жаль, ви не можете цього робити."
@@ -21,10 +23,12 @@ uk:
21
23
  problem_with_status: "Був проблема зміни статусу"
22
24
  status_indicator: бути
23
25
  status_update_prompt: "Що ви робите зараз?"
24
- template_or_item_required: "Діяльність вимагає шаблон або елемент для правильного відображення"
25
- update_error: "К сожалению ... Був проблема. {{errors}}"
26
- update_status_message: "обновити свій статус!"
27
- updating_status_message: "Оновлення статусу. Будь ласка, зачекайте."
26
+ template_or_item_required: "Діяльність вимагає шаблон або пункт правильного відображення"
27
+ update_error: "На жаль ... Був проблема. {{errors}}"
28
+ update_status_message: "оновити статус!"
29
+ updating_status_message: "Оновлення статусу. Будь ласка, почекайте."
30
+ upload_files: "Завантажити файли"
31
+ write: Писати
28
32
  write_prompt: "Напишіть коментар ..."
29
33
  activity_templates:
30
- status_update: "Статус Оновлення"
34
+ status_update: "Статус оновлення"
data/locales/vi.yml CHANGED
@@ -3,28 +3,32 @@ vi:
3
3
  muck:
4
4
  activities:
5
5
  activity_feed_title: "Hoạt động gần đây"
6
+ add_photos: "Thêm hình ảnh"
7
+ add_videos: "Chia sẻ Video"
6
8
  adding_comment_message: "Thêm nhận xét ..."
7
- all_activities: "Tất cả các hoạt động"
9
+ all_activities: "Mọi hoạt động"
8
10
  clear: "Rõ ràng"
9
- create_error: "Có một vấn đề khi thêm các yêu cầu hoạt động: {{error}}"
11
+ create_error: "Có vấn đề thêm các hoạt động được yêu cầu: {{error}}"
10
12
  delete: Xoá
11
13
  invite_friends: "Mời bạn bè"
12
- item_could_not_be_removed: "Khoản thể không được gỡ bỏ khỏi danh sách các hoạt động gần đây."
13
- item_created: "Đăng từ hoạt động"
14
- item_removed: "Khoản thành công gỡ bỏ khỏi danh sách các hoạt động gần đây."
15
- joined_status: "{{name}} joined {{application_name}}"
14
+ item_could_not_be_removed: " không thể được gỡ bỏ khỏi danh sách các hoạt động gần đây."
15
+ item_created: "Nhập hoạt động"
16
+ item_removed: " thành công khỏi danh sách các hoạt động gần đây."
17
+ joined_status: "{{name}} Gia nhập {{application_name}}"
16
18
  make_comment: "Thảo luận"
17
- paging_newer: "«Mơi hơn"
19
+ paging_newer: "«Mới hơn"
18
20
  paging_older: "Cu hơn »"
19
21
  permission_denied: "Xin lỗi, bạn không thể làm điều đó."
20
22
  post: "Chia sẻ"
21
- problem_with_status: "Có một vấn đề thay đổi tình trạng của bạn"
23
+ problem_with_status: "Có vấn đề thay đổi tình trạng của bạn"
22
24
  status_indicator: là
23
25
  status_update_prompt: "Bạn đang làm gì ngay bây giờ?"
24
- template_or_item_required: "Một hoạt động đòi hỏi một mẫu hoặc một mục để hiển thị một cách chính xác"
26
+ template_or_item_required: "Một hoạt động đòi hỏi một bản mẫu hoặc một mục để hiển thị một cách chính xác"
25
27
  update_error: "Rất tiếc ... Có một vấn đề. {{errors}}"
26
28
  update_status_message: "cập nhật tình trạng của bạn!"
27
- updating_status_message: "Cập nhật tình trạng của bạn. Xin vui lòng chờ trong giây lát."
28
- write_prompt: "Viết bình luận ..."
29
+ updating_status_message: "Cập nhật tình trạng của bạn. Xin vui lòng chờ đợi."
30
+ upload_files: "Tải lên tập tin"
31
+ write: Viết
32
+ write_prompt: "Viết chú thích ..."
29
33
  activity_templates:
30
34
  status_update: "Tình trạng cập nhật"
data/locales/zh-CN.yml CHANGED
@@ -3,28 +3,32 @@ zh-CN:
3
3
  muck:
4
4
  activities:
5
5
  activity_feed_title: 近期活动
6
+ add_photos: 添加照片
7
+ add_videos: 分享视频
6
8
  adding_comment_message: 添加评论...
7
9
  all_activities: 所有活动
8
10
  clear: 清楚的
9
- create_error: "有问题的请加活动: {{error}}"
11
+ create_error: "有一个问题,要求加入活动:{{error}}"
10
12
  delete: 删除
11
13
  invite_friends: 邀请朋友
12
- item_could_not_be_removed: 项目不能从最近的活动清单。
13
- item_created: 时间活动
14
- item_removed: 项目成功地从最近的活动清单。
15
- joined_status: "{{name}} joined {{application_name}}"
14
+ item_could_not_be_removed: 项目无法从列表中删除最近的活动。
15
+ item_created: 新增活动
16
+ item_removed: 项目成功地从列表中删除最近的活动。
17
+ joined_status: "{{name}}加入{{application_name}}"
16
18
  make_comment: 评论
17
19
  paging_newer: «较新
18
20
  paging_older: 较旧»
19
21
  permission_denied: 对不起,你不能这样做。
20
22
  post: 共享
21
- problem_with_status: 有问题请更改您的状态
23
+ problem_with_status: 有一个问题,改变你的状态
22
24
  status_indicator: 是
23
- status_update_prompt: 你在做什么呢?
24
- template_or_item_required: 一项活动需要一个模板或一个项目,以显示正确
25
+ status_update_prompt: 你在做什么现在?
26
+ template_or_item_required: 一个活动需要一个模板或一个项目以显示正确
25
27
  update_error: "哎呀...有一个问题。 {{errors}}"
26
- update_status_message: 更新您的地位!
28
+ update_status_message: 更新您的状态!
27
29
  updating_status_message: 更新您的状态。请稍候。
30
+ upload_files: 上传文件
31
+ write: 写
28
32
  write_prompt: 撰写评论...
29
33
  activity_templates:
30
34
  status_update: 状态更新
data/locales/zh-TW.yml CHANGED
@@ -3,28 +3,32 @@ zh-TW:
3
3
  muck:
4
4
  activities:
5
5
  activity_feed_title: 近期活動
6
+ add_photos: 添加照片
7
+ add_videos: 分享視頻
6
8
  adding_comment_message: 添加評論...
7
9
  all_activities: 所有活動
8
10
  clear: 清楚的
9
- create_error: "有問題的請加活動: {{error}}"
11
+ create_error: "有一個問題,要求加入活動:{{error}}"
10
12
  delete: 刪除
11
13
  invite_friends: 邀請朋友
12
- item_could_not_be_removed: 項目不能從最近的活動清單。
13
- item_created: 時間活動
14
+ item_could_not_be_removed: 項目無法刪除從最近的活動清單。
15
+ item_created: 新增活動
14
16
  item_removed: 項目成功地從最近的活動清單。
15
- joined_status: "{{name}} joined {{application_name}}"
17
+ joined_status: "{{name}}加入{{application_name}}"
16
18
  make_comment: 評論
17
19
  paging_newer: «較新
18
20
  paging_older: 較舊»
19
21
  permission_denied: 對不起,你不能這樣做。
20
22
  post: 共享
21
- problem_with_status: 有問題請更改您的狀態
23
+ problem_with_status: 有一個問題,改變你的狀態
22
24
  status_indicator: 是
23
- status_update_prompt: 你在做什麼呢?
24
- template_or_item_required: 一項活動需要一個模板或一個項目,以顯示正確
25
+ status_update_prompt: 你在做什麼現在?
26
+ template_or_item_required: 一個活動需要一個模板或一個項目以顯示正確
25
27
  update_error: "哎呀...有一個問題。 {{errors}}"
26
- update_status_message: 更新您的地位!
28
+ update_status_message: 更新您的狀態!
27
29
  updating_status_message: 更新您的狀態。請稍候。
30
+ upload_files: 上傳文件
31
+ write: 寫
28
32
  write_prompt: 撰寫評論...
29
33
  activity_templates:
30
34
  status_update: 狀態更新
data/locales/zh.yml CHANGED
@@ -3,28 +3,32 @@ zh:
3
3
  muck:
4
4
  activities:
5
5
  activity_feed_title: 近期活动
6
+ add_photos: 添加照片
7
+ add_videos: 分享视频
6
8
  adding_comment_message: 添加评论...
7
9
  all_activities: 所有活动
8
10
  clear: 清楚的
9
- create_error: "有问题的请加活动: {{error}}"
11
+ create_error: "有一个问题,要求加入活动:{{error}}"
10
12
  delete: 删除
11
13
  invite_friends: 邀请朋友
12
- item_could_not_be_removed: 项目不能从最近的活动清单。
13
- item_created: 时间活动
14
- item_removed: 项目成功地从最近的活动清单。
15
- joined_status: "{{name}} joined {{application_name}}"
14
+ item_could_not_be_removed: 项目无法从列表中删除最近的活动。
15
+ item_created: 新增活动
16
+ item_removed: 项目成功地从列表中删除最近的活动。
17
+ joined_status: "{{name}}加入{{application_name}}"
16
18
  make_comment: 评论
17
19
  paging_newer: «较新
18
20
  paging_older: 较旧»
19
21
  permission_denied: 对不起,你不能这样做。
20
22
  post: 共享
21
- problem_with_status: 有问题请更改您的状态
23
+ problem_with_status: 有一个问题,改变你的状态
22
24
  status_indicator: 是
23
- status_update_prompt: 你在做什么呢?
24
- template_or_item_required: 一项活动需要一个模板或一个项目,以显示正确
25
+ status_update_prompt: 你在做什么现在?
26
+ template_or_item_required: 一个活动需要一个模板或一个项目以显示正确
25
27
  update_error: "哎呀...有一个问题。 {{errors}}"
26
- update_status_message: 更新您的地位!
28
+ update_status_message: 更新您的状态!
27
29
  updating_status_message: 更新您的状态。请稍候。
30
+ upload_files: 上传文件
31
+ write: 写
28
32
  write_prompt: 撰写评论...
29
33
  activity_templates:
30
34
  status_update: 状态更新
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{muck-activities}
8
- s.version = "0.1.19"
8
+ s.version = "0.1.20"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Justin Ball"]
12
- s.date = %q{2009-08-13}
12
+ s.date = %q{2009-09-10}
13
13
  s.description = %q{Activity engine for the muck system.}
14
14
  s.email = %q{justinball@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -25,9 +25,11 @@ Gem::Specification.new do |s|
25
25
  "app/helpers/muck_activity_helper.rb",
26
26
  "app/models/activity_feed.rb",
27
27
  "app/views/activities/_activity_feed.html.erb",
28
+ "app/views/activities/_activity_scripts.html.erb",
28
29
  "app/views/activities/_cached_activities.html.erb",
29
30
  "app/views/activities/_comment.html.erb",
30
31
  "app/views/activities/_comments.html.erb",
32
+ "app/views/activities/_contribute.html.erb",
31
33
  "app/views/activities/_current_status.html.erb",
32
34
  "app/views/activities/_current_status_wrapper.html.erb",
33
35
  "app/views/activities/_status_update.html.erb",
@@ -37,6 +39,8 @@ Gem::Specification.new do |s|
37
39
  "config/muck_activities_routes.rb",
38
40
  "db/migrate/20090402033319_add_muck_activities.rb",
39
41
  "db/migrate/20090730044139_add_comment_cache.rb",
42
+ "db/migrate/20090818204527_add_activity_indexes.rb",
43
+ "db/migrate/20090819030523_add_attachable_to_activities.rb",
40
44
  "install.rb",
41
45
  "lib/active_record/acts/muck_activity.rb",
42
46
  "lib/muck_activities.rb",
@@ -134,6 +138,8 @@ Gem::Specification.new do |s|
134
138
  "test/rails_root/db/migrate/20090613173314_create_comments.rb",
135
139
  "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
136
140
  "test/rails_root/db/migrate/20090803185323_create_shares.rb",
141
+ "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
142
+ "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
137
143
  "test/rails_root/features/step_definitions/webrat_steps.rb",
138
144
  "test/rails_root/features/support/env.rb",
139
145
  "test/rails_root/features/support/paths.rb",
@@ -309,12 +315,11 @@ Gem::Specification.new do |s|
309
315
  "test/rails_root/test/unit/user_test.rb",
310
316
  "uninstall.rb"
311
317
  ]
312
- s.has_rdoc = true
313
318
  s.homepage = %q{http://github.com/jbasdf/muck_activities}
314
319
  s.rdoc_options = ["--charset=UTF-8"]
315
320
  s.require_paths = ["lib"]
316
321
  s.rubyforge_project = %q{muck-activities}
317
- s.rubygems_version = %q{1.3.1}
322
+ s.rubygems_version = %q{1.3.5}
318
323
  s.summary = %q{Activity engine for the muck system}
319
324
  s.test_files = [
320
325
  "test/rails_root/app/controllers/application_controller.rb",
@@ -347,6 +352,8 @@ Gem::Specification.new do |s|
347
352
  "test/rails_root/db/migrate/20090613173314_create_comments.rb",
348
353
  "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
349
354
  "test/rails_root/db/migrate/20090803185323_create_shares.rb",
355
+ "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
356
+ "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
350
357
  "test/rails_root/features/step_definitions/webrat_steps.rb",
351
358
  "test/rails_root/features/support/env.rb",
352
359
  "test/rails_root/features/support/paths.rb",
@@ -365,7 +372,7 @@ Gem::Specification.new do |s|
365
372
 
366
373
  if s.respond_to? :specification_version then
367
374
  current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
368
- s.specification_version = 2
375
+ s.specification_version = 3
369
376
 
370
377
  if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
371
378
  s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
@@ -7,8 +7,7 @@ function apply_activity_ajax_methods(){
7
7
  hide_comment_boxes();
8
8
  apply_comment_hover();
9
9
  apply_activity_hover();
10
- jQuery('.activity-no-comments').hide();
11
-
10
+ jQuery('.activity-no-comments').hide();
12
11
  jQuery('.activity-has-comments').find('textarea').click(function(){
13
12
  show_comment_box(this);
14
13
  });
@@ -1,4 +1,4 @@
1
- RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
1
+ RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION
2
2
 
3
3
  require File.join(File.dirname(__FILE__), 'boot')
4
4
 
@@ -8,6 +8,10 @@ default: &DEFAULT
8
8
  session_key: _uploader_session
9
9
  session_secret: ea55c4d5e105735fdfb1caec46711b3dd14ec976d0ba95b4c0f575cb046cc358bce7a335ee36eb29253fb680ef8b838d871f6baeff48220fee8e9e42ab84774b
10
10
 
11
+ # enable_activity_file_uploads: true # Turn on file uploads in the activity feed. Requires that uploader be installed.
12
+ # enable_activity_image_uploads: true # Turn on image uploads in the activity feed. Requires that uploader and muck_albums be installed.
13
+ # enable_activity_video_sharing: true # Turn on video sharing in the activity feed.
14
+ #
11
15
  production:
12
16
  <<: *DEFAULT
13
17
 
@@ -0,0 +1,9 @@
1
+ class AddActivityIndexes < ActiveRecord::Migration
2
+ def self.up
3
+ add_index :activities, ["source_id", "source_type"]
4
+ end
5
+
6
+ def self.down
7
+ remove_index :activities, ["source_id", "source_type"]
8
+ end
9
+ end
@@ -0,0 +1,13 @@
1
+ class AddAttachableToActivities < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :activities, :attachable_id, :integer
4
+ add_column :activities, :attachable_type, :string
5
+ add_index :activities, ["attachable_id", "attachable_type"]
6
+ end
7
+
8
+ def self.down
9
+ remove_column :activities, :attachable_id
10
+ remove_column :activities, :attachable_type
11
+ remove_index :activities, ["attachable_id", "attachable_type"]
12
+ end
13
+ end