From 9a5bd8a8460b7424b8be763f8605e2cb17ef69dd Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Wed, 31 Mar 2021 14:42:10 +0200 Subject: [PATCH] Use 24h time instead of 12h to avoid localization requirement --- src/views/backups.js | 10 ++-------- src/views/settings.js | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/views/backups.js b/src/views/backups.js index d0d65c8f5..6714f6e5c 100644 --- a/src/views/backups.js +++ b/src/views/backups.js @@ -132,14 +132,8 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat { name: 'Saturday', value: 6 }, ]; - $scope.cronHours = [ - { name: 'Midnight', value: 0 }, { name: '1 AM', value: 1 }, { name: '2 AM', value: 2 }, { name: '3 AM', value: 3 }, - { name: '4 AM', value: 4 }, { name: '5 AM', value: 5 }, { name: '6 AM', value: 6 }, { name: '7 AM', value: 7 }, - { name: '8 AM', value: 8 }, { name: '9 AM', value: 9 }, { name: '10 AM', value: 10 }, { name: '11 AM', value: 11 }, - { name: 'Noon', value: 12 }, { name: '1 PM', value: 13 }, { name: '2 PM', value: 14 }, { name: '3 PM', value: 15 }, - { name: '4 PM', value: 16 }, { name: '5 PM', value: 17 }, { name: '6 PM', value: 18 }, { name: '7 PM', value: 19 }, - { name: '8 PM', value: 20 }, { name: '9 PM', value: 21 }, { name: '10 PM', value: 22 }, { name: '11 PM', value: 23 } - ]; + // generates 24h time sets (instead of american 12h) to avoid having to translate everything to locales eg. 12:00 + $scope.cronHours = Array.from({ length: 24 }).map(function (v, i) { return { name: (i < 10 ? '0' : '') + i + ':00', value: i }; }); $scope.formats = [ { name: 'Tarball (zipped)', value: 'tgz' }, diff --git a/src/views/settings.js b/src/views/settings.js index bd6e043a5..2f84422d7 100644 --- a/src/views/settings.js +++ b/src/views/settings.js @@ -25,14 +25,8 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca { name: 'Saturday', value: 6 }, ]; - $scope.cronHours = [ - { name: 'Midnight', value: 0 }, { name: '1 AM', value: 1 }, { name: '2 AM', value: 2 }, { name: '3 AM', value: 3 }, - { name: '4 AM', value: 4 }, { name: '5 AM', value: 5 }, { name: '6 AM', value: 6 }, { name: '7 AM', value: 7 }, - { name: '8 AM', value: 8 }, { name: '9 AM', value: 9 }, { name: '10 AM', value: 10 }, { name: '11 AM', value: 11 }, - { name: 'Noon', value: 12 }, { name: '1 PM', value: 13 }, { name: '2 PM', value: 14 }, { name: '3 PM', value: 15 }, - { name: '4 PM', value: 16 }, { name: '5 PM', value: 17 }, { name: '6 PM', value: 18 }, { name: '7 PM', value: 19 }, - { name: '8 PM', value: 20 }, { name: '9 PM', value: 21 }, { name: '10 PM', value: 22 }, { name: '11 PM', value: 23 } - ]; + // generates 24h time sets (instead of american 12h) to avoid having to translate everything to locales eg. 12:00 + $scope.cronHours = Array.from({ length: 24 }).map(function (v, i) { return { name: (i < 10 ? '0' : '') + i + ':00', value: i }; }); $scope.registryConfigProviders = [ { name: 'AWS', value: 'aws' },