publify_core 9.0.0.pre6 → 9.0.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 (176) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +44 -0
  3. data/README.md +9 -0
  4. data/app/controllers/admin/base_controller.rb +0 -6
  5. data/app/controllers/admin/content_controller.rb +34 -15
  6. data/app/controllers/admin/dashboard_controller.rb +4 -9
  7. data/app/controllers/admin/feedback_controller.rb +1 -0
  8. data/app/controllers/admin/notes_controller.rb +1 -1
  9. data/app/controllers/admin/pages_controller.rb +3 -7
  10. data/app/controllers/admin/sidebar_controller.rb +1 -0
  11. data/app/controllers/admin/tags_controller.rb +1 -0
  12. data/app/controllers/articles_controller.rb +50 -55
  13. data/app/controllers/comments_controller.rb +2 -3
  14. data/app/controllers/content_controller.rb +8 -17
  15. data/app/controllers/feedback_controller.rb +5 -39
  16. data/app/controllers/notes_controller.rb +1 -3
  17. data/app/controllers/setup_controller.rb +14 -18
  18. data/app/controllers/tags_controller.rb +13 -15
  19. data/app/controllers/theme_controller.rb +7 -5
  20. data/app/controllers/xml_controller.rb +11 -59
  21. data/app/helpers/authors_helper.rb +2 -2
  22. data/app/helpers/base_helper.rb +11 -4
  23. data/app/helpers/xml_helper.rb +2 -2
  24. data/app/jobs/application_job.rb +2 -0
  25. data/app/models/archives_sidebar.rb +8 -11
  26. data/app/models/article.rb +53 -72
  27. data/app/models/article/factory.rb +1 -1
  28. data/app/models/blog.rb +17 -40
  29. data/app/models/comment.rb +4 -3
  30. data/app/models/content.rb +18 -21
  31. data/app/models/content_base.rb +0 -5
  32. data/app/models/feedback.rb +76 -54
  33. data/app/models/meta_sidebar.rb +1 -0
  34. data/app/models/note.rb +7 -0
  35. data/app/models/page.rb +10 -5
  36. data/app/models/ping.rb +0 -113
  37. data/app/models/post_type.rb +1 -0
  38. data/app/models/redirect.rb +1 -1
  39. data/app/models/resource.rb +1 -19
  40. data/app/models/sidebar.rb +1 -1
  41. data/app/models/static_sidebar.rb +1 -0
  42. data/app/models/tag.rb +13 -9
  43. data/app/models/tag_sidebar.rb +4 -4
  44. data/app/models/trackback.rb +1 -8
  45. data/app/models/trigger.rb +1 -15
  46. data/app/models/user.rb +2 -9
  47. data/app/uploaders/resource_uploader.rb +33 -2
  48. data/app/views/accounts/confirm.html.erb +0 -1
  49. data/app/views/admin/content/_article_list.html.erb +1 -1
  50. data/app/views/admin/content/_form.html.erb +3 -7
  51. data/app/views/admin/pages/_form.html.erb +2 -2
  52. data/app/views/admin/seo/_general.html.erb +33 -28
  53. data/app/views/admin/seo/_permalinks.html.erb +2 -2
  54. data/app/views/admin/seo/_titles.html.erb +36 -36
  55. data/app/views/admin/settings/display.html.erb +20 -27
  56. data/app/views/admin/settings/feedback.html.erb +44 -51
  57. data/app/views/admin/settings/index.html.erb +14 -14
  58. data/app/views/admin/settings/write.html.erb +12 -30
  59. data/app/views/admin/tags/_index_and_form.html.erb +1 -1
  60. data/app/views/articles/_archives_article.html.erb +9 -0
  61. data/app/views/articles/_article.html.erb +8 -6
  62. data/app/views/articles/_article_collection.html.erb +1 -1
  63. data/app/views/articles/_article_excerpt.html.erb +10 -8
  64. data/app/views/articles/_article_links.html.erb +4 -2
  65. data/app/views/articles/_comment_list.html.erb +5 -5
  66. data/app/views/articles/_full_article_content.html.erb +4 -2
  67. data/app/views/articles/archives.html.erb +10 -20
  68. data/app/views/articles/feedback_atom_feed.atom.builder +5 -5
  69. data/app/views/articles/feedback_rss_feed.rss.builder +12 -13
  70. data/app/views/articles/index_atom_feed.atom.builder +3 -4
  71. data/app/views/articles/index_rss_feed.rss.builder +9 -10
  72. data/app/views/articles/read.html.erb +5 -31
  73. data/app/views/articles/search.html.erb +1 -1
  74. data/app/views/articles/trackback.xml.builder +1 -1
  75. data/app/views/authors/show.html.erb +11 -21
  76. data/app/views/authors/show_atom_feed.atom.builder +3 -4
  77. data/app/views/authors/show_rss_feed.rss.builder +9 -10
  78. data/app/views/comments/_comment.html.erb +17 -16
  79. data/app/views/feedback/index.atom.builder +7 -0
  80. data/app/views/feedback/index.rss.builder +19 -0
  81. data/app/views/notes/_note.html.erb +16 -15
  82. data/app/views/notes/index.html.erb +1 -1
  83. data/app/views/notification_mailer/_mail_footer.html.erb +0 -2
  84. data/app/views/notification_mailer/_mail_header.html.erb +2 -0
  85. data/app/views/notification_mailer/article.html.erb +4 -3
  86. data/app/views/notification_mailer/comment.html.erb +7 -6
  87. data/app/views/notification_mailer/notif_user.html.erb +3 -8
  88. data/app/views/setup/index.html.erb +4 -0
  89. data/app/views/shared/_atom_header.atom.builder +3 -3
  90. data/app/views/shared/_atom_item_article.atom.builder +26 -19
  91. data/app/views/shared/_atom_item_comment.atom.builder +3 -5
  92. data/app/views/shared/_atom_item_trackback.atom.builder +3 -4
  93. data/app/views/shared/_page_header.html.erb +1 -1
  94. data/app/views/shared/_rss_item_article.rss.builder +10 -15
  95. data/app/views/shared/_rss_item_comment.rss.builder +1 -2
  96. data/app/views/shared/_rss_item_trackback.rss.builder +1 -1
  97. data/app/views/tags/index.html.erb +2 -2
  98. data/app/views/xml/sitemap.googlesitemap.builder +7 -0
  99. data/config/initializers/mime_types.rb +0 -1
  100. data/config/locales/da.yml +8 -37
  101. data/config/locales/de.yml +7 -36
  102. data/config/locales/en.yml +7 -36
  103. data/config/locales/es-MX.yml +8 -37
  104. data/config/locales/fr.yml +7 -36
  105. data/config/locales/he.yml +4 -33
  106. data/config/locales/it.yml +7 -36
  107. data/config/locales/ja.yml +5 -34
  108. data/config/locales/lt.yml +7 -36
  109. data/config/locales/nb-NO.yml +7 -36
  110. data/config/locales/nl.yml +9 -38
  111. data/config/locales/pl.yml +8 -37
  112. data/config/locales/pt-BR.yml +8 -37
  113. data/config/locales/ro.yml +9 -38
  114. data/config/locales/ru.yml +7 -36
  115. data/config/locales/zh-CN.yml +6 -35
  116. data/config/locales/zh-TW.yml +7 -36
  117. data/config/routes.rb +6 -28
  118. data/db/migrate/113_initial_schema.rb +191 -191
  119. data/db/migrate/114_fixes_buggy_articles_and_notes.rb +6 -7
  120. data/db/migrate/115_drops_categories_for_tags.rb +3 -3
  121. data/db/migrate/20150207131657_add_missing_indexes.rb +1 -1
  122. data/db/migrate/20150807134129_simplify_redirect_relations.rb +1 -1
  123. data/db/migrate/20150808052637_add_blog_ids.rb +3 -5
  124. data/db/migrate/20150808191127_add_blog_id_to_redirects.rb +1 -1
  125. data/db/migrate/20150810094754_add_blog_id_to_tags.rb +1 -1
  126. data/db/migrate/20160108111120_add_devise_to_users.rb +3 -3
  127. data/db/migrate/20160108184201_move_last_connection_to_last_sign_in_at.rb +1 -1
  128. data/db/migrate/20160110094906_remove_profiles_rights.rb +1 -1
  129. data/db/migrate/20160605103918_replace_profile_id_with_string.rb +1 -3
  130. data/db/migrate/20160605154632_remove_profiles.rb +2 -2
  131. data/db/migrate/20160701061851_demand_blog_id_on_contents.rb +1 -1
  132. data/db/migrate/20160701062604_add_blog_id_to_resources.rb +1 -1
  133. data/db/migrate/20170528093024_move_resources_to_content.rb +5 -0
  134. data/db/migrate/20170528094923_move_tags_to_content.rb +6 -0
  135. data/db/migrate/20170528201606_remove_separate_published_flag.rb +5 -0
  136. data/db/migrate/20170605071626_remove_extra_state_columns_from_feedback.rb +6 -0
  137. data/db/migrate/20170702105201_remove_published_at_from_feedback.rb +5 -0
  138. data/db/seeds.rb +1 -1
  139. data/lib/publify_core.rb +0 -1
  140. data/lib/publify_core/version.rb +1 -1
  141. data/lib/publify_guid.rb +1 -1
  142. data/lib/publify_time.rb +2 -2
  143. data/lib/sidebar_field.rb +19 -12
  144. data/lib/transforms.rb +1 -0
  145. metadata +102 -66
  146. data/.gitignore +0 -13
  147. data/.rspec +0 -2
  148. data/.rubocop.yml +0 -84
  149. data/.rubocop_todo.yml +0 -148
  150. data/.travis.yml +0 -27
  151. data/Gemfile +0 -17
  152. data/README.rdoc +0 -3
  153. data/Rakefile +0 -35
  154. data/app/assets/stylesheets/publify_core/.keep +0 -0
  155. data/app/controllers/.keep +0 -0
  156. data/app/controllers/admin/migrations_controller.rb +0 -19
  157. data/app/controllers/concerns/.keep +0 -0
  158. data/app/controllers/trackbacks_controller.rb +0 -36
  159. data/app/helpers/.keep +0 -0
  160. data/app/mailers/.keep +0 -0
  161. data/app/models/.keep +0 -0
  162. data/app/models/article/states.rb +0 -179
  163. data/app/models/concerns/.keep +0 -0
  164. data/app/models/feedback/states.rb +0 -256
  165. data/app/services/migrator.rb +0 -25
  166. data/app/views/.keep +0 -0
  167. data/app/views/comments/index.html.erb +0 -1
  168. data/app/views/comments/index_atom_feed.atom.builder +0 -8
  169. data/app/views/comments/index_rss_feed.rss.builder +0 -20
  170. data/app/views/trackbacks/index_atom_feed.atom.builder +0 -7
  171. data/app/views/trackbacks/index_rss_feed.rss.builder +0 -20
  172. data/app/views/trackbacks/trackback.xml.builder +0 -4
  173. data/app/views/xml/feed.googlesitemap.builder +0 -7
  174. data/app/views/xml/rsd.rsd.builder +0 -8
  175. data/lib/stateful.rb +0 -106
  176. data/publify_core.gemspec +0 -54
data/app/views/notification_mailer/article.html.erb CHANGED
@@ -1,6 +1,7 @@
1
1
  <p>A new article has been posted on <%=h @blog.blog_name %>:</p>
2
2
 
3
- <%= render 'mail_header' %>
4
- <h2><%=h @article.title %></h2>
5
- <%= html @article, :body %>
3
+ <%= render 'mail_header' do %>
4
+ <h2><%=h @article.title %></h2>
5
+ <%= html @article, :body %>
6
+ <% end %>
6
7
  <%= render 'mail_footer' %>
data/app/views/notification_mailer/comment.html.erb CHANGED
@@ -2,10 +2,11 @@
2
2
  <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a>, responding to
3
3
  <a href="<%= @comment.article.permalink_url %>"><%=h(@comment.article.title) %></a>.</p>
4
4
 
5
- <%= render 'mail_header' %>
6
- <h2><%=h @comment.title %></h2>
7
- <cite><strong><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></strong> </cite>
8
- <%= link_to('said', @comment.permalink_url) %>
9
- <%= display_date_and_time @comment.created_at %> <br>
10
- <%= html @comment %>
5
+ <%= render 'mail_header' do %>
6
+ <h2><%=h @comment.title %></h2>
7
+ <cite><strong><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></strong> </cite>
8
+ <%= link_to('said', @comment.permalink_url) %>
9
+ <%= display_date_and_time @comment.created_at %> <br>
10
+ <%= html @comment %>
11
+ <% end %>
11
12
  <%= render 'mail_footer' %>
data/app/views/notification_mailer/notif_user.html.erb CHANGED
@@ -2,13 +2,8 @@
2
2
  <body>
3
3
  <p>Your <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a> account has been created.</p>
4
4
 
5
- <%= render 'mail_header' %>
6
- <p>Your credentials appear below.</p>
7
-
8
- <ul>
9
- <li>Login: <%= h @user.login %></li>
10
- <li>Password: <%= h @user.password %></li>
11
- </ul>
12
- </div>
5
+ <%= render 'mail_header' do %>
6
+ <p>Your can log in using your chosen login name, <%= h @user.login %>, and your password.</p>
7
+ <% end %>
13
8
  </body>
14
9
  </html>
data/app/views/setup/index.html.erb CHANGED
@@ -8,6 +8,10 @@
8
8
  <div class='form-group'>
9
9
  <%= text_field(:setting, :email, { :class=> 'form-control', :placeholder => t(".your_mail")})%>
10
10
  </div>
11
+ <div class='form-group'>
12
+ <%= label_tag :setting_password, t('.password') %><br>
13
+ <%= password_field(:setting, :password, { :class=> 'form-control' })%>
14
+ </div>
11
15
 
12
16
  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save')%>">
13
17
  <% end %>
data/app/views/shared/_atom_header.atom.builder CHANGED
@@ -1,6 +1,6 @@
1
1
  feed.title(feed_title)
2
- unless this_blog.blog_subtitle.blank?
3
- feed.subtitle(this_blog.blog_subtitle, "type" => "html")
2
+ if this_blog.blog_subtitle.present?
3
+ feed.subtitle(this_blog.blog_subtitle, 'type' => 'html')
4
4
  end
5
5
  feed.updated items.first.updated_at if items.first
6
- feed.generator "Publify", uri: "http://www.publify.co", version: PublifyCore::VERSION
6
+ feed.generator 'Publify', uri: 'http://www.publify.co', version: PublifyCore::VERSION
data/app/views/shared/_atom_item_article.atom.builder CHANGED
@@ -1,39 +1,46 @@
1
- feed.entry item, :id => "urn:uuid:#{item.guid}", :url => item.permalink_url do |entry|
1
+ feed.entry item, id: "urn:uuid:#{item.guid}", published: item.published_at, url: item.permalink_url do |entry|
2
2
  entry.author do
3
- name = item.user.name rescue item.author
4
- email = item.user.email rescue nil
3
+ name = begin
4
+ item.user.name
5
+ rescue
6
+ item.author
7
+ end
8
+ email = begin
9
+ item.user.email
10
+ rescue
11
+ nil
12
+ end
5
13
  entry.name name
6
- entry.email email if this_blog.link_to_author unless email.blank?
14
+ entry.email email unless email.blank? || !this_blog.link_to_author
7
15
  end
8
16
 
9
17
  if item.is_a?(Note)
10
- entry.title truncate(item.html(:body).strip_html, length: 80, separator: ' ', omissions: '...'), "type"=>"html"
18
+ entry.title truncate(item.html(:body).strip_html, length: 80, separator: ' ', omissions: '...'), 'type' => 'html'
11
19
  else
12
- entry.title item.title, "type"=>"html"
20
+ entry.title item.title, 'type' => 'html'
13
21
  end
14
22
 
15
23
  if item.is_a?(Article)
16
24
 
17
25
  item.tags.each do |tag|
18
- entry.category "term" => tag.display_name, "scheme" => tag.permalink_url
26
+ entry.category 'term' => tag.display_name, 'scheme' => tag_url(tag.permalink)
19
27
  end
20
28
 
21
29
  item.resources.each do |resource|
22
- if resource.size > 0 # The Atom spec disallows files with size=0
23
- entry.tag! :link, "rel" => "enclosure",
24
- :type => resource.mime,
25
- :title => item.title,
26
- :href => this_blog.file_url(resource.upload_url),
27
- :length => resource.size
30
+ if resource.size > 0 # The Atom spec disallows files with size=0
31
+ entry.tag! :link, 'rel' => 'enclosure',
32
+ type: resource.mime,
33
+ title: item.title,
34
+ href: this_blog.file_url(resource.upload_url),
35
+ length: resource.size
28
36
  else
29
- entry.tag! :link, "rel" => "enclosure",
30
- :type => resource.mime,
31
- :title => item.title,
32
- :href => this_blog.file_url(resource.upload_url)
37
+ entry.tag! :link, 'rel' => 'enclosure',
38
+ type: resource.mime,
39
+ title: item.title,
40
+ href: this_blog.file_url(resource.upload_url)
33
41
  end
34
42
  end
35
43
  end
36
44
  content_html = fetch_html_content_for_feeds(item, this_blog)
37
- entry.content content_html + item.get_rss_description, "type"=>"html"
45
+ entry.content content_html + item.get_rss_description, 'type' => 'html'
38
46
  end
39
-
data/app/views/shared/_atom_item_comment.atom.builder CHANGED
@@ -1,10 +1,8 @@
1
- feed.entry item, :id => "urn:uuid:#{item.guid}", :url => item.permalink_url do |entry|
1
+ feed.entry item, id: "urn:uuid:#{item.guid}", url: item.permalink_url do |entry|
2
2
  entry.author do
3
3
  entry.name item.author
4
4
  entry.uri item.url
5
5
  end
6
- entry.title item.feed_title, "type"=>"html"
7
- entry.content html(item), "type"=>"html"
6
+ entry.title item.feed_title, 'type' => 'html'
7
+ entry.content html(item), 'type' => 'html'
8
8
  end
9
-
10
-
data/app/views/shared/_atom_item_trackback.atom.builder CHANGED
@@ -1,9 +1,8 @@
1
- feed.entry item, :id => "urn:uuid:#{item.guid}", :url => item.permalink_url do |entry|
1
+ feed.entry item, id: "urn:uuid:#{item.guid}", url: item.permalink_url do |entry|
2
2
  entry.author do
3
3
  entry.name item.blog_name
4
4
  entry.uri item.url
5
5
  end
6
- entry.title item.feed_title, "type"=>"html"
7
- entry.summary item.excerpt, "type"=>"html"
6
+ entry.title item.feed_title, 'type' => 'html'
7
+ entry.summary item.excerpt, 'type' => 'html'
8
8
  end
9
-
data/app/views/shared/_page_header.html.erb CHANGED
@@ -5,7 +5,6 @@
5
5
  <%= meta_tag 'google-site-verification', this_blog.google_verification unless this_blog.google_verification.blank?%>
6
6
  <meta name="generator" content="Publify <%=PublifyCore::VERSION%>">
7
7
  <%= show_meta_keyword %>
8
- <link rel="EditURI" type="application/rsd+xml" title="RSD" href="<%= url_for :controller => '/xml', :action => 'rsd' %>">
9
8
  <% if feed_atom %>
10
9
  <link rel="alternate" type="application/atom+xml" title="Atom" href="<%= feed_atom %>">
11
10
  <% end %>
@@ -13,6 +12,7 @@
13
12
  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= feed_rss %>">
14
13
  <% end %>
15
14
  <%= javascript_include_tag :publify, async: Rails.env.production? %>
15
+ <%= csrf_meta_tags %>
16
16
  <%= stylesheet_link_tag :publify %>
17
17
  <%= page_header_includes %>
18
18
  <% if this_blog.use_canonical_url %>
data/app/views/shared/_rss_item_article.rss.builder CHANGED
@@ -7,29 +7,24 @@ xm.item do
7
7
  content_html = fetch_html_content_for_feeds(item, this_blog)
8
8
  xm.description content_html + item.get_rss_description
9
9
  xm.pubDate item.published_at.rfc822
10
- xm.guid "urn:uuid:#{item.guid}", "isPermaLink" => "false"
11
- if item.link_to_author?
12
- xm.author "#{item.user.email} (#{item.user.name})"
13
- end
10
+ xm.guid "urn:uuid:#{item.guid}", 'isPermaLink' => 'false'
11
+ xm.author "#{item.user.email} (#{item.user.name})" if item.link_to_author?
14
12
 
15
13
  if item.is_a?(Article)
16
- xm.comments(item.permalink_url("comments"))
17
- for tag in item.tags
14
+ xm.comments(item.permalink_url('comments'))
15
+ item.tags.each do |tag|
18
16
  xm.category tag.display_name
19
17
  end
20
18
  # RSS 2.0 only allows a single enclosure per item, so only include the first one here.
21
- if not item.resources.empty?
19
+ unless item.resources.empty?
22
20
  resource = item.resources.first
23
21
  xm.enclosure(
24
- :url => item.blog.file_url(resource.upload_url),
25
- :length => resource.size,
26
- :type => resource.mime)
27
- end
22
+ url: item.blog.file_url(resource.upload_url),
23
+ length: resource.size,
24
+ type: resource.mime
25
+ )
28
26
  end
29
-
30
- if item.allow_pings?
31
- xm.trackback :ping, item.trackback_url
32
27
  end
28
+
33
29
  xm.link item.permalink_url
34
30
  end
35
-
data/app/views/shared/_rss_item_comment.rss.builder CHANGED
@@ -2,7 +2,6 @@ feed.item do
2
2
  feed.title item.feed_title
3
3
  feed.description html(item)
4
4
  feed.pubDate item.created_at.rfc822
5
- feed.guid "urn:uuid:#{item.guid}", "isPermaLink" => "false"
5
+ feed.guid "urn:uuid:#{item.guid}", 'isPermaLink' => 'false'
6
6
  feed.link item.permalink_url
7
7
  end
8
-
data/app/views/shared/_rss_item_trackback.rss.builder CHANGED
@@ -2,6 +2,6 @@ feed.item do
2
2
  feed.title item.feed_title
3
3
  feed.description item.excerpt
4
4
  feed.pubDate item.created_at.rfc822
5
- feed.guid "urn:uuid:#{item.guid}", "isPermaLink" => "false"
5
+ feed.guid "urn:uuid:#{item.guid}", 'isPermaLink' => 'false'
6
6
  feed.link item.url
7
7
  end
data/app/views/tags/index.html.erb CHANGED
@@ -9,7 +9,7 @@
9
9
  <% end %>
10
10
  </ul>
11
11
  <% else %>
12
- <p><%= t(".there_is_no_tags") %></p>
12
+ <p><%= t(".there_are_no_tags") %></p>
13
13
  <% end %>
14
14
  </div>
15
- <p><%= paginate(@tags, right: "#{t(".next_page")} &raquo;", left: "&laquo; #{t('.previous_page')}") %></p>
15
+ <p><%= paginate @tags %></p>
data/app/views/xml/sitemap.googlesitemap.builder ADDED
@@ -0,0 +1,7 @@
1
+ xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
2
+ xml.urlset 'xmlns' => 'http://www.google.com/schemas/sitemap/0.84' do
3
+ @items.each do |item|
4
+ render "googlesitemap_item_#{item.class.name.to_s.downcase}",
5
+ item: item, xm: xml
6
+ end
7
+ end
data/config/initializers/mime_types.rb CHANGED
@@ -3,4 +3,3 @@
3
3
  # Add new mime types for use in respond_to blocks:
4
4
  # Mime::Type.register "text/richtext", :rtf
5
5
  Mime::Type.register_alias "application/xml", :googlesitemap
6
- Mime::Type.register "application/rsd+xml", :rsd
data/config/locales/da.yml CHANGED
@@ -7,7 +7,6 @@ da:
7
7
  admin: admin
8
8
  dont_lose_the_mail_sent: Don't lose the mail sent at %{email} or you won't be able to login anymore
9
9
  login: Brugernavn %{login}
10
- password: Kodeord %{password}
11
10
  proceed_to: Proceed to %{link}
12
11
  success: You have successfully signed up.
13
12
  create_account: Create an account
@@ -40,11 +39,7 @@ da:
40
39
  allow_comments_status:
41
40
  one: aktiveret
42
41
  zero: disabled
43
- allow_pings_status:
44
- one: aktiveret
45
- zero: disabled
46
- allow_trackbacks: Tillad Trackbacks
47
- allowed_comments_and_trackbacks_html: Comments are %{allow_comment} and trackbacks are %{allow_trackback}
42
+ allowed_comments_html: Comments are %{allow_comment}
48
43
  article_type: Article type
49
44
  cancel: Anuller
50
45
  default: Default
@@ -430,8 +425,6 @@ da:
430
425
  feed_articles: Article excerpts
431
426
  feed_excerpts_only: Show only article excerpts in feed
432
427
  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
428
  or: or
436
429
  publishing_options: Publishing Options
437
430
  status_main_feed: Display statuses in the main feed
@@ -447,15 +440,12 @@ da:
447
440
  comments_filter: Kommentarfilter
448
441
  days: dage
449
442
  disable_comments_after: Deaktiver kommentarer efter
450
- disable_trackbacks_sitewide: Disable trackbacks site-wide
451
443
  enable_comments_by_default: Aktiver kommentarer som standard
452
444
  enable_feedback_moderation: Aktiver feedback moderation
453
445
  enable_recaptcha: Enable reCaptcha
454
446
  enable_spam_protection: Aktiver spam beskyttelse
455
- enable_trackbacks_by_default: Aktiver Trackbacks som standard
456
- explain_disable_trackbacks: Denne indstilling giver dig mulighed for at deaktivere Trackbacks for hver artikel i din blog. Det vil ikke fjerne eksisterende Trackbacks, men det vil forhindre yderligere forsøg på at tilføje Trackbacks overalt på din blog.
457
- explain_feedback_moderation: Du kan slå feedback moderation til for hele bloggen. Hvis du gør dette kommer kommentarer og trackbacks først frem når du har godkendt dem
458
- explain_reject_comments: Publify will automatically reject comments and trackbacks which contain over a certain amount of links in them
447
+ explain_feedback_moderation: Du kan slå feedback moderation til for hele bloggen. Hvis du gør dette kommer kommentarer først frem når du har godkendt dem
448
+ explain_reject_comments: Publify will automatically reject comments which contain over a certain amount of links in them
459
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
460
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
461
451
  feedback: Feedback
@@ -468,7 +458,6 @@ da:
468
458
  set_to_0_to_never_reject_comments: Sæt til 0 for at aldrig forkaste kommentarer
469
459
  spam: Spam
470
460
  spam_protection: Spam beskyttelse
471
- trackbacks: Trackbacks
472
461
  update_settings: Update settings
473
462
  index:
474
463
  allow_users_to_register: Allow users to register
@@ -494,7 +483,6 @@ da:
494
483
  cancel: Anuller
495
484
  display: Vis
496
485
  example: for eksempel
497
- explain: Når du udgiver artikler kan Publify sende trackbacks til de hjemmesider du linker til. Dette bør slåes fra for private blogs da det ellers kan lække privat information til hjemmesider du diskuterer. For offentlige blogs, er der ingen reel mening i at deaktivere dette.
498
486
  image_medium_size: Image medium size
499
487
  image_thumbnail_size: Image thumbnail size
500
488
  latitude_longitude: Breddegrad, længdegrad
@@ -502,12 +490,9 @@ da:
502
490
  or: or
503
491
  publish: Udgiv
504
492
  publish_on_twitter: Publish on Twitter
505
- send_trackbacks: Send trackbacks
506
- trackbacks: Trackbacks
507
493
  twitter_consumer_key: Twitter consumer key
508
494
  twitter_consumer_secret: Twitter consumer secret
509
495
  update_settings: Update settings
510
- urls_to_ping: Webadresser der automatisk pinges
511
496
  write: Skriv
512
497
  your_geoloc: din breddegrad og længdegrad
513
498
  shared:
@@ -642,7 +627,8 @@ da:
642
627
  articles:
643
628
  archives:
644
629
  no_articles_found: Fandt ingen artikler
645
- posted_in: Posted in
630
+ archives_article:
631
+ posted_in: offentliggjort i
646
632
  article:
647
633
  posted_by: Skrevet af
648
634
  article_excerpt:
@@ -679,12 +665,7 @@ da:
679
665
  edit: Rediger
680
666
  leave_a_response: Skriv en kommentar
681
667
  rss_feed: RSS Feed for denne artikel
682
- trackback_uri: Trackback URI
683
668
  trackbacks: Trackbacks
684
- use_the_following_link_to_trackback: Brug følgende link til lave trackback fra din egen side
685
- search:
686
- next_page: Next page
687
- previous_page: Previous page
688
669
  trackback:
689
670
  from: From
690
671
  authors:
@@ -693,9 +674,6 @@ da:
693
674
  contact_information: Contact information
694
675
  jabber: 'Jabber:'
695
676
  msn: 'MSN:'
696
- next_page: Næste side
697
- posted_in: offentliggjort i
698
- previous_page: Forrige side
699
677
  this_author_has_not_published_any_article_yet: This author has not published any article yet
700
678
  twitter: 'Twitter:'
701
679
  web_site: 'Web site:'
@@ -775,16 +753,10 @@ da:
775
753
  designed_by: Designed by %{designed_by}
776
754
  powered_by_html: Powered by %{powered_by}
777
755
  notes:
778
- index:
779
- next_page: Next page
780
- previous_page: Previous page
781
756
  note:
782
757
  view_on_twitter: View on Twitter
783
758
  notice:
784
759
  note_successfully_created: Note was successfully created
785
- pagination:
786
- next_page: Next page
787
- previous_page: Previous page
788
760
  profile:
789
761
  admin: Publify administrator
790
762
  contributor: Contributor
@@ -795,16 +767,15 @@ da:
795
767
  title: Hello World!
796
768
  index:
797
769
  blog_name: Blog name
770
+ password: Kodeord
798
771
  welcome_to_your_blog_setup: Welcome to your blog setup
799
- your_mail: Your email
772
+ your_mail: Din email
800
773
  page:
801
774
  about: About
802
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.
803
776
  tags:
804
777
  index:
805
- next_page: Next page
806
- previous_page: Previous page
807
- there_is_no_tags: There is no tag
778
+ there_are_no_tags: There are no tags
808
779
  time:
809
780
  formats:
810
781
  default: "%m/%d/%Y %H:%M"
data/config/locales/de.yml CHANGED
@@ -7,7 +7,6 @@ de:
7
7
  admin: admin
8
8
  dont_lose_the_mail_sent: Don't lose the mail sent at %{email} or you won't be able to login anymore
9
9
  login: Login
10
- password: Passwort
11
10
  proceed_to: Proceed to %{link}
12
11
  success: You have successfully signed up.
13
12
  create_account: Create an account
@@ -40,11 +39,7 @@ de:
40
39
  allow_comments_status:
41
40
  one: enabled
42
41
  zero: disabled
43
- allow_pings_status:
44
- one: enabled
45
- zero: disabled
46
- allow_trackbacks: Trackbacks erlauben
47
- allowed_comments_and_trackbacks_html: Comments are %{allow_comment} and trackbacks are %{allow_trackback}
42
+ allowed_comments_html: Comments are %{allow_comment}
48
43
  article_type: Article type
49
44
  cancel: Abbrechen
50
45
  default: Default
@@ -430,8 +425,6 @@ de:
430
425
  feed_articles: Article excerpts
431
426
  feed_excerpts_only: Show only article excerpts in feed
432
427
  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
428
  or: or
436
429
  publishing_options: Publishing Options
437
430
  status_main_feed: Display statuses in the main feed
@@ -447,15 +440,12 @@ de:
447
440
  comments_filter: Textfilter für Kommentar
448
441
  days: Tagen
449
442
  disable_comments_after: Kommentare abschalten nach
450
- disable_trackbacks_sitewide: Disable trackbacks site-wide
451
443
  enable_comments_by_default: Kommentare per default erlauben
452
444
  enable_feedback_moderation: Moderation von Kommentaren aktivieren
453
445
  enable_recaptcha: Enable reCaptcha
454
446
  enable_spam_protection: Spamschutz aktivieren
455
- enable_trackbacks_by_default: Trackbacks per default aktivieren
456
- explain_disable_trackbacks: Diese Option erlaubt es Ihnen, Trackbacks für alle Artikel im gesamten Blog zu deaktivieren. Dadurch werden zwar keine bereits existierenden Trackbacks entfernt, aber alle zukünftig irgendwo in Ihrem Blog eintreffenden Trackbacks werden abgewiesen.
457
- explain_feedback_moderation: Sie können die Moderation von Kommentaren auf der gesamten Website aktivieren. Dann erscheinen keine Kommentare oder Trackbacks in Ihrem Blog, die sie nicht überprüft haben
458
- explain_reject_comments: Publify kann automatisch Kommentare und Trackbacks abweisen, die mehr als eine bestimmte Anzahl von Links enthalten
447
+ explain_feedback_moderation: Sie können die Moderation von Kommentaren auf der gesamten Website aktivieren. Dann erscheinen keine Kommentare in Ihrem Blog, die sie nicht überprüft haben
448
+ explain_reject_comments: Publify kann automatisch Kommentare abweisen, die mehr als eine bestimmte Anzahl von Links enthalten
459
449
  explain_spam_protection: Bei Aktivierung des Spamschutzes wird Publify sowohl die IP Adresse des Autors als auch den Inhalt seiner Veröffentlichung gegen lokale und entfernte Blacklisten vergleichen. Gute Abwehr von Spambots
460
450
  explain_spamfiltering_html: Publify kann (optional) den <a href='http://akismet.com'>Akismet</a> Spam-Filterdienst verwenden. Sie müssen sich dort registriert und einen API Key erhalten haben, bevor Sie diesen Dienst nutzen können. Wenn Sie einen solchen Key haben, geben Sie ihn hier ein
461
451
  feedback: Feedback
@@ -468,7 +458,6 @@ de:
468
458
  set_to_0_to_never_reject_comments: Wert 0 bewirkt, dass Kommentare nie abgewiesen werden
469
459
  spam: Spam
470
460
  spam_protection: Spamschutz
471
- trackbacks: Trackbacks
472
461
  update_settings: Update settings
473
462
  index:
474
463
  allow_users_to_register: Allow users to register
@@ -494,7 +483,6 @@ de:
494
483
  cancel: Abbrechen
495
484
  display: Zeige
496
485
  example: Beispiel
497
- explain: Publify kann Trackbacks zu anderen Websites schicken, zu denen Sie in veröffentlichten Artikeln verlinken. Das sollte für private Blogs deaktiviert werden, weil sonst nicht-öffentliche Informationen mit dem Trackback Ping nach außen zu den Seiten gehen, die Sie in Ihren Artikeln diskutieren. Für öffentliche Blogs jedoch besteht kein wirklicher Grund, das zu deaktivieren.
498
486
  image_medium_size: Image medium size
499
487
  image_thumbnail_size: Image thumbnail size
500
488
  latitude_longitude: geografische Breite, Länge
@@ -502,12 +490,9 @@ de:
502
490
  or: or
503
491
  publish: Veröffentlichen
504
492
  publish_on_twitter: Publish on Twitter
505
- send_trackbacks: Trackbacks verschicken
506
- trackbacks: Trackbacks
507
493
  twitter_consumer_key: Twitter consumer key
508
494
  twitter_consumer_secret: Twitter consumer secret
509
495
  update_settings: Update settings
510
- urls_to_ping: Automatisch diese URLs anpingen
511
496
  write: Schreiben
512
497
  your_geoloc: Ihrer geografischen Breite und Länge
513
498
  shared:
@@ -642,7 +627,8 @@ de:
642
627
  articles:
643
628
  archives:
644
629
  no_articles_found: Keine Artikel gefunden
645
- posted_in: Posted in
630
+ archives_article:
631
+ posted_in: posted in
646
632
  article:
647
633
  posted_by: Angelegt von
648
634
  article_excerpt:
@@ -679,12 +665,7 @@ de:
679
665
  edit: Bearbeiten
680
666
  leave_a_response: Einen Kommentar hinterlassen
681
667
  rss_feed: RSS Feed für diesen Artikel
682
- trackback_uri: Trackback URI
683
668
  trackbacks: Trackbacks
684
- use_the_following_link_to_trackback: Verwenden Sie den folgenden Link zur Rückverlinkung von Ihrer eigenen Seite
685
- search:
686
- next_page: Next page
687
- previous_page: Previous page
688
669
  trackback:
689
670
  from: From
690
671
  authors:
@@ -693,9 +674,6 @@ de:
693
674
  contact_information: Contact information
694
675
  jabber: 'Jabber:'
695
676
  msn: 'MSN:'
696
- next_page: Nächste Seite
697
- posted_in: posted in
698
- previous_page: Vorherige Seite
699
677
  this_author_has_not_published_any_article_yet: This author has not published any article yet
700
678
  twitter: 'Twitter:'
701
679
  web_site: 'Web site:'
@@ -775,16 +753,10 @@ de:
775
753
  designed_by: Designed by %{designed_by}
776
754
  powered_by_html: Powered by %{powered_by}
777
755
  notes:
778
- index:
779
- next_page: Next page
780
- previous_page: Previous page
781
756
  note:
782
757
  view_on_twitter: View on Twitter
783
758
  notice:
784
759
  note_successfully_created: Note was successfully created
785
- pagination:
786
- next_page: Next page
787
- previous_page: Previous page
788
760
  profile:
789
761
  admin: Publify administrator
790
762
  contributor: Contributor
@@ -795,6 +767,7 @@ de:
795
767
  title: Hello World!
796
768
  index:
797
769
  blog_name: Blog name
770
+ password: Passwort
798
771
  welcome_to_your_blog_setup: Welcome to your blog setup
799
772
  your_mail: Your email
800
773
  page:
@@ -802,9 +775,7 @@ de:
802
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.
803
776
  tags:
804
777
  index:
805
- next_page: Next page
806
- previous_page: Previous page
807
- there_is_no_tags: There is no tag
778
+ there_are_no_tags: There are no tags
808
779
  time:
809
780
  formats:
810
781
  default: "%m/%d/%Y %H:%M"