From 4602c5bfcec05a55d8465f565a886f48e752df44 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sun, 24 Jan 2016 00:37:01 +0530 Subject: [PATCH] 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. --- plinth/modules/apps/templates/apps.html | 2 +- plinth/modules/firewall/templates/firewall.html | 4 ++-- .../modules/first_boot/templates/firstboot_state0.html | 4 ++-- .../first_boot/templates/firstboot_state10.html | 2 +- plinth/modules/letsencrypt/templates/letsencrypt.html | 2 +- .../networks/templates/connections_diagram.html | 2 +- plinth/modules/openvpn/templates/openvpn.html | 10 +++++----- .../pagekite/templates/pagekite_introduction.html | 8 ++++---- plinth/modules/privoxy/templates/privoxy.html | 2 +- plinth/modules/quassel/templates/quassel.html | 2 +- plinth/modules/restore/templates/restore_index.html | 2 +- plinth/modules/system/templates/system.html | 4 ++-- plinth/modules/tor/templates/tor.html | 4 ++-- plinth/templates/base.html | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/plinth/modules/apps/templates/apps.html b/plinth/modules/apps/templates/apps.html index 303325e2a..266f6f079 100644 --- a/plinth/modules/apps/templates/apps.html +++ b/plinth/modules/apps/templates/apps.html @@ -25,7 +25,7 @@

{% trans "Services and Applications" %}

- {% 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. diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html index d391f9708..6646ac642 100644 --- a/plinth/modules/firewall/templates/firewall.html +++ b/plinth/modules/firewall/templates/firewall.html @@ -25,9 +25,9 @@

{{ title }}

- {% 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' %}

- {% 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 diff --git a/plinth/modules/first_boot/templates/firstboot_state0.html b/plinth/modules/first_boot/templates/firstboot_state0.html index 517cd7df5..670a901cc 100644 --- a/plinth/modules/first_boot/templates/firstboot_state0.html +++ b/plinth/modules/first_boot/templates/firstboot_state0.html @@ -37,7 +37,7 @@ {% block content_row %}

{{ cfg.box_name }} + alt="{{ box_name }}" width="640"/>

@@ -46,7 +46,7 @@

- {% blocktrans trimmed with box_name=cfg.box_name %} + {% blocktrans trimmed %} To complete the setup of your {{ box_name }}, please provide some basic information. {% endblocktrans %} diff --git a/plinth/modules/first_boot/templates/firstboot_state10.html b/plinth/modules/first_boot/templates/firstboot_state10.html index b7b18cf9c..213ff09f2 100644 --- a/plinth/modules/first_boot/templates/firstboot_state10.html +++ b/plinth/modules/first_boot/templates/firstboot_state10.html @@ -29,7 +29,7 @@

{% trans "Setup Complete!" %}

- {% 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. diff --git a/plinth/modules/letsencrypt/templates/letsencrypt.html b/plinth/modules/letsencrypt/templates/letsencrypt.html index ba92f871d..15043bdf2 100644 --- a/plinth/modules/letsencrypt/templates/letsencrypt.html +++ b/plinth/modules/letsencrypt/templates/letsencrypt.html @@ -38,7 +38,7 @@

{% trans "Certificates (Let's Encrypt)" %}

- {% 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 diff --git a/plinth/modules/networks/templates/connections_diagram.html b/plinth/modules/networks/templates/connections_diagram.html index 37e3baf70..9221daaea 100644 --- a/plinth/modules/networks/templates/connections_diagram.html +++ b/plinth/modules/networks/templates/connections_diagram.html @@ -94,7 +94,7 @@

{{ cfg.box_name }} + class="col-image network-entity" alt="{{ box_name }}"/>
{% trans "Virtual Private Network (OpenVPN)" %}

- {% 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 @@

{% trans "Profile" %}

- {% 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 @@

- {% 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 %}

- {% 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 @@

- {% 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 diff --git a/plinth/modules/pagekite/templates/pagekite_introduction.html b/plinth/modules/pagekite/templates/pagekite_introduction.html index 73f711b36..92682064d 100644 --- a/plinth/modules/pagekite/templates/pagekite_introduction.html +++ b/plinth/modules/pagekite/templates/pagekite_introduction.html @@ -23,7 +23,7 @@ {% block content %}

- {% 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 @@

- {% 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 diff --git a/plinth/modules/privoxy/templates/privoxy.html b/plinth/modules/privoxy/templates/privoxy.html index 3bb04cd75..4a4f82c00 100644 --- a/plinth/modules/privoxy/templates/privoxy.html +++ b/plinth/modules/privoxy/templates/privoxy.html @@ -35,7 +35,7 @@

- {% 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 diff --git a/plinth/modules/quassel/templates/quassel.html b/plinth/modules/quassel/templates/quassel.html index 286f01065..c2f47ce0c 100644 --- a/plinth/modules/quassel/templates/quassel.html +++ b/plinth/modules/quassel/templates/quassel.html @@ -26,7 +26,7 @@

{% trans "IRC Client (Quassel)" %}

- {% 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 diff --git a/plinth/modules/restore/templates/restore_index.html b/plinth/modules/restore/templates/restore_index.html index 28369dbd1..8c9402ba7 100644 --- a/plinth/modules/restore/templates/restore_index.html +++ b/plinth/modules/restore/templates/restore_index.html @@ -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 %}

diff --git a/plinth/modules/system/templates/system.html b/plinth/modules/system/templates/system.html index e3cc68759..e8c2a46f3 100644 --- a/plinth/modules/system/templates/system.html +++ b/plinth/modules/system/templates/system.html @@ -25,14 +25,14 @@

{% trans "System Configuration" %}

- {% blocktrans trimmed with box_name=cfg.box_name %} + {% blocktrans trimmed %} Here you can administrate the underlying system of your {{ box_name }}. {% endblocktrans %}

- {% 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 %} diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html index a48d42011..4d4ebbd31 100644 --- a/plinth/modules/tor/templates/tor.html +++ b/plinth/modules/tor/templates/tor.html @@ -85,7 +85,7 @@

{% trans "Bridge" %}

- {% 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 @@

{% trans "SOCKS" %}

- {% 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 %} diff --git a/plinth/templates/base.html b/plinth/templates/base.html index 95060ef6a..d34fd28e1 100644 --- a/plinth/templates/base.html +++ b/plinth/templates/base.html @@ -86,7 +86,7 @@ {% block mainmenu_left %} {{ cfg.box_name }} + alt="{{ box_name }}" />