Merge pull request #2745 from AlchemyCMS/backport/7.0-stable/pr-2689

[7.0-stable] Merge pull request #2689 from robinboening/fix_switching_to_default_language

app/controllers/alchemy/admin/languages_controller.rb

@@ -38,7 +38,8 @@ def destroy
       end
 
       def switch
-        set_alchemy_language(params[:language_id])
+        @language = set_alchemy_language(params[:language_id])
+        session[:alchemy_language_id] = @language.id
         do_redirect_to request.referer || alchemy.admin_dashboard_path
       end
 

app/controllers/concerns/alchemy/admin/current_language.rb

@@ -12,7 +12,11 @@ module CurrentLanguage
       private
 
       def load_current_language
-        @current_language = Alchemy::Language.current
+        @current_language = if session[:alchemy_language_id].present?
+          set_alchemy_language(session[:alchemy_language_id])
+        else
+          Alchemy::Language.current
+        end
         if @current_language.nil?
           flash[:warning] = Alchemy.t("Please create a language first.")
           redirect_to admin_languages_path

lib/alchemy/controller_actions.rb

@@ -59,17 +59,15 @@ def set_current_alchemy_site
       Site.current = current_alchemy_site
     end
 
-    # Try to find and stores current language for Alchemy.
+    # Sets the current language for Alchemy.
     #
     def set_alchemy_language(lang = nil)
       @language = if lang
         lang.is_a?(Language) ? lang : load_alchemy_language_from_id_or_code(lang)
       else
-        # find the best language and remember it for later
-        load_alchemy_language_from_params ||
-          load_alchemy_language_from_session ||
-          Language.default
+        load_alchemy_language_from_params || Language.default
       end
+
       store_current_alchemy_language(@language)
     end
 
@@ -80,26 +78,15 @@ def load_alchemy_language_from_params
       end
     end
 
-    # Load language from session if it's present on current site.
-    # Otherwise return nil so we can load the default language from current site.
-    def load_alchemy_language_from_session
-      if session[:alchemy_language_id].present? && Site.current
-        Site.current.languages.find_by(id: session[:alchemy_language_id])
-      end
-    end
-
     def load_alchemy_language_from_id_or_code(id_or_code)
       Language.find_by(id: id_or_code) ||
         Language.find_by_code(id_or_code)
     end
 
-    # Stores language's id in the session.
-    #
-    # Also stores language in +Language.current+
+    # Stores language in +Language.current+
     #
     def store_current_alchemy_language(language)
       if language&.id
-        session[:alchemy_language_id] = language.id
         Language.current = language
       end
     end

spec/controllers/alchemy/pages_controller_spec.rb

@@ -213,11 +213,6 @@ module Alchemy
           end
 
           context "with no lang parameter present" do
-            it "should store defaults language id in the session." do
-              get :show, params: {urlname: page.urlname}
-              expect(controller.session[:alchemy_language_id]).to eq(Language.default.id)
-            end
-
             it "should store default language as class var." do
               get :show, params: {urlname: page.urlname}
               expect(Language.current).to eq(Language.default)

spec/helpers/alchemy/base_helper_spec.rb

@@ -72,7 +72,6 @@ module Alchemy
 
         context "of an existing page" do
           it "should return the page object" do
-            session[:alchemy_language_id] = page.language_id
             expect(helper.page_or_find(page.page_layout)).to eq(page)
           end
         end

spec/libraries/controller_actions_spec.rb

@@ -64,24 +64,24 @@
       RequestStore.store[:alchemy_current_language] = nil
     end
 
-    context "with a Language argument" do
-      it "should set the language to the passed Language instance" do
+    context "with a Language object given" do
+      it "should set the language to the Language instance" do
         controller.send :set_alchemy_language, klingon
         expect(assigns(:language)).to eq(klingon)
         expect(Alchemy::Language.current).to eq(klingon)
       end
     end
 
-    context "with a language id argument" do
-      it "should set the language to the language specified by the passed id" do
+    context "with a language id given" do
+      it "should find and set the language by the id" do
         controller.send :set_alchemy_language, klingon.id
         expect(assigns(:language)).to eq(klingon)
         expect(Alchemy::Language.current).to eq(klingon)
       end
     end
 
-    context "with a language code argument" do
-      it "should set the language to the language specified by the passed code" do
+    context "with a locale given" do
+      it "should find and set the language by the locale" do
         controller.send :set_alchemy_language, klingon.code
         expect(assigns(:language)).to eq(klingon)
         expect(Alchemy::Language.current).to eq(klingon)
@@ -94,55 +94,6 @@
         controller.send :set_alchemy_language
         expect(assigns(:language)).to eq(default_language)
         expect(Alchemy::Language.current).to eq(default_language)
-        expect(controller.session).to include_language_information_for(default_language)
-      end
-    end
-
-    context "with language in the session" do
-      before do
-        allow(controller).to receive(:session).and_return(alchemy_language_id: klingon.id)
-      end
-
-      it "should use the language from the session" do
-        controller.send :set_alchemy_language
-        expect(assigns(:language)).to eq(klingon)
-        expect(Alchemy::Language.current).to eq(klingon)
-      end
-
-      context "if no current site exists" do
-        before do
-          expect(Alchemy::Site).to receive(:current).exactly(:twice) { nil }
-        end
-
-        it "should set the default language" do
-          controller.send :set_alchemy_language
-
-          expect(assigns(:language)).to eq(default_language)
-          expect(Alchemy::Language.current).to eq(default_language)
-        end
-      end
-
-      context "if the language is not on the current site" do
-        let(:french_site) do
-          create(:alchemy_site, host: "french.fr")
-        end
-
-        let(:french_language) do
-          create(:alchemy_language, site: french_site, code: :fr)
-        end
-
-        before do
-          expect(controller).to receive(:session).at_least(:once) do
-            {alchemy_language_id: french_language.id}
-          end
-        end
-
-        it "should set the default language" do
-          controller.send :set_alchemy_language
-
-          expect(assigns(:language)).to eq(default_language)
-          expect(Alchemy::Language.current).to eq(default_language)
-        end
       end
     end
 
@@ -152,7 +103,6 @@
         controller.send :set_alchemy_language
         expect(assigns(:language)).to eq(klingon)
         expect(Alchemy::Language.current).to eq(klingon)
-        expect(controller.session).to include_language_information_for(klingon)
       end
 
       context "for language that does not exist" do