3 files changed, 17 insertions, 3 deletions
diff --git a/app/Template/user/edit.php b/app/Template/user/edit.php
index 68b264ec..43171d29 100644
--- a/app/Template/user/edit.php
+++ b/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 ?>
diff --git a/app/Template/user/new.php b/app/Template/user/new.php
index a720d1a1..1413bd3d 100644
--- a/app/Template/user/new.php
+++ b/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">
diff --git a/app/Template/user/show.php b/app/Template/user/show.php
index f65be260..490d8fb3 100644
--- a/app/Template/user/show.php
+++ b/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('Email:') ?> <strong><?= $this->e($user['email']) ?></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('Name:') ?> <strong><?= $this->e($user['name']) ?: t('None') ?></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('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>