From 0808cb0833c74957805139723029fe830957cc40 Mon Sep 17 00:00:00 2001
From: Phil Howard <Phil@gadgetoid.com>
Date: Mon, 9 Nov 2015 10:26:52 +0000
Subject: [PATCH] Fix to urlmapper ignore cruft in src, fr tags and encoding

---
 src/fr-FR/template/layout.html | 5 ++++-
 urlmapper.py                   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/fr-FR/template/layout.html b/src/fr-FR/template/layout.html
index cc3ba94..dcce14c 100644
--- a/src/fr-FR/template/layout.html
+++ b/src/fr-FR/template/layout.html
@@ -1,7 +1,8 @@
 <!doctype html>
-<html>
+<html lang="fr-FR">
 	<head>
 		<title>{{title}}</title>
+		<meta http-equiv="content-type" content="text/html;charset=utf-8" />
 		<meta name="description" content="{{description}}" />
 		<link href='//fonts.googleapis.com/css?family=Sanchez|Ubuntu+Mono' rel='stylesheet' type='text/css' />
 		<link href='{{resource_url}}prettify/prettify.css' rel='stylesheet' />
@@ -9,6 +10,7 @@
 		<link href="{{resource_url}}pinout.css?v={{v}}" rel="stylesheet">
 		<link href="{{resource_url}}print.css?v={{v}}" rel="stylesheet" media="print">
 		<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+		{{hreflang}}
     <script type='text/javascript'>
       var _gaq = _gaq || [];
       _gaq.push(['_setAccount', 'UA-32070014-1']);
@@ -27,6 +29,7 @@
 				<li><a href="http://eagle.gadgetoid.com">Leçons Eagle</a></li>
 				<li><a href="https://twitter.com/gadgetoid"><i class="fa fa-twitter"></i> @Gadgetoid</a></li>
 				<li><a href="https://github.com/Gadgetoid/Pinout2"><i class="fa fa-github"></i> Contribuez!</a></li>
+				{{lang_links}}
 			</ul>
 			<h1 class="logo"><a title="Raspberry Pi GPIO Pinout home" href="/pinout"><img src="{{resource_url}}pinout-logo.png" style="top:8px;" /><span>Raspberry Pi</span>n<span class="out">out</span></a></h1>
 			<div class="overlay-container">
diff --git a/urlmapper.py b/urlmapper.py
index d799d1b..f268891 100755
--- a/urlmapper.py
+++ b/urlmapper.py
@@ -84,7 +84,7 @@ def generate_for_lang(lang="en-GB"):
 	return url_lookup
 
 def generate_urls(lang="en-GB"):
-	languages = [l.replace('src/','') for l in glob.glob('src/*')] #  if not l == 'src/'+lang
+	languages = [l.replace('src/','') for l in glob.glob('src/*-*')] #  if not l == 'src/'+lang
 	urls = {}
 	for lang in languages:
 		urls[lang] = generate_for_lang(lang)
