From 8349acf449b5284a5b1c44b35163358f5ac4c4c5 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 18 Jan 2011 19:15:46 +0000 Subject: [PATCH] luci-0.10: merge r6746, r6747 and r6748 --- build/i18n-lua2po.pl | 120 ++++++++++++++++++ build/i18n-po2lua.pl | 27 ---- contrib/package/iwinfo/src/iwinfo_nl80211.c | 3 +- .../luasrc/controller/admin/servicectl.lua | 6 +- 4 files changed, 125 insertions(+), 31 deletions(-) create mode 100755 build/i18n-lua2po.pl delete mode 100755 build/i18n-po2lua.pl diff --git a/build/i18n-lua2po.pl b/build/i18n-lua2po.pl new file mode 100755 index 000000000..d72d2e975 --- /dev/null +++ b/build/i18n-lua2po.pl @@ -0,0 +1,120 @@ +#!/usr/bin/perl + +@ARGV >= 2 || die "Usage: $0 []\n"; + +my $source_dir = shift @ARGV; +my $target_dir = shift @ARGV; +my $target_lang = shift @ARGV; +my $master_lang = "en"; + + +if( ! -d "$target_dir/" . ( $target_lang || 'templates' ) ) +{ + system('mkdir', '-p', "$target_dir/" . ( $target_lang || 'templates' )); +} + + +my %target_strings; + +if( $target_lang && open F, "find $source_dir -path '*/luasrc/i18n/*' -name '*.$target_lang.lua' |" ) +{ + while( chomp( my $file = readline F ) ) + { + if( open L, "< $file" ) + { + my ( $basename ) = $file =~ m{.+/([^/]+)\.[\w\-]+\.lua$}; + $target_strings{$basename} = { }; + + while( chomp( my $entry = readline L ) ) + { + my ( $k, $v ); + if( $entry =~ /^\s*(\w+)\s*=\s*\[\[(.+)\]\]/ ) + { + ( $k, $v ) = ( $1, $2 ); + } + elsif( $entry =~ /^\s*(\w+)\s*=\s*'(.+)'/ ) + { + ( $k, $v ) = ( $1, $2 ); + } + elsif( $entry =~ /^\s*(\w+)\s*=\s*"(.+)"/ ) + { + ( $k, $v ) = ( $1, $2 ); + } + + if( $k && $v ) + { + $v =~ s/"/\\"/g; + $v =~ s/\\\\"/\\"/g; + $target_strings{$basename}{$k} = $v; + } + } + + close L; + } + } + + close F; +} + + +if( open F, "find . -path '*/luasrc/i18n/*' -name '*.$master_lang.lua' |" ) +{ + my $destfile = sprintf '%s/%s/%%s.%s', + $target_dir, + $target_lang || 'templates', + $target_lang ? 'po' : 'pot' + ; + + while( chomp( my $file = readline F ) ) + { + if( open L, "< $file" ) + { + my ( $basename ) = $file =~ m{.+/([^/]+)\.\w+\.lua$}; + my $filename = sprintf $destfile, $basename; + + if( open T, "> $filename" ) + { + printf "Generating %-40s ", $filename; + + printf T "# %s.%s\n# generated from %s\n\nmsgid \"\"\n" . + "msgstr \"Content-Type: text/plain; charset=UTF-8\"\n\n", + $basename, $target_lang ? 'po' : 'pot', $file; + + while( chomp( my $entry = readline L ) ) + { + my ( $k, $v ); + if( $entry =~ /^\s*(\w+)\s*=\s*\[\[(.+)\]\]/ ) + { + ( $k, $v ) = ( $1, $2 ); + } + elsif( $entry =~ /^\s*(\w+)\s*=\s*'(.+)'/ ) + { + ( $k, $v ) = ( $1, $2 ); + } + elsif( $entry =~ /^\s*(\w+)\s*=\s*"(.+)"/ ) + { + ( $k, $v ) = ( $1, $2 ); + } + + if( $k && $v ) + { + $v =~ s/"/\\"/g; + $v =~ s/\\\\"/\\"/g; + printf T "#: %s:%d\n#. %s\nmsgid \"%s\"\nmsgstr \"%s\"\n\n", + $file, $., $v, $k, + ( $target_strings{$basename} && $target_strings{$basename}{$k} ) + ? $target_strings{$basename}{$k} : ""; + } + } + + close T; + + print "done\n"; + } + + close L; + } + } + + close F; +} diff --git a/build/i18n-po2lua.pl b/build/i18n-po2lua.pl deleted file mode 100755 index 5129055ff..000000000 --- a/build/i18n-po2lua.pl +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/perl - -@ARGV == 2 || die "Usage: $0 \n"; - -my $source_dir = shift @ARGV; -my $target_dir = shift @ARGV; - -if( ! -d $target_dir ) -{ - system('mkdir', '-p', $target_dir); -} - -if( open F, "find $source_dir -type f -name '*.po' |" ) -{ - while( chomp( my $file = readline F ) ) - { - my ( $lang, $basename ) = $file =~ m{.+/(\w+)/([^/]+)\.po$}; - $lang = lc $lang; - $lang =~ s/_/-/g; - - printf "Generating %-40s ", "$target_dir/$basename.$lang.lmo"; - system("./build/po2lmo", $file, "$target_dir/$basename.$lang.lmo"); - print ( -f "$target_dir/$basename.$lang.lmo" ? "done\n" : "empty\n" ); - } - - close F; -} diff --git a/contrib/package/iwinfo/src/iwinfo_nl80211.c b/contrib/package/iwinfo/src/iwinfo_nl80211.c index aca2be233..fa714e906 100644 --- a/contrib/package/iwinfo/src/iwinfo_nl80211.c +++ b/contrib/package/iwinfo/src/iwinfo_nl80211.c @@ -356,6 +356,7 @@ static inline int nl80211_wpactl_recv(int sock, char *buf, int blen) static char * nl80211_wpactl_info(const char *ifname, const char *cmd, const char *event) { + int numtry = 0; int sock = -1; char *rv = NULL; size_t remote_length, local_length; @@ -395,7 +396,7 @@ static char * nl80211_wpactl_info(const char *ifname, const char *cmd, send(sock, cmd, strlen(cmd), 0); - while( 1 ) + while( numtry++ < 5 ) { if( nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0 ) { diff --git a/modules/admin-core/luasrc/controller/admin/servicectl.lua b/modules/admin-core/luasrc/controller/admin/servicectl.lua index 3ef8847c0..83f07d7f2 100644 --- a/modules/admin-core/luasrc/controller/admin/servicectl.lua +++ b/modules/admin-core/luasrc/controller/admin/servicectl.lua @@ -18,9 +18,9 @@ function index() luci.i18n.loadc("base") local i18n = luci.i18n.translate - entry({"servicectl"}, alias("servicectl", "status"), "", 1).sysauth = "root" - entry({"servicectl", "status"}, call("action_status"), "", 2).leaf = true - entry({"servicectl", "restart"}, call("action_restart"), "", 3).leaf = true + entry({"servicectl"}, alias("servicectl", "status"), nil, 1).sysauth = "root" + entry({"servicectl", "status"}, call("action_status"), nil, 2).leaf = true + entry({"servicectl", "restart"}, call("action_restart"), nil, 3).leaf = true end function action_status() -- 2.25.1