diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-04-27 10:18:48 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-04-27 10:18:48 +0100 |
| commit | a7d0d25b323d9ca7f31405482f9462570e0cbeaf (patch) | |
| tree | 644b8f34e0ca59ae0262c1a936ab65b737b0fcc4 /app | |
| parent | 3a18daf0b880ad9f7ee3591c3c777edfd5688b34 (diff) | |
| parent | 6df23e10dfbf3351d3953f99062d46253b5ec94a (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/raw_email.rb | 2 | ||||
| -rw-r--r-- | app/views/user/show.rhtml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0508abe76..0ec8e206e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -178,7 +178,7 @@ class ApplicationController < ActionController::Base end def foi_fragment_cache_path(param) - path = File.join(RAILS_ROOT, 'cache', 'views', foi_fragment_cache_part_path(param)) + path = File.join(Rails.root, 'cache', 'views', foi_fragment_cache_part_path(param)) max_file_length = 255 - 35 # we subtract 35 because tempfile # adds on a variable number of # characters diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb index 3e12a6feb..1feb9c70b 100644 --- a/app/models/raw_email.rb +++ b/app/models/raw_email.rb @@ -27,7 +27,7 @@ class RawEmail < ActiveRecord::Base def directory request_id = self.incoming_message.info_request.id.to_s if ENV["RAILS_ENV"] == "test" - return File.join(RAILS_ROOT, 'files/raw_email_test') + return File.join(Rails.root, 'files/raw_email_test') else return File.join(MySociety::Config.get('RAW_EMAILS_LOCATION', 'files/raw_emails'), diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 8f1803442..bb509ec51 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -139,7 +139,7 @@ <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> <% if @page == 1 %> - <h2 class="foi_results" id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> <%= @match_phrase %> + <h2 class="foi_results" id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> <%= @match_phrase %> </h2> <p><%= @is_you ? _('You have made no Freedom of Information requests using this site.') : _('This person has made no Freedom of Information requests using this site.') %> <%= @page_desc %> |