From 24168fb4e516de0871cb02cd18d937c7cf9fed03 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 4 Jun 2013 13:33:02 +0000
Subject: [PATCH] Migrated geoip.html

---
 i2p2www/legacy.py                             |  1 +
 i2p2www/pages/site/docs/index.html            |  2 +-
 .../pages/site/docs/spec}/geoip.html          | 32 ++++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)
 rename {www.i2p2/pages => i2p2www/pages/site/docs/spec}/geoip.html (76%)

diff --git a/i2p2www/legacy.py b/i2p2www/legacy.py
index d8d18c24..cbd778b5 100644
--- a/i2p2www/legacy.py
+++ b/i2p2www/legacy.py
@@ -41,6 +41,7 @@ LEGACY_PAGES_MAP={
     'donate':                 'get-involved/donate',
     'faq':                    'support/faq',
     'getinvolved':            'get-involved',
+    'geoip':                  'docs/spec/geoip',
     'glossary':               'support/glossary',
     'halloffame':             'about/hall-of-fame',
     'how':                    'docs',
diff --git a/i2p2www/pages/site/docs/index.html b/i2p2www/pages/site/docs/index.html
index 3cc69411..3a95ba2f 100644
--- a/i2p2www/pages/site/docs/index.html
+++ b/i2p2www/pages/site/docs/index.html
@@ -184,7 +184,7 @@ Traditionally used only by Java applications and higher-level APIs.
 </li><li>
 <a href="{{ site_url('docs/spec/configuration') }}">{{ _('Configuration File Format') }}</a></li>
 </li><li>
-<a href="geoip.html">GeoIP File Format</a></li>
+<a href="{{ site_url('docs/spec/geoip') }}">GeoIP File Format</a></li>
 </li></ul>
 
 <h3>{% trans %}Developer's Guides and Resources{% endtrans %}</h3>
diff --git a/www.i2p2/pages/geoip.html b/i2p2www/pages/site/docs/spec/geoip.html
similarity index 76%
rename from www.i2p2/pages/geoip.html
rename to i2p2www/pages/site/docs/spec/geoip.html
index b3cd1cb3..4a233942 100644
--- a/www.i2p2/pages/geoip.html
+++ b/i2p2www/pages/site/docs/spec/geoip.html
@@ -1,20 +1,21 @@
-{% extends "_layout.html" %}
-{% block title %}GeoIP File Specification{% endblock %}
+{% extends "global/layout.html" %}
+{% block title %}{% trans %}GeoIP File Specification{% endtrans %}{% endblock %}
+{% block lastupdated %}{% trans %}May 2013{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.6{% endblock %}
 {% block content %}
-Updated May 2013, current as of router version 0.9.6
 
-
-<h2>Overview</h2>
-<p>
+<h2>{% trans %}Overview{% endtrans %}</h2>
+<p>{% trans -%}
 This page specifies the format of the various GeoIP files,
 used by the router to look up a country for an IP.
-</p>
+{%- endtrans %}</p>
 
 
-<h2>Country Name (countries.txt) Format</h2>
-<p>
+<h2>{% trans %}Country Name (countries.txt) Format{% endtrans %}</h2>
+<p>{% trans -%}
 This format is easily generated from data files available from many public sources.
 For example:
+{%- endtrans %}</p>
 <pre>
 # wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
 # unzip GeoIPCountryCSV.zip
@@ -29,10 +30,11 @@ For example:
 </ul>
 
 
-<h2>IPv4 (geoip.txt) Format</h2>
-<p>
+<h2>{% trans %}IPv4 (geoip.txt) Format{% endtrans %}</h2>
+<p>{% trans -%}
 This format is borrowed from Tor and is easily generated from data files available from many public sources.
 For example:
+{%- endtrans %}</p>
 <pre>
 # wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
 # unzip GeoIPCountryCSV.zip
@@ -49,10 +51,11 @@ For example:
 </ul>
 
 
-<h2>IPv6 (geoipv6.dat.gz) Format</h2>
-<p>
+<h2>{% trans %}IPv6 (geoipv6.dat.gz) Format{% endtrans %}</h2>
+<p>{% trans -%}
 This is a compressed binary format designed for I2P.
 The file is gzipped. Ungzipped format:
+{%- endtrans %}</p>
 <pre>
    Bytes 0-9: Magic number "I2PGeoIPv6"
    Bytes 10-11: Version (0x0001)
@@ -65,8 +68,7 @@ The file is gzipped. Ungzipped format:
        8 byte to (/64)
        2 byte ISO country code LOWER case (ASCII)
 </pre>
-<p>
-NOTES:
+<p>{% trans %}NOTES:{% endtrans %}</p>
 <ul>
 <li>Data must be sorted (SIGNED long twos complement), no overlap.
 So the order is 8000:: ... FFFF:: 0000:: ... 7FFF::