alchemy_cms 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cee9559837fa4a7f082aaef25d8ad9d0b60f97deeb95abe7c5e02be7e0b1c51
-  data.tar.gz: '0933e0f1400f3518d7092129e532583ea4846da5c20043185a2025dcd4f335b2'
+  metadata.gz: d15084caa39f27fd7e147a1b8a084703ac45296d8a07eb4beff76b112eefdb0e
+  data.tar.gz: aa0a0ce5aefb6e4ec8f515ce32dfc4318aa0c4fd0890dcf645e20e848f8a47cb
 SHA512:
-  metadata.gz: cba619e0c9801e3ad568efaeeea2f1a6d28184da08f53aeeb60481f257c9e3dbe56555720f779e3dbb6def2b036c9584b46d765d241016a4b23d1fe398933d5b
-  data.tar.gz: 64f673911a078cadc30bdeb6cd0be0c7245feac2b2822efab375abe26ef7bcc32b0eea1736199b4ed09cd57b36be080de84621bc85f4c861c277f66a1de2d78c
+  metadata.gz: 838e6dabcd215deca170a9a521bd65e409edfe450486c675234c42b49de5303fcdbfb16b842a1fab81e3dd322efcb25176e7f52f6e1b81baa4f910ab873fc02d
+  data.tar.gz: 6e0e0db13cc814a9956402df065b513858d94e46677ccbe37435b69dd522d096137416d3c75692e990b412d35a01ddb9f95d5aa0a6763c21080a2b3e5509c34f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.2.2 (2019-08-13)
+
+- Fallback to default locale if unavailable locale requested  [#1610](https://github.com/AlchemyCMS/alchemy_cms/pull/1610) ([mamhoff](https://github.com/mamhoff))
+
 ## 4.2.1 (2019-08-08)
 
 - Use strings as JSON root keys in API controllers [#1602](https://github.com/AlchemyCMS/alchemy_cms/pull/1602) ([tvdeyen](https://github.com/tvdeyen))

data/lib/alchemy/admin/locale.rb

@@ -28,7 +28,7 @@ module Alchemy
 
       # Checks if we need to change to locale or not.
       def locale_change_needed?
-        params[:admin_locale].present? || session[:alchemy_locale].blank?
+        params[:admin_locale].present? || session[:alchemy_locale].blank? || available_locale.nil?
       end
 
       # Returns either the most preferred locale that is within the list of available locales or nil

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.2.1"
+  VERSION = "4.2.2"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers