publify_core 9.0.0.pre5 → 9.2.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of publify_core might be problematic. Click here for more details.

Files changed (395) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +102 -6
  3. data/README.md +9 -0
  4. data/app/assets/javascripts/bootstrap-sprockets.js +8 -0
  5. data/app/assets/javascripts/bootstrap/affix.js +164 -0
  6. data/app/assets/javascripts/bootstrap/alert.js +95 -0
  7. data/app/assets/javascripts/bootstrap/button.js +125 -0
  8. data/app/assets/javascripts/bootstrap/collapse.js +212 -0
  9. data/app/assets/javascripts/bootstrap/dropdown.js +165 -0
  10. data/app/assets/javascripts/bootstrap/modal.js +358 -0
  11. data/app/assets/javascripts/bootstrap/tab.js +155 -0
  12. data/app/assets/javascripts/bootstrap/transition.js +59 -0
  13. data/app/assets/javascripts/lightbox.js +4 -4
  14. data/app/assets/javascripts/publify_admin.js +1 -35
  15. data/app/assets/stylesheets/_bootstrap-compass.scss +9 -0
  16. data/app/assets/stylesheets/_bootstrap-mincer.scss +19 -0
  17. data/app/assets/stylesheets/_bootstrap-sprockets.scss +9 -0
  18. data/app/assets/stylesheets/_bootstrap.scss +42 -0
  19. data/app/assets/stylesheets/administration_structure.css.scss +1 -45
  20. data/app/assets/stylesheets/bootstrap/_alerts.scss +73 -0
  21. data/app/assets/stylesheets/bootstrap/_button-groups.scss +242 -0
  22. data/app/assets/stylesheets/bootstrap/_buttons.scss +168 -0
  23. data/app/assets/stylesheets/bootstrap/_close.scss +37 -0
  24. data/app/assets/stylesheets/bootstrap/_code.scss +69 -0
  25. data/app/assets/stylesheets/bootstrap/_component-animations.scss +38 -0
  26. data/app/assets/stylesheets/bootstrap/_dropdowns.scss +213 -0
  27. data/app/assets/stylesheets/bootstrap/_forms.scss +586 -0
  28. data/app/assets/stylesheets/bootstrap/_grid.scss +94 -0
  29. data/app/assets/stylesheets/bootstrap/_labels.scss +66 -0
  30. data/app/assets/stylesheets/bootstrap/_media.scss +66 -0
  31. data/app/assets/stylesheets/bootstrap/_mixins.scss +37 -0
  32. data/app/assets/stylesheets/bootstrap/_modals.scss +150 -0
  33. data/app/assets/stylesheets/bootstrap/_navbar.scss +479 -0
  34. data/app/assets/stylesheets/bootstrap/_navs.scss +242 -0
  35. data/app/assets/stylesheets/bootstrap/_normalize.scss +427 -0
  36. data/app/assets/stylesheets/bootstrap/_pagination.scss +86 -0
  37. data/app/assets/stylesheets/bootstrap/_panels.scss +222 -0
  38. data/app/assets/stylesheets/bootstrap/_print.scss +99 -0
  39. data/app/assets/stylesheets/bootstrap/_scaffolding.scss +160 -0
  40. data/app/assets/stylesheets/bootstrap/_tables.scss +234 -0
  41. data/app/assets/stylesheets/bootstrap/_theme.scss +224 -0
  42. data/app/assets/stylesheets/bootstrap/_type.scss +296 -0
  43. data/app/assets/stylesheets/bootstrap/_utilities.scss +55 -0
  44. data/app/assets/stylesheets/bootstrap/_variables.scss +638 -0
  45. data/app/assets/stylesheets/bootstrap/_wells.scss +29 -0
  46. data/app/assets/stylesheets/bootstrap/mixins/_alerts.scss +15 -0
  47. data/app/assets/stylesheets/bootstrap/mixins/_background-variant.scss +12 -0
  48. data/app/assets/stylesheets/bootstrap/mixins/_border-radius.scss +18 -0
  49. data/app/assets/stylesheets/bootstrap/mixins/_buttons.scss +56 -0
  50. data/app/assets/stylesheets/bootstrap/mixins/_center-block.scss +7 -0
  51. data/app/assets/stylesheets/bootstrap/mixins/_clearfix.scss +22 -0
  52. data/app/assets/stylesheets/bootstrap/mixins/_forms.scss +82 -0
  53. data/app/assets/stylesheets/bootstrap/mixins/_gradients.scss +56 -0
  54. data/app/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +81 -0
  55. data/app/assets/stylesheets/bootstrap/mixins/_grid.scss +122 -0
  56. data/app/assets/stylesheets/bootstrap/mixins/_hide-text.scss +21 -0
  57. data/app/assets/stylesheets/bootstrap/mixins/_image.scss +28 -0
  58. data/app/assets/stylesheets/bootstrap/mixins/_labels.scss +12 -0
  59. data/app/assets/stylesheets/bootstrap/mixins/_nav-divider.scss +10 -0
  60. data/app/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +9 -0
  61. data/app/assets/stylesheets/bootstrap/mixins/_opacity.scss +7 -0
  62. data/app/assets/stylesheets/bootstrap/mixins/_pagination.scss +24 -0
  63. data/app/assets/stylesheets/bootstrap/mixins/_panels.scss +20 -0
  64. data/app/assets/stylesheets/bootstrap/mixins/_reset-filter.scss +8 -0
  65. data/app/assets/stylesheets/bootstrap/mixins/_resize.scss +6 -0
  66. data/app/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +17 -0
  67. data/app/assets/stylesheets/bootstrap/mixins/_size.scss +10 -0
  68. data/app/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +9 -0
  69. data/app/assets/stylesheets/bootstrap/mixins/_table-row.scss +28 -0
  70. data/app/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +12 -0
  71. data/app/assets/stylesheets/bootstrap/mixins/_text-overflow.scss +8 -0
  72. data/app/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +222 -0
  73. data/app/assets/stylesheets/lightbox.css +3 -3
  74. data/app/assets/stylesheets/publify_admin.css.scss +0 -1
  75. data/app/controllers/accounts_controller.rb +2 -0
  76. data/app/controllers/admin/base_controller.rb +8 -22
  77. data/app/controllers/admin/content_controller.rb +69 -48
  78. data/app/controllers/admin/dashboard_controller.rb +20 -74
  79. data/app/controllers/admin/feedback_controller.rb +45 -36
  80. data/app/controllers/admin/notes_controller.rb +16 -10
  81. data/app/controllers/admin/pages_controller.rb +20 -34
  82. data/app/controllers/admin/post_types_controller.rb +7 -5
  83. data/app/controllers/admin/profiles_controller.rb +15 -5
  84. data/app/controllers/admin/redirects_controller.rb +9 -5
  85. data/app/controllers/admin/resources_controller.rb +7 -4
  86. data/app/controllers/admin/seo_controller.rb +12 -10
  87. data/app/controllers/admin/settings_controller.rb +7 -5
  88. data/app/controllers/admin/sidebar_controller.rb +7 -5
  89. data/app/controllers/admin/tags_controller.rb +7 -3
  90. data/app/controllers/admin/themes_controller.rb +10 -7
  91. data/app/controllers/admin/users_controller.rb +10 -7
  92. data/app/controllers/articles_controller.rb +92 -81
  93. data/app/controllers/authors_controller.rb +6 -3
  94. data/app/controllers/base_controller.rb +9 -11
  95. data/app/controllers/comments_controller.rb +15 -16
  96. data/app/controllers/content_controller.rb +12 -19
  97. data/app/controllers/feedback_controller.rb +7 -39
  98. data/app/controllers/notes_controller.rb +6 -6
  99. data/app/controllers/setup_controller.rb +25 -26
  100. data/app/controllers/tags_controller.rb +16 -16
  101. data/app/controllers/text_controller.rb +2 -4
  102. data/app/controllers/textfilter_controller.rb +2 -0
  103. data/app/controllers/theme_controller.rb +22 -17
  104. data/app/controllers/xml_controller.rb +13 -59
  105. data/app/helpers/admin/base_helper.rb +28 -29
  106. data/app/helpers/admin/feedback_helper.rb +34 -24
  107. data/app/helpers/articles_helper.rb +4 -2
  108. data/app/helpers/authors_helper.rb +9 -18
  109. data/app/helpers/base_helper.rb +66 -55
  110. data/app/helpers/blog_helper.rb +4 -2
  111. data/app/helpers/xml_helper.rb +5 -3
  112. data/app/jobs/application_job.rb +4 -0
  113. data/app/mailers/notification_mailer.rb +5 -3
  114. data/app/models/ability.rb +25 -24
  115. data/app/models/archives_sidebar.rb +18 -18
  116. data/app/models/article.rb +84 -99
  117. data/app/models/article/factory.rb +14 -6
  118. data/app/models/blog.rb +98 -110
  119. data/app/models/comment.rb +14 -10
  120. data/app/models/config_manager.rb +4 -2
  121. data/app/models/content.rb +45 -65
  122. data/app/models/content_base.rb +7 -14
  123. data/app/models/feedback.rb +91 -66
  124. data/app/models/meta_sidebar.rb +5 -3
  125. data/app/models/note.rb +31 -23
  126. data/app/models/page.rb +16 -10
  127. data/app/models/page_sidebar.rb +4 -2
  128. data/app/models/ping.rb +2 -113
  129. data/app/models/post_type.rb +4 -3
  130. data/app/models/redirect.rb +13 -7
  131. data/app/models/redirection.rb +3 -1
  132. data/app/models/resource.rb +6 -22
  133. data/app/models/search_sidebar.rb +4 -2
  134. data/app/models/sidebar.rb +12 -7
  135. data/app/models/static_sidebar.rb +15 -13
  136. data/app/models/tag.rb +23 -15
  137. data/app/models/tag_sidebar.rb +10 -7
  138. data/app/models/text_filter.rb +85 -11
  139. data/app/models/trackback.rb +7 -18
  140. data/app/models/trigger.rb +8 -19
  141. data/app/models/user.rb +46 -52
  142. data/app/services/title_builder.rb +52 -45
  143. data/app/uploaders/resource_uploader.rb +35 -2
  144. data/app/views/accounts/confirm.html.erb +3 -4
  145. data/app/views/admin/content/_article_list.html.erb +24 -9
  146. data/app/views/admin/content/_form.html.erb +71 -51
  147. data/app/views/admin/content/autosave.js.erb +2 -2
  148. data/app/views/admin/content/edit.html.erb +1 -1
  149. data/app/views/admin/content/index.html.erb +25 -15
  150. data/app/views/admin/content/new.html.erb +2 -2
  151. data/app/views/admin/dashboard/_comment.html.erb +5 -5
  152. data/app/views/admin/dashboard/_comments.html.erb +2 -2
  153. data/app/views/admin/dashboard/_drafts.html.erb +5 -5
  154. data/app/views/admin/dashboard/_overview.html.erb +7 -9
  155. data/app/views/admin/dashboard/_welcome.html.erb +11 -11
  156. data/app/views/admin/dashboard/index.html.erb +12 -7
  157. data/app/views/admin/feedback/_button.html.erb +6 -6
  158. data/app/views/admin/feedback/_feedback.html.erb +3 -3
  159. data/app/views/admin/feedback/_ham.html.erb +27 -9
  160. data/app/views/admin/feedback/_spam.html.erb +26 -16
  161. data/app/views/admin/feedback/article.html.erb +20 -21
  162. data/app/views/admin/feedback/edit.html.erb +14 -15
  163. data/app/views/admin/feedback/{ham.js → ham.js.erb} +0 -0
  164. data/app/views/admin/feedback/index.html.erb +25 -23
  165. data/app/views/admin/feedback/{spam.js → spam.js.erb} +0 -0
  166. data/app/views/admin/migrations/show.html.erb +10 -11
  167. data/app/views/admin/notes/_form.html.erb +13 -13
  168. data/app/views/admin/notes/_list.html.erb +19 -8
  169. data/app/views/admin/notes/_note.html.erb +12 -7
  170. data/app/views/admin/notes/edit.html.erb +6 -1
  171. data/app/views/admin/notes/index.html.erb +5 -1
  172. data/app/views/admin/notes/show.html.erb +2 -2
  173. data/app/views/admin/pages/_form.html.erb +86 -77
  174. data/app/views/admin/pages/_pages.html.erb +11 -4
  175. data/app/views/admin/pages/edit.html.erb +3 -1
  176. data/app/views/admin/pages/index.html.erb +10 -6
  177. data/app/views/admin/pages/new.html.erb +3 -1
  178. data/app/views/admin/post_types/_index_and_form.html.erb +15 -16
  179. data/app/views/admin/post_types/edit.html.erb +1 -1
  180. data/app/views/admin/post_types/index.html.erb +1 -1
  181. data/app/views/admin/profiles/index.html.erb +2 -3
  182. data/app/views/admin/redirects/_index_and_form.html.erb +10 -11
  183. data/app/views/admin/redirects/edit.html.erb +1 -1
  184. data/app/views/admin/redirects/index.html.erb +1 -1
  185. data/app/views/admin/resources/index.html.erb +19 -16
  186. data/app/views/admin/seo/_general.html.erb +40 -59
  187. data/app/views/admin/seo/_permalinks.html.erb +17 -17
  188. data/app/views/admin/seo/_titles.html.erb +81 -82
  189. data/app/views/admin/seo/show.html.erb +14 -19
  190. data/app/views/admin/settings/display.html.erb +42 -52
  191. data/app/views/admin/settings/feedback.html.erb +59 -67
  192. data/app/views/admin/settings/index.html.erb +30 -31
  193. data/app/views/admin/settings/write.html.erb +27 -46
  194. data/app/views/admin/shared/_edit.html.erb +3 -3
  195. data/app/views/admin/shared/_menu.html.erb +26 -26
  196. data/app/views/admin/shared/_twitter_alert.html.erb +1 -1
  197. data/app/views/admin/sidebar/_config.html.erb +5 -5
  198. data/app/views/admin/sidebar/_target_sidebar.html.erb +4 -4
  199. data/app/views/admin/sidebar/index.html.erb +7 -7
  200. data/app/views/admin/tags/_index_and_form.html.erb +11 -12
  201. data/app/views/admin/tags/edit.html.erb +1 -1
  202. data/app/views/admin/tags/index.html.erb +1 -1
  203. data/app/views/admin/themes/index.html.erb +5 -6
  204. data/app/views/admin/users/_form.html.erb +34 -34
  205. data/app/views/admin/users/edit.html.erb +2 -2
  206. data/app/views/admin/users/index.html.erb +10 -12
  207. data/app/views/admin/users/new.html.erb +2 -2
  208. data/app/views/archives_sidebar/_content.html.erb +2 -2
  209. data/app/views/articles/_archives_article.html.erb +9 -0
  210. data/app/views/articles/_article.html.erb +9 -9
  211. data/app/views/articles/_article_author.html.erb +4 -0
  212. data/app/views/articles/_article_collection.html.erb +1 -1
  213. data/app/views/articles/_article_content.html.erb +2 -2
  214. data/app/views/articles/_article_excerpt.html.erb +11 -9
  215. data/app/views/articles/_article_links.html.erb +5 -3
  216. data/app/views/articles/_comment_errors.html.erb +1 -1
  217. data/app/views/articles/_comment_form.html.erb +12 -12
  218. data/app/views/articles/_comment_list.html.erb +5 -5
  219. data/app/views/articles/_comment_preview.html.erb +3 -3
  220. data/app/views/articles/_full_article_content.html.erb +4 -2
  221. data/app/views/articles/_password_form.html.erb +4 -4
  222. data/app/views/articles/_trackback.html.erb +2 -2
  223. data/app/views/articles/archives.html.erb +11 -21
  224. data/app/views/articles/feedback_atom_feed.atom.builder +7 -5
  225. data/app/views/articles/feedback_rss_feed.rss.builder +11 -11
  226. data/app/views/articles/index_atom_feed.atom.builder +5 -4
  227. data/app/views/articles/index_rss_feed.rss.builder +8 -8
  228. data/app/views/articles/live_search.html.erb +3 -3
  229. data/app/views/articles/read.html.erb +19 -37
  230. data/app/views/articles/search.html.erb +3 -3
  231. data/app/views/articles/trackback.xml.builder +3 -1
  232. data/app/views/articles/view_page.html.erb +2 -2
  233. data/app/views/authors/show.html.erb +18 -28
  234. data/app/views/authors/show_atom_feed.atom.builder +5 -4
  235. data/app/views/authors/show_rss_feed.rss.builder +8 -8
  236. data/app/views/comments/_comment.html.erb +17 -16
  237. data/app/views/devise/mailer/reset_password_instructions.html.erb +7 -9
  238. data/app/views/devise/passwords/edit.html.erb +4 -4
  239. data/app/views/devise/passwords/new.html.erb +1 -1
  240. data/app/views/devise/registrations/new.html.erb +5 -5
  241. data/app/views/devise/sessions/new.html.erb +3 -3
  242. data/app/views/errors/404.html.erb +2 -2
  243. data/app/views/feedback/index.atom.builder +9 -0
  244. data/app/views/feedback/index.rss.builder +20 -0
  245. data/app/views/layouts/accounts.html.erb +26 -26
  246. data/app/views/layouts/administration.html.erb +31 -31
  247. data/app/views/layouts/default.html.erb +4 -3
  248. data/app/views/layouts/editor.html.erb +5 -19
  249. data/app/views/meta_sidebar/_content.html.erb +2 -2
  250. data/app/views/notes/_note.html.erb +16 -15
  251. data/app/views/notes/index.html.erb +2 -2
  252. data/app/views/notes/show_in_reply.html.erb +1 -1
  253. data/app/views/notification_mailer/_mail_footer.html.erb +3 -5
  254. data/app/views/notification_mailer/_mail_header.html.erb +2 -0
  255. data/app/views/notification_mailer/article.html.erb +5 -4
  256. data/app/views/notification_mailer/comment.html.erb +9 -8
  257. data/app/views/notification_mailer/notif_user.html.erb +4 -9
  258. data/app/views/page_sidebar/_content.html.erb +1 -1
  259. data/app/views/search_sidebar/_content.html.erb +2 -2
  260. data/app/views/settings/install.html.erb +2 -2
  261. data/app/views/setup/index.html.erb +9 -5
  262. data/app/views/shared/_atom_header.atom.builder +4 -4
  263. data/app/views/shared/_atom_item_article.atom.builder +19 -22
  264. data/app/views/shared/_atom_item_comment.atom.builder +5 -5
  265. data/app/views/shared/_atom_item_trackback.atom.builder +5 -4
  266. data/app/views/shared/_google_analytics.html.erb +8 -0
  267. data/app/views/shared/_page_header.html.erb +10 -13
  268. data/app/views/shared/_rss_item_article.rss.builder +12 -15
  269. data/app/views/shared/_rss_item_comment.rss.builder +2 -1
  270. data/app/views/shared/_rss_item_trackback.rss.builder +2 -0
  271. data/app/views/sidebar/display_plugins.html.erb +1 -1
  272. data/app/views/tag_sidebar/_content.html.erb +1 -1
  273. data/app/views/tags/index.html.erb +2 -2
  274. data/app/views/xml/_googlesitemap_item_article.googlesitemap.builder +2 -0
  275. data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder +2 -0
  276. data/app/views/xml/_googlesitemap_item_page.googlesitemap.builder +2 -0
  277. data/app/views/xml/_googlesitemap_item_tag.googlesitemap.builder +2 -0
  278. data/app/views/xml/sitemap.googlesitemap.builder +9 -0
  279. data/config/i18n-tasks.yml +0 -5
  280. data/config/initializers/devise.rb +10 -4
  281. data/config/initializers/mime_types.rb +3 -2
  282. data/config/locales/da.yml +140 -108
  283. data/config/locales/de.yml +147 -111
  284. data/config/locales/en.yml +133 -102
  285. data/config/locales/es-MX.yml +141 -106
  286. data/config/locales/fr.yml +172 -122
  287. data/config/locales/he.yml +132 -105
  288. data/config/locales/it.yml +141 -108
  289. data/config/locales/ja.yml +115 -100
  290. data/config/locales/lt.yml +158 -110
  291. data/config/locales/nb-NO.yml +128 -101
  292. data/config/locales/nl.yml +147 -113
  293. data/config/locales/pl.yml +335 -275
  294. data/config/locales/pt-BR.yml +143 -107
  295. data/config/locales/ro.yml +155 -108
  296. data/config/locales/ru.yml +166 -105
  297. data/config/locales/zh-CN.yml +112 -96
  298. data/config/locales/zh-TW.yml +116 -99
  299. data/config/routes.rb +70 -87
  300. data/db/migrate/113_initial_schema.rb +6 -6
  301. data/db/migrate/114_fixes_buggy_articles_and_notes.rb +8 -6
  302. data/db/migrate/115_drops_categories_for_tags.rb +7 -6
  303. data/db/migrate/20150207131657_add_missing_indexes.rb +3 -1
  304. data/db/migrate/20150807134129_simplify_redirect_relations.rb +6 -1
  305. data/db/migrate/20150808052637_add_blog_ids.rb +11 -7
  306. data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +3 -1
  307. data/db/migrate/20150810094754_add_blog_id_to_tags.rb +3 -1
  308. data/db/migrate/20160108111120_add_devise_to_users.rb +3 -1
  309. data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +3 -1
  310. data/db/migrate/20160110094906_remove_profiles_rights.rb +3 -1
  311. data/db/migrate/20160605103918_replace_profile_id_with_string.rb +3 -3
  312. data/db/migrate/20160605154632_remove_profiles.rb +12 -7
  313. data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +3 -1
  314. data/db/migrate/20160701062604_add_blog_id_to_resources.rb +3 -1
  315. data/db/migrate/20170528093024_move_resources_to_content.rb +7 -0
  316. data/db/migrate/20170528094923_move_tags_to_content.rb +8 -0
  317. data/db/migrate/20170528201606_remove_separate_published_flag.rb +7 -0
  318. data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +8 -0
  319. data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +7 -0
  320. data/db/migrate/20190208151235_add_text_filter_name_fields.rb +9 -0
  321. data/db/migrate/20190208152646_move_text_filter_to_name.rb +97 -0
  322. data/db/migrate/20190209155717_remove_text_filter_ids.rb +19 -0
  323. data/db/migrate/20190209160610_remove_text_filters.rb +17 -0
  324. data/db/migrate/20200413140440_add_unique_indexes.rb +10 -0
  325. data/db/seeds.rb +8 -20
  326. data/lib/email_notify.rb +3 -1
  327. data/lib/format.rb +4 -12
  328. data/lib/publify_core.rb +36 -36
  329. data/lib/publify_core/engine.rb +11 -4
  330. data/lib/publify_core/lang.rb +5 -1
  331. data/lib/publify_core/testing_support/dns_mock.rb +15 -0
  332. data/lib/publify_core/testing_support/factories.rb +240 -0
  333. data/lib/publify_core/testing_support/feed_assertions.rb +48 -0
  334. data/lib/publify_core/testing_support/fixtures/exploit.svg +4 -0
  335. data/lib/publify_core/testing_support/fixtures/fakepng.png +1 -0
  336. data/lib/publify_core/testing_support/fixtures/otherfile.txt +1 -0
  337. data/lib/publify_core/testing_support/fixtures/testfile.png +0 -0
  338. data/lib/publify_core/testing_support/fixtures/testfile.txt +1 -0
  339. data/lib/publify_core/testing_support/upload_fixtures.rb +15 -0
  340. data/lib/publify_core/version.rb +3 -1
  341. data/lib/publify_guid.rb +4 -2
  342. data/lib/publify_plugins.rb +10 -5
  343. data/lib/publify_textfilter_markdown.rb +38 -25
  344. data/lib/publify_textfilter_none.rb +5 -3
  345. data/lib/publify_textfilter_smartypants.rb +5 -3
  346. data/lib/publify_textfilter_textile.rb +7 -4
  347. data/lib/publify_textfilter_twitterfilter.rb +13 -7
  348. data/lib/publify_time.rb +6 -2
  349. data/lib/sidebar_field.rb +29 -20
  350. data/lib/sidebar_registry.rb +5 -3
  351. data/lib/spam_protection.rb +19 -17
  352. data/lib/tasks/i18n.rake +9 -0
  353. data/lib/tasks/manifest.rake +30 -0
  354. data/lib/tasks/publify_core_tasks.rake +2 -0
  355. data/lib/text_filter_plugin.rb +30 -29
  356. data/lib/theme.rb +5 -5
  357. data/lib/transforms.rb +22 -20
  358. data/{app/assets/stylesheets/publify_core/.keep → themes/plain/javascripts/theme.js} +0 -0
  359. metadata +304 -130
  360. data/.gitignore +0 -13
  361. data/.rspec +0 -2
  362. data/.rubocop.yml +0 -84
  363. data/.rubocop_todo.yml +0 -148
  364. data/.travis.yml +0 -27
  365. data/Gemfile +0 -17
  366. data/README.rdoc +0 -3
  367. data/Rakefile +0 -35
  368. data/app/assets/javascripts/widearea.js +0 -486
  369. data/app/assets/stylesheets/widearea.css +0 -133
  370. data/app/controllers/.keep +0 -0
  371. data/app/controllers/admin/migrations_controller.rb +0 -19
  372. data/app/controllers/admin/textfilters_controller.rb +0 -6
  373. data/app/controllers/concerns/.keep +0 -0
  374. data/app/controllers/trackbacks_controller.rb +0 -36
  375. data/app/helpers/.keep +0 -0
  376. data/app/mailers/.keep +0 -0
  377. data/app/models/.keep +0 -0
  378. data/app/models/article/states.rb +0 -179
  379. data/app/models/concerns/.keep +0 -0
  380. data/app/models/feedback/states.rb +0 -256
  381. data/app/services/migrator.rb +0 -25
  382. data/app/views/.keep +0 -0
  383. data/app/views/admin/dashboard/_inbound.html.erb +0 -31
  384. data/app/views/admin/notes/_header.html.erb +0 -6
  385. data/app/views/articles/_protected_article_content.html.erb +0 -6
  386. data/app/views/comments/index.html.erb +0 -1
  387. data/app/views/comments/index_atom_feed.atom.builder +0 -8
  388. data/app/views/comments/index_rss_feed.rss.builder +0 -20
  389. data/app/views/trackbacks/index_atom_feed.atom.builder +0 -7
  390. data/app/views/trackbacks/index_rss_feed.rss.builder +0 -20
  391. data/app/views/trackbacks/trackback.xml.builder +0 -4
  392. data/app/views/xml/feed.googlesitemap.builder +0 -7
  393. data/app/views/xml/rsd.rsd.builder +0 -8
  394. data/lib/stateful.rb +0 -106
  395. data/publify_core.gemspec +0 -54
@@ -5,9 +5,9 @@ en:
5
5
  back_to_login: Back to login
6
6
  confirm:
7
7
  admin: admin
8
- dont_lose_the_mail_sent: Don't lose the mail sent at %{email} or you won't be able to login anymore
8
+ dont_lose_the_mail_sent: Don't lose the mail sent at %{email} or you won't be
9
+ able to login anymore
9
10
  login: 'Login: %{login}'
10
- password: 'Password: %{password}'
11
11
  proceed_to: Proceed to %{link}
12
12
  success: You have successfully signed up.
13
13
  create_account: Create an account
@@ -30,6 +30,7 @@ en:
30
30
  access_granted:
31
31
  error: Error, you are not allowed to perform this action
32
32
  article_list:
33
+ feedback: Feedback
33
34
  no_articles: There are no articles yet. Why don't you create one?
34
35
  autosave:
35
36
  success: Article was successfully saved
@@ -38,13 +39,10 @@ en:
38
39
  form:
39
40
  allow_comments: Allow comments
40
41
  allow_comments_status:
41
- one: enabled
42
- zero: disabled
43
- allow_pings_status:
44
- one: enabled
45
- zero: disabled
46
- allow_trackbacks: Allow trackbacks
47
- allowed_comments_and_trackbacks_html: Comments are %{allow_comment} and trackbacks are %{allow_trackback}
42
+ disabled: disabled
43
+ enabled: enabled
44
+ allowed_comments_html: Comments are %{allow_comment}
45
+ article_filter: Article filter
48
46
  article_type: Article type
49
47
  cancel: Cancel
50
48
  default: Default
@@ -62,20 +60,28 @@ en:
62
60
  save_as_draft: Save as draft
63
61
  status: Status
64
62
  tags: Tags
65
- tags_explanation_html: Separate tags with commas. Use double quotes (") around multi-word tags, e.g. "opera house".
63
+ tags_explanation_html: Separate tags with commas. Use double quotes (")
64
+ around multi-word tags, e.g. "opera house".
66
65
  title: Title
67
66
  type_your_post: Type your post
68
67
  visibility: Visibility
69
68
  index:
69
+ actions: Actions
70
70
  all_articles: All articles
71
+ author: Author
72
+ created_at: Created at
71
73
  drafts: Drafts
74
+ feedback: Feedback
72
75
  manage_articles: Manage articles
73
76
  new_article: New article
74
77
  publication_date: Publication date
75
78
  publication_pending: Publication pending
76
79
  published: Published
80
+ published_at: Publication date
77
81
  search: Search
78
82
  select_an_author: Select an author
83
+ text_filter: Text filter
84
+ title: Title
79
85
  withdrawn: Withdrawn
80
86
  update:
81
87
  success: Article was successfully updated
@@ -88,35 +94,31 @@ en:
88
94
  drafts:
89
95
  no_drafts_yet: No drafts yet, why don't you write one
90
96
  your_drafts: Your drafts
91
- inbound:
92
- at: at
93
- at_an_unknown_date: at an unknown date
94
- inbound_links: Inbound links
95
- made_a_link_to_you_on: made a link to you on
96
- no_one_made_link_to_you_yet: No one made a link to you yet
97
- you_have_no_internet_connection: You have no internet connection
98
97
  index:
98
+ textile_deprecated_html: The Textile text filter has been deprecated and will
99
+ be removed soon. Some of your content still uses this filter. Run the <code>publify:textile_to_markdown</code>
100
+ rake task to convert it to Markdown, or convert your content manually.
99
101
  welcome_back: Welcome back, %{user_name}!
100
102
  overview:
101
103
  change_your_blog_presentation: change your blog presentation
102
- customization_explain_html: You can also do a bit of design, %{theme_link} or %{sidebar_link}.
103
- dashboard_explain_html: This place gives you a quick overview of what happens on your Publify blog and what you can do. Maybe will you want to %{available_actions}
104
+ customization_explain_html: You can also do a bit of design, %{theme_link}
105
+ or %{sidebar_link}.
106
+ dashboard_explain_html: This place gives you a quick overview of what happens
107
+ on your Publify blog and what you can do. Maybe will you want to %{available_actions}
104
108
  enable_plugins: enable plugins
105
109
  help_explain_html: If you need help, %{doc_link}.
106
110
  read_our_documentation: read our documentation
107
- update_your_profile_or_change_your_password: update your profile or change your password
111
+ update_your_profile_or_change_your_password: update your profile or change
112
+ your password
108
113
  write_a_page: write a page
109
114
  write_a_post: write a post
110
- publify_version:
111
- error: You are at least one major version of Publify out of date. You should upgrade immediately. Download and install <a href='http://publify.co/stable.tgz'>the latest Publify version</a>
112
- notice: There's a new version of Publify available. Why don't you upgrade to <a href='http://publify.co/stable.tgz'>the latest Publify version</a>?
113
- warning: There's a new version of Publify available which may contain important bug fixes. Why don't you upgrade to <a href='http://publify.co/stable.tgz'>the latest Publify version</a>?
114
115
  welcome:
115
116
  approved_count:
116
117
  one: 1 approved
117
118
  other: "%{count} approved"
118
119
  zero: no approved
119
- articles_and_comments_count_since: "%{articles_count} articles and %{comments_count} comments were posted since your last login"
120
+ articles_and_comments_count_since: "%{articles_count} articles and %{comments_count}
121
+ comments were posted since your last login"
120
122
  articles_count:
121
123
  one: 1 article
122
124
  other: "%{count} articles"
@@ -199,11 +201,12 @@ en:
199
201
  save: Save
200
202
  url: Url
201
203
  your_comment: Your comment
202
- ham:
203
- by: by
204
- created_on: 'on'
205
204
  index:
205
+ actions: Actions
206
206
  all: All
207
+ author: Author
208
+ content: Content
209
+ created_at: Created at
207
210
  feedback: Feedback
208
211
  ham: Ham
209
212
  no_feedback: There is no feedback yet. Why don't you create some?
@@ -211,12 +214,8 @@ en:
211
214
  presumed_spam: Presumed spam
212
215
  select_all: Select all
213
216
  spam: Spam
217
+ status: Status
214
218
  unapproved_comments: Unapproved comments
215
- spam:
216
- by: by
217
- cancel: Cancel
218
- created_on: 'on'
219
- this_comment_by_was_flagged_as_spam_html: This comment by %{author} was flagged as spam, %{cancel_link}?
220
219
  state:
221
220
  ham: Ham
222
221
  just_marked_as_ham: Just Marked As Ham
@@ -242,6 +241,8 @@ en:
242
241
  update_database_now: Update database now
243
242
  you_are_up_to_date: You are up to date!
244
243
  notes:
244
+ edit:
245
+ notes: Notes
245
246
  form:
246
247
  cancel: Cancel
247
248
  compose_new_note: Compose new note
@@ -255,8 +256,14 @@ en:
255
256
  publish_at: Publish at
256
257
  publish_settings: Publish settings
257
258
  tweet_id_like: Tweet id like 123456
258
- header:
259
+ index:
259
260
  notes: Notes
261
+ list:
262
+ actions: Actions
263
+ author: Author
264
+ created_at: Created at
265
+ text_filter: Text filter
266
+ title: Title
260
267
  show:
261
268
  action_or_other_html: "%{first_action} or %{second_action}"
262
269
  are_you_sure: Are you sure you want to delete this note?
@@ -269,20 +276,21 @@ en:
269
276
  form:
270
277
  article_filter: Article filter
271
278
  cancel: Cancel
272
- offline: offline
273
279
  online: Online
274
280
  permanent_link: Permanent link
275
281
  publish: Publish
276
282
  publish_settings: Publish settings
277
- published: published
278
283
  save: Save
279
284
  status: Status
280
285
  title: Title
281
286
  type_your_post: Type your post
282
287
  index:
288
+ actions: Actions
283
289
  author: Author
290
+ created_at: Created at
284
291
  manage_pages: Manage pages
285
292
  new_page: New Page
293
+ text_filter: Text filter
286
294
  title: Title
287
295
  new:
288
296
  success: New page created
@@ -293,7 +301,9 @@ en:
293
301
  cancel: Cancel
294
302
  default: Default
295
303
  description: Description
296
- explain: The template name is the filename Publify will look for when calling an article of that type. It should be in your theme under views/articles/template name.html.erb
304
+ explain: The template name is the filename Publify will look for when calling
305
+ an article of that type. It should be in your theme under views/articles/template
306
+ name.html.erb
297
307
  name: Name
298
308
  or: or
299
309
  post_types: Post Types
@@ -339,42 +349,47 @@ en:
339
349
  warning: No file selected
340
350
  seo:
341
351
  general:
342
- canonical_url: Canonical Url
343
352
  custom_tracking_code: Custom tracking code
344
353
  do_not_index_tags: Do not index tags
345
354
  dofollow: Dofollow
346
- explain: Here you can add anything you want to appear in your application header, such as analytics service tracking code.
347
- explain_humans_txt: It's an initiative for knowing the people behind a website. It's a TXT file that contains information about the different people who have contributed to building the website. http://humanstxt.org/
348
- explain_moderate_feedback: You may want to moderate feedback when turning this on
349
- explain_rss_description: 'You can use the following tags: %author% (author name), %blog_url% (this blog URL), %blog_name% (this blog title) and %permalink_url% (a link to the article you want to protect)'
350
- explain_tag_index_html: Checking this box will add <code>noindex, follow</code> meta tags in every tags page, removing them from search engines and preventing duplicate content issues
355
+ explain: Here you can add anything you want to appear in your application
356
+ header, such as analytics service tracking code.
357
+ explain_moderate_feedback: You may want to moderate feedback when turning
358
+ this on
359
+ explain_rss_description: 'You can use the following tags: %author% (author
360
+ name), %blog_url% (this blog URL), %blog_name% (this blog title) and %permalink_url%
361
+ (a link to the article you want to protect)'
362
+ explain_tag_index_html: Checking this box will add <code>noindex, follow</code>
363
+ meta tags in every tags page, removing them from search engines and preventing
364
+ duplicate content issues
351
365
  general_settings: General settings
352
366
  google: Google
353
367
  google_analytics: Google Analytics
354
- google_webmaster_tools_validation_link: Google Webmaster Tools validation link
355
- human: Human
356
- humans_txt: Human
368
+ google_webmaster_tools_validation_link: Google Webmaster Tools validation
369
+ link
357
370
  indexing: Indexing
358
371
  meta_description: Meta description
359
372
  meta_keywords: Meta keywords
360
- read_more_about_html: Read more about %{link}
361
373
  robots_txt: Robots.txt
362
374
  rss_description_message: RSS description message
363
- this_will_display: This will display at the bottom of each post in the RSS feed
364
- use_canonical_url: Use canonical URL
375
+ this_will_display: This will display at the bottom of each post in the RSS
376
+ feed
365
377
  use_dofollow_in_comments: Use dofollow in comments
366
378
  use_meta_keywords: Use meta keywords
367
379
  use_rss_description: Use RSS description
368
380
  permalinks:
369
381
  custom: Custom
370
382
  date_and_title: Date and title
371
- explain: Publify offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links.
383
+ explain: Publify offers you the ability to create a custom URL structure for
384
+ your permalinks and archives. This can improve the aesthetics, usability,
385
+ and forward-compatibility of your links.
372
386
  help_on_permalink_settings: Help on permalink settings
373
387
  month_and_title: Month and title
374
388
  permalink_format: Permalink format
375
389
  sample: Here are some examples to get you started.
376
390
  title_only: Title only
377
- you_can_custom_your_url_structure: 'You can customize your URL structure using the following tags:'
391
+ you_can_custom_your_url_structure: 'You can customize your URL structure using
392
+ the following tags:'
378
393
  your_article_day: your article day of publication.
379
394
  your_article_month: your article month of publication.
380
395
  your_article_slug_html: your article slug. <strong>Using this slug is mandatory</strong>.
@@ -397,30 +412,35 @@ en:
397
412
  paginated_archives: Paginated archives
398
413
  replaced_by_the_archive_date: Replaced by the archive date
399
414
  replaced_by_the_content_body: Replaced by the content body
400
- replaced_with_the_article_categories: Replaced with the article categories (comma separated)
415
+ replaced_with_the_article_categories: Replaced with the article categories
416
+ (comma separated)
401
417
  replaced_with_the_article_page_title: Replaced with the article/page title
402
418
  replaced_with_the_article_tags: Replaced with the article tags (comma separated)
403
419
  replaced_with_the_category_tag_name: Replaced with the category/tag name
404
420
  replaced_with_the_current_date: Replaced with the current date
405
421
  replaced_with_the_current_month: Replaced with the current month
406
422
  replaced_with_the_current_page_number: Replaced with the current page number
407
- replaced_with_the_current_search_phrase: Replaced with the current search phrase
423
+ replaced_with_the_current_search_phrase: Replaced with the current search
424
+ phrase
408
425
  replaced_with_the_current_time: Replaced with the current time
409
426
  replaced_with_the_current_year: Replaced with the current year
410
427
  replaced_with_the_post_page_excerpt: Replaced with the post/page excerpt
411
- replaced_with_the_title_of_the_article_page: Replaced with the title of the article/page
428
+ replaced_with_the_title_of_the_article_page: Replaced with the title of the
429
+ article/page
412
430
  search_results: Search results
413
431
  short_statuses: Short statuses
414
432
  short_statuses_lists: Short statuses lists
415
433
  the_blog_s_name: The blog's name
416
434
  the_blog_s_tagline_description: The blog's tagline / description
417
- these_tags_can_be_included: These tags can be included in your templates and will be replaced when displaying the page.
435
+ these_tags_can_be_included: These tags can be included in your templates and
436
+ will be replaced when displaying the page.
418
437
  title_template: Title template
419
438
  settings:
420
439
  display:
421
440
  cancel: Cancel
422
441
  custom_url: Custom URL shortener domain
423
- custom_url_help: If you have a custom domain for URL shortening, enter it here.
442
+ custom_url_help: If you have a custom domain for URL shortening, enter it
443
+ here.
424
444
  date_format: Date format
425
445
  default_archives_show: articles on the archives page
426
446
  default_article_show: articles on the homepage
@@ -430,8 +450,6 @@ en:
430
450
  feed_articles: Article excerpts
431
451
  feed_excerpts_only: Show only article excerpts in feed
432
452
  feed_settings: RSS Feed Settings
433
- feedburner_help: Enter your FeedBurner ID if you wish to use your Google FeedBurner account instead of using the Publify feed URL.
434
- feedburner_id: FeedBurner ID
435
453
  or: or
436
454
  publishing_options: Publishing Options
437
455
  status_main_feed: Display statuses in the main feed
@@ -447,28 +465,32 @@ en:
447
465
  comments_filter: Comments filter
448
466
  days: days
449
467
  disable_comments_after: Disable comments after
450
- disable_trackbacks_sitewide: Disable trackbacks site-wide
451
468
  enable_comments_by_default: Enable comments by default
452
469
  enable_feedback_moderation: Enable feedback moderation
453
470
  enable_recaptcha: Enable reCaptcha
454
471
  enable_spam_protection: Enable spam protection
455
- enable_trackbacks_by_default: Enable Trackbacks by default
456
- explain_disable_trackbacks: This setting allows you to disable trackbacks for every article in your blog. It won't remove existing trackbacks, but it will prevent any further attempt to add a trackback anywhere on your blog.
457
- explain_feedback_moderation: You can enable site-wide feedback moderation. If you do so, no comment or trackback will appear on your blog unless you validate it.
458
- explain_reject_comments: Publify will automatically reject comments and trackbacks which contain over a certain amount of links in them
459
- explain_spam_protection: Enabling spam protection will make Publify compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots
460
- explain_spamfiltering_html: Publify can (optionally) use the <a href='http://akismet.com'>Akismet</a> spam-filtering service. You need to register with Akismet and receive an API key before you can use their service. If you have an Akismet key, enter it here
472
+ explain_feedback_moderation: You can enable site-wide feedback moderation.
473
+ If you do so, no comment will appear on your blog unless you validate it.
474
+ explain_reject_comments: Publify will automatically reject comments which
475
+ contain over a certain amount of links in them
476
+ explain_spam_protection: Enabling spam protection will make Publify compare
477
+ the IP address of posters as well as the contents of their posts against
478
+ local and remote blacklists. Good defense against spam bots
479
+ explain_spamfiltering_html: Publify can (optionally) use the <a href='http://akismet.com'>Akismet</a>
480
+ spam-filtering service. You need to register with Akismet and receive an
481
+ API key before you can use their service. If you have an Akismet key, enter
482
+ it here
461
483
  feedback: Feedback
462
484
  feedback_settings: Feedback settings
463
485
  max_links: Max Links
464
486
  none: none
465
487
  or: or
466
- remember_to_set_your_recaptcha: Remember to set your reCaptcha keys inside config/initializers/recaptcha.rb
488
+ remember_to_set_your_recaptcha: Remember to set your reCaptcha keys inside
489
+ config/initializers/recaptcha.rb
467
490
  set_to_0_to_never_disable_comments: Set to 0 to never disable comments
468
491
  set_to_0_to_never_reject_comments: Set to 0 to never reject comments
469
492
  spam: Spam
470
493
  spam_protection: Spam protection
471
- trackbacks: Trackbacks
472
494
  update_settings: Update settings
473
495
  index:
474
496
  allow_users_to_register: Allow users to register
@@ -477,7 +499,10 @@ en:
477
499
  blog_url: Blog URL
478
500
  cancel: Cancel
479
501
  email_address_used_to_notify: Email address used by Publify to send notifications
480
- explain_allow_users_to_register_html: This will allow users to register themselves as contributors, an unprivileged account level which grants them no rights beyond owning a profile on the site. If you don't want users to register, you can add them via <em>Manage users</em> under <em>Settings</em>.
502
+ explain_allow_users_to_register_html: This will allow users to register themselves
503
+ as contributors, an unprivileged account level which grants them no rights
504
+ beyond owning a profile on the site. If you don't want users to register,
505
+ you can add them via <em>Manage users</em> under <em>Settings</em>.
481
506
  general_settings: General settings
482
507
  items_to_display_in_admin_lists: Items to display in admin lists
483
508
  language: Language
@@ -494,7 +519,6 @@ en:
494
519
  cancel: Cancel
495
520
  display: Display
496
521
  example: example
497
- explain: When publishing articles, Publify can send trackbacks to websites that you link to. This should be disabled for private blogs as it will leak non-public information to sites that you're discussing. For public blogs, there's no real point in disabling this.
498
522
  image_medium_size: Image medium size
499
523
  image_thumbnail_size: Image thumbnail size
500
524
  latitude_longitude: Latitude, Longitude
@@ -502,12 +526,9 @@ en:
502
526
  or: or
503
527
  publish: Publish
504
528
  publish_on_twitter: Publish on Twitter
505
- send_trackbacks: Send trackbacks
506
- trackbacks: Trackbacks
507
529
  twitter_consumer_key: Twitter consumer key
508
530
  twitter_consumer_secret: Twitter consumer secret
509
531
  update_settings: Update settings
510
- urls_to_ping: URLs to ping automatically
511
532
  write: Write
512
533
  your_geoloc: your latitude and longitude
513
534
  shared:
@@ -526,6 +547,7 @@ en:
526
547
  feedback: Feedback
527
548
  general_settings: General settings
528
549
  global_seo_settings: Global SEO settings
550
+ home: Home
529
551
  in_page_plugins: In page plugins
530
552
  logged_in_as: Logged in as %{login}
531
553
  logout_html: Log out &raquo;
@@ -550,7 +572,8 @@ en:
550
572
  write: Write
551
573
  twitter_alert:
552
574
  fill_the_twitter_credentials: fill in the OAuth credentials
553
- how_to_setup_twitter_html: If you want to push short statuses on Twitter, you need to %{twitter_settings_link} Twitter gave you after you %{twitter_registration_link}.
575
+ how_to_setup_twitter_html: If you want to push short statuses on Twitter,
576
+ you need to %{twitter_settings_link} Twitter gave you after you %{twitter_registration_link}.
554
577
  registered_your_application: registered your application
555
578
  sidebar:
556
579
  config:
@@ -559,8 +582,14 @@ en:
559
582
  you_have_no_plugins_installed: You have no plugins installed
560
583
  index:
561
584
  cancel: Cancel
562
- download_more_plugins_html: You can download and install sidebar plugins from our official <a href='https://github.com/fdv/publify/wiki/Sidebar-plugins'>plugin repository</a>. All you have to do is upload the theme directory in your vendor/plugins directory.
563
- explain_how_its_works: Drag and drop to change the sidebar items displayed on this blog. To remove items from the sidebar just click 'remove'. Changes are saved immediately, but not activated until you click the 'Publish changes' button
585
+ download_more_plugins_html: You can download and install sidebar plugins from
586
+ our official <a href='https://github.com/fdv/publify/wiki/Sidebar-plugins'>plugin
587
+ repository</a>. All you have to do is upload the theme directory in your
588
+ vendor/plugins directory.
589
+ explain_how_its_works: Drag and drop to change the sidebar items displayed
590
+ on this blog. To remove items from the sidebar just click 'remove'. Changes
591
+ are saved immediately, but not activated until you click the 'Publish changes'
592
+ button
564
593
  or: or
565
594
  publish_changes: Publish changes
566
595
  sidebar: Sidebar
@@ -577,6 +606,7 @@ en:
577
606
  no_tags: There are no tags yet. Why don't you create one?
578
607
  or: or
579
608
  save: Save
609
+ view: View
580
610
  themes:
581
611
  index:
582
612
  active_theme: "%{name} - Active theme"
@@ -642,8 +672,9 @@ en:
642
672
  articles:
643
673
  archives:
644
674
  no_articles_found: No articles found
645
- posted_in: Posted in
646
- article:
675
+ archives_article:
676
+ posted_in: posted in
677
+ article_author:
647
678
  posted_by: Posted by
648
679
  article_excerpt:
649
680
  continue_reading: Continue reading
@@ -663,7 +694,7 @@ en:
663
694
  comment_markup_help: Comment Markup Help
664
695
  leave_url_email: leave url/email
665
696
  preview_comment: Preview comment
666
- your_blog: your blog
697
+ your_blog: Your blog
667
698
  your_email: Your email
668
699
  your_message: Your message
669
700
  your_name: Your name
@@ -679,12 +710,7 @@ en:
679
710
  edit: Edit
680
711
  leave_a_response: Leave a response
681
712
  rss_feed: RSS feed
682
- trackback_uri: Trackback URI
683
713
  trackbacks: Trackbacks
684
- use_the_following_link_to_trackback: Use the following link to trackback from your own site
685
- search:
686
- next_page: Next page
687
- previous_page: Previous page
688
714
  trackback:
689
715
  from: From
690
716
  authors:
@@ -693,17 +719,17 @@ en:
693
719
  contact_information: Contact information
694
720
  jabber: 'Jabber:'
695
721
  msn: 'MSN:'
696
- next_page: Next page
697
- posted_in: posted in
698
- previous_page: Previous page
699
- this_author_has_not_published_any_article_yet: This author has not published any articles yet
722
+ this_author_has_not_published_any_article_yet: This author has not published
723
+ any articles yet
700
724
  twitter: 'Twitter:'
701
725
  web_site: 'Web site:'
702
726
  yahoo: 'Yahoo:'
703
727
  comments:
704
728
  comment:
705
729
  said: said
706
- this_comment_has_been_flagged_for_moderator_approval: This comment has been flagged for moderator approval. It won't appear on this blog until the author approves it
730
+ this_comment_has_been_flagged_for_moderator_approval: This comment has been
731
+ flagged for moderator approval. It won't appear on this blog until the author
732
+ approves it
707
733
  date:
708
734
  abbr_month_names:
709
735
  -
@@ -737,17 +763,26 @@ en:
737
763
  characters_minimum: Minimum %{min} characters
738
764
  errors:
739
765
  article_type_already_exist: This article type already exists
740
- cant_end_with_rss_or_atom: Can't end in .rss or .atom. These are reserved for feed URLs
766
+ cant_end_with_rss_or_atom: Can't end in .rss or .atom. These are reserved for
767
+ feed URLs
741
768
  no_notes_found: No notes found...
742
769
  no_posts_found: No posts found...
743
770
  page_not_found: Page not found
744
771
  permalink_need_a_title: 'You need a permalink format with an identifier : %%title%%'
745
772
  problem_sending_to_twitter: Oooops something went wrong!
746
- render_sidebar: It seems something went wrong. Maybe some of your sidebars are actually missing and you should either reinstall them or remove them manually
747
- the_page_you_are_looking_for: The page you are looking for has moved or does not exist.
773
+ render_sidebar: It seems something went wrong. Maybe some of your sidebars are
774
+ actually missing and you should either reinstall them or remove them manually
775
+ the_page_you_are_looking_for: The page you are looking for has moved or does not
776
+ exist.
748
777
  generic:
749
778
  change: Change
779
+ conversation: Conversation
780
+ delete: Delete
781
+ edit: Edit
782
+ mark_as_ham: Mark as ham
783
+ mark_as_spam: Mark as spam
750
784
  save: Save
785
+ short_url: Short url
751
786
  helper:
752
787
  at: at
753
788
  langs:
@@ -775,36 +810,32 @@ en:
775
810
  designed_by: Designed by %{designed_by}
776
811
  powered_by_html: Powered by %{powered_by}
777
812
  notes:
778
- index:
779
- next_page: Next page
780
- previous_page: Previous page
781
813
  note:
782
814
  view_on_twitter: View on Twitter
783
815
  notice:
784
816
  note_successfully_created: Note was successfully created
785
- pagination:
786
- next_page: Next page
787
- previous_page: Previous page
788
817
  profile:
789
818
  admin: Publify administrator
790
819
  contributor: Contributor
791
820
  publisher: Blog publisher
792
821
  setup:
793
822
  article:
794
- body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!'
823
+ body: Welcome to Publify. This is your first article. Edit or delete it, then
824
+ start blogging!
795
825
  title: Hello World!
796
826
  index:
797
827
  blog_name: Blog name
828
+ password: Password
798
829
  welcome_to_your_blog_setup: Welcome to your blog setup
799
830
  your_mail: Your email
800
831
  page:
801
832
  about: About
802
- body: This is an example of a Publify page. You can edit this to write information about yourself or your site so readers know who you are. You can create as many pages as you like and manage all of your content inside Publify.
833
+ body: This is an example of a Publify page. You can edit this to write information
834
+ about yourself or your site so readers know who you are. You can create as
835
+ many pages as you like and manage all of your content inside Publify.
803
836
  tags:
804
837
  index:
805
- next_page: Next page
806
- previous_page: Previous page
807
- there_is_no_tags: There is no tag
838
+ there_are_no_tags: There are no tags
808
839
  time:
809
840
  formats:
810
841
  default: "%m/%d/%Y %H:%M"