Pull patch into the right branch.

Patches applied:

 * sgunderson@bigfoot.com--2005-private/ccbs--pgweb--1.0--patch-22
   More Norwegifying.

diff --git a/html/players.pl b/html/players.pl
index 8158d4dad06fd3bf774a45828f0eb2179fc838d3..dcce199dbf30c49d76531cbf28695fff3345c6cb 100755 (executable)
--- a/html/players.pl
+++ b/html/players.pl
@@ -12,7 +12,7 @@ my $dbh = ccbs::db_connect();
 my $players = ccbs::db_fetch_all($dbh, 'SELECT player,nick,countryname,clubname,count(*) AS num_songs,COUNT(DISTINCT song) AS num_unique_songs,COUNT(DISTINCT tournament) AS num_tournaments,AVG(score)::integer AS avg_score,MAX(score) AS high_score FROM scores NATURAL JOIN players NATURAL JOIN countries NATURAL LEFT JOIN clubs GROUP BY player,nick,countryname,clubname ORDER BY LOWER(nick)');
 
 ccbs::print_header();
-ccbs::process_template('players.tmpl', 'Players', {
+ccbs::process_template('players.tmpl', 'Spillere', {
        players => $players,
 });
 $dbh->disconnect;

diff --git a/html/songs.pl b/html/songs.pl
index 6ae2469e7f4787fc3470abe578c43269521adb8e..b14087356ecb019ed360855f1a9732869258d929 100755 (executable)
--- a/html/songs.pl
+++ b/html/songs.pl
@@ -12,7 +12,7 @@ my $dbh = ccbs::db_connect();
 my $songs = ccbs::db_fetch_all($dbh, 'SELECT machinename,song,title,artist,avg_score,stddev_score,high_score,high_score_player,high_score_nick FROM machinesongs NATURAL JOIN songs NATURAL JOIN machines NATURAL LEFT JOIN ( SELECT song,AVG(score)::integer AS avg_score,STDDEV(score)::integer AS stddev_score,MAX(score) AS high_score FROM scores GROUP BY song ) t1 NATURAL LEFT JOIN ( SELECT DISTINCT ON (song) song,player AS high_score_player,nick AS high_score_nick,score AS high_score FROM scores NATURAL JOIN players ORDER BY song,score DESC ) t2 ORDER BY machine,LOWER(title)');
 
 ccbs::print_header();
-ccbs::process_template('songs.tmpl', 'Songs', {
+ccbs::process_template('songs.tmpl', 'Sanger', {
        songs => $songs,
 });
 $dbh->disconnect;