Commit graph

232 commits

Author SHA1 Message Date
Jo-Philipp Wich
ec9942925c luci-base: datatypes.lua: add missing parentheses in conditional
The missing parens lead to a wrong expression precedence, causing a runtime
error when attempting to compare nil with a number.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-24 13:51:27 +01:00
Jo-Philipp Wich
e4b1bb3156 luci-base: ipmask, ipmask4 and ipmask6 validators
These validators accept IP address specifications in the form

 - address
 - address/bits
 - address/netmask

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-23 16:15:22 +01:00
Jo-Philipp Wich
937f4fbbdf luci-base: datatypes.lua: cleanup white space
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-23 16:10:07 +01:00
Cody R. Brown
0f35de886c luci-base: luci.tools.status: properly parse infinite dnsmasq leases
The expiry time in a dnsmasq lease file line may be 0 (i.e.
expiry date = 01/01/1970 00:00:00 GMT) to denote an infinite
lease time, so adjust the code to properly support that.

The expiry attribute of the lease object will be set to "false"
in case of an infinite lease. This is to mimic the odhcp code below.
If the expiry date is not equal to 0, then just do exactly what was
done before (return the os.diff of current time and ts).

Signed-off-by: Cody R. Brown <dev@codybrown.ca>
2017-01-23 09:37:10 +02:00
Daniel Dickinson
f00a1ac2d9 Merge pull request #953 from musashino205/mount-fix-disp
luci-mod-admin-full: Fix display problems of mount
2017-01-16 10:45:20 -05:00
Daniel Dickinson
859bac61fc Merge pull request #917 from aa65535/master
luci-base:adjust the code order
2017-01-16 09:26:42 -05:00
Daniel Dickinson
a85807d375 Merge pull request #946 from chloe-jeong/trunk-ko
Updates korean languages.
2017-01-16 02:07:36 -05:00
INAGAKI Hiroshi
bc8f58a2ef luci-base: sync translations
Recently a string to be translated were added to Lua source, so
I synchronized po templates and po file of each language with Lua
source.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-01-16 13:01:17 +09:00
Weongyo Jeong
fe7fd0e230 luci-base: Updates korean language.
Signed-off-by: Weongyo Jeong <weongyo@gmail.com>
2017-01-14 21:12:53 +09:00
Hannu Nyman
61fa65f2f9 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-01-11 15:50:46 +02:00
Daniel Dickinson
6c13339ad3 Merge pull request #930 from cshore-firmware/pull-request-fix-webadmin
base: webadmin: Don't take substring of nil variable
2017-01-10 17:19:55 -05:00
Hannu Nyman
95d3f26691 Merge pull request #923 from kuoruan/i18n-zh-cn
Update Simplified Chinese translation
2017-01-07 17:04:32 +02:00
Hsing-Wang Liao
70b725991e luci-base: Update Simplified Chinese translation
Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>
2017-01-07 21:50:21 +08:00
Hannu Nyman
9dbfb9d388 luci-base: update LuaSrcDiet download location
Update the googlecode download address to the current one.

Change hash to SHA256 at the same time.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-01-05 23:34:54 +02:00
Jian Chang
260a24aadb luci-base:adjust the code order
The `cbi_validate_field` should be after data initialized.

Signed-off-by: Jian Chang <aa65535@live.com>
2017-01-03 19:00:53 +08:00
Daniel Dickinson
7bfd36d585 base: webadmin: Don't take substring of nil variable
When converting interface names to UCI network names
webadmin fails if there is no UCI network name because
webadmin failed to ensure uciname has a value before
attempting to take a substring.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2016-12-30 13:44:22 -05:00
Hannu Nyman
882c5f02e6 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-12-22 11:23:26 +02:00
Jo-Philipp Wich
b56d1a85e2 luci-base: luci.sys.iptparser: properly check for table support
Do not assume that the "raw" table is present on any system, instead check
/proc/net/ip{,6}_tables_names to determine which iptables tables are available.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-12-21 18:04:24 +01:00
jose1711
08f955d627 Fix a few typos in Czech translation
Signed-off-by: Jose Riha <jose1711@gmail.com>
2016-12-21 10:01:28 +02:00
Hannu Nyman
de4c4a6ff5 Merge pull request #884 from chloe-jeong/trunk-ko
Adds Korean translation.
2016-12-20 16:21:59 +02:00
Weongyo Jeong
9d640e4c4c Adds Korean translation.
Adds Korean language supported for Luci of OpenWRT.  Most of msgs which
shown at UI are translated but still not completed for non-popular
features.

Signed-off-by: Weongyo Jeong <weongyo@gmail.com>
2016-12-20 23:11:11 +09:00
musashino205
18122da3e3 luci-base: Update Japanese translation
Signed-off-by: musashino205 <musashino.open@gmail.com>
2016-12-16 15:25:17 +09:00
musashino205
4d4ef3a7a3 luci-base: Update Japanese translation
Signed-off-by: musashino205 <musashino.open@gmail.com>
2016-12-16 03:55:25 +09:00
Hannu Nyman
0fdee1ed9d i18n: fix some sysupgrade related string translations
Fix translated strings broken by recent changes.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-12-10 16:36:02 +02:00
Hannu Nyman
e65f6512e7 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-12-10 14:34:30 +02:00
Daniel Dickinson
c5287ef15f Merge pull request #663 from NeoRaider/styleable-checkboxes
luci-base: view: make checkboxes and radio buttons styleable
2016-12-10 06:36:01 -05:00
Hannu Nyman
dad185e2c9 Fix config files getting overwritten in opkg install
Commit 39ff053890 accidentally removed the conffiles definitions
from luci-base, statistics, splash and diag-devinfo apps.

That has caused existing config files to get overwritten if the
package has been reinstalled via opkg. Additionally, the splash
text files have not been saved in sysupgrade or backup as they
are located outside /etc/config

This commit adds back the conffiles definitions to the respective
packages.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-12-10 11:20:01 +02:00
Hannu Nyman
a7c5c018b6 time zone data: Update to 2016j
Changes:
     Saratov, Russia switches from +03 to +04 on 2016-12-04 at 02:00.
     This hives off a new zone Europe/Saratov from Europe/Volgograd.

     The new zone Asia/Atyrau for Atyraū Region, Kazakhstan, is like
     Asia/Aqtau except it switched from +04/+05 to +05/+06 in spring
     1999, not fall 1994.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-12-09 18:10:44 +02:00
Jo-Philipp Wich
8e9e92a630 luci-base: luci.tools.status: properly parse infinite odhcpd leases
The expiry time in an odhcpd lease file line may be -1 to denote an infinite
lease time, so adjust the code to properly support that.

The expiry attribute of the lease object will be set to "false" in case of an
infinite lease.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-12-09 13:05:44 +01:00
Hannu Nyman
3936e79cf8 time zone data: Update to 2016i
Note that several of the time zones now use a numeric name
that is quoted with < >  (e.g. "<+03>-3")

musl 1.1.15 and earlier have a bug with < > quoted time zone names.
Fix for the bug
* has already been patched in musl upstream with
  http://git.musl-libc.org/cgit/musl/commit/?id=8ca27ac4bfe73bff785d0c26c1de0da92b55e5c6
* has been committed in LEDE with
  671cb35880
* has been submitted to Openwrt as pull request
  https://github.com/openwrt/openwrt/pull/163

Key changes in 2016d-2016i:
---------------------------

2016d:
     America/Caracas switches from -0430 to -04 on 2016-05-01.

     Asia/Magadan switches from +10 to +11 on 2016-04-24.

     New zone Asia/Tomsk, split off from Asia/Novosibirsk.

2016f:
     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24.

     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.

2016g:
     Turkey switched from EET/EEST (+02/+03) to permanent +03,
     effective 2016-09-07. Use "+03" rather than an invented
     abbreviation for the new time.

     Several zones in Antarctica and the former Soviet Union, along
     with zones intended for ships at sea that cannot use POSIX TZ
     strings, now use numeric time zone abbreviations instead of
     invented or obsolete alphanumeric abbreviations.

2016h:
     Asia/Gaza and Asia/Hebron end DST on 2016-10-29, not
     2016-10-21. Predict that future fall transitions will
     be on the last Saturday of October.

     Asia/Colombo now uses numeric time zone abbreviations like "+0530"
     instead of alphabetic ones like "IST" and "LKT".

2016i:
     Pacific/Tongatapu begins DST on 2016-11-06, ending on
     2017-01-15.  Assume future observances in Tonga will be
     from the first Sunday in November through the third Sunday in
     January, like Fiji. Switch to numeric time zone abbreviations
     for this zone.

     Northern Cyprus is now +03 year round, causing a split in Cyprus
     time zones starting 2016-10-30 at 04:00. This creates a zone
     Asia/Famagusta.

     Antarctica/Casey switched from +08 to +11 on 2016-10-22.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-11-08 12:43:00 +02:00
Hannu Nyman
5f4b0fe274 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-10-30 10:21:12 +02:00
Hannu Nyman
494116d620 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-10-23 21:36:36 +03:00
Matthias Schiffer
4d97a9f698
luci-base: use default install paths for host utils
This reverts commit d4c3372020.

PATH inconsistencies and Host/Install arguments have been fixed in both
LEDE and OpenWrt, so we can revert the revert.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-09 22:44:15 +02:00
Jo-Philipp Wich
e06c60a0d6 luci-base: remove default diag host from /etc/config/luci
Now that luci-mod-admin-full figures out the proper diagnostics host
during postinstall we can remove the UCI section from the default
configuration file.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-10-06 17:14:46 +02:00
Jo-Philipp Wich
d4c3372020 Revert "luci-base: use default install paths for host utils"
This reverts commit 87a7570690.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-10-05 01:44:02 +02:00
Jo-Philipp Wich
dcb2a0e680 Revert "luci-base: fix luci-base host tool install on OpenWrt"
This reverts commit f7639bcd6a.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-10-05 01:43:55 +02:00
Matthias Schiffer
f7639bcd6a
luci-base: fix luci-base host tool install on OpenWrt
OpenWrt doesn't provide an argument to Host/Install like LEDE does; use
HOST_BUILD_PREFIX instead, which is available on both.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-04 00:34:30 +02:00
Matthias Schiffer
87a7570690 luci-base: use default install paths for host utils
Also, don't make any assumptions about the staging dir lua and LuaSrcDiet
were installed to.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-03 18:07:43 +02:00
Hannu Nyman
d5f8c9b028 Merge pull request #782 from Ansuel/master
Fix some capital and add some translation
2016-08-25 00:45:41 +03:00
BuildTools
140b6d0e1d Fix some capital and add some translation
Hope this time I have done a good work
2016-08-24 12:27:01 +02:00
Hannu Nyman
74b452a83e i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-08-24 11:49:13 +03:00
Jo-Philipp Wich
f885853b5c Revert "Fix and update italian translation"
This reverts commit 66d5023891 since the
original change was apparently untested.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-24 10:20:43 +02:00
Ansuel
66d5023891 Fix and update italian translation
I have fixed some capital letter and add some translation
2016-08-23 23:10:45 +02:00
Jo-Philipp Wich
4a5635cafa luci-base: properly style login alert message
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-18 09:19:54 +02:00
Hannu Nyman
f58069a1a6 i18n: sync translations, fix sv for adblock
Sync translations.
Fix the newly added sv translation for adblock.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-08-16 10:07:49 +03:00
Jo-Philipp Wich
8cd6e4efe8 luci-base: support reading switch topology from /etc/board.json
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-15 17:52:28 +02:00
Jo-Philipp Wich
6a11f71758 luci-base: cbi.js: handle undefined arguments in formatting
Fix the JavaScript String.format() to not trigger an exception if the argument
for an escaped format like %h or %q is undefined.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-04 11:45:30 +02:00
Jo-Philipp Wich
123f14b55d luci-base: fix handling of monitor ifaces
Wireless monitor interfaces usually have no SSID set in their config and
various network model utility functions did not handle this case properly,
mainly while trying to incorperate the SSID string into various description
labels.

Fall back to the internal network id (radioX.networkY) in cases where neither
the SSID nor the BSSID are available.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-04 11:45:30 +02:00
Jo-Philipp Wich
240b8c4b6e luci-base: improve string format error reporting
In mod metamethod, execute string format under pcall() and rethrow error in
caller context to report caller of function in errors and not the meta
method itself.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-04 11:45:30 +02:00
Florian Eckert
8b07a65117 luci-mod-admin-full: make diagnostics url customizable
Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
2016-07-29 08:21:23 +02:00