From c5a967a1a249ed02a88521986cdee5cc1536b0fd Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sun, 3 Nov 2024 10:01:57 -0800 Subject: [PATCH] i18n: Fix translation of FreedomBox name in various places Tests: - With a locale that has translation for the 'FreedomBox' source string, check the following locations have translated string for 'FreedomBox': - Default backup repository label. - Firewall app description. - Network forms for: topology, internet connection type, and router configuration. - RSS-Bridge app description. - TiddlyWiki app description. Signed-off-by: Sunil Mohan Adapa Reviewed-by: Veiko Aasa --- plinth/modules/backups/repository.py | 2 +- plinth/modules/firewall/__init__.py | 2 +- plinth/modules/networks/forms.py | 24 ++++++++++++------------ plinth/modules/rssbridge/__init__.py | 2 +- plinth/modules/tiddlywiki/__init__.py | 7 +++---- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/plinth/modules/backups/repository.py b/plinth/modules/backups/repository.py index 9ec67c134..614486316 100644 --- a/plinth/modules/backups/repository.py +++ b/plinth/modules/backups/repository.py @@ -334,7 +334,7 @@ class RootBorgRepository(BaseBorgRepository): PATH = '/var/lib/freedombox/borgbackup' storage_type = 'root' - name = format_lazy(_('{box_name} storage'), box_name=cfg.box_name) + name = format_lazy(_('{box_name} storage'), box_name=_(cfg.box_name)) borg_path = PATH sort_order = 10 is_mounted = True diff --git a/plinth/modules/firewall/__init__.py b/plinth/modules/firewall/__init__.py index 1b559fbca..fa00acb64 100644 --- a/plinth/modules/firewall/__init__.py +++ b/plinth/modules/firewall/__init__.py @@ -25,7 +25,7 @@ _description = [ _('Firewall is a security system that controls the incoming and ' 'outgoing network traffic on your {box_name}. Keeping a ' 'firewall enabled and properly configured reduces risk of ' - 'security threat from the Internet.'), box_name=cfg.box_name) + 'security threat from the Internet.'), box_name=_(cfg.box_name)) ] _port_details: dict[str, list[str]] = {} diff --git a/plinth/modules/networks/forms.py b/plinth/modules/networks/forms.py index 0067dc023..b2dc3f37f 100644 --- a/plinth/modules/networks/forms.py +++ b/plinth/modules/networks/forms.py @@ -364,7 +364,7 @@ class NetworkTopologyForm(forms.Form): network_topology = forms.ChoiceField( label=format_lazy( _('Specify how your {box_name} is connected to your network'), - box_name=cfg.box_name), + box_name=_(cfg.box_name)), required=True, widget=forms.RadioSelect, choices=[ @@ -373,8 +373,8 @@ class NetworkTopologyForm(forms.Form): _('Connected to a router ' '

Your {box_name} gets its Internet ' 'connection from your router via Wi-Fi or Ethernet cable. ' - 'This is a typical home setup.

'), box_name=cfg.box_name, - allow_markup=True)), + 'This is a typical home setup.

'), + box_name=_(cfg.box_name), allow_markup=True)), ('as_router', format_lazy( _('{box_name} is your router ' @@ -383,14 +383,14 @@ class NetworkTopologyForm(forms.Form): 'a Wi-Fi adapter. {box_name} is directly connected to the ' 'Internet and all your devices connect to {box_name} ' 'for their Internet connectivity.

'), - box_name=cfg.box_name, allow_markup=True)), + box_name=_(cfg.box_name), allow_markup=True)), ('direct', format_lazy( _('Directly connected to the Internet ' '

Your Internet connection is ' 'directly attached to your {box_name} and there are no ' 'other devices on the network. This can happen on ' - 'community or cloud setups.

'), box_name=cfg.box_name, + 'community or cloud setups.

'), box_name=_(cfg.box_name), allow_markup=True)), ], ) @@ -430,8 +430,8 @@ class InternetConnectionTypeForm(forms.Form): 'same IP address. This is the most trouble-free setup for ' 'many {box_name} services but very few ISPs offer this. ' 'You may be able to get this service from your ISP by ' - 'making an additional payment.

'), box_name=cfg.box_name, - allow_markup=True)), + 'making an additional payment.

'), + box_name=_(cfg.box_name), allow_markup=True)), ('private_ip', format_lazy( _('I dont have a public IP address' @@ -444,7 +444,7 @@ class InternetConnectionTypeForm(forms.Form): 'most troublesome situation for hosting services at home. ' '{box_name} provides many workaround solutions but each ' 'solution has some limitations.

'), - box_name=cfg.box_name, allow_markup=True)), + box_name=_(cfg.box_name), allow_markup=True)), ('unknown', format_lazy( _('I do not know the type of connection my ISP provides ' @@ -476,8 +476,8 @@ class RouterConfigurationForm(forms.Form): 'Internet to a single IP address such as the ' '{box_name}\'s IP address. First remember to configure ' 'a static local IP address for your {box_name} in your ' - 'router\'s configuration.

'), box_name=cfg.box_name, - allow_markup=True), + 'router\'s configuration.

'), + box_name=_(cfg.box_name), allow_markup=True), ), ('port_forwarding', format_lazy( @@ -491,8 +491,8 @@ class RouterConfigurationForm(forms.Form): 'web interface need you to forward traffic from ports ' '80 and 443 to work. Each of the other applications ' 'will suggest which port(s) need to be forwarded ' - 'for that application to work.

'), box_name=cfg.box_name, - allow_markup=True)), + 'for that application to work.

'), + box_name=_(cfg.box_name), allow_markup=True)), ('not_configured', format_lazy( _('Router is currently unconfigured ' diff --git a/plinth/modules/rssbridge/__init__.py b/plinth/modules/rssbridge/__init__.py index 13bf1cca7..6a4e6aba1 100644 --- a/plinth/modules/rssbridge/__init__.py +++ b/plinth/modules/rssbridge/__init__.py @@ -28,7 +28,7 @@ _description = [ _('You can use RSS-Bridge with Tiny Tiny ' 'RSS to follow various websites. When adding a feed, enable ' 'authentication and use your {box_name} credentials.'), - ttrss_url=reverse_lazy('ttrss:index'), box_name=cfg.box_name), + ttrss_url=reverse_lazy('ttrss:index'), box_name=_(cfg.box_name)), ] diff --git a/plinth/modules/tiddlywiki/__init__.py b/plinth/modules/tiddlywiki/__init__.py index 012064beb..5a30ebc6b 100644 --- a/plinth/modules/tiddlywiki/__init__.py +++ b/plinth/modules/tiddlywiki/__init__.py @@ -26,7 +26,7 @@ _description = [ 'web browser. Each wiki is a self-contained HTML file stored on your' ' {box_name}. Instead of writing long wiki pages, TiddlyWiki ' 'encourages you to write several short notes called Tiddlers and ' - 'link them together into a dense graph.'), box_name=cfg.box_name), + 'link them together into a dense graph.'), box_name=_(cfg.box_name)), _('It is a versatile application with a wide variety of use cases - ' 'non-linear notebook, website, personal knowledge base, task and project' ' management system, personal diary etc. Plugins can extend the ' @@ -41,7 +41,7 @@ _description = [ _('Wikis are not public by default, but they can be downloaded for ' 'sharing or publishing. They can be edited by ' 'any user on {box_name} belonging to the wiki group. ' - 'Simultaneous editing is not supported.'), box_name=cfg.box_name, + 'Simultaneous editing is not supported.'), box_name=_(cfg.box_name), users_url=reverse_lazy('users:index')), _('Create a new wiki or upload your existing wiki file to get started.') ] @@ -66,8 +66,7 @@ class TiddlyWikiApp(app_module.App): short_description=_('Non-linear Notebooks'), description=_description, manual_page='TiddlyWiki', - clients=manifest.clients, - tags=manifest.tags) + clients=manifest.clients, tags=manifest.tags) self.add(info) menu_item = menu.Menu('menu-tiddlywiki', info.name,