From b5db89661a6e581fb385234c2567acc85b5f42c5 Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Sat, 20 Apr 2019 20:44:42 +0200
Subject: [PATCH 1/4] Fix fallback culture before login

---
 src/components/globalize.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/globalize.js b/src/components/globalize.js
index 32b6412a42..c41e885842 100644
--- a/src/components/globalize.js
+++ b/src/components/globalize.js
@@ -127,12 +127,17 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana
 
     function loadStrings(options) {
         var locale = getCurrentLocale();
+        var promises = [];
+        var optionsName;;
         if (typeof options === 'string') {
-            return ensureTranslation(allTranslations[options], locale);
+            optionsName = options;
         } else {
+            optionsName = options.name;
             register(options);
-            return ensureTranslation(allTranslations[options.name], locale);
         }
+        promises.push(ensureTranslation(allTranslations[optionsName], locale));
+        promises.push(ensureTranslation(allTranslations[optionsName], fallbackCulture));
+        return Promise.all(promises);
     }
 
     var cacheParam = new Date().getTime();

From bdbc5682db39182f0e1a355e3fc6557153d36419 Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Sat, 20 Apr 2019 20:48:13 +0200
Subject: [PATCH 2/4] Remove extra semicolon

---
 src/components/globalize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/globalize.js b/src/components/globalize.js
index c41e885842..aa3a2ef0f9 100644
--- a/src/components/globalize.js
+++ b/src/components/globalize.js
@@ -128,7 +128,7 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana
     function loadStrings(options) {
         var locale = getCurrentLocale();
         var promises = [];
-        var optionsName;;
+        var optionsName;
         if (typeof options === 'string') {
             optionsName = options;
         } else {

From 5493667a6c114bcf7ecdaa3d3731e46f2e6b7cb3 Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Sat, 20 Apr 2019 14:52:53 -0400
Subject: [PATCH 3/4] Fix server name input type

url type is too strict for what should be a host name/address
---
 src/addserver.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addserver.html b/src/addserver.html
index a17bbcf729..a5c67ddcee 100644
--- a/src/addserver.html
+++ b/src/addserver.html
@@ -3,7 +3,7 @@
         <form class="manualServerForm" style="margin: 0 auto;">
             <h1 style="text-align: left;">${HeaderConnectToServer}</h1>
             <div class="inputContainer">
-                <input is="emby-input" type="url" id="txtServerHost" required="required" label="${LabelServerHost}" />
+                <input is="emby-input" type="text" id="txtServerHost" required="required" label="${LabelServerHost}" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off" />
                 <div class="fieldDescription" style="text-align: left;">${LabelServerHostHelp}</div>
             </div>
             <br />

From 117614362f7f28b3a9656354a9750ccbc5e9840a Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthony@lavado.ca>
Date: Thu, 25 Apr 2019 01:25:19 -0400
Subject: [PATCH 4/4] Adds recording button back to view

As per @cvium on Matrix, adds the recording button back by changing the selector that makes it visible. Fixes #268.
---
 src/components/recordingcreator/recordingfields.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js
index bb2582320c..a17054cc01 100644
--- a/src/components/recordingcreator/recordingfields.js
+++ b/src/components/recordingcreator/recordingfields.js
@@ -38,7 +38,7 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
         var options = instance.options;
         var apiClient = connectionManager.getApiClient(options.serverId);
 
-        instance.querySelector('.recordingFields').classList.remove('hide');
+        options.parent.querySelector('.recordingFields').classList.remove('hide');
         return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) {
             instance.TimerId = program.TimerId;
             instance.Status = program.Status;
@@ -254,4 +254,4 @@ define(['globalize', 'connectionManager', 'serverNotifications', 'require', 'loa
     };
 
     return RecordingEditor;
-});
\ No newline at end of file
+});