Merge pull request #86 from saivann/master

improve translation system

README.md

@@ -8,19 +8,33 @@ Installing dependencies
 # Usage
 
 * update DOWNLOAD\_VERSION in _config.yml
-* run ./_contrib/updatesitemap if you changed a page
 * run jekyll
 * output will be in \_site/
 
-# Translation
+## Translation
+
+### Guidelines
+
+* You must be a native speaker for the language you choose to translate.
+* At least one other reviewer might be required and is highly recommanded.
+* Try to avoid changing the meaning of any statements. If you need to change the meaning of anything, make a note of it and list that in the pull request.
+* Sentences and popular expressions should be adapted so that they sound native in your language.
+
+### How to translate
+
+1. Begin, Run ./_contrib/translate (ISO 639-1 language code) (language name) to create your language. Ex : ./_contrib/translate fr "Français"
+2. Texts, Open .html files in the appropriate folder and in _layouts and translate all human readable english dialogs (without touching the html tags and the page id).
+3. Links, Update the name of each .html file so that it reflects your language and update the links in the .html files accordingly.
+4. Sitemap, Add links to your translated pages in _config.yml under their equivalent english version.
+5. Images, Update the few images that contain text with any vector image editing software like Inkscape.
+6. Languages, Make sure that the languages are listed in alphabetical order in _config.yml
 
-* Find the two letter ISO 639-1 code for your language (fr, en, jp)
-* Run ./_contrib/translate (language code) (language name)
-* Make sure that languages are listed in alphabetical order in _config.yml
-* Rename html files in (lang)/ according to your language. And update links in _layouts/base-(lang).html and (lang)/*.html to reflect your changes.
-* Translate all .html and images files in (lang)/ and _layouts/base-(lang).html
 * A tips for translators, you can preview your work in a simple Google chrome browser with no HTTP server. Just go to the existing english page, open the javascript console with CTRL + SHIFT + J and use the following command to make the page editable : document.body.contentEditable=true
 
+### Update
+
+All changes made in the english version can be easily tracked on github.
+
 ## Advanced Usage
 
 ### Alerts

_config.yml

@@ -3,10 +3,60 @@ ALERT_CLASS:
 ALERT: 
 
 langs:
-- langcode: fr
-  langtext: Français
-- langcode: en
-  langtext: English
+  fr: Français
+  en: English
+  
+section:
+  index:
+    en: 
+    fr: 
+  about:
+    en: about
+    fr: a-propos
+  bitcoin-for-developers:
+    en: bitcoin-for-developers
+    fr: bitcoin-pour-developpeurs
+  bitcoin-for-enthusiasts:
+    en: bitcoin-for-enthusiasts
+    fr: bitcoin-pour-passionnes
+  bitcoin-for-individuals:
+    en: bitcoin-for-individuals
+    fr: bitcoin-pour-particuliers
+  bitcoin-for-organizations:
+    en: bitcoin-for-organizations
+    fr: bitcoin-pour-organisations
+  choose-your-wallet:
+    en: choose-your-wallet
+    fr: choisir-votre-porte-monnaie
+  community:
+    en: community
+    fr: communaute
+  development:
+    en: development
+    fr: developpement
+  download:
+    en: download
+    fr: telecharger
+  foundation:
+    en: foundation
+    fr: fondation
+  how-it-works:
+    en: how-it-works
+    fr: comment-ca-marche
+  resources:
+    en: resources
+    fr: ressources
+  support-bitcoin:
+    en: support-bitcoin
+    fr: supporter-bitcoin
+  version-history:
+    en: version-history
+  vocabulary:
+    en: vocabulary
+    fr: vocabulaire
+  you-need-to-know:
+    en: you-need-to-know
+    fr: vous-devez-savoir
 
 safe:        false
 auto:        false

_contrib/translate

@@ -12,12 +12,9 @@ sed -i "s_href=\"/en/_href=\"/${1}/_g" ${1}/*.html
 sed -i "s_src=\"/en/_src=\"/${1}/_g" ${1}/*.html
 sed -i "s_href=\"/en/_href=\"/${1}/_g" _layouts/base-${1}.html
 sed -i "s_src=\"/en/_src=\"/${1}/_g" _layouts/base-${1}.html
-sed -i "s_langcode: en_langcode: ${1}_g" _layouts/base-${1}.html
-sed -i "s_langtext: English_langtext: ${2}_g" _layouts/base-${1}.html
+sed -i "s_lang: en_lang: ${1}_g" _layouts/base-${1}.html
 sed -i "s/ALERT_CLASS_en/ALERT_CLASS_${1}/g" _layouts/base-${1}.html
 sed -i "s/ALERT_en/ALERT_${1}/g" _layouts/base-${1}.html
-sed -i "/langcode: ${1}/d" _config.yml
-sed -i "/langtext: ${2}/d" _config.yml
-sed -i "/langs:/a - langtext: ${2}" _config.yml
-sed -i "/langs:/a - langcode: ${1}" _config.yml
-sed -i "s_- langtext: ${2}_  langtext: ${2}_g" _config.yml
+sed -i "/${1}: ${2}/d" _config.yml
+sed -i "/langs:/a - ${1}: ${2}" _config.yml
+sed -i "s_- ${1}: ${2}_  ${1}: ${2}_g" _config.yml

_contrib/updatesitemap

@@ -1,26 +0,0 @@
-#!/bin/bash
-#Should be called each time a page is updated, added or removed to update sitemaps
-echo '<?xml version="1.0" encoding="UTF-8"?>' > sitemap.xml
-echo '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' >> sitemap.xml
-for l in *; do
-	if [[ ! -d $l || $l == "_site" || $l == "_layouts" ]]; then
-		continue
-	fi
-	files=`find ${l} -name "*.html" -type f`
-	for f in $files; do
-		c=(${f//"."/ })
-		c=${c[@]:0:1}
-		if [[ $c == "${l}/index" ]]; then
-			c=(${c//"/"/ })
-			c="${c[@]:0:1}/"
-		fi
-		t=$(stat -c "%y" ${f})
-		t=(${t//" "/ })
-		t=${t[@]:0:1}
-		echo "<url>" >> sitemap.xml
-		echo "	<loc>http://bitcoin.org/${c}</loc>" >> sitemap.xml
-		echo "	<lastmod>${t}</lastmod>" >> sitemap.xml
-		echo "</url>" >> sitemap.xml
-	done
-done
-echo '</urlset>' >> sitemap.xml

_layouts/base-en.html

@@ -1,42 +1,38 @@
 ---
-langcode: en
-langtext: English
+lang: en
 menufor:
 - text: Individuals
-  url: /en/bitcoin-for-individuals
+  url: bitcoin-for-individuals
 - text: Organizations
-  url: /en/bitcoin-for-organizations
+  url: bitcoin-for-organizations
 - text: Developers
-  url: /en/bitcoin-for-developers
+  url: bitcoin-for-developers
 - text: Enthusiasts
-  url: /en/bitcoin-for-enthusiasts
+  url: bitcoin-for-enthusiasts
 menu:
 - text: How it works
-  url: /en/how-it-works
+  url: how-it-works
 - text: Vocabulary
-  url: /en/vocabulary
+  url: vocabulary
 - text: Resources
-  url: /en/resources
+  url: resources
 - text: Community
-  url: /en/community
+  url: community
 - text: Development
-  url: /en/development
+  url: development
 - text: Foundation
-  url: /en/foundation
+  url: foundation
 - text: About
-  url: /en/about
+  url: about
 ---
 <!DOCTYPE HTML>
-<html lang="{{ page.langcode }}">
+<html lang="{{ page.lang }}">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>{{ page.title }}</title>
 {% lesscss bootstrap.less %}
 <script type="text/javascript" src="/js/main.js"></script>
 <link rel="shortcut icon" href="/favicon.png">
-{% for lang in site.langs %}{% if lang.langcode != page.langcode %}
-<link rel="alternate" hreflang="{{ lang.langcode }}" href="/{{ lang.langcode }}" />
-{% endif %}{% endfor %}
 </head>
 <body>
 {% if site.ALERT or site.ALERT_en %}
@@ -49,24 +45,24 @@ menu:
   <div id="head">
     <div class="wrap">
     <ul id="lang">
-      <li><a href="#" onclick="return false;">{{ page.langtext }}</a>
+      <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
       <ul>
-        {% for lang in site.langs %}{% if lang.langcode != page.langcode %}
-        <li><a href="/{{ lang.langcode }}/">{{ lang.langtext }}</a></li>
+        {% for lang in site.langs %}{% if lang[0] != page.lang %}{% assign la = lang[0]%}
+        <li><a href="/{{ lang[0] }}/{{ site.section[page.id][la] }}">{{ lang[1] }}</a></li>
         {% endif %}{% endfor %}
       </ul>
       </li>
     </ul>
-    <div id="logo"><a href="/{{ page.langcode }}/"><span>Bitcoin</span></a></div>
+    <div id="logo"><a href="/{{ page.lang }}/"><span>Bitcoin</span></a></div>
     <ul id="menufor">
-      {% for link in page.menufor %}{% assign active = nil %}{% capture fullurl %}{{ link.url | append:'.html' }}{% endcapture %}{% if page.url == fullurl %}{% assign active = 'active' %}{% endif %}
-      <li{% if active %} class="{{ active }}"{% endif %}><a href="{{ link.url }}">{{ link.text }}</a></li>
+      {% for link in page.menufor %}{% assign active = nil %}{% capture fullurl %}{{ '/' | append:page.lang | append:'/' | append:link.url | append:'.html' }}{% endcapture %}{% if page.url == fullurl %}{% assign active = 'active' %}{% endif %}
+      <li{% if active %} class="{{ active }}"{% endif %}><a href="/{{ page.lang }}/{{ link.url }}">{{ link.text }}</a></li>
       {% endfor %}
     </ul>
     </div>
     <ul id="menu" class="wrap">
-        {% for link in page.menu %}{% assign active = nil %}{% capture fullurl %}{{ link.url | append:'.html' }}{% endcapture %}{% if page.url == fullurl %}{% assign active = 'active' %}{% endif %}
-        <li{% if active %} class="{{ active }}"{% endif %}><a href="{{ link.url }}">{{ link.text }}</a></li>
+        {% for link in page.menu %}{% assign active = nil %}{% capture fullurl %}{{ '/' | append:page.lang | append:'/' | append:link.url | append:'.html' }}{% endcapture %}{% if page.url == fullurl %}{% assign active = 'active' %}{% endif %}
+        <li{% if active %} class="{{ active }}"{% endif %}><a href="/{{ page.lang }}/{{ link.url }}">{{ link.text }}</a></li>
         {% endfor %}
     </ul>
   </div>

_layouts/base-fr.html

@@ -1,44 +1,38 @@
 ---
-ALERT_CLASS:
-ALERT:
-langcode: fr
-langtext: Français
+lang: fr
 menufor:
 - text: Particuliers
-  url: /fr/bitcoin-pour-particuliers
+  url: bitcoin-pour-particuliers
 - text: Organisations
-  url: /fr/bitcoin-pour-organisations
+  url: bitcoin-pour-organisations
 - text: Développeurs
-  url: /fr/bitcoin-pour-developpeurs
+  url: bitcoin-pour-developpeurs
 - text: Passionnés
-  url: /fr/bitcoin-pour-passionnes
+  url: bitcoin-pour-passionnes
 menu:
 - text: Comment ça marche
-  url: /fr/comment-ca-marche
+  url: comment-ca-marche
 - text: Vocabulaire
-  url: /fr/vocabulaire
+  url: vocabulaire
 - text: Ressources
-  url: /fr/ressources
+  url: ressources
 - text: Communauté
-  url: /fr/communaute
+  url: communaute
 - text: Développement
-  url: /fr/developpement
+  url: developpement
 - text: Fondation
-  url: /fr/fondation
+  url: fondation
 - text: À propos
-  url: /fr/a-propos
+  url: a-propos
 ---
 <!DOCTYPE HTML>
-<html lang="{{ page.langcode }}">
+<html lang="{{ page.lang }}">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>{{ page.title }}</title>
 {% lesscss bootstrap.less %}
 <script type="text/javascript" src="/js/main.js"></script>
 <link rel="shortcut icon" href="/favicon.png">
-{% for lang in site.langs %}{% if lang.langcode != page.langcode %}
-<link rel="alternate" hreflang="{{ lang.langcode }}" href="/{{ lang.langcode }}" />
-{% endif %}{% endfor %}
 </head>
 <body>
 {% if site.ALERT or site.ALERT_fr %}
@@ -51,24 +45,24 @@ menu:
   <div id="head">
     <div class="wrap">
     <ul id="lang">
-      <li><a href="#" onclick="return false;">{{ page.langtext }}</a>
+      <li><a href="#" onclick="return false;">{{ site.langs[page.lang] }}</a>
       <ul>
-        {% for lang in site.langs %}{% if lang.langcode != page.langcode %}
-        <li><a href="/{{ lang.langcode }}/">{{ lang.langtext }}</a></li>
+        {% for lang in site.langs %}{% if lang[0] != page.lang %}{% assign la = lang[0]%}
+        <li><a href="/{{ lang[0] }}/{{ site.section[page.id][la] }}">{{ lang[1] }}</a></li>
         {% endif %}{% endfor %}
       </ul>
       </li>
     </ul>
-    <div id="logo"><a href="/{{ page.langcode }}/"><span>Bitcoin</span></a></div>
+    <div id="logo"><a href="/{{ page.lang }}/"><span>Bitcoin</span></a></div>
     <ul id="menufor">
-      {% for link in page.menufor %}{% assign active = nil %}{% capture fullurl %}{{ link.url | append:'.html' }}{% endcapture %}{% if page.url == fullurl %}{% assign active = 'active' %}{% endif %}
-      <li{% if active %} class="{{ active }}"{% endif %}><a href="{{ link.url }}">{{ link.text }}</a></li>
+      {% for link in page.menufor %}{% assign active = nil %}{% capture fullurl %}{{ '/' | append:page.lang | append:'/' | append:link.url | append:'.html' }}{% endcapture %}{% if page.url == fullurl %}{% assign active = 'active' %}{% endif %}
+      <li{% if active %} class="{{ active }}"{% endif %}><a href="/{{ page.lang }}/{{ link.url }}">{{ link.text }}</a></li>
       {% endfor %}
     </ul>
     </div>
     <ul id="menu" class="wrap">
-        {% for link in page.menu %}{% assign active = nil %}{% capture fullurl %}{{ link.url | append:'.html' }}{% endcapture %}{% if page.url == fullurl %}{% assign active = 'active' %}{% endif %}
-        <li{% if active %} class="{{ active }}"{% endif %}><a href="{{ link.url }}">{{ link.text }}</a></li>
+        {% for link in page.menu %}{% assign active = nil %}{% capture fullurl %}{{ '/' | append:page.lang | append:'/' | append:link.url | append:'.html' }}{% endcapture %}{% if page.url == fullurl %}{% assign active = 'active' %}{% endif %}
+        <li{% if active %} class="{{ active }}"{% endif %}><a href="/{{ page.lang }}/{{ link.url }}">{{ link.text }}</a></li>
         {% endfor %}
     </ul>
   </div>

_less/main.less

@@ -77,7 +77,7 @@ cursor:pointer;
 #lang{
 position:absolute;
 right:0px;
-height:28px;
+height:30px;
 border-left:1px solid transparent;
 border-right:1px solid transparent;
 border-top:1px solid transparent;
@@ -85,10 +85,11 @@ border-top:1px solid transparent;
 #lang>li>ul{
 display:none;
 right:-1px;
-top:26px;
+top:28px;
 position:absolute;
 background-color:#fff;
 margin-left:-5px;
+padding-bottom:4px;
 border-radius-bottom-right:5px;
 -webkit-border-radius-bottom-right:5px;
 border-radius-bottom-left:5px;
@@ -107,8 +108,11 @@ background-color:#fff;
 #lang>li:hover>ul{
 display:block;
 }
-#lang a,#lang a:link,#lang a:visited,#lang a:active{
+#lang>li>a,#lang>li>a:link,#lang>li>a:visited,#lang>li>a:active{
 padding:4px 8px;
+}
+#lang a,#lang a:link,#lang a:visited,#lang a:active{
+padding:2px 8px;
 text-decoration:none;
 color:#000;
 font-size:18px;

en/about.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: about
 title: About - Bitcoin
 ---
 <h1>About Bitcoin</h1>

en/bitcoin-for-developers.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: bitcoin-for-developers
 title: Bitcoin for Developers - Bitcoin
 ---
 <h1>Bitcoin for Developers</h1>

en/bitcoin-for-enthusiasts.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: bitcoin-for-enthusiasts
 title: Bitcoin for Enthusiasts
 ---
 <h1>Bitcoin for Enthusiasts</h1>

en/bitcoin-for-individuals.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: bitcoin-for-individuals
 title: Bitcoin for Individuals - Bitcoin
 ---
 <h1>Bitcoin for Individuals</h1>

en/bitcoin-for-organizations.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: bitcoin-for-organizations
 title: Bitcoin for Organizations - Bitcoin
 ---
 <h1>Bitcoin for Organizations</h1>

en/choose-your-wallet.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: choose-your-wallet
 title: Choose your wallet - Bitcoin
 ---
 <!--CSS to prevent bubbles to be partially hidden in low-res devices-->

en/community.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: community
 title: Community - Bitcoin
 ---
 <h1>Bitcoin communities</h1>

en/development.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: development
 title: Development - Bitcoin
 ---
 <h1>Bitcoin development</h1>

en/download.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: download
 title: Download - Bitcoin
 ---
 <h1>Download Bitcoin-Qt</h1>

en/faq.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: faq
 title: Frequently Asked Questions
 ---
 <h1>Frequently Asked Questions</h1>

en/foundation.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: foundation
 title: Bitcoin Foundation
 ---
 

en/how-it-works.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: how-it-works
 title: How does Bitcoin work? - Bitcoin
 ---
 <h1>How does Bitcoin work?</h1>

en/index.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: index
 title: Bitcoin
 ---
 <h1>An open source P2P digital currency</h1>

en/resources.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: resources
 title: Resources - Bitcoin
 ---
 <h1>Bitcoin resources</h1>

en/support-bitcoin.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: support-bitcoin
 title: Support Bitcoin - Bitcoin
 ---
 <h1>Support Bitcoin</h1>

en/version-history.html

@@ -1,4 +1,5 @@
 ---
 layout: post
+id: version-history
 title: Version history
 ---

en/vocabulary.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: vocabulary
 title: Vocabulary - Bitcoin
 ---
 <h1>Some Bitcoin words you might hear</h1>

en/you-need-to-know.html

@@ -1,5 +1,6 @@
 ---
 layout: base-en
+id: you-need-to-know
 title: Some things you need to know - Bitcoin
 ---
 <h1>Some things you need to know</h1>

fr/a-propos.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: about
 title: À propos - Bitcoin
 ---
 <h1>À propos du Bitcoin</h1>

fr/bitcoin-pour-developpeurs.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: bitcoin-for-developers
 title: Bitcoin pour les Développeurs - Bitcoin
 ---
 <h1>Bitcoin pour les Développeurs</h1>

fr/bitcoin-pour-organisations.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: bitcoin-for-organizations
 title: Bitcoin pour les Entreprises - Bitcoin
 ---
 <h1>Bitcoin pour les Organisations</h1>

fr/bitcoin-pour-particuliers.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: bitcoin-for-individuals
 title: Bitcoin pour les Particuliers - Bitcoin
 ---
 <h1>Bitcoin pour les Particuliers</h1>

fr/bitcoin-pour-passionnes.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: bitcoin-for-enthusiasts
 title: Bitcoin pour les Passionnés
 ---
 <h1>Bitcoin pour les Passionnés</h1>

fr/choisir-votre-porte-monnaie.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: choose-your-wallet
 title: Choisir votre porte-monnaie - Bitcoin
 ---
 <!--CSS to prevent bubbles to be partially hidden in low-res devices-->

fr/comment-ca-marche.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: how-it-works
 title: Comment fonctionne Bitcoin? - Bitcoin
 ---
 <h1>Comment fonctionne Bitcoin?</h1>

fr/communaute.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: community
 title: Communauté - Bitcoin
 ---
 <h1>Les communautés Bitcoin</h1>

fr/developpement.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: development
 title: Développement - Bitcoin
 ---
 <h1>Développement du Bitcoin</h1>

fr/fondation.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: foundation
 title: Fondation Bitcoin
 ---
 

fr/index.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: index
 title: Bitcoin
 ---
 <h1>Une devise virtuelle P2P libre et ouverte</h1>

fr/ressources.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: resources
 title: Ressources - Bitcoin
 ---
 <h1>Ressources sur le Bitcoin</h1>

fr/supporter-bitcoin.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: support-bitcoin
 title: Supporter Bitcoin - Bitcoin
 ---
 <h1>Supporter Bitcoin</h1>

fr/telecharger.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: download
 title: Télécharger - Bitcoin
 ---
 <h1>Télécharger Bitcoin-Qt</h1>

fr/vocabulaire.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: vocabulary
 title: Vocabulaire - Bitcoin
 ---
 <h1>Quelques mots que vous pourriez entendre</h1>

fr/vous-devez-savoir.html

@@ -1,5 +1,6 @@
 ---
 layout: base-fr
+id: you-need-to-know
 title: Ce que vous devez savoir - Bitcoin
 ---
 <h1>Ce que vous devez savoir</h1>

index.html

@@ -1,10 +1,11 @@
 ---
 layout: base-en
+id: index
 title: Bitcoin
 ---
 <script>
 //Auto redirect to the appropriate language
-var langs={};{% for lang in site.langs %}{% if lang.langcode != page.langcode %}langs['{{ lang.langcode }}']=true;{% endif %}{% endfor %}
+var langs={};{% for lang in site.langs %}{% if lang[0] != page.lang %}langs['{{ lang[0] }}']=true;{% endif %}{% endfor %}
 var lang=(navigator.language)?navigator.language:navigator.userLanguage;
 lang=lang.split('_')[0];
 if(!langs[lang])lang='en';

sitemap.xml

@@ -1,139 +1,12 @@
+---
+---
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">{% for sect in site.section %}{% for lang in sect[1] %}
 <url>
-	<loc>http://bitcoin.org/en/bitcoin-for-enthusiasts</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/you-need-to-know</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/bitcoin-for-organizations</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/support-bitcoin</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/community</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/faq</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/vocabulary</loc>
-	<lastmod>2013-03-09</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/development</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/bitcoin-for-individuals</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/about</loc>
-	<lastmod>2013-03-09</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/bitcoin-for-developers</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/resources</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/download</loc>
-	<lastmod>2013-03-09</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/how-it-works</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/choose-your-wallet</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/version-history</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/en/foundation</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/bitcoin-pour-developpeurs</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/developpement</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/vous-devez-savoir</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/fondation</loc>
-	<lastmod>2013-03-07</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/communaute</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/a-propos</loc>
-	<lastmod>2013-03-09</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/telecharger</loc>
-	<lastmod>2013-03-07</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/</loc>
-	<lastmod>2013-03-08</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/vocabulaire</loc>
-	<lastmod>2013-03-09</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/bitcoin-pour-particuliers</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/choisir-votre-porte-monnaie</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/supporter-bitcoin</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/ressources</loc>
-	<lastmod>2013-03-06</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/bitcoin-pour-organisations</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/comment-ca-marche</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
-<url>
-	<loc>http://bitcoin.org/fr/bitcoin-pour-passionnes</loc>
-	<lastmod>2013-03-17</lastmod>
-</url>
+  <loc>http://bitcoin.org/{{ lang[0] }}/{{ lang[1] }}</loc>{% for lan in sect[1] %}{% if lang[0] != lan[0] %}
+  <xhtml:link
+    rel="alternate"
+    hreflang="{{ lan[0] }}"
+    href="http://www.bitcoin.org/{{ lan[0] }}/{{ lan[1] }}" />{% endif %}{% endfor %}
+</url>{% endfor %}{% endfor %}
 </urlset>