Merge remote-tracking branch 'mysociety/develop' into rails_xss

1 files changed, 20 insertions, 2 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f9649c868..a946526b8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -54,10 +54,15 @@ class ApplicationController < ActionController::Base
     end
 
     def set_gettext_locale
+        if Configuration::include_default_locale_in_urls == false
+            params_locale = params[:locale] ? params[:locale] : I18n.default_locale
+        else
+            params_locale = params[:locale]
+        end
         if Configuration::use_default_browser_language
-            requested_locale = params[:locale] || session[:locale] || cookies[:locale] || request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale
+            requested_locale = params_locale || session[:locale] || cookies[:locale] || request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale
         else
-            requested_locale = params[:locale] || session[:locale] || cookies[:locale] || I18n.default_locale
+            requested_locale = params_locale || session[:locale] || cookies[:locale] || I18n.default_locale
         end
         requested_locale = FastGettext.best_locale_in(requested_locale)
         session[:locale] = FastGettext.set_locale(requested_locale)
@@ -226,6 +231,19 @@ class ApplicationController < ActionController::Base
         end
     end
 
+    def request_dirs(info_request)
+        first_three_digits = info_request.id.to_s()[0..2]
+        File.join(first_three_digits.to_s, info_request.id.to_s)
+    end
+
+    def request_download_zip_dir(info_request)
+        File.join(download_zip_dir, "download", request_dirs(info_request))
+    end
+
+    def download_zip_dir()
+        File.join(Rails.root, '/cache/zips/')
+    end
+
     # get the local locale
     def locale_from_params(*args)
       if params[:show_locale]