loleaflet/Makefile.am | 1 + loleaflet/dist/toolbar/toolbar.js | 4 ++-- loleaflet/po/templates/loleaflet-ui.pot | 14 +++++++++++++- loleaflet/src/control/Control.AlertDialog.js | 9 +++++---- 4 files changed, 21 insertions(+), 7 deletions(-)
New commits: commit f1188048f6e0250d80bb13b104506ff21c284ca9 Author: Andras Timar <[email protected]> Date: Wed Jan 17 16:55:11 2018 +0100 enable l10n of Control.AlertDialog.js Change-Id: I841aa6b7ef02fd6681fc55f16976a38de69c54b6 Reviewed-on: https://gerrit.libreoffice.org/48066 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 37e3064f..495cd47d 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -50,6 +50,7 @@ pot: src/admin/AdminSocketHistory.js \ src/admin/AdminSocketSettings.js \ src/admin/Util.js \ + src/control/Control.AlertDialog.js \ src/control/Control.ColumnHeader.js \ src/control/Control.ContextMenu.js \ src/control/Control.DocumentRepair.js \ diff --git a/loleaflet/po/templates/loleaflet-ui.pot b/loleaflet/po/templates/loleaflet-ui.pot index 1bb29c66..5156fd5f 100644 --- a/loleaflet/po/templates/loleaflet-ui.pot +++ b/loleaflet/po/templates/loleaflet-ui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-09 15:54+0100\n" +"POT-Creation-Date: 2018-01-16 15:32+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -515,6 +515,14 @@ msgstr "" msgid " s" msgstr "" +#: src/control/Control.AlertDialog.js:28 +msgid "The server encountered a %0 error while parsing the %1 command." +msgstr "" + +#: src/control/Control.AlertDialog.js:41 +msgid "Download PDF export?" +msgstr "" + #: src/control/Control.ContextMenu.js:129 msgid "Internal Cut" msgstr "" diff --git a/loleaflet/src/control/Control.AlertDialog.js b/loleaflet/src/control/Control.AlertDialog.js index 4b937200..f91fceae 100644 --- a/loleaflet/src/control/Control.AlertDialog.js +++ b/loleaflet/src/control/Control.AlertDialog.js @@ -2,7 +2,7 @@ * L.Control.Dialog used for displaying alerts */ -/* global vex */ +/* global _ vex */ L.Control.AlertDialog = L.Control.extend({ onAdd: function (map) { // TODO: Better distinction between warnings and errors @@ -25,8 +25,9 @@ L.Control.AlertDialog = L.Control.extend({ // Handled by transparently retrying. return; } else if (e.cmd && e.kind) { - var msg = 'The server encountered a \'' + e.kind + '\' error while' + - ' parsing the \'' + e.cmd + '\' command.'; + var msg = _('The server encountered a %0 error while parsing the %1 command.'); + msg.replace('%0', e.kind); + msg.replace('%1', e.cmd); vex.dialog.alert(msg); } @@ -37,7 +38,7 @@ L.Control.AlertDialog = L.Control.extend({ _onPrint: function (e) { var url = e.url; vex.dialog.confirm({ - message: 'Download PDF export?', + message: _('Download PDF export?'), callback: L.bind(function (value) { if (value) { this._map._fileDownloader.src = url; commit 901d50c7bc2e93d7451333aa520803ff51b301cb Author: Andras Timar <[email protected]> Date: Tue Jan 16 15:16:59 2018 +0100 l10n: make 2 strings localizable Change-Id: Iafe6944a4fe5d28169982a7bd0dfc835824a2a96 Reviewed-on: https://gerrit.libreoffice.org/47992 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index e351d940..683fa418 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -660,10 +660,10 @@ $(function () { '<hr><table class="loleaflet-font" id="editor-btn">' + '<tr>' + '<td><input type="checkbox" name="alwaysFollow" id="follow-checkbox" onclick="editorUpdate(event)"></td>' + - '<td>Always follow the editor</td>' + + '<td>' + _('Always follow the editor') + '</td>' + '</tr>' + '</table>' + - '<p id="currently-msg">Current - <b><span id="current-editor">Dewan</span></b></p>' + + '<p id="currently-msg">' + _('Current') + ' - <b><span id="current-editor">Dewan</span></b></p>' + '</div>' }, {type: 'break', id: 'userlistbreak'}, diff --git a/loleaflet/po/templates/loleaflet-ui.pot b/loleaflet/po/templates/loleaflet-ui.pot index 7b94cbed..1bb29c66 100644 --- a/loleaflet/po/templates/loleaflet-ui.pot +++ b/loleaflet/po/templates/loleaflet-ui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-03 21:47+0100\n" +"POT-Creation-Date: 2018-01-09 15:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -344,6 +344,10 @@ msgstr "" msgid "No users" msgstr "" +#: dist/toolbar/toolbar.js:680 +msgid "Always follow the editor" +msgstr "" + #: dist/toolbar/toolbar.js:674 src/control/Control.Menubar.js:57 #: src/control/Control.Menubar.js:238 msgid "Reset zoom" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
