[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - loleaflet/dist
Andras Timar
andras.timar at collabora.com
Fri Jan 26 12:05:53 UTC 2018
loleaflet/dist/toolbar/toolbar.js | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 791fb5670b802cb4f3ad09973344d14fce18f620
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Dec 27 22:17:22 2017 +0100
localize StateTableCell status bar string (Sum, Average, Count, etc.)
Change-Id: Ie4d6197115f8f8290f1d6f8608acf2e3e3642c79
Reviewed-on: https://gerrit.libreoffice.org/47107
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 84bd0d7e5ebe1814eaecc973dedd9f66ee2881d8)
Reviewed-on: https://gerrit.libreoffice.org/47296
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 cb0b51a7..953917c2 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -712,6 +712,20 @@ var userJoinedPopupMessage = '<div>' + _('%user has joined') + '</div>';
var userLeftPopupMessage = '<div>' + _('%user has left') + '</div>';
var userPopupTimeout = null;
+function localizeStateTableCell (text) {
+ var stateArray = text.split(';');
+ var stateArrayLength = stateArray.length;
+ var localizedText = '';
+ for (var i = 0; i < stateArrayLength; i++) {
+ var labelValuePair = stateArray[i].split(':');
+ localizedText += _(labelValuePair[0].trim()) + ':' + labelValuePair[1];
+ if (stateArrayLength > 1 && i < stateArrayLength - 1) {
+ localizedText += '; ';
+ }
+ }
+ return localizedText;
+}
+
function toLocalePattern (pattern, regex, text, sub1, sub2) {
var matches = new RegExp(regex, 'g').exec(text);
if (matches) {
@@ -1279,7 +1293,7 @@ map.on('commandstatechanged', function (e) {
updateToolbarItem(statusbar, 'StatusSelectionMode', $('#StatusSelectionMode').html(state ? L.Styles.selectionMode[state].toLocaleString() : '  ').parent().html());
}
else if (commandName == '.uno:StateTableCell') {
- updateToolbarItem(statusbar, 'StateTableCell', $('#StateTableCell').html(state ? state : '  ').parent().html());
+ updateToolbarItem(statusbar, 'StateTableCell', $('#StateTableCell').html(state ? localizeStateTableCell(state) : '  ').parent().html());
}
else if (commandName === '.uno:StatusBarFunc') {
if (state) {
More information about the Libreoffice-commits
mailing list