# HG changeset patch # User Aleksej Bobylev # Date 1337589258 -10800 # Node ID d8adb319ac56c8a3dc7503db748cf0ec76a298fb # Parent bffd6c0e7c5b50fe85fb4d14641cdb564d9ea27e New function unboldify(); I think, they will be handy diff -r bffd6c0e7c5b -r d8adb319ac56 AUTHORS --- a/AUTHORS Mon May 21 10:44:59 2012 +0300 +++ b/AUTHORS Mon May 21 11:34:18 2012 +0300 @@ -1,3 +1,4 @@ Christophe Lincoln Pascal Bellard Paul Issot +Aleksej Bobylev diff -r bffd6c0e7c5b -r d8adb319ac56 po/fr.po --- a/po/fr.po Mon May 21 10:44:59 2012 +0300 +++ b/po/fr.po Mon May 21 11:34:18 2012 +0300 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-21 10:33+0300\n" +"POT-Creation-Date: 2012-05-21 11:30+0300\n" "PO-Revision-Date: 2012-05-17 09:09+0100\n" "Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" @@ -25,23 +25,23 @@ msgid "Failed" msgstr "Echec" -#: rootfs/lib/libtaz.sh:121 +#: rootfs/lib/libtaz.sh:132 msgid "You must be root to execute:" msgstr "Vous devez être root pour exécuter:" -#: rootfs/lib/libtaz.sh:134 +#: rootfs/lib/libtaz.sh:145 msgid "y" msgstr "o" -#: rootfs/lib/libtaz.sh:135 +#: rootfs/lib/libtaz.sh:146 msgid "Y" msgstr "O" -#: rootfs/lib/libtaz.sh:136 +#: rootfs/lib/libtaz.sh:147 msgid "n" msgstr "n" -#: rootfs/lib/libtaz.sh:137 +#: rootfs/lib/libtaz.sh:148 msgid "N" msgstr "N" @@ -50,32 +50,32 @@ msgid "$file is not a tazpkg. Exiting" msgstr "n'est pas un tazpkg. Arrêt" -#: rootfs/var/www/cgi-bin/cgi-env.sh:10 rootfs/var/www/cgi-bin/cgi-env.sh:17 +#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 msgid "CGI SHell Environment" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:23 +#: rootfs/var/www/cgi-bin/cgi-env.sh:30 msgid "" "Welcome to the SliTaz web server CGI Shell environment. Let the power of " "SHell script meet the web! Here you can check HTTP info and try some " "requests." msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:27 +#: rootfs/var/www/cgi-bin/cgi-env.sh:34 msgid "" "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" "like syntax such as: $(GET var)" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 +#: rootfs/var/www/cgi-bin/cgi-env.sh:37 msgid "QUERY_STRING test:" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:35 +#: rootfs/var/www/cgi-bin/cgi-env.sh:42 msgid "HTTP Info" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:40 +#: rootfs/var/www/cgi-bin/cgi-env.sh:47 msgid "HTTP Helper" msgstr "" @@ -93,11 +93,7 @@ msgstr "" #: rootfs/usr/bin/man:30 -msgid "Usage:" -msgstr "" - -#: rootfs/usr/bin/man:30 -msgid "man [section] command" +msgid "Usage: man [section] command" msgstr "" #: rootfs/usr/bin/man:78 diff -r bffd6c0e7c5b -r d8adb319ac56 po/ru.po --- a/po/ru.po Mon May 21 10:44:59 2012 +0300 +++ b/po/ru.po Mon May 21 11:34:18 2012 +0300 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-21 10:33+0300\n" -"PO-Revision-Date: 2012-05-21 10:35+0300\n" +"POT-Creation-Date: 2012-05-21 11:30+0300\n" +"PO-Revision-Date: 2012-05-21 11:32+0300\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" "Language: ru\n" @@ -27,23 +27,23 @@ msgid "Failed" msgstr "Ошибка" -#: rootfs/lib/libtaz.sh:121 +#: rootfs/lib/libtaz.sh:132 msgid "You must be root to execute:" msgstr "Вы должны обладать правами root для запуска:" -#: rootfs/lib/libtaz.sh:134 +#: rootfs/lib/libtaz.sh:145 msgid "y" msgstr "" -#: rootfs/lib/libtaz.sh:135 +#: rootfs/lib/libtaz.sh:146 msgid "Y" msgstr "" -#: rootfs/lib/libtaz.sh:136 +#: rootfs/lib/libtaz.sh:147 msgid "n" msgstr "" -#: rootfs/lib/libtaz.sh:137 +#: rootfs/lib/libtaz.sh:148 msgid "N" msgstr "" @@ -52,28 +52,28 @@ msgid "$file is not a tazpkg. Exiting" msgstr "Файл $file не является пакетом. Выход" -#: rootfs/var/www/cgi-bin/cgi-env.sh:10 #: rootfs/var/www/cgi-bin/cgi-env.sh:17 +#: rootfs/var/www/cgi-bin/cgi-env.sh:24 msgid "CGI SHell Environment" msgstr "Переменные окружения CGI" -#: rootfs/var/www/cgi-bin/cgi-env.sh:23 +#: rootfs/var/www/cgi-bin/cgi-env.sh:30 msgid "Welcome to the SliTaz web server CGI Shell environment. Let the power of SHell script meet the web! Here you can check HTTP info and try some requests." msgstr "Добро пожаловать на сервер, работающий на SliTaz. Пусть мощь скриптов послужит вебу. Здесь вы можете проверить информацию HTTP и попробовать сделать некоторые запросы." -#: rootfs/var/www/cgi-bin/cgi-env.sh:27 +#: rootfs/var/www/cgi-bin/cgi-env.sh:34 msgid "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-like syntax such as: $(GET var)" msgstr "Включив /usr/lib/slitaz/httphelper.sh в ваши скрипты, вы сможете использовать PHP-подобный синтаксис: $(GET var)" -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 +#: rootfs/var/www/cgi-bin/cgi-env.sh:37 msgid "QUERY_STRING test:" msgstr "Тест QUERY_STRING:" -#: rootfs/var/www/cgi-bin/cgi-env.sh:35 +#: rootfs/var/www/cgi-bin/cgi-env.sh:42 msgid "HTTP Info" msgstr "Информация HTTP" -#: rootfs/var/www/cgi-bin/cgi-env.sh:40 +#: rootfs/var/www/cgi-bin/cgi-env.sh:47 msgid "HTTP Helper" msgstr "Помощник HTTP" @@ -92,12 +92,8 @@ msgstr "Для его установки выполните: su -c 'tazpkg get-install retawq'" #: rootfs/usr/bin/man:30 -msgid "Usage:" -msgstr "Использование:" - -#: rootfs/usr/bin/man:30 -msgid "man [section] command" -msgstr "man [раздел] команда" +msgid "Usage: man [section] command" +msgstr "Использование: man [раздел] команда" #: rootfs/usr/bin/man:78 #, sh-format diff -r bffd6c0e7c5b -r d8adb319ac56 po/slitaz-base.pot --- a/po/slitaz-base.pot Mon May 21 10:44:59 2012 +0300 +++ b/po/slitaz-base.pot Mon May 21 11:34:18 2012 +0300 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-21 10:33+0300\n" +"POT-Creation-Date: 2012-05-21 11:30+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,23 +25,23 @@ msgid "Failed" msgstr "" -#: rootfs/lib/libtaz.sh:121 +#: rootfs/lib/libtaz.sh:132 msgid "You must be root to execute:" msgstr "" -#: rootfs/lib/libtaz.sh:134 +#: rootfs/lib/libtaz.sh:145 msgid "y" msgstr "" -#: rootfs/lib/libtaz.sh:135 +#: rootfs/lib/libtaz.sh:146 msgid "Y" msgstr "" -#: rootfs/lib/libtaz.sh:136 +#: rootfs/lib/libtaz.sh:147 msgid "n" msgstr "" -#: rootfs/lib/libtaz.sh:137 +#: rootfs/lib/libtaz.sh:148 msgid "N" msgstr "" @@ -50,32 +50,32 @@ msgid "$file is not a tazpkg. Exiting" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:10 rootfs/var/www/cgi-bin/cgi-env.sh:17 +#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 msgid "CGI SHell Environment" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:23 +#: rootfs/var/www/cgi-bin/cgi-env.sh:30 msgid "" "Welcome to the SliTaz web server CGI Shell environment. Let the power of " "SHell script meet the web! Here you can check HTTP info and try some " "requests." msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:27 +#: rootfs/var/www/cgi-bin/cgi-env.sh:34 msgid "" "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" "like syntax such as: $(GET var)" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 +#: rootfs/var/www/cgi-bin/cgi-env.sh:37 msgid "QUERY_STRING test:" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:35 +#: rootfs/var/www/cgi-bin/cgi-env.sh:42 msgid "HTTP Info" msgstr "" -#: rootfs/var/www/cgi-bin/cgi-env.sh:40 +#: rootfs/var/www/cgi-bin/cgi-env.sh:47 msgid "HTTP Helper" msgstr "" @@ -93,11 +93,7 @@ msgstr "" #: rootfs/usr/bin/man:30 -msgid "Usage:" -msgstr "" - -#: rootfs/usr/bin/man:30 -msgid "man [section] command" +msgid "Usage: man [section] command" msgstr "" #: rootfs/usr/bin/man:78 diff -r bffd6c0e7c5b -r d8adb319ac56 rootfs/lib/libtaz.sh --- a/rootfs/lib/libtaz.sh Mon May 21 10:44:59 2012 +0300 +++ b/rootfs/lib/libtaz.sh Mon May 21 11:34:18 2012 +0300 @@ -93,6 +93,17 @@ esac } +# Better to keep messages unsplitted +# Example: unboldify "My pretty function ;)" +unboldify() { + case $output in + raw) echo "$@" | sed -e 's|||g;s|||g' ;; + gtk) echo "$@" ;; + html) echo "$@" | sed -e 's|||g;s|||g' ;; + *) echo -e "$(echo "$@" | sed -e 's||\\033[1m|g;s||\\033[0m|g')" ;; + esac +} + # Usage: colorize "Message" colorNB or use --color=NB option # when running a tool. Default to white/38 and no html or gtk. colorize() { diff -r bffd6c0e7c5b -r d8adb319ac56 rootfs/usr/bin/man --- a/rootfs/usr/bin/man Mon May 21 10:44:59 2012 +0300 +++ b/rootfs/usr/bin/man Mon May 21 11:34:18 2012 +0300 @@ -27,7 +27,7 @@ ''|-*) cat <Usage: man [section] command')" EOT return ;; diff -r bffd6c0e7c5b -r d8adb319ac56 testsuite.sh --- a/testsuite.sh Mon May 21 10:44:59 2012 +0300 +++ b/testsuite.sh Mon May 21 11:34:18 2012 +0300 @@ -13,6 +13,9 @@ echo -n "Checking libtaz.sh: boldify() " boldify "Message" + echo -n "Checking libtaz.sh: unboldify() " + unboldify "It's a sample message" + echo -n "Checking libtaz.sh: colorize() " echo -n $(colorize 33 "Message ") echo -n $(colorize 35 "Message ")