From c85479129c6654b873cbb589d64e8314bf8d04ef Mon Sep 17 00:00:00 2001 From: str4d Date: Fri, 18 Jan 2013 04:36:24 +0000 Subject: [PATCH] Use {{ _('') }} instead of {% trans %}{% endtrans %} for short strings and headings --- i2p2www/pages/blog/index.html | 4 ++-- i2p2www/pages/blog/latest.html | 2 +- i2p2www/pages/blog/post.html | 2 +- i2p2www/pages/downloads/debian.html | 14 +++++++------- i2p2www/pages/downloads/list.html | 20 ++++++++++---------- i2p2www/pages/downloads/select.html | 10 +++++----- i2p2www/pages/meetings/index.html | 6 +++--- i2p2www/pages/meetings/show.html | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/i2p2www/pages/blog/index.html b/i2p2www/pages/blog/index.html index 4cc0bb5f..a95e4c1c 100644 --- a/i2p2www/pages/blog/index.html +++ b/i2p2www/pages/blog/index.html @@ -1,7 +1,7 @@ {% extends "global/layout.html" %} -{% block title %}{% trans %}Blog Index{% endtrans %}{% endblock %} +{% block title %}{{ _('Blog Index') }}}{% endblock %} {% block headextra %} - + {%- endblock %} {% block content %} diff --git a/i2p2www/pages/blog/post.html b/i2p2www/pages/blog/post.html index 92739112..22ed3c3d 100644 --- a/i2p2www/pages/blog/post.html +++ b/i2p2www/pages/blog/post.html @@ -1,5 +1,5 @@ {% extends "global/layout.html" %} -{% block title %}{{ title }} - {% trans %}Blog{% endtrans %}{% endblock %} +{% block title %}{{ title }} - {{ _('Blog') }}{% endblock %} {% block content %} -

{% trans %}Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint & Trisquel{% endtrans %}

-
{% trans %}Adding the PPA via the command line and installing I2P{% endtrans %}
+

{{ _('Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint & Trisquel') }}

+
{{ _('Adding the PPA via the command line and installing I2P') }}
  1. {% trans %}Open a terminal and enter:{% endtrans %}
    @@ -54,7 +54,7 @@ was added with the earlier command.     sudo apt-get install i2p
-
{% trans %}Adding the PPA Using Synaptic{% endtrans %}
+
{{ _('Adding the PPA Using Synaptic') }}
  1. {% trans -%} @@ -83,7 +83,7 @@ After the installation process completes you can move on to the next part of starting I2P and configuring it for your system. {%- endtrans %} -

    {% trans %}Instructions for Debian Lenny and newer{% endtrans %}

    +

    {{ _('Instructions for Debian Lenny and newer') }}

    {% trans -%} The steps below should be performed with root access (i.e., switching @@ -123,7 +123,7 @@ repository enabled on your system, including the I2P PPA added in step After the installation process completes you can move on to the next part of starting I2P and configuring it for your system. {%- endtrans %} -

    {% trans %}Instructions for Non-Linux / Non-x86{% endtrans %}

    +

    {{ _('Instructions for Non-Linux / Non-x86') }}

    {% trans -%} The steps below should be performed with root access (i.e., switching @@ -152,7 +152,7 @@ user to root with "su" or by prefixing each command with "sud After the installation process completes you can move on to the next part of starting I2P and configuring it for your system. {%- endtrans %} -

    {% trans %}Post-install work{% endtrans %}

    +

    {{ _('Post-install work') }}

    {% trans -%} diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html index d6aa6ea2..c29f20ed 100644 --- a/i2p2www/pages/downloads/list.html +++ b/i2p2www/pages/downloads/list.html @@ -1,9 +1,9 @@ {% extends "global/layout.html" %} -{% block title %}{% trans %}Download{% endtrans %}{% endblock %} +{% block title %}{{ _('Download') }}{% endblock %} {% block content %} -

    {% trans %}Download I2P{% endtrans %}

    +

    {{ _('Download I2P') }}

    -

    Dependency

    +

    {{ _('Dependency') }}

    {% trans %} Java Runtime 1.5 or higher. (Oracle/Sun Java Version 6, @@ -15,7 +15,7 @@ Java Runtime 1.5 or higher. or type java -version at your command prompt. {% endtrans %}

    -

    {% trans %}Clean installs{% endtrans %}

    +

    {{ _('Clean installs') }}

    @@ -130,7 +130,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
    -

    {% trans %}Source package{% endtrans %}

    +

    {{ _('Source package') }}

    i2psource_{{ ver() }}.tar.bz2
    @@ -160,7 +160,7 @@ The files are signed by zzz, I2P can also be downloaded from our project pages on Launchpad and Google Code. {%- endtrans %}

    -

    {% trans %}Post-install work{% endtrans %}

    +

    {{ _('Post-install work') }}

    {% trans -%} After running the installer on windows, simply click on the "Start I2P" button @@ -197,14 +197,14 @@ as the default settings of 96 KBps down / 40 KBps up are fairly slow. If you want to reach eepsites via your browser, have a look on the browser proxy setup page for an easy howto. {%- endtrans %}

    -

    {% trans %}Updates from earlier releases:{% endtrans %}

    +

    {{ _('Updates from earlier releases:') }}

    {% trans -%} Both automatic and manual upgrades are available for the release. {%- endtrans %}

    -

    {% trans %}Automatic updates{% endtrans %}

    +

    {{ _('Automatic updates') }}

    {% trans -%} If you are running 0.7.5 or later, your router should detect the @@ -255,7 +255,7 @@ receive the release.

    -

    {% trans %}Manual updates{% endtrans %}

    +

    {{ _('Manual updates') }}

    i2pupdate_{{ ver() }}.zip
    @@ -294,7 +294,7 @@ The file is signed by zzz, whose key is here. {%- endtrans %} -

    {% trans %}Previous Releases{% endtrans %}

    +

    {{ _('Previous Releases') }}

    {% trans echelon=i2pconv('echelon.i2p') -%} Previous releases are available on Google Code diff --git a/i2p2www/pages/downloads/select.html b/i2p2www/pages/downloads/select.html index fbe8c40d..4d7a60f8 100644 --- a/i2p2www/pages/downloads/select.html +++ b/i2p2www/pages/downloads/select.html @@ -1,15 +1,15 @@ {% extends "global/layout.html" %} -{% block title %}{% trans %}Mirror selection{% endtrans %}{% endblock %} +{% block title %}{{ _('Mirror selection') }}{% endblock %} {% block content %} -

    {% trans %}Mirror selection{% endtrans %}

    -

    {% trans %}File:{% endtrans %} /{{ file }}

    +

    {{ _('Mirror selection') }}

    +

    {{ _('File:') }} /{{ file }}

    {% for protocol in mirrors -%}

    {{ protocol.name | upper }}

    diff --git a/i2p2www/pages/meetings/index.html b/i2p2www/pages/meetings/index.html index 18a0f308..92164e3f 100644 --- a/i2p2www/pages/meetings/index.html +++ b/i2p2www/pages/meetings/index.html @@ -1,10 +1,10 @@ {% extends "global/layout.html" %} -{% block title %}{% trans %}Meetings{% endtrans %}{% endblock %} +{% block title %}{{ _('Meetings') }}{% endblock %} {% block headextra %} - + {%- endblock %} {% block content %} -

    {% trans %}Logs of past I2P meetings{% endtrans %}

    +

    {{ _('Logs of past I2P meetings') }}

    {% trans blogindex=get_url('blog_index') -%} If you have something to discuss, please find the developers on IRC in #i2p-dev. diff --git a/i2p2www/pages/meetings/show.html b/i2p2www/pages/meetings/show.html index 235d1210..c65da553 100644 --- a/i2p2www/pages/meetings/show.html +++ b/i2p2www/pages/meetings/show.html @@ -7,7 +7,7 @@ {% endif %} {% endautoescape %}

    -

    {% trans %}Full IRC Log{% endtrans %}

    +

    {{ _('Full IRC Log') }}

     {{ log|escape }}
 {# TODO: pygments #}