From 6c0f7fc1e7e2237e115a2caa84d53a0712f438c3 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 6 Dec 2017 15:31:27 +0100
Subject: [PATCH] Set locale_default at initial admin creation too.

---
 .../app/controllers/getting_started.coffee    |  3 ++
 ...20171206000001_setting_default_locale2.rb} | 12 +++++-
 db/seeds/settings.rb                          | 39 ++++++++++---------
 3 files changed, 33 insertions(+), 21 deletions(-)
 rename db/migrate/{20171115000001_setting_default_locale.rb => 20171206000001_setting_default_locale2.rb} (65%)

diff --git a/app/assets/javascripts/app/controllers/getting_started.coffee b/app/assets/javascripts/app/controllers/getting_started.coffee
index 8c2fbb71d..db46c9ad7 100644
--- a/app/assets/javascripts/app/controllers/getting_started.coffee
+++ b/app/assets/javascripts/app/controllers/getting_started.coffee
@@ -240,6 +240,9 @@ class Admin extends App.WizardFullScreen
 
   relogin: (data, status, xhr) =>
     @log 'notice', 'relogin:success', data
+    callback = ->
+      App.Setting.set('locale_default', App.i18n.detectBrowserLocale())
+    App.Setting.fetchFull(callback)
     App.Event.trigger 'notify:removeall'
     @navigate 'getting_started/base'
 
diff --git a/db/migrate/20171115000001_setting_default_locale.rb b/db/migrate/20171206000001_setting_default_locale2.rb
similarity index 65%
rename from db/migrate/20171115000001_setting_default_locale.rb
rename to db/migrate/20171206000001_setting_default_locale2.rb
index e91bbfa12..73b0cf1ba 100644
--- a/db/migrate/20171115000001_setting_default_locale.rb
+++ b/db/migrate/20171206000001_setting_default_locale2.rb
@@ -1,13 +1,20 @@
-class SettingDefaultLocale < ActiveRecord::Migration[5.1]
+class SettingDefaultLocale2 < ActiveRecord::Migration[5.1]
   def up
 
     # return if it's a new setup
     return if !Setting.find_by(name: 'system_init_done')
 
+    setting = Setting.find_by(name: 'locale_default')
+    if setting
+      setting.area = 'System::Branding'
+      setting.preferences[:prio] = 8
+      setting.save!
+    end
+
     Setting.create_if_not_exists(
       title: 'Locale',
       name: 'locale_default',
-      area: 'System::Base',
+      area: 'System::Branding',
       description: 'Defines the system default language.',
       options: {
         form: [
@@ -18,6 +25,7 @@ class SettingDefaultLocale < ActiveRecord::Migration[5.1]
       },
       state: 'en-us',
       preferences: {
+        prio: 8,
         controller: 'SettingsAreaItemDefaultLocale',
         permission: ['admin.system'],
       },
diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb
index 281abc6d4..6e6f2272e 100644
--- a/db/seeds/settings.rb
+++ b/db/seeds/settings.rb
@@ -156,6 +156,26 @@ Setting.create_if_not_exists(
   },
   frontend: true
 )
+Setting.create_if_not_exists(
+  title: 'Locale',
+  name: 'locale_default',
+  area: 'System::Branding',
+  description: 'Defines the system default language.',
+  options: {
+    form: [
+      {
+        name: 'locale_default',
+      }
+    ],
+  },
+  state: 'en-us',
+  preferences: {
+    prio: 8,
+    controller: 'SettingsAreaItemDefaultLocale',
+    permission: ['admin.system'],
+  },
+  frontend: true
+)
 Setting.create_or_update(
   title: 'Pretty Date',
   name: 'pretty_date_format',
@@ -183,25 +203,6 @@ Setting.create_or_update(
   state: 'relative',
   frontend: true
 )
-Setting.create_if_not_exists(
-  title: 'Locale',
-  name: 'locale_default',
-  area: 'System::Base',
-  description: 'Defines the system default language.',
-  options: {
-    form: [
-      {
-        name: 'locale_default',
-      }
-    ],
-  },
-  state: 'en-us',
-  preferences: {
-    controller: 'SettingsAreaItemDefaultLocale',
-    permission: ['admin.system'],
-  },
-  frontend: true
-)
 options = {}
 (10..99).each do |item|
   options[item] = item