social_stream 2.0.0.beta2 → 2.0.0.beta3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (227) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -0
  3. data/README.rdoc +5 -4
  4. data/Rakefile +1 -1
  5. data/base/app/assets/images/icons/files_ico-50.png +0 -0
  6. data/base/app/assets/images/icons/files_ico-70.png +0 -0
  7. data/base/app/assets/images/logos/medium/group.png +0 -0
  8. data/base/app/assets/images/logos/medium/user.png +0 -0
  9. data/base/app/assets/images/logos/original/group.png +0 -0
  10. data/base/app/assets/images/logos/original/user.png +0 -0
  11. data/base/app/assets/images/logos/small/group.png +0 -0
  12. data/base/app/assets/images/logos/small/user.png +0 -0
  13. data/base/app/assets/javascripts/social_stream/contact.js +23 -56
  14. data/base/app/assets/javascripts/social_stream/object.js +5 -0
  15. data/base/app/assets/javascripts/social_stream/relation_customs.js +1 -1
  16. data/base/app/assets/javascripts/social_stream/wall.js +1 -0
  17. data/base/app/assets/stylesheets/social_stream-base.css.sass +81 -2
  18. data/base/app/assets/stylesheets/social_stream/base/adjust.css.sass +5 -0
  19. data/base/app/assets/stylesheets/social_stream/base/{_adjust.css.sass → adjust/_adjust.css.sass} +1 -5
  20. data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +10 -0
  21. data/base/app/assets/stylesheets/social_stream/base/buttons.css.sass +2 -0
  22. data/base/app/assets/stylesheets/social_stream/base/{_buttons.scss.sass → buttons/_buttons.scss.sass} +0 -0
  23. data/base/app/assets/stylesheets/social_stream/base/contacts.css.sass +10 -0
  24. data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +12 -7
  25. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +35 -27
  26. data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +13 -3
  27. data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass +38 -3
  28. data/base/app/assets/stylesheets/social_stream/base/conversation.css.sass +10 -0
  29. data/base/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass +3 -3
  30. data/base/app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass +3 -0
  31. data/base/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass +4 -1
  32. data/base/app/assets/stylesheets/social_stream/base/explore.css.sass +18 -0
  33. data/base/app/assets/stylesheets/social_stream/base/explore/_explore.css.sass +8 -3
  34. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass +1 -0
  35. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore-timeline.css.sass +9 -5
  36. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore.css.sass +4 -5
  37. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass +12 -10
  38. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass +2 -0
  39. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass +2 -0
  40. data/base/app/assets/stylesheets/social_stream/base/footer.css.sass +2 -0
  41. data/base/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass +4 -3
  42. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise.css.sass +16 -0
  43. data/base/app/assets/stylesheets/social_stream/base/groups/_groups.css.sass +17 -0
  44. data/base/app/assets/stylesheets/social_stream/base/{_groups.css.sass → groups/layout/_groups.css.sass} +2 -7
  45. data/base/app/assets/stylesheets/social_stream/base/icons.css.sass +2 -0
  46. data/base/app/assets/stylesheets/social_stream/base/icons/icon.css.css +52 -38
  47. data/base/app/assets/stylesheets/social_stream/base/jquery-ui.css.sass +10 -0
  48. data/base/app/assets/stylesheets/social_stream/base/{_jquery-ui.css.sass → jquery-ui/_jquery-ui.css.sass} +0 -0
  49. data/base/app/assets/stylesheets/social_stream/base/layouts.css.sass +2 -0
  50. data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +10 -5
  51. data/base/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +4 -2
  52. data/base/app/assets/stylesheets/social_stream/base/logo.css.sass +7 -0
  53. data/base/app/assets/stylesheets/social_stream/base/mixins.css.sass +10 -0
  54. data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +11 -12
  55. data/base/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass +2 -1
  56. data/base/app/assets/stylesheets/social_stream/base/notifications.css.sass +10 -0
  57. data/base/app/assets/stylesheets/social_stream/base/profile.css.sass +10 -0
  58. data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +29 -19
  59. data/base/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +42 -47
  60. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -4
  61. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +12 -4
  62. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
  63. data/base/app/assets/stylesheets/social_stream/base/responsive.css.sass +6 -0
  64. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +7 -4
  65. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +1 -2
  66. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +4 -1
  67. data/base/app/assets/stylesheets/social_stream/base/search.css.sass +2 -0
  68. data/base/app/assets/stylesheets/social_stream/base/select2.css.sass +5 -0
  69. data/base/app/assets/stylesheets/social_stream/base/settings.css.sass +10 -0
  70. data/base/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass +1 -2
  71. data/base/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass +5 -0
  72. data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass +2 -1
  73. data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass +4 -2
  74. data/base/app/assets/stylesheets/social_stream/base/sidebar.css.sass +8 -0
  75. data/base/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +1 -1
  76. data/base/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +4 -1
  77. data/base/app/assets/stylesheets/social_stream/base/timeline.css.sass +14 -0
  78. data/base/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass +4 -9
  79. data/base/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass +4 -2
  80. data/base/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass +34 -0
  81. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass +14 -0
  82. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass +28 -0
  83. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass +14 -0
  84. data/base/app/assets/stylesheets/social_stream/base/toolbar.css.sass +10 -0
  85. data/base/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +28 -8
  86. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass +1 -2
  87. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass +14 -2
  88. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss +1 -1
  89. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_forms.scss +8 -0
  90. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss +4 -0
  91. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabOverlay.ttf +0 -0
  92. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular-Outline.ttf +0 -0
  93. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular.ttf +0 -0
  94. data/base/app/assets/stylesheets/social_stream/fonts/colorfont.css +4 -4
  95. data/base/app/assets/stylesheets/social_stream/fonts/fonts.css +4 -4
  96. data/base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass +5 -0
  97. data/base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass +5 -0
  98. data/base/app/controllers/repositories_controller.rb +2 -3
  99. data/base/app/helpers/contacts_helper.rb +30 -17
  100. data/base/app/models/activity_object.rb +16 -17
  101. data/base/app/models/profile.rb +0 -4
  102. data/base/app/views/activities/_root.html.erb +1 -1
  103. data/base/app/views/activities/_timeline_modal.html.erb +2 -2
  104. data/base/app/views/contacts/_contact.html.erb +2 -2
  105. data/base/app/views/contacts/index.html.erb +6 -0
  106. data/base/app/views/explore/_followed.html.erb +6 -6
  107. data/base/app/views/groups/{_new.html.erb → _form.html.erb} +4 -7
  108. data/base/app/views/groups/_new_modal.html.erb +11 -0
  109. data/base/app/views/groups/new.html.erb +5 -1
  110. data/base/app/views/layouts/_footer.html.erb +1 -1
  111. data/base/app/views/layouts/application.html.erb +7 -8
  112. data/base/app/views/profiles/_avatar.html.erb +9 -9
  113. data/base/app/views/profiles/_comunication-info.html.erb +8 -8
  114. data/base/app/views/profiles/_experience.html.erb +15 -15
  115. data/base/app/views/profiles/_personal.html.erb +13 -12
  116. data/base/app/views/profiles/_profile.html.erb +33 -26
  117. data/base/app/views/profiles/_tags.html.erb +8 -12
  118. data/base/app/views/subjects/_subject.html.erb +1 -1
  119. data/base/app/views/toolbar/_logo.html.erb +6 -7
  120. data/base/app/views/toolbar/_profile.html.erb +9 -12
  121. data/base/config/locales/en.yml +462 -444
  122. data/base/config/locales/es.yml +464 -461
  123. data/base/config/locales/pt.yml +504 -379
  124. data/base/config/locales/zh.yml +479 -409
  125. data/base/lib/social_stream/base/version.rb +1 -1
  126. data/base/lib/social_stream/population/actor.rb +10 -0
  127. data/base/lib/social_stream/search.rb +11 -2
  128. data/base/lib/tasks/db/populate.rake +57 -16
  129. data/base/social_stream-base.gemspec +1 -1
  130. data/base/spec/views/profiles_spec.rb +5 -3
  131. data/documents/app/assets/javascripts/social_stream/audio.js.erb +5 -5
  132. data/documents/app/assets/javascripts/social_stream/documents.timeline.js +24 -6
  133. data/documents/app/assets/javascripts/social_stream/documents.wall.js +37 -32
  134. data/documents/app/assets/javascripts/social_stream/video.js +33 -0
  135. data/documents/app/assets/stylesheets/social_stream/documents/create/layout/_new.css.sass +3 -0
  136. data/documents/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass +12 -7
  137. data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-1200px-min.css.sass +8 -1
  138. data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-767px-max.css.sass +27 -2
  139. data/documents/app/assets/stylesheets/social_stream/documents/show/_show.css.sass +29 -0
  140. data/documents/app/assets/stylesheets/social_stream/documents/show/layout/_show.css.sass +36 -0
  141. data/documents/app/assets/stylesheets/social_stream/documents/timeline/_audios.css.sass +27 -12
  142. data/documents/app/views/audios/_audio_processed.html.erb +5 -46
  143. data/documents/app/views/audios/_audio_show.html.erb +16 -57
  144. data/documents/app/views/audios/_player.html.erb +42 -0
  145. data/documents/app/views/common_documents/_index.html.erb +3 -5
  146. data/documents/app/views/videos/_player.html.erb +36 -0
  147. data/documents/app/views/videos/_video_processed.html.erb +5 -43
  148. data/documents/app/views/videos/_video_show.html.erb +10 -60
  149. data/documents/config/locales/en.yml +67 -67
  150. data/documents/config/locales/es.yml +67 -64
  151. data/documents/config/locales/zh.yml +90 -0
  152. data/documents/lib/generators/social_stream/documents/templates/initializer.rb +1 -1
  153. data/documents/lib/social_stream-documents.rb +1 -1
  154. data/documents/lib/social_stream/documents/version.rb +1 -1
  155. data/documents/social_stream-documents.gemspec +1 -1
  156. data/events/app/assets/javascripts/social_stream/fullcalendar.js +14 -2
  157. data/events/app/assets/stylesheets/social_stream/events/responsive/_responsive-767px-max.css.sass +12 -9
  158. data/events/app/controllers/events_controller.rb +7 -1
  159. data/events/app/views/events/_details.html.erb +18 -16
  160. data/events/app/views/events/_show_modal.html.erb +10 -0
  161. data/events/app/views/sidebar/_calendar.html.erb +1 -1
  162. data/events/config/locales/en.yml +32 -31
  163. data/events/config/locales/es.yml +32 -32
  164. data/events/config/locales/zh.yml +57 -0
  165. data/events/lib/social_stream/events/version.rb +1 -1
  166. data/events/social_stream-events.gemspec +1 -1
  167. data/lib/social_stream/components.rb +4 -0
  168. data/lib/social_stream/version.rb +1 -1
  169. data/lib/tasks/i18n.rake +55 -0
  170. data/linkser/app/assets/javascripts/social_stream/linkser.wall.js +12 -6
  171. data/linkser/app/assets/stylesheets/social_stream/linkser/repository/layout/_repository.css.sass +1 -0
  172. data/linkser/app/assets/stylesheets/social_stream/linkser/timeline/layout/_timeline-link.css.sass +6 -1
  173. data/linkser/app/views/links/_new_activity.html.erb +0 -1
  174. data/linkser/app/views/links/_timeline.html.erb +1 -1
  175. data/linkser/config/locales/en.yml +12 -11
  176. data/linkser/config/locales/es.yml +12 -11
  177. data/linkser/config/locales/zh.yml +17 -0
  178. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  179. data/linkser/social_stream-linkser.gemspec +1 -1
  180. data/linkser/vendor/assets/jplayer.blue.monday.video.play.hover.png +0 -0
  181. data/linkser/vendor/assets/jplayer.blue.monday.video.play.png +0 -0
  182. data/linkser/vendor/assets/stylesheets/jplayer.blue.monday.png +0 -0
  183. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass +1 -1
  184. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass +1 -1
  185. data/oauth2_server/app/views/site/clients/show.html.erb +5 -1
  186. data/oauth2_server/config/locales/en.yml +16 -15
  187. data/oauth2_server/config/locales/es.yml +20 -19
  188. data/oauth2_server/config/locales/zh.yml +30 -0
  189. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  190. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  191. data/ostatus/Rakefile +1 -2
  192. data/ostatus/config/locales/en.yml +34 -33
  193. data/ostatus/config/locales/zh.yml +35 -0
  194. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  195. data/ostatus/social_stream-ostatus.gemspec +1 -1
  196. data/places/config/locales/en.yml +58 -67
  197. data/places/config/locales/es.yml +60 -61
  198. data/presence/app/assets/stylesheets/social_stream/presence/_toolbar-chat.css.sass +2 -2
  199. data/presence/config/locales/en.yml +45 -43
  200. data/presence/config/locales/es.yml +45 -43
  201. data/presence/config/locales/zh.yml +69 -0
  202. data/presence/lib/social_stream/presence/version.rb +1 -1
  203. data/presence/social_stream-presence.gemspec +1 -1
  204. data/social_stream.gemspec +7 -7
  205. metadata +68 -44
  206. data/base/app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf +0 -0
  207. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf +0 -0
  208. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf +0 -0
  209. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf +0 -0
  210. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf +0 -0
  211. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf +0 -0
  212. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf +0 -0
  213. data/base/app/assets/stylesheets/social_stream/fonts/RockSalt.ttf +0 -0
  214. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SIL OFL Font License - Source Sans Pro.txt +0 -93
  215. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Black.otf +0 -0
  216. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BlackIt.otf +0 -0
  217. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Bold.otf +0 -0
  218. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BoldIt.otf +0 -0
  219. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf +0 -0
  220. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf +0 -0
  221. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-It.otf +0 -0
  222. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Light.otf +0 -0
  223. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-LightIt.otf +0 -0
  224. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Regular.otf +0 -0
  225. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Semibold.otf +0 -0
  226. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf +0 -0
  227. data/documents/app/assets/javascripts/social_stream/video.js.erb +0 -42
@@ -1,27 +1,27 @@
1
- <section class="experience">
2
- <header>
3
- <%= render partial: 'edit_icon' %>
4
- <h4>
1
+ <section class="accordion-group experience">
2
+ <div class="accordion-heading">
3
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion4" href="#collapseFour">
5
4
  <%= t("profile.#{ @profile.subject.class.to_s.downcase }.experience") %>
6
- </h4>
7
- </header>
5
+ </a>
8
6
 
9
- <div class="briefing">
10
- <% if @profile.experience? %>
11
- <%= simple_format @profile.experience %>
12
- <% else %>
13
- <%= render partial: 'empty' %>
14
- <% end %>
15
- </div>
7
+
8
+ <% if @profile.experience? %>
9
+ <%= simple_format @profile.experience %>
10
+ <% else %>
11
+ <%= render partial: 'empty' %>
12
+ <% end %>
16
13
 
14
+ </div>
17
15
  <% if can? :update, @profile %>
18
- <div class="update">
16
+ <div id="collapseFour" class="accordion-body collapse">
17
+ <div class="accordion-inner">
19
18
  <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
20
19
 
21
20
  <%= f.text_area :experience, :maxlength => 246, :rows => 5 %>
22
21
 
23
22
  <%= f.submit :class => "btn" %>
24
23
  <% end %>
25
- </div>
26
24
  <% end %>
25
+ </div>
26
+ </div>
27
27
  </section>
@@ -1,12 +1,9 @@
1
- <section class="personal">
2
- <header>
3
- <%= render partial: 'edit_icon' %>
4
- <h4>
1
+ <section class="accordion-group personal">
2
+ <div class="accordion-heading">
3
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
5
4
  <%= t("profile.#{ @profile.subject.class.to_s.downcase }.info") %>
6
- </h4>
7
- </header>
8
-
9
- <div class="briefing">
5
+ </a>
6
+
10
7
  <% if @profile.personal_present? %>
11
8
  <% if @profile.organization? %>
12
9
  <h5>
@@ -64,12 +61,15 @@
64
61
  <% end %>
65
62
  </div>
66
63
 
67
- <% if can? :update, @profile %>
68
- <div class="update">
64
+ <div id="collapseTwo" class="accordion-body collapse">
65
+ <div class="accordion-inner">
66
+ <% if can? :update, @profile %>
67
+
69
68
  <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
70
69
  <h6>
71
- <%= f.label t('actor.name') %>
72
70
  <span class="required">*</span>
71
+ <%= f.label t('*actor.name') %>
72
+
73
73
  </h6>
74
74
 
75
75
  <%= f.text_field :name, :class => "required" %>
@@ -102,6 +102,7 @@
102
102
  </p>
103
103
  <%= f.submit :class => "btn" %>
104
104
  <% end %>
105
+ <% end %>
105
106
  </div>
106
- <% end %>
107
+ </div>
107
108
  </section>
@@ -2,32 +2,39 @@
2
2
  <h2 class="colorfont">
3
3
  <%= t('profile.one') %>
4
4
  </h2>
5
+ <div class="accordion" id="accordion2">
6
+ <div class="accordion-group">
7
+ <% if can?(:update, @profile) || @profile.tags_present? %>
8
+ <%= render partial: "tags" %>
9
+ <% end %>
10
+ </div>
11
+ <div class="accordion-group">
12
+ <% if can?(:update, @profile) || @profile.personal_present? %>
13
+ <%= render partial: "personal" %>
14
+ <% end %>
15
+ </div>
16
+ <div class="accordion-group">
17
+ <% if can?(:update, @profile) || @profile.contact_present? %>
18
+ <%= render :partial => "comunication-info" %>
19
+ <% end %>
20
+ </div>
21
+ <div class="accordion-group">
22
+ <% if can?(:update, @profile) || @profile.experience? %>
23
+ <%= render :partial => "experience" %>
24
+ <% end %>
25
+ </div>
26
+ <div class="accordion-group">
27
+ <% if can?(:update, @profile) || @profile.personal_present? %>
28
+ <%= render :partial => "avatar" %>
29
+ <% end %>
30
+ </div>
5
31
 
6
- <% if can?(:update, @profile) || @profile.tags_present? %>
7
- <%= render partial: "tags" %>
8
- <% end %>
9
-
10
- <% if can?(:update, @profile) || @profile.personal_present? %>
11
- <%= render partial: "personal" %>
12
- <% end %>
13
-
14
- <% if can?(:update, @profile) || @profile.contact_present? %>
15
- <%= render :partial => "comunication-info" %>
16
- <% end %>
17
-
18
- <% if can?(:update, @profile) || @profile.experience? %>
19
- <%= render :partial => "experience" %>
20
- <% end %>
21
-
22
- <% if can?(:update, @profile) || @profile.personal_present? %>
23
- <%= render :partial => "avatar" %>
24
- <% end %>
25
-
26
- <%= javascript_tag do %>
27
- $(function() {
28
- SocialStream.Profile.show({
29
- section: "<%= params[:section ] %>"
32
+ <%= javascript_tag do %>
33
+ $(function() {
34
+ SocialStream.Profile.show({
35
+ section: "<%= params[:section ] %>"
36
+ });
30
37
  });
31
- });
32
- <% end %>
38
+ <% end %>
39
+ </div>
33
40
  </div>
@@ -1,26 +1,22 @@
1
- <section class="tags">
2
- <header>
3
- <%= render partial: 'edit_icon' %>
4
- <h4>
1
+ <section class="tags accordion-group">
2
+ <div class="accordion-heading">
3
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
5
4
  <%= t('profile.tags.other') %>
6
- </h4>
7
- </header>
8
-
9
-
10
- <div class="briefing">
5
+ </a>
11
6
  <% if @profile.subject.tag_list.count > 0 %>
12
7
  <%= tag_list @profile.subject %>
13
8
  <% else %>
14
9
  <%= render partial: 'empty' %>
15
10
  <% end %>
11
+ <% if can?(:update, @profile) %>
16
12
  </div>
17
-
18
- <% if can?(:update, @profile) %>
19
- <div class="update">
13
+ <div id="collapseOne" class="update accordion-body collapse">
14
+ <div class="accordion-inner">
20
15
  <%= form_for(@profile, :url => [ @profile.subject, :profile ]) do |f| %>
21
16
  <%= f.text_field :tag_list, "data-path" => tags_path(format: :json) %>
22
17
  <%= f.submit :class => "btn" %>
23
18
  <% end %>
24
19
  </div>
25
20
  <% end %>
21
+ </div>
26
22
  </section>
@@ -9,7 +9,7 @@
9
9
  </div>
10
10
 
11
11
  <div class="info">
12
- 2 contactos en comun
12
+ <%= contact_count subject %>
13
13
  </div>
14
14
  </div>
15
15
  </div>
@@ -1,14 +1,13 @@
1
1
  <div id="avatar_profile">
2
- <% if subject == current_subject %>
2
+ <%= link_to image_tag(subject.logo.url(:medium), :alt => subject.name , :size => "150x150"), subject %>
3
3
 
4
- <%= link_to image_tag(subject.logo.url(:medium), :alt => subject.name , :size => "150x150", :id => "current_avatar_img"), subject %>
4
+ <% if subject == current_subject %>
5
5
  <div class="logo_menu logo_caption">
6
- <%= link_to t('avatar.profile_change'), polymorphic_path([subject, :profile], section: :avatar) %>
6
+ <%= link_to t('avatar.profile_change'), polymorphic_path([subject, :profile], section: :avatar) %>
7
7
  </div>
8
- <% else %>
9
- <%= link_to image_tag(subject.logo.url, :alt => subject.name , :size => "150x150"), subject %>
10
8
  <% end %>
11
9
  </div>
10
+
12
11
  <div class= "subject-name-phone">
13
- <%= subject.name %>
14
- </div>
12
+ <%= subject.name %>
13
+ </div>
@@ -5,13 +5,7 @@
5
5
 
6
6
  <% if current_subject.present? && subject != current_subject %>
7
7
  <div class="contact-button">
8
- <%= contact_to subject %>
9
-
10
- <%= javascript_tag do %>
11
- $(function() {
12
- SocialStream.Contact.show();
13
- });
14
- <% end %>
8
+ <%= contact_button subject %>
15
9
  </div>
16
10
  <% end %>
17
11
 
@@ -32,11 +26,14 @@
32
26
  <% end %>
33
27
  </li>
34
28
  <% end %>
35
- <li>
36
- <%= link_to new_message_path do %>
37
- <i class='icon_navbar-message'></i> <%= t 'mailboxer.send' %>
38
- <% end %>
39
- </li>
29
+
30
+ <% if subject != current_subject %>
31
+ <li>
32
+ <%= link_to new_message_path(receiver: subject.slug) do %>
33
+ <i class='icon_navbar-message'></i> <%= t 'mailboxer.send' %>
34
+ <% end %>
35
+ </li>
36
+ <% end %>
40
37
 
41
38
  <div class="base_items"/>
42
39
  </ul>
@@ -1,615 +1,633 @@
1
+ ---
1
2
  en:
2
- language_name: "English"
3
+ language_name: English
3
4
  actor:
4
- name: "Name"
5
+ name: Name
5
6
  action:
6
- send: "Send"
7
- accept: "Accept"
7
+ send: Send
8
+ accept: Accept
8
9
  account:
9
- cancel: "Cancel account"
10
- edit: "Edit account"
11
- email:
12
- change: "Change email address"
13
- lang:
14
- change: "Change language"
15
- one: "Account"
10
+ cancel: Cancel account
11
+ edit: Edit account
12
+ email:
13
+ change: Change email address
14
+ lang:
15
+ change: Change language
16
+ one: Account
16
17
  password:
17
- change: "Change password"
18
- new: "New password"
19
- retype: "Retype new password"
18
+ change: Change password
19
+ new: New password
20
+ retype: Retype new password
20
21
  activerecord:
21
22
  attributes:
22
23
  contact:
23
- relation_ids: "Roles"
24
+ relation_ids: Roles
24
25
  relation/custom:
25
- name: "Name"
26
+ name: Name
26
27
  user:
27
- email: "Email"
28
- name: "Name"
29
- password: "Password"
30
- password_confirmation: "Confirm password"
31
- remember_me: "Remember me"
28
+ email: Email
29
+ name: Name
30
+ password: Password
31
+ password_confirmation: Confirm password
32
+ remember_me: Remember me
32
33
  activity:
33
34
  audience:
34
35
  hidden:
35
- summary: "Restricted"
36
- full: "Shared with contacts of %{audience}"
36
+ summary: Restricted
37
+ full: Shared with contacts of %{audience}
37
38
  public:
38
- summary: "Public"
39
- full: "Shared with all the Internet"
40
- show: "Show"
39
+ summary: Public
40
+ full: Shared with all the Internet
41
+ show: Show
41
42
  visible:
42
- summary: "Restricted"
43
- full: "Shared with %{audience}"
44
- confirm_delete: "Delete activity?"
45
- delete: "Delete"
46
- last: "Last Activities"
47
- like: "I like"
43
+ summary: Restricted
44
+ full: Shared with %{audience}
45
+ confirm_delete: Delete activity?
46
+ delete: Delete
47
+ last: Last Activities
48
+ like: I like
48
49
  like_sentence:
49
- one: "%{likers} likes this"
50
- other: "%{likers} like this"
51
- more:
52
- one: "Activity"
53
- other: "Activities"
50
+ one: '%{likers} likes this'
51
+ other: '%{likers} like this'
52
+ more:
53
+ one: Activity
54
+ other: Activities
54
55
  privacy:
55
56
  contact:
56
57
  myself:
57
- group: "All members"
58
- user: "Your contacts"
58
+ group: All members
59
+ user: Your contacts
59
60
  outside:
60
- group: "Members of %{receiver}"
61
- user: "Contacts of %{receiver}"
61
+ group: Members of %{receiver}
62
+ user: Contacts of %{receiver}
62
63
  relation:
63
- one: "%{count} group"
64
- other: "%{count} groups"
65
- sending: "Sending"
66
- share: "Share"
64
+ one: '%{count} group'
65
+ other: '%{count} groups'
66
+ sending: Sending
67
+ share: Share
67
68
  stream:
68
- atom_title: "Activity Stream from %{subject}"
69
+ atom_title: Activity Stream from %{subject}
69
70
  title:
70
- follow: "%{author} added %{activity_object} as contact"
71
- like: "%{author} likes %{activity_object}"
72
- make-friend: "%{author} also added %{activity_object} as contact"
73
- post: "%{author} posted %{activity_object}"
74
- updated: "%{author} posted %{activity_object}"
75
- title: "Activities"
76
- to_comment: "Comment"
77
- unlike: "I do not like anymore"
71
+ follow: '%{author} added %{activity_object} as contact'
72
+ like: '%{author} likes %{activity_object}'
73
+ make-friend: '%{author} also added %{activity_object} as contact'
74
+ post: '%{author} posted %{activity_object}'
75
+ updated: '%{author} posted %{activity_object}'
76
+ title: Activities
77
+ to_comment: Comment
78
+ unlike: I do not like anymore
78
79
  verb:
79
80
  follow:
80
81
  User:
81
- title: "%{subject} added %{contact} as contact."
82
- message: "%{name} added you as contact."
82
+ title: '%{subject} added %{contact} as contact.'
83
+ message: '%{name} added you as contact.'
83
84
  Group:
84
- title: "%{subject} added %{contact} as contact."
85
- message: "%{name} added you as contact."
85
+ title: '%{subject} added %{contact} as contact.'
86
+ message: '%{name} added you as contact.'
86
87
  like:
87
88
  User:
88
- title: "%{subject} is a fan of %{contact}."
89
- message: "%{name} is now your fan."
89
+ title: '%{subject} is a fan of %{contact}.'
90
+ message: '%{name} is now your fan.'
90
91
  Group:
91
- title: "%{subject} is a fan of %{contact}."
92
- message: "%{name} is now your fan."
93
- join:
94
- one: "%{sender} joined the %{title} %{thing}."
92
+ title: '%{subject} is a fan of %{contact}.'
93
+ message: '%{name} is now your fan.'
94
+ join:
95
+ one: '%{sender} joined the %{title} %{thing}.'
95
96
  make-friend:
96
97
  User:
97
- title: "%{subject} and %{contact} are now connected."
98
- message: "%{name} also added you as contact."
98
+ title: '%{subject} and %{contact} are now connected.'
99
+ message: '%{name} also added you as contact.'
99
100
  Group:
100
- title: "%{subject} added %{contact} as contact."
101
- message: "%{name} added you as contact."
101
+ title: '%{subject} added %{contact} as contact.'
102
+ message: '%{name} added you as contact.'
102
103
  post:
103
104
  title:
104
- other_wall: "%{sender} → %{receiver}"
105
+ other_wall: '%{sender} → %{receiver}'
105
106
  activity_action:
106
- follow: "Follow"
107
+ follow: Follow
107
108
  sentence:
108
109
  follow:
109
- one: "%{followers} follows this"
110
- other: "%{followers} follow this"
110
+ one: '%{followers} follows this'
111
+ other: '%{followers} follow this'
111
112
  more:
112
- one: "%{count} more person"
113
- other: "%{count} more people"
114
- unfollow: "Unfollow"
113
+ one: '%{count} more person'
114
+ other: '%{count} more people'
115
+ unfollow: Unfollow
115
116
  ajax:
116
- error: "There was an error in the remote server"
117
- browse: "Browse"
117
+ error: There was an error in the remote server
118
+ browse: Browse
118
119
  button:
119
- cancel: "Cancel"
120
- create: "Create"
121
- save: "Save"
122
- update: "Update"
120
+ cancel: Cancel
121
+ create: Create
122
+ save: Save
123
+ update: Update
123
124
  cheesecake:
124
125
  changes:
125
- details: "Change details"
126
- none: "No changes"
127
- save: "Save changes"
128
- saving: "Saving..."
126
+ details: Change details
127
+ none: No changes
128
+ save: Save changes
129
+ saving: Saving...
129
130
  form:
130
- editing: "Editing"
131
+ editing: Editing
131
132
  fields:
132
- color: "Color"
133
- name: "Name"
134
- permissions: "Permissions"
135
- subsector: "Subsector"
133
+ color: Color
134
+ name: Name
135
+ permissions: Permissions
136
+ subsector: Subsector
136
137
  select:
137
- hint: "Select by clicking the portraits"
138
+ hint: Select by clicking the portraits
138
139
  comment:
139
- input: "Write a comment..."
140
- confirm_delete: "Delete comment?"
141
- name: "comment"
142
- one: "a comment"
143
- other: "comments"
140
+ input: Write a comment...
141
+ confirm_delete: Delete comment?
142
+ name: comment
143
+ one: a comment
144
+ other: comments
144
145
  title:
145
- one: "Comment"
146
- other: "Comments"
147
- view_all: "View all comments (%{count})"
146
+ one: Comment
147
+ other: Comments
148
+ view_all: View all comments (%{count})
148
149
  contact:
149
- all_n: "All contacts (%{count})"
150
- confirm_delete: "Remove contact?"
151
- current: "Current"
152
- delete: "Delete"
150
+ all_n: All contacts (%{count})
151
+ confirm_delete: Remove contact?
152
+ current: Current
153
+ delete: Delete
153
154
  edit:
154
- title: "Edit contact to %{name}"
155
- submit: "Edit contact"
156
- empty: "You have not added anybody yet. What about <a href=\"%{explore}\">exploring</a>?"
155
+ title: Edit contact to %{name}
156
+ submit: Edit contact
157
+ empty: You have not added anybody yet. What about <a href="%{explore}">exploring</a>?
157
158
  error_count:
158
- one: "1 error prohibited this contact from being saved:"
159
- other: "%{count} errors prohibited this contact from being saved:"
160
- follow: "Follow"
161
- following: "Following"
159
+ one: '1 error prohibited this contact from being saved:'
160
+ other: '%{count} errors prohibited this contact from being saved:'
161
+ follow: Follow
162
+ following: Following
162
163
  graph:
163
- one: "Graph"
164
- empty: "We're sorry but you don't have any contacts yet. You can try the search box to look for somebody!"
164
+ one: Graph
165
+ empty: We're sorry but you don't have any contacts yet. You can try the search
166
+ box to look for somebody!
165
167
  in_common:
166
- one: "1 contact in common"
167
- other: "%{count} contacts in common"
168
+ one: 1 contact in common
169
+ other: '%{count} contacts in common'
168
170
  n:
169
- one: "%{count} contact"
170
- other: "%{count} contacts"
171
+ one: '%{count} contact'
172
+ other: '%{count} contacts'
171
173
  new:
172
174
  button:
173
- zero: "Add"
174
- one: "%{count} role"
175
- other: "%{count} roles"
176
- link: "+ Add contact"
177
- title: "Add %{name} to your contacts"
178
- menu: "Add contact"
179
- submit: "Add Contact"
180
- one: "Contact"
181
- other: "Contacts"
175
+ zero: Add
176
+ one: '%{count} role'
177
+ other: '%{count} roles'
178
+ link: + Add contact
179
+ title: Add %{name} to your contacts
180
+ menu: Add contact
181
+ submit: Add Contact
182
+ one: Contact
183
+ other: Contacts
182
184
  pending:
183
- other: "Added you"
184
- all: "All"
185
- all_n: "See all pending requests (%{count})"
186
- received: "Received"
185
+ other: Added you
186
+ all: All
187
+ all_n: See all pending requests (%{count})
188
+ received: Received
187
189
  relation:
188
- one: "Contact type"
189
- new: "New type"
190
+ one: Contact type
191
+ new: New type
190
192
  reply:
191
- link: "+ Reply contact"
192
- title: "Reply contact request to %{name}"
193
- submit: "Reply contact"
194
- saving: "Saving..."
195
- sent: "Added"
193
+ link: + Reply contact
194
+ title: Reply contact request to %{name}
195
+ submit: Reply contact
196
+ saving: Saving...
197
+ sent: Added
196
198
  suggestion:
197
- one: "Suggestion"
198
- other: "Suggestions"
199
- all: "All"
199
+ one: Suggestion
200
+ other: Suggestions
201
+ all: All
200
202
  type:
201
- new: "+ New type"
202
- unfollow: "Unfollow"
203
- view_all: "View all..."
204
- copyright: "2013 Copyright - All rights reserved"
203
+ new: + New type
204
+ unfollow: Unfollow
205
+ view_all: View all...
206
+ copyright: 2013 Copyright - All rights reserved
205
207
  counter:
206
208
  like:
207
- one: "<span class=\"counter\">%{count}</span> like"
208
- other: "<span class=\"counter\">%{count}</span> likes"
209
+ one: <span class="counter">%{count}</span> like
210
+ other: <span class="counter">%{count}</span> likes
209
211
  view:
210
- one: "<span class=\"counter\">%{count}</span> view"
211
- other: "<span class=\"counter\">%{count}</span> views"
212
+ one: <span class="counter">%{count}</span> view
213
+ other: <span class="counter">%{count}</span> views
212
214
  delete:
213
- confirm: "Delete %{element}}?"
215
+ confirm: Delete %{element}}?
214
216
  devise:
215
217
  links:
216
- sign_in: "Sign in"
217
- sign_up: "Sign up"
218
- forgot_password: "Forgot you password?"
219
- confirmation_instructions: "Didn't receive confirmation instructions?"
220
- unlock_instructions: "Didn't receive unlock instructions?"
221
- sign_in_with: "Sign in with %{provider}"
218
+ sign_in: Sign in
219
+ sign_up: Sign up
220
+ forgot_password: Forgot you password?
221
+ confirmation_instructions: Didn't receive confirmation instructions?
222
+ unlock_instructions: Didn't receive unlock instructions?
223
+ sign_in_with: Sign in with %{provider}
222
224
  passwords:
223
- confirm: "Confirm password"
224
- forgot: "Forgot your password?"
225
- instructions: "Type the email address bound to your account and we will sent you instructions to change it:"
226
- update: "Change your password"
225
+ confirm: Confirm password
226
+ forgot: Forgot your password?
227
+ instructions: 'Type the email address bound to your account and we will sent
228
+ you instructions to change it:'
229
+ update: Change your password
227
230
  dropdown:
228
- notifications: "Notifications"
229
- privacy: "Privacy"
230
- settings: "Settings"
231
+ notifications: Notifications
232
+ privacy: Privacy
233
+ settings: Settings
231
234
  explore:
232
235
  explore:
233
- most_followed: "Most followed"
234
- most_popular: "Most popular"
236
+ most_followed: Most followed
237
+ most_popular: Most popular
235
238
  header:
236
- explore: "Explore"
237
- participants: "Participants"
238
- resources: "Resources"
239
- timeline: "Timeline"
240
- tags: "Tags"
241
- search: "Search"
242
- link: "Explore"
243
- or: "or Explore"
239
+ explore: Explore
240
+ participants: Participants
241
+ resources: Resources
242
+ timeline: Timeline
243
+ tags: Tags
244
+ search: Search
245
+ link: Explore
246
+ or: or Explore
244
247
  participants:
245
- last_active: "Last active"
246
- last_registered: "Last registered"
247
- most_members: "Most members"
248
- registered_since: "since %{time}"
248
+ last_active: Last active
249
+ last_registered: Last registered
250
+ most_members: Most members
251
+ registered_since: since %{time}
249
252
  resources:
250
- last_uploaded: "Last uploaded"
251
- most_visited: "Most viewed"
252
- uploaded_since: "since %{time}"
253
+ last_uploaded: Last uploaded
254
+ most_visited: Most viewed
255
+ uploaded_since: since %{time}
253
256
  search:
254
- title: "Advanced search"
255
- placeholder: "looking for..."
256
- submit: "Search"
257
+ title: Advanced search
258
+ placeholder: looking for...
259
+ submit: Search
257
260
  follower:
258
261
  follower:
259
- title: "Followers"
262
+ title: Followers
260
263
  following:
261
- title: "Followings"
264
+ title: Followings
262
265
  n:
263
- one: "1 follower"
264
- other: "%{count} followers"
265
- forgot_password: "Forgot you password?"
266
+ one: 1 follower
267
+ other: '%{count} followers'
268
+ forgot_password: Forgot you password?
266
269
  frontpage:
267
- main_title: "Social Stream, the core for building distributed social network websites."
270
+ main_title: Social Stream, the core for building distributed social network websites.
268
271
  presentation:
269
272
  modular:
270
- header: "Modular"
271
- p: "Available <a href=\"https://github.com/ging/social_stream#social-stream-components\">Social Stream components</a> provide your application only with the features you need in your social network. Just add your desired gems to your Gemfile"
273
+ header: Modular
274
+ p: Available <a href="https://github.com/ging/social_stream#social-stream-components">Social
275
+ Stream components</a> provide your application only with the features you
276
+ need in your social network. Just add your desired gems to your Gemfile
272
277
  flexible:
273
- header: "Flexible"
274
- p: "Completely customize your social network <a href=\"https://github.com/ging/social_stream/wiki/How-to-change-controllers%2C-models%2C-views%2C-assets-and-locales\">changing any Social Stream component</a>, <a href=\"https://github.com/ging/social_stream/wiki/How-to-add-new-activity-objects\">adding new activity objects</a> or changing the CSS using <a href=\"http://sass-lang.com/\">Sass</a>"
278
+ header: Flexible
279
+ p: Completely customize your social network <a href="https://github.com/ging/social_stream/wiki/How-to-change-controllers%2C-models%2C-views%2C-assets-and-locales">changing
280
+ any Social Stream component</a>, <a href="https://github.com/ging/social_stream/wiki/How-to-add-new-activity-objects">adding
281
+ new activity objects</a> or changing the CSS using <a href="http://sass-lang.com/">Sass</a>
275
282
  community:
276
- header: "Community"
277
- p: "Social Stream enjoys a growing community of developers. Feel free to drop a message at <a href=\"http://groups.google.com/group/social-stream\">Social Stream's Google group</a> or <a href=\"http://stackoverflow.com/questions/tagged/social-stream\">StackOverflow</a> if you have problems. <a href=\"https://github.com/ging/social_stream/issues/new\">Open an issue</a> if you find a defect. Pull request are very welcomed!"
278
- stats: "%{users} users and %{groups} groups registered"
283
+ header: Community
284
+ p: Social Stream enjoys a growing community of developers. Feel free to drop
285
+ a message at <a href="http://groups.google.com/group/social-stream">Social
286
+ Stream's Google group</a> or <a href="http://stackoverflow.com/questions/tagged/social-stream">StackOverflow</a>
287
+ if you have problems. <a href="https://github.com/ging/social_stream/issues/new">Open
288
+ an issue</a> if you find a defect. Pull request are very welcomed!
289
+ stats: '%{users} users and %{groups} groups registered'
279
290
  group:
280
- one: "group"
281
- other: "groups"
282
- all: "All groups"
283
- all_n: "All groups (%{count})"
284
- by: "By groups"
291
+ one: group
292
+ other: groups
293
+ all: All groups
294
+ all_n: All groups (%{count})
295
+ by: By groups
285
296
  destroy:
286
- one: "Destroy group"
287
- explanation: "All the activities, information and contacts of this group will be destroyed!"
288
- go_ahead: "Yes, I am sure. Destroy all!"
289
- last_confirm: "This is your last chance. Are you really sure?"
297
+ one: Destroy group
298
+ explanation: All the activities, information and contacts of this group will
299
+ be destroyed!
300
+ go_ahead: Yes, I am sure. Destroy all!
301
+ last_confirm: This is your last chance. Are you really sure?
290
302
  form:
291
- title: "Group"
292
- input: "What is the name of the group?"
293
- last: "Last groups"
294
- my: "My groups"
303
+ title: Group
304
+ input: What is the name of the group?
305
+ last: Last groups
306
+ my: My groups
295
307
  n:
296
- one: "%{count} group"
297
- other: "%{count} groups"
308
+ one: '%{count} group'
309
+ other: '%{count} groups'
298
310
  new:
299
- action: "New group"
300
- name: "Name"
301
- description: "Description"
302
- participants: "Participants"
303
- cloud: "Group tag cloud"
311
+ link: New group
312
+ name: Name
313
+ description: Description
314
+ participants: Participants
315
+ title: New group
316
+ cloud: Group tag cloud
304
317
  most:
305
- followed: "Most followed"
306
- liked: "Most liked"
307
- tags: "Tags"
318
+ followed: Most followed
319
+ liked: Most liked
320
+ tags: Tags
308
321
  title:
309
- one: "Group"
310
- other: "Groups"
311
- view_all: "View all..."
322
+ one: Group
323
+ other: Groups
324
+ view_all: View all...
312
325
  header:
313
326
  icon:
314
- contacts: "Contacts"
315
- home: "Home"
316
- messages: "Messages"
317
- repository: "Repository"
318
- help: "Help"
327
+ contacts: Contacts
328
+ home: Home
329
+ messages: Messages
330
+ repository: Repository
331
+ help: Help
319
332
  helpers:
320
333
  submit:
321
334
  relation_custom:
322
- create: "Save"
323
- update: "Update"
324
- home: "Home"
335
+ create: Save
336
+ update: Update
337
+ home: Home
325
338
  inbox:
326
- one: "Inbox"
339
+ one: Inbox
327
340
  invitation:
328
- e-mails: "E-mail addresses"
329
- error: "Your request was unprocessable. Make sure you wrote correct e-mail addresses."
330
- invited: "%{sender} has invited you to %{site}!"
331
- join: "Invite other people to join %{site}!"
332
- join_me: "Join me at %{site}!"
333
- one: "Invitation"
334
- other: "Invitations"
335
- toolbar: "Invite"
336
- success: "Your invitations have successfully been sent"
337
- text: "Write your own message"
341
+ e-mails: E-mail addresses
342
+ error: Your request was unprocessable. Make sure you wrote correct e-mail addresses.
343
+ invited: '%{sender} has invited you to %{site}!'
344
+ join: Invite other people to join %{site}!
345
+ join_me: Join me at %{site}!
346
+ one: Invitation
347
+ other: Invitations
348
+ toolbar: Invite
349
+ success: Your invitations have successfully been sent
350
+ text: Write your own message
338
351
  layout:
339
- more: "See more (%{count})"
352
+ more: See more (%{count})
340
353
  like:
341
354
  n:
342
- one: "%{count} like"
343
- other: "%{count} likes"
355
+ one: '%{count} like'
356
+ other: '%{count} likes'
344
357
  location:
345
- message: "You are here > %{location}"
346
- base: "You are here"
347
- separator: " > "
358
+ message: You are here > %{location}
359
+ base: You are here
360
+ separator: ' > '
348
361
  mailboxer:
349
- delete: "Delete"
350
- delete_confirm: "Do you want to move '%{object}' to trash?"
362
+ delete: Delete
363
+ delete_confirm: Do you want to move '%{object}' to trash?
351
364
  form:
352
- body: "Body"
353
- recipients: "Recipients"
354
- subject: "Subject"
355
- mark_as_read: "Mark as read"
365
+ body: Body
366
+ recipients: Recipients
367
+ subject: Subject
368
+ mark_as_read: Mark as read
356
369
  message_mailer:
357
- has_sent_new:
358
- event: "has sent a new message to %{receiver}"
359
- group: "has sent a new message to %{receiver}"
360
- user: "has sent you a new message"
361
- has_sent_reply:
362
- event: "has sent a reply to %{receiver}"
363
- group: "has sent a reply to %{receiver}"
364
- user: "has sent you a reply"
365
- subject_new: "%{subject}"
366
- subject_reply: "%{subject}"
370
+ has_sent_new:
371
+ event: has sent a new message to %{receiver}
372
+ group: has sent a new message to %{receiver}
373
+ user: has sent you a new message
374
+ has_sent_reply:
375
+ event: has sent a reply to %{receiver}
376
+ group: has sent a reply to %{receiver}
377
+ user: has sent you a reply
378
+ subject_new: '%{subject}'
379
+ subject_reply: '%{subject}'
367
380
  notification_mailer:
368
- subject: "%{subject}"
369
- reply: "Reply"
370
- send: "Send message"
371
- sent: "Your message was sent"
381
+ subject: '%{subject}'
382
+ reply: Reply
383
+ send: Send message
384
+ sent: Your message was sent
372
385
  menu:
373
- options: "Menu Options"
374
- information: "Information"
375
- wall: "Wall"
386
+ options: Menu Options
387
+ information: Information
388
+ wall: Wall
376
389
  message:
377
- answer: "Write your answer"
378
- inbox: "Inbox"
379
- look: "Take a look at this conversation"
380
- new: "New Message"
381
- one: "Message"
382
- other: "Messages"
383
- participants: "Participants"
384
- send: "Send a message"
385
- sentbox: "Sentbox"
386
- trash: "Trash"
390
+ answer: Write your answer
391
+ inbox: Inbox
392
+ look: Take a look at this conversation
393
+ new: New Message
394
+ one: Message
395
+ other: Messages
396
+ participants: Participants
397
+ send: Send a message
398
+ sentbox: Sentbox
399
+ trash: Trash
387
400
  notification:
388
- all_text: "Read the whole text at %{url}"
389
- confirm: "Confirm %{sender} as contact?"
390
- default: "You have a new notification"
391
- destroy_sure: "Do you want to delete this notification?"
392
- fan: "%{sender} is now %{whose} fan."
401
+ all_text: Read the whole text at %{url}
402
+ confirm: Confirm %{sender} as contact?
403
+ default: You have a new notification
404
+ destroy_sure: Do you want to delete this notification?
405
+ fan: '%{sender} is now %{whose} fan.'
393
406
  follow:
394
- group: "%{sender} added %{who} as contact."
395
- user: "%{sender} added %{who} as contact."
396
- hello: "Hi %{receiver},"
407
+ group: '%{sender} added %{who} as contact.'
408
+ user: '%{sender} added %{who} as contact.'
409
+ hello: Hi %{receiver},
397
410
  like:
398
- group: "%{sender} likes %{whose} %{thing}."
399
- user: "%{sender} likes %{whose} %{thing}."
400
- look: "Take a look at %{sender}'s profile"
411
+ group: '%{sender} likes %{whose} %{thing}.'
412
+ user: '%{sender} likes %{whose} %{thing}.'
413
+ look: Take a look at %{sender}'s profile
401
414
  makefriend:
402
- group: "%{sender} also added %{who} as contact."
403
- user: "%{sender} also added %{who} as contact."
404
- one: "Notification"
405
- other: "Notifications"
415
+ group: '%{sender} also added %{who} as contact.'
416
+ user: '%{sender} also added %{who} as contact.'
417
+ one: Notification
418
+ other: Notifications
406
419
  post:
407
- group: "%{title} -- by %{sender} in %{whose} wall"
408
- user: "%{title} -- by %{sender} in %{whose} wall"
409
- read: "Mark as read"
410
- read_all: "Mark all as read"
411
- unread: "Mark as unread"
420
+ group: '%{title} -- by %{sender} in %{whose} wall'
421
+ user: '%{title} -- by %{sender} in %{whose} wall'
422
+ read: Mark as read
423
+ read_all: Mark all as read
424
+ unread: Mark as unread
412
425
  update:
413
- group: "%{sender} updated %{thing} in %{whose} wall."
414
- user: "%{sender} updated %{thing} in %{whose} wall."
415
- visit: "Visit %{url} and check all your notifications."
416
- watch: "Watch it at %{url}"
417
- watch_it: "Watch it!"
426
+ group: '%{sender} updated %{thing} in %{whose} wall.'
427
+ user: '%{sender} updated %{thing} in %{whose} wall.'
428
+ visit: Visit %{url} and check all your notifications.
429
+ watch: Watch it at %{url}
430
+ watch_it: Watch it!
418
431
  who:
419
- group: "%{name}"
420
- user: "you"
421
- whose:
422
- group: "%{receiver}'s"
423
- user: "your"
432
+ group: '%{name}'
433
+ user: you
434
+ whose:
435
+ group: '%{receiver}''s'
436
+ user: your
424
437
  post:
425
- confirm_delete: "Delete post?"
438
+ confirm_delete: Delete post?
426
439
  form:
427
- title: "Post"
428
- input: "Share you thoughts here!"
429
- name: "post"
430
- one: "a post"
431
- other: "posts"
440
+ title: Post
441
+ input: Share you thoughts here!
442
+ name: post
443
+ one: a post
444
+ other: posts
432
445
  title:
433
- one: "Post"
434
- other: "Posts"
446
+ one: Post
447
+ other: Posts
435
448
  preposition:
436
- and: "and"
437
- on: "on"
449
+ and: and
450
+ true: 'on'
438
451
  profile:
439
- one: "Profile"
440
- age: "Age"
441
- is_on: "is on"
442
- must_be_signed_id: "You must be signed in"
452
+ one: Profile
453
+ age: Age
454
+ is_on: is on
455
+ must_be_signed_id: You must be signed in
443
456
  group:
444
- about: "About us"
445
- birthday: "Anniversary"
446
- experience: "Area of expertise"
447
- info: "Group information"
448
- tags: "Group tags"
457
+ about: About us
458
+ birthday: Anniversary
459
+ experience: Area of expertise
460
+ info: Group information
461
+ tags: Group tags
449
462
  user:
450
- about: "About me"
451
- birthday: "Birthday"
452
- experience: "Experience"
453
- info: "Personal information"
454
- tags: "User tags"
455
- actualcity: "Actual City"
456
- address: "Address"
457
- contact: "Contact information"
458
- country: "Country"
459
- email: "E-mail"
460
- empty: "These fields are empty. Please, update them."
461
- fax: "Fax"
462
- mobile: "Mobile"
463
- organization: "Organization"
464
- phone: "Phone"
465
- profile: "Edit profile"
463
+ about: About me
464
+ birthday: Birthday
465
+ experience: Experience
466
+ info: Personal information
467
+ tags: User tags
468
+ actualcity: Actual City
469
+ address: Address
470
+ contact: Contact information
471
+ country: Country
472
+ email: E-mail
473
+ empty: These fields are empty. Please, update them.
474
+ fax: Fax
475
+ mobile: Mobile
476
+ organization: Organization
477
+ phone: Phone
478
+ profile: Edit profile
466
479
  tags:
467
- default: "social, stream,"
468
- other: "Tags"
469
- website: "Website"
480
+ default: social, stream,
481
+ other: Tags
482
+ website: Website
470
483
  update:
471
- error: "Please, check the format of your profile:"
472
- success: "Your profile has been updated"
484
+ error: 'Please, check the format of your profile:'
485
+ success: Your profile has been updated
473
486
  public:
474
- other: "Everybody"
487
+ other: Everybody
475
488
  permission:
476
489
  description:
477
490
  default:
478
491
  brief:
479
- create:
480
- activity: "Post to your wall"
492
+ create:
493
+ activity: Post to your wall
481
494
  follow:
482
- nil: "Follow their activity"
495
+ nil: Follow their activity
483
496
  read:
484
- activity: "Read your wall"
497
+ activity: Read your wall
485
498
  represent:
486
- nil: "Administrate"
499
+ nil: Administrate
487
500
  notify:
488
- nil: "Notify"
501
+ nil: Notify
489
502
  detailed:
490
503
  create:
491
504
  activity:
492
- positive: "They WILL BE ABLE to post new activities to your wall"
493
- negative: "They WILL NOT BE ABLE to post new activities to your wall"
505
+ positive: They WILL BE ABLE to post new activities to your wall
506
+ negative: They WILL NOT BE ABLE to post new activities to your wall
494
507
  follow:
495
508
  nil:
496
- positive: "Activities of the contacts at %{relation} WILL APPEAR in your home wall"
497
- negative: "Activities of the contacts at %{relation} WILL APPEAR in your home wall"
509
+ positive: Activities of the contacts at %{relation} WILL APPEAR in your
510
+ home wall
511
+ negative: Activities of the contacts at %{relation} WILL APPEAR in your
512
+ home wall
498
513
  read:
499
514
  activity:
500
- positive: "They WILL BE ABLE to read posts in your wall, except those shared with specific contacts"
501
- negative: "They WILL NOT BE ABLE to read posts in your wall, except those marked as public"
515
+ positive: They WILL BE ABLE to read posts in your wall, except those
516
+ shared with specific contacts
517
+ negative: They WILL NOT BE ABLE to read posts in your wall, except those
518
+ marked as public
502
519
  represent:
503
520
  nil:
504
- positive: "They WILL BE ABLE to change session and act as %{subject}"
505
- negative: "They WILL NOT BE ABLE to change session and act as %{subject}"
521
+ positive: They WILL BE ABLE to change session and act as %{subject}
522
+ negative: They WILL NOT BE ABLE to change session and act as %{subject}
506
523
  notify:
507
524
  nil:
508
- positive: "Activities WILL BE notified to contacts at %{name}"
509
- negative: "Activities WILL NOT BE notified to contacts at %{name}"
525
+ positive: Activities WILL BE notified to contacts at %{name}
526
+ negative: Activities WILL NOT BE notified to contacts at %{name}
510
527
  of_relation:
511
- choose: "Permissions in <strong>%{name}</strong> role"
512
- postit: "Manage the permissions of your contacts and create new roles"
528
+ choose: Permissions in <strong>%{name}</strong> role
529
+ postit: Manage the permissions of your contacts and create new roles
513
530
  privacy:
514
- intro: "Contacts at <strong>%{relation}</strong> level are only allowed to:"
531
+ intro: 'Contacts at <strong>%{relation}</strong> level are only allowed to:'
515
532
  rule:
516
- add: "Add"
517
- title: "Privacy rules"
518
- saved: "Privacy rules saved"
533
+ add: Add
534
+ title: Privacy rules
535
+ saved: Privacy rules saved
519
536
  relation_custom:
520
- confirm_delete: "Delete this role?"
521
- delete: "Delete"
522
- edit: "Change name"
537
+ confirm_delete: Delete this role?
538
+ delete: Delete
539
+ edit: Change name
523
540
  list:
524
- title: "Roles"
525
- new: "+ New role"
526
- title: "Privacy"
541
+ title: Roles
542
+ new: + New role
543
+ title: Privacy
527
544
  relation_public:
528
- name: "Public"
545
+ name: Public
529
546
  repository:
530
- filter: "filter"
531
- title: "Repository"
547
+ filter: filter
548
+ title: Repository
532
549
  order:
533
- by: "Order by"
534
- last_modified: "Last modified"
535
- most_popular: "Most popular"
550
+ by: Order by
551
+ last_modified: Last modified
552
+ most_popular: Most popular
536
553
  representation:
537
- notice: "Your session has changed. Now you are acting on behalf of %{subject}. Use the top-right menu to return to your session"
538
- switch: "Switch session"
539
- required: "(*) These fields are required"
554
+ notice: Your session has changed. Now you are acting on behalf of %{subject}.
555
+ Use the top-right menu to return to your session
556
+ switch: Switch session
557
+ required: (*) These fields are required
540
558
  search:
541
- all_results: "Search all %{subject} (%{count})"
559
+ all_results: Search all %{subject} (%{count})
542
560
  at_least:
543
- one: "Write at least %{count} character"
544
- other: "Write at least %{count} characters"
545
- global:
546
- name: "Global search"
561
+ one: Write at least %{count} character
562
+ other: Write at least %{count} characters
563
+ global:
564
+ name: Global search
547
565
  first_result:
548
- more: "Showing the first %{count} results."
549
- one: "Showing the first result."
550
- query: "See more results for %{query} >"
551
- name: "Search"
552
- no_subject_found: "No %{subject} was found."
553
- nothing: "Nothing found"
554
- searching: "Searching: %{query}"
555
- show_all: "All"
556
- write: "Write your query ..."
557
- wrong: "There seems to be a problem with the search engine"
566
+ more: Showing the first %{count} results.
567
+ one: Showing the first result.
568
+ query: See more results for %{query} >
569
+ name: Search
570
+ no_subject_found: No %{subject} was found.
571
+ nothing: Nothing found
572
+ searching: 'Searching: %{query}'
573
+ show_all: All
574
+ write: Write your query ...
575
+ wrong: There seems to be a problem with the search engine
558
576
  settings:
559
577
  api_key:
560
- briefing: "Manage your API key"
561
- confirm: "Are you sure?"
562
- empty: "Empty Token"
563
- explanation: "This is your API key"
564
- name: "API Key"
565
- regenerate: "Regenerate API key"
578
+ briefing: Manage your API key
579
+ confirm: Are you sure?
580
+ empty: Empty Token
581
+ explanation: This is your API key
582
+ name: API Key
583
+ regenerate: Regenerate API key
566
584
  cancel_account:
567
- briefing: "Lets you cancel your account"
585
+ briefing: Lets you cancel your account
568
586
  email_change:
569
- briefing: "Change your email"
587
+ briefing: Change your email
570
588
  lang_change:
571
- briefing: "Change your language"
572
- name: "Change your language"
573
- error: "Some errors raised when saving your changes"
574
- for: "Settings for"
575
- main: "Settings"
589
+ briefing: Change your language
590
+ name: Change your language
591
+ error: Some errors raised when saving your changes
592
+ for: Settings for
593
+ main: Settings
576
594
  manage:
577
- name: "Admin Contacts"
578
- briefing: "Settings for contacts"
579
- explanation: "Change contacts permissions"
595
+ name: Admin Contacts
596
+ briefing: Settings for contacts
597
+ explanation: Change contacts permissions
580
598
  notifications:
581
- briefing: "Settings about notifications behaviour and mail alerts"
582
- name: "Notifications"
599
+ briefing: Settings about notifications behaviour and mail alerts
600
+ name: Notifications
583
601
  by_email:
584
- name: "Send me an email when I receive a notification"
585
- always: "Always"
586
- never: "Never"
587
- one: "Settings"
602
+ name: Send me an email when I receive a notification
603
+ always: Always
604
+ never: Never
605
+ one: Settings
588
606
  password_change:
589
- briefing: "Change your password"
590
- success: "Your settings where correctly changed"
591
- share: "Share"
592
- sign_in: "Sign in"
593
- sign_out: "Sign out"
594
- sign_up: "Sign up"
607
+ briefing: Change your password
608
+ success: Your settings where correctly changed
609
+ share: Share
610
+ sign_in: Sign in
611
+ sign_out: Sign out
612
+ sign_up: Sign up
595
613
  site:
596
- name: "Social Stream"
614
+ name: Social Stream
597
615
  subject:
598
- this_is_you: "This is you!"
599
- sure: "Are you sure?"
616
+ this_is_you: This is you!
617
+ sure: Are you sure?
600
618
  time:
601
- ago: "%{time} ago"
602
- unknown: "Unknown"
619
+ ago: '%{time} ago'
620
+ unknown: Unknown
603
621
  user:
604
- all: "All users"
605
- all_n: "All users (%{count})"
606
- by: "By Users"
607
- one: "user"
608
- other: "users"
622
+ all: All users
623
+ all_n: All users (%{count})
624
+ by: By Users
625
+ one: user
626
+ other: users
609
627
  title:
610
- one: "User"
611
- other: "Users"
612
- welcome: "Welcome to %{site}!"
628
+ one: User
629
+ other: Users
630
+ welcome: Welcome to %{site}!
613
631
  lang:
614
- browser: "Auto-detect browser language"
615
- none: "Language independent content"
632
+ browser: Auto-detect browser language
633
+ none: Language independent content