slitaz-base-files rev 180
New function unboldify(); I think, they will be handy
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon May 21 11:34:18 2012 +0300 (2012-05-21) |
| parents | bffd6c0e7c5b |
| children | 021b49de9f37 |
| files | AUTHORS po/fr.po po/ru.po po/slitaz-base.pot rootfs/lib/libtaz.sh rootfs/usr/bin/man testsuite.sh |
line diff
1.1 --- a/AUTHORS Mon May 21 10:44:59 2012 +0300 1.2 +++ b/AUTHORS Mon May 21 11:34:18 2012 +0300 1.3 @@ -1,3 +1,4 @@ 1.4 Christophe Lincoln <pankso@slitaz.org> 1.5 Pascal Bellard <pascal.bellard@slitaz.org> 1.6 Paul Issot <paul@slitaz.org> 1.7 +Aleksej Bobylev <al.bobylev@gmail.com>
2.1 --- a/po/fr.po Mon May 21 10:44:59 2012 +0300 2.2 +++ b/po/fr.po Mon May 21 11:34:18 2012 +0300 2.3 @@ -7,7 +7,7 @@ 2.4 msgstr "" 2.5 "Project-Id-Version: SliTaz Base\n" 2.6 "Report-Msgid-Bugs-To: \n" 2.7 -"POT-Creation-Date: 2012-05-21 10:33+0300\n" 2.8 +"POT-Creation-Date: 2012-05-21 11:30+0300\n" 2.9 "PO-Revision-Date: 2012-05-17 09:09+0100\n" 2.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 2.11 "Language-Team: French\n" 2.12 @@ -25,23 +25,23 @@ 2.13 msgid "Failed" 2.14 msgstr "Echec" 2.15 2.16 -#: rootfs/lib/libtaz.sh:121 2.17 +#: rootfs/lib/libtaz.sh:132 2.18 msgid "You must be root to execute:" 2.19 msgstr "Vous devez être root pour exécuter:" 2.20 2.21 -#: rootfs/lib/libtaz.sh:134 2.22 +#: rootfs/lib/libtaz.sh:145 2.23 msgid "y" 2.24 msgstr "o" 2.25 2.26 -#: rootfs/lib/libtaz.sh:135 2.27 +#: rootfs/lib/libtaz.sh:146 2.28 msgid "Y" 2.29 msgstr "O" 2.30 2.31 -#: rootfs/lib/libtaz.sh:136 2.32 +#: rootfs/lib/libtaz.sh:147 2.33 msgid "n" 2.34 msgstr "n" 2.35 2.36 -#: rootfs/lib/libtaz.sh:137 2.37 +#: rootfs/lib/libtaz.sh:148 2.38 msgid "N" 2.39 msgstr "N" 2.40 2.41 @@ -50,32 +50,32 @@ 2.42 msgid "$file is not a tazpkg. Exiting" 2.43 msgstr "n'est pas un tazpkg. Arrêt" 2.44 2.45 -#: rootfs/var/www/cgi-bin/cgi-env.sh:10 rootfs/var/www/cgi-bin/cgi-env.sh:17 2.46 +#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 2.47 msgid "CGI SHell Environment" 2.48 msgstr "" 2.49 2.50 -#: rootfs/var/www/cgi-bin/cgi-env.sh:23 2.51 +#: rootfs/var/www/cgi-bin/cgi-env.sh:30 2.52 msgid "" 2.53 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 2.54 "SHell script meet the web! Here you can check HTTP info and try some " 2.55 "requests." 2.56 msgstr "" 2.57 2.58 -#: rootfs/var/www/cgi-bin/cgi-env.sh:27 2.59 +#: rootfs/var/www/cgi-bin/cgi-env.sh:34 2.60 msgid "" 2.61 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 2.62 "like syntax such as: $(GET var)" 2.63 msgstr "" 2.64 2.65 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 2.66 +#: rootfs/var/www/cgi-bin/cgi-env.sh:37 2.67 msgid "QUERY_STRING test:" 2.68 msgstr "" 2.69 2.70 -#: rootfs/var/www/cgi-bin/cgi-env.sh:35 2.71 +#: rootfs/var/www/cgi-bin/cgi-env.sh:42 2.72 msgid "HTTP Info" 2.73 msgstr "" 2.74 2.75 -#: rootfs/var/www/cgi-bin/cgi-env.sh:40 2.76 +#: rootfs/var/www/cgi-bin/cgi-env.sh:47 2.77 msgid "HTTP Helper" 2.78 msgstr "" 2.79 2.80 @@ -93,11 +93,7 @@ 2.81 msgstr "" 2.82 2.83 #: rootfs/usr/bin/man:30 2.84 -msgid "Usage:" 2.85 -msgstr "" 2.86 - 2.87 -#: rootfs/usr/bin/man:30 2.88 -msgid "man [section] command" 2.89 +msgid "<b>Usage:</b> man [section] command" 2.90 msgstr "" 2.91 2.92 #: rootfs/usr/bin/man:78
3.1 --- a/po/ru.po Mon May 21 10:44:59 2012 +0300 3.2 +++ b/po/ru.po Mon May 21 11:34:18 2012 +0300 3.3 @@ -7,8 +7,8 @@ 3.4 msgstr "" 3.5 "Project-Id-Version: SliTaz Base\n" 3.6 "Report-Msgid-Bugs-To: \n" 3.7 -"POT-Creation-Date: 2012-05-21 10:33+0300\n" 3.8 -"PO-Revision-Date: 2012-05-21 10:35+0300\n" 3.9 +"POT-Creation-Date: 2012-05-21 11:30+0300\n" 3.10 +"PO-Revision-Date: 2012-05-21 11:32+0300\n" 3.11 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 3.12 "Language-Team: \n" 3.13 "Language: ru\n" 3.14 @@ -27,23 +27,23 @@ 3.15 msgid "Failed" 3.16 msgstr "Ошибка" 3.17 3.18 -#: rootfs/lib/libtaz.sh:121 3.19 +#: rootfs/lib/libtaz.sh:132 3.20 msgid "You must be root to execute:" 3.21 msgstr "Вы должны обладать правами root для запуска:" 3.22 3.23 -#: rootfs/lib/libtaz.sh:134 3.24 +#: rootfs/lib/libtaz.sh:145 3.25 msgid "y" 3.26 msgstr "" 3.27 3.28 -#: rootfs/lib/libtaz.sh:135 3.29 +#: rootfs/lib/libtaz.sh:146 3.30 msgid "Y" 3.31 msgstr "" 3.32 3.33 -#: rootfs/lib/libtaz.sh:136 3.34 +#: rootfs/lib/libtaz.sh:147 3.35 msgid "n" 3.36 msgstr "" 3.37 3.38 -#: rootfs/lib/libtaz.sh:137 3.39 +#: rootfs/lib/libtaz.sh:148 3.40 msgid "N" 3.41 msgstr "" 3.42 3.43 @@ -52,28 +52,28 @@ 3.44 msgid "$file is not a tazpkg. Exiting" 3.45 msgstr "Файл $file не является пакетом. Выход" 3.46 3.47 -#: rootfs/var/www/cgi-bin/cgi-env.sh:10 3.48 #: rootfs/var/www/cgi-bin/cgi-env.sh:17 3.49 +#: rootfs/var/www/cgi-bin/cgi-env.sh:24 3.50 msgid "CGI SHell Environment" 3.51 msgstr "Переменные окружения CGI" 3.52 3.53 -#: rootfs/var/www/cgi-bin/cgi-env.sh:23 3.54 +#: rootfs/var/www/cgi-bin/cgi-env.sh:30 3.55 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." 3.56 msgstr "Добро пожаловать на сервер, работающий на SliTaz. Пусть мощь скриптов послужит вебу. Здесь вы можете проверить информацию HTTP и попробовать сделать некоторые запросы." 3.57 3.58 -#: rootfs/var/www/cgi-bin/cgi-env.sh:27 3.59 +#: rootfs/var/www/cgi-bin/cgi-env.sh:34 3.60 msgid "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-like syntax such as: $(GET var)" 3.61 msgstr "Включив /usr/lib/slitaz/httphelper.sh в ваши скрипты, вы сможете использовать PHP-подобный синтаксис: $(GET var)" 3.62 3.63 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 3.64 +#: rootfs/var/www/cgi-bin/cgi-env.sh:37 3.65 msgid "QUERY_STRING test:" 3.66 msgstr "Тест QUERY_STRING:" 3.67 3.68 -#: rootfs/var/www/cgi-bin/cgi-env.sh:35 3.69 +#: rootfs/var/www/cgi-bin/cgi-env.sh:42 3.70 msgid "HTTP Info" 3.71 msgstr "Информация HTTP" 3.72 3.73 -#: rootfs/var/www/cgi-bin/cgi-env.sh:40 3.74 +#: rootfs/var/www/cgi-bin/cgi-env.sh:47 3.75 msgid "HTTP Helper" 3.76 msgstr "Помощник HTTP" 3.77 3.78 @@ -92,12 +92,8 @@ 3.79 msgstr "Для его установки выполните: su -c 'tazpkg get-install retawq'" 3.80 3.81 #: rootfs/usr/bin/man:30 3.82 -msgid "Usage:" 3.83 -msgstr "Использование:" 3.84 - 3.85 -#: rootfs/usr/bin/man:30 3.86 -msgid "man [section] command" 3.87 -msgstr "man [раздел] команда" 3.88 +msgid "<b>Usage:</b> man [section] command" 3.89 +msgstr "<b>Использование:</b> man [раздел] команда" 3.90 3.91 #: rootfs/usr/bin/man:78 3.92 #, sh-format
4.1 --- a/po/slitaz-base.pot Mon May 21 10:44:59 2012 +0300 4.2 +++ b/po/slitaz-base.pot Mon May 21 11:34:18 2012 +0300 4.3 @@ -8,7 +8,7 @@ 4.4 msgstr "" 4.5 "Project-Id-Version: SliTaz Base\n" 4.6 "Report-Msgid-Bugs-To: \n" 4.7 -"POT-Creation-Date: 2012-05-21 10:33+0300\n" 4.8 +"POT-Creation-Date: 2012-05-21 11:30+0300\n" 4.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 4.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 4.11 "Language-Team: LANGUAGE <LL@li.org>\n" 4.12 @@ -25,23 +25,23 @@ 4.13 msgid "Failed" 4.14 msgstr "" 4.15 4.16 -#: rootfs/lib/libtaz.sh:121 4.17 +#: rootfs/lib/libtaz.sh:132 4.18 msgid "You must be root to execute:" 4.19 msgstr "" 4.20 4.21 -#: rootfs/lib/libtaz.sh:134 4.22 +#: rootfs/lib/libtaz.sh:145 4.23 msgid "y" 4.24 msgstr "" 4.25 4.26 -#: rootfs/lib/libtaz.sh:135 4.27 +#: rootfs/lib/libtaz.sh:146 4.28 msgid "Y" 4.29 msgstr "" 4.30 4.31 -#: rootfs/lib/libtaz.sh:136 4.32 +#: rootfs/lib/libtaz.sh:147 4.33 msgid "n" 4.34 msgstr "" 4.35 4.36 -#: rootfs/lib/libtaz.sh:137 4.37 +#: rootfs/lib/libtaz.sh:148 4.38 msgid "N" 4.39 msgstr "" 4.40 4.41 @@ -50,32 +50,32 @@ 4.42 msgid "$file is not a tazpkg. Exiting" 4.43 msgstr "" 4.44 4.45 -#: rootfs/var/www/cgi-bin/cgi-env.sh:10 rootfs/var/www/cgi-bin/cgi-env.sh:17 4.46 +#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24 4.47 msgid "CGI SHell Environment" 4.48 msgstr "" 4.49 4.50 -#: rootfs/var/www/cgi-bin/cgi-env.sh:23 4.51 +#: rootfs/var/www/cgi-bin/cgi-env.sh:30 4.52 msgid "" 4.53 "Welcome to the SliTaz web server CGI Shell environment. Let the power of " 4.54 "SHell script meet the web! Here you can check HTTP info and try some " 4.55 "requests." 4.56 msgstr "" 4.57 4.58 -#: rootfs/var/www/cgi-bin/cgi-env.sh:27 4.59 +#: rootfs/var/www/cgi-bin/cgi-env.sh:34 4.60 msgid "" 4.61 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-" 4.62 "like syntax such as: $(GET var)" 4.63 msgstr "" 4.64 4.65 -#: rootfs/var/www/cgi-bin/cgi-env.sh:30 4.66 +#: rootfs/var/www/cgi-bin/cgi-env.sh:37 4.67 msgid "QUERY_STRING test:" 4.68 msgstr "" 4.69 4.70 -#: rootfs/var/www/cgi-bin/cgi-env.sh:35 4.71 +#: rootfs/var/www/cgi-bin/cgi-env.sh:42 4.72 msgid "HTTP Info" 4.73 msgstr "" 4.74 4.75 -#: rootfs/var/www/cgi-bin/cgi-env.sh:40 4.76 +#: rootfs/var/www/cgi-bin/cgi-env.sh:47 4.77 msgid "HTTP Helper" 4.78 msgstr "" 4.79 4.80 @@ -93,11 +93,7 @@ 4.81 msgstr "" 4.82 4.83 #: rootfs/usr/bin/man:30 4.84 -msgid "Usage:" 4.85 -msgstr "" 4.86 - 4.87 -#: rootfs/usr/bin/man:30 4.88 -msgid "man [section] command" 4.89 +msgid "<b>Usage:</b> man [section] command" 4.90 msgstr "" 4.91 4.92 #: rootfs/usr/bin/man:78
5.1 --- a/rootfs/lib/libtaz.sh Mon May 21 10:44:59 2012 +0300 5.2 +++ b/rootfs/lib/libtaz.sh Mon May 21 11:34:18 2012 +0300 5.3 @@ -93,6 +93,17 @@ 5.4 esac 5.5 } 5.6 5.7 +# Better to keep messages unsplitted 5.8 +# Example: unboldify "My <b>pretty</b> function ;)" 5.9 +unboldify() { 5.10 + case $output in 5.11 + raw) echo "$@" | sed -e 's|<b>||g;s|</b>||g' ;; 5.12 + gtk) echo "$@" ;; 5.13 + html) echo "$@" | sed -e 's|<b>|<strong>|g;s|</b>|</strong>|g' ;; 5.14 + *) echo -e "$(echo "$@" | sed -e 's|<b>|\\033[1m|g;s|</b>|\\033[0m|g')" ;; 5.15 + esac 5.16 +} 5.17 + 5.18 # Usage: colorize "Message" colorNB or use --color=NB option 5.19 # when running a tool. Default to white/38 and no html or gtk. 5.20 colorize() {
6.1 --- a/rootfs/usr/bin/man Mon May 21 10:44:59 2012 +0300 6.2 +++ b/rootfs/usr/bin/man Mon May 21 11:34:18 2012 +0300 6.3 @@ -27,7 +27,7 @@ 6.4 ''|-*) 6.5 cat <<EOT 6.6 6.7 -$(boldify "$(gettext 'Usage:')") $(gettext "man [section] command") 6.8 +unboldify "$(gettext '<b>Usage:</b> man [section] command')" 6.9 6.10 EOT 6.11 return ;;
7.1 --- a/testsuite.sh Mon May 21 10:44:59 2012 +0300 7.2 +++ b/testsuite.sh Mon May 21 11:34:18 2012 +0300 7.3 @@ -13,6 +13,9 @@ 7.4 echo -n "Checking libtaz.sh: boldify() " 7.5 boldify "Message" 7.6 7.7 + echo -n "Checking libtaz.sh: unboldify() " 7.8 + unboldify "It's a <b>sample</b> message" 7.9 + 7.10 echo -n "Checking libtaz.sh: colorize() " 7.11 echo -n $(colorize 33 "Message ") 7.12 echo -n $(colorize 35 "Message ")