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 @@

${HeaderConnectToServer}

- +
${LabelServerHostHelp}

diff --git a/src/components/globalize.js b/src/components/globalize.js index 32b6412a42..aa3a2ef0f9 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(); 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 +});