luci-app-advanced-reboot: improve localization by moving from translate to translatef
Signed-off-by: Stan Grishin <stangri@melmac.net>
This commit is contained in:
Stan Grishin
parent
b7ac596937
commit
75a4a80c1d
4 changed files with 24 additions and 26 deletions
|
|
@ -13,7 +13,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot
|
|||
|
||||
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full
|
||||
LUCI_PKGARCH:=all
|
||||
PKG_RELEASE:=51
|
||||
PKG_RELEASE:=52
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ function get_partition_os_info(op_ubi)
|
|||
cp_info = util.trim(util.exec('. /etc/os-release && echo "$OPENWRT_RELEASE"'))
|
||||
end
|
||||
end
|
||||
logger(i18n.translate("attempting to mount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")")
|
||||
logger(i18n.translatef("attempting to mount alternative partition (mtd%s)", tostring(op_ubi))
|
||||
alt_partition_unmount(op_ubi)
|
||||
alt_partition_mount(op_ubi)
|
||||
if fs.access("/alt/rom/etc/os-release") then
|
||||
|
|
@ -51,7 +51,7 @@ function get_partition_os_info(op_ubi)
|
|||
op_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$OPENWRT_RELEASE"'))
|
||||
end
|
||||
end
|
||||
logger(i18n.translate("attempting to unmount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")")
|
||||
logger(i18n.translatef("attempting to unmount alternative partition (mtd%s)", tostring(op_ubi))
|
||||
alt_partition_unmount(op_ubi)
|
||||
return cp_info, op_info
|
||||
end
|
||||
|
|
@ -176,7 +176,7 @@ function action_template()
|
|||
bev1p2=bev1p2,
|
||||
p2_os=p2_os,
|
||||
current_partition=current_partition,
|
||||
errorMessage = errorMessage})
|
||||
errorMessage=errorMessage})
|
||||
end
|
||||
|
||||
function action_reboot()
|
||||
|
|
@ -209,28 +209,28 @@ function action_altreboot()
|
|||
if bev1 then
|
||||
curEnvSetting = tonumber(util.trim(util.exec("fw_printenv -n " .. bev1)))
|
||||
if not curEnvSetting then
|
||||
errorMessage = errorMessage .. i18n.translate("Unable to obtain firmware environment variable") .. ": " .. bev1 .. ". "
|
||||
util.perror(i18n.translate("Unable to obtain firmware environment variable") .. ": " .. bev1 .. ".")
|
||||
errorMessage = errorMessage .. i18n.translatef("Unable to obtain firmware environment variable: %s.", bev1)
|
||||
util.perror(i18n.translatef("Unable to obtain firmware environment variable: %s.", bev1))
|
||||
else
|
||||
newEnvSetting = curEnvSetting == bev1p1 and bev1p2 or bev1p1
|
||||
errorCode = sys.call("fw_setenv " .. bev1 .. " " .. newEnvSetting)
|
||||
if errorCode ~= 0 then
|
||||
errorMessage = errorMessage or "" .. i18n.translate("Unable to set firmware environment variable") .. ": " .. bev1 .. " " .. i18n.translate("to") .. " " .. newEnvSetting .. ". "
|
||||
util.perror(i18n.translate("Unable to set firmware environment variable") .. ": " .. bev1 .. " " .. i18n.translate("to") .. " " .. newEnvSetting .. ".")
|
||||
errorMessage = errorMessage or "" .. i18n.translatef("Unable to set firmware environment variable: %s to %s.", bev1, newEnvSetting)
|
||||
util.perror(i18n.translatef("Unable to set firmware environment variable: %s to %s.", bev1, newEnvSetting))
|
||||
end
|
||||
end
|
||||
end
|
||||
if bev2 then
|
||||
curEnvSetting = util.trim(util.exec("fw_printenv -n " .. bev2))
|
||||
if not curEnvSetting then
|
||||
errorMessage = errorMessage or "" .. i18n.translate("Unable to obtain firmware environment variable") .. ": " .. bev2 .. ". "
|
||||
util.perror(i18n.translate("Unable to obtain firmware environment variable") .. ": " .. bev2 .. ".")
|
||||
errorMessage = errorMessage or "" .. i18n.translatef("Unable to obtain firmware environment variable: %s.", bev2)
|
||||
util.perror(i18n.translatef("Unable to obtain firmware environment variable: %s.", bev2))
|
||||
else
|
||||
newEnvSetting = curEnvSetting == bev2p1 and bev2p2 or bev2p1
|
||||
errorCode = sys.call("fw_setenv " .. bev2 .. " '" .. newEnvSetting .. "'")
|
||||
if errorCode ~= 0 then
|
||||
errorMessage = errorMessage or "" .. i18n.translate("Unable to set firmware environment variable") .. ": " .. bev2 .. " " .. i18n.translate("to") .. " " .. newEnvSetting .. ". "
|
||||
util.perror(i18n.translate("Unable to set firmware environment variable") .. ": " .. bev2 .. " " .. i18n.translate("to") .. " " .. newEnvSetting .. ".")
|
||||
errorMessage = errorMessage or "" .. i18n.translatef("Unable to set firmware environment variable: %s to %s.", bev2, newEnvSetting)
|
||||
util.perror(i18n.translatef("Unable to set firmware environment variable: %s to %s.", bev2, newEnvSetting))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -245,8 +245,8 @@ function action_altreboot()
|
|||
if zyxelNewBootFlag then
|
||||
errorCode = sys.call("printf \"" .. zyxelNewBootFlag .. "\" >" .. zyxelFlagPartition )
|
||||
if errorCode ~= 0 then
|
||||
errorMessage = errorMessage or "" .. i18n.translate("Unable to set Dual Boot Flag Partition entry for partition") .. ": " .. zyxelFlagPartition .. ". "
|
||||
util.perror(i18n.translate("Unable to set Dual Boot Flag Partition entry for partition") .. ": " .. zyxelFlagPartition .. ".")
|
||||
errorMessage = errorMessage or "" .. i18n.translatef("Unable to set Dual Boot Flag Partition entry for partition: %s.", zyxelFlagPartition)
|
||||
util.perror(i18n.translatef("Unable to set Dual Boot Flag Partition entry for partition: %s.", zyxelFlagPartition))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -143,19 +143,19 @@ msgstr ""
|
|||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:213
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:226
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:227
|
||||
msgid "Unable to obtain firmware environment variable"
|
||||
msgid "Unable to obtain firmware environment variable: %s."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:248
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:249
|
||||
msgid "Unable to set Dual Boot Flag Partition entry for partition"
|
||||
msgid "Unable to set Dual Boot Flag Partition entry for partition: %s."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:218
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:219
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:232
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:233
|
||||
msgid "Unable to set firmware environment variable"
|
||||
msgid "Unable to set firmware environment variable: %s to %s."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:118
|
||||
|
|
@ -205,16 +205,9 @@ msgid "Warning: Unable to obtain device information!"
|
|||
msgstr ""
|
||||
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:45
|
||||
msgid "attempting to mount alternative partition"
|
||||
msgid "attempting to mount alternative partition (mtd%s)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:54
|
||||
msgid "attempting to unmount alternative partition"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:218
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:219
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:232
|
||||
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:233
|
||||
msgid "to"
|
||||
msgid "attempting to unmount alternative partition (mtd%s)"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/sh
|
||||
|
||||
rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
|
||||
exit 0
|
||||
|
||||
Loading…
Reference in a new issue