aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-10-10 13:21:22 +0100
committerSeb Bacon <seb.bacon@gmail.com>2011-10-10 13:21:22 +0100
commit189c7c80c9e56d09d8dd441a924d687aa2b9ed5e (patch)
tree8aac4844a602458276b8d61f8482b31bae865d67 /app/controllers/general_controller.rb
parent247a24cde3954b7f7b3cbb2e3b624669b6e6e61d (diff)
parentf6b93d8cb5fbe4e4d2c96bf732f76102d54ce9cd (diff)
Merge branch 'release/0.4' into develop
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 55abea3b7..194a1cec0 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -70,13 +70,13 @@ class GeneralController < ApplicationController
def blog
medium_cache
@feed_autodetect = []
- feed_url = MySociety::Config.get('BLOG_FEED', '')
- if not feed_url.empty?
- content = open(feed_url).read
+ @feed_url = "#{MySociety::Config.get('BLOG_FEED', '')}?lang=#{self.locale_from_params()}"
+ if not @feed_url.empty?
+ content = open(@feed_url).read
@data = XmlSimple.xml_in(content)
@channel = @data['channel'][0]
@blog_items = @channel['item']
- @feed_autodetect = [{:url => feed_url, :title => "#{site_name} blog"}]
+ @feed_autodetect = [{:url => @feed_url, :title => "#{site_name} blog"}]
else
@blog_items = []
end