From 4e5b00044087b204fbfe74f4073a175767d80721 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Fri, 7 Oct 2016 15:32:04 -0300 Subject: [PATCH] style(GUI): say "eject" instead of "unmount" in Windows (#754) In Windows, if the user unmounts a drive, then the drive becomes inaccessible to the OS. Compare this to UNIX based operating systems, where an unmounted drive is still available for many I/O operations. To prevent confusion, we say "eject" instead of "unmount" when running on Windows, despite "unmount" being the correct way of saying it. See: https://github.com/resin-io/etcher/issues/750 Signed-off-by: Juan Cruz Viotti --- lib/gui/pages/settings/controllers/settings.js | 10 ++++++++++ lib/gui/pages/settings/templates/settings.tpl.html | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/gui/pages/settings/controllers/settings.js b/lib/gui/pages/settings/controllers/settings.js index f221a7f9..5bfee961 100644 --- a/lib/gui/pages/settings/controllers/settings.js +++ b/lib/gui/pages/settings/controllers/settings.js @@ -16,8 +16,18 @@ 'use strict'; +const os = require('os'); + module.exports = function(WarningModalService, SettingsModel) { + /** + * @summary Client platform + * @type String + * @constant + * @public + */ + this.platform = os.platform(); + /** * @summary Refresh current settings * @function diff --git a/lib/gui/pages/settings/templates/settings.tpl.html b/lib/gui/pages/settings/templates/settings.tpl.html index 786315fd..1d888010 100644 --- a/lib/gui/pages/settings/templates/settings.tpl.html +++ b/lib/gui/pages/settings/templates/settings.tpl.html @@ -17,7 +17,16 @@ ng-model="settings.currentData.unmountOnSuccess" ng-change="settings.model.set('unmountOnSuccess', settings.currentData.unmountOnSuccess)"> - Auto-unmount on success + + + + + + + Eject + Auto-unmount + on success +