From 7b0bd883f67bf46e87222504cfa020e5314dd217 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 4 Jun 2014 15:39:16 -0400 Subject: [PATCH] localize more terms --- dashboard-ui/collections.html | 4 ++-- dashboard-ui/edititemmetadata.html | 2 ++ dashboard-ui/livetvchannels.html | 9 +++++---- dashboard-ui/movies.html | 4 ++-- dashboard-ui/scripts/chromecast.js | 5 +++-- dashboard-ui/scripts/editcollectionitems.js | 8 ++++---- dashboard-ui/scripts/livetvchannels.js | 6 +++--- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index b99435bb92..cc7775fd70 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -29,7 +29,7 @@

${MessageNoCollectionsAvailable}

-
+

${HeaderNewCollection}

@@ -48,7 +48,7 @@

- +

diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html index 27ced96e9c..84b80f4565 100644 --- a/dashboard-ui/edititemmetadata.html +++ b/dashboard-ui/edititemmetadata.html @@ -296,7 +296,9 @@ diff --git a/dashboard-ui/livetvchannels.html b/dashboard-ui/livetvchannels.html index df4119d232..66e9bfb1e2 100644 --- a/dashboard-ui/livetvchannels.html +++ b/dashboard-ui/livetvchannels.html @@ -23,10 +23,11 @@
-
-
-

${MessageLoadingChannels}

-
+
+ +
+
+

${MessageLoadingChannels}

diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 71f8adbad0..35d46b2528 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -46,7 +46,7 @@
-
+

${HeaderAddToCollection}

@@ -73,7 +73,7 @@

- +

diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js index d99d1ba18f..d1db300146 100644 --- a/dashboard-ui/scripts/chromecast.js +++ b/dashboard-ui/scripts/chromecast.js @@ -216,10 +216,11 @@ CastPlayer.prototype.onLaunchError = function () { console.log("chromecast launch error"); this.deviceState = DEVICE_STATE.ERROR; + Dashboard.alert({ - title: "Error Launching Chromecast", - message: "There was an error launching chromecast. Please ensure your device is connected to your wireless network." + title: Globalize.translate("Error"), + message: Globalize.translate("ErrorLaunchingChromecast") }); diff --git a/dashboard-ui/scripts/editcollectionitems.js b/dashboard-ui/scripts/editcollectionitems.js index 40a212c7a7..bb7c3afea0 100644 --- a/dashboard-ui/scripts/editcollectionitems.js +++ b/dashboard-ui/scripts/editcollectionitems.js @@ -50,7 +50,7 @@ html += '
' + item.Name + '
'; if (item.ParentId != currentItem.Id) { - html += ''; + html += ''; } html += ''; @@ -80,7 +80,7 @@ html += '
' + item.Name + '
'; - html += ''; + html += ''; html += ''; @@ -174,7 +174,7 @@ }); if (!items.length) { - Dashboard.alert('Please select at least one item.'); + Dashboard.alert(Globalize.translate("MessagePleaseSelectOneItem")); return; } @@ -207,7 +207,7 @@ }); if (!items.length) { - Dashboard.alert('Please select at least one item.'); + Dashboard.alert(Globalize.translate("MessagePleaseSelectOneItem")); return; } diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js index 19c50a4aa9..bde7292020 100644 --- a/dashboard-ui/scripts/livetvchannels.js +++ b/dashboard-ui/scripts/livetvchannels.js @@ -102,8 +102,9 @@ reloadItems(page); }); - }).on('pagebeforeshow', "#liveTvChannelsPage", function () { + }).on('pageshow', "#liveTvChannelsPage", function () { + // Can't use pagebeforeshow here or the loading popup won't center correctly var page = this; var limit = LibraryBrowser.getDefaultPageSize(); @@ -120,9 +121,8 @@ reloadItems(page); - }).on('pageshow', "#liveTvChannelsPage", function () { - updateFilterControls(this); + }); })(jQuery, document, ApiClient); \ No newline at end of file