From 0e1f01b41379910d48e225e038ab75bc272652b2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 27 Jun 2019 16:22:47 +0300 Subject: [PATCH] [PE] Fix Bug 39782 --- apps/presentationeditor/main/app.reporter.js | 29 +------------------ .../main/app_dev.reporter.js | 29 +------------------ .../main/index.reporter.html | 23 ++++++++++----- .../main/index.reporter.html.deploy | 23 ++++++++++----- 4 files changed, 32 insertions(+), 72 deletions(-) diff --git a/apps/presentationeditor/main/app.reporter.js b/apps/presentationeditor/main/app.reporter.js index 6c90d9036..14ed36933 100644 --- a/apps/presentationeditor/main/app.reporter.js +++ b/apps/presentationeditor/main/app.reporter.js @@ -96,34 +96,7 @@ require([ }); var setDocumentTitle = function(title) { - function getUrlParams() { - var e, - a = /\+/g, // Regex for replacing addition symbol with a space - r = /([^&=]+)=?([^&]*)/g, - d = function (s) { return decodeURIComponent(s.replace(a, " ")); }, - q = window.location.search.substring(1), - urlParams = {}; - - while (e = r.exec(q)) - urlParams[d(e[1])] = d(e[2]); - - return urlParams; - } - var params = getUrlParams(), - lang = (params["lang"] || 'en').split(/[\-\_]/)[0], - presenter = 'Presenter View'; - - if ( lang == 'de') presenter = ''; - else if ( lang == 'es') presenter = ''; - else if ( lang == 'fr') presenter = ''; - else if ( lang == 'it') presenter = ''; - else if ( lang == 'pt') presenter = ''; - else if ( lang == 'ru') presenter = 'Режим докладчика'; - else if ( lang == 'sl') presenter = ''; - else if ( lang == 'tr') presenter = ''; - presenter && (presenter += ' - '); - - window.document.title = presenter + (title || ''); + (title) && (window.document.title += (' - ' + title)); }; function load_document(data) { diff --git a/apps/presentationeditor/main/app_dev.reporter.js b/apps/presentationeditor/main/app_dev.reporter.js index 7fd416947..04b34270e 100644 --- a/apps/presentationeditor/main/app_dev.reporter.js +++ b/apps/presentationeditor/main/app_dev.reporter.js @@ -97,34 +97,7 @@ require([ }); var setDocumentTitle = function(title) { - function getUrlParams() { - var e, - a = /\+/g, // Regex for replacing addition symbol with a space - r = /([^&=]+)=?([^&]*)/g, - d = function (s) { return decodeURIComponent(s.replace(a, " ")); }, - q = window.location.search.substring(1), - urlParams = {}; - - while (e = r.exec(q)) - urlParams[d(e[1])] = d(e[2]); - - return urlParams; - } - var params = getUrlParams(), - lang = (params["lang"] || 'en').split(/[\-\_]/)[0], - presenter = 'Presenter View'; - - if ( lang == 'de') presenter = ''; - else if ( lang == 'es') presenter = ''; - else if ( lang == 'fr') presenter = ''; - else if ( lang == 'it') presenter = ''; - else if ( lang == 'pt') presenter = ''; - else if ( lang == 'ru') presenter = 'Режим докладчика'; - else if ( lang == 'sl') presenter = ''; - else if ( lang == 'tr') presenter = ''; - presenter && (presenter += ' - '); - - window.document.title = presenter + (title || ''); + (title) && (window.document.title += (' - ' + title)); }; function load_document(data) { diff --git a/apps/presentationeditor/main/index.reporter.html b/apps/presentationeditor/main/index.reporter.html index 7e582e153..1584f730c 100644 --- a/apps/presentationeditor/main/index.reporter.html +++ b/apps/presentationeditor/main/index.reporter.html @@ -226,18 +226,25 @@ customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, loading = 'Loading...', + presenter = 'Presenter View', logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; window.frameEditorId = params["frameEditorId"]; - if ( lang == 'de') loading = 'Ladevorgang...'; - else if ( lang == 'es') loading = 'Cargando...'; - else if ( lang == 'fr') loading = 'Chargement en cours...'; - else if ( lang == 'it') loading = 'Caricamento in corso...'; - else if ( lang == 'pt') loading = 'Carregando...'; - else if ( lang == 'ru') loading = 'Загрузка...'; - else if ( lang == 'sl') loading = 'Nalaganje...'; - else if ( lang == 'tr') loading = 'Yükleniyor...'; + if ( lang == 'bg') { presenter = 'Изглед на презентатора';} + else if ( lang == 'cs') { presenter = 'Zobrazení přednášejícího';} + else if ( lang == 'de') { presenter = 'Referentenansicht'; loading = 'Ladevorgang...';} + else if ( lang == 'es') { presenter = 'Vista del presentador'; loading = 'Cargando...';} + else if ( lang == 'fr') { presenter = 'Mode présentateur'; loading = 'Chargement en cours...';} + else if ( lang == 'it') { presenter = 'Visualizzazione del presenter'; loading = 'Caricamento in corso...';} + else if ( lang == 'pl') { presenter = 'Widok Prezentera';} + else if ( lang == 'pt') { presenter = 'Vista de apresentador'; loading = 'Carregando...';} + else if ( lang == 'ru') { presenter = 'Режим докладчика'; loading = 'Загрузка...';} + else if ( lang == 'sk') { presenter = 'Režim prezentácie';} + else if ( lang == 'sl') { loading = 'Nalaganje...';} + else if ( lang == 'zh') { presenter = '演示者视图';} + else if ( lang == 'tr') { loading = 'Yükleniyor...';} + window.document.title = presenter; if (!stopLoading) document.write( diff --git a/apps/presentationeditor/main/index.reporter.html.deploy b/apps/presentationeditor/main/index.reporter.html.deploy index 9ce5c414d..5b403c632 100644 --- a/apps/presentationeditor/main/index.reporter.html.deploy +++ b/apps/presentationeditor/main/index.reporter.html.deploy @@ -222,18 +222,25 @@ customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, loading = 'Loading...', + presenter = 'Presenter View', logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; window.frameEditorId = params["frameEditorId"]; - if ( lang == 'de') loading = 'Ladevorgang...'; - else if ( lang == 'es') loading = 'Cargando...'; - else if ( lang == 'fr') loading = 'Chargement en cours...'; - else if ( lang == 'it') loading = 'Caricamento in corso...'; - else if ( lang == 'pt') loading = 'Carregando...'; - else if ( lang == 'ru') loading = 'Загрузка...'; - else if ( lang == 'sl') loading = 'Nalaganje...'; - else if ( lang == 'tr') loading = 'Yükleniyor...'; + if ( lang == 'bg') { presenter = 'Изглед на презентатора';} + else if ( lang == 'cs') { presenter = 'Zobrazení přednášejícího';} + else if ( lang == 'de') { presenter = 'Referentenansicht'; loading = 'Ladevorgang...';} + else if ( lang == 'es') { presenter = 'Vista del presentador'; loading = 'Cargando...';} + else if ( lang == 'fr') { presenter = 'Mode présentateur'; loading = 'Chargement en cours...';} + else if ( lang == 'it') { presenter = 'Visualizzazione del presenter'; loading = 'Caricamento in corso...';} + else if ( lang == 'pl') { presenter = 'Widok Prezentera';} + else if ( lang == 'pt') { presenter = 'Vista de apresentador'; loading = 'Carregando...';} + else if ( lang == 'ru') { presenter = 'Режим докладчика'; loading = 'Загрузка...';} + else if ( lang == 'sk') { presenter = 'Režim prezentácie';} + else if ( lang == 'sl') { loading = 'Nalaganje...';} + else if ( lang == 'zh') { presenter = '演示者视图';} + else if ( lang == 'tr') { loading = 'Yükleniyor...';} + window.document.title = presenter; if (!stopLoading) document.write(