SliTaz Repositories

     1.1 --- a/web/bugs.cgi	Mon May 07 09:26:25 2012 +0200
     1.2 +++ b/web/bugs.cgi	Sun Jul 01 22:26:53 2012 +0000
     1.3 @@ -85,14 +85,14 @@
     1.4  		cat << EOT
     1.5  <div id="user">
     1.6  <a href="?user=$user">$(get_gravatar $MAIL 20)</a>
     1.7 -<a href="?logout">Logout</a>
     1.8 +<a href="?logout">$(gettext 'Log out')</a>
     1.9  </div>
    1.10  EOT
    1.11  	else
    1.12  	cat << EOT
    1.13  <div id="user">
    1.14  	<a href="?login"><img src="images/avatar.png" alt="[ User ]" /></a>
    1.15 -	<a href="?login">Login</a>
    1.16 +	<a href="?login">$(gettext 'Log in')</a>
    1.17  </div>
    1.18  EOT
    1.19  	fi
    1.20 @@ -100,8 +100,8 @@
    1.21  
    1.22  <div id="search">
    1.23  	<form method="get" action="./">
    1.24 -		<input type="text" name="search" placeholder="$(gettext "Search")" />
    1.25 -		<!-- <input type="submit" value="$(gettext "Search")" /> -->
    1.26 +		<input type="text" name="search" placeholder="$(gettext 'Search')" />
    1.27 +		<!-- <input type="submit" value="$(gettext 'Search')" /> -->
    1.28  	</form>
    1.29  </div>
    1.30  
    1.31 @@ -114,21 +114,21 @@
    1.32  # Login page
    1.33  login_page() {
    1.34  	cat << EOT
    1.35 -<h2>$(gettext "Login")</h2>
    1.36 +<h2>$(gettext 'Login')</h2>
    1.37  
    1.38  <div id="account-info">
    1.39 -$(gettext "No account yet? Please signup using the SliTaz Bugs reporter
    1.40 -on your SliTaz system. <p>Tip: to attach big files or images, you can use
    1.41 -SliTaz Paste services:") <a href="http://paste.slitaz.org/">paste.slitaz.org</a>
    1.42 -</p>
    1.43 +<p>$(gettext "No account yet? Please signup using the SliTaz Bugs reporter \
    1.44 +on your SliTaz system.")</p>
    1.45 +<p>$(gettext "Tip: to attach big files or images, you can use SliTaz Paste \
    1.46 +services:") <a href="http://paste.slitaz.org/">paste.slitaz.org</a></p>
    1.47  </div>
    1.48  
    1.49  <div id="login">
    1.50  	<form method="post" action="$SCRIPT_NAME">
    1.51 -		<input type="text" name="auth" placeholder="$(gettext "User name")" />
    1.52 -		<input type="password" name="pass" placeholder="$(gettext "Password")" />
    1.53 +		<input type="text" name="auth" placeholder="$(gettext 'User name')" />
    1.54 +		<input type="password" name="pass" placeholder="$(gettext 'Password')" />
    1.55  		<div>
    1.56 -			<input type="submit" value="Login" />
    1.57 +			<input type="submit" value="$(gettext 'Log in')" />
    1.58  			$error
    1.59  		</div>
    1.60  	</form>
    1.61 @@ -142,7 +142,7 @@
    1.62  public_people() {
    1.63  	cat << EOT
    1.64  <pre>
    1.65 -Real name : $NAME
    1.66 +$(eval_gettext 'Real name  : $NAME')
    1.67  </pre>
    1.68  EOT
    1.69  }
    1.70 @@ -151,16 +151,17 @@
    1.71  auth_people() {
    1.72  	cat << EOT
    1.73  <pre>
    1.74 -Real name  : $NAME
    1.75 -Email      : $MAIL
    1.76 -Secure key : $KEY
    1.77 +$(eval_gettext 'Real name  : $NAME')
    1.78 +$(eval_gettext 'Email      : $MAIL')
    1.79 +$(eval_gettext 'Secure key : $KEY')
    1.80  </pre>
    1.81  EOT
    1.82  }
    1.83  
    1.84  # Usage: list_bugs STATUS
    1.85  list_bugs() {
    1.86 -	echo "<h3>$1 Bugs</h3>"
    1.87 +	bug="$1"
    1.88 +	echo "<h3>$(eval_gettext '$bug Bug')</h3>"
    1.89  	for pr in critical standard
    1.90  	do
    1.91  		for bug in $(fgrep -H "$1" $bugdir/*/bug.conf | cut -d ":" -f 1)
    1.92 @@ -170,9 +171,9 @@
    1.93  			if [ "$PRIORITY" == "$pr" ]; then
    1.94  				cat << EOT
    1.95  <pre>
    1.96 -Bug title  : <strong>$BUG</strong> <a href="?id=$id">Show</a>
    1.97 -ID - Date  : $id - $DATE
    1.98 -Creator    : <a href="?user=$CREATOR">$CREATOR</a>
    1.99 +$(gettext 'Bug title  :') <strong>$BUG</strong> <a href="?id=$id">$(gettext 'Show')</a>
   1.100 +$(gettext 'ID - Date  :') $id - $DATE
   1.101 +$(gettext 'Creator    :') <a href="?user=$CREATOR">$CREATOR</a>
   1.102  </pre>
   1.103  EOT
   1.104  			fi
   1.105 @@ -196,12 +197,15 @@
   1.106  		MAIL="default"
   1.107  	fi
   1.108  	cat << EOT
   1.109 -<h2>Bug $id</h2>
   1.110 +<h2>$(eval_gettext 'Bug $id')</h2>
   1.111  <form method="get" action="./">
   1.112  
   1.113  <p>
   1.114 -	$(get_gravatar $MAIL 32) <strong>$STATUS</strong> $BUG - $DATE - Priority $PRIORITY
   1.115 -	- $msgs messages
   1.116 +	$(get_gravatar $MAIL 32)
   1.117 +	<strong>$STATUS</strong>
   1.118 +	$BUG - $DATE -
   1.119 +	$(eval_gettext 'Priority $PRIORITY') -
   1.120 +	$(eval_ngettext '$msgs message' '$msgs messages' $msgs)
   1.121  </p>
   1.122  
   1.123  <pre>
   1.124 @@ -253,7 +257,7 @@
   1.125  
   1.126  		<input type="hidden" name="id" value="$id" />
   1.127  		<textarea name="msg" rows="8"></textarea>
   1.128 -		<p><input type="submit" value="$(gettext "Send message")" /></p>
   1.129 +		<p><input type="submit" value="$(gettext 'Send message')" /></p>
   1.130  	</form>
   1.131  </div>
   1.132  EOT
   1.133 @@ -347,13 +351,13 @@
   1.134  # Edit/Save a bug configuration file
   1.135  edit_bug() {
   1.136  	cat << EOT
   1.137 -<h2>$(gettext "Edit Bug $bug")</h2>
   1.138 +<h2>$(eval_gettext 'Edit Bug $bug')</h2>
   1.139  <div id="edit">
   1.140  
   1.141  <form method="get" action="./">
   1.142  	<textarea name="bugconf">$(cat $bugdir/$bug/bug.conf)</textarea>
   1.143  	<input type="hidden" name="bug" value="$bug" />
   1.144 -	<input type="submit" value="$(gettext "Save configuration")" />
   1.145 +	<input type="submit" value="$(gettext 'Save configuration')" />
   1.146  </form>
   1.147  
   1.148  </div>
   1.149 @@ -363,7 +367,7 @@
   1.150  save_bug() {
   1.151  	bug="$(GET bug)"
   1.152  	content="$(GET bugconf)"
   1.153 -	sed s'/"/\'/' | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.conf << EOT
   1.154 +	sed "s|\"|'|" | sed "s/$(echo -en '\r') /\n/g" > $bugdir/$bug/bug.conf << EOT
   1.155  $content
   1.156  EOT
   1.157  }
   1.158 @@ -386,7 +390,7 @@
   1.159  	[ "$size" ] || size=48
   1.160  	url="http://www.gravatar.com/avatar"
   1.161  	md5=$(md5crypt $email)
   1.162 -	echo "<img src='$url/$md5?d=identicon&s=$size' alt='' />"
   1.163 +	echo "<img src=\"$url/$md5?d=identicon&amp;s=$size\" alt=\"\" />"
   1.164  }
   1.165  
   1.166  # Create a new user in AUTH_FILE and PEOPLE
   1.167 @@ -469,7 +473,7 @@
   1.168  	*\ login\ *)
   1.169  		# The login page
   1.170  		[ "$(GET error)" ] && \
   1.171 -			error="<span class="error">$(gettext "Bad login or pass")</span>"
   1.172 +			error="<span class='error'>$(gettext 'Bad login or pass')</span>"
   1.173  		header
   1.174  		html_header
   1.175  		user_box
   1.176 @@ -503,7 +507,7 @@
   1.177  		if check_auth; then
   1.178  			new_bug_page
   1.179  		else
   1.180 -			echo "<p>$(gettext "You must be logged in to post a new bug")</p>"
   1.181 +			echo "<p>$(gettext 'You must be logged in to post a new bug')</p>"
   1.182  		fi
   1.183  		html_footer ;;
   1.184  	*\ addbug\ *)
   1.185 @@ -586,7 +590,7 @@
   1.186  <h2>$(gettext "Search")</h2>
   1.187  <form method="get" action="./">
   1.188  	<input type="text" name="search" />
   1.189 -	<input type="submit" value="$(gettext "Search")" />
   1.190 +	<input type="submit" value="$(gettext 'Search')" />
   1.191  </form>
   1.192  <div>
   1.193  EOT
   1.194 @@ -598,13 +602,14 @@
   1.195  			if [ "$result" ]; then
   1.196  				#found=$(($found + 1))
   1.197  				id=${bug#bug/}
   1.198 -				echo "<p><strong>Bug $id</strong> <a href='?id=$id'>$(gettext "Show")</a></p>"
   1.199 +				echo "<p><strong>Bug $id</strong> <a href=\"?id=$id\">"$(gettext 'Show')"</a></p>"
   1.200  				echo '<pre>'
   1.201  				fgrep -i "$(GET search)" $bugdir/$id/* | \
   1.202  					sed s"/$(GET search)/<span class='ok'>$(GET search)<\/span>/"g
   1.203  				echo '</pre>'
   1.204  			else
   1.205 -				gettext "<p>No result found for:"; echo " $(GET search)</p>"
   1.206 +				get_search=$(GET search)
   1.207 +				echo "<p>$(eval_gettext 'No result found for: $get_search')</p>"
   1.208  			fi
   1.209  		done
   1.210  		echo '</div>'
   1.211 @@ -625,26 +630,28 @@
   1.212  <h2>$(gettext "Summary")</h2>
   1.213  
   1.214  <p>
   1.215 -	Bugs: $bugs in total - $close fixed - $fixme to fix - $msgs messages
   1.216 +	$(eval_ngettext 'Bug: $bugs in total -' 'Bugs: $bugs in total -' $bugs)
   1.217 +	$(eval_ngettext '$close fixed -' '$close fixed -' $close)
   1.218 +	$(eval_ngettext '$fixme to fix -' '$fixme to fix -' $fixme)
   1.219 +	$(eval_ngettext '$msgs message' '$msgs messages' $msgs)
   1.220  </p>
   1.221  
   1.222  <div class="pctbar">
   1.223  	<div class="pct" style="width: ${pct}%;">${pct}%</div>
   1.224  </div>
   1.225  
   1.226 -<p>
   1.227 -	Please read the <a href="?README">README</a> for help and more
   1.228 -	information. You may also be interested by the SliTaz
   1.229 -	<a href="http://roadmap.slitaz.org/">Roadmap</a> and the packages
   1.230 -	<a href="http://cook.slitaz.org/">Cooker</a>. To perform a search
   1.231 -	enter your term and press ENTER.
   1.232 +<p>$(gettext "Please read the <a href=\"?README\">README</a> for help and more \
   1.233 +information. You may also be interested by the SliTaz \
   1.234 +<a href=\"http://roadmap.slitaz.org/\">Roadmap</a> and the packages \
   1.235 +<a href=\"http://cook.slitaz.org/\">Cooker</a>. To perform a search \
   1.236 +enter your term and press ENTER.")
   1.237  </p>
   1.238  
   1.239  <div id="tools">
   1.240 -	<a href="?closed">View closed bugs</a>
   1.241 +	<a href="?closed">$(gettext 'View closed bugs')</a>
   1.242  EOT
   1.243  		if check_auth; then
   1.244 -			echo "<a href='?newbug'>$(gettext "Create a new bug")</a>"
   1.245 +			echo "<a href='?newbug'>$(gettext 'Create a new bug')</a>"
   1.246  		fi
   1.247  		cat << EOT
   1.248  </div>