[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - loleaflet/admin.strings.js loleaflet/dist loleaflet/Makefile.am loleaflet/src

[Andras Timar]

 loleaflet/Makefile.am                       |    1 +
 loleaflet/admin.strings.js                  |    3 +++
 loleaflet/dist/admin/adminHistory.html      |    6 +++---
 loleaflet/src/admin/AdminSocketAnalytics.js |    4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 5e6388f9212fe823d49f8eccb1c7fb0c430a15d0
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Jan 2 23:55:04 2018 +0100

    l10n: admin console fixes
    
    Change-Id: I047e90c4977bcca2a8968d1af5422742b4ae43db
    Reviewed-on: https://gerrit.libreoffice.org/47288
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 6aa893badf1c1bc1669fac304a824663b5432868)
    Reviewed-on: https://gerrit.libreoffice.org/47294
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 07209238..46fa1dcc 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -50,6 +50,7 @@ pot:
 		unocommands.js \
 		dist/errormessages.js \
 		dist/toolbar/toolbar.js \
+		src/admin/AdminSocketAnalytics.js \
 		src/admin/AdminSocketBase.js \
 		src/admin/AdminSocketOverview.js \
 		src/admin/AdminSocketHistory.js \
diff --git a/loleaflet/admin.strings.js b/loleaflet/admin.strings.js
index 06812103..d4851649 100644
--- a/loleaflet/admin.strings.js
+++ b/loleaflet/admin.strings.js
@@ -35,6 +35,9 @@ l10nstrings.strCpuStatsInterval = _('Time interval of CPU statistics (in ms)');
 l10nstrings.strLimitVirtMemMb = _('Maximum Document process virtual memory (in MB) - reduce only');
 l10nstrings.strLimitStackMemKb = _('Maximum Document process stack memory (in KB) - reduce only');
 l10nstrings.strLimitFileSizeMb = _('Maximum file size allowed to write to disk (in MB) - reduce only');
+l10nstrings.strDocuments = _('Documents:');
+l10nstrings.strExpired = _('Expired:');
+l10nstrings.strRefresh = _('Refresh');
 
 if (module) {
 	module.exports = l10nstrings;
diff --git a/loleaflet/dist/admin/adminHistory.html b/loleaflet/dist/admin/adminHistory.html
index ba71ca0e..76dec2c9 100644
--- a/loleaflet/dist/admin/adminHistory.html
+++ b/loleaflet/dist/admin/adminHistory.html
@@ -64,10 +64,10 @@
 
         <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
           <h1 class="page-header"><script>document.write(l10nstrings.strHistory)</script>
-              <button class="pull-right" id="refreshHistory">refresh</button>
+              <button class="pull-right" id="refreshHistory"><script>document.write(l10nstrings.strRefresh)</script></button>
           </h1>
-            <pre id="json-doc">Documents:<br/><textarea rows="10" cols="100"></textarea></pre>
-            <pre id="json-ex-doc">Expired:<br/><textarea rows="10" cols="100"></textarea></pre>
+            <pre id="json-doc"><script>document.write(l10nstrings.strDocuments)</script><br/><textarea rows="10" cols="100"></textarea></pre>
+            <pre id="json-ex-doc"><script>document.write(l10nstrings.strExpired)</script><br/><textarea rows="10" cols="100"></textarea></pre>
         </div>
       </div>
     </div>
diff --git a/loleaflet/src/admin/AdminSocketAnalytics.js b/loleaflet/src/admin/AdminSocketAnalytics.js
index 7652d4b6..29473cac 100644
--- a/loleaflet/src/admin/AdminSocketAnalytics.js
+++ b/loleaflet/src/admin/AdminSocketAnalytics.js
@@ -214,11 +214,11 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 
 			var legendData = [
 				{
-					text: 'Recieved',
+					text: _('Received'),
 					color: 'red'
 				},
 				{
-					text: 'Sent',
+					text: _('Sent'),
 					color: 'green'
 				}
 			];