luci-app: fix translation strings

The current handling method introduces extraneous spaces into the translations.
For instance, 'System Log', which is correctly translated to Japanese as 'システムログ' (without extra spaces), is being displayed as 'システム ログ' under the current approach.
Other CJK/Southeast Asian languages are experiencing similar issues, including Chinese, Thai, and Lao.
Therefore, these elements should be translated together as a single unit, rather than separately.

Signed-off-by: Andy Chiang <[email protected]>

diff --git a/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js
index ff2294ab53b4c81e8a99f091163458227c1b4f08..32e0cd77da7245b304eaa6013f38e3bda80d6524 100644 (file)
--- a/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js
+++ b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js
@@ -1,4 +1,4 @@
 'use strict';
 'require tools.views as views';
 
-return views.LogreadBox("acme", "acme");
\ No newline at end of file
+return views.LogreadBox("acme", _('ACME Log'));
\ No newline at end of file

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js
index 89b8b393f7d05bdf1e4657e3d0f86bb76837d468..8a86ea45ed0b4def7ede0a7b90617a5a84ecaaa3 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js
@@ -1,4 +1,4 @@
 'use strict';
 'require tools.views as views';
 
-return views.LogreadBox("adblock-", "adblock");
\ No newline at end of file
+return views.LogreadBox("adblock-", _('Adblock Log'));
\ No newline at end of file

diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/firewall_log.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/firewall_log.js
index db4ce15fe3bc78d912f45327bc7e2a9cc8e3dd05..08b7364f3c95070f43bd81e6d17a59b963977e0e 100644 (file)
--- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/firewall_log.js
+++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/firewall_log.js
@@ -1,4 +1,4 @@
 'use strict';
 'require tools.views as views';
 
-return views.LogreadBox(" banIP/", "banIP firewall logs");
+return views.LogreadBox(" banIP/", _('banIP firewall Log'));

diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/processing_log.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/processing_log.js
index 9d2e1654d79030d5331a81f8c330b15cd4b3e6f6..c6936103785ed6e6abfdf1653ef182548940f29e 100644 (file)
--- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/processing_log.js
+++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/processing_log.js
@@ -1,4 +1,4 @@
 'use strict';
 'require tools.views as views';
 
-return views.LogreadBox("banIP-", "banIP");
+return views.LogreadBox("banIP-", _('banIP Log'));

diff --git a/applications/luci-app-clamav/htdocs/luci-static/resources/view/clamav/clamav-log.js b/applications/luci-app-clamav/htdocs/luci-static/resources/view/clamav/clamav-log.js
index 409a8de36f85b76300d8e1e7edeaa09805d4bc6c..6df6f8aaf1ea3b4912bde0343c94630f01737572 100644 (file)
--- a/applications/luci-app-clamav/htdocs/luci-static/resources/view/clamav/clamav-log.js
+++ b/applications/luci-app-clamav/htdocs/luci-static/resources/view/clamav/clamav-log.js
@@ -1,4 +1,4 @@
 'use strict';
 'require tools.views as views';
 
-return views.LogreadBox("clamav", "clamav");
+return views.LogreadBox("clamav", _('ClamAV Log'));

diff --git a/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/logread.js b/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/logread.js
index 13b22476f74c7f428f39dd779d3bcdf30f13ee0c..d4c8e710b5bc534d740f486bdbc4a8fac19a47b1 100644 (file)
--- a/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/logread.js
+++ b/applications/luci-app-nextdns/htdocs/luci-static/resources/view/nextdns/logread.js
@@ -1,4 +1,4 @@
 'use strict';
 'require tools.views as views';
 
-return views.LogreadBox("nextdns", "nextdns");
+return views.LogreadBox("nextdns", _('NextDNS Log'));

diff --git a/modules/luci-base/htdocs/luci-static/resources/tools/views.js b/modules/luci-base/htdocs/luci-static/resources/tools/views.js
index 01cd7556ab9c8123f155995e7c498529c48938e8..7b47adc9fa23af1a28dd5df6da224393d572a24f 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/tools/views.js
+++ b/modules/luci-base/htdocs/luci-static/resources/tools/views.js
@@ -25,7 +25,7 @@ var CBILogreadBox = function(logtag, name) {
                logTextFilter: '',
                invertLogTextSearch: false,
                logTagFilter: logtag ? logtag : '',
-               logName: name ? name : _('System'),
+               logName: name ? name : _('System Log'),
                fetchMaxRows: 1000,
 
                facilities: [
@@ -233,7 +233,7 @@ var CBILogreadBox = function(logtag, name) {
                        filterMaxRows.addEventListener('change', handleLogFilterChange);
 
                        return E([], [
-                               E('h2', {}, [ `${this.logName} ${_('Log')}` ]),
+                               E('h2', {}, [ this.logName ]),
                                E('div', { 'id': 'content_syslog' }, [
                                        E('div', { class: 'cbi-section-descr' }, this.logTagFilter ? _('The syslog output, pre-filtered for messages related to: ' + this.logTagFilter) : '') ,
                                        E('div', { 'style': 'margin-bottom:10px' }, [

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js
index a70c781571baaedd9804b4b88698a3ce4f9ef07b..5240decf8685417e7c7df248f58c489a593141b7 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js
@@ -1,4 +1,4 @@
 'use strict';
 'require tools.views as views';
 
-return views.LogreadBox(null, _('System'));
\ No newline at end of file
+return views.LogreadBox(null, _('System Log'));
\ No newline at end of file