diff --git a/ElectronClient/app/gui/ConfigScreen.jsx b/ElectronClient/app/gui/ConfigScreen.jsx index 3ca2302e6ef..6a305546446 100644 --- a/ElectronClient/app/gui/ConfigScreen.jsx +++ b/ElectronClient/app/gui/ConfigScreen.jsx @@ -5,6 +5,7 @@ const { Setting } = require('lib/models/setting.js'); const { bridge } = require('electron').remote.require('./bridge'); const { Header } = require('./Header.min.js'); const { themeStyle } = require('../theme.js'); +const pathUtils = require('lib/path-utils.js'); const { _ } = require('lib/locale.js'); class ConfigScreenComponent extends React.Component { @@ -146,6 +147,9 @@ class ConfigScreenComponent extends React.Component {
+
+ {_('Notes and settings are stored in: %s', pathUtils.toSystemSlashes(Setting.value('profileDir'), process.platform))} +
{ settingComps } diff --git a/ReactNativeClient/lib/path-utils.js b/ReactNativeClient/lib/path-utils.js index 30e1a82f6b9..ded0507405a 100644 --- a/ReactNativeClient/lib/path-utils.js +++ b/ReactNativeClient/lib/path-utils.js @@ -40,4 +40,9 @@ function safeFileExtension(e) { return e.replace(/[^a-zA-Z0-9]/g, '') } -module.exports = { basename, dirname, filename, isHidden, fileExtension, safeFileExtension }; \ No newline at end of file +function toSystemSlashes(path, os) { + if (os === 'win32') return path.replace(/\//g, "\\"); + return path.replace(/\\/g, "/"); +} + +module.exports = { basename, dirname, filename, isHidden, fileExtension, safeFileExtension, toSystemSlashes }; \ No newline at end of file