OSDN Git Service

Merge Official Source
authorTianling Shen <cnsztl@immortalwrt.org>
Thu, 30 Sep 2021 01:35:21 +0000 (09:35 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Thu, 30 Sep 2021 01:35:21 +0000 (09:35 +0800)
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
1  2 
modules/luci-base/po/en/base.po
modules/luci-base/po/zh_Hans/base.po
modules/luci-base/po/zh_Hant/base.po
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/10_system.js

Simple merge
Simple merge
Simple merge
@@@ -64,26 -50,11 +64,27 @@@ return baseclass.extend(
                        );
                }
  
 +              // TODO: This is ugly
 +              var projectlink = document.createElement('a');
 +              projectlink.append('Project ImmortalWrt');
 +              projectlink.href = 'https://github.com/immortalwrt';
 +              projectlink.target = '_blank';
 +
 +              var corelink = document.createElement('a');
 +              corelink.append('ImmortalWrt Core');
 +              corelink.href = 'https://github.com/immortalwrt/immortalwrt';
 +              corelink.target = '_blank';
 +
 +              var sourcelink = document.createElement('placeholder');
 +              sourcelink.append(projectlink);
 +              sourcelink.append(' / ');
 +              sourcelink.append(corelink);
 +
                var fields = [
                        _('Hostname'),         boardinfo.hostname,
 -                      _('Model'),            boardinfo.model,
 +                      _('Model'),            boardinfo.model + cpubench.cpubench,
                        _('Architecture'),     boardinfo.system,
+                       _('Target Platform'),  (L.isObject(boardinfo.release) ? boardinfo.release.target : ''),
                        _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description + ' / ' : '') + (luciversion || ''),
                        _('Kernel Version'),   boardinfo.kernel,
                        _('Local Time'),       datestr,