From 80b812d3a3275e75b7c189e94950bd6715155a23 Mon Sep 17 00:00:00 2001 From: Peter Iliev Date: Mon, 9 Jul 2018 15:49:49 -0700 Subject: [PATCH 1/3] [player-3519] Updating Google IMA to use the new uiLanguage variable that was exposed in the AMC. --- js/google_ima.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/google_ima.js b/js/google_ima.js index 412a731..e443cec 100644 --- a/js/google_ima.js +++ b/js/google_ima.js @@ -1206,7 +1206,7 @@ require("../html5-common/js/utils/utils.js"); //These are required by Google for tracking purposes. google.ima.settings.setPlayerVersion(PLUGIN_VERSION); google.ima.settings.setPlayerType(PLAYER_TYPE); - google.ima.settings.setLocale(OO.getLocale()); + google.ima.settings.setLocale(_amc.uiLanguage); if (this.useInsecureVpaidMode) { google.ima.settings.setVpaidMode(google.ima.ImaSdkSettings.VpaidMode.INSECURE); From 52895440f66d8b9cc808672eb62011f3227d68fa Mon Sep 17 00:00:00 2001 From: Peter Iliev Date: Mon, 9 Jul 2018 16:56:41 -0700 Subject: [PATCH 2/3] [player-3519] Adding in an failsafe for setting the google ui language. --- js/google_ima.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/google_ima.js b/js/google_ima.js index e443cec..102a1b4 100644 --- a/js/google_ima.js +++ b/js/google_ima.js @@ -1206,7 +1206,11 @@ require("../html5-common/js/utils/utils.js"); //These are required by Google for tracking purposes. google.ima.settings.setPlayerVersion(PLUGIN_VERSION); google.ima.settings.setPlayerType(PLAYER_TYPE); - google.ima.settings.setLocale(_amc.uiLanguage); + if (_amc.uiLanguage) { + google.ima.settings.setLocale(_amc.uiLanguage); + } else { + google.ima.settings.setLocale(OO.getLocale()); + } if (this.useInsecureVpaidMode) { google.ima.settings.setVpaidMode(google.ima.ImaSdkSettings.VpaidMode.INSECURE); From 82f8414bcf9019f218d1696dc6e711c0609bac8d Mon Sep 17 00:00:00 2001 From: Peter Iliev Date: Tue, 10 Jul 2018 12:59:14 -0700 Subject: [PATCH 3/3] [player-3519] Fixing style. --- js/google_ima.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/google_ima.js b/js/google_ima.js index 102a1b4..5a6fa68 100644 --- a/js/google_ima.js +++ b/js/google_ima.js @@ -1206,11 +1206,15 @@ require("../html5-common/js/utils/utils.js"); //These are required by Google for tracking purposes. google.ima.settings.setPlayerVersion(PLUGIN_VERSION); google.ima.settings.setPlayerType(PLAYER_TYPE); - if (_amc.uiLanguage) { + if (_amc.uiLanguage) + { google.ima.settings.setLocale(_amc.uiLanguage); - } else { + } + else + { google.ima.settings.setLocale(OO.getLocale()); } + if (this.useInsecureVpaidMode) { google.ima.settings.setVpaidMode(google.ima.ImaSdkSettings.VpaidMode.INSECURE);