social_stream 2.1.1 → 2.2.0

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 (188) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +5 -2
  3. data/LICENSE +1 -1
  4. data/base/Rakefile +3 -17
  5. data/base/app/assets/images/flags/de.png +0 -0
  6. data/base/app/assets/images/flags/fr.png +0 -0
  7. data/base/app/assets/images/flags/hu.png +0 -0
  8. data/base/app/assets/images/flags/nl.png +0 -0
  9. data/base/app/assets/javascripts/social_stream/actor.js +34 -0
  10. data/base/app/assets/javascripts/social_stream/contact.js +40 -5
  11. data/base/app/assets/javascripts/social_stream/flash.js +6 -1
  12. data/base/app/assets/javascripts/social_stream/group.js +6 -5
  13. data/base/app/assets/javascripts/social_stream/relation_customs.js +0 -1
  14. data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +3 -0
  15. data/base/app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass +0 -2
  16. data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +1 -11
  17. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +1 -29
  18. data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +0 -1
  19. data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +5 -0
  20. data/base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass +36 -7
  21. data/base/app/controllers/actors_controller.rb +25 -0
  22. data/base/app/controllers/contacts_controller.rb +38 -8
  23. data/base/app/controllers/groups_controller.rb +2 -21
  24. data/base/app/controllers/profiles_controller.rb +4 -0
  25. data/base/app/controllers/settings_controller.rb +12 -2
  26. data/base/app/controllers/users_controller.rb +0 -8
  27. data/base/app/helpers/contacts_helper.rb +8 -0
  28. data/base/app/models/activity.rb +19 -6
  29. data/base/app/models/actor.rb +49 -11
  30. data/base/app/models/contact.rb +12 -5
  31. data/base/app/models/group.rb +13 -11
  32. data/base/app/models/permission.rb +30 -0
  33. data/base/app/models/relation.rb +17 -7
  34. data/base/app/models/relation/custom.rb +2 -40
  35. data/base/app/models/relation/follow.rb +8 -2
  36. data/base/app/models/relation/owner.rb +10 -0
  37. data/base/app/models/relation/single.rb +7 -4
  38. data/base/app/models/site.rb +1 -1
  39. data/base/app/models/tie.rb +8 -4
  40. data/base/app/views/contacts/_add_button.html.erb +9 -0
  41. data/base/app/views/contacts/_button.html.erb +3 -3
  42. data/base/app/views/contacts/_button_multiple.html.erb +4 -0
  43. data/base/app/views/contacts/_button_simple.html.erb +17 -0
  44. data/base/app/views/contacts/_new_modal.html.erb +22 -0
  45. data/base/app/views/contacts/destroy.js.erb +5 -4
  46. data/base/app/views/contacts/update.js.erb +5 -4
  47. data/base/app/views/devise/confirmations/new.html.erb +14 -9
  48. data/base/app/views/frontpage/_presentation.html.erb +2 -2
  49. data/base/app/views/groups/_form.html.erb +20 -20
  50. data/base/app/views/groups/show.html.erb +5 -5
  51. data/base/app/views/layouts/_header_dropdown_menu.html.erb +3 -5
  52. data/base/app/views/layouts/_header_signed_in.erb +3 -3
  53. data/base/app/views/layouts/_logo_in.html.erb +1 -1
  54. data/base/app/views/layouts/application.html.erb +2 -0
  55. data/base/app/views/permissions/_list.html.erb +1 -1
  56. data/base/app/views/profiles/_avatar.html.erb +1 -5
  57. data/base/app/views/profiles/_avatar_edit.html.erb +5 -0
  58. data/base/app/views/profiles/_comunication-info.html.erb +2 -36
  59. data/base/app/views/profiles/_comunication-info_edit.html.erb +27 -0
  60. data/base/app/views/profiles/_edit_icon.html.erb +0 -1
  61. data/base/app/views/profiles/_experience.html.erb +1 -6
  62. data/base/app/views/profiles/_experience_edit.html.erb +5 -0
  63. data/base/app/views/profiles/_personal.html.erb +1 -39
  64. data/base/app/views/profiles/_personal_edit.html.erb +31 -0
  65. data/base/app/views/profiles/_profile_edit.html.erb +7 -0
  66. data/base/app/views/profiles/_tags.html.erb +1 -4
  67. data/base/app/views/profiles/_tags_edit.html.erb +4 -0
  68. data/base/app/views/profiles/edit.html.erb +24 -0
  69. data/base/app/views/settings/_notifications.html.erb +12 -4
  70. data/base/app/views/users/show.html.erb +5 -5
  71. data/base/config/locales/de.yml +654 -0
  72. data/base/config/locales/en.yml +20 -9
  73. data/base/config/locales/es.yml +151 -140
  74. data/base/config/locales/fr.yml +656 -0
  75. data/base/config/locales/hu.yml +653 -0
  76. data/base/config/locales/nl.yml +656 -0
  77. data/base/config/locales/pt.yml +250 -239
  78. data/base/config/locales/rails.de.yml +203 -0
  79. data/base/config/locales/rails.fr.yml +222 -0
  80. data/base/config/locales/rails.hu.yml +199 -0
  81. data/base/config/locales/rails.nl.yml +199 -0
  82. data/base/config/locales/zh.yml +214 -202
  83. data/base/config/routes.rb +22 -30
  84. data/base/db/migrate/20130708152633_set_group_owners.rb +19 -0
  85. data/base/db/migrate/20130723133530_actor_notification_settings.rb +10 -0
  86. data/base/lib/generators/social_stream/base/templates/initializer.rb +13 -7
  87. data/base/lib/rails/social_stream.rb +2 -0
  88. data/base/lib/social_stream/base.rb +27 -7
  89. data/base/lib/social_stream/base/ability.rb +3 -5
  90. data/base/lib/social_stream/base/autoload.rb +1 -0
  91. data/base/lib/social_stream/base/version.rb +1 -1
  92. data/base/lib/social_stream/controllers/authorship.rb +18 -0
  93. data/base/lib/social_stream/controllers/helpers.rb +18 -4
  94. data/base/lib/social_stream/controllers/objects.rb +2 -8
  95. data/base/lib/social_stream/controllers/subjects.rb +9 -2
  96. data/base/lib/social_stream/models/supertype.rb +2 -0
  97. data/base/lib/social_stream/population/activity_object.rb +6 -8
  98. data/base/lib/social_stream/routing/mapper.rb +52 -0
  99. data/base/social_stream-base.gemspec +4 -7
  100. data/base/spec/controllers/groups_controller_spec.rb +19 -8
  101. data/base/spec/controllers/posts_controller_spec.rb +114 -147
  102. data/base/spec/models/post_authorization_spec.rb +190 -204
  103. data/base/spec/models/post_spec.rb +17 -63
  104. data/base/vendor/assets/javascripts/bootstrap-multiselect.js +434 -127
  105. data/documents/Rakefile +1 -6
  106. data/documents/config/locales/de.yml +93 -0
  107. data/documents/config/locales/es.yml +2 -2
  108. data/documents/config/locales/fr.yml +93 -0
  109. data/documents/config/locales/hu.yml +93 -0
  110. data/documents/config/locales/nl.yml +93 -0
  111. data/documents/config/locales/zh.yml +4 -4
  112. data/documents/config/routes.rb +7 -9
  113. data/documents/lib/social_stream/documents/version.rb +1 -1
  114. data/documents/social_stream-documents.gemspec +4 -4
  115. data/events/Rakefile +1 -6
  116. data/events/config/locales/es.yml +3 -3
  117. data/events/config/locales/zh.yml +3 -3
  118. data/events/lib/social_stream/events/models/actor.rb +2 -1
  119. data/events/lib/social_stream/events/version.rb +1 -1
  120. data/events/social_stream-events.gemspec +1 -1
  121. data/lib/generators/social_stream/install_generator.rb +1 -0
  122. data/lib/social_stream.rb +1 -0
  123. data/lib/social_stream/version.rb +1 -1
  124. data/lib/tasks/i18n.rake +22 -2
  125. data/linkser/Rakefile +1 -6
  126. data/linkser/config/locales/de.yml +17 -0
  127. data/linkser/config/locales/es.yml +2 -2
  128. data/linkser/config/locales/fr.yml +17 -0
  129. data/linkser/config/locales/hu.yml +17 -0
  130. data/linkser/config/locales/nl.yml +17 -0
  131. data/linkser/config/locales/zh.yml +2 -2
  132. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  133. data/linkser/social_stream-linkser.gemspec +1 -1
  134. data/oauth2_server/Rakefile +1 -6
  135. data/oauth2_server/app/assets/images/step_1.png +0 -0
  136. data/oauth2_server/app/assets/images/step_2.png +0 -0
  137. data/oauth2_server/app/assets/images/step_3.png +0 -0
  138. data/oauth2_server/app/assets/javascripts/social_stream/site_client.js +27 -0
  139. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass +0 -5
  140. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass +3 -5
  141. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass +8 -6
  142. data/oauth2_server/app/controllers/site/clients_controller.rb +17 -41
  143. data/oauth2_server/app/decorators/social_stream/base/relation_decorator.rb +2 -0
  144. data/oauth2_server/app/decorators/social_stream/base/user_decorator.rb +1 -20
  145. data/oauth2_server/app/models/relation/manager.rb +1 -10
  146. data/oauth2_server/app/models/site/client.rb +4 -2
  147. data/oauth2_server/app/views/site/clients/_destroy.html.erb +11 -0
  148. data/oauth2_server/app/views/site/clients/_edit.html.erb +9 -2
  149. data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb +6 -6
  150. data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb +8 -6
  151. data/oauth2_server/app/views/site/clients/_form.html.erb +11 -11
  152. data/oauth2_server/app/views/site/clients/_list.html.erb +23 -11
  153. data/oauth2_server/app/views/site/clients/edit.html.erb +1 -1
  154. data/oauth2_server/app/views/site/clients/index.html.erb +9 -40
  155. data/oauth2_server/app/views/site/clients/show.html.erb +66 -68
  156. data/oauth2_server/config/locales/en.yml +19 -0
  157. data/oauth2_server/config/locales/es.yml +23 -4
  158. data/oauth2_server/config/locales/zh.yml +32 -13
  159. data/oauth2_server/config/routes.rb +3 -1
  160. data/oauth2_server/lib/social_stream/oauth2_server.rb +4 -1
  161. data/oauth2_server/lib/social_stream/oauth2_server/ability.rb +1 -1
  162. data/oauth2_server/lib/social_stream/oauth2_server/models/user.rb +18 -0
  163. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  164. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  165. data/oauth2_server/spec/controllers/site_clients_controller_authorization_spec.rb +7 -0
  166. data/ostatus/Rakefile +1 -6
  167. data/ostatus/config/locales/zh.yml +8 -8
  168. data/ostatus/lib/social_stream-ostatus.rb +3 -0
  169. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  170. data/ostatus/social_stream-ostatus.gemspec +1 -1
  171. data/places/config/locales/es.yml +51 -51
  172. data/presence/config/locales/es.yml +48 -48
  173. data/presence/config/locales/zh.yml +48 -48
  174. data/presence/lib/social_stream/presence/version.rb +1 -1
  175. data/presence/social_stream-presence.gemspec +1 -1
  176. data/social_stream.gemspec +8 -7
  177. metadata +60 -29
  178. data/base/app/assets/javascripts/social_stream/follow.js +0 -28
  179. data/base/app/controllers/followers_controller.rb +0 -34
  180. data/base/app/helpers/followers_helper.rb +0 -5
  181. data/base/app/views/contacts/_link_follow.html.erb +0 -16
  182. data/base/app/views/followers/destroy.js.erb +0 -1
  183. data/base/app/views/followers/index.html.erb +0 -30
  184. data/base/app/views/followers/update.js.erb +0 -3
  185. data/base/app/views/frontpage/_characteristics.html.erb +0 -23
  186. data/base/lib/social_stream/routing/constraints/custom.rb +0 -11
  187. data/base/lib/social_stream/routing/constraints/follow.rb +0 -11
  188. data/base/spec/controllers/followers_controller_spec.rb +0 -37
@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
3
3
 
4
4
  require 'rdoc/task'
5
5
 
6
- require 'rspec/core'
7
- require 'rspec/core/rake_task'
8
-
9
- RSpec::Core::RakeTask.new(:spec)
10
-
11
- task :default => :spec
6
+ task :default => :rdoc
12
7
 
13
8
  Rake::RDocTask.new(:rdoc) do |rdoc|
14
9
  rdoc.rdoc_dir = 'rdoc'
@@ -0,0 +1,93 @@
1
+ ---
2
+ de:
3
+ activerecord:
4
+ attributes:
5
+ document:
6
+ title: Titel
7
+ models:
8
+ document: File
9
+ audio:
10
+ confirm_delete: Audio löschen?
11
+ mine: Meine Audios
12
+ name: Audio
13
+ not_mine: Audios
14
+ one: Ein Audio
15
+ other: audios
16
+ processing: Audio clip wird verarbeitet. Bitte warten...
17
+ title:
18
+ one: Audio
19
+ other: Audios
20
+ details:
21
+ msg: Siehe Details...
22
+ document:
23
+ actions:
24
+ delete: Löschen
25
+ details: Details
26
+ download: Download
27
+ edit: Bearbeiten
28
+ all: Alle Files
29
+ by: by %{author}
30
+ confirm_delete: File löschen?
31
+ description:
32
+ input: Add a description here
33
+ filter: filter
34
+ form:
35
+ title: File
36
+ info:
37
+ author: Author
38
+ date:
39
+ created_at: Erstellt am
40
+ updated_at: Aktualisiert am
41
+ description:
42
+ title: Beschreibung
43
+ file:
44
+ title: Upload
45
+ size: Size
46
+ tags: Tags
47
+ title:
48
+ title: Titel
49
+ mine: Meine Files
50
+ name: File
51
+ new:
52
+ link: Add file
53
+ title: New file
54
+ new_activity:
55
+ attach: Attach file
56
+ not_mine: Files
57
+ one: Ein File
58
+ other: files
59
+ scope:
60
+ network: Network
61
+ own: Own
62
+ simple_all: Alle
63
+ title:
64
+ input: File title
65
+ one: File
66
+ other: Files
67
+ picture:
68
+ confirm_delete: Bild löschen?
69
+ mine: Meine Bilder
70
+ name: Bild
71
+ not_mine: Bilder
72
+ one: Ein Bild
73
+ other: pictures
74
+ title:
75
+ one: Bild
76
+ other: Bilder
77
+ resource:
78
+ all: Alle Ressourcen
79
+ confirm_delete: Ressource löschen?
80
+ mine: Meine Ressourcen
81
+ not_mine: Ressourcen
82
+ title: Ressourcen
83
+ video:
84
+ confirm_delete: Video löschen?
85
+ mine: Meine Videos
86
+ name: Video
87
+ not_mine: Videos
88
+ one: Ein Video
89
+ other: videos
90
+ processing: Video wird verarbeitet. Bitte warten...
91
+ title:
92
+ one: Video
93
+ other: Videos
@@ -40,9 +40,9 @@ es:
40
40
  updated_at: Última modificación
41
41
  description: Descripción
42
42
  file: Fichero
43
- title: Título
44
43
  size: Size
45
44
  tags: Tags
45
+ title: Título
46
46
  mine: Mis ficheros
47
47
  name: fichero
48
48
  new:
@@ -74,9 +74,9 @@ es:
74
74
  resource:
75
75
  all: Todos los recursos
76
76
  confirm_delete: ¿Borrar recursos?
77
- title: Recursos
78
77
  mine: Mis recursos
79
78
  not_mine: Recursos
79
+ title: Recursos
80
80
  video:
81
81
  confirm_delete: ¿Borrar vídeo?
82
82
  mine: Mis vídeos
@@ -0,0 +1,93 @@
1
+ ---
2
+ fr:
3
+ activerecord:
4
+ attributes:
5
+ document:
6
+ title: Titre
7
+ models:
8
+ document: File
9
+ audio:
10
+ confirm_delete: Supprimer les clips audio ?
11
+ mine: Mes clips audio
12
+ name: clip audio
13
+ not_mine: Clips audio
14
+ one: un clip audio
15
+ other: audios
16
+ processing: Traitement du clip audio en cours. Veuillez patienter...
17
+ title:
18
+ one: Clip audio
19
+ other: Clips audio
20
+ details:
21
+ msg: Plus d'infos...
22
+ document:
23
+ actions:
24
+ delete: Supprimer
25
+ details: Détails
26
+ download: Télécharger
27
+ edit: Éditer
28
+ all: Tous les fichiers
29
+ by: by %{author}
30
+ confirm_delete: Supprimer le fichier ?
31
+ description:
32
+ input: Add a description here
33
+ filter: filter
34
+ form:
35
+ title: Fichier
36
+ info:
37
+ author: Author
38
+ date:
39
+ created_at: Publication créée à
40
+ updated_at: Publication mise à jour à
41
+ description:
42
+ title: Description
43
+ file:
44
+ title: Publier
45
+ size: Size
46
+ tags: Tags
47
+ title:
48
+ title: Titre
49
+ mine: Mes fichiers
50
+ name: fichier
51
+ new:
52
+ link: Add file
53
+ title: New file
54
+ new_activity:
55
+ attach: Attach file
56
+ not_mine: Fichiers
57
+ one: un fichier
58
+ other: files
59
+ scope:
60
+ network: Network
61
+ own: Own
62
+ simple_all: Tous
63
+ title:
64
+ input: File title
65
+ one: Fichier
66
+ other: Fichiers
67
+ picture:
68
+ confirm_delete: Supprimer la photo ?
69
+ mine: Mes photos
70
+ name: photo
71
+ not_mine: Photos
72
+ one: une photo
73
+ other: pictures
74
+ title:
75
+ one: Photo
76
+ other: Photos
77
+ resource:
78
+ all: Toutes les ressources
79
+ confirm_delete: Supprimer la ressource ?
80
+ mine: Mes ressources
81
+ not_mine: Ressources
82
+ title: Ressources
83
+ video:
84
+ confirm_delete: Supprimer la vidéo ?
85
+ mine: Mes vidéos
86
+ name: vidéo
87
+ not_mine: Vidéos
88
+ one: une vidéo
89
+ other: videos
90
+ processing: Traitement de la vidéo en cours. Veuillez patienter...
91
+ title:
92
+ one: Vidéo
93
+ other: Vidéos
@@ -0,0 +1,93 @@
1
+ ---
2
+ hu:
3
+ activerecord:
4
+ attributes:
5
+ document:
6
+ title: Cím
7
+ models:
8
+ document: File
9
+ audio:
10
+ confirm_delete: Kikapcsolod a hangot?
11
+ mine: Saját hangok
12
+ name: hang
13
+ not_mine: Hangok
14
+ one: egy hang
15
+ other: audios
16
+ processing: Audió klip feldolgozása. Kérlek, várj…
17
+ title:
18
+ one: Hang
19
+ other: Hangok
20
+ details:
21
+ msg: Részletek...
22
+ document:
23
+ actions:
24
+ delete: Törlés
25
+ details: Részletek
26
+ download: Letöltés
27
+ edit: Szekesztés
28
+ all: Minden fájl
29
+ by: by %{author}
30
+ confirm_delete: Törlöd a fájlt?
31
+ description:
32
+ input: Add a description here
33
+ filter: filter
34
+ form:
35
+ title: Fájl
36
+ info:
37
+ author: Author
38
+ date:
39
+ created_at: Létrehozva
40
+ updated_at: Frissítve
41
+ description:
42
+ title: Leírás
43
+ file:
44
+ title: Feltöltés
45
+ size: Size
46
+ tags: Tags
47
+ title:
48
+ title: Cím
49
+ mine: Saját fájljaim
50
+ name: fájl
51
+ new:
52
+ link: Add file
53
+ title: New file
54
+ new_activity:
55
+ attach: Attach file
56
+ not_mine: Fájlok
57
+ one: egy fájl
58
+ other: files
59
+ scope:
60
+ network: Network
61
+ own: Own
62
+ simple_all: Összes
63
+ title:
64
+ input: File title
65
+ one: Fájl
66
+ other: Fájlok
67
+ picture:
68
+ confirm_delete: Törlöd a képet?
69
+ mine: Saját képeim
70
+ name: kép
71
+ not_mine: Képek
72
+ one: egy kép
73
+ other: pictures
74
+ title:
75
+ one: Kép
76
+ other: Képek
77
+ resource:
78
+ all: Összes erőforrás
79
+ confirm_delete: Törlöd az erőforrást?
80
+ mine: Saját erőforrásaim
81
+ not_mine: Erőforrások
82
+ title: Erőforrások
83
+ video:
84
+ confirm_delete: Törlöd a videót?
85
+ mine: Saját vieóim
86
+ name: videó
87
+ not_mine: Videók
88
+ one: egy videó
89
+ other: videos
90
+ processing: A videó feldolgozás alatt van. Kérjük, várj...
91
+ title:
92
+ one: Videó
93
+ other: Videók
@@ -0,0 +1,93 @@
1
+ ---
2
+ nl:
3
+ activerecord:
4
+ attributes:
5
+ document:
6
+ title: Titel
7
+ models:
8
+ document: File
9
+ audio:
10
+ confirm_delete: Audio verwijderen?
11
+ mine: Mijn audio’s
12
+ name: audio
13
+ not_mine: Audio’s
14
+ one: een audio
15
+ other: audios
16
+ processing: Bezig met bewerken audioclip. Wachten...
17
+ title:
18
+ one: Audio
19
+ other: Audio’s
20
+ details:
21
+ msg: Zie bijzonderheden...
22
+ document:
23
+ actions:
24
+ delete: Verwijderen
25
+ details: Bijzonderheden
26
+ download: Downloaden
27
+ edit: Bewerken
28
+ all: Alle bestanden
29
+ by: by %{author}
30
+ confirm_delete: Bestand verwijderen?
31
+ description:
32
+ input: Add a description here
33
+ filter: filter
34
+ form:
35
+ title: Bestand
36
+ info:
37
+ author: Author
38
+ date:
39
+ created_at: Gecreëerd op
40
+ updated_at: Geüpdatet op
41
+ description:
42
+ title: Beschrijving
43
+ file:
44
+ title: Uploaden
45
+ size: Size
46
+ tags: Tags
47
+ title:
48
+ title: Titel
49
+ mine: Mijn bestanden
50
+ name: bestand
51
+ new:
52
+ link: Add file
53
+ title: New file
54
+ new_activity:
55
+ attach: Attach file
56
+ not_mine: Bestanden
57
+ one: een bestand
58
+ other: files
59
+ scope:
60
+ network: Network
61
+ own: Own
62
+ simple_all: Alle
63
+ title:
64
+ input: File title
65
+ one: Bestand
66
+ other: Bestanden
67
+ picture:
68
+ confirm_delete: Afbeelding verwijderen?
69
+ mine: Mijn afbeeldingen
70
+ name: afbeelding
71
+ not_mine: Afbeeldingen
72
+ one: een afbeelding
73
+ other: pictures
74
+ title:
75
+ one: Afbeelding
76
+ other: Afbeeldingen
77
+ resource:
78
+ all: Alle Leermiddelen
79
+ confirm_delete: Leermiddel verwijderen?
80
+ mine: Mijn leermiddelen
81
+ not_mine: Leermiddelen
82
+ title: Leermiddelen
83
+ video:
84
+ confirm_delete: Video verwijderen?
85
+ mine: Mijn video’s
86
+ name: video
87
+ not_mine: Video’s
88
+ one: een video
89
+ other: videos
90
+ processing: Bezig met bewerken van video. Wachten...
91
+ title:
92
+ one: Video
93
+ other: Video’s
@@ -8,15 +8,15 @@ zh:
8
8
  document: File
9
9
  audio:
10
10
  confirm_delete: Delete audio?
11
- title:
12
- one: Audio
13
- other: Audios
14
11
  mine: My audios
15
12
  name: audio
16
13
  not_mine: Audios
17
14
  one: an audio
18
15
  other: audios
19
16
  processing: Processing audio clip. Please wait...
17
+ title:
18
+ one: Audio
19
+ other: Audios
20
20
  details:
21
21
  msg: See details...
22
22
  document:
@@ -74,9 +74,9 @@ zh:
74
74
  resource:
75
75
  all: All Resources
76
76
  confirm_delete: Delete resource?
77
- title: Resources
78
77
  mine: My resources
79
78
  not_mine: Resources
79
+ title: Resources
80
80
  video:
81
81
  confirm_delete: Delete video?
82
82
  mine: My videos
@@ -9,16 +9,14 @@ Rails.application.routes.draw do
9
9
  end
10
10
 
11
11
  # Social Stream subjects configured in config/initializers/social_stream.rb
12
- SocialStream.subjects.each do |actor|
13
- resources actor.to_s.pluralize do
14
- resources :pictures
15
- resources :audios
16
- resources :videos
12
+ route_subjects do
13
+ resources :pictures
14
+ resources :audios
15
+ resources :videos
17
16
 
18
- resources :documents do
19
- get "search", :on => :collection
20
- get "download", :on => :member
21
- end
17
+ resources :documents do
18
+ get "search", :on => :collection
19
+ get "download", :on => :member
22
20
  end
23
21
  end
24
22
  end