community_engine 2.3.2 → 3.0.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 (580) hide show
  1. checksums.yaml +13 -5
  2. data/.travis.yml +5 -4
  3. data/CHANGELOG +43 -5
  4. data/Gemfile +1 -16
  5. data/README.markdown +22 -19
  6. data/UPGRADING.markdown +10 -0
  7. data/about.yml +1 -1
  8. data/app/assets/javascripts/community_engine.js +187 -18
  9. data/app/assets/javascripts/cropper.js +86 -565
  10. data/app/assets/javascripts/forum.js +26 -71
  11. data/app/assets/javascripts/jquery.migrate.js +521 -0
  12. data/app/assets/stylesheets/_colors.css.scss +100 -0
  13. data/app/assets/stylesheets/_font.css.scss +17 -0
  14. data/app/assets/stylesheets/_forms.css.scss +20 -0
  15. data/app/assets/stylesheets/_forum.css.scss +0 -0
  16. data/app/assets/stylesheets/_grid.css.scss +7 -0
  17. data/app/assets/stylesheets/_layers.css.scss +7 -0
  18. data/app/assets/stylesheets/_layout.css.scss +28 -0
  19. data/app/assets/stylesheets/community_engine.css.scss +18 -0
  20. data/app/assets/stylesheets/cropper.css +6 -182
  21. data/app/controllers/activities_controller.rb +10 -10
  22. data/app/controllers/admin_controller.rb +23 -23
  23. data/app/controllers/ads_controller.rb +16 -5
  24. data/app/controllers/albums_controller.rb +11 -5
  25. data/app/controllers/base_controller.rb +5 -8
  26. data/app/controllers/categories_controller.rb +31 -31
  27. data/app/controllers/clippings_controller.rb +18 -12
  28. data/app/controllers/comments_controller.rb +17 -8
  29. data/app/controllers/events_controller.rb +25 -21
  30. data/app/controllers/favorites_controller.rb +12 -12
  31. data/app/controllers/forums_controller.rb +20 -9
  32. data/app/controllers/friendships_controller.rb +41 -48
  33. data/app/controllers/homepage_features_controller.rb +11 -5
  34. data/app/controllers/invitations_controller.rb +15 -9
  35. data/app/controllers/messages_controller.rb +25 -19
  36. data/app/controllers/metro_areas_controller.rb +9 -3
  37. data/app/controllers/moderators_controller.rb +1 -1
  38. data/app/controllers/monitorships_controller.rb +2 -2
  39. data/app/controllers/pages_controller.rb +16 -4
  40. data/app/controllers/password_resets_controller.rb +0 -1
  41. data/app/controllers/photos_controller.rb +32 -30
  42. data/app/controllers/posts_controller.rb +33 -17
  43. data/app/controllers/rsvps_controller.rb +8 -4
  44. data/app/controllers/sb_posts_controller.rb +22 -18
  45. data/app/controllers/sessions_controller.rb +2 -1
  46. data/app/controllers/sitemap_controller.rb +8 -8
  47. data/app/controllers/statistics_controller.rb +9 -8
  48. data/app/controllers/tags_controller.rb +26 -24
  49. data/app/controllers/topics_controller.rb +10 -6
  50. data/app/controllers/users_controller.rb +63 -34
  51. data/app/helpers/base_helper.rb +119 -29
  52. data/app/helpers/friendships_helper.rb +3 -3
  53. data/app/helpers/posts_helper.rb +5 -7
  54. data/app/models/acts_as_taggable_on/tag.rb +12 -13
  55. data/app/models/ad.rb +2 -5
  56. data/app/models/album.rb +0 -2
  57. data/app/models/category.rb +6 -7
  58. data/app/models/clipping.rb +2 -5
  59. data/app/models/clipping_image.rb +5 -5
  60. data/app/models/comment.rb +4 -5
  61. data/app/models/country.rb +2 -4
  62. data/app/models/event.rb +1 -2
  63. data/app/models/favorite.rb +5 -10
  64. data/app/models/forum.rb +0 -2
  65. data/app/models/friendship.rb +3 -5
  66. data/app/models/friendship_status.rb +0 -2
  67. data/app/models/homepage_feature.rb +4 -6
  68. data/app/models/invitation.rb +6 -8
  69. data/app/models/message.rb +25 -26
  70. data/app/models/message_thread.rb +1 -1
  71. data/app/models/metro_area.rb +0 -2
  72. data/app/models/page.rb +0 -2
  73. data/app/models/photo.rb +8 -8
  74. data/app/models/poll.rb +7 -9
  75. data/app/models/post.rb +11 -15
  76. data/app/models/role.rb +1 -2
  77. data/app/models/rsvp.rb +0 -3
  78. data/app/models/sb_post.rb +14 -9
  79. data/app/models/state.rb +0 -2
  80. data/app/models/topic.rb +5 -6
  81. data/app/models/user.rb +50 -63
  82. data/app/models/vote.rb +1 -1
  83. data/app/views/activities/_activity.html.haml +9 -9
  84. data/app/views/activities/destroy.js.erb +1 -0
  85. data/app/views/activities/index.html.haml +13 -13
  86. data/app/views/activities/network.html.haml +10 -13
  87. data/app/views/admin/comments.html.haml +48 -70
  88. data/app/views/admin/events.html.haml +20 -27
  89. data/app/views/admin/messages.html.haml +2 -3
  90. data/app/views/admin/update.js.erb +1 -0
  91. data/app/views/admin/users.html.haml +51 -66
  92. data/app/views/ads/_form.html.haml +21 -0
  93. data/app/views/ads/edit.html.haml +6 -46
  94. data/app/views/ads/index.html.haml +25 -39
  95. data/app/views/ads/new.html.haml +4 -43
  96. data/app/views/ads/show.html.haml +18 -35
  97. data/app/views/albums/_form.html.haml +17 -12
  98. data/app/views/albums/edit.html.haml +12 -14
  99. data/app/views/albums/new.html.haml +8 -13
  100. data/app/views/albums/show.html.haml +25 -32
  101. data/app/views/base/_homepage_banner_message.html.haml +5 -19
  102. data/app/views/base/advertise.html.haml +5 -8
  103. data/app/views/base/site_index.html.haml +25 -27
  104. data/app/views/categories/_form.html.haml +8 -0
  105. data/app/views/categories/_menu_item.html.haml +13 -0
  106. data/app/views/categories/_tips.html.haml +2 -2
  107. data/app/views/categories/edit.html.haml +3 -33
  108. data/app/views/categories/index.html.haml +18 -28
  109. data/app/views/categories/new.html.haml +3 -8
  110. data/app/views/categories/show.html.haml +33 -36
  111. data/app/views/clippings/_clipping.html.haml +10 -17
  112. data/app/views/clippings/_favorite.html.haml +14 -0
  113. data/app/views/clippings/_form.html.haml +15 -0
  114. data/app/views/clippings/_images.html.haml +1 -1
  115. data/app/views/clippings/_menu_item.html.haml +6 -0
  116. data/app/views/clippings/edit.html.haml +12 -23
  117. data/app/views/clippings/index.html.haml +29 -30
  118. data/app/views/clippings/load_images_from_uri.js.erb +1 -0
  119. data/app/views/clippings/new.html.haml +9 -26
  120. data/app/views/clippings/new_clipping.html.haml +30 -77
  121. data/app/views/clippings/show.html.haml +48 -53
  122. data/app/views/clippings/site_index.html.haml +19 -32
  123. data/app/views/comments/_comment.html.haml +40 -40
  124. data/app/views/comments/_comment_form.html.haml +22 -46
  125. data/app/views/comments/_edit_form.html.haml +13 -28
  126. data/app/views/comments/create.js.erb +25 -0
  127. data/app/views/comments/destroy.js.erb +3 -0
  128. data/app/views/comments/edit.js.erb +11 -0
  129. data/app/views/comments/index.html.haml +12 -22
  130. data/app/views/comments/update.js.erb +14 -0
  131. data/app/views/events/_event.html.haml +26 -24
  132. data/app/views/events/_form.html.haml +18 -0
  133. data/app/views/events/_menu_item.html.haml +6 -0
  134. data/app/views/events/_subscribe.html.haml +1 -1
  135. data/app/views/events/edit.html.haml +7 -32
  136. data/app/views/events/index.html.haml +11 -19
  137. data/app/views/events/new.html.haml +2 -31
  138. data/app/views/events/show.html.haml +54 -24
  139. data/app/views/favorites/create.js.erb +10 -0
  140. data/app/views/favorites/destroy.js.erb +6 -0
  141. data/app/views/favorites/index.html.haml +6 -8
  142. data/app/views/forums/_form.html.haml +10 -20
  143. data/app/views/forums/_menu_item.html.haml +6 -0
  144. data/app/views/forums/edit.html.haml +8 -10
  145. data/app/views/forums/index.html.haml +56 -64
  146. data/app/views/forums/new.html.haml +5 -8
  147. data/app/views/forums/show.html.haml +65 -72
  148. data/app/views/friendships/_friendship.html.haml +14 -16
  149. data/app/views/friendships/accepted.html.haml +7 -11
  150. data/app/views/friendships/create.js.haml +1 -0
  151. data/app/views/friendships/denied.html.haml +4 -8
  152. data/app/views/friendships/pending.html.haml +4 -6
  153. data/app/views/friendships/show.html.haml +10 -11
  154. data/app/views/homepage_features/_form.html.haml +6 -0
  155. data/app/views/homepage_features/edit.html.haml +5 -30
  156. data/app/views/homepage_features/index.html.haml +22 -28
  157. data/app/views/homepage_features/new.html.haml +2 -30
  158. data/app/views/homepage_features/show.html.haml +27 -29
  159. data/app/views/invitations/index.html.haml +8 -0
  160. data/app/views/invitations/new.html.haml +21 -30
  161. data/app/views/kaminari/bootstrap/_first_page.html.erb +13 -0
  162. data/app/views/kaminari/bootstrap/_gap.html.erb +8 -0
  163. data/app/views/kaminari/bootstrap/_last_page.html.erb +13 -0
  164. data/app/views/kaminari/bootstrap/_next_page.html.erb +13 -0
  165. data/app/views/kaminari/bootstrap/_page.html.erb +12 -0
  166. data/app/views/kaminari/bootstrap/_paginator.html.erb +25 -0
  167. data/app/views/kaminari/bootstrap/_prev_page.html.erb +13 -0
  168. data/app/views/layouts/application.html.haml +26 -37
  169. data/app/views/messages/_form.html.haml +6 -12
  170. data/app/views/messages/_inbox.html.haml +34 -39
  171. data/app/views/messages/_menu_item.html.haml +11 -0
  172. data/app/views/messages/_sent.html.haml +22 -33
  173. data/app/views/messages/_sidebar_nav.html.haml +12 -9
  174. data/app/views/messages/index.html.haml +2 -2
  175. data/app/views/messages/new.html.haml +2 -9
  176. data/app/views/messages/show.html.haml +28 -36
  177. data/app/views/metro_areas/_form.html.haml +6 -0
  178. data/app/views/metro_areas/edit.html.haml +6 -14
  179. data/app/views/metro_areas/index.html.haml +19 -26
  180. data/app/views/metro_areas/new.html.haml +4 -14
  181. data/app/views/metro_areas/show.html.haml +13 -21
  182. data/app/views/moderators/_toggle.html.haml +6 -0
  183. data/app/views/moderators/create.js.erb +5 -0
  184. data/app/views/moderators/destroy.js.erb +1 -0
  185. data/app/views/monitorships/create.js.erb +1 -0
  186. data/app/views/monitorships/destroy.js.erb +1 -0
  187. data/app/views/pages/_form.html.haml +16 -23
  188. data/app/views/pages/edit.html.haml +2 -14
  189. data/app/views/pages/index.html.haml +32 -32
  190. data/app/views/pages/new.html.haml +5 -12
  191. data/app/views/pages/show.html.haml +4 -8
  192. data/app/views/password_resets/edit.html.haml +6 -14
  193. data/app/views/password_resets/new.html.haml +7 -11
  194. data/app/views/photo_manager/index.html.haml +45 -43
  195. data/app/views/photos/_form.html.haml +24 -0
  196. data/app/views/photos/_manage_photos.html.haml +14 -6
  197. data/app/views/photos/_show_image_list.html.haml +2 -2
  198. data/app/views/photos/create.js.erb +1 -0
  199. data/app/views/photos/edit.html.haml +10 -38
  200. data/app/views/photos/index.html.haml +20 -20
  201. data/app/views/photos/manage_photos.js.erb +5 -0
  202. data/app/views/photos/new.html.haml +11 -49
  203. data/app/views/photos/recent.html.haml +6 -6
  204. data/app/views/photos/show.html.haml +48 -52
  205. data/app/views/polls/_edit.html.haml +6 -10
  206. data/app/views/polls/_excerpt.html.haml +3 -4
  207. data/app/views/polls/_new.html.haml +10 -9
  208. data/app/views/polls/_poll_ui.html.haml +30 -34
  209. data/app/views/posts/_author_profile.html.haml +12 -11
  210. data/app/views/posts/_favorited_post.html.haml +8 -10
  211. data/app/views/posts/_form.html.haml +40 -0
  212. data/app/views/posts/_menu_item.html.haml +6 -0
  213. data/app/views/posts/_post.html.haml +27 -24
  214. data/app/views/posts/_send_to_friend.html.haml +26 -0
  215. data/app/views/posts/edit.html.haml +11 -48
  216. data/app/views/posts/featured.html.haml +7 -12
  217. data/app/views/posts/index.html.haml +14 -18
  218. data/app/views/posts/manage.html.haml +44 -59
  219. data/app/views/posts/new.html.haml +9 -64
  220. data/app/views/posts/popular.html.haml +25 -30
  221. data/app/views/posts/preview.html.haml +27 -26
  222. data/app/views/posts/recent.html.haml +20 -27
  223. data/app/views/posts/send_to_friend.js.erb +3 -0
  224. data/app/views/posts/show.html.haml +67 -76
  225. data/app/views/rsvps/_form.html.haml +3 -0
  226. data/app/views/rsvps/edit.html.haml +3 -9
  227. data/app/views/rsvps/new.html.haml +3 -9
  228. data/app/views/sb_posts/_dummy_forum_post.html.haml +13 -0
  229. data/app/views/sb_posts/_edit.html.haml +6 -0
  230. data/app/views/sb_posts/_edit_script.js.erb +14 -0
  231. data/app/views/sb_posts/_reply_form.html.haml +14 -35
  232. data/app/views/sb_posts/_reply_script.js.erb +13 -0
  233. data/app/views/sb_posts/_sb_post.html.haml +31 -33
  234. data/app/views/sb_posts/create.js.erb +30 -0
  235. data/app/views/sb_posts/destroy.js.erb +2 -0
  236. data/app/views/sb_posts/edit.html.erb +4 -4
  237. data/app/views/sb_posts/edit.js.erb +14 -0
  238. data/app/views/sb_posts/index.html.haml +3 -16
  239. data/app/views/sb_posts/monitored.html.erb +3 -9
  240. data/app/views/sb_posts/update.js.erb +11 -0
  241. data/app/views/sessions/_menu_item.html.haml +28 -0
  242. data/app/views/sessions/new.html.haml +19 -24
  243. data/app/views/shared/_add_friend_link.html.haml +9 -0
  244. data/app/views/shared/_admin_nav.html.haml +6 -8
  245. data/app/views/shared/_contact.html.haml +1 -1
  246. data/app/views/shared/_end_javascript.html.haml +4 -4
  247. data/app/views/shared/_explore.html.haml +7 -6
  248. data/app/views/shared/_footer_content.html.haml +12 -10
  249. data/app/views/shared/_footer_links.html.haml +18 -0
  250. data/app/views/shared/_friend_link.html.haml +25 -0
  251. data/app/views/shared/_header.html.haml +22 -42
  252. data/app/views/shared/_jumbotron.html.haml +3 -0
  253. data/app/views/shared/_load_tinymce.js.erb +15 -0
  254. data/app/views/shared/_location_chooser.html.haml +26 -17
  255. data/app/views/shared/_login_sidebar.html.haml +6 -5
  256. data/app/views/shared/_messages.html.haml +6 -8
  257. data/app/views/shared/_scripts_and_styles.html.haml +1 -2
  258. data/app/views/shared/_sidebar.html.haml +1 -0
  259. data/app/views/shared/_tag_auto_complete.html.haml +19 -0
  260. data/app/views/shared/_widget.html.haml +3 -0
  261. data/app/views/sitemap/index.html.haml +15 -20
  262. data/app/views/statistics/index.html.haml +32 -40
  263. data/app/views/tags/edit.html.haml +12 -19
  264. data/app/views/tags/index.html.haml +16 -25
  265. data/app/views/tags/manage.html.haml +24 -33
  266. data/app/views/tags/show.html.haml +52 -58
  267. data/app/views/topics/_form.html.haml +23 -25
  268. data/app/views/topics/_recent_topics_sidebar.haml +1 -1
  269. data/app/views/topics/edit.html.haml +7 -9
  270. data/app/views/topics/new.html.haml +6 -21
  271. data/app/views/topics/show.html.haml +48 -106
  272. data/app/views/user_notifier/follow_up_comment_notice.text.erb +1 -1
  273. data/app/views/user_notifier/message_notification.text.erb +1 -1
  274. data/app/views/user_notifier/new_forum_post_notice.text.erb +1 -1
  275. data/app/views/users/_dashboard_nav.html.haml +36 -39
  276. data/app/views/users/_menu_item.html.haml +6 -0
  277. data/app/views/users/_omniauth_connect.html.haml +4 -4
  278. data/app/views/users/_profile_completeness.html.haml +3 -3
  279. data/app/views/users/_profile_user_info_sidebar.html.haml +40 -43
  280. data/app/views/users/_search_options.html.haml +9 -7
  281. data/app/views/users/_sidebar_user.html.haml +1 -1
  282. data/app/views/users/_user.html.haml +27 -28
  283. data/app/views/users/crop_profile_photo.html.haml +30 -37
  284. data/app/views/users/dashboard.html.haml +37 -41
  285. data/app/views/users/edit.html.haml +53 -71
  286. data/app/views/users/edit_account.html.haml +44 -64
  287. data/app/views/users/forgot_username.html.haml +6 -12
  288. data/app/views/users/index.html.haml +4 -14
  289. data/app/views/users/invite.html.haml +14 -25
  290. data/app/views/users/new.html.haml +27 -48
  291. data/app/views/users/resend_activation.html.haml +7 -12
  292. data/app/views/users/show.html.haml +88 -90
  293. data/app/views/users/signup_completed.html.haml +7 -7
  294. data/app/views/users/statistics.html.haml +17 -18
  295. data/app/views/users/update.js.erb +1 -0
  296. data/app/views/users/upload_profile_photo.html.haml +10 -15
  297. data/app/views/users/welcome_about.html.haml +54 -61
  298. data/app/views/users/welcome_invite.html.haml +16 -25
  299. data/app/views/users/welcome_photo.html.haml +18 -27
  300. data/app/views/votes/create.js.erb +5 -0
  301. data/community_engine.gemspec +49 -41
  302. data/config/application_config.rb +13 -16
  303. data/config/initializers/mce_options.rb +9 -32
  304. data/config/initializers/recaptcha_constants.rb +2 -2
  305. data/config/locales/de-DE.yml +1 -17
  306. data/config/locales/en.yml +18 -32
  307. data/config/locales/es-AR.yml +2 -14
  308. data/config/locales/es-ES.yml +0 -6
  309. data/config/locales/es-MX.yml +1 -9
  310. data/config/locales/fr-FR.yml +3 -17
  311. data/config/locales/ja-JP.yml +2 -18
  312. data/config/locales/ru-RU.yml +3 -21
  313. data/config/locales/sr-CP.yml +0 -4
  314. data/config/locales/sv-SE.yml +3 -20
  315. data/config/routes.rb +37 -42
  316. data/db/migrate/016_add_metro_areas.rb +2 -2
  317. data/db/migrate/039_create_activities_table.rb +2 -2
  318. data/db/migrate/056_create_roles.rb +8 -6
  319. data/db/migrate/069_create_pages.rb +3 -3
  320. data/db/migrate/081_upgrade_to_friendly_id_5x.rb +25 -0
  321. data/db/migrate/082_upgrade_to_acts_as_commentable_4x.rb +29 -0
  322. data/lib/activity_tracker.rb +3 -0
  323. data/{vendor/plugins/activity_tracker/lib → lib/activity_tracker}/activity.rb +6 -6
  324. data/{vendor/plugins/activity_tracker/lib → lib/activity_tracker}/activity_tracker.rb +0 -0
  325. data/{vendor/plugins/acts_as_publishable/init.rb → lib/acts_as_publishable.rb} +1 -1
  326. data/{vendor/plugins/acts_as_publishable/lib → lib/acts_as_publishable}/acts_as_publishable.rb +3 -3
  327. data/lib/community_engine.rb +31 -9
  328. data/lib/community_engine/engine.rb +17 -1
  329. data/lib/community_engine/engines_extensions.rb +1 -3
  330. data/lib/community_engine/version.rb +3 -3
  331. data/{config/initializers → lib/paperclip_processors}/cropper.rb +3 -3
  332. data/lib/resource_feeder.rb +3 -0
  333. data/{vendor/plugins/resource_feeder/lib → lib}/resource_feeder/atom.rb +0 -0
  334. data/{vendor/plugins/resource_feeder/lib → lib}/resource_feeder/rss.rb +0 -0
  335. data/{vendor/plugins/white_list/init.rb → lib/white_list.rb} +1 -1
  336. data/{vendor/plugins/white_list/lib → lib/white_list}/white_list_helper.rb +0 -0
  337. data/test/fixtures/messages.yml +2 -2
  338. data/test/functional/admin_controller_test.rb +11 -11
  339. data/test/functional/ads_controller_test.rb +11 -11
  340. data/test/functional/albums_controller_test.rb +4 -4
  341. data/test/functional/categories_controller_test.rb +4 -4
  342. data/test/functional/clippings_controller_test.rb +4 -4
  343. data/test/functional/comments_controller_test.rb +20 -16
  344. data/test/functional/events_controller_test.rb +6 -6
  345. data/test/functional/forums_controller_test.rb +8 -8
  346. data/test/functional/friendships_controller_test.rb +13 -18
  347. data/test/functional/homepage_features_controller_test.rb +5 -5
  348. data/test/functional/messages_controller_test.rb +6 -2
  349. data/test/functional/metro_areas_controller_test.rb +7 -7
  350. data/test/functional/moderators_controller_test.rb +1 -1
  351. data/test/functional/pages_controller_test.rb +2 -2
  352. data/test/functional/password_reset_controller_test.rb +2 -2
  353. data/test/functional/photos_controller_test.rb +16 -15
  354. data/test/functional/posts_controller_test.rb +4 -4
  355. data/test/functional/rsvps_controller_test.rb +6 -6
  356. data/test/functional/sb_posts_controller_test.rb +53 -50
  357. data/test/functional/sessions_controller_test.rb +4 -1
  358. data/test/functional/tags_controller_test.rb +1 -1
  359. data/test/functional/topics_controller_test.rb +10 -10
  360. data/test/functional/users_controller_test.rb +32 -19
  361. data/test/functional/votes_controller_test.rb +1 -1
  362. data/test/test_helper.rb +3 -1
  363. data/test/testapp/config/application.rb +1 -9
  364. data/test/testapp/config/environments/development.rb +1 -2
  365. data/test/testapp/config/environments/production.rb +2 -0
  366. data/test/testapp/config/environments/test.rb +1 -2
  367. data/test/testapp/config/initializers/omniauth.rb +3 -3
  368. data/test/testapp/config/initializers/secret_token.rb +1 -0
  369. data/test/testapp/db/schema.rb +143 -152
  370. data/test/unit/category_test.rb +2 -2
  371. data/test/unit/comment_test.rb +64 -53
  372. data/test/unit/event_test.rb +4 -4
  373. data/test/unit/forum_test.rb +1 -1
  374. data/test/unit/message_test.rb +7 -1
  375. data/test/unit/page_test.rb +2 -2
  376. data/test/unit/post_test.rb +47 -47
  377. data/test/unit/sb_post_test.rb +24 -20
  378. data/test/unit/topic_test.rb +7 -6
  379. data/test/unit/user_test.rb +75 -52
  380. data/vendor/assets/javascripts/.gitkeep +0 -0
  381. data/vendor/assets/javascripts/jcrop/jquery.Jcrop.js +1699 -0
  382. data/vendor/assets/javascripts/jcrop/jquery.color.js +661 -0
  383. data/vendor/assets/javascripts/tag-it/tag-it.js +597 -0
  384. data/vendor/assets/stylesheets/.gitkeep +0 -0
  385. data/vendor/assets/stylesheets/jcrop/Jcrop.gif +0 -0
  386. data/vendor/assets/stylesheets/jcrop/jquery.Jcrop.min.css +28 -0
  387. data/vendor/assets/stylesheets/tag-it/tag-it.css +69 -0
  388. data/vendor/assets/stylesheets/tag-it/tagit.ui-zendesk.css +107 -0
  389. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/README +0 -0
  390. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/Rakefile +0 -0
  391. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/generators/publishing/publishing_generator.rb +0 -0
  392. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/generators/publishing/templates/migration.rb +0 -0
  393. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/install.rb +0 -0
  394. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/acts_as_publishable/test/acts_as_publishable_test.rb +0 -0
  395. data/vendor/{plugins/activity_tracker → converted2.3plugins_to_lib_leftovers/acts_as_publishable}/uninstall.rb +0 -0
  396. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/README +0 -0
  397. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/Rakefile +0 -0
  398. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/test/atom_feed_test.rb +0 -0
  399. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/test/rss_feed_test.rb +0 -0
  400. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/resource_feeder/test/test_helper.rb +0 -0
  401. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/white_list/README +0 -0
  402. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/white_list/Rakefile +0 -0
  403. data/vendor/{plugins → converted2.3plugins_to_lib_leftovers}/white_list/test/white_list_test.rb +0 -0
  404. metadata +348 -302
  405. data/app/assets/images/bg_h6btn.gif +0 -0
  406. data/app/assets/images/bg_navbar.gif +0 -0
  407. data/app/assets/images/clearbits/bg_rounded.gif +0 -0
  408. data/app/assets/images/clearbits/comment.gif +0 -0
  409. data/app/assets/images/clearbits/lock.gif +0 -0
  410. data/app/assets/images/clearbits/smile.gif +0 -0
  411. data/app/assets/images/close.gif +0 -0
  412. data/app/assets/images/cropper/marqueeHoriz.gif +0 -0
  413. data/app/assets/images/cropper/marqueeVert.gif +0 -0
  414. data/app/assets/images/feed.png +0 -0
  415. data/app/assets/images/icons/31.png +0 -0
  416. data/app/assets/images/icons/52.png +0 -0
  417. data/app/assets/images/icons/accept.png +0 -0
  418. data/app/assets/images/icons/activity_default.png +0 -0
  419. data/app/assets/images/icons/add.png +0 -0
  420. data/app/assets/images/icons/book.png +0 -0
  421. data/app/assets/images/icons/bullet_arrow_down.png +0 -0
  422. data/app/assets/images/icons/bullet_arrow_down_50.png +0 -0
  423. data/app/assets/images/icons/clipping.png +0 -0
  424. data/app/assets/images/icons/comment.png +0 -0
  425. data/app/assets/images/icons/comments.png +0 -0
  426. data/app/assets/images/icons/date.png +0 -0
  427. data/app/assets/images/icons/delete.png +0 -0
  428. data/app/assets/images/icons/email.png +0 -0
  429. data/app/assets/images/icons/email_edit.png +0 -0
  430. data/app/assets/images/icons/email_go.png +0 -0
  431. data/app/assets/images/icons/email_open.png +0 -0
  432. data/app/assets/images/icons/group_go.png +0 -0
  433. data/app/assets/images/icons/heart.png +0 -0
  434. data/app/assets/images/icons/heart_add.png +0 -0
  435. data/app/assets/images/icons/heart_off.png +0 -0
  436. data/app/assets/images/icons/page_white.png +0 -0
  437. data/app/assets/images/icons/page_white_magnify.png +0 -0
  438. data/app/assets/images/icons/picture.png +0 -0
  439. data/app/assets/images/icons/poll.png +0 -0
  440. data/app/assets/images/icons/post.png +0 -0
  441. data/app/assets/images/icons/printer.png +0 -0
  442. data/app/assets/images/icons/rss.png +0 -0
  443. data/app/assets/images/icons/slides.png +0 -0
  444. data/app/assets/images/icons/tag_blue.png +0 -0
  445. data/app/assets/images/icons/user.png +0 -0
  446. data/app/assets/images/icons/user_add.png +0 -0
  447. data/app/assets/images/icons/user_edit.png +0 -0
  448. data/app/assets/images/icons/user_go.png +0 -0
  449. data/app/assets/images/icons/vote.png +0 -0
  450. data/app/assets/images/icons/world.png +0 -0
  451. data/app/assets/images/icons/wrench.png +0 -0
  452. data/app/assets/images/logo.gif +0 -0
  453. data/app/assets/images/reply_background.png +0 -0
  454. data/app/assets/images/search.gif +0 -0
  455. data/app/assets/images/thumb.gif +0 -0
  456. data/app/assets/javascripts/builder.js +0 -136
  457. data/app/assets/javascripts/calendarview.js +0 -839
  458. data/app/assets/javascripts/lightbox.js +0 -151
  459. data/app/assets/javascripts/prototip-min.js +0 -27
  460. data/app/assets/javascripts/rails.js +0 -202
  461. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/css/advimage.css +0 -84
  462. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/editor_plugin.js +0 -52
  463. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/editor_plugin_src.js +0 -45
  464. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/image.htm +0 -180
  465. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/img/sample.gif +0 -0
  466. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/js/functions.js +0 -508
  467. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/langs/en.js +0 -3
  468. data/app/assets/javascripts/tinymce/plugins/curblyadvimage/langs/en_dlg.js +0 -43
  469. data/app/assets/javascripts/tinymce/plugins/tinyautosave/editor_plugin.js +0 -8
  470. data/app/assets/javascripts/tinymce/plugins/tinyautosave/editor_plugin_src.js +0 -1001
  471. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress.gif +0 -0
  472. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress10.gif +0 -0
  473. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress11.gif +0 -0
  474. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress12.gif +0 -0
  475. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress2.gif +0 -0
  476. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress3.gif +0 -0
  477. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress4.gif +0 -0
  478. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress5.gif +0 -0
  479. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress6.gif +0 -0
  480. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress7.gif +0 -0
  481. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress8.gif +0 -0
  482. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress9.gif +0 -0
  483. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/restore.gif +0 -0
  484. data/app/assets/javascripts/tinymce/plugins/tinyautosave/images/restore.png +0 -0
  485. data/app/assets/javascripts/tinymce/plugins/tinyautosave/langs/da.js +0 -5
  486. data/app/assets/javascripts/tinymce/plugins/tinyautosave/langs/en.js +0 -5
  487. data/app/assets/stylesheets/community_engine.css +0 -6
  488. data/app/assets/stylesheets/forum.css +0 -605
  489. data/app/assets/stylesheets/prototip.css +0 -73
  490. data/app/assets/stylesheets/reset-fonts-grids.css +0 -8
  491. data/app/assets/stylesheets/screen.css +0 -977
  492. data/app/helpers/monitorships_helper.rb +0 -2
  493. data/app/views/activities/_icon.html.haml +0 -14
  494. data/app/views/activities/destroy.js.rjs +0 -1
  495. data/app/views/clippings/_meta.html.haml +0 -26
  496. data/app/views/clippings/load_images_from_uri.js.rjs +0 -1
  497. data/app/views/comments/create.js.rjs +0 -20
  498. data/app/views/comments/edit.js.rjs +0 -7
  499. data/app/views/comments/update.js.rjs +0 -9
  500. data/app/views/favorites/create.js.rjs +0 -17
  501. data/app/views/favorites/destroy.js.rjs +0 -14
  502. data/app/views/favorites/show.html.haml +0 -13
  503. data/app/views/friendships/_friendships.html.erb +0 -14
  504. data/app/views/friendships/index.html.erb +0 -3
  505. data/app/views/friendships/index.xml.builder +0 -29
  506. data/app/views/invitations/index.html.erb +0 -16
  507. data/app/views/moderators/_toggle.html.erb +0 -14
  508. data/app/views/moderators/create.js.rjs +0 -5
  509. data/app/views/moderators/destroy.js.rjs +0 -1
  510. data/app/views/monitorships/create.js.rjs +0 -4
  511. data/app/views/monitorships/destroy.js.rjs +0 -4
  512. data/app/views/photos/manage_photos.js.rjs +0 -5
  513. data/app/views/polls/_polls_sidebar.html.haml +0 -8
  514. data/app/views/posts/_send_to_friend.html.erb +0 -29
  515. data/app/views/sb_posts/_dummy_forum_post.html.erb +0 -13
  516. data/app/views/sb_posts/_edit.html.erb +0 -31
  517. data/app/views/sb_posts/create.js.rjs +0 -16
  518. data/app/views/sb_posts/edit.js.rjs +0 -6
  519. data/app/views/sb_posts/update.js.rjs +0 -5
  520. data/app/views/shared/_user_menu.html.haml +0 -21
  521. data/app/views/votes/create.js.rjs +0 -6
  522. data/db/migrate/090_add_comment_role.rb +0 -15
  523. data/vendor/plugins/activity_tracker/README +0 -4
  524. data/vendor/plugins/activity_tracker/Rakefile +0 -22
  525. data/vendor/plugins/activity_tracker/generators/activity_migration/USAGE +0 -13
  526. data/vendor/plugins/activity_tracker/generators/activity_migration/activity_migration_generator.rb +0 -11
  527. data/vendor/plugins/activity_tracker/generators/activity_migration/templates/migration.rb +0 -17
  528. data/vendor/plugins/activity_tracker/init.rb +0 -1
  529. data/vendor/plugins/activity_tracker/install.rb +0 -1
  530. data/vendor/plugins/activity_tracker/tasks/activity_tracker_tasks.rake +0 -4
  531. data/vendor/plugins/activity_tracker/test/abstract_unit.rb +0 -47
  532. data/vendor/plugins/activity_tracker/test/activity_tracker_test.rb +0 -48
  533. data/vendor/plugins/activity_tracker/test/database.yml +0 -18
  534. data/vendor/plugins/activity_tracker/test/debug.log +0 -3329
  535. data/vendor/plugins/activity_tracker/test/fixtures/test_post.rb +0 -5
  536. data/vendor/plugins/activity_tracker/test/fixtures/test_posts.yml +0 -3
  537. data/vendor/plugins/activity_tracker/test/fixtures/test_user.rb +0 -4
  538. data/vendor/plugins/activity_tracker/test/fixtures/test_users.yml +0 -6
  539. data/vendor/plugins/activity_tracker/test/schema.rb +0 -21
  540. data/vendor/plugins/acts_as_list/README +0 -23
  541. data/vendor/plugins/acts_as_list/init.rb +0 -3
  542. data/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb +0 -256
  543. data/vendor/plugins/acts_as_list/test/list_test.rb +0 -332
  544. data/vendor/plugins/acts_as_publishable/uninstall.rb +0 -1
  545. data/vendor/plugins/auto_complete/README +0 -23
  546. data/vendor/plugins/auto_complete/Rakefile +0 -22
  547. data/vendor/plugins/auto_complete/init.rb +0 -2
  548. data/vendor/plugins/auto_complete/lib/auto_complete.rb +0 -47
  549. data/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb +0 -143
  550. data/vendor/plugins/auto_complete/test/auto_complete_test.rb +0 -67
  551. data/vendor/plugins/enumerations_mixin/.gitignore +0 -1
  552. data/vendor/plugins/enumerations_mixin/Gemfile +0 -1
  553. data/vendor/plugins/enumerations_mixin/LICENSE +0 -20
  554. data/vendor/plugins/enumerations_mixin/README.md +0 -120
  555. data/vendor/plugins/enumerations_mixin/README_ENUMERATIONS +0 -163
  556. data/vendor/plugins/enumerations_mixin/Rakefile +0 -14
  557. data/vendor/plugins/enumerations_mixin/VERSION +0 -1
  558. data/vendor/plugins/enumerations_mixin/enumerations_mixin.gemspec +0 -44
  559. data/vendor/plugins/enumerations_mixin/examples/virtual_enumerations_sample.rb +0 -76
  560. data/vendor/plugins/enumerations_mixin/init.rb +0 -21
  561. data/vendor/plugins/enumerations_mixin/lib/active_record/acts/enumerated.rb +0 -180
  562. data/vendor/plugins/enumerations_mixin/lib/active_record/aggregations/has_enumerated.rb +0 -60
  563. data/vendor/plugins/enumerations_mixin/lib/active_record/virtual_enumerations.rb +0 -68
  564. data/vendor/plugins/enumerations_mixin/lib/enumerations_mixin.rb +0 -12
  565. data/vendor/plugins/enumerations_mixin/virtual_enumerations_sample.rb +0 -76
  566. data/vendor/plugins/prototype_legacy_helper/README.markdown +0 -13
  567. data/vendor/plugins/prototype_legacy_helper/init.rb +0 -1
  568. data/vendor/plugins/prototype_legacy_helper/lib/prototype_legacy_helper.rb +0 -432
  569. data/vendor/plugins/prototype_legacy_helper/test/test_prototype_helper.rb +0 -297
  570. data/vendor/plugins/resource_feeder/init.rb +0 -2
  571. data/vendor/plugins/resource_feeder/lib/resource_feeder.rb +0 -2
  572. data/vendor/plugins/respond_to_parent/MIT-LICENSE +0 -20
  573. data/vendor/plugins/respond_to_parent/README +0 -47
  574. data/vendor/plugins/respond_to_parent/Rakefile +0 -22
  575. data/vendor/plugins/respond_to_parent/init.rb +0 -1
  576. data/vendor/plugins/respond_to_parent/install.rb +0 -1
  577. data/vendor/plugins/respond_to_parent/lib/responds_to_parent.rb +0 -70
  578. data/vendor/plugins/respond_to_parent/test/responds_to_parent_test.rb +0 -10
  579. data/vendor/plugins/respond_to_parent/test/test_helper.rb +0 -6
  580. data/vendor/plugins/respond_to_parent/uninstall.rb +0 -1
data/config/initializers/mce_options.rb CHANGED
@@ -1,40 +1,17 @@
1
1
  configatron.default_mce_options = {
2
- :theme => 'advanced',
3
- :browsers => %w{msie gecko safari},
4
- :theme_advanced_layout_manager => "SimpleLayout",
5
- :theme_advanced_statusbar_location => "bottom",
6
- :theme_advanced_toolbar_location => "top",
7
- :theme_advanced_toolbar_align => "left",
8
- :theme_advanced_resizing => true,
2
+ :selector => 'textarea.rich_text_editor',
9
3
  :relative_urls => false,
10
4
  :convert_urls => false,
11
- :cleanup => true,
12
- :cleanup_on_startup => true,
13
5
  :convert_fonts_to_spans => true,
14
- :theme_advanced_resize_horizontal => false,
15
- :theme_advanced_buttons1 => %w{bold italic underline separator justifyleft justifycenter justifyright indent outdent separator bullist numlist separator link unlink image media separator undo redo code},
16
- :theme_advanced_buttons2 => [],
17
- :theme_advanced_buttons3 => [],
18
- :plugins => %w{media curblyadvimage inlinepopups safari autosave},
19
- :editor_deselector => "mceNoEditor",
20
- :editor_selector => "rich_text_editor",
6
+ :toolbar => 'bold italic underline | alignleft aligncenter alignright | indent outdent | bullist numlist | link unlink image media | undo redo code',
7
+ :plugins => %w{media link image preview autosave emoticons paste autoresize},
21
8
  :extended_valid_elements => "img[class|src|flashvars|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed|scale|wmode|salign|style],embed[src|quality|scale|salign|wmode|bgcolor|width|height|name|align|type|pluginspage|flashvars],object[align<bottom?left?middle?right?top|archive|border|class|classid|codebase|codetype|data|declare|dir<ltr?rtl|height|hspace|id|lang|name|style|tabindex|title|type|usemap|vspace|width]",
22
- :media_strict => false
9
+ :media_strict => false
23
10
  }
24
-
11
+
25
12
  configatron.simple_mce_options = {
26
- :theme => 'advanced',
27
- :browsers => %w{msie gecko safari},
28
- :cleanup_on_startup => true,
13
+ :selector => 'textarea.rich_text_editor',
29
14
  :convert_fonts_to_spans => true,
30
- :theme_advanced_resizing => true,
31
- :theme_advanced_toolbar_location => "top",
32
- :theme_advanced_statusbar_location => "bottom",
33
- :editor_deselector => "mceNoEditor",
34
- :theme_advanced_resize_horizontal => false,
35
- :theme_advanced_buttons1 => %w{bold italic underline separator bullist numlist separator link unlink image},
36
- :theme_advanced_buttons2 => [],
37
- :theme_advanced_buttons3 => [],
38
- :plugins => %w{inlinepopups safari curblyadvimage},
39
- :editor_selector => "rich_text_editor"
40
- }
15
+ :toolbar => 'bold italic underline | bullist numlist | link unlink image',
16
+ :plugins => %w{autosave link image emoticons },
17
+ }
data/config/initializers/recaptcha_constants.rb CHANGED
@@ -1,6 +1,6 @@
1
- if !configatron.allow_anonymous_commenting.nil? || !configatron.require_captcha_on_signup.nil?
1
+ if configatron.has_key?(:allow_anonymous_commenting) || configatron.has_key?(:require_captcha_on_signup)
2
2
  Recaptcha.configure do |config|
3
3
  config.public_key = configatron.recaptcha_pub_key
4
4
  config.private_key = configatron.recaptcha_priv_key
5
- end
5
+ end
6
6
  end
data/config/locales/de-DE.yml CHANGED
@@ -54,12 +54,8 @@ de-DE:
54
54
 
55
55
  #en: a_few_seconds_ago: a few seconds ago
56
56
  a_few_seconds_ago: vor ein paar Sekunden
57
- #en: about: About
58
- about: "\xC3\x9Cber uns"
59
57
  #en: about_me: About Me
60
58
  about_me: "\xC3\x9Cber mich"
61
- #en: about_site: About %{site}
62
- about_site: "\xC3\x9Cber uns %{site}"
63
59
  #en: about_you: About You
64
60
  about_you: "\xC3\x9Cber dich"
65
61
  #en: accept: Accept
@@ -438,10 +434,6 @@ de-DE:
438
434
  explore_site: Site erkunden
439
435
  #en: failed: failed
440
436
  failed: Fehler
441
- #en: faq: FAQ
442
- faq: FAQ
443
- #en: faq_section: FAQ section
444
- faq_section: FAQ Bereich
445
437
  #en: favorites: Favorites
446
438
  favorites: Favoriten
447
439
  #en: favorite_this: Favorite this
@@ -516,8 +508,6 @@ de-DE:
516
508
  get_started_upload_a_profile_photo: "Fang an: lade ein Profilfoto hoch"
517
509
  #en: go: Go
518
510
  go: Gehe
519
- #en: go2: Go
520
- go2: Los
521
511
  #en: go_check_your_e_mail: Go check your e-mail!
522
512
  go_check_your_e_mail: "Prüfe deine E-Mail!"
523
513
  #en: go_to_the_forums: go to the forums
@@ -646,8 +636,6 @@ de-DE:
646
636
  make_this_my_profile_photo: Als Profilfoto übernehmen
647
637
  #en: male: Male
648
638
  male: "Männlich"
649
- #en: manage_my: "Manage my:"
650
- manage_my: Verwalte
651
639
  #en: manage_posts: Manage Posts
652
640
  manage_posts: "Einträge verwalten"
653
641
  #en: medium: Medium
@@ -686,8 +674,6 @@ de-DE:
686
674
  month: Monat
687
675
  #en: more: More
688
676
  more: Mehr
689
- #en: more_about_you: More about you
690
- more_about_you: "Mehr über dich"
691
677
  #en: most_active_1_month: Most active (1 month)
692
678
  most_active_1_month: Am aktivsten (1 Monat)
693
679
  #en: most_recent: most recent
@@ -730,7 +716,7 @@ de-DE:
730
716
  new_invitation_from: Neue Einladung von
731
717
  #en: new_metro_area: New Metro Area
732
718
  new_metro_area: Neue Metro Area
733
- #en: new_photo: New photo.
719
+ #en: new_photo: New photo
734
720
  new_photo: Neues Foto
735
721
  #en: new_photos_&raquo;_multiple_uploader: "New Photos &raquo; Multiple Uploader"
736
722
  new_photos_raquo_multiple_uploader: "Neue Fotos &raquo; Multiple Uploader"
@@ -1203,8 +1189,6 @@ de-DE:
1203
1189
  url: Url
1204
1190
  #en: user_bio_help: "<p>Your bio is first thing people see on your profile. Some ideas:<ul><li> Describe your sense of style</li><li> Explain what you love about life.</li><li> What's the last thing you purchased for a friend?</li></ul></p>"
1205
1191
  user_bio_help: "<p>Über Mich ist das Erste was die Leute sehen, wenn Sie dein Profile besuchen. Einige Ideen:<ul><li> Describe your sense of style</li><li> Erkläre was du am Leben liebst.</li><li> Was hast du als letztes für einen Freund gekauft?</li></ul></p>"
1206
- #en: user_e_mail: "User e-mail:"
1207
- user_e_mail: "Benutzer-E-Mail:"
1208
1192
  #en: username: Username
1209
1193
  username: Benutzername
1210
1194
  #en: user: User
data/config/locales/en.yml CHANGED
@@ -51,12 +51,8 @@ en:
51
51
 
52
52
  #en: a_few_seconds_ago: a few seconds ago
53
53
  a_few_seconds_ago: a few seconds ago
54
- #en: about: About
55
- about: About
56
54
  #en: about_me: About Me
57
55
  about_me: About Me
58
- #en: about_site: About %{site}
59
- about_site: "About %{site}"
60
56
  #en: about_you: About You
61
57
  about_you: About You
62
58
  #en: admin_pages: Pages
@@ -163,6 +159,8 @@ en:
163
159
  are_you_sure_you_want_to_permanently_delete_this_comment: "Are you sure you want to permanently delete this comment?"
164
160
  #en: are_you_sure_you_want_to_permanently_delete_this_user: Are you sure you want to permanently delete this user?
165
161
  are_you_sure_you_want_to_permanently_delete_this_user: Are you sure you want to permanently delete this user?
162
+ #en: are_you_sure_you_want_to_permanently_delete_this_user_and_mark_as_spam: Are you sure you want to permanently delete this user and mark it as spam!?
163
+ are_you_sure_you_want_to_permanently_delete_this_user_and_mark_as_spam: Are you sure you want to permanently delete this user and mark it as spam!?
166
164
  #en: assume_id: Assume ID
167
165
  assume_id: Assume ID
168
166
  #en: assume_user_id: "Assume this user's ID"
@@ -478,9 +476,9 @@ en:
478
476
  #en: enter_a_message: Enter a message
479
477
  enter_a_message: Enter a message
480
478
  #en: enter_e_mail_addresses: Enter e-mail addresses
481
- enter_e_mail_addresses: Enter e-mail addresses
479
+ enter_e_mail_addresses: Enter email addresses
482
480
  #en: enter_e_mail_addresses_comma_sep: Enter e-mail addresses (comma-separated)
483
- enter_e_mail_addresses_comma_sep: Enter e-mail addresses (comma-separated)
481
+ enter_e_mail_addresses_comma_sep: Enter email addresses (comma-separated)
484
482
  #en: enter_your_email_address: "Enter your email address"
485
483
  enter_your_email_address: "Enter your email address"
486
484
  #en: error: Error!
@@ -507,10 +505,6 @@ en:
507
505
  explore_site: "Explore %{site}"
508
506
  #en: failed: failed
509
507
  failed: failed
510
- #en: faq: FAQ
511
- faq: FAQ
512
- #en: faq_section: FAQ section
513
- faq_section: FAQ section
514
508
  #en: favorited: favorited
515
509
  favorited: favorited
516
510
  #en: favorites: Favorites
@@ -593,8 +587,6 @@ en:
593
587
  upload_a_profile_photo: "Upload a profile photo"
594
588
  #en: go: Go
595
589
  go: Go
596
- #en: go2: Go
597
- go2: Go
598
590
  #en: go_check_your_e_mail: Go check your e-mail!
599
591
  go_check_your_e_mail: Go check your e-mail!
600
592
  #en: go_to_the_forums: go to the forums
@@ -747,10 +739,8 @@ en:
747
739
  make_this_my_profile_photo: Make this my profile photo
748
740
  #en: male: Male
749
741
  male: Male
750
- #en: manage: "Manage:"
751
- manage: "Manage:"
752
- #en: manage_my: "Manage my:"
753
- manage_my: "Manage my:"
742
+ #en: manage: "Manage"
743
+ manage: "Manage"
754
744
  #en: manage_pages: Manage Pages
755
745
  manage_pages: Manage Pages
756
746
  #en: manage_posts: Manage Posts
@@ -809,8 +799,6 @@ en:
809
799
  month: Month
810
800
  #en: more: More
811
801
  more: More
812
- #en: more_about_you: More about you
813
- more_about_you: More about you
814
802
  #en: most_active_1_month: Most active (1 month)
815
803
  most_active_1_month: Most active (1 month)
816
804
  #en: my_account: My Account
@@ -841,6 +829,8 @@ en:
841
829
  need_some_help_contact_our: Need some help? Check out our
842
830
  #en: need_to_contact_us: Need to contact us?
843
831
  need_to_contact_us: Need to contact us?
832
+ #en: new: New1
833
+ new: New!
844
834
  #en: new_ad: New Ad
845
835
  new_ad: New Ad
846
836
  #en: new_category: New category
@@ -861,8 +851,8 @@ en:
861
851
  new_metro_area: New Metro Area
862
852
  #en: new_page: New Page
863
853
  new_page: New Page
864
- #en: new_photo: New photo.
865
- new_photo: New photo.
854
+ #en: new_photo: New photo
855
+ new_photo: New photo
866
856
  #en: new_photos_multiple_uploader: "New Photos &raquo; Multiple Uploader"
867
857
  new_photos_multiple_uploader: "New Photos &raquo; Multiple Uploader"
868
858
  #en: new_post: New post
@@ -977,8 +967,8 @@ en:
977
967
  plural_photos:
978
968
  one: 1 Photo
979
969
  other: "%{count} Photos"
980
- #en: photos_should_be_x_pixels: Photos should be 300x300 pixels.
981
- photos_should_be_x_pixels: Photos should be 300x300 pixels.
970
+ #en: photos_should_be_x_pixels: Photos should be 300x200 pixels.
971
+ photos_should_be_x_pixels: Photos should be 300x200 pixels.
982
972
  #en: photos_tagged: Photos tagged
983
973
  photos_tagged: "Photos tagged"
984
974
  #en: photo_tip_1: Photos show the world your creativity. Pick your best pics, and give them good titles and descriptions.
@@ -1113,6 +1103,8 @@ en:
1113
1103
  requested_friendship_with: Requested friendship with
1114
1104
  #en: requesting_friendship: Requesting friendship
1115
1105
  requesting_friendship: Requesting friendship
1106
+ #en: friendship_request_failed
1107
+ friendship_request_failed: Friendship request failed
1116
1108
  #en: required: required
1117
1109
  required: required
1118
1110
  #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: "(Required: We will send a confirmation e-mail to the address you enter.)"
@@ -1395,6 +1387,8 @@ en:
1395
1387
  uncategorized: Uncategorized
1396
1388
  #en: update: Update
1397
1389
  update: Update
1390
+ #en: update_comment: Update Comment
1391
+ update_comment: Update Comment
1398
1392
  #en: update_rsvp: Update RSVP
1399
1393
  update_rsvp: Update RSVP
1400
1394
  #en: update_profile_and_tag_yourself: Update your profile and tag yourself
@@ -1415,8 +1409,6 @@ en:
1415
1409
  uploaded_by: uploaded by
1416
1410
  #en: url: Url
1417
1411
  url: Url
1418
- #en: user_e_mail: "User e-mail:"
1419
- user_e_mail: "User e-mail:"
1420
1412
  #en: username: Username
1421
1413
  username: Username
1422
1414
  #en: user: User
@@ -1541,6 +1533,8 @@ en:
1541
1533
  you_can_browse_all_content_and_users_on: You can browse all content and users on
1542
1534
  #en: you_cant_delete_that_user: You can't delete that user.
1543
1535
  you_cant_delete_that_user: You can't delete that user.
1536
+ #en: you_cannot_make_an_administrator_a_moderator
1537
+ you_cannot_make_an_administrator_a_moderator: You cannot make an administrator_a_moderator
1544
1538
  #en: you_can_select_up_to_5_files_at_a_time: You can select up to 5 files at a time.
1545
1539
  you_can_select_up_to_5_files_at_a_time: You can select up to 5 files at a time.
1546
1540
  #en: you_could_tag_yourself: You could tag yourself
@@ -1587,8 +1581,6 @@ en:
1587
1581
  your_about_text_goes_here: Your About Text Goes Here
1588
1582
  #en: your_account_has_been_activated: Your %{site} account has been activated!
1589
1583
  your_account_has_been_activated: "Your %{site} account has been activated!"
1590
- #en: your_faq_text_goes_here: Your FAQ text goes here.
1591
- your_faq_text_goes_here: Your FAQ text goes here.
1592
1584
  #en: your_changes_were_saved: Your changes were saved.
1593
1585
  your_changes_were_saved: Your changes were saved.
1594
1586
  #en: your_password_reset_instructions_have_been_emailed_to_you: Instructions to reset your password have been emailed to you.
@@ -1660,9 +1652,3 @@ en:
1660
1652
  cancel_and_go_back_to_photo_manager: "Cancel and go back to photo manager"
1661
1653
  #en: back_to_photo_manager: "Back to photo manager"
1662
1654
  back_to_photo_manager: "Back to photo manager"
1663
- #en: photo_presence_error: "is not present."
1664
- photo_presence_error: "is not present."
1665
- #en: photo_content_type_error: "is not a supported image type."
1666
- photo_content_type_error: "is not a supported image type."
1667
- #en: photo_size_limit_error: "must be less than %{count}MB."
1668
- photo_size_limit_error: "must be less than %{count}MB."
data/config/locales/es-AR.yml CHANGED
@@ -26,12 +26,8 @@ es-AR:
26
26
  attributes:
27
27
  photo:
28
28
  created_at: "creado: "
29
- #en: about: About
30
- about: Acerca
31
29
  #en: about_me: About Me
32
30
  about_me: "Acerca de m\xC3\xAD"
33
- #en: about_site: About %{site}
34
- about_site: Acerca de %{site}
35
31
  #en: about_you: About You
36
32
  about_you: Acerca de usted
37
33
  #en: accepted_friendships: Accepted Friendships
@@ -240,8 +236,6 @@ es-AR:
240
236
  events: Eventos
241
237
  #en: explore_site: Explore %{site}
242
238
  explore_site: Explorar %{site}
243
- #en: faq: FAQ
244
- faq: FAQ
245
239
  #en: favorited: favorited
246
240
  favorited: marcado como favorito
247
241
  #en: featured_writer: Featured Writer
@@ -344,8 +338,6 @@ es-AR:
344
338
  looking_for_most_x: Buscando lo mas %{link}?
345
339
  #en: male: Male
346
340
  male: Hombre
347
- #en: manage_my: "Manage my:"
348
- manage_my: "Gestionar mi:"
349
341
  #en: manage_posts: Manage Posts
350
342
  manage_posts: Administrar posts
351
343
  #en: members: Members
@@ -356,8 +348,6 @@ es-AR:
356
348
  metro_area_was_successfully_created: Localidad creada satisfactoriamente.
357
349
  #en: metro_areas: Metro areas
358
350
  metro_areas: Localidades
359
- #en: more_about_you: More about you
360
- more_about_you: "M\xC3\xA1s acerca tuyo"
361
351
  #en: my_friends: My Friends
362
352
  my_friends: Mis amigos
363
353
  #en: my_profile: My Profile
@@ -374,7 +364,7 @@ es-AR:
374
364
  new_ad: Nuevo aviso
375
365
  #en: new_category: New category
376
366
  new_category: "Nueva categor\xC3\xADa"
377
- #en: new_photo: New photo.
367
+ #en: new_photo: New photo
378
368
  new_photo: Nueva foto
379
369
  #en: new_post: New post
380
370
  new_post: Nuevo post
@@ -629,9 +619,7 @@ es-AR:
629
619
  uploaded_a_photo: "public\xC3\xB3 una foto"
630
620
  #en: user_clippings:
631
621
  user_clippings: Recortes de %{user}
632
- #en: user_e_mail: "User e-mail:"
633
- user_e_mail: "E-mail del usuario:"
634
- #en: user_login: "User login:"
622
+ #en: user_e_mail: "User e-mail"
635
623
  user_login: "Nombre de usuario:"
636
624
  #en: username: Username
637
625
  username: Nombre de usuario
data/config/locales/es-ES.yml CHANGED
@@ -24,12 +24,8 @@ es-ES:
24
24
  attributes:
25
25
  photo:
26
26
  created_at: "creado: "
27
- #en: about: About
28
- about: "Qui\xC3\xA9nes somos"
29
27
  #en: about_me: About Me
30
28
  about_me: "Acerca de M\xC3\xAD"
31
- #en: about_site: About %{site}
32
- about_site: Acerca de %{site}
33
29
  #en: about_you: About You
34
30
  about_you: "Acerca de T\xC3\xAD"
35
31
  #en: accepted_friendships: Accepted Friendships
@@ -280,8 +276,6 @@ es-ES:
280
276
  events: "Eventos"
281
277
  #en: explore_site: Explore %{site}
282
278
  explore_site: "Explora %{site}"
283
- #en: faq: FAQ
284
- faq: "Preguntas m\xC3\xA1s frecuentes"
285
279
  #en: favorited: favorited
286
280
  favorited: 'favorito'
287
281
  #en: featured_posts: Featured Posts
data/config/locales/es-MX.yml CHANGED
@@ -73,7 +73,6 @@ es-MX:
73
73
  logged_in: "Ingresado:"
74
74
  cancel_and_go_back_to_my_photos: cancelar y regresar a mis fotos
75
75
  voices: Voces
76
- manage_my: "Administrar mi:"
77
76
  location: Unicación
78
77
  metro_areas: Ciudades
79
78
  photo_tip_1: Las fotos muestran al mundo tu creatividad. Escoge las mejores, y dales buenos títulos y descripciones.
@@ -95,7 +94,6 @@ es-MX:
95
94
  estimated_total_for_this_month: Total estimado para este mes
96
95
  cancel: cancelar
97
96
  account_activation_error: "Activación de cuenta falló. Tal vez ya está activa. Intenta conectarte o manda un correo electrónico a %{email} para obtener ayuda."
98
- more_about_you: Más sobre tí
99
97
  email_addresses: Direcciones de Correo Electrónico
100
98
  blog_posts: "Publicaciones de la blog"
101
99
  admin: Administrador
@@ -339,7 +337,6 @@ es-MX:
339
337
  editing_category: "Editando categoría"
340
338
  ads: Anuncio
341
339
  you_have_uploaded: Has subido
342
- user_e_mail: "E-mail del usuario:"
343
340
  rss: RSS
344
341
  requested_friendship_with: Se pidió la amistad de
345
342
  an_error_occurred: "Ocurrió un error"
@@ -394,7 +391,6 @@ es-MX:
394
391
  homepage_banner_msg: CommunityEngine es la mejor forma de is de cero a 100 en un momento
395
392
  get_help_from_someone_who_knows: Obtén ayuda de alguien que sabe
396
393
  tags: Etiquetas
397
- about_site: Acerca de %{site}
398
394
  one_minute_ago: hace un minuto
399
395
  request_friendship: Solicitar amistad
400
396
  remove_this_friend: Eliminar este amigo
@@ -407,7 +403,7 @@ es-MX:
407
403
  back: Regresar
408
404
  just_uploading_one_photo: ¿Subiendo solo una foto?
409
405
  clippings_are_a_way_to_save_images_you_like_from_around_the_web: Los recortes son una forma de guardar imagenes que te gusten de la Web
410
- new_photo: Nueva foto.
406
+ new_photo: Nueva foto
411
407
  by: por
412
408
  last: último
413
409
  zippostal_code: "Código Postal:"
@@ -448,7 +444,6 @@ es-MX:
448
444
  update: Actualizar
449
445
  type_your_password: "Escribe tu contraseña:"
450
446
  sign_up: ¡Registrate!
451
- go2: Ir
452
447
  new_clipping: Nuevo recorte
453
448
  messages_sent: ¡Mensajes enviados!
454
449
  voice: voz
@@ -467,7 +462,6 @@ es-MX:
467
462
  create_an_account: Crear una cuenta
468
463
  days_ago: dias atras
469
464
  notify_email_updates: Email de Noticias de la Comunidad
470
- faq_section: Seccion de Preguntas Frecuentes
471
465
  last_post: Última publicación
472
466
  you_must_vote_to_see_the_results: Debe votar para ver los resultados.
473
467
  more: Más
@@ -525,7 +519,6 @@ es-MX:
525
519
  sign_up_for_an_account: Registrarse.
526
520
  required: requerido
527
521
  postal_code: "Código postal:"
528
- faq: "Preguntas más frecuentes"
529
522
  most_active_1_month: Más Activo (1 month)
530
523
  clippings: Recortes
531
524
  featured_posts: Publicaciones Destacadas
@@ -626,7 +619,6 @@ es-MX:
626
619
  logins: Nombres de Usuario
627
620
  one_day_ago: hace un día
628
621
  megabyte_upload_limit: límite de megabytes para subir
629
- about: "Quiénes somos"
630
622
  scrapbook: Bloc de notas
631
623
  make_moderator: Hacer moderador
632
624
  admin_controls: Administración
data/config/locales/fr-FR.yml CHANGED
@@ -31,12 +31,8 @@ fr:
31
31
 
32
32
  #en: a_few_seconds_ago: a few seconds ago
33
33
  a_few_seconds_ago: il y a quelques secondes
34
- #en: about: About
35
- about: "A propos"
36
34
  #en: about_me: About Me
37
35
  about_me: "Qui suis je ?"
38
- #en: about_site: About %{site}
39
- about_site: "A propos de %{site}"
40
36
  #en: about_you: About You
41
37
  about_you: "Qui suis je ?"
42
38
  #en: accept: Accept
@@ -432,10 +428,6 @@ fr:
432
428
  explore_site: "Parcourir %{site}"
433
429
  # #en: failed: failed
434
430
  failed: a échoué
435
- #en: faq: FAQ
436
- faq: FAQ
437
- #en: faq_section: FAQ section
438
- faq_section: Rubrique FAQ
439
431
  #en: favorites: Favorites
440
432
  favorites: Favoris
441
433
  #en: favorite_this: Favorite this
@@ -516,8 +508,6 @@ fr:
516
508
  upload_a_profile_photo: "Ajoutez une photo à votre profil"
517
509
  #en: go: Go
518
510
  go: Continuer
519
- #en: go2: Go
520
- go2: Continuer
521
511
  #en: go_check_your_e_mail: Go check your e-mail!
522
512
  go_check_your_e_mail: Allez vérifier vos mails !
523
513
  #en: go_to_the_forums: go to the forums
@@ -662,8 +652,8 @@ fr:
662
652
  make_this_my_profile_photo: Faire de cette photo ma photo de profil
663
653
  #en: male: Male
664
654
  male: Homme
665
- # #en: manage: "Manage:"
666
- manage: "Gérer :"
655
+ # #en: manage: "Manage"
656
+ manage: "Gérer"
667
657
  #en: manage_pages: Manage Pages
668
658
  manage_pages: Gérer les Pages
669
659
  #en: manage_posts: Manage Posts
@@ -720,8 +710,6 @@ fr:
720
710
  month: Mois
721
711
  #en: more: More
722
712
  more: Plus
723
- #en: more_about_you: More about you
724
- more_about_you: Mais encore ...
725
713
  #en: most_active_1_month: Most active (1 month)
726
714
  most_active_1_month: Le plus actif (depuis 1 mois)
727
715
  #en: my_account: My Account
@@ -770,7 +758,7 @@ fr:
770
758
  new_invitation_from: Nouvelle invitation de
771
759
  # #en: new_metro_area: New Metro Area
772
760
  new_metro_area: Nouvelle zone de métro
773
- #en: new_photo: New photo.
761
+ #en: new_photo: New photo
774
762
  new_photo: Ajouter une photo
775
763
  #en: new_photos_multiple_uploader: "New Photos &raquo; Multiple Uploader"
776
764
  new_photos_multiple_uploader: "Ajout de nouvelles photos &raquo; Téléchargement multiple"
@@ -1284,8 +1272,6 @@ fr:
1284
1272
  uploaded_by: téléchargé par
1285
1273
  #en: url: Url
1286
1274
  url: URL
1287
- #en: user_e_mail: "User e-mail:"
1288
- user_e_mail: "Email du membre :"
1289
1275
  #en: username: Username
1290
1276
  username: Pseudo
1291
1277
  #en: user: User