Skip to content

luci-mod-status: use localized time #8014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
systemcrash merged 4 commits into from
Oct 20, 2025
Merged

luci-mod-status: use localized time #8014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4f13fc
luci-mod-status: use localized time
AndyChiang888 Oct 15, 2025
f12ab2f
luci-mod-system: use localized time
AndyChiang888 Oct 15, 2025
1d44986
luci-mod-dashboard: use localized time
AndyChiang888 Oct 15, 2025
ba98cae
luci-theme-bootstrap: add width for localtime
AndyChiang888 Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
'require fs';
'require rpc';
'require network';
'require uci';

var callSystemBoard = rpc.declare({
object: 'system',
Expand All @@ -14,6 +15,12 @@ var callSystemInfo = rpc.declare({
method: 'info'
});

var callGetUnixtime = rpc.declare({
object: 'luci',
method: 'getUnixtime',
expect: { result: 0 }
});

return baseclass.extend({

params: [],
Expand All @@ -23,7 +30,9 @@ return baseclass.extend({
network.getWANNetworks(),
network.getWAN6Networks(),
L.resolveDefault(callSystemBoard(), {}),
L.resolveDefault(callSystemInfo(), {})
L.resolveDefault(callSystemInfo(), {}),
L.resolveDefault(callGetUnixtime(), 0),
uci.load('system')
]);
},

Expand Down Expand Up @@ -298,20 +307,22 @@ return baseclass.extend({

const boardinfo = data[2];
const systeminfo = data[3];
const unixtime = data[4];

let datestr = null;

if (systeminfo.localtime) {
const date = new Date(systeminfo.localtime * 1000);

datestr = '%04d-%02d-%02d %02d:%02d:%02d'.format(
date.getUTCFullYear(),
date.getUTCMonth() + 1,
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCSeconds()
);
if (unixtime) {
const date = new Date(unixtime * 1000);
const zn = uci.get('system', '@system[0]', 'zonename')?.replaceAll(' ', '_') || 'UTC';
const ts = uci.get('system', '@system[0]', 'clock_timestyle');
const hc = uci.get('system', '@system[0]', 'clock_hourcycle');

datestr = new Intl.DateTimeFormat(undefined, {
dateStyle: 'medium',
timeStyle: (ts == 0) ? 'long' : 'full',
hourCycle: hc,
timeZone: zn
}).format(date);
}

this.params.router = {
Expand Down
1 change: 1 addition & 0 deletions modules/luci-mod-dashboard/root/usr/share/rpcd/acl.d/luci-mod-dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"ubus": {
"file": [ "list", "read" ],
"luci": [ "getUnixtime" ],
"system": [ "board", "info" ]
}
}
Expand Down
35 changes: 23 additions & 12 deletions modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
'require baseclass';
'require fs';
'require rpc';
'require uci';

var callGetUnixtime = rpc.declare({
object: 'luci',
method: 'getUnixtime',
expect: { result: 0 }
});

var callLuciVersion = rpc.declare({
object: 'luci',
Expand All @@ -25,30 +32,34 @@ return baseclass.extend({
return Promise.all([
L.resolveDefault(callSystemBoard(), {}),
L.resolveDefault(callSystemInfo(), {}),
L.resolveDefault(callLuciVersion(), { revision: _('unknown version'), branch: 'LuCI' })
L.resolveDefault(callLuciVersion(), { revision: _('unknown version'), branch: 'LuCI' }),
L.resolveDefault(callGetUnixtime(), 0),
uci.load('system')
]);
},

render: function(data) {
var boardinfo = data[0],
systeminfo = data[1],
luciversion = data[2];
luciversion = data[2],
unixtime = data[3];

luciversion = luciversion.branch + ' ' + luciversion.revision;

var datestr = null;

if (systeminfo.localtime) {
var date = new Date(systeminfo.localtime * 1000);
if (unixtime) {
var date = new Date(unixtime * 1000),
zn = uci.get('system', '@system[0]', 'zonename')?.replaceAll(' ', '_') || 'UTC',
ts = uci.get('system', '@system[0]', 'clock_timestyle'),
hc = uci.get('system', '@system[0]', 'clock_hourcycle');

datestr = '%04d-%02d-%02d %02d:%02d:%02d'.format(
date.getUTCFullYear(),
date.getUTCMonth() + 1,
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCSeconds()
);
datestr = new Intl.DateTimeFormat(undefined, {
dateStyle: 'medium',
timeStyle: (ts == 0) ? 'long' : 'full',
hourCycle: hc,
timeZone: zn
}).format(date);
}

var fields = [
Expand Down
2 changes: 1 addition & 1 deletion modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"/www/luci-static/resources/view/status/include": [ "list" ]
},
"ubus": {
"luci": [ "getVersion" ],
"luci": [ "getVersion", "getUnixtime" ],
"file": [ "list", "read" ],
"system": [ "board", "info" ]
}
Expand Down
47 changes: 28 additions & 19 deletions modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'require tools.widgets as widgets';

var callRcList, callRcInit, callTimezone,
callGetLocaltime, callSetLocaltime, CBILocalTime;
callGetUnixtime, callSetLocaltime, CBILocalTime;

callRcList = rpc.declare({
object: 'rc',
Expand All @@ -29,10 +29,10 @@ callRcInit = rpc.declare({
expect: { result: false }
});

callGetLocaltime = rpc.declare({
object: 'system',
method: 'info',
expect: { localtime: 0 }
callGetUnixtime = rpc.declare({
object: 'luci',
method: 'getUnixtime',
expect: { result: 0 }
});

callSetLocaltime = rpc.declare({
Expand All @@ -49,16 +49,17 @@ callTimezone = rpc.declare({
});

function formatTime(epoch) {
var date = new Date(epoch * 1000);

return '%04d-%02d-%02d %02d:%02d:%02d'.format(
date.getUTCFullYear(),
date.getUTCMonth() + 1,
date.getUTCDate(),
date.getUTCHours(),
date.getUTCMinutes(),
date.getUTCSeconds()
);
var date = new Date(epoch * 1000),
zn = uci.get('system', '@system[0]', 'zonename')?.replaceAll(' ', '_') || 'UTC',
ts = uci.get('system', '@system[0]', 'clock_timestyle'),
hc = uci.get('system', '@system[0]', 'clock_hourcycle');

return new Intl.DateTimeFormat(undefined, {
dateStyle: 'medium',
timeStyle: (ts == 0) ? 'long' : 'full',
hourCycle: hc,
timeZone: zn
}).format(date);
}

CBILocalTime = form.DummyValue.extend({
Expand Down Expand Up @@ -97,7 +98,7 @@ return view.extend({
return Promise.all([
callRcList('sysntpd'),
callTimezone(),
callGetLocaltime(),
callGetUnixtime(),
uci.load('luci'),
uci.load('system')
]);
Expand All @@ -106,7 +107,7 @@ return view.extend({
render: function(rpc_replies) {
var ntpd_enabled = rpc_replies[0],
timezones = rpc_replies[1],
localtime = rpc_replies[2],
unixtime = rpc_replies[2],
m, s, o;

m = new form.Map('system',
Expand All @@ -129,7 +130,7 @@ return view.extend({
*/

o = s.taboption('general', CBILocalTime, '_systime', _('Local Time'));
o.cfgvalue = function() { return localtime };
o.cfgvalue = function() { return unixtime };
o.ntpd_support = ntpd_enabled;

o = s.taboption('general', form.Value, 'hostname', _('Hostname'));
Expand All @@ -155,6 +156,14 @@ return view.extend({
uci.set('system', section_id, 'timezone', tz);
};

o = s.taboption('general', form.Flag, 'clock_timestyle', _('Full TimeZone Name'), _('Unchecked means the timezone offset (E.g. GMT+1) is displayed'));
o.default = o.enabled;

o = s.taboption('general', form.ListValue, 'clock_hourcycle', _('Time Format'));
o.value('', _('Default'));
o.value('h12', _('12-Hour Clock'));
o.value('h23', _('24-Hour Clock'));

/*
* Logging
*/
Expand Down Expand Up @@ -309,7 +318,7 @@ return view.extend({

return m.render().then(function(mapEl) {
poll.add(function() {
return callGetLocaltime().then(function(t) {
return callGetUnixtime().then(function(t) {
mapEl.querySelector('#localtime').value = formatTime(t);
});
});
Expand Down
5 changes: 2 additions & 3 deletions modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
"description": "Grant access to system configuration",
"read": {
"ubus": {
"luci": [ "getLEDs", "getTimezones", "getUSBDevices" ],
"rc": [ "list" ],
"system": [ "info" ]
"luci": [ "getLEDs", "getTimezones", "getUSBDevices", "getUnixtime" ],
"rc": [ "list" ]
},
"uci": [ "luci", "system" ]
},
Expand Down
6 changes: 6 additions & 0 deletions themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,12 @@ select,
border-radius: 3px;
}

@media screen and (min-width: 768px) {
#localtime {
width: 300px;
}
}

input,
select,
.cbi-select,
Expand Down