Merge pull request #4936 from ElonH/luci-app-rclone

luci-app-rclone: bump version from 1.4.0 to 1.4.1
This commit is contained in:
coolsnowwolf 2020-07-03 19:29:39 +08:00 committed by GitHub
commit 49b45cde79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 70 additions and 7 deletions

View File

@ -10,10 +10,13 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for Rclone
LUCI_DEPENDS:=+rclone +rclone-webui-react +fuse-utils +rclone-ng
LUCI_DEPENDS:=+rclone \
+PACKAGE_luci-app-rclone_INCLUDE_rclone-webui:rclone-webui-react \
+PACKAGE_luci-app-rclone_INCLUDE_rclone-ng:rclone-ng \
+PACKAGE_luci-app-rclone_INCLUDE_fuse-utils:fuse-utils
LUCI_PKGARCH:=all
PKG_NAME:=luci-app-rclone
PKG_VERSION:=1.4.0
PKG_VERSION:=1.4.1
PKG_RELEASE:=1
PKG_LICENSE:=GPLv3.0+
PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
@ -32,6 +35,24 @@ define Package/luci-app-rclone/description
Yandex Disk, The local root/usr/binystem.
endef
define Package/luci-app-rclone/conffiles
/etc/config/rclone
endef
define Package/luci-app-rclone/config
config PACKAGE_luci-app-rclone_INCLUDE_rclone-webui
bool "Include rclone-webui"
default y
config PACKAGE_luci-app-rclone_INCLUDE_rclone-ng
bool "Include rclone-ng (another webui)"
default y
config PACKAGE_luci-app-rclone_INCLUDE_fuse-utils
bool "Include fuse-utils (mount cloud storage)"
default y
endef
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature

View File

@ -1,6 +1,8 @@
require('luci.sys')
require('luci.util')
local ipkg = require('luci.model.ipkg')
local fs = require 'nixio.fs'
local uci = require 'luci.model.uci'.cursor()
@ -31,6 +33,7 @@ else
address_msg = ''
end
if ipkg.installed("rclone-webui-react") and ipkg.installed("rclone-ng") then
m =
Map(
'rclone',
@ -46,6 +49,44 @@ m =
translate('RcloneNg') ..
" \" onclick=\"window.open('http://'+window.location.hostname+'/RcloneNg')\"/> <br/><br/>"
)
elseif ipkg.installed("rclone-webui-react") then
m =
Map(
'rclone',
translate('Rclone'),
translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') ..
' <br/> <br/> ' .. translate('rclone state') .. ' : ' .. state_msg .. '<br/> <br/>'
.. address_msg ..
translate('Installed Web Interface') ..
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="cbi-button" style="margin: 0 5px;" value=" ' ..
translate('Webui React') ..
" \" onclick=\"window.open('http://'+window.location.hostname+'/rclone-webui-react')\"/>"
)
elseif ipkg.installed("rclone-ng") then
m =
Map(
'rclone',
translate('Rclone'),
translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') ..
' <br/> <br/> ' .. translate('rclone state') .. ' : ' .. state_msg .. '<br/> <br/>'
.. address_msg ..
translate('Installed Web Interface') ..
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="cbi-button" style="margin: 0 5px;" value=" ' ..
translate('RcloneNg') ..
" \" onclick=\"window.open('http://'+window.location.hostname+'/RcloneNg')\"/> <br/><br/>"
)
else
m =
Map(
'rclone',
translate('Rclone'),
translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') ..
' <br/> <br/> ' .. translate('rclone state') .. ' : ' .. state_msg .. '<br/> <br/>'
.. address_msg
)
end
s = m:section(TypedSection, 'global', translate('global'))
s.addremove = false

View File

@ -0,0 +1 @@
../zh_Hans/luci-app-rclone.po

View File

@ -2,14 +2,14 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"Last-Translator: dingpengyu <dingpengyu06@gmail.com>\n"
"Last-Translator: ElonH <elonhhuang@gmail.com>\n"
"Language-Team: none\n"
"Language: zh_CN\n"
"Language: zh-Hans\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"X-Generator: Poedit 2.3.1\n"
"X-Generator: Poedit 2.0.6\n"
#: luasrc/model/cbi/rclone.lua:121
msgid "FAQ"
@ -48,7 +48,7 @@ msgid ""
"commonly either http or socks5."
msgstr ""
"内容格式为: protocol://server:port\n"
"protocol 通常为 http 或者 socks5"
"protocol 通常为 http 或者 socks5"
#: luasrc/model/cbi/rclone.lua:43
msgid "Webui React"
@ -140,7 +140,7 @@ msgstr "启动 rclone 后台服务"
#: luasrc/model/cbi/rclone.lua:80
msgid "than updaload configuration to here."
msgstr "然后上传配置文件到这里"
msgstr "然后上传配置文件到这里"
#: luasrc/model/cbi/rclone.lua:80
msgid "to setup configuration on pc,"