[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist loleaflet/src

[Andras Timar]

 loleaflet/dist/toolbar/toolbar.js        |    2 +-
 loleaflet/src/control/Control.Menubar.js |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f844604a92c3da744c4b08c08d7662fc8146fcc6
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Oct 4 13:29:20 2017 +0200

    loleaflet: enable l10n of language names
    
    Change-Id: Idd8b1b0bb081d718cf8d36c60ce6e293bd818fc6
    Reviewed-on: https://gerrit.libreoffice.org/43132
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 33867ca9..5faa4fa6 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1176,7 +1176,7 @@ map.on('commandstatechanged', function (e) {
 		}
 	}
 	else if (commandName === '.uno:LanguageStatus') {
-		$('#LanguageStatus').html(state);
+		$('#LanguageStatus').html(_(state));
 	}
 	else if (commandName === '.uno:ModifiedStatus') {
 		var modifiedStatus = e.state === 'true';
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 1ab60a1d..9705b85f 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -363,9 +363,9 @@ L.Control.Menubar = L.Control.extend({
 			$menuParagraph = $('#menu-resetparagraph').parent();
 			$menuDefault = $('#menu-resetlanguage').parent();
 			for (var lang in e.commandValues) {
-				$menuSelection.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Current_' + e.commandValues[lang])));
-				$menuParagraph.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Paragraph_' + e.commandValues[lang])));
-				$menuDefault.append(this._createLangMenuItem(e.commandValues[lang], encodeURIComponent('Default_' + e.commandValues[lang])));
+				$menuSelection.append(this._createLangMenuItem(_(e.commandValues[lang]), encodeURIComponent('Current_' + e.commandValues[lang])));
+				$menuParagraph.append(this._createLangMenuItem(_(e.commandValues[lang]), encodeURIComponent('Paragraph_' + e.commandValues[lang])));
+				$menuDefault.append(this._createLangMenuItem(_(e.commandValues[lang]), encodeURIComponent('Default_' + e.commandValues[lang])));
 			}
 		}
 	},