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

[Andras Timar]

 loleaflet/dist/toolbar/toolbar.js |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 0585394a86e4cbbb3d6132868697dc28be6649b3
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 25 14:31:34 2018 +0200

    l10n of color picker widget
    
    Change-Id: Ibbb9556b2ef3de3fd61b2f83e0ec45edc23d779e
    Reviewed-on: https://gerrit.libreoffice.org/54804
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 5a29248000167d5e8995214d38b547f1202218eb)
    Reviewed-on: https://gerrit.libreoffice.org/55085

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index ec8cb155a..24c9cf582 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -307,6 +307,9 @@ function onClick(id, item, subItem) {
 		// absolutely no idea why, but without the timeout, the popup is
 		// closed as soon as it is opend
 		setTimeout(function () {
+			$('#fontColorPicker').colorpicker({
+				strings: _('Theme Colors') + ',' + _('Standard Colors') + ',' + _('Web Colors') + ',' + _('Theme Colors') + ',' + _('Back to Palette') + ',' + _('History') + ',' + _('No history yet.')
+			});
 			$('#fontColorPicker').colorpicker('showPalette');
 			$('.ui-widget-content').addClass('loleaflet-font');
 		}, 0);
@@ -315,6 +318,9 @@ function onClick(id, item, subItem) {
 		// absolutely no idea why, but without the timeout, the popup is
 		// closed as soon as it is opend
 		setTimeout(function () {
+			$('#backColorPicker').colorpicker({
+				strings: _('Theme Colors') + ',' + _('Standard Colors') + ',' + _('Web Colors') + ',' + _('Theme Colors') + ',' + _('Back to Palette') + ',' + _('History') + ',' + _('No history yet.')
+			});
 			$('#backColorPicker').colorpicker('showPalette');
 			$('.ui-widget-content').addClass('loleaflet-font');
 		}, 0);