[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, 1 insertion(+), 12 deletions(-)

New commits:
commit 27bc2c2705ea44ab2abae3536f1de6a714d41946
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Dec 18 23:57:00 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Dec 19 00:27:42 2019 +0100

    Revert "android: Translate the style names in the mobile wizard."
    
    This is not needed any more when we use the .mo files correctly.
    
    This reverts commit ddf0612e2f361af1f9284125a0dee98844ef7832.
    
    Change-Id: I13260c30e874ced89667b4dc45ec7d6e26ec5138
    Reviewed-on: https://gerrit.libreoffice.org/85453
    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 4b329c40e..6d788bcac 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1037,11 +1037,6 @@ 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 = [];
@@ -1104,13 +1099,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
 	_comboboxEntry: function(parentContainer, data, builder) {
 		var fixedtext = L.DomUtil.create('p', 'mobile-wizard', parentContainer);
-
-		// 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.innerHTML = builder._cleanText(data.text);
 		fixedtext.parent = data.parent;
 
 		if (data.style && data.style.length)