From 5a347f1a00a2cfe27fad2a1a369560dcbca53140 Mon Sep 17 00:00:00 2001
From: Jan Schulz-Hofen <jan@plan.io>
Date: Sat, 17 Dec 2016 13:36:57 +0200
Subject: [PATCH] Default time zone for new users

---
 app/models/user.rb                   | 2 +-
 app/views/settings/_general.html.erb | 2 ++
 config/locales/de.yml                | 1 +
 config/locales/en.yml                | 1 +
 config/locales/fr.yml                | 1 +
 config/locales/ru.yml                | 1 +
 config/locales/sv.yml                | 1 +
 config/settings.yml                  | 2 ++
 8 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 628b0cf..2b72531 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -366,7 +366,7 @@ class User < Principal
   end
 
   def pref
-    self.preference ||= UserPreference.new(:user => self)
+    self.preference ||= UserPreference.new(:user => self, :time_zone => Setting.default_time_zone)
   end
 
   def time_zone
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 23abdb3..03f9d3b 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -27,6 +27,8 @@
 
 <p><%= setting_text_field :feeds_limit, :size => 6 %></p>
 
+<p><%= setting_select :default_time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :blank => :label_none %></p>
+
 <%= call_hook(:view_settings_general_form) %>
 </div>
 
diff --git a/config/locales/de.yml b/config/locales/de.yml
index fbb6f9f..a92284a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -994,6 +994,7 @@ de:
   setting_date_format: Datumsformat
   setting_default_issue_start_date_to_creation_date: Aktuelles Datum als Beginn für neue Tickets verwenden
   setting_default_language: Standardsprache
+  setting_default_time_zone: Standardzeitzone für neue Benutzer
   setting_default_notification_option: Standard Benachrichtigungsoptionen
   setting_default_projects_modules: Standardmäßig aktivierte Module für neue Projekte
   setting_default_projects_public: Neue Projekte sind standardmäßig öffentlich
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 669ea47..4c7132b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -371,6 +371,7 @@ en:
   setting_app_subtitle: Application subtitle
   setting_welcome_text: Welcome text
   setting_default_language: Default language
+  setting_default_time_zone: Default time zone for new users
   setting_login_required: Authentication required
   setting_self_registration: Self-registration
   setting_attachment_max_size: Maximum attachment size
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a55c188..fd05b2b 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -383,6 +383,7 @@ fr:
   setting_app_subtitle: Sous-titre de l'application
   setting_welcome_text: Texte d'accueil
   setting_default_language: Langue par défaut
+  setting_default_time_zone: Fuseau horaire pour nouveaux utilisateurs
   setting_login_required: Authentification obligatoire
   setting_self_registration: Inscription des nouveaux utilisateurs
   setting_attachment_max_size: Taille maximale des fichiers
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 08b8e5b..a73c3e6 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -852,6 +852,7 @@ ru:
   setting_cross_project_issue_relations: Разрешить пересечение задач по проектам
   setting_date_format: Формат даты
   setting_default_language: Язык по умолчанию
+  setting_default_time_zone: Часовой пояс по-умолчанию для новых пользователей
   setting_default_notification_option: Способ оповещения по умолчанию
   setting_default_projects_public: Новые проекты являются общедоступными
   setting_diff_max_lines_displayed: Максимальное число строк для diff
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 32447aa..c595ab0 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -383,6 +383,7 @@ sv:
   setting_app_subtitle: Applikationsunderrubrik
   setting_welcome_text: Välkomsttext
   setting_default_language: Standardspråk
+  setting_default_time_zone: Standardtidzon för nya användare
   setting_login_required: Kräver inloggning
   setting_self_registration: Självregistrering
   setting_attachment_max_size: Maxstorlek på bilaga
diff --git a/config/settings.yml b/config/settings.yml
index 1411a01..f48fa03 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -90,6 +90,8 @@ wiki_compression:
   default: ""
 default_language:
   default: en
+default_time_zone:
+  default: ""
 force_default_language_for_anonymous:
   default: 0
 force_default_language_for_loggedin:
-- 
2.4.0