Merge branch 'mainline-0.1' of /srv/git.sesse.net/private/ccbs into mainline-0.1

[ccbs] / html / do-start-round.pl

diff --git a/html/do-start-round.pl b/html/do-start-round.pl
index 6a9738d3c1b2620443130e60162cd23d815ef89c..fe4139a47275680feb39a96f539b669b7b07d827 100755 (executable)
--- a/html/do-start-round.pl
+++ b/html/do-start-round.pl
@@ -40,7 +40,7 @@ if ($round == 1) {
        # First of all, check that there are no null values!
        my $ref = $dbh->selectrow_hashref('SELECT COUNT(*) AS num_incomplete FROM scores WHERE tournament=? AND round=? AND (song IS NULL OR playmode IS NULL OR difficulty IS NULL OR chosen IS NULL or score IS NULL)', undef, $tournament, $round-1);
        if ($ref->{'num_incomplete'} != 0) {
-               ccbs::user_error(_("There's still") . $ref->{'num_incomplete'} . _("songs left in this round which don't have all data registered.");
+               ccbs::user_error(_("There's still") . $ref->{'num_incomplete'} . _("songs left in this round which don't have all data registered."));
        }
 
        # Find out how many people will go on from the _current_ group (ie. the one
@@ -118,7 +118,7 @@ for my $g (1..$num_groups) {
                my $ref = $dbh->selectrow_hashref('SELECT * FROM machinesongs NATURAL JOIN songratings WHERE song NOT IN ( SELECT song FROM randomsongsused ) AND machine=( SELECT machine FROM tournaments WHERE tournament=? ) AND playmode=\'single\' AND difficulty=\'expert\' ORDER BY random() LIMIT 1',
                        undef, $tournament);
                if (!defined($ref)) {
-                       ccbs::user_error(_("There aren't any songs left in the song selector!");
+                       ccbs::user_error(_("There aren't any songs left in the song selector!"));
                }
                $dbh->do('INSERT INTO randomsongsused (song) VALUES (?)',
                        undef, $ref->{'song'});