mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

globalization fix

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-12 16:16:33 -05:00
parent 64354206a0
commit ac5697b240
8 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-behaviors/.bower.json vendored
View file

@ -29,14 +29,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-behaviors", "homepage": "https://github.com/PolymerElements/iron-behaviors",
"_release": "1.0.12", "_release": "1.0.12",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.12", "tag": "v1.0.12",
"commit": "657f526a2382a659cdf4e13be87ecc89261588a3" "commit": "657f526a2382a659cdf4e13be87ecc89261588a3"
}, },
"_source": "git://github.com/polymerelements/iron-behaviors.git", "_source": "git://github.com/PolymerElements/iron-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-behaviors" "_originalSource": "PolymerElements/iron-behaviors"
} }

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View file

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"homepage": "https://github.com/PolymerElements/iron-meta", "homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
}, },
"_source": "git://github.com/PolymerElements/iron-meta.git", "_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta" "_originalSource": "polymerelements/iron-meta"
} }

4
dashboard-ui/bower_components/paper-material/.bower.json vendored
View file

@ -37,7 +37,7 @@
"tag": "v1.0.4", "tag": "v1.0.4",
"commit": "05f3800d37f8c5cad63ac2cf279f01bffb7d4fe8" "commit": "05f3800d37f8c5cad63ac2cf279f01bffb7d4fe8"
}, },
"_source": "git://github.com/PolymerElements/paper-material.git", "_source": "git://github.com/polymerelements/paper-material.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-material" "_originalSource": "polymerelements/paper-material"
} }

6
dashboard-ui/bower_components/paper-ripple/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/paper-ripple", "homepage": "https://github.com/polymerelements/paper-ripple",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
}, },
"_source": "git://github.com/PolymerElements/paper-ripple.git", "_source": "git://github.com/polymerelements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-ripple" "_originalSource": "polymerelements/paper-ripple"
} }

3
dashboard-ui/scripts/device.js
View file

@ -44,8 +44,7 @@
CameraUploadPath: $('#txtUploadPath', page).val() CameraUploadPath: $('#txtUploadPath', page).val()
}), }),
contentType: "application/json", contentType: "application/json"
dataType: 'json'
}).then(Dashboard.processServerConfigurationUpdateResult); }).then(Dashboard.processServerConfigurationUpdateResult);
} }

34
dashboard-ui/scripts/globalize.js
View file

@ -35,16 +35,9 @@
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', requestUrl, true); xhr.open('GET', requestUrl, true);
xhr.onload = function (e) { var onError = function () {
Logger.log('Globalize response status: ' + this.status); Logger.log('Dictionary not found. Reverting to english');
if (this.status < 400) {
dictionaries[url] = JSON.parse(this.response);
resolve();
} else {
// Grab the english version // Grab the english version
var xhr2 = new XMLHttpRequest(); var xhr2 = new XMLHttpRequest();
@ -56,9 +49,24 @@
}; };
xhr2.send(); xhr2.send();
};
xhr.onload = function (e) {
Logger.log('Globalize response status: ' + this.status);
if (this.status < 400) {
dictionaries[url] = JSON.parse(this.response);
resolve();
} else {
onError();
} }
}; };
xhr.onerror = onError;
xhr.send(); xhr.send();
}); });
} }
@ -67,7 +75,6 @@
function setCulture(value) { function setCulture(value) {
Logger.log('Setting culture to ' + value); Logger.log('Setting culture to ' + value);
currentCulture = value; currentCulture = value;
return Promise.all([loadDictionary('html', value), loadDictionary('javascript', value)]); return Promise.all([loadDictionary('html', value), loadDictionary('javascript', value)]);
@ -115,14 +122,11 @@
Logger.log('Entering Globalize.ensure'); Logger.log('Entering Globalize.ensure');
return new Promise(function (resolve, reject) { return getDeviceCulture().then(function (culture) {
getDeviceCulture().then(function (culture) {
culture = normalizeLocaleName(culture || 'en-US'); culture = normalizeLocaleName(culture || 'en-US');
setCulture(culture).then(resolve); return setCulture(culture);
});
}); });
} }

4
dashboard-ui/scripts/sync.js
View file

@ -76,8 +76,12 @@
function renderForm(options) { function renderForm(options) {
return new Promise(function (resolve, reject) {
require(['paper-checkbox', 'paper-input'], function () { require(['paper-checkbox', 'paper-input'], function () {
renderFormInternal(options); renderFormInternal(options);
resolve();
});
}); });
} }

9
dashboard-ui/scripts/syncjob.js
View file

@ -23,8 +23,9 @@
dialogOptionsFn: getTargetDialogOptionsFn(dialogOptions), dialogOptionsFn: getTargetDialogOptionsFn(dialogOptions),
showName: true, showName: true,
readOnlySyncTarget: true readOnlySyncTarget: true
}); }).then(function () {
fillJobValues(page, job, dialogOptions); fillJobValues(page, job, dialogOptions);
});
} }
function getTargetDialogOptionsFn(dialogOptions) { function getTargetDialogOptionsFn(dialogOptions) {
@ -267,7 +268,11 @@
function fillJobValues(page, job, editOptions) { function fillJobValues(page, job, editOptions) {
$('#txtSyncJobName', page).val(job.Name); var txtSyncJobName = page.querySelector('#txtSyncJobName');
if (txtSyncJobName) {
txtSyncJobName.value = job.Name;
}
$('#selectProfile', page).val(job.Profile || '').trigger('change'); $('#selectProfile', page).val(job.Profile || '').trigger('change');
$('#selectQuality', page).val(job.Quality || '').trigger('change'); $('#selectQuality', page).val(job.Quality || '').trigger('change');
$('#chkUnwatchedOnly', page).checked(job.UnwatchedOnly); $('#chkUnwatchedOnly', page).checked(job.UnwatchedOnly);