From 812e07b7347bc9d9a212b0204af1d90c92ee0c13 Mon Sep 17 00:00:00 2001 From: Albin Larsson Date: Mon, 28 May 2018 07:43:37 +0200 Subject: [PATCH] Replace browser language detection in defaults.js with explicit 'auto' option --- readme.md | 2 +- src/js/captions.js | 6 +++++- src/js/defaults.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index e925152f..46747960 100644 --- a/readme.md +++ b/readme.md @@ -303,7 +303,7 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke | `invertTime` | Boolean | `true` | Display the current time as a countdown rather than an incremental counter. | | `toggleInvert` | Boolean | `true` | Allow users to click to toggle the above. | | `listeners` | Object | `null` | Allows binding of event listeners to the controls before the default handlers. See the `defaults.js` for available listeners. If your handler prevents default on the event (`event.preventDefault()`), the default handler will not fire. | -| `captions` | Object | `{ active: false, language: browser language, update: false }` | `active`: Toggles if captions should be active by default. `language`: Sets the default language to load (if available). `update`: Listen to changes to tracks and update menu. This is needed for some streaming libraries, but can result in unselectable language options). | +| `captions` | Object | `{ active: false, language: `'auto'`, update: false }` | `active`: Toggles if captions should be active by default. `language`: Sets the default language to load (if available). 'auto' uses the browser language. `update`: Listen to changes to tracks and update menu. This is needed for some streaming libraries, but can result in unselectable language options). | | `fullscreen` | Object | `{ enabled: true, fallback: true, iosNative: false }` | `enabled`: Toggles whether fullscreen should be enabled. `fallback`: Allow fallback to a full-window solution. `iosNative`: whether to use native iOS fullscreen when entering fullscreen (no custom controls) | | `ratio` | String | `16:9` | The aspect ratio you want to use for embedded players. | | `storage` | Object | `{ enabled: true, key: 'plyr' }` | `enabled`: Allow use of local storage to store user settings. `key`: The key name to use. | diff --git a/src/js/captions.js b/src/js/captions.js index f62b2d4f..f8083b65 100644 --- a/src/js/captions.js +++ b/src/js/captions.js @@ -88,7 +88,11 @@ const captions = { // Set language if it hasn't been set already if (!this.language) { - this.language = this.storage.get('language') || (this.config.captions.language || '').toLowerCase(); + let { language } = this.config.captions; + if (language === 'auto') { + [ language ] = (navigator.language || navigator.userLanguage).split('-'); + } + this.language = this.storage.get('language') || (language || '').toLowerCase(); } // Toggle the class hooks diff --git a/src/js/defaults.js b/src/js/defaults.js index dc8785d5..977a77e7 100644 --- a/src/js/defaults.js +++ b/src/js/defaults.js @@ -115,7 +115,7 @@ const defaults = { // Captions settings captions: { active: false, - language: (navigator.language || navigator.userLanguage).split('-')[0], + language: 'auto', // Listen to new tracks added after Plyr is initialized. // This is needed for streaming captions, but may result in unselectable options update: false,