Commit bbca7da326148b6f1e206e73428c146a2559aa8b

Authored by Andrey Karpikov
1 parent bafdb310

add sitemap

@@ -130,10 +130,11 @@ module Kanjai @@ -130,10 +130,11 @@ module Kanjai
130 end 130 end
131 end 131 end
132 132
133 - def added_to_sitemap?  
134 - lang = I18n.locale.to_s 133 + def added_to_sitemap?(lang)
135 url = self.lang_attributes(lang, :url) 134 url = self.lang_attributes(lang, :url)
136 - url != ":param" 135 + count_contents = page_data.joins(:page_contents).where(lang: lang)
  136 +
  137 + url != ":param" && count_contents.any?
137 end 138 end
138 139
139 def plugin_sitemap_pages 140 def plugin_sitemap_pages
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" 2 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
3 xmlns:xhtml="http://www.w3.org/1999/xhtml"> 3 xmlns:xhtml="http://www.w3.org/1999/xhtml">
4 <% @domain.pages.walk_tree do |page, level| -%> 4 <% @domain.pages.walk_tree do |page, level| -%>
5 - <% if page.added_to_sitemap? -%> 5 + <% if page.added_to_sitemap?(@default_lang) -%>
6 <url> 6 <url>
7 - <loc><%= page.full_url('https://', @default_lang) %></loc>  
8 - <% page.page_data.where.not(lang: @default_lang).pluck(:lang).uniq.each do |lang| -%> 7 + <loc><%= page.full_url('https://', @default_lang) %></loc>
  8 + <% page.page_data.joins(:page_contents).where.not(lang: @default_lang).pluck(:lang).uniq.each do |lang| -%>
9 <% if @alternative_languages.include?(lang) && page.lang_attributes(lang, :url) -%> 9 <% if @alternative_languages.include?(lang) && page.lang_attributes(lang, :url) -%>
10 <xhtml:link rel="alternate" hreflang="<%= lang %>" href="<%= page.full_url('https://', lang) %>" /> 10 <xhtml:link rel="alternate" hreflang="<%= lang %>" href="<%= page.full_url('https://', lang) %>" />
11 <% end %> 11 <% end %>
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.350" 2 + VERSION = "0.0.351"
3 end 3 end