symphonia 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcbc8cd072e8954ef37d0d33d6e496f2c6bf0a3d7c248ac6d91597962efd5f7f
-  data.tar.gz: 7e6723dc2fada4ac259d8d9c940b6316c0f484b303e9cbcb310ec882744a1112
+  metadata.gz: ae951ba3f4d9edc28e15cb11be9e6a628d95ce1d80cc4022a21d44086779e35d
+  data.tar.gz: c2ed368b149863d442869dceb77c55d881938a332a12f468634f787067dd0b92
 SHA512:
-  metadata.gz: 8e3c9d3d7d059afa8bcb300b7416b10c7b1d084b3a367f1c8d272a4967831bb16812a2aca71edd78e0d88617f87993cf8d1a96bec5db72687c16d19d204e939d
-  data.tar.gz: 7e653165f5f73e584899aba6b4a92b3cb7ee03f5bb42d43e2c186e39cd38308f9abe86639efca96cd7998669bd1f77f9346f3d6fb87ae4c24d0c79dcd33d970c
+  metadata.gz: b9e4194530a7fd978ede0d8585f50d79126af0bacefa0bdf9c08a26071588e8ad340c550ab6663c8692eca46122574ee7a8c3f6662cb857017a77a8307756af0
+  data.tar.gz: 8c20a79fb3f1bf3de2d7a615aa1970440513cd663e6bd0132e822ffa5d1d2c30c5985456e6304f1d62725c5200ea464f61656a479b53cbcbe774435aa9c45372

data/app/models/symphonia/user.rb

@@ -152,6 +152,10 @@ module Symphonia
       def persistence_token
         nil
       end
+
+      def language
+        Symphonia.config.default_locale || I18n.default_locale
+      end
     end
 
   end

data/lib/symphonia/controller_extensions.rb

@@ -74,8 +74,9 @@ module Symphonia
     # private
 
     def set_locale
-      client_lang = params.fetch(:locale, nil).presence || session[:locale].presence || request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten
-      @client_lang = Array(client_lang).detect { |l| I18n.available_locales.include?(l.to_sym) }
+      client_lang = Array(params.fetch(:locale, nil).presence || session[:locale].presence || request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten)
+      client_lang.unshift current_user.language if current_user.language
+      @client_lang = client_lang.detect { |l| I18n.available_locales.include?(l.to_sym) }
 
       I18n.locale = (@client_lang || I18n.default_locale)
       session[:locale] = I18n.locale

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake