[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - loleaflet/src

[Jan Holesovsky (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit ddf0612e2f361af1f9284125a0dee98844ef7832
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Dec 12 13:00:13 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Dec 12 13:05:41 2019 +0100

    android: Translate the style names in the mobile wizard.
    
    Change-Id: Idda5f05866aea203ba30646a2b4d4109be3f46e2
    Reviewed-on: https://gerrit.libreoffice.org/85046
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 6d788bcac..4b329c40e 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1037,6 +1037,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
 			}
 		}
 		title = builder._cleanText(title);
+
+		// FIXME find out why Android needs this & fix
+		if (window.ThisIsTheAndroidApp)
+			title = _(title);
+
 		data.text = title;
 
 		var entries = [];
@@ -1099,7 +1104,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
 	_comboboxEntry: function(parentContainer, data, builder) {
 		var fixedtext = L.DomUtil.create('p', 'mobile-wizard', parentContainer);
-		fixedtext.innerHTML = builder._cleanText(data.text);
+
+		// FIXME find out why Android needs this & fix
+		if (window.ThisIsTheAndroidApp)
+			fixedtext.innerHTML = _(builder._cleanText(data.text));
+		else
+			fixedtext.innerHTML = builder._cleanText(data.text);
+
 		fixedtext.parent = data.parent;
 
 		if (data.style && data.style.length)