X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fcommon.pm;h=15c698bb539bd3daf3f7ef5d5f9664d16d043546;hb=fde909c294de9806dd6337f5acb0ed87c41557c6;hp=207bfe9297d836b2e7a8fa979ad1bf1725dfbe6e;hpb=cec2dc50dba0555927a1c19cfc0126955e7713dc;p=wloh

diff --git a/include/common.pm b/include/common.pm
index 207bfe9..15c698b 100644
--- a/include/common.pm
+++ b/include/common.pm
@@ -60,7 +60,7 @@ sub get_navbar {
 
 	print "<p style=\"font-size: smaller;\">";
 
-	my $q = $dbh->prepare('SELECT spraak, kultur FROM fotballspraak WHERE nyestesesong <> -1 ORDER BY id');
+	my $q = $dbh->prepare('SELECT spraak, kultur FROM fotballspraak WHERE nyestesesong <> -1 AND length(kultur)=5 ORDER BY id');
 	$q->execute;
 
 	my @languages = ();
@@ -75,9 +75,9 @@ sub get_navbar {
 
 		if ($ref->{'kultur'} eq $locale) {
 			$lang{'lang-with-link'} = '';
-			$lang{'lang-no-link'} = $ref->{'spraak'};
+			$lang{'lang-no-link'} = Encode::decode_utf8($ref->{'spraak'});
 		} else {
-			$lang{'a'} = $ref->{'spraak'};
+			$lang{'a'} = Encode::decode_utf8($ref->{'spraak'});
 			$lang{'a/href'} = sprintf "/%s/%s", $ref->{'kultur'}, $url;
 			$lang{'lang-no-link'} = '';
 		}
@@ -87,31 +87,6 @@ sub get_navbar {
 	return \@languages;
 }
 
-sub print_navbar {
-	my ($cgi, $dbh, $locale) = @_;
-	my $url = $cgi->url(-relative => 1);
-
-	print "<p style=\"font-size: smaller;\">";
-
-	my $q = $dbh->prepare('SELECT spraak, kultur FROM fotballspraak WHERE nyestesesong <> -1 ORDER BY id');
-	$q->execute;
-
-	my $first = 1;
-	while (my $ref = $q->fetchrow_hashref) {
-		if (!$first) {
-			print " :: ";
-		}
-		$first = 0;
-
-		if ($ref->{'kultur'} eq $locale) {
-			printf "%s ", $ref->{'spraak'};
-		} else {
-			printf "<a href=\"/%s/%s\">%s</a> ", $ref->{'kultur'}, $url, $ref->{'spraak'};
-		}
-	}
-	print "</p>\n";
-}
-
 # mapping from locale to translation to use (if not found, "en" is used)
 my %translation_mapping = (
 	'nb-NO' => 'no',
@@ -163,7 +138,7 @@ sub get_ordinal {
 
 sub find_all_locales {
 	my $dbh = shift;
-	my $q = $dbh->prepare('SELECT kultur FROM fotballspraak WHERE nyestesesong<>-1');
+	my $q = $dbh->prepare('SELECT kultur FROM fotballspraak WHERE nyestesesong <> -1 AND length(kultur)=5');
 	$q->execute;
 
 	my @locales = ();