publify_core 9.0.0.pre6 → 9.0.0

data/config/locales/ru.yml

@@ -7,7 +7,6 @@ ru:
       admin: admin
       dont_lose_the_mail_sent: Не потеряйте письмо, высланное на %{email}, или вы больше не сможете зайти
       login: 'логин: %{user}'
-      password: 'пароль: %{pass}'
       proceed_to: Proceed to %{link}
       success: You have successfully signed up.
     create_account: Создать учетную запись
@@ -40,11 +39,7 @@ ru:
         allow_comments_status:
           one: enabled
           zero: выключены
-        allow_pings_status:
-          one: enabled
-          zero: выключены
-        allow_trackbacks: Разрешить trackback’и
-        allowed_comments_and_trackbacks_html: Комментарии %{allow_comment} и trackback’и %{allow_trackback}
+        allowed_comments_html: Comments are %{allow_comment}
         article_type: Article type
         cancel: Отменить
         default: Default
@@ -430,8 +425,6 @@ ru:
         feed_articles: Article excerpts
         feed_excerpts_only: Show only article excerpts in feed
         feed_settings: RSS Feed Settings
-        feedburner_help: Enter your FeedBurner ID if you wish to use your Google FeedBurner account instead of using the Publify feed URL.
-        feedburner_id: FeedBurner ID
         or: или
         publishing_options: Publishing Options
         status_main_feed: Display statuses in the main feed
@@ -447,15 +440,12 @@ ru:
         comments_filter: Comments filter
         days: days
         disable_comments_after: Disable comments after
-        disable_trackbacks_sitewide: Disable trackbacks site-wide
         enable_comments_by_default: Enable comments by default
         enable_feedback_moderation: Enable feedback moderation
         enable_recaptcha: Enable reCaptcha
         enable_spam_protection: Enable spam protection
-        enable_trackbacks_by_default: Enable Trackbacks by default
-        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.
-        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.
-        explain_reject_comments: Publify will automatically reject comments and trackbacks which contain over a certain amount of links in them
+        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.
+        explain_reject_comments: Publify will automatically reject comments which contain over a certain amount of links in them
         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
         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
         feedback: Комментарии
@@ -468,7 +458,6 @@ ru:
         set_to_0_to_never_reject_comments: Set to 0 to never reject comments
         spam: Spam
         spam_protection: Spam protection
-        trackbacks: Trackbacks
         update_settings: Обновить настройки
       index:
         allow_users_to_register: Разрешить пользователям регистрироваться
@@ -494,7 +483,6 @@ ru:
         cancel: Отменить
         display: Display
         example: example
-        explain: После публикации статей Publify может отправлять уведомления на те сайты, на которые вы ссылаетесь. Разумно выключить эту опцию для приватных блогов. Для публичных блогов особых причин выключать ее нет.
         image_medium_size: Image medium size
         image_thumbnail_size: Image thumbnail size
         latitude_longitude: Latitude, Longitude
@@ -502,12 +490,9 @@ ru:
         or: или
         publish: Опубликовать
         publish_on_twitter: Publish on Twitter
-        send_trackbacks: Отправлять trackback’и
-        trackbacks: Trackbacks
         twitter_consumer_key: Twitter consumer key
         twitter_consumer_secret: Twitter consumer secret
         update_settings: Обновить настройки
-        urls_to_ping: URLs to ping automatically
         write: Публикация
         your_geoloc: your latitude and longitude
     shared:
@@ -642,7 +627,8 @@ ru:
   articles:
     archives:
       no_articles_found: No articles found
-      posted_in: Posted in
+    archives_article:
+      posted_in: posted in
     article:
       posted_by: Posted by
     article_excerpt:
@@ -679,12 +665,7 @@ ru:
       edit: Редактировать
       leave_a_response: Оставить отзыв
       rss_feed: RSS feed
-      trackback_uri: Trackback URI
       trackbacks: Trackbacks
-      use_the_following_link_to_trackback: Use the following link to trackback from your own site
-    search:
-      next_page: Следующая страница
-      previous_page: Предыдущая страница
     trackback:
       from: From
   authors:
@@ -693,9 +674,6 @@ ru:
       contact_information: Contact information
       jabber: 'Jabber:'
       msn: 'MSN:'
-      next_page: Следующая страница
-      posted_in: posted in
-      previous_page: Предыдущая страница
       this_author_has_not_published_any_article_yet: Этот автор еще ничего не публиковал
       twitter: 'Twitter:'
       web_site: 'Веб-сайт:'
@@ -775,16 +753,10 @@ ru:
       designed_by: Designed by %{designed_by}
       powered_by_html: Powered by %{powered_by}
   notes:
-    index:
-      next_page: Следующая страница
-      previous_page: Предыдущая страница
     note:
       view_on_twitter: View on Twitter
   notice:
     note_successfully_created: Note was successfully created
-  pagination:
-    next_page: Следующая страница
-    previous_page: Предыдущая страница
   profile:
     admin: Publify administrator
     contributor: Contributor
@@ -795,6 +767,7 @@ ru:
       title: Hello World!
     index:
       blog_name: Название блога
+      password: Пароль
       welcome_to_your_blog_setup: Welcome to your blog setup
       your_mail: Ваш email
     page:
@@ -802,9 +775,7 @@ ru:
       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.
   tags:
     index:
-      next_page: Следующая страница
-      previous_page: Предыдущая страница
-      there_is_no_tags: Тегов нет
+      there_are_no_tags: Тегов нет
   time:
     formats:
       default: "%m/%d/%Y %H:%M"

data/config/locales/zh-CN.yml

@@ -7,7 +7,6 @@ zh-CN:
       admin: admin
       dont_lose_the_mail_sent: Don't lose the mail sent at %{email} or you won't be able to login anymore
       login: 'Login: %{login}'
-      password: 'Password: %{password}'
       proceed_to: Proceed to %{link}
       success: You have successfully signed up.
     create_account: 创建帐号
@@ -40,11 +39,7 @@ zh-CN:
         allow_comments_status:
           one: enabled
           zero: disabled
-        allow_pings_status:
-          one: enabled
-          zero: disabled
-        allow_trackbacks: 允许引用
-        allowed_comments_and_trackbacks_html: Comments are %{allow_comment} and trackbacks are %{allow_trackback}
+        allowed_comments_html: Comments are %{allow_comment}
         article_type: Article type
         cancel: 取消
         default: Default
@@ -430,8 +425,6 @@ zh-CN:
         feed_articles: Article excerpts
         feed_excerpts_only: Show only article excerpts in feed
         feed_settings: RSS Feed Settings
-        feedburner_help: Enter your FeedBurner ID if you wish to use your Google FeedBurner account instead of using the Publify feed URL.
-        feedburner_id: FeedBurner ID
         or: or
         publishing_options: Publishing Options
         status_main_feed: Display statuses in the main feed
@@ -447,13 +440,10 @@ zh-CN:
         comments_filter: 篩選评论
         days: 日期
         disable_comments_after: 在失效的评论之後
-        disable_trackbacks_sitewide: Disable trackbacks site-wide
         enable_comments_by_default: 預設為可以回應
         enable_feedback_moderation: 適度可以反饋
         enable_recaptcha: Enable reCaptcha
         enable_spam_protection: 有效防止垃圾郵件
-        enable_trackbacks_by_default: 預設為可以引用
-        explain_disable_trackbacks: 此設定可以讓你博客裡的文章停止引用，這個舉動並不會刪除存在的引用，但是會阻止將來你要試圖增加的引用
         explain_feedback_moderation: 你可以設定網點範圍有限度的反饋。這麼做將不會有任何评论引用出現在你的博客，除非你使之生效
         explain_reject_comments: Publify會自動回絕评论和引用，包含某些可靠的連結總數
         explain_spam_protection: publify會根據張貼者IP的位址內容還有黑名單來有效防止垃圾郵件。好的防禦可以抑制垃圾郵寄
@@ -468,7 +458,6 @@ zh-CN:
         set_to_0_to_never_reject_comments: 設定0回絕不回絕的评论
         spam: Spam
         spam_protection: 防止垃圾郵件
-        trackbacks: Trackbacks
         update_settings: Update settings
       index:
         allow_users_to_register: Allow users to register
@@ -494,7 +483,6 @@ zh-CN:
         cancel: 取消
         display: 顯示
         example: 舉例
-        explain: 當公開的文章或引用會洩漏你私人的資訊時，對於不公開的博客publify會終止連結。在公開的博客並無此選項
         image_medium_size: Image medium size
         image_thumbnail_size: Image thumbnail size
         latitude_longitude: 緯度,經度
@@ -502,12 +490,9 @@ zh-CN:
         or: or
         publish: 发布
         publish_on_twitter: Publish on Twitter
-        send_trackbacks: 引用發送
-        trackbacks: 引用
         twitter_consumer_key: Twitter consumer key
         twitter_consumer_secret: Twitter consumer secret
         update_settings: Update settings
-        urls_to_ping: URL自動地Ping
         write: 寫入
         your_geoloc: 你的緯度、經度
     shared:
@@ -612,8 +597,8 @@ zh-CN:
         notification_settings: Notifications
         notifications: Send notification messages
         or: or
-        password: Password
-        password_confirmation: Password confirmation
+        password: 密码
+        password_confirmation: 密码确认
         profile: Profile
         profile_settings: Profile Settings
         save: 保存
@@ -642,6 +627,7 @@ zh-CN:
   articles:
     archives:
       no_articles_found: 没有找到任何文章
+    archives_article:
       posted_in: 发表在
     article:
       posted_by: 貼上
@@ -679,12 +665,7 @@ zh-CN:
       edit: 修改
       leave_a_response: 離開一個回應
       rss_feed: 為本篇提供RSS
-      trackback_uri: Trackback URI
       trackbacks: Trackbacks
-      use_the_following_link_to_trackback: 從你所屬的網點用隨後的連結去引用
-    search:
-      next_page: Next page
-      previous_page: Previous page
     trackback:
       from: From
   authors:
@@ -693,9 +674,6 @@ zh-CN:
       contact_information: Contact information
       jabber: 'Jabber:'
       msn: 'MSN:'
-      next_page: 下一頁
-      posted_in: 发表在
-      previous_page: 前一頁
       this_author_has_not_published_any_article_yet: This author has not published any article yet
       twitter: 'Twitter:'
       web_site: 'Web site:'
@@ -775,16 +753,10 @@ zh-CN:
       designed_by: Designed by %{designed_by}
       powered_by_html: Powered by %{powered_by}
   notes:
-    index:
-      next_page: Next page
-      previous_page: Previous page
     note:
       view_on_twitter: View on Twitter
   notice:
     note_successfully_created: Note was successfully created
-  pagination:
-    next_page: Next page
-    previous_page: Previous page
   profile:
     admin: Publify administrator
     contributor: Contributor
@@ -795,6 +767,7 @@ zh-CN:
       title: Hello World!
     index:
       blog_name: Blog name
+      password: 密码
       welcome_to_your_blog_setup: Welcome to your blog setup
       your_mail: Your email
     page:
@@ -802,9 +775,7 @@ zh-CN:
       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.
   tags:
     index:
-      next_page: Next page
-      previous_page: Previous page
-      there_is_no_tags: There is no tag
+      there_are_no_tags: There are no tags
   time:
     formats:
       default: "%m/%d/%Y %H:%M"

data/config/locales/zh-TW.yml

@@ -7,7 +7,6 @@ zh-TW:
       admin: admin
       dont_lose_the_mail_sent: Don't lose the mail sent at %{email} or you won't be able to login anymore
       login: 'Login: %{login}'
-      password: 'Password: %{password}'
       proceed_to: Proceed to %{link}
       success: You have successfully signed up.
     create_account: Create an account
@@ -40,11 +39,7 @@ zh-TW:
         allow_comments_status:
           one: enabled
           zero: disabled
-        allow_pings_status:
-          one: enabled
-          zero: disabled
-        allow_trackbacks: 允許引用
-        allowed_comments_and_trackbacks_html: Comments are %{allow_comment} and trackbacks are %{allow_trackback}
+        allowed_comments_html: Comments are %{allow_comment}
         article_type: Article type
         cancel: 取消
         default: Default
@@ -430,8 +425,6 @@ zh-TW:
         feed_articles: Article excerpts
         feed_excerpts_only: Show only article excerpts in feed
         feed_settings: RSS Feed Settings
-        feedburner_help: Enter your FeedBurner ID if you wish to use your Google FeedBurner account instead of using the Publify feed URL.
-        feedburner_id: FeedBurner ID
         or: or
         publishing_options: Publishing Options
         status_main_feed: Display statuses in the main feed
@@ -447,13 +440,10 @@ zh-TW:
         comments_filter: 篩選評論
         days: 日期
         disable_comments_after: 在失效的評論之後
-        disable_trackbacks_sitewide: Disable trackbacks site-wide
         enable_comments_by_default: 預設為可以回應
         enable_feedback_moderation: 適度可以反饋
         enable_recaptcha: Enable reCaptcha
         enable_spam_protection: 有效防止垃圾郵件
-        enable_trackbacks_by_default: 預設為可以引用
-        explain_disable_trackbacks: 此設定可以讓你部落格裡的文章停止引用，這個舉動並不會刪除存在的引用，但是會阻止將來你要試圖增加的引用
         explain_feedback_moderation: 你可以設定網點範圍有限度的反饋。這麼做將不會有任何評論引用出現在你的部落格，除非你使之生效
         explain_reject_comments: Publify會自動回絕評論和引用，包含某些可靠的連結總數
         explain_spam_protection: publify會根據張貼者IP的位址內容還有黑名單來有效防止垃圾郵件。好的防禦可以抑制垃圾郵寄
@@ -468,7 +458,6 @@ zh-TW:
         set_to_0_to_never_reject_comments: 設定0回絕不回絕的評論
         spam: Spam
         spam_protection: 防止垃圾郵件
-        trackbacks: Trackbacks
         update_settings: Update settings
       index:
         allow_users_to_register: Allow users to register
@@ -494,7 +483,6 @@ zh-TW:
         cancel: 取消
         display: 顯示
         example: 舉例
-        explain: 當公開的文章或引用會洩漏你私人的資訊時，對於不公開的部落格publify會終止連結。在公開的部落格並無此選項
         image_medium_size: Image medium size
         image_thumbnail_size: Image thumbnail size
         latitude_longitude: 緯度,經度
@@ -502,12 +490,9 @@ zh-TW:
         or: or
         publish: 公開
         publish_on_twitter: Publish on Twitter
-        send_trackbacks: 引用發送
-        trackbacks: 引用
         twitter_consumer_key: Twitter consumer key
         twitter_consumer_secret: Twitter consumer secret
         update_settings: Update settings
-        urls_to_ping: URL自動地Ping
         write: 寫入
         your_geoloc: 你的緯度、經度
     shared:
@@ -612,8 +597,8 @@ zh-TW:
         notification_settings: Notifications
         notifications: Send notification messages
         or: or
-        password: Password
-        password_confirmation: Password confirmation
+        password: 密碼
+        password_confirmation: 密碼確認
         profile: Profile
         profile_settings: Profile Settings
         save: 存檔
@@ -642,7 +627,8 @@ zh-TW:
   articles:
     archives:
       no_articles_found: 沒有找到任何文章
-      posted_in: Posted in
+    archives_article:
+      posted_in: posted in
     article:
       posted_by: 貼上
     article_excerpt:
@@ -679,12 +665,7 @@ zh-TW:
       edit: 修改
       leave_a_response: 離開一個回應
       rss_feed: 為本篇提供RSS
-      trackback_uri: Trackback URI
       trackbacks: Trackbacks
-      use_the_following_link_to_trackback: 從你所屬的網點用隨後的連結去引用
-    search:
-      next_page: Next page
-      previous_page: Previous page
     trackback:
       from: From
   authors:
@@ -693,9 +674,6 @@ zh-TW:
       contact_information: Contact information
       jabber: 'Jabber:'
       msn: 'MSN:'
-      next_page: 下一頁
-      posted_in: posted in
-      previous_page: 前一頁
       this_author_has_not_published_any_article_yet: This author has not published any article yet
       twitter: 'Twitter:'
       web_site: 'Web site:'
@@ -775,16 +753,10 @@ zh-TW:
       designed_by: Designed by %{designed_by}
       powered_by_html: Powered by %{powered_by}
   notes:
-    index:
-      next_page: Next page
-      previous_page: Previous page
     note:
       view_on_twitter: View on Twitter
   notice:
     note_successfully_created: Note was successfully created
-  pagination:
-    next_page: Next page
-    previous_page: Previous page
   profile:
     admin: Publify administrator
     contributor: Contributor
@@ -795,6 +767,7 @@ zh-TW:
       title: Hello World!
     index:
       blog_name: Blog name
+      password: 密碼
       welcome_to_your_blog_setup: Welcome to your blog setup
       your_mail: Your email
     page:
@@ -802,9 +775,7 @@ zh-TW:
       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.
   tags:
     index:
-      next_page: Next page
-      previous_page: Previous page
-      there_is_no_tags: There is no tag
+      there_are_no_tags: There are no tags
   time:
     formats:
       default: "%m/%d/%Y %H:%M"

data/config/routes.rb

@@ -6,40 +6,18 @@ Rails.application.routes.draw do
   get ':year', to: 'articles#index', year: /\d{4}/, as: 'articles_by_year', format: false
   get ':year/page/:page', to: 'articles#index', year: /\d{4}/, as: 'articles_by_year_page', format: false
 
-  get 'articles.:format', to: 'articles#index', constraints: {format: 'rss'}, as: 'rss'
-  get 'articles.:format', to: 'articles#index', constraints: {format: 'atom'}, as: 'atom'
+  get 'articles.:format', to: 'articles#index', format: /rss|atom/, as: 'articles_feed'
 
-  scope controller: 'xml', path: 'xml' do
-    get 'articlerss/:id/feed.xml', action: 'articlerss', format: false
-    get 'commentrss/feed.xml', action: 'commentrss', format: false
-    get 'trackbackrss/feed.xml', action: 'trackbackrss', format: false
-  end
-
-  get 'xml/:format', to: 'xml#feed', type: 'feed', constraints: {format: 'rss'}, as: 'xml'
-  get 'sitemap.xml', to: 'xml#feed', format: 'googlesitemap', type: 'sitemap', as: 'sitemap_xml'
-
-  scope controller: 'xml', path: 'xml', as: 'xml' do
-    scope action: 'feed' do
-      get ':format/feed.xml', type: 'feed'
-      get ':format/:type/:id/feed.xml'
-      get ':format/:type/feed.xml'
-    end
-  end
-
-  get 'xml/rsd', to: 'xml#rsd', format: false
-  get 'xml/feed', to: 'xml#feed'
+  get 'sitemap.xml', to: 'xml#sitemap', format: 'googlesitemap'
 
   # CommentsController
-  resources :comments, as: 'admin_comments', only: [:index, :create] do
+  resources :comments, only: [:create] do
     collection do
       post :preview
     end
   end
 
-  resources :trackbacks
-
-  # I thinks it's useless. More investigating
-  post "trackbacks/:id/:day/:month/:year", to: 'trackbacks#create', format: false
+  resources :feedback, only: :index
 
   # ArticlesController
   get '/live_search/', to: 'articles#live_search', as: :live_search_articles, format: false
@@ -56,7 +34,8 @@ Rails.application.routes.draw do
   get 'articles/tag', to: 'articles#tag', format: false
 
   # SetupController
-  match '/setup', to: 'setup#index', via: [:get, :post], format: false
+  get '/setup', to: 'setup#index', format: false
+  post '/setup', to: 'setup#create', format: false
 
   # TagsController (imitate inflected_resource)
   resources :tags, only: [:index, :create, :new]
@@ -130,7 +109,6 @@ Rails.application.routes.draw do
     end
 
     resource :seo, controller: 'seo', only: [:show, :update], format: false
-    resource :migrations, only: [:show, :update]
 
     # TODO: This should be a singular resource
     resource :settings, only: [], format: false do