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

[Libreoffice Gerrit user]

 loleaflet/dist/loleaflet-help.html |    2 +-
 loleaflet/src/control/Toolbar.js   |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7f28c65de90a1d9ba3491dd5b22c09751d99dec8
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Jul 31 09:24:39 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 31 09:29:11 2018 +0200

    loleaflet: fix Keyboard Shortcuts help localization
    
    Change-Id: I1bbe88a37127fb13cba7c065ce03cb6799c6b7fa

diff --git a/loleaflet/dist/loleaflet-help.html b/loleaflet/dist/loleaflet-help.html
index 15c79d3c7..eaa3313f2 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -109,7 +109,7 @@
             <tr> <td class="shortcut">Ctrl + Alt + Shift + Arrow Keys</td>  <td class="function">Like Alt, but only the active cell is modified</td>  </tr>
             <tr> <td class="shortcut">Alt + Insert</td>  <td class="function">3 seconds in Insert mode, Arrow Key inserts row/column, Ctrl + Arrow Key inserts cell</td>  </tr>
             <tr> <td class="shortcut">Alt + Del</td>  <td class="function">3 seconds in Delete mode, Arrow key deletes row/column, Ctrl + Arrow key merges cell with neighboring cell</td>  </tr>
-            <tr> <td class="shortcut">Shift + Ctrl + Del</td>  <td class="function">If no whole cell is selected, the text from the cursor to the end of the current sentence is deleted. If the cursor is at the end of a cell, and no whole cell is selected, the contents of the next cell are deleted.
+            <tr> <td class="shortcut">Shift + Ctrl + Del</td>  <td class="function"> <p>If no whole cell is selected, the text from the cursor to the end of the current sentence is deleted. If the cursor is at the end of a cell, and no whole cell is selected, the contents of the next cell are deleted.</p>
 <p>If no whole cell is selected and the cursor is at the end of the table, the paragraph following the table will be deleted, unless it is the last paragraph in the document.</p>
 <p>If one or more cells are selected, the whole rows containing the selection will be deleted. If all rows are selected completely or partially, the entire table will be deleted.</p>
 </td>  </tr>
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 6d5e7ae97..d417d3dbd 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -210,6 +210,10 @@ L.Map.include({
 					for (i = 0, max = translatableContent.length; i < max; i++) {
 						translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
 					}
+					translatableContent = $vexContent.find('p');
+					for (i = 0, max = translatableContent.length; i < max; i++) {
+						translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
+					}
 
 					$('.vex-content').attr('tabindex', -1);
 					$('.vex-content').focus();