Use translated brand name in templates

Using brand name directly from configuration means that it can't be
easily translated.  Instead use the translated brand name sent in my the
context processor.
This commit is contained in:
Sunil Mohan Adapa 2016-01-24 00:37:01 +05:30
parent 8ccffcf02c
commit 4602c5bfce
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971
14 changed files with 25 additions and 25 deletions

View File

@ -25,7 +25,7 @@
<h2>{% trans "Services and Applications" %}</h2>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
You can install and run various services and applications on
your {{ box_name }}. Click on any app page link on the left to
read a description of the application and choose to install it.

View File

@ -25,9 +25,9 @@
<h2>{{ title }}</h2>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
Firewall is a network security system that controls the incoming
and outgoing network traffic on your {{ box_name }}. Keeping a
{% blocktrans trimmed %}
firewall enabled and properly configured reduces risk of
security threat from the Internet.
{% endblocktrans %}
@ -38,7 +38,7 @@
{% if firewall_status == 'not_running' %}
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
Firewall daemon is not running. Please run it. Firewall comes
enabled by default on {{ box_name }}. On any Debian based
system (such as {{ box_name }}) you may run it using the

View File

@ -37,7 +37,7 @@
{% block content_row %}
<p class="text-center">
<img src="{% static 'theme/img/FreedomBox-logo-standard.png' %}"
alt="{{ cfg.box_name }}" width="640"/>
alt="{{ box_name }}" width="640"/>
</p>
<p class="text-center">
@ -46,7 +46,7 @@
</p>
<p class="text-center" style="font-size: larger">
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
To complete the setup of your {{ box_name }}, please provide
some basic information.
{% endblocktrans %}

View File

@ -29,7 +29,7 @@
<h2>{% trans "Setup Complete!" %}</h2>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
{{ box_name }} setup is now complete. To make your {{ box_name }}
functional, you need some applications. Applications will be
installed the first time you access them.

View File

@ -38,7 +38,7 @@
<h2>{% trans "Certificates (Let's Encrypt)" %}</h2>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
A digital certficate allows users of a web service to verify the
identity of the service and to securely communicate with it.
{{ box_name }} can automatically obtain and setup digital

View File

@ -94,7 +94,7 @@
</div>
<div class="col-sm-2">
<img src="{% static 'theme/img/network-freedombox.svg' %}"
class="col-image network-entity" alt="{{ cfg.box_name }}"/>
class="col-image network-entity" alt="{{ box_name }}"/>
</div>
<div class="col-sm-3">
<img src="{% static 'theme/img/network-spacing.svg' %}"

View File

@ -35,7 +35,7 @@
<h2>{% trans "Virtual Private Network (OpenVPN)" %}</h2>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
Virtual Private Network (VPN) is a technique for securely
connecting two machines in order to access resources of a
private network. While you are away from home, you can connect
@ -51,7 +51,7 @@
<h3>{% trans "Profile" %}</h3>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
To connect to {{ box_name }}'s VPN, you need to download a
profile and feed it to an OpenVPN client on your mobile or
desktop machine. OpenVPN Clients are available for most
@ -63,7 +63,7 @@
</p>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
Profile is specific to each user of {{ box_name }}. Keep it a
secret.
{% endblocktrans %}
@ -82,7 +82,7 @@
{% if not status.is_setup and not status.setup_running %}
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
OpenVPN has not yet been setup. Performing a secure setup
takes a very long time. Depending on how fast your
{{ box_name }} is, it may even take hours. If the setup
@ -105,7 +105,7 @@
</p>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
To perform a secure setup, this process takes a very long
time. Depending on how fast your {{ box_name }} is, it may
even take hours. If the setup is interrupted, you may start

View File

@ -23,7 +23,7 @@
{% block content %}
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
PageKite is a system for exposing {{ box_name }} services when
you don't have a direct connection to the Internet. You only
need this if your {{ box_name }} services are unreachable from
@ -34,13 +34,13 @@
<ul>
<li>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
{{ box_name }} is behind a restricted firewall.
{% endblocktrans %}
</li>
<li>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
{{ box_name }} is connected to a (wireless) router which you
don't control.
{% endblocktrans %}
@ -64,7 +64,7 @@
</ul>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
PageKite works around NAT, firewalls and IP-address limitations
by using a combination of tunnels and reverse proxies. You can
use any pagekite service provider, for example

View File

@ -35,7 +35,7 @@
</p>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
You can use Privoxy by modifying your browser proxy settings to
your {{ box_name }} hostname (or IP address) with port 8118.
While using Privoxy, you can see its configuration details and

View File

@ -26,7 +26,7 @@
<h2>{% trans "IRC Client (Quassel)" %}</h2>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
Quassel is an IRC application that is split into two parts, a
"core" and a "client". This allows the core to remain connected
to IRC servers, and to continue receiving messages, even when

View File

@ -31,7 +31,7 @@
web applications. The idea is to uncouple web applications from
data. No matter where a web application is served from, the
data can be stored on an unhosted storage server of user's
choice. With reStore, your {{ cfg.box_name }} becomes your
choice. With reStore, your {{ box_name }} becomes your
unhosted storage server.
{% endblocktrans %}
</p>

View File

@ -25,14 +25,14 @@
<h2>{% trans "System Configuration" %}</h2>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
Here you can administrate the underlying system of your
{{ box_name }}.
{% endblocktrans %}
</p>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
The options affect the {{ box_name }} at its most general level,
so be careful!
{% endblocktrans %}

View File

@ -85,7 +85,7 @@
<h3>{% trans "Bridge" %}</h3>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
Your {{ box_name }} is configured as a Tor bridge with obfsproxy,
so it can help circumvent censorship. If your {{ box_name }} is
behind a router or firewall, you should make sure the following
@ -117,7 +117,7 @@
<h3>{% trans "SOCKS" %}</h3>
<p>
{% blocktrans trimmed with box_name=cfg.box_name %}
{% blocktrans trimmed %}
A Tor SOCKS port is available on your {{ box_name }} on TCP port
9050.
{% endblocktrans %}

View File

@ -86,7 +86,7 @@
{% block mainmenu_left %}
<span class="navbar-brand">
<img src="{% static 'theme/img/freedombox-logo-32px.png' %}"
alt="{{ cfg.box_name }}" />
alt="{{ box_name }}" />
</span>
<a href="{% url 'index' %}" class="navbar-brand" title="{% trans "Applications" %}">
<span class="glyphicon glyphicon-th"></span>