diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2017-11-12 13:06:15 +0300 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2018-06-27 14:19:50 +0300 |
| commit | 0cacdd3132d7f82801038efd5117e1629c97e749 (patch) | |
| tree | 7d1a3de79b4cb6a6e44cfc7a4b4190f53f927270 /settings | |
| parent | fd41192bb45947f56304d465c2266f168eb6036b (diff) | |
show locale example and apply new locale right away
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.scss | 4 | ||||
| -rw-r--r-- | settings/js/settings/personalInfo.js | 10 | ||||
| -rw-r--r-- | settings/templates/settings/personal/personal.info.php | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 0ca3a96360b..3770a30b466 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -124,6 +124,10 @@ select { } } +#localeexample { + text-align: center; +} + input { &#pass1, &#pass2, diff --git a/settings/js/settings/personalInfo.js b/settings/js/settings/personalInfo.js index aad2311a700..2f7e1c386b5 100644 --- a/settings/js/settings/personalInfo.js +++ b/settings/js/settings/personalInfo.js @@ -312,7 +312,7 @@ $(document).ready(function () { value: selectedLocale }, success: function() { - location.reload(); + moment.locale(selectedLocale); }, fail: function() { OC.Notification.showTemporary(t('settings', 'An error occured while changing your locale. Please reload the page and try again.')); @@ -441,4 +441,12 @@ $(document).ready(function () { }, user.displayName); }); +window.setInterval(function() { + $('#localeexample-time').text(moment().format('LTS')); + $('#localeexample-date').text(moment().format('L')); + $('#localeexample-fdow').text(t('settings', 'Week starts on {fdow}', + {fdow: moment().weekday(0).format('dddd')})); + +}, 1000); + OC.Settings.updateAvatar = updateAvatar; diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php index 83530222f3e..b3952803abb 100644 --- a/settings/templates/settings/personal/personal.info.php +++ b/settings/templates/settings/personal/personal.info.php @@ -366,6 +366,11 @@ vendor_style('jcrop/css/jquery.Jcrop'); </option> <?php endforeach;?> </select> + <div id="localeexample"> + <p id="localeexample-time"></p> + <p id="localeexample-date"></p> + <p id="localeexample-fdow"></p> + </div> </form> <?php } ?> </div> |