# HG changeset patch # User Paul Issott # Date 1333489825 -3600 # Node ID 4e45eb4505ebe0967af4184dccb1dd7d7d97e429 # Parent 6f171d79db652977a3520c5c446783e2eed65ad9 Tiny edits diff -r 6f171d79db65 -r 4e45eb4505eb README --- a/README Tue Apr 03 19:51:05 2012 +0200 +++ b/README Tue Apr 03 22:50:25 2012 +0100 @@ -2,18 +2,18 @@ ================================================================================ -The SliTaz Project have setup and tried several bug trackers but ther wher never -adopted by the main developers. This is an attemp to change that by providong -a radicaly simple tool well integrated wirh SliTaz packages Cooker, Cookiso, +The SliTaz Project have setup and tried several bug trackers but they were never +adopted by the main developers. This is an attempt to change that by providing +a radically simple tool well integrated with the SliTaz packages Cooker, Cookiso, Roadmap and other sites such as the wiki and forum. -Users data are securely stored outside of the web server document root. Password +Users data are securely stored outside of the web server document root. Passwords are crypted with MD5 and also stored outside of the document root. Your ID key -is the MD5 sum of your login, mail and password +is the MD5 sum of your login, mail and password. -TazBug is simple to use, 2 type of status exist: OPEN and CLOSED and 2 priority -level are handled. Affected packages name can be added to the bug and the all -bug configuration file can be edited. +TazBug is simple to use, 2 types of status exists: OPEN and CLOSED and 2 priority +levels are handled. Affected packages names can be added to the bug and the all +bug configuration files can be edited. TazBug Goals @@ -22,7 +22,7 @@ * Simple to use with a clean and modern interface * Client side cmdline tool to post bugs and messages * Full desktop integration with GTK boxes or local CGI script - * Use http://paste.slitaz.org/ for attached files + * Use http://paste.slitaz.org/ for attaching files * Use shared accounts with other sites to have only one login @@ -38,7 +38,7 @@ Installation ------------ TazBug should work on any SliTaz system and can be used as a Bug Tracker for -your project. You can grab last source from SliTaz Mercurial repositories or +your project. You can grab last sources from SliTaz Mercurial repositories or a release tarball from SliTaz mirrors. You need a web server with CGI support and SliTaz httphelper in /usr/lib/slitaz as well as Busybox HTTPd applet. diff -r 6f171d79db65 -r 4e45eb4505eb tazbug --- a/tazbug Tue Apr 03 19:51:05 2012 +0200 +++ b/tazbug Tue Apr 03 22:50:25 2012 +0100 @@ -1,6 +1,6 @@ #!/bin/sh # -# TazBug Command line tool. Help crypt password, key and post on the +# TazBug Command line tool. Help to encrypt password, key and post on the # the server side. # # Copyright (C) 2012 SliTaz GNU/Linux - BSD License @@ -122,7 +122,7 @@ . $conf || exit 1 gen_key $USER $MAIL $pass ;; gen-config) - # Recreate a config file if value have change sites must be updated + # Recreate a config file if values have changed sites must be updated check_info_args gen_config gen_key ;; @@ -131,8 +131,8 @@ check_info_args echo "" echo "Sending account request for: $name ($user)" - # 'gen_key user:mail:passwd' localy but dont send it. It will be - # generated on server from the user login, mail and cryted password + # 'gen_key user:mail:passwd' localy but don't send it. It will be + # generated on server from the user login, mail and encryted password # so it is not transmited in GET urls. gen_config pass=$(crypt_pass $pass) diff -r 6f171d79db65 -r 4e45eb4505eb tazbug-box --- a/tazbug-box Tue Apr 03 19:51:05 2012 +0200 +++ b/tazbug-box Tue Apr 03 22:50:25 2012 +0100 @@ -1,6 +1,6 @@ #!/bin/sh # -# SliTaz Bug GUI tool. All the account part may move to slitaz-account +# SliTaz Bug GUI tool. All the account's parts may move to slitaz-account # if we use it for other sites and services so we use one centralized # SliTaz account. # diff -r 6f171d79db65 -r 4e45eb4505eb web/bug/0/bug.conf --- a/web/bug/0/bug.conf Tue Apr 03 19:51:05 2012 +0200 +++ b/web/bug/0/bug.conf Tue Apr 03 22:50:25 2012 +0100 @@ -7,4 +7,4 @@ DATE="2012-03-29" PKGS="tazbug" -DESC="The bug description with link and usefull information" +DESC="The bug description with links and useful information" diff -r 6f171d79db65 -r 4e45eb4505eb web/bugs.cgi --- a/web/bugs.cgi Tue Apr 03 19:51:05 2012 +0200 +++ b/web/bugs.cgi Tue Apr 03 22:50:25 2012 +0100 @@ -109,9 +109,9 @@

$(gettext "Login")

-$(gettext "Not yet and account ? Please signup using SliTaz Bugs formular -from your SliTaz system.

Tip: to attach big files or images, you can use -SliTaz Paste service:") paste.slitaz.org +$(gettext "No account yet? Please signup using the SliTaz Bugs registration +on your SliTaz system.

Tip: to attach big files or images, you can use +SliTaz Paste services:") paste.slitaz.org

@@ -183,8 +183,8 @@ done } -# Stripped down Wiki parser for bug desc and messages wich are simply -# displyed in
+# Stripped down Wiki parser for bug desc and messages which are simply
+# displayed in 
 wiki_parser() {
 	sed \
 		-e s"#http://\([^']*\).png#[ Image ]#"g \
@@ -496,7 +496,7 @@
 		if check_auth; then
 			new_bug_page
 		else
-			echo "

$(gettext "You must be logged to post a new bug")

" + echo "

$(gettext "You must be logged in to post a new bug")

" fi html_footer ;; *\ addbug\ *) @@ -538,7 +538,7 @@ user="$(GET signup)" echo "Requested user login : $user" if fgrep -q "$user:" $AUTH_FILE; then - echo "ERROR: User already exist" && exit 1 + echo "ERROR: User already exists" && exit 1 else echo "Creating account for : $(GET name)" new_user_config