Skip to content
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.

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

Move locale doc to command line switches #11863

Merged
merged 4 commits into from Feb 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions docs/api/app.md
Expand Up @@ -530,12 +530,6 @@ Returns `String` - The current application locale. Possible return values are do

**Note:** On Windows you have to call it after the `ready` events gets emitted.

### `app.setLocale(locale)`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What became of this method?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm, I see: #11469 (comment)


* `locale` String

Set the locale of the app (must be called before the `ready` event).

### `app.addRecentDocument(path)` _macOS_ _Windows_

* `path` String
Expand Down
4 changes: 4 additions & 0 deletions docs/api/chrome-command-line-switches.md
Expand Up @@ -28,6 +28,10 @@ Disables the disk cache for HTTP requests.

Disable HTTP/2 and SPDY/3.1 protocols.

## --lang

Set a custom locale.

## --inspect=`port` and --inspect-brk=`port`

Debug-related flags, see the [Debugging the Main Process][debugging-main-process] guide for details.
Expand Down
19 changes: 0 additions & 19 deletions spec/api-app-spec.js
Expand Up @@ -112,25 +112,6 @@ describe('app module', () => {
})
})

describe('app.setLocale()', () => {
const testLocale = (locale, result, done) => {
const appPath = path.join(__dirname, 'fixtures', 'api', 'locale-check')
const electronPath = remote.getGlobal('process').execPath
let output = ''
let appProcess = ChildProcess.spawn(electronPath, [appPath, `--lang=${locale}`])

appProcess.stdout.on('data', (data) => { output += data })
appProcess.stdout.on('end', () => {
output = output.replace(/(\r\n|\n|\r)/gm, '')
assert.equal(output, result)
done()
})
}

it('should set the locale', (done) => testLocale('fr', 'fr', done))
it('should not set an invalid locale', (done) => testLocale('asdfkl', 'en-US', done))
})

describe('app.isInApplicationsFolder()', () => {
before(function () {
if (process.platform !== 'darwin') {
Expand Down
22 changes: 22 additions & 0 deletions spec/chromium-spec.js
Expand Up @@ -4,6 +4,7 @@ const http = require('http')
const path = require('path')
const ws = require('ws')
const url = require('url')
const ChildProcess = require('child_process')
const {ipcRenderer, remote} = require('electron')
const {closeWindow} = require('./window-helpers')

Expand All @@ -26,6 +27,27 @@ describe('chromium feature', () => {
listener = null
})

describe('command line switches', () => {
describe('--lang switch', () => {
const testLocale = (locale, result, done) => {
const appPath = path.join(__dirname, 'fixtures', 'api', 'locale-check')
const electronPath = remote.getGlobal('process').execPath
let output = ''
let appProcess = ChildProcess.spawn(electronPath, [appPath, `--lang=${locale}`])

appProcess.stdout.on('data', (data) => { output += data })
appProcess.stdout.on('end', () => {
output = output.replace(/(\r\n|\n|\r)/gm, '')
assert.equal(output, result)
done()
})
}

it('should set the locale', (done) => testLocale('fr', 'fr', done))
it('should not set an invalid locale', (done) => testLocale('asdfkl', 'en-US', done))
})
})

afterEach(() => closeWindow(w).then(() => { w = null }))

describe('heap snapshot', () => {
Expand Down