publify_core 9.0.0 → 9.2.2

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 (360) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +92 -37
  3. data/app/assets/javascripts/bootstrap-sprockets.js +8 -0
  4. data/app/assets/javascripts/bootstrap/affix.js +164 -0
  5. data/app/assets/javascripts/bootstrap/alert.js +95 -0
  6. data/app/assets/javascripts/bootstrap/button.js +125 -0
  7. data/app/assets/javascripts/bootstrap/collapse.js +212 -0
  8. data/app/assets/javascripts/bootstrap/dropdown.js +165 -0
  9. data/app/assets/javascripts/bootstrap/modal.js +358 -0
  10. data/app/assets/javascripts/bootstrap/tab.js +155 -0
  11. data/app/assets/javascripts/bootstrap/transition.js +59 -0
  12. data/app/assets/javascripts/lightbox.js +4 -4
  13. data/app/assets/javascripts/publify_admin.js +1 -35
  14. data/app/assets/stylesheets/_bootstrap-compass.scss +9 -0
  15. data/app/assets/stylesheets/_bootstrap-mincer.scss +19 -0
  16. data/app/assets/stylesheets/_bootstrap-sprockets.scss +9 -0
  17. data/app/assets/stylesheets/_bootstrap.scss +42 -0
  18. data/app/assets/stylesheets/administration_structure.css.scss +1 -45
  19. data/app/assets/stylesheets/bootstrap/_alerts.scss +73 -0
  20. data/app/assets/stylesheets/bootstrap/_button-groups.scss +242 -0
  21. data/app/assets/stylesheets/bootstrap/_buttons.scss +168 -0
  22. data/app/assets/stylesheets/bootstrap/_close.scss +37 -0
  23. data/app/assets/stylesheets/bootstrap/_code.scss +69 -0
  24. data/app/assets/stylesheets/bootstrap/_component-animations.scss +38 -0
  25. data/app/assets/stylesheets/bootstrap/_dropdowns.scss +213 -0
  26. data/app/assets/stylesheets/bootstrap/_forms.scss +586 -0
  27. data/app/assets/stylesheets/bootstrap/_grid.scss +94 -0
  28. data/app/assets/stylesheets/bootstrap/_labels.scss +66 -0
  29. data/app/assets/stylesheets/bootstrap/_media.scss +66 -0
  30. data/app/assets/stylesheets/bootstrap/_mixins.scss +37 -0
  31. data/app/assets/stylesheets/bootstrap/_modals.scss +150 -0
  32. data/app/assets/stylesheets/bootstrap/_navbar.scss +479 -0
  33. data/app/assets/stylesheets/bootstrap/_navs.scss +242 -0
  34. data/app/assets/stylesheets/bootstrap/_normalize.scss +427 -0
  35. data/app/assets/stylesheets/bootstrap/_pagination.scss +86 -0
  36. data/app/assets/stylesheets/bootstrap/_panels.scss +222 -0
  37. data/app/assets/stylesheets/bootstrap/_print.scss +99 -0
  38. data/app/assets/stylesheets/bootstrap/_scaffolding.scss +160 -0
  39. data/app/assets/stylesheets/bootstrap/_tables.scss +234 -0
  40. data/app/assets/stylesheets/bootstrap/_theme.scss +224 -0
  41. data/app/assets/stylesheets/bootstrap/_type.scss +296 -0
  42. data/app/assets/stylesheets/bootstrap/_utilities.scss +55 -0
  43. data/app/assets/stylesheets/bootstrap/_variables.scss +638 -0
  44. data/app/assets/stylesheets/bootstrap/_wells.scss +29 -0
  45. data/app/assets/stylesheets/bootstrap/mixins/_alerts.scss +15 -0
  46. data/app/assets/stylesheets/bootstrap/mixins/_background-variant.scss +12 -0
  47. data/app/assets/stylesheets/bootstrap/mixins/_border-radius.scss +18 -0
  48. data/app/assets/stylesheets/bootstrap/mixins/_buttons.scss +56 -0
  49. data/app/assets/stylesheets/bootstrap/mixins/_center-block.scss +7 -0
  50. data/app/assets/stylesheets/bootstrap/mixins/_clearfix.scss +22 -0
  51. data/app/assets/stylesheets/bootstrap/mixins/_forms.scss +82 -0
  52. data/app/assets/stylesheets/bootstrap/mixins/_gradients.scss +56 -0
  53. data/app/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +81 -0
  54. data/app/assets/stylesheets/bootstrap/mixins/_grid.scss +122 -0
  55. data/app/assets/stylesheets/bootstrap/mixins/_hide-text.scss +21 -0
  56. data/app/assets/stylesheets/bootstrap/mixins/_image.scss +28 -0
  57. data/app/assets/stylesheets/bootstrap/mixins/_labels.scss +12 -0
  58. data/app/assets/stylesheets/bootstrap/mixins/_nav-divider.scss +10 -0
  59. data/app/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +9 -0
  60. data/app/assets/stylesheets/bootstrap/mixins/_opacity.scss +7 -0
  61. data/app/assets/stylesheets/bootstrap/mixins/_pagination.scss +24 -0
  62. data/app/assets/stylesheets/bootstrap/mixins/_panels.scss +20 -0
  63. data/app/assets/stylesheets/bootstrap/mixins/_reset-filter.scss +8 -0
  64. data/app/assets/stylesheets/bootstrap/mixins/_resize.scss +6 -0
  65. data/app/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +17 -0
  66. data/app/assets/stylesheets/bootstrap/mixins/_size.scss +10 -0
  67. data/app/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +9 -0
  68. data/app/assets/stylesheets/bootstrap/mixins/_table-row.scss +28 -0
  69. data/app/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +12 -0
  70. data/app/assets/stylesheets/bootstrap/mixins/_text-overflow.scss +8 -0
  71. data/app/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +222 -0
  72. data/app/assets/stylesheets/lightbox.css +3 -3
  73. data/app/assets/stylesheets/publify_admin.css.scss +0 -1
  74. data/app/controllers/accounts_controller.rb +2 -0
  75. data/app/controllers/admin/base_controller.rb +8 -16
  76. data/app/controllers/admin/content_controller.rb +38 -36
  77. data/app/controllers/admin/dashboard_controller.rb +16 -65
  78. data/app/controllers/admin/feedback_controller.rb +45 -37
  79. data/app/controllers/admin/notes_controller.rb +16 -10
  80. data/app/controllers/admin/pages_controller.rb +19 -29
  81. data/app/controllers/admin/post_types_controller.rb +7 -5
  82. data/app/controllers/admin/profiles_controller.rb +15 -5
  83. data/app/controllers/admin/redirects_controller.rb +9 -5
  84. data/app/controllers/admin/resources_controller.rb +7 -4
  85. data/app/controllers/admin/seo_controller.rb +12 -10
  86. data/app/controllers/admin/settings_controller.rb +7 -5
  87. data/app/controllers/admin/sidebar_controller.rb +6 -5
  88. data/app/controllers/admin/tags_controller.rb +6 -3
  89. data/app/controllers/admin/themes_controller.rb +10 -7
  90. data/app/controllers/admin/users_controller.rb +10 -7
  91. data/app/controllers/articles_controller.rb +49 -33
  92. data/app/controllers/authors_controller.rb +6 -3
  93. data/app/controllers/base_controller.rb +9 -11
  94. data/app/controllers/comments_controller.rb +13 -13
  95. data/app/controllers/content_controller.rb +4 -2
  96. data/app/controllers/feedback_controller.rb +4 -2
  97. data/app/controllers/notes_controller.rb +5 -3
  98. data/app/controllers/setup_controller.rb +15 -12
  99. data/app/controllers/tags_controller.rb +6 -4
  100. data/app/controllers/text_controller.rb +2 -4
  101. data/app/controllers/textfilter_controller.rb +2 -0
  102. data/app/controllers/theme_controller.rb +18 -13
  103. data/app/controllers/xml_controller.rb +2 -0
  104. data/app/helpers/admin/base_helper.rb +28 -29
  105. data/app/helpers/admin/feedback_helper.rb +34 -24
  106. data/app/helpers/articles_helper.rb +4 -2
  107. data/app/helpers/authors_helper.rb +7 -16
  108. data/app/helpers/base_helper.rb +56 -52
  109. data/app/helpers/blog_helper.rb +4 -2
  110. data/app/helpers/xml_helper.rb +3 -1
  111. data/app/jobs/application_job.rb +2 -0
  112. data/app/mailers/notification_mailer.rb +5 -3
  113. data/app/models/ability.rb +25 -23
  114. data/app/models/archives_sidebar.rb +14 -11
  115. data/app/models/article.rb +42 -42
  116. data/app/models/article/factory.rb +14 -6
  117. data/app/models/blog.rb +86 -75
  118. data/app/models/comment.rb +10 -11
  119. data/app/models/config_manager.rb +4 -2
  120. data/app/models/content.rb +37 -50
  121. data/app/models/content_base.rb +10 -4
  122. data/app/models/feedback.rb +21 -17
  123. data/app/models/meta_sidebar.rb +4 -3
  124. data/app/models/note.rb +26 -25
  125. data/app/models/page.rb +9 -8
  126. data/app/models/page_sidebar.rb +4 -2
  127. data/app/models/ping.rb +3 -1
  128. data/app/models/post_type.rb +3 -3
  129. data/app/models/redirect.rb +13 -7
  130. data/app/models/redirection.rb +3 -1
  131. data/app/models/resource.rb +5 -3
  132. data/app/models/search_sidebar.rb +4 -2
  133. data/app/models/sidebar.rb +11 -6
  134. data/app/models/static_sidebar.rb +14 -13
  135. data/app/models/tag.rb +15 -11
  136. data/app/models/tag_sidebar.rb +6 -3
  137. data/app/models/text_filter.rb +85 -11
  138. data/app/models/trackback.rb +7 -11
  139. data/app/models/trigger.rb +7 -4
  140. data/app/models/user.rb +44 -43
  141. data/app/services/title_builder.rb +52 -45
  142. data/app/uploaders/resource_uploader.rb +5 -3
  143. data/app/views/accounts/confirm.html.erb +3 -3
  144. data/app/views/admin/content/_article_list.html.erb +23 -8
  145. data/app/views/admin/content/_form.html.erb +71 -47
  146. data/app/views/admin/content/autosave.js.erb +2 -2
  147. data/app/views/admin/content/edit.html.erb +1 -1
  148. data/app/views/admin/content/index.html.erb +25 -15
  149. data/app/views/admin/content/new.html.erb +2 -2
  150. data/app/views/admin/dashboard/_comment.html.erb +5 -5
  151. data/app/views/admin/dashboard/_comments.html.erb +2 -2
  152. data/app/views/admin/dashboard/_drafts.html.erb +5 -5
  153. data/app/views/admin/dashboard/_overview.html.erb +7 -9
  154. data/app/views/admin/dashboard/_welcome.html.erb +11 -11
  155. data/app/views/admin/dashboard/index.html.erb +12 -7
  156. data/app/views/admin/feedback/_button.html.erb +6 -6
  157. data/app/views/admin/feedback/_feedback.html.erb +3 -3
  158. data/app/views/admin/feedback/_ham.html.erb +27 -9
  159. data/app/views/admin/feedback/_spam.html.erb +26 -16
  160. data/app/views/admin/feedback/article.html.erb +20 -21
  161. data/app/views/admin/feedback/edit.html.erb +14 -15
  162. data/app/views/admin/feedback/{ham.js → ham.js.erb} +0 -0
  163. data/app/views/admin/feedback/index.html.erb +25 -23
  164. data/app/views/admin/feedback/{spam.js → spam.js.erb} +0 -0
  165. data/app/views/admin/migrations/show.html.erb +10 -11
  166. data/app/views/admin/notes/_form.html.erb +13 -13
  167. data/app/views/admin/notes/_list.html.erb +19 -8
  168. data/app/views/admin/notes/_note.html.erb +12 -7
  169. data/app/views/admin/notes/edit.html.erb +6 -1
  170. data/app/views/admin/notes/index.html.erb +5 -1
  171. data/app/views/admin/notes/show.html.erb +2 -2
  172. data/app/views/admin/pages/_form.html.erb +86 -77
  173. data/app/views/admin/pages/_pages.html.erb +11 -4
  174. data/app/views/admin/pages/edit.html.erb +3 -1
  175. data/app/views/admin/pages/index.html.erb +10 -6
  176. data/app/views/admin/pages/new.html.erb +3 -1
  177. data/app/views/admin/post_types/_index_and_form.html.erb +15 -16
  178. data/app/views/admin/post_types/edit.html.erb +1 -1
  179. data/app/views/admin/post_types/index.html.erb +1 -1
  180. data/app/views/admin/profiles/index.html.erb +2 -3
  181. data/app/views/admin/redirects/_index_and_form.html.erb +10 -11
  182. data/app/views/admin/redirects/edit.html.erb +1 -1
  183. data/app/views/admin/redirects/index.html.erb +1 -1
  184. data/app/views/admin/resources/index.html.erb +19 -16
  185. data/app/views/admin/seo/_general.html.erb +23 -47
  186. data/app/views/admin/seo/_permalinks.html.erb +16 -16
  187. data/app/views/admin/seo/_titles.html.erb +63 -64
  188. data/app/views/admin/seo/show.html.erb +14 -19
  189. data/app/views/admin/settings/display.html.erb +22 -25
  190. data/app/views/admin/settings/feedback.html.erb +31 -32
  191. data/app/views/admin/settings/index.html.erb +23 -24
  192. data/app/views/admin/settings/write.html.erb +21 -22
  193. data/app/views/admin/shared/_edit.html.erb +3 -3
  194. data/app/views/admin/shared/_menu.html.erb +26 -26
  195. data/app/views/admin/shared/_twitter_alert.html.erb +1 -1
  196. data/app/views/admin/sidebar/_config.html.erb +5 -5
  197. data/app/views/admin/sidebar/_target_sidebar.html.erb +4 -4
  198. data/app/views/admin/sidebar/index.html.erb +7 -7
  199. data/app/views/admin/tags/_index_and_form.html.erb +11 -12
  200. data/app/views/admin/tags/edit.html.erb +1 -1
  201. data/app/views/admin/tags/index.html.erb +1 -1
  202. data/app/views/admin/themes/index.html.erb +5 -6
  203. data/app/views/admin/users/_form.html.erb +34 -34
  204. data/app/views/admin/users/edit.html.erb +2 -2
  205. data/app/views/admin/users/index.html.erb +10 -12
  206. data/app/views/admin/users/new.html.erb +2 -2
  207. data/app/views/archives_sidebar/_content.html.erb +2 -2
  208. data/app/views/articles/_archives_article.html.erb +3 -3
  209. data/app/views/articles/_article.html.erb +7 -9
  210. data/app/views/articles/_article_author.html.erb +4 -0
  211. data/app/views/articles/_article_content.html.erb +2 -2
  212. data/app/views/articles/_article_excerpt.html.erb +2 -2
  213. data/app/views/articles/_article_links.html.erb +1 -1
  214. data/app/views/articles/_comment_errors.html.erb +1 -1
  215. data/app/views/articles/_comment_form.html.erb +12 -12
  216. data/app/views/articles/_comment_preview.html.erb +3 -3
  217. data/app/views/articles/_password_form.html.erb +4 -4
  218. data/app/views/articles/_trackback.html.erb +2 -2
  219. data/app/views/articles/archives.html.erb +1 -1
  220. data/app/views/articles/feedback_atom_feed.atom.builder +3 -1
  221. data/app/views/articles/feedback_rss_feed.rss.builder +9 -8
  222. data/app/views/articles/index_atom_feed.atom.builder +5 -3
  223. data/app/views/articles/index_rss_feed.rss.builder +10 -9
  224. data/app/views/articles/live_search.html.erb +3 -3
  225. data/app/views/articles/read.html.erb +16 -8
  226. data/app/views/articles/search.html.erb +2 -2
  227. data/app/views/articles/trackback.xml.builder +3 -1
  228. data/app/views/articles/view_page.html.erb +2 -2
  229. data/app/views/authors/show.html.erb +9 -9
  230. data/app/views/authors/show_atom_feed.atom.builder +4 -2
  231. data/app/views/authors/show_rss_feed.rss.builder +10 -9
  232. data/app/views/comments/_comment.html.erb +3 -3
  233. data/app/views/devise/mailer/reset_password_instructions.html.erb +7 -9
  234. data/app/views/devise/passwords/edit.html.erb +4 -4
  235. data/app/views/devise/passwords/new.html.erb +1 -1
  236. data/app/views/devise/registrations/new.html.erb +5 -5
  237. data/app/views/devise/sessions/new.html.erb +3 -3
  238. data/app/views/errors/404.html.erb +2 -2
  239. data/app/views/feedback/index.atom.builder +3 -1
  240. data/app/views/feedback/index.rss.builder +9 -8
  241. data/app/views/layouts/accounts.html.erb +26 -26
  242. data/app/views/layouts/administration.html.erb +31 -31
  243. data/app/views/layouts/default.html.erb +4 -3
  244. data/app/views/layouts/editor.html.erb +5 -19
  245. data/app/views/meta_sidebar/_content.html.erb +2 -2
  246. data/app/views/notes/_note.html.erb +1 -1
  247. data/app/views/notes/index.html.erb +1 -1
  248. data/app/views/notes/show_in_reply.html.erb +1 -1
  249. data/app/views/notification_mailer/_mail_footer.html.erb +3 -3
  250. data/app/views/notification_mailer/article.html.erb +2 -2
  251. data/app/views/notification_mailer/comment.html.erb +5 -5
  252. data/app/views/notification_mailer/notif_user.html.erb +1 -1
  253. data/app/views/page_sidebar/_content.html.erb +1 -1
  254. data/app/views/search_sidebar/_content.html.erb +2 -2
  255. data/app/views/settings/install.html.erb +2 -2
  256. data/app/views/setup/index.html.erb +7 -7
  257. data/app/views/shared/_atom_header.atom.builder +4 -4
  258. data/app/views/shared/_atom_item_article.atom.builder +19 -29
  259. data/app/views/shared/_atom_item_comment.atom.builder +4 -2
  260. data/app/views/shared/_atom_item_trackback.atom.builder +4 -2
  261. data/app/views/shared/_google_analytics.html.erb +8 -0
  262. data/app/views/shared/_page_header.html.erb +9 -12
  263. data/app/views/shared/_rss_item_article.rss.builder +9 -7
  264. data/app/views/shared/_rss_item_comment.rss.builder +3 -1
  265. data/app/views/shared/_rss_item_trackback.rss.builder +3 -1
  266. data/app/views/sidebar/display_plugins.html.erb +1 -1
  267. data/app/views/tag_sidebar/_content.html.erb +1 -1
  268. data/app/views/tags/index.html.erb +1 -1
  269. data/app/views/xml/_googlesitemap_item_article.googlesitemap.builder +2 -0
  270. data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder +2 -0
  271. data/app/views/xml/_googlesitemap_item_page.googlesitemap.builder +2 -0
  272. data/app/views/xml/_googlesitemap_item_tag.googlesitemap.builder +2 -0
  273. data/app/views/xml/sitemap.googlesitemap.builder +4 -2
  274. data/config/i18n-tasks.yml +0 -5
  275. data/config/initializers/devise.rb +10 -4
  276. data/config/initializers/mime_types.rb +3 -1
  277. data/config/locales/da.yml +134 -73
  278. data/config/locales/de.yml +142 -77
  279. data/config/locales/en.yml +128 -68
  280. data/config/locales/es-MX.yml +135 -71
  281. data/config/locales/fr.yml +167 -88
  282. data/config/locales/he.yml +128 -72
  283. data/config/locales/it.yml +136 -74
  284. data/config/locales/ja.yml +110 -66
  285. data/config/locales/lt.yml +153 -76
  286. data/config/locales/nb-NO.yml +123 -67
  287. data/config/locales/nl.yml +140 -77
  288. data/config/locales/pl.yml +329 -240
  289. data/config/locales/pt-BR.yml +137 -72
  290. data/config/locales/ro.yml +148 -72
  291. data/config/locales/ru.yml +161 -71
  292. data/config/locales/zh-CN.yml +106 -61
  293. data/config/locales/zh-TW.yml +109 -63
  294. data/config/routes.rb +68 -63
  295. data/db/migrate/113_initial_schema.rb +191 -191
  296. data/db/migrate/114_fixes_buggy_articles_and_notes.rb +10 -7
  297. data/db/migrate/115_drops_categories_for_tags.rb +5 -4
  298. data/db/migrate/20150207131657_add_missing_indexes.rb +2 -0
  299. data/db/migrate/20150807134129_simplify_redirect_relations.rb +5 -0
  300. data/db/migrate/20150808052637_add_blog_ids.rb +9 -3
  301. data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +2 -0
  302. data/db/migrate/20150810094754_add_blog_id_to_tags.rb +2 -0
  303. data/db/migrate/20160108111120_add_devise_to_users.rb +4 -2
  304. data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +2 -0
  305. data/db/migrate/20160110094906_remove_profiles_rights.rb +2 -0
  306. data/db/migrate/20160605103918_replace_profile_id_with_string.rb +2 -0
  307. data/db/migrate/20160605154632_remove_profiles.rb +10 -5
  308. data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +2 -0
  309. data/db/migrate/20160701062604_add_blog_id_to_resources.rb +2 -0
  310. data/db/migrate/20170528093024_move_resources_to_content.rb +2 -0
  311. data/db/migrate/20170528094923_move_tags_to_content.rb +2 -0
  312. data/db/migrate/20170528201606_remove_separate_published_flag.rb +2 -0
  313. data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +2 -0
  314. data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +2 -0
  315. data/db/migrate/20190208151235_add_text_filter_name_fields.rb +9 -0
  316. data/db/migrate/20190208152646_move_text_filter_to_name.rb +97 -0
  317. data/db/migrate/20190209155717_remove_text_filter_ids.rb +19 -0
  318. data/db/migrate/20190209160610_remove_text_filters.rb +17 -0
  319. data/db/migrate/20200413140440_add_unique_indexes.rb +10 -0
  320. data/db/seeds.rb +8 -20
  321. data/lib/email_notify.rb +3 -1
  322. data/lib/format.rb +4 -12
  323. data/lib/publify_core.rb +36 -35
  324. data/lib/publify_core/engine.rb +11 -4
  325. data/lib/publify_core/lang.rb +5 -1
  326. data/lib/publify_core/testing_support/dns_mock.rb +15 -0
  327. data/lib/publify_core/testing_support/factories.rb +240 -0
  328. data/lib/publify_core/testing_support/feed_assertions.rb +48 -0
  329. data/lib/publify_core/testing_support/fixtures/exploit.svg +4 -0
  330. data/lib/publify_core/testing_support/fixtures/fakepng.png +1 -0
  331. data/lib/publify_core/testing_support/fixtures/otherfile.txt +1 -0
  332. data/lib/publify_core/testing_support/fixtures/testfile.png +0 -0
  333. data/lib/publify_core/testing_support/fixtures/testfile.txt +1 -0
  334. data/lib/publify_core/testing_support/upload_fixtures.rb +15 -0
  335. data/lib/publify_core/version.rb +3 -1
  336. data/lib/publify_guid.rb +3 -1
  337. data/lib/publify_plugins.rb +10 -5
  338. data/lib/publify_textfilter_markdown.rb +38 -25
  339. data/lib/publify_textfilter_none.rb +5 -3
  340. data/lib/publify_textfilter_smartypants.rb +5 -3
  341. data/lib/publify_textfilter_textile.rb +7 -4
  342. data/lib/publify_textfilter_twitterfilter.rb +13 -7
  343. data/lib/publify_time.rb +4 -0
  344. data/lib/sidebar_field.rb +15 -13
  345. data/lib/sidebar_registry.rb +5 -3
  346. data/lib/spam_protection.rb +19 -17
  347. data/lib/tasks/i18n.rake +9 -0
  348. data/lib/tasks/manifest.rake +30 -0
  349. data/lib/tasks/publify_core_tasks.rake +2 -0
  350. data/lib/text_filter_plugin.rb +30 -29
  351. data/lib/theme.rb +5 -5
  352. data/lib/transforms.rb +21 -20
  353. data/themes/plain/javascripts/theme.js +0 -0
  354. metadata +247 -109
  355. data/app/assets/javascripts/widearea.js +0 -486
  356. data/app/assets/stylesheets/widearea.css +0 -133
  357. data/app/controllers/admin/textfilters_controller.rb +0 -6
  358. data/app/views/admin/dashboard/_inbound.html.erb +0 -31
  359. data/app/views/admin/notes/_header.html.erb +0 -6
  360. data/app/views/articles/_protected_article_content.html.erb +0 -6
@@ -5,8 +5,9 @@ ru:
5
5
  back_to_login: Назад к форме входа
6
6
  confirm:
7
7
  admin: admin
8
- dont_lose_the_mail_sent: Не потеряйте письмо, высланное на %{email}, или вы больше не сможете зайти
9
- login: 'логин: %{user}'
8
+ dont_lose_the_mail_sent: Не потеряйте письмо, высланное на %{email}, или вы
9
+ больше не сможете зайти
10
+ login: 'логин: %{login}'
10
11
  proceed_to: Proceed to %{link}
11
12
  success: You have successfully signed up.
12
13
  create_account: Создать учетную запись
@@ -29,6 +30,7 @@ ru:
29
30
  access_granted:
30
31
  error: Error, you are not allowed to perform this action
31
32
  article_list:
33
+ feedback: Комментарии
32
34
  no_articles: Ничего нет. Почему бы не начать и не добавить?
33
35
  autosave:
34
36
  success: Article was successfully saved
@@ -37,9 +39,10 @@ ru:
37
39
  form:
38
40
  allow_comments: Разрешить комментарии
39
41
  allow_comments_status:
40
- one: enabled
41
- zero: выключены
42
+ disabled: выключены
43
+ enabled: enabled
42
44
  allowed_comments_html: Comments are %{allow_comment}
45
+ article_filter: Фильтр постов
43
46
  article_type: Article type
44
47
  cancel: Отменить
45
48
  default: Default
@@ -57,20 +60,28 @@ ru:
57
60
  save_as_draft: Сохранить как черновик
58
61
  status: Статус
59
62
  tags: Теги
60
- 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".
61
65
  title: Заголовок
62
66
  type_your_post: Type your post
63
67
  visibility: Видимость
64
68
  index:
69
+ actions: Actions
65
70
  all_articles: Все посты
71
+ author: Автор
72
+ created_at: Created at
66
73
  drafts: Черновики
74
+ feedback: Комментарии
67
75
  manage_articles: Управление постами
68
76
  new_article: Новый пост
69
77
  publication_date: Дата публикации
70
78
  publication_pending: Ожидают публикации
71
79
  published: Опубликован
80
+ published_at: Дата публикации
72
81
  search: Найти
73
82
  select_an_author: Выбрать автора
83
+ text_filter: Text filter
84
+ title: Заголовок
74
85
  withdrawn: Отозванные
75
86
  update:
76
87
  success: Article was successfully updated
@@ -83,68 +94,82 @@ ru:
83
94
  drafts:
84
95
  no_drafts_yet: Пока нет черновиков. Почему бы не взять и не написать?
85
96
  your_drafts: Ваши черновики
86
- inbound:
87
- at: в
88
- at_an_unknown_date: at an unknown date
89
- inbound_links: Входящие ссылки
90
- made_a_link_to_you_on: made a link to you on
91
- no_one_made_link_to_you_yet: Никто пока сюда не ссылался
92
- you_have_no_internet_connection: You have no internet connection
93
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.
94
101
  welcome_back: Добро пожаловать снова, %{user_name}!
95
102
  overview:
96
103
  change_your_blog_presentation: изменив тему блога
97
- customization_explain_html: Вы также можете изменить дизайн, %{theme_link} или %{sidebar_link}
98
- dashboard_explain_html: Здесь можно посмотреть, что происходит в вашем Publify-блоге и что в нем можно сделать. Возможно, вы хотели бы %{available_actions}.
104
+ customization_explain_html: Вы также можете изменить дизайн, %{theme_link}
105
+ или %{sidebar_link}
106
+ dashboard_explain_html: Здесь можно посмотреть, что происходит в вашем Publify-блоге
107
+ и что в нем можно сделать. Возможно, вы хотели бы %{available_actions}.
99
108
  enable_plugins: включив плагины
100
109
  help_explain_html: Если вам нужна помощь, %{doc_link}.
101
110
  read_our_documentation: ознакомьтесь с документацией
102
- update_your_profile_or_change_your_password: изменить свой профиль или поменять пароль
111
+ update_your_profile_or_change_your_password: изменить свой профиль или поменять
112
+ пароль
103
113
  write_a_page: создать страницу
104
114
  write_a_post: написать пост
105
- publify_version:
106
- error: You are late from at least one major version of Publify. You should upgrade immediately. Download and install <a href='http://publify.co/stable.tgz'>the latest Publify version</a>
107
- 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> ?
108
- 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> ?
109
115
  welcome:
110
116
  approved_count:
117
+ few: "%{count} approved"
118
+ many: "%{count} approved"
111
119
  one: 1 approved
112
120
  other: "%{count} approved"
113
121
  zero: no approved
114
- articles_and_comments_count_since: "%{articles_count} постов и %{comments_count} комментариев получено с вашего последнего посещения"
122
+ articles_and_comments_count_since: "%{articles_count} постов и %{comments_count}
123
+ комментариев получено с вашего последнего посещения"
115
124
  articles_count:
125
+ few: 'постов: %{count}'
126
+ many: 'постов: %{count}'
116
127
  one: 1 пост
117
128
  other: 'постов: %{count}'
118
129
  zero: нет постов
119
130
  comments_count:
131
+ few: 'комментариев: %{count}'
132
+ many: 'комментариев: %{count}'
120
133
  one: 1 комментарий
121
134
  other: 'комментариев: %{count}'
122
135
  zero: нет комментариев
123
136
  content: Content
124
137
  drafts_count:
138
+ few: 'черновиков: %{count}'
139
+ many: 'черновиков: %{count}'
125
140
  one: 1 черновик
126
141
  other: 'черновиков: %{count}'
127
142
  zero: нет черновиков
128
143
  feedback: Комментарии
129
144
  notes_count:
145
+ few: 'заметок: %{count}'
146
+ many: 'заметок: %{count}'
130
147
  one: 1 заметка
131
148
  other: 'заметок: %{count}'
132
149
  zero: нет заметок
133
150
  pages_count:
151
+ few: 'страниц: %{count}'
152
+ many: 'страниц: %{count}'
134
153
  one: 1 страница
135
154
  other: 'страниц: %{count}'
136
155
  zero: нет страниц
137
156
  running_publify: Работает Publify %{version}
138
157
  spam_count:
158
+ few: "%{count} spam"
159
+ many: "%{count} spam"
139
160
  one: 1 spam
140
161
  other: "%{count} spam"
141
162
  zero: no spam
142
163
  today: Сегодня
143
164
  unconfirmed_count:
165
+ few: "%{count} unconfirmed"
166
+ many: "%{count} unconfirmed"
144
167
  one: 1 unconfirmed
145
168
  other: "%{count} unconfirmed"
146
169
  zero: no unconfirmed
147
170
  your_articles_count:
171
+ few: 'постов написанных вами: %{count}'
172
+ many: 'постов написанных вами: %{count}'
148
173
  one: 1 пост написан вами
149
174
  other: 'постов написанных вами: %{count}'
150
175
  zero: нет постов написанных вами
@@ -167,10 +192,14 @@ ru:
167
192
  success_deleted: Deleted %{count} item(s)
168
193
  success_deleted_spam: All spam have been deleted
169
194
  success_mark_as_ham:
195
+ few: Marked %{count} items as Ham
196
+ many: Marked %{count} items as Ham
170
197
  one: Marked 1 item as Ham
171
198
  other: Marked %{count} items as Ham
172
199
  zero: No item selected to mark as Ham
173
200
  success_mark_as_spam:
201
+ few: Marked %{count} items as Spam
202
+ many: Marked %{count} items as Spam
174
203
  one: Marked 1 item as Spam
175
204
  other: Marked %{count} items as Spam
176
205
  zero: No item selected to mark as Spam
@@ -194,11 +223,12 @@ ru:
194
223
  save: Сохранить
195
224
  url: Url
196
225
  your_comment: Ваш комментарий
197
- ham:
198
- by: by
199
- created_on: 'on'
200
226
  index:
227
+ actions: Actions
201
228
  all: Все
229
+ author: Автор
230
+ content: Content
231
+ created_at: Created at
202
232
  feedback: Комментарии
203
233
  ham: Хорошие
204
234
  no_feedback: Ничего нет. Почему бы не начать и не добавить?
@@ -206,12 +236,8 @@ ru:
206
236
  presumed_spam: Предположительно спам
207
237
  select_all: Выбрать все
208
238
  spam: Спам
239
+ status: Статус
209
240
  unapproved_comments: Unapproved comments
210
- spam:
211
- by: от автора
212
- cancel: Отменить
213
- created_on: 'on'
214
- this_comment_by_was_flagged_as_spam_html: Этот комментарий от автора %{author} помечен как спам, %{cancel_link}?
215
241
  state:
216
242
  ham: Ham
217
243
  just_marked_as_ham: Just Marked As Ham
@@ -230,6 +256,8 @@ ru:
230
256
  information: Information
231
257
  may_take_a_moment: may take a moment
232
258
  migration_pending:
259
+ few: There are %{count} migrations pending.
260
+ many: There are %{count} migrations pending.
233
261
  one: There is one migration pending.
234
262
  other: There are %{count} migrations pending.
235
263
  migrations: Migrations
@@ -237,6 +265,8 @@ ru:
237
265
  update_database_now: Update database now
238
266
  you_are_up_to_date: You are up to date!
239
267
  notes:
268
+ edit:
269
+ notes: Заметки
240
270
  form:
241
271
  cancel: Отменить
242
272
  compose_new_note: Compose new note
@@ -250,8 +280,14 @@ ru:
250
280
  publish_at: Опубликован
251
281
  publish_settings: Настройки публикации
252
282
  tweet_id_like: Tweet id like 123456
253
- header:
254
- notes: Notes
283
+ index:
284
+ notes: Заметки
285
+ list:
286
+ actions: Actions
287
+ author: Автор
288
+ created_at: Created at
289
+ text_filter: Text filter
290
+ title: Заголовок
255
291
  show:
256
292
  action_or_other_html: "%{first_action} или %{second_action}"
257
293
  are_you_sure: Are you sure you want to delete this note
@@ -264,20 +300,21 @@ ru:
264
300
  form:
265
301
  article_filter: Фильтр постов
266
302
  cancel: Отменить
267
- offline: offline
268
303
  online: Онлайн
269
304
  permanent_link: Постоянная ссылка
270
305
  publish: Опубликовать
271
306
  publish_settings: Настройки публикации
272
- published: published
273
307
  save: Сохранить
274
308
  status: Статус
275
309
  title: Заголовок
276
310
  type_your_post: Type your post
277
311
  index:
312
+ actions: Actions
278
313
  author: Автор
314
+ created_at: Created at
279
315
  manage_pages: Manage pages
280
316
  new_page: Новая страница
317
+ text_filter: Text filter
281
318
  title: Заголовок
282
319
  new:
283
320
  success: Новая страница создана
@@ -288,7 +325,9 @@ ru:
288
325
  cancel: Отменить
289
326
  default: Default
290
327
  description: Описание
291
- 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
328
+ explain: The template name is the filename Publify will look for when calling
329
+ an article of that type. It should be in your theme under views/articles/template
330
+ name.html.erb
292
331
  name: Имя
293
332
  or: или
294
333
  post_types: Post Types
@@ -318,7 +357,7 @@ ru:
318
357
  are_you_sure: Вы уверены?
319
358
  content_type: Content Type
320
359
  date: Дата
321
- delete: Delete
360
+ delete: Удалить
322
361
  file_size: Размер Файла
323
362
  filename: Имя Файла
324
363
  media_library: Медиатека
@@ -334,42 +373,47 @@ ru:
334
373
  warning: No file selected
335
374
  seo:
336
375
  general:
337
- canonical_url: Canonical Url
338
376
  custom_tracking_code: Custom tracking code
339
377
  do_not_index_tags: Не индксировать теги
340
378
  dofollow: Dofollow
341
- explain: Here you can add anything you want to appear in your application header, such as analytics service tracking code.
342
- 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/
343
- explain_moderate_feedback: You may want to moderate feedback when turning this on
344
- 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)'
345
- 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
379
+ explain: Here you can add anything you want to appear in your application
380
+ header, such as analytics service tracking code.
381
+ explain_moderate_feedback: You may want to moderate feedback when turning
382
+ this on
383
+ explain_rss_description: 'You can use the following tags: %author% (author
384
+ name), %blog_url% (this blog URL), %blog_name% (this blog title) and %permalink_url%
385
+ (a link to the article you want to protect)'
386
+ explain_tag_index_html: Checking this box will add <code>noindex, follow</code>
387
+ meta tags in every tags page, removing them from search engines and preventing
388
+ duplicate content issues
346
389
  general_settings: Основные настройки
347
390
  google: Google
348
391
  google_analytics: Google Analytics
349
- google_webmaster_tools_validation_link: Google Webmaster Tools validation link
350
- human: Human
351
- humans_txt: Human
392
+ google_webmaster_tools_validation_link: Google Webmaster Tools validation
393
+ link
352
394
  indexing: Индексация
353
395
  meta_description: Meta description
354
396
  meta_keywords: Meta keywords
355
- read_more_about_html: Read more about %{link}
356
397
  robots_txt: Robots.txt
357
398
  rss_description_message: RSS description message
358
- this_will_display: This will display at the bottom of each post in the RSS feed
359
- use_canonical_url: Use canonical URL
399
+ this_will_display: This will display at the bottom of each post in the RSS
400
+ feed
360
401
  use_dofollow_in_comments: Use dofollow in comments
361
402
  use_meta_keywords: Использовать meta keywords
362
403
  use_rss_description: Use RSS description
363
404
  permalinks:
364
405
  custom: Собственный формат
365
406
  date_and_title: Дата и заголовок
366
- 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.
407
+ explain: Publify offers you the ability to create a custom URL structure for
408
+ your permalinks and archives. This can improve the aesthetics, usability,
409
+ and forward-compatibility of your links.
367
410
  help_on_permalink_settings: Help on permalink settings
368
411
  month_and_title: Месяц и заголовок
369
412
  permalink_format: Формат постоянных ссылок
370
413
  sample: Вот некоторые примеры, от которых вы можете оттолкнуться.
371
414
  title_only: Только заголовок
372
- you_can_custom_your_url_structure: 'В своем формате структуру URL’ов вы можете использовать следующие теги:'
415
+ you_can_custom_your_url_structure: 'В своем формате структуру URL’ов вы можете
416
+ использовать следующие теги:'
373
417
  your_article_day: день публикации вашего поста.
374
418
  your_article_month: месяц публикации вашего поста.
375
419
  your_article_slug_html: заголовок вашего поста. <strong>Используйте его обязательно</strong>.
@@ -392,30 +436,35 @@ ru:
392
436
  paginated_archives: Paginated archives
393
437
  replaced_by_the_archive_date: Replaced by the archive date
394
438
  replaced_by_the_content_body: Replaced by the content body
395
- replaced_with_the_article_categories: Replaced with the article categories (comma separated)
439
+ replaced_with_the_article_categories: Replaced with the article categories
440
+ (comma separated)
396
441
  replaced_with_the_article_page_title: Replaced with the article/page title
397
442
  replaced_with_the_article_tags: Replaced with the article tags (comma separated)
398
443
  replaced_with_the_category_tag_name: Replaced with the category/tag name
399
444
  replaced_with_the_current_date: Replaced with the current date
400
445
  replaced_with_the_current_month: Replaced with the current month
401
446
  replaced_with_the_current_page_number: Replaced with the current page number
402
- replaced_with_the_current_search_phrase: Replaced with the current search phrase
447
+ replaced_with_the_current_search_phrase: Replaced with the current search
448
+ phrase
403
449
  replaced_with_the_current_time: Replaced with the current time
404
450
  replaced_with_the_current_year: Replaced with the current year
405
451
  replaced_with_the_post_page_excerpt: Replaced with the post/page excerpt
406
- replaced_with_the_title_of_the_article_page: Replaced with the title of the article/page
452
+ replaced_with_the_title_of_the_article_page: Replaced with the title of the
453
+ article/page
407
454
  search_results: Search results
408
455
  short_statuses: Short statuses
409
456
  short_statuses_lists: Short statuses lists
410
457
  the_blog_s_name: The blog's name
411
458
  the_blog_s_tagline_description: The blog's tagline / description
412
- these_tags_can_be_included: These tags can be included in your templates and will be replaced when displaying the page.
459
+ these_tags_can_be_included: These tags can be included in your templates and
460
+ will be replaced when displaying the page.
413
461
  title_template: Шаблон заголовка
414
462
  settings:
415
463
  display:
416
464
  cancel: Отменить
417
465
  custom_url: Custom URL shortener domain
418
- custom_url_help: If you have a custom domain for URL shortening, enter it here.
466
+ custom_url_help: If you have a custom domain for URL shortening, enter it
467
+ here.
419
468
  date_format: Date format
420
469
  default_archives_show: articles on the archives page
421
470
  default_article_show: articles on the homepage
@@ -444,16 +493,24 @@ ru:
444
493
  enable_feedback_moderation: Enable feedback moderation
445
494
  enable_recaptcha: Enable reCaptcha
446
495
  enable_spam_protection: Enable spam protection
447
- explain_feedback_moderation: You can enable site wide feedback moderation. If you do so, no comment will appear on your blog unless you validate it.
448
- explain_reject_comments: Publify will automatically reject comments which contain over a certain amount of links in them
449
- 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
450
- 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
496
+ explain_feedback_moderation: You can enable site wide feedback moderation.
497
+ If you do so, no comment will appear on your blog unless you validate it.
498
+ explain_reject_comments: Publify will automatically reject comments which
499
+ contain over a certain amount of links in them
500
+ explain_spam_protection: Enabling spam protection will make Publify compare
501
+ the IP address of posters as well as the contents of their posts against
502
+ local and remote blacklists. Good defense against spam bots
503
+ explain_spamfiltering_html: Publify can (optionally) use the <a href='http://akismet.com'>Akismet</a>
504
+ spam-filtering service. You need to register with Akismet and receive an
505
+ API key before you can use their service. If you have an Akismet key, enter
506
+ it here
451
507
  feedback: Комментарии
452
508
  feedback_settings: Feedback settings
453
509
  max_links: Max Links
454
510
  none: Нет
455
511
  or: или
456
- remember_to_set_your_recaptcha: Remember to set your reCaptcha keys inside config/initializers/recaptcha.rb
512
+ remember_to_set_your_recaptcha: Remember to set your reCaptcha keys inside
513
+ config/initializers/recaptcha.rb
457
514
  set_to_0_to_never_disable_comments: Set to 0 to never disable comments
458
515
  set_to_0_to_never_reject_comments: Set to 0 to never reject comments
459
516
  spam: Spam
@@ -466,9 +523,15 @@ ru:
466
523
  blog_url: URL блога
467
524
  cancel: Отменить
468
525
  email_address_used_to_notify: Email address used by Publify to send notifications
469
- explain_allow_users_to_register_html: Вы можете разрешить пользователям регистрироваться в вашем блоге. По умолчанию они регистрируются как контрибьюторы, то есть получают непривелигированные учетные записи, которые не имеют никаких прав — только профиль на сайте. Если вы не хотите давать пользователям возможность регистрироваться, вы можете добавлять их вручную в разделе «пользователи» панели администратора
526
+ explain_allow_users_to_register_html: Вы можете разрешить пользователям регистрироваться
527
+ в вашем блоге. По умолчанию они регистрируются как контрибьюторы, то есть
528
+ получают непривелигированные учетные записи, которые не имеют никаких прав
529
+ — только профиль на сайте. Если вы не хотите давать пользователям возможность
530
+ регистрироваться, вы можете добавлять их вручную в разделе «пользователи»
531
+ панели администратора
470
532
  general_settings: Основные настройки
471
- items_to_display_in_admin_lists: Количество элементов для отображения в администраторских списках
533
+ items_to_display_in_admin_lists: Количество элементов для отображения в администраторских
534
+ списках
472
535
  language: Язык
473
536
  or: или
474
537
  source_email: Source Email
@@ -511,6 +574,7 @@ ru:
511
574
  feedback: Комментарии
512
575
  general_settings: Основные настройки
513
576
  global_seo_settings: Глобальные SEO-настройки
577
+ home: Главная
514
578
  in_page_plugins: Плагины для страницы
515
579
  logged_in_as: Вы вошли как %{login}
516
580
  logout_html: Выйти »
@@ -535,7 +599,8 @@ ru:
535
599
  write: Публикация
536
600
  twitter_alert:
537
601
  fill_the_twitter_credentials: fill in the OAuth credentials
538
- 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}.
602
+ how_to_setup_twitter_html: If you want to push short statuses on Twitter,
603
+ you need to %{twitter_settings_link} Twitter gave you after you %{twitter_registration_link}.
539
604
  registered_your_application: registered your application
540
605
  sidebar:
541
606
  config:
@@ -544,8 +609,14 @@ ru:
544
609
  you_have_no_plugins_installed: You have no plugins installed
545
610
  index:
546
611
  cancel: Отменить
547
- 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.
548
- 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
612
+ download_more_plugins_html: You can download and install sidebar plugins from
613
+ our official <a href='https://github.com/fdv/publify/wiki/Sidebar-plugins'>plugin
614
+ repository</a>. All you have to do is upload the theme directory in your
615
+ vendor/plugins directory.
616
+ explain_how_its_works: Drag and drop to change the sidebar items displayed
617
+ on this blog. To remove items from the sidebar just click 'remove'. Changes
618
+ are saved immediately, but not activated until you click the 'Publish changes'
619
+ button
549
620
  or: или
550
621
  publish_changes: Сохранить изменения
551
622
  sidebar: Боковая колонка
@@ -562,6 +633,7 @@ ru:
562
633
  no_tags: Ничего нет. Почему бы не начать и не добавить?
563
634
  or: или
564
635
  save: Сохранить
636
+ view: View
565
637
  themes:
566
638
  index:
567
639
  active_theme: "%{name} - Active theme"
@@ -629,17 +701,21 @@ ru:
629
701
  no_articles_found: No articles found
630
702
  archives_article:
631
703
  posted_in: posted in
632
- article:
704
+ article_author:
633
705
  posted_by: Posted by
634
706
  article_excerpt:
635
707
  continue_reading: Continue reading
636
708
  article_links:
637
709
  comments:
710
+ few: 'Комментариев: %{count}'
711
+ many: 'Комментариев: %{count}'
638
712
  one: 1 комментарий
639
713
  other: 'Комментариев: %{count}'
640
714
  zero: Нет комментариев
641
715
  tags: Tags
642
716
  trackbacks:
717
+ few: "%{count} trackbacks"
718
+ many: "%{count} trackbacks"
643
719
  one: 1 trackback
644
720
  other: "%{count} trackbacks"
645
721
  zero: no trackbacks
@@ -649,7 +725,7 @@ ru:
649
725
  comment_markup_help: Помощь по разметке
650
726
  leave_url_email: leave url/email
651
727
  preview_comment: Предпросмотр комментария
652
- your_blog: your blog
728
+ your_blog: Ваш блог
653
729
  your_email: Ваш email
654
730
  your_message: Ваше сообщение
655
731
  your_name: Ваше имя
@@ -681,7 +757,9 @@ ru:
681
757
  comments:
682
758
  comment:
683
759
  said: said
684
- 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
760
+ this_comment_has_been_flagged_for_moderator_approval: This comment has been
761
+ flagged for moderator approval. It won't appear on this blog until the author
762
+ approves it
685
763
  date:
686
764
  abbr_month_names:
687
765
  -
@@ -715,17 +793,26 @@ ru:
715
793
  characters_minimum: Minimum %{min} characters
716
794
  errors:
717
795
  article_type_already_exist: This article type already exists
718
- cant_end_with_rss_or_atom: Can't end in .rss or .atom. These are reserved for feed URLs
796
+ cant_end_with_rss_or_atom: Can't end in .rss or .atom. These are reserved for
797
+ feed URLs
719
798
  no_notes_found: No notes found...
720
799
  no_posts_found: No posts found...
721
800
  page_not_found: Страница не найдена
722
801
  permalink_need_a_title: 'You need a permalink format with an identifier : %%title%%'
723
802
  problem_sending_to_twitter: Oooops something went wrong!
724
- 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
725
- the_page_you_are_looking_for: Страница, которую вы запрашиваете, была перемещена или не существует
803
+ render_sidebar: It seems something went wrong. Maybe some of your sidebars are
804
+ actually missing and you should either reinstall them or remove them manually
805
+ the_page_you_are_looking_for: Страница, которую вы запрашиваете, была перемещена
806
+ или не существует
726
807
  generic:
727
808
  change: Изменить
809
+ conversation: Conversation
810
+ delete: Удалить
811
+ edit: Редактировать
812
+ mark_as_ham: Mark as ham
813
+ mark_as_spam: Mark as spam
728
814
  save: Сохранить
815
+ short_url: Short url
729
816
  helper:
730
817
  at: в
731
818
  langs:
@@ -763,7 +850,8 @@ ru:
763
850
  publisher: Blog publisher
764
851
  setup:
765
852
  article:
766
- body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!'
853
+ body: Welcome to Publify. This is your first article. Edit or delete it, then
854
+ start blogging!
767
855
  title: Hello World!
768
856
  index:
769
857
  blog_name: Название блога
@@ -772,7 +860,9 @@ ru:
772
860
  your_mail: Ваш email
773
861
  page:
774
862
  about: About
775
- 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 this one as you like and manage all of your content inside Publify.
863
+ body: This is an example of a Publify page. You can edit this to write information
864
+ about yourself or your site so readers know who you are. You can create as
865
+ many pages as this one as you like and manage all of your content inside Publify.
776
866
  tags:
777
867
  index:
778
868
  there_are_no_tags: Тегов нет