From 572e68dc36d8f73eb8a45cbff3569ffbec8a543b Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sun, 24 Jan 2016 00:50:14 +0530 Subject: [PATCH] Make remaining uses of brand name customizable --- plinth/modules/dynamicdns/templates/dynamicdns.html | 8 ++++---- plinth/modules/help/help.py | 11 ++++++----- plinth/modules/help/templates/help_about.html | 9 +++++---- plinth/modules/help/templates/help_base.html | 4 +--- plinth/modules/help/templates/help_index.html | 12 ++++++------ .../modules/networks/templates/connection_show.html | 4 ++-- plinth/modules/openvpn/templates/openvpn.html | 2 +- plinth/modules/tor/tor.py | 8 +++++--- plinth/service.py | 12 +++++++----- plinth/templates/base.html | 6 ++++-- 10 files changed, 41 insertions(+), 35 deletions(-) diff --git a/plinth/modules/dynamicdns/templates/dynamicdns.html b/plinth/modules/dynamicdns/templates/dynamicdns.html index 732679999..aa8e4b1af 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns.html @@ -29,7 +29,7 @@ If your internet provider changes your IP address periodic (i.e. every 24h) it may be hard for others to find you in the WEB. And for this reason nobody may find the services which are - provided by FreedomBox (like your ownCloud). + provided by {{ box_name }}, such as ownCloud. {% endblocktrans %}

@@ -59,9 +59,9 @@

{% blocktrans trimmed %} - If your freedombox is connected behind some NAT router, don't forget - to add portforwarding (i.e. forward some standard ports like 80 and 443) - to your freedombox device. + If your {{ box_name }} is connected behind some NAT router, don't forget + to add port forwarding (i.e. forward some standard ports like 80 and + 443). {% endblocktrans %}

{% endblock %} diff --git a/plinth/modules/help/help.py b/plinth/modules/help/help.py index c59d5d753..4ffe73e87 100644 --- a/plinth/modules/help/help.py +++ b/plinth/modules/help/help.py @@ -35,7 +35,7 @@ def init(): 'glyphicon-book', 'help:index', 101) menu.add_urlname(ugettext_lazy('Where to Get Help'), 'glyphicon-search', 'help:index_explicit', 5) - menu.add_urlname(ugettext_lazy('FreedomBox Manual'), 'glyphicon-info-sign', + menu.add_urlname(ugettext_lazy('Manual'), 'glyphicon-info-sign', 'help:manual', 10) menu.add_urlname(ugettext_lazy('About'), 'glyphicon-star', 'help:about', 100) @@ -52,7 +52,7 @@ def index(request): def about(request): """Serve the about page""" context = { - 'title': _('About {box_name}').format(box_name=cfg.box_name), + 'title': _('About {box_name}').format(box_name=_(cfg.box_name)), 'version': __version__ } return TemplateResponse(request, 'help_about.html', context) @@ -68,6 +68,7 @@ def manual(request): except IOError: raise Http404 - return TemplateResponse(request, 'help_manual.html', - {'title': _('FreedomBox Manual'), - 'content': content}) + return TemplateResponse( + request, 'help_manual.html', + {'title': _('{box_name} Manual').format(box_name=_(cfg.box_name)), + 'content': content}) diff --git a/plinth/modules/help/templates/help_about.html b/plinth/modules/help/templates/help_about.html index d0c33e51f..83e44eeaf 100644 --- a/plinth/modules/help/templates/help_about.html +++ b/plinth/modules/help/templates/help_about.html @@ -55,15 +55,16 @@

{% blocktrans trimmed %} There are a number of projects working to realize a future of - distributed services; FreedomBox aims to bring them all together - in a convenient package. + distributed services; {{ box_name }} aims to bring them all + together in a convenient package. {% endblocktrans %}

{% blocktrans trimmed %} - For more information about the FreedomBox project, see the - FreedomBox Wiki. + For more information about the {{ box_name }} project, see the + {{ box_name }} + Wiki. {% endblocktrans %}

diff --git a/plinth/modules/help/templates/help_base.html b/plinth/modules/help/templates/help_base.html index aaf879b7b..5217c2542 100644 --- a/plinth/modules/help/templates/help_base.html +++ b/plinth/modules/help/templates/help_base.html @@ -33,9 +33,7 @@ {{ cfg.box_name }} - {% blocktrans trimmed with box_name=cfg.box_name %} - {{ box_name }} Setup - {% endblocktrans %} + {% blocktrans trimmed %}{{ box_name }} Setup{% endblocktrans %} diff --git a/plinth/modules/help/templates/help_index.html b/plinth/modules/help/templates/help_index.html index 4b41ac6b3..ee424d8e1 100644 --- a/plinth/modules/help/templates/help_index.html +++ b/plinth/modules/help/templates/help_index.html @@ -26,8 +26,8 @@

{% url 'help:manual' as manual_url %} - {% blocktrans trimmed with box_name=cfg.box_name %} - The FreedomBox Manual is the + {% blocktrans trimmed %} + The {{ box_name }} Manual is the best place to start for information regarding {{ box_name }}. {% endblocktrans %}

@@ -35,13 +35,13 @@

{% blocktrans trimmed %} - FreedomBox project wiki contains further information. + {{ box_name }} project wiki contains further information. {% endblocktrans %}

{% blocktrans trimmed %} - To seek help from FreedomBox community, queries may be posted on + To seek help from {{ box_name }} community, queries may be posted on the mailing list. The list archives also contain information @@ -51,8 +51,8 @@

{% blocktrans trimmed %} - Many FreedomBox contributors and users are also available on the irc.oftc.net IRC network. - Join and request help on the + Many {{ box_name }} contributors and users are also available on + the irc.oftc.net IRC network. Join and request help on the #freedombox channel using the IRC web interface. {% endblocktrans %} diff --git a/plinth/modules/networks/templates/connection_show.html b/plinth/modules/networks/templates/connection_show.html index 476f6fe3b..9ef544235 100644 --- a/plinth/modules/networks/templates/connection_show.html +++ b/plinth/modules/networks/templates/connection_show.html @@ -317,8 +317,8 @@

{% blocktrans trimmed %} - This interface is not maintained by FreedomBox. Its - security status is unknown to FreedomBox. Many FreedomBox + This interface is not maintained by {{ box_name }}. Its + security status is unknown to {{ box_name }}. Many {{ box_name }} services may not be available on this interface. It is recommended that you deactivate/delete this connection and re-configure it. diff --git a/plinth/modules/openvpn/templates/openvpn.html b/plinth/modules/openvpn/templates/openvpn.html index dcedf3d15..654c47722 100644 --- a/plinth/modules/openvpn/templates/openvpn.html +++ b/plinth/modules/openvpn/templates/openvpn.html @@ -57,7 +57,7 @@ desktop machine. OpenVPN Clients are available for most platforms. See documentation on + title="{{ box_name }} Manual - OpenVPN">documentation on recommended clients and instructions on how to configure them. {% endblocktrans %}

diff --git a/plinth/modules/tor/tor.py b/plinth/modules/tor/tor.py index ae80da907..d4f430284 100644 --- a/plinth/modules/tor/tor.py +++ b/plinth/modules/tor/tor.py @@ -34,6 +34,7 @@ from plinth import package from plinth.errors import ActionError from plinth.modules.names import SERVICES from plinth.signals import domain_added, domain_removed +from plinth.utils import format_lazy APT_SOURCES_URI_PATHS = ('/files/etc/apt/sources.list/*/uri', '/files/etc/apt/sources.list.d/*/*/uri') @@ -48,9 +49,10 @@ class TorForm(forms.Form): # pylint: disable=W0232 hs_enabled = forms.BooleanField( label=_('Enable Tor Hidden Service'), required=False, - help_text=_('A hidden service will allow FreedomBox to provide ' - 'selected services (such as ownCloud or Chat) without ' - 'revealing its location.')) + help_text=format_lazy(_( + 'A hidden service will allow {box_name} to provide selected ' + 'services (such as ownCloud or Chat) without revealing its ' + 'location.'), box_name=_(cfg.box_name))) apt_transport_tor_enabled = forms.BooleanField( label=_('Download software packages over Tor'), required=False, diff --git a/plinth/service.py b/plinth/service.py index ec3d28678..3a087ca32 100644 --- a/plinth/service.py +++ b/plinth/service.py @@ -19,12 +19,12 @@ Framework for working with servers and their services. """ +import collections from django.utils.translation import ugettext_lazy as _ -import collections - +from plinth import cfg from plinth.signals import service_enabled - +from plinth.utils import format_lazy services = {} @@ -75,5 +75,7 @@ def init(): is_external=True, enabled=True) Service('ssh', _('Secure Shell (SSH) Server'), ['ssh'], is_external=True, enabled=True) - Service('plinth', _('FreedomBox Web Interface (Plinth)'), ['https'], - is_external=True, enabled=True) + Service('plinth', + format_lazy(_('{box_name} Web Interface (Plinth)'), + box_name=_(cfg.box_name)), + ['https'], is_external=True, enabled=True) diff --git a/plinth/templates/base.html b/plinth/templates/base.html index d34fd28e1..d3f76308d 100644 --- a/plinth/templates/base.html +++ b/plinth/templates/base.html @@ -46,10 +46,12 @@ + content="{% blocktrans trimmed %} + Plinth administrative interface for the {{ box_name }} + {% endblocktrans %}" /> {% block title %} - {% if title %} {{ title }} {% else %} {% trans "FreedomBox" %} {% endif %} + {% if title %} {{ title }} {% else %} {{ box_name }} {% endif %} {% endblock %}