diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-11-14 10:53:56 +0000 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-11-15 14:29:57 +0000 |
| commit | 9b266d11c6b5082c733f101326160cef797f6edf (patch) | |
| tree | f7bb5d727bfebc9d8e8fd00d96f7d5d01d6e4424 /modules/luci-base/htdocs | |
| parent | dc26e2d037504f3fcd3ce1947770fbce92d48241 (diff) | |
luci-base: Improve change application message
As a native English speaker the luci message displayed when clicking
'Save & Apply' has a somewhat uncomfortable English phrasing of "Waiting
for configuration to get applied". It could be improved by replacing
'get' with 'be' but once you've got that far you might as well replace
this with the shorter & simpler "Applying configuration changes". This
is also technically more correct since luci/openwrt should only be
updating/restarting processes that are related to the changed areas, not
changing the entire configuration.
As a result of that, change both the 'success' and 'rolled back'
messages to "Configuration changes have been applied" & "Configuration
changes have been rolled back"
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'modules/luci-base/htdocs')
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/ui.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js index 2e360410d..1a9504b5d 100644 --- a/modules/luci-base/htdocs/luci-static/resources/ui.js +++ b/modules/luci-base/htdocs/luci-static/resources/ui.js @@ -2562,7 +2562,7 @@ return L.Class.extend({ var call = function(r, data, duration) { if (r.status === 204) { L.ui.changes.displayStatus('warning', [ - E('h4', _('Configuration has been rolled back!')), + E('h4', _('Configuration changes have been rolled back!')), E('p', _('The device could not be reached within %d seconds after applying the pending changes, which caused the configuration to be rolled back for safety reasons. If you believe that the configuration changes are correct nonetheless, perform an unchecked configuration apply. Alternatively, you can dismiss this warning and edit changes before attempting to apply again, or revert all pending changes to keep the currently working configuration state.').format(L.env.apply_rollback)), E('div', { 'class': 'right' }, [ E('button', { @@ -2623,7 +2623,7 @@ return L.Class.extend({ L.ui.changes.setIndicator(0); L.ui.changes.displayStatus('notice', - E('p', _('Configuration has been applied.'))); + E('p', _('Configuration changes applied.'))); window.clearTimeout(tt); window.setTimeout(function() { @@ -2648,7 +2648,7 @@ return L.Class.extend({ var now = Date.now(); L.ui.changes.displayStatus('notice spinning', - E('p', _('Waiting for configuration to get applied… %ds') + E('p', _('Applying configuration changes… %ds') .format(Math.max(Math.floor((deadline - Date.now()) / 1000), 0)))); if (now >= deadline) |