diff options
| author | David Cabo <david@calibea.com> | 2011-09-26 13:51:56 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-09-26 13:51:56 +0200 |
| commit | a4b7dd4fc7eb766752213bd6fb5243d9a340e7e5 (patch) | |
| tree | 003905e67f987ea4bc22d7661e6961900dc30a7c | |
| parent | da6cb921342fdd57d5a7dee6a3beaa1dc2d543f2 (diff) | |
Add locale parameter to blog URL when fetching posts. Fixes #197
| -rw-r--r-- | app/controllers/general_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/general/blog.rhtml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 55abea3b7..0bd9ac87a 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', '') + @feed_url = "#{MySociety::Config.get('BLOG_FEED', '')}?lang=#{self.locale_from_params()}" if not feed_url.empty? - content = open(feed_url).read + 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 diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml index 834676f82..98636a653 100644 --- a/app/views/general/blog.rhtml +++ b/app/views/general/blog.rhtml @@ -4,8 +4,8 @@ <div id="right_column"> <div class="act_link"> <h2><%= _("Stay up to date") %></h2> - <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>"><%= _("Follow us on twitter") %></a><br/><br/> - <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>"><%= _("Subscribe to blog") %></a> + <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.twitter.com/<%= @twitter_user %>"><%= _("Follow us on twitter") %></a><br/><br/> + <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= @feed_url %>"><%= _("Subscribe to blog") %></a> </div> <div id="twitter"> <script src="http://widgets.twimg.com/j/2/widget.js"></script> |