# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1448121014 -7200
# Node ID efc8f188db6e5a28ff1ef4e499e31454c3e41745
# Parent  af25e2951d08ea4d69d6f4cf207598f82a02e5b1
libtaz.sh: change pair of functions: action(), status() to best look in textual logs and in gtk boxes

diff -r af25e2951d08 -r efc8f188db6e po/el.po
--- a/po/el.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/el.po	Sat Nov 21 17:50:14 2015 +0200
@@ -46,6 +46,10 @@
 msgid "N"
 msgstr "N"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "16"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "O καθρέπτης (mirror) είναι απρόσιτoς"
diff -r af25e2951d08 -r efc8f188db6e po/es.po
--- a/po/es.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/es.po	Sat Nov 21 17:50:14 2015 +0200
@@ -44,6 +44,10 @@
 msgid "N"
 msgstr "N"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "9"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "No se puede alcanzar el Mirror"
diff -r af25e2951d08 -r efc8f188db6e po/fa.po
--- a/po/fa.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/fa.po	Sat Nov 21 17:50:14 2015 +0200
@@ -47,6 +47,10 @@
 msgid "N"
 msgstr "N"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "14"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "آیینه در دسترس نیست"
diff -r af25e2951d08 -r efc8f188db6e po/fr.po
--- a/po/fr.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/fr.po	Sat Nov 21 17:50:14 2015 +0200
@@ -45,6 +45,10 @@
 msgid "N"
 msgstr "N"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "9"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "Le miroir est inacessible"
diff -r af25e2951d08 -r efc8f188db6e po/pl.po
--- a/po/pl.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/pl.po	Sat Nov 21 17:50:14 2015 +0200
@@ -49,6 +49,10 @@
 msgid "N"
 msgstr "N"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "17"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "Serwer lustrzany jest nieosiągalny"
diff -r af25e2951d08 -r efc8f188db6e po/pt_BR.po
--- a/po/pt_BR.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/pt_BR.po	Sat Nov 21 17:50:14 2015 +0200
@@ -45,6 +45,10 @@
 msgid "N"
 msgstr "N"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "13"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "Mirror indisponível"
diff -r af25e2951d08 -r efc8f188db6e po/ru.po
--- a/po/ru.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/ru.po	Sat Nov 21 17:50:14 2015 +0200
@@ -47,6 +47,10 @@
 msgid "N"
 msgstr "N"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "10"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "Репозиторий недоступен"
diff -r af25e2951d08 -r efc8f188db6e po/slitaz-base.pot
--- a/po/slitaz-base.pot	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/slitaz-base.pot	Sat Nov 21 17:50:14 2015 +0200
@@ -45,6 +45,10 @@
 msgid "N"
 msgstr ""
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr ""
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr ""
diff -r af25e2951d08 -r efc8f188db6e po/sv.po
--- a/po/sv.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/sv.po	Sat Nov 21 17:50:14 2015 +0200
@@ -45,6 +45,10 @@
 msgid "N"
 msgstr "N"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "8"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "Spegeln går inte att nå"
diff -r af25e2951d08 -r efc8f188db6e po/zh_CN.po
--- a/po/zh_CN.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/zh_CN.po	Sat Nov 21 17:50:14 2015 +0200
@@ -46,6 +46,10 @@
 msgid "N"
 msgstr "否"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "8"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "无法连接镜像"
diff -r af25e2951d08 -r efc8f188db6e po/zh_TW.po
--- a/po/zh_TW.po	Thu Oct 08 00:32:28 2015 +0300
+++ b/po/zh_TW.po	Sat Nov 21 17:50:14 2015 +0200
@@ -44,6 +44,10 @@
 msgid "N"
 msgstr "否"
 
+#: rootfs/lib/libtaz.sh:221
+msgid "w"
+msgstr "8"
+
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
 msgstr "無法連接鏡像"
diff -r af25e2951d08 -r efc8f188db6e rootfs/lib/libtaz.sh
--- a/rootfs/lib/libtaz.sh	Thu Oct 08 00:32:28 2015 +0300
+++ b/rootfs/lib/libtaz.sh	Sat Nov 21 17:50:14 2015 +0200
@@ -61,10 +61,8 @@
 			 done=" <span class=\"float-right color$okcolor\">$okmsg</span>"
 			error=" <span class=\"float-right color$ercolor\">$ermsg</span>";;
 		*)
-			local cols=$(get_cols)
-			local scol=$((${cols:-80} - 10))
-			 done="\\033[${scol}G[ \\033[1;${okcolor}m${okmsg}\\033[0;39m ]"
-			error="\\033[${scol}G[ \\033[1;${ercolor}m${ermsg}\\033[0;39m ]";;
+			 done="[ \\033[1;${okcolor}m${okmsg}\\033[0;39m ]"
+			error="[ \\033[1;${ercolor}m${ermsg}\\033[0;39m ]";;
 	esac
 	case $check in
 		0) echo -e "$done";;
@@ -219,9 +217,16 @@
 
 # Print current action
 action() {
+	local w cols scol msg chars padding
+	w=$(_ 'w'); w=${w/w/10}
+	cols=$(get_cols); cols=${cols:-80}; scol=$(( $cols - $w ))
+	msg="$(_n "$@" | fold -sw$scol)"
+	chars=$(echo -n "$msg" | tail -n1 | wc -m); padding=$(( $scol - $chars ))
+	msg="$(printf '%s%'$padding's' "$msg" "")"
+
 	case $output in
-		raw|gtk|html) _n "$@";;
-		*) echo -ne "\033[0;33m$(_ "$@")\033[0m";;
+		raw|gtk|html) echo -n "$msg";;
+		*) echo -ne "\033[0;33m$msg\033[0m";;
 	esac
 }