Languages

Author: veganstraightedge

app/controllers/sitemap_controller.rb

@@ -46,8 +46,10 @@ def show
     # To Change Everything (TCE)
     @to_change_everything_languages = TO_CHANGE_EVERYTHING_LANGUAGES
 
+    # languages
+    @locales = languages
+
     # TODO: extract to show view + _url partial
-    # add_languages
     # add_tools
   end
 
@@ -89,20 +91,13 @@ def add_tools
   end
 
   # languages
-  def add_languages
-    language_url = [root_url, :languages].join '/'
-    @urls << sitemap_url.new(language_url, @last_modified)
-
+  def languages
     Locale.live.each do |locale|
       unicode_url = language_url locale: locale.name.downcase.tr(' ', '-')
       slug_url    = language_url locale: locale.slug.to_sym
       english_url = language_url locale: locale.name_in_english.downcase.tr(' ', '-')
 
-      urls = [unicode_url, slug_url, english_url].uniq
-
-      urls.each do |url|
-        @urls << sitemap_url.new(url, @last_modified)
-      end
+      [unicode_url, slug_url, english_url].uniq
     end
   end
 

app/views/sitemap/show.xml.erb

@@ -8,6 +8,31 @@
         xmlns:pagemap='http://www.google.com/schemas/sitemap-pagemap/1.0'
         xmlns:xhtml='http://www.w3.org/1999/xhtml'
         xsi:schemaLocation='http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd'>
+  <%# @urls.each do |url| %>
+    <%#= render 'sitemap/url', loc: url.loc, lastmod: url.lastmod %>
+  <%# end %>
+
+  <%# language pages %>
+  <%= render 'sitemap/url', loc: languages_url, lastmod: @last_modified %>
+
+  <% Locale.live.each do |locale| %>
+    <%
+    unicode_url = language_url locale: locale.name.downcase.tr(' ', '-')
+    slug_url    = language_url locale: locale.slug.to_sym
+    english_url = language_url locale: locale.name_in_english.downcase.tr(' ', '-')
+
+    urls = [unicode_url, slug_url, english_url].uniq
+    %>
+
+    <% urls.each do |url| %>
+      <%= render 'sitemap/url', loc: url, lastmod: @last_modified %>
+    <% end %>
+  <% end %>
+
+
+
+  <% if false %>
+
 
   <%= cache @last_modified do %>
     <%# homepage %>
@@ -69,11 +94,5 @@
   <% end %>
 
 
-  <% if false %>
-
-  <%# @urls.each do |url| %>
-    <%#= render 'sitemap/url', loc: url.loc, lastmod: url.lastmod %>
-  <%# end %>
-
   <% end %>
 </urlset>