From 0109454a34d58d5fc0b2828c5106486de6a334db Mon Sep 17 00:00:00 2001
From: Albin Larsson <mail@albinlarsson.com>
Date: Mon, 28 May 2018 04:38:08 +0200
Subject: Ensure language is set in case the track is added after
 initialization, and trigger languagechange event when language is initially
 set

---
 src/js/controls.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/js/controls.js')

diff --git a/src/js/controls.js b/src/js/controls.js
index c76bd66b..32e82f78 100644
--- a/src/js/controls.js
+++ b/src/js/controls.js
@@ -883,13 +883,10 @@ const controls = {
                 'language',
                 track.label,
                 track.language !== 'enabled' ? controls.createBadge.call(this, track.language.toUpperCase()) : null,
-                track.language.toLowerCase() === this.captions.language.toLowerCase(),
+                track.language.toLowerCase() === this.language,
             );
         });
 
-        // Store reference
-        this.options.captions = tracks.map(track => track.language);
-
         controls.updateSetting.call(this, type, list);
     },
 
-- 
cgit v1.2.3


From 1c1668bfc344a21e2039527f70034ba4ecb68dfd Mon Sep 17 00:00:00 2001
From: Philip Giuliani <philip.giuliani@keepinmind.info>
Date: Wed, 30 May 2018 14:55:48 +0200
Subject: Implement translation support for qualityName and qualityBadge

---
 src/js/controls.js | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

(limited to 'src/js/controls.js')

diff --git a/src/js/controls.js b/src/js/controls.js
index 32e82f78..72b752c1 100644
--- a/src/js/controls.js
+++ b/src/js/controls.js
@@ -664,27 +664,7 @@ const controls = {
 
         // Get the badge HTML for HD, 4K etc
         const getBadge = quality => {
-            let label = '';
-
-            switch (quality) {
-                case 2160:
-                    label = '4K';
-                    break;
-
-                case 1440:
-                case 1080:
-                case 720:
-                    label = 'HD';
-                    break;
-
-                case 576:
-                case 480:
-                    label = 'SD';
-                    break;
-
-                default:
-                    break;
-            }
+            const label = i18n.get(`qualityBadge.${quality}`, this.config);
 
             if (!label.length) {
                 return null;
@@ -708,7 +688,6 @@ const controls = {
     },
 
     // Translate a value into a nice label
-    // TODO: Localisation
     getLabel(setting, value) {
         switch (setting) {
             case 'speed':
@@ -716,7 +695,13 @@ const controls = {
 
             case 'quality':
                 if (utils.is.number(value)) {
-                    return `${value}p`;
+                    const qualityName = i18n.get(`qualityName.${value}`, this.config);
+
+                    if (!qualityName.length) {
+                        return `${value}p`;
+                    }
+
+                    return qualityName;
                 }
 
                 return utils.toTitleCase(value);
-- 
cgit v1.2.3


From 56668f58b6284e63f2874120cf7e1747b868d2b0 Mon Sep 17 00:00:00 2001
From: Philip Giuliani <philip.giuliani@keepinmind.info>
Date: Thu, 31 May 2018 14:40:56 +0200
Subject: Rename qualityName to label

---
 src/js/controls.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/js/controls.js')

diff --git a/src/js/controls.js b/src/js/controls.js
index 72b752c1..20518f9c 100644
--- a/src/js/controls.js
+++ b/src/js/controls.js
@@ -695,13 +695,13 @@ const controls = {
 
             case 'quality':
                 if (utils.is.number(value)) {
-                    const qualityName = i18n.get(`qualityName.${value}`, this.config);
+                    const label = i18n.get(`qualityLabel.${value}`, this.config);
 
-                    if (!qualityName.length) {
+                    if (!label.length) {
                         return `${value}p`;
                     }
 
-                    return qualityName;
+                    return label;
                 }
 
                 return utils.toTitleCase(value);
-- 
cgit v1.2.3