Allow users to override the timezone and the language

app/Auth/Database.php

@@ -33,7 +33,7 @@ class Database extends Base
         $user = $this->db->table(User::TABLE)->eq('username', $username)->eq('is_ldap_user', 0)->findOne();
 
         if ($user && password_verify($password, $user['password'])) {
-            $this->user->updateSession($user);
+            $this->userSession->refresh($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
             return true;
         }

app/Auth/GitHub.php

@@ -35,7 +35,7 @@ class GitHub extends Base
         $user = $this->user->getByGitHubId($github_id);
 
         if ($user) {
-            $this->user->updateSession($user);
+            $this->userSession->refresh($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
             return true;
         }

app/Auth/Google.php

@@ -36,7 +36,7 @@ class Google extends Base
         $user = $this->user->getByGoogleId($google_id);
 
         if ($user) {
-            $this->user->updateSession($user);
+            $this->userSession->refresh($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
             return true;
         }

app/Auth/Ldap.php

@@ -54,7 +54,7 @@ class Ldap extends Base
             }
 
             // We open the session
-            $this->user->updateSession($user);
+            $this->userSession->refresh($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
 
             return true;

app/Auth/RememberMe.php

@@ -101,7 +101,7 @@ class RememberMe extends Base
                 );
 
                 // Create the session
-                $this->user->updateSession($this->user->getById($record['user_id']));
+                $this->userSession->refresh($this->user->getById($record['user_id']));
 
                 $this->container['dispatcher']->dispatch(
                     'auth.success',

app/Auth/ReverseProxy.php

@@ -37,7 +37,7 @@ class ReverseProxy extends Base
                 $user = $this->user->getByUsername($login);
             }
 
-            $this->user->updateSession($user);
+            $this->userSession->refresh($user);
             $this->container['dispatcher']->dispatch('auth.success', new AuthEvent(self::AUTH_NAME, $user['id']));
 
             return true;

app/Console/Base.php

@@ -16,6 +16,7 @@ use Symfony\Component\Console\Command\Command;
  * @property \Model\ProjectPermission      $projectPermission
  * @property \Model\ProjectAnalytic        $projectAnalytic
  * @property \Model\ProjectDailySummary    $projectDailySummary
+ * @property \Model\SubtaskExport          $subtaskExport
  * @property \Model\Task                   $task
  * @property \Model\TaskExport             $taskExport
  * @property \Model\TaskFinder             $taskFinder

app/Controller/User.php

@@ -151,6 +151,8 @@ class User extends Base
     public function create(array $values = array(), array $errors = array())
     {
         $this->response->html($this->template->layout('user/new', array(
+            'timezones' => $this->config->getTimezones(true),
+            'languages' => $this->config->getLanguages(true),
             'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
             'projects' => $this->project->getList(),
             'errors' => $errors,
@@ -194,6 +196,8 @@ class User extends Base
         $this->response->html($this->layout('user/show', array(
             'projects' => $this->projectPermission->getAllowedProjects($user['id']),
             'user' => $user,
+            'timezones' => $this->config->getTimezones(true),
+            'languages' => $this->config->getLanguages(true),
         )));
     }
 
@@ -358,6 +362,8 @@ class User extends Base
             'errors' => $errors,
             'projects' => $this->projectPermission->filterProjects($this->project->getList(), $user['id']),
             'user' => $user,
+            'timezones' => $this->config->getTimezones(true),
+            'languages' => $this->config->getLanguages(true),
         )));
     }
 

app/Core/Translator.php

@@ -181,5 +181,8 @@ class Translator
         if (file_exists($filename)) {
             self::$locales = require $filename;
         }
+        else {
+            self::$locales = array();
+        }
     }
 }

app/Locale/da_DK/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/de_DE/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/es_ES/translations.php

@@ -453,7 +453,7 @@ return array(
     'Notifications:' => 'Notificaciones:',
     // 'Notifications' => '',
     'Group:' => 'Grupo:',
-    'Regular user' => 'Usuario regular:',
+    'Regular user' => 'Usuario regular',
     'Account type:' => 'Tipo de Cuenta:',
     'Edit profile' => 'Editar perfil',
     'Change password' => 'Cambiar contraseña',
@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/fi_FI/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/fr_FR/translations.php

@@ -644,4 +644,7 @@ return array(
     'Subtasks exportation for "%s"' => 'Exportation des sous-tâches pour le projet « %s »',
     'Task Title' => 'Titre de la tâche',
     'Untitled' => 'Sans nom',
+    'Application default' => 'Valeur par défaut de l\'application',
+    'Language:' => 'Langue :',
+    'Timezone:' => 'Fuseau horaire :',
 );

app/Locale/hu_HU/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/it_IT/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/ja_JP/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/pl_PL/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/pt_BR/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/ru_RU/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/sv_SE/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/th_TH/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Locale/zh_CN/translations.php

@@ -644,4 +644,7 @@ return array(
     // 'Subtasks exportation for "%s"' => '',
     // 'Task Title' => '',
     // 'Untitled' => '',
+    // 'Application default' => '',
+    // 'Language:' => '',
+    // 'Timezone:' => '',
 );

app/Model/Config.php

@@ -25,24 +25,32 @@ class Config extends Base
      * Get available timezones
      *
      * @access public
+     * @param  boolean   $prepend  Prepend a default value
      * @return array
      */
-    public function getTimezones()
+    public function getTimezones($prepend = false)
     {
         $timezones = timezone_identifiers_list();
-        return array_combine(array_values($timezones), $timezones);
+        $listing = array_combine(array_values($timezones), $timezones);
+
+        if ($prepend) {
+            return array('' => t('Application default')) + $listing;
+        }
+
+        return $listing;
     }
 
     /**
      * Get available languages
      *
      * @access public
+     * @param  boolean   $prepend  Prepend a default value
      * @return array
      */
-    public function getLanguages()
+    public function getLanguages($prepend = false)
     {
         // Sorted by value
-        return array(
+        $languages = array(
             'da_DK' => 'Dansk',
             'de_DE' => 'Deutsch',
             'en_US' => 'English',
@@ -59,6 +67,12 @@ class Config extends Base
             'ja_JP' => '日本語',
             'th_TH' => 'ไทย',
         );
+
+        if ($prepend) {
+            return array('' => t('Application default')) + $languages;
+        }
+
+        return $languages;
     }
 
     /**
@@ -138,10 +152,11 @@ class Config extends Base
      */
     public function setupTranslations()
     {
-        $language = $this->get('application_language', 'en_US');
+        if ($this->userSession->isLogged() && ! empty($this->session['user']['language'])) {
-
+            Translator::load($this->session['user']['language']);
-        if ($language !== 'en_US') {
+        }
-            Translator::load($language);
+        else {
+            Translator::load($this->get('application_language', 'en_US'));
         }
     }
 
@@ -152,8 +167,13 @@ class Config extends Base
      */
     public function setupTimezone()
     {
+        if ($this->userSession->isLogged() && ! empty($this->session['user']['timezone'])) {
+            date_default_timezone_set($this->session['user']['timezone']);
+        }
+        else {
             date_default_timezone_set($this->get('application_timezone', 'UTC'));
         }
+    }
 
     /**
      * Optimize the Sqlite database

app/Model/User.php

@@ -254,7 +254,7 @@ class User extends Base
 
         // If the user is connected refresh his session
         if (Session::isOpen() && $this->userSession->getId() == $values['id']) {
-            $this->updateSession();
+            $this->userSession->refresh();
         }
 
         return $result;
@@ -294,30 +294,6 @@ class User extends Base
         });
     }
 
-    /**
-     * Update user session information
-     *
-     * @access public
-     * @param  array  $user  User data
-     */
-    public function updateSession(array $user = array())
-    {
-        if (empty($user)) {
-            $user = $this->getById($this->userSession->getId());
-        }
-
-        if (isset($user['password'])) {
-            unset($user['password']);
-        }
-
-        $user['id'] = (int) $user['id'];
-        $user['default_project_id'] = (int) $user['default_project_id'];
-        $user['is_admin'] = (bool) $user['is_admin'];
-        $user['is_ldap_user'] = (bool) $user['is_ldap_user'];
-
-        $this->session['user'] = $user;
-    }
-
     /**
      * Common validation rules
      *

app/Model/UserSession.php

@@ -2,6 +2,8 @@
 
 namespace Model;
 
+use Core\Translator;
+
 /**
  * User Session
  *
@@ -10,6 +12,30 @@ namespace Model;
  */
 class UserSession extends Base
 {
+    /**
+     * Update user session information
+     *
+     * @access public
+     * @param  array  $user  User data
+     */
+    public function refresh(array $user = array())
+    {
+        if (empty($user)) {
+            $user = $this->user->getById($this->userSession->getId());
+        }
+
+        if (isset($user['password'])) {
+            unset($user['password']);
+        }
+
+        $user['id'] = (int) $user['id'];
+        $user['default_project_id'] = (int) $user['default_project_id'];
+        $user['is_admin'] = (bool) $user['is_admin'];
+        $user['is_ldap_user'] = (bool) $user['is_ldap_user'];
+
+        $this->session['user'] = $user;
+    }
+
     /**
      * Return true if the logged user is admin
      *

app/Schema/Mysql.php

@@ -5,7 +5,13 @@ namespace Schema;
 use PDO;
 use Core\Security;
 
-const VERSION = 40;
+const VERSION = 41;
+
+function version_41($pdo)
+{
+    $pdo->exec('ALTER TABLE users ADD COLUMN timezone VARCHAR(50)');
+    $pdo->exec('ALTER TABLE users ADD COLUMN language CHAR(5)');
+}
 
 function version_40($pdo)
 {

app/Schema/Postgres.php

@@ -5,7 +5,13 @@ namespace Schema;
 use PDO;
 use Core\Security;
 
-const VERSION = 21;
+const VERSION = 22;
+
+function version_22($pdo)
+{
+    $pdo->exec('ALTER TABLE users ADD COLUMN timezone VARCHAR(50)');
+    $pdo->exec('ALTER TABLE users ADD COLUMN language CHAR(5)');
+}
 
 function version_21($pdo)
 {

app/Schema/Sqlite.php

@@ -5,7 +5,13 @@ namespace Schema;
 use Core\Security;
 use PDO;
 
-const VERSION = 39;
+const VERSION = 40;
+
+function version_40($pdo)
+{
+    $pdo->exec('ALTER TABLE users ADD COLUMN timezone TEXT');
+    $pdo->exec('ALTER TABLE users ADD COLUMN language TEXT');
+}
 
 function version_39($pdo)
 {

app/Template/user/edit.php

@@ -20,6 +20,12 @@
     <?= $this->formLabel(t('Default project'), 'default_project_id') ?>
     <?= $this->formSelect('default_project_id', $projects, $values, $errors) ?><br/>
 
+    <?= $this->formLabel(t('Timezone'), 'timezone') ?>
+    <?= $this->formSelect('timezone', $timezones, $values, $errors) ?><br/>
+
+    <?= $this->formLabel(t('Language'), 'language') ?>
+    <?= $this->formSelect('language', $languages, $values, $errors) ?><br/>
+
     <?php if ($this->userSession->isAdmin()): ?>
         <?= $this->formCheckbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?><br/>
     <?php endif ?>

app/Template/user/new.php

@@ -27,6 +27,12 @@
         <?= $this->formLabel(t('Default project'), 'default_project_id') ?>
         <?= $this->formSelect('default_project_id', $projects, $values, $errors) ?><br/>
 
+        <?= $this->formLabel(t('Timezone'), 'timezone') ?>
+        <?= $this->formSelect('timezone', $timezones, $values, $errors) ?><br/>
+
+        <?= $this->formLabel(t('Language'), 'language') ?>
+        <?= $this->formSelect('language', $languages, $values, $errors) ?><br/>
+
         <?= $this->formCheckbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
 
         <div class="form-actions">

app/Template/user/show.php

@@ -3,9 +3,11 @@
 </div>
 <ul class="listing">
     <li><?= t('Username:') ?> <strong><?= $this->e($user['username']) ?></strong></li>
-    <li><?= t('Name:') ?> <strong><?= $this->e($user['name']) ?></strong></li>
+    <li><?= t('Name:') ?> <strong><?= $this->e($user['name']) ?: t('None') ?></strong></li>
-    <li><?= t('Email:') ?> <strong><?= $this->e($user['email']) ?></strong></li>
+    <li><?= t('Email:') ?> <strong><?= $this->e($user['email']) ?: t('None') ?></strong></li>
-    <li><?= t('Default project:') ?> <strong><?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? $this->e($projects[$user['default_project_id']]) : t('None'); ?></strong></li>
+    <li><?= t('Default project:') ?> <strong><?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? $this->e($projects[$user['default_project_id']]) : t('None') ?></strong></li>
+    <li><?= t('Timezone:') ?> <strong><?= $this->inList($user['timezone'], $timezones) ?></strong></li>
+    <li><?= t('Language:') ?> <strong><?= $this->inList($user['language'], $languages) ?></strong></li>
     <li><?= t('Notifications:') ?> <strong><?= $user['notifications_enabled'] == 1 ? t('Enabled') : t('Disabled') ?></strong></li>
     <li><?= t('Group:') ?> <strong><?= $user['is_admin'] ? t('Administrator') : t('Regular user') ?></strong></li>
     <li><?= t('Account type:') ?> <strong><?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?></strong></li>

tests/units/TaskPermissionTest.php

@@ -9,6 +9,7 @@ use Model\TaskPermission;
 use Model\Project;
 use Model\Category;
 use Model\User;
+use Model\UserSession;
 
 class TaskPermissionTest extends Base
 {
@@ -19,6 +20,7 @@ class TaskPermissionTest extends Base
         $tp = new TaskPermission($this->container);
         $p = new Project($this->container);
         $u = new User($this->container);
+        $us = new UserSession($this->container);
 
         $this->assertNotFalse($u->create(array('username' => 'toto', 'password' => '123456')));
         $this->assertNotFalse($u->create(array('username' => 'toto2', 'password' => '123456')));
@@ -31,7 +33,7 @@ class TaskPermissionTest extends Base
         // User #1 can remove everything
         $user = $u->getbyId(1);
         $this->assertNotEmpty($user);
-        $u->updateSession($user);
+        $us->refresh($user);
 
         $task = $tf->getbyId(1);
         $this->assertNotEmpty($task);
@@ -40,7 +42,7 @@ class TaskPermissionTest extends Base
         // User #2 can't remove the task #1
         $user = $u->getbyId(2);
         $this->assertNotEmpty($user);
-        $u->updateSession($user);
+        $us->refresh($user);
 
         $task = $tf->getbyId(1);
         $this->assertNotEmpty($task);
@@ -49,7 +51,7 @@ class TaskPermissionTest extends Base
         // User #1 can remove everything
         $user = $u->getbyId(1);
         $this->assertNotEmpty($user);
-        $u->updateSession($user);
+        $us->refresh($user);
 
         $task = $tf->getbyId(2);
         $this->assertNotEmpty($task);
@@ -58,7 +60,7 @@ class TaskPermissionTest extends Base
         // User #2 can remove his own task
         $user = $u->getbyId(2);
         $this->assertNotEmpty($user);
-        $u->updateSession($user);
+        $us->refresh($user);
 
         $task = $tf->getbyId(2);
         $this->assertNotEmpty($task);
@@ -67,7 +69,7 @@ class TaskPermissionTest extends Base
         // User #1 can remove everything
         $user = $u->getbyId(1);
         $this->assertNotEmpty($user);
-        $u->updateSession($user);
+        $us->refresh($user);
 
         $task = $tf->getbyId(3);
         $this->assertNotEmpty($task);
@@ -76,7 +78,7 @@ class TaskPermissionTest extends Base
         // User #2 can't remove the task #3
         $user = $u->getbyId(2);
         $this->assertNotEmpty($user);
-        $u->updateSession($user);
+        $us->refresh($user);
 
         $task = $tf->getbyId(3);
         $this->assertNotEmpty($task);
@@ -85,7 +87,7 @@ class TaskPermissionTest extends Base
         // User #1 can remove everything
         $user = $u->getbyId(1);
         $this->assertNotEmpty($user);
-        $u->updateSession($user);
+        $us->refresh($user);
 
         $task = $tf->getbyId(4);
         $this->assertNotEmpty($task);
@@ -94,7 +96,7 @@ class TaskPermissionTest extends Base
         // User #2 can't remove the task #4
         $user = $u->getbyId(2);
         $this->assertNotEmpty($user);
-        $u->updateSession($user);
+        $us->refresh($user);
 
         $task = $tf->getbyId(4);
         $this->assertNotEmpty($task);