odania_core 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e89c0f4dc03ebb43f4c90086e465a1d6f3054331
-  data.tar.gz: 800f98632a21f7f5b582d505303b6dc7a2169827
+  metadata.gz: 61ed856180e939491b2083a9b5e74fb1b1bd7798
+  data.tar.gz: 7bd04630e902690fb8ab84a45732037c099f8bc9
 SHA512:
-  metadata.gz: 40bc3e3ec7564d79982c95630b7199620fbbfde93f6a3678196251d62df4c23ae4ed956f3cf37db4feb54d885c5fbb649c3e2cb48f322f3904d0fcb3c42a38f4
-  data.tar.gz: 841e266073e9725022d9935b792a0ca21233ce1659568118b47a682526f7c4a17cc409cf31b7867fd72b42b6c7e0090423f12f1e01dcf49ac279863d9361ca27
+  metadata.gz: 0da684e9a7298c90a391038cecbbb06280ae55370e82aca0f00e15213aad539df683a38562ec902a0f633105934887194335367800f3db1d8e9d835ff08f64da
+  data.tar.gz: 3f47d19dfd36045385b8d7ea3b07919bcddd8b126a90ac5546d167b6a9bc2087ee85017c4176ee517de1488ea51084321a46b047758552fe29b875c8905e9de0

data/app/controllers/odania/menu_controller.rb

@@ -17,6 +17,8 @@ class Odania::MenuController < ApplicationController
 		menu_item = current_menu.default_menu_item unless current_menu.default_menu_item_id.nil?
 		menu_item = current_menu.menu_items.where(parent_id: nil).first if menu_item.nil?
 
+		return render_error(t('No content defined')) if menu_item.nil?
+
 		return redirect_to menu_item.target_data['url'] if 'URL'.eql? menu_item.target_type
 		redirect_to menu_item.get_target_path
 	end

data/app/views/odania/common/internal_server_error.html.erb

@@ -1,3 +1,6 @@
 <h1><%= t('Internal server error') %></h1>
 
 <%= t('An error occurred') %>
+
+<hr/>
+<%= @error_msg %>

data/config/locales/de.yml

@@ -8,3 +8,4 @@ de:
   Tag _tag: "Tag %{tag}"
   Read more: 'Weiter lesen'
   Language: 'Sprache'
+  No content defined: 'Kein Inhalt definiert'

data/config/locales/en.yml

@@ -8,3 +8,4 @@ en:
   Tag _tag: "Tag %{tag}"
   Read more: 'Read more'
   Language: 'Language'
+  No content defined: 'No content defined'

data/lib/odania/filter.rb

@@ -20,7 +20,7 @@ module Odania
 				tags = []
 				html.gsub(/#[a-z0-9\-]*[^< ]/i) do |match|
 					tag = match[1, match.length]
-					filtered_html.gsub!(match, "<a href=\"/tags/#{tag.parameterize}\">#{tag}</a>")
+					filtered_html.gsub!(match, "<a href=\"/#{obj.language.iso_639_1}/tags/#{tag.parameterize}\">#{tag}</a>")
 					tags << tag
 				end
 

data/lib/odania_core/version.rb

@@ -1,3 +1,3 @@
 module OdaniaCore
-	VERSION = '0.0.5'
+	VERSION = '0.0.6'
 end