Fixed URLs and added translation tags to blog, downloads and meetings pages

2013-01-18 03:42:02 +00:00
parent 789739aff6
commit 18b1ea8fc1
8 changed files with 298 additions and 144 deletions
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -1,8 +1,10 @@
 {% extends "global/layout.html" %}
-{% block title %}Download{% endblock %}
+{% block title %}{% trans %}Download{% endtrans %}{% endblock %}
 {% block content %}
-<h1>Download I2P</h1>
+<h1>{% trans %}Download I2P{% endtrans %}</h1>
+
 <h3>Dependency</h3>
+<p>{% trans %}
 Java Runtime 1.5 or higher.
 (<a href="http://java.com/download/">Oracle/Sun Java Version 6</a>,
 <a href="http://openjdk.java.net/install/">OpenJDK 6</a>, or
@@ -11,78 +13,92 @@ Java Runtime 1.5 or higher.
 <br />
 <a href="http://java.com/en/download/installed.jsp?detect=jre&amp;try=1">Determine your installed Java version here</a>
 or type <tt>java -version</tt> at your command prompt.
-<h3>Clean installs</h3>
+{% endtrans %}</p>
+
+<h3>{% trans %}Clean installs{% endtrans %}</h3>
 <div class="downloadlist">

 <div class="package">
  <h1>Windows</h1>
  <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s_windows.exe')) }}">i2pinstall_{{ ver() }}_windows.exe</a>
+    <a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s_windows.exe')) }}">i2pinstall_{{ ver() }}_windows.exe</a>
    <div class="sig">
      (SHA256
 c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
-      <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s_windows.exe.sig')) }}">sig</a>)
+      <a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s_windows.exe.sig')) }}">sig</a>)
    </div>
  </div>
  <div class="details">
+    {% trans -%}
    Download that file and run it.
+    {%- endtrans %}
  </div>
 </div>

 <div class="package">
  <h1>Mac OS X</h1>
  <div class="file">
-    <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.4-1_osx.jar') }}">i2pinstall_0.9.4-1_osx.jar</a>
+    <a href="{{ get_url('downloads_select', file='i2pinstall_0.9.4-1_osx.jar') }}">i2pinstall_0.9.4-1_osx.jar</a>
    <div class="sig">
    (SHA256
 9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
-      <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.4-1_osx.jar.sig') }}">sig</a>)
+      <a href="{{ get_url('downloads_select', file='i2pinstall_0.9.4-1_osx.jar.sig') }}">sig</a>)
    </div>
  </div>
  <div class="details">
+    {% trans -%}
    Download that file and double-click it (if that works) or
    type <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> in a terminal to run the
    installer.
    You may be able to right-click and select
    &quot;Open with Java&quot;.
+    {%- endtrans %}
    <div class="warning">
-      Due to <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+      {% trans buglink='http://'+i2pconv('trac.i2p2.i2p')+'/ticket/826' -%}
+      Due to <a href="{{ buglink }}">a wrapper bug</a>, the 0.9.4 installer
      will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer above.
+      {%- endtrans %}
    </div>

-    <h2>Command line (headless) install:</h2>
+    <h2>{% trans %}Command line (headless) install:{% endtrans %}</h2>
+    {% trans -%}
    Download the 0.9.4-1 OSX graphical installer file above and
    run <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> from the command line.
+    {%- endtrans %}
  </div>
 </div>

 <div class="package">
  <h1>GNU/Linux / BSD / Solaris</h1>
  <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar</a>
+    <a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar</a>
    <div class="sig">
      (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
-      <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>)
+      <a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>)
    </div>
  </div>
  <div class="details">
+    {% trans i2pversion=ver() -%}
    Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_{{ ver() }}.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_{{ i2pversion }}.jar</code> in a terminal to run the
    installer.
    On some platforms you may be able to right-click and select
    &quot;Open with Java&quot;.
+    {%- endtrans %}

-    <h2>Command line (headless) install:</h2>
+    <h2>{% trans %}Command line (headless) install:{% endtrans %}</h2>
+    {% trans i2pversion=ver() -%}
    Download the graphical installer file above and
-    run <code>java -jar i2pinstall_{{ ver() }}.jar -console</code> from the command line.
+    run <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> from the command line.
+    {%- endtrans %}
  </div>
 </div>

 <div class="package">
  <h1>Debian / Ubuntu</h1>
  <div class="details">
-    <a href="{{ url_for('downloads_select', lang=g.lang, file='debian') }}">Packages for Debian &amp; Ubuntu are available.</a>
+    <a href="{{ get_url('downloads_select', file='debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
  </div>
 </div>

@@ -97,48 +113,63 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
    </div>
  </div>
  <div class="details">
+    {% trans spongeurl='http://'+i2pconv('sponge.i2p') -%}
    The Android version of I2P is being actively developed.
    The latest dev build is version 0.9.3-5_b2-API8, and is available from
-    <a href="http://{{ i2pconv('sponge.i2p') }}/">sponge's eepsite</a> -
+    <a href="{{ spongeurl }}">sponge's eepsite</a> -
    scan or click the QR code.
+    {%- endtrans %}
    <div class="warning">
+      {% trans -%}
      The release and dev versions of the I2P APK are not compatible, as they
      are signed by zzz and sponge respectively. Uninstall one before installing
      the other.
+      {%- endtrans %}
    </div>
  </div>
 </div>

 <div class="package">
-  <h1>Source package</h1>
+  <h1>{% trans %}Source package{% endtrans %}</h1>
  <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2psource_%s.tar.bz2')) }}">i2psource_{{ ver() }}.tar.bz2</a>
+    <a href="{{ get_url('downloads_select', file=ver('i2psource_%s.tar.bz2')) }}">i2psource_{{ ver() }}.tar.bz2</a>
    <div class="sig">
      (SHA256
 1b7d9695555ed42142b04ad6bcda083cd1a064f6354b639ad2aef4d9cd474e06
-       <a href="{{ url_for('downloads_select', file=ver('i2psource_%s.tar.bz2.sig')) }}">sig</a>)
+       <a href="{{ get_url('downloads_select', file=ver('i2psource_%s.tar.bz2.sig')) }}">sig</a>)
    </div>
  </div>
  <div class="details">
-    Alternately, you can fetch the source from <a href="{{ site_url('volunteer/guides/newdevelopers') }}#getting-the-i2p-code">monotone</a>.
+    {% trans monotoneurl=site_url('get-involved/guides/new-developers'), i2pversion=ver() -%}
+    Alternately, you can fetch the source from <a href="{{ monotoneurl }}#getting-the-i2p-code">monotone</a>.
    <br />
-    Run <code>(tar xjvf i2psource_{{ ver() }}.tar.bz2 ; cd i2p-{{ ver() }} ; ant pkg)</code> then either
+    Run <code>(tar xjvf i2psource_{{ i2pversion }}.tar.bz2 ; cd i2p-{{ i2pversion }} ; ant pkg)</code> then either
    run the GUI installer or headless install as above.
+    {%- endtrans %}
  </div>
 </div>

 </div>

+{% trans signingkey=site_url('get-involved/develop/release-signing-key') -%}
 The files are signed by zzz,
-<a href="release-signing-key.html">whose key is here</a>.
-<p>I2P can also be downloaded from our project pages on <a href="https://launchpad.net/i2p/trunk">Launchpad</a> and <a href="http://code.google.com/p/i2p/">Google Code</a>.</p>
-<h3>Post-install work</h3>
+<a href="{{ signingkey }}">whose key is here</a>.
+{%- endtrans %}

-<p>After running the installer on windows, simply click on the "Start I2P" button
+<p>{% trans -%}
+I2P can also be downloaded from our project pages on <a href="https://launchpad.net/i2p/trunk">Launchpad</a> and <a href="http://code.google.com/p/i2p/">Google Code</a>.
+{%- endtrans %}</p>
+
+<h3>{% trans %}Post-install work{% endtrans %}</h3>
+
+<p>{% trans -%}
+After running the installer on windows, simply click on the "Start I2P" button
 which will bring up the <a href="http://localhost:7657/index.jsp">router console</a>,
-which has further instructions.</p>
+which has further instructions.
+{%- endtrans %}</p>

-<p>On Unix-like systems, I2P can be started as a service
+<p>{% trans -%}
+On Unix-like systems, I2P can be started as a service
 using the "i2prouter" script, located in the directory you selected for I2P.
 Changing to that directory in a console and issuing "sh i2prouter status"
 should tell you the router's status. The arguments "start", "stop" and "restart"
@@ -146,102 +177,129 @@ control the service. The <a href="http://localhost:7657/index.jsp">router consol
 can be accessed at its usual location.
 For users on OpenSolaris and other systems for which the wrapper (i2psvc) is not supported,
 start the router with "sh runplain.sh" instead.
-</p>
+{%- endtrans %}</p>

-<p>When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
+<p>{% trans faq=site_url('faq') -%}
+When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
 if you can, bearing in mind the Internet-facing ports I2P uses,
-<a href="{{ site_url('support/faq') }}#ports">described here</a> among other ports.
+<a href="{{ faq }}#ports">described here</a> among other ports.
 If you have successfully opened your port to inbound TCP, also enable inbound TCP on the
 <a href="http://localhost:7657/confignet.jsp">configuration page</a>.
-</p>
+{%- endtrans %}</p>

-<p>Also, please review and <b>adjust the bandwidth settings</b> on the
+<p>{% trans -%}
+Also, please review and <b>adjust the bandwidth settings</b> on the
 <a href="http://localhost:7657/config.jsp">configuration page</a>,
 as the default settings of 96 KBps down / 40 KBps up are fairly slow.
-</p>
+{%- endtrans %}</p>

-<p>
-If you want to reach eepsites via your browser, have a look on the <a href="{{ site_url('support/htproxyports') }}">browser proxy setup</a> page for an easy howto.
-</p>
+<p>{% trans browserconfig=site_url('about/browser-config') -%}
+If you want to reach eepsites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
+{%- endtrans %}</p>

-<h3>Updates from earlier releases:</h3>
-<p>
+<h3>{% trans %}Updates from earlier releases:{% endtrans %}</h3>
+
+<p>{% trans -%}
 Both automatic and manual upgrades are available for the release.
-</p>
+{%- endtrans %}</p>

 <div class="package">
-  <h1>Automatic updates</h1>
+  <h1>{% trans %}Automatic updates{% endtrans %}</h1>
  <div class="details">
-<p>
+<p>{% trans -%}
 If you are running 0.7.5 or later, your router should detect the
 new release. To upgrade simply click the 'Download Update' button on your router console
 when it appears.
-</p>
+{%- endtrans %}</p>
    <div class="warning">
-<p>
+<p>{% trans -%}
 Due to a bug in release 0.7.6, those whose first I2P installation was that version
 and have not upgraded manually
 may get a "downloaded version is not greater than current version" error,
 and should use the manual update method below.
-</p>
+{%- endtrans %}</p>
    </div>
    <div class="warning">
-<p>
+<p>{% trans blogpost=get_url('blog_post', slug='2009/06/29/0.7.5-Release') -%}
 If you are running 0.7.4 or earlier, please see
-<a href="{{ url_for('blog_post', slug='2009/06/29/I2P_0.7.5_released') }}">the 0.7.5 release notes</a>
+<a href="{{ blogpost }}">the 0.7.5 release notes</a>
 for important information about how to configure your router to automatically
 receive the release.
-</p>
+{%- endtrans %}</p>
    </div>
    <div class="warning">
-<p>
+<p>{% trans instructions=site_url('misc/upgrade-0.6.1.30') -%}
 If you are running 0.6.1.30 or earlier, please see
-<a href="upgrade-0.6.1.30.html">instructions</a>
+<a href="{{ instructions }}">instructions</a>
 for important information about how to configure your router to automatically
 receive the release.
-</p>
+{%- endtrans %}</p>

 <ol>
-<li>If you have reconfigured your router following the <a href="upgrade-0.6.1.30.html">instructions</a>, you should see a link on your 
+<li>
+    {% trans instructions=site_url('misc/upgrade-0.6.1.30') -%}
+    If you have reconfigured your router following the <a href="{{ instructions }}">instructions</a>, you should see a link on your 
    <a href="http://localhost:7657/index.jsp">router console</a> allowing
    you to download and install the new release by just clicking on that
-    link.</li>
-<li>Alternately, you can use the manual method specified below.</li>
+    link.
+    {%- endtrans %}
+</li>
+<li>
+    {% trans -%}
+    Alternately, you can use the manual method specified below.
+    {%- endtrans %}
+</li>
 </ol>
    </div>
  </div>
 </div>

 <div class="package">
-  <h1>Manual updates</h1>
+  <h1>{% trans %}Manual updates{% endtrans %}</h1>
  <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2pupdate_%s.zip')) }}">i2pupdate_{{ ver() }}.zip</a>
+    <a href="{{ get_url('downloads_select', file=ver('i2pupdate_%s.zip')) }}">i2pupdate_{{ ver() }}.zip</a>
    <div class="sig">
      (SHA256
 0f369d9b85793f157ec67c4d59723a2ad0c1de2a0902d35e11c26a2c74add824
-      <a href="{{ url_for('downloads_select', file=ver('i2pupdate_%s.zip.sig')) }}">sig</a>)
+      <a href="{{ get_url('downloads_select', file=ver('i2pupdate_%s.zip.sig')) }}">sig</a>)
    </div>
  </div>
  <div class="details">
 <ol>
-<li>Download that file to your I2P
+<li>
+    {% trans -%}
+    Download that file to your I2P
    installation directory and <b>rename as i2pupdate.zip</b>.
    (alternately, you can get the source as above and run "ant updater", then copy the
    resulting i2pupdate.zip to your I2P installation directory).  You do 
-    NOT need to unzip that file.</li>
-<li>Click <a href="http://localhost:7657/configservice.jsp">"Restart"</a></li>
-<li>Grab a cup of coffee and come back in 11 minutes</li>
+    NOT need to unzip that file.
+    {%- endtrans %}
+</li>
+<li>
+    {% trans -%}
+    Click <a href="http://localhost:7657/configservice.jsp">"Restart"</a>
+    {%- endtrans %}
+</li>
+<li>
+    {% trans -%}
+    Grab a cup of coffee and come back in 11 minutes
+    {%- endtrans %}
+</li>
 </ol>
  </div>
 </div>

+{% trans signingkey=site_url('get-involved/develop/release-signing-key') -%}
 The file is signed by zzz,
-<a href="{{ site_url('volunteer/develop/release-signing-key') }}">whose key is here</a>.
+<a href="{{ signingkey }}">whose key is here</a>.
+{%- endtrans %}

-<h3>Previous Releases</h3>
+<h3>{% trans %}Previous Releases{% endtrans %}</h3>
+
+{% trans echelon=i2pconv('echelon.i2p') -%}
 Previous releases are available on <a href="http://code.google.com/p/i2p/downloads/list?can=1">Google Code</a>
 and <a href="https://launchpad.net/i2p/trunk">Launchpad</a>
-and within the I2P network on <a href="http://{{ i2pconv('echelon.i2p') }}/">{{ i2pconv('echelon.i2p') }}</a>.
-
+and within the I2P network on <a href="http://{{ echelon }}/">{{ echelon }}</a>.
+{%- endtrans %}

 {% endblock %}