nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

help, networks: Clarify i18n different contexts for "Manual"

Browse Source 
The word "Manual" means 'user guide' in case of help and 'not automatically' in
case of networking app.

After change, POT file is produced as follows:

msgctxt "User guide"
msgid "Manual"
msgstr ""

msgctxt "Not automatically"
msgid "Manual"
msgstr ""

Closes: #1922.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Joseph Nuthalapati <njoseph@riseup.net>
This commit is contained in:
Sunil Mohan Adapa 2020-08-19 18:32:52 -07:00 committed by Joseph Nuthalapati
parent eb567e0f41
commit 699266fdc1
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plinth/modules/help/__init__.py
View File

@ -5,6 +5,7 @@ FreedomBox app for help pages.
import os import os
from django.utils.translation import pgettext_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from plinth import app as app_module from plinth import app as app_module
@ -32,7 +33,8 @@ class HelpApp(app_module.App):
menu_item = menu.Menu('menu-help', _('Documentation'), None, 'fa-book', menu_item = menu.Menu('menu-help', _('Documentation'), None, 'fa-book',
'help:index', parent_url_name='index') 'help:index', parent_url_name='index')
self.add(menu_item) self.add(menu_item)
menu_item = menu.Menu('menu-help-manual', _('Manual'), None, menu_item = menu.Menu('menu-help-manual',
pgettext_lazy('User guide', 'Manual'), None,
'fa-info-circle', 'help:manual', 'fa-info-circle', 'help:manual',
parent_url_name='help:index', order=10) parent_url_name='help:index', order=10)
self.add(menu_item) self.add(menu_item)

7
plinth/modules/networks/forms.py
View File

@ -2,6 +2,7 @@
from django import forms from django import forms
from django.core import validators from django.core import validators
from django.utils.translation import pgettext_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from plinth import cfg, network from plinth import cfg, network
@ -44,7 +45,8 @@ class ConnectionForm(forms.Form):
'clients on this network and share its Internet connection.'), 'clients on this network and share its Internet connection.'),
box_name=_(cfg.box_name)), box_name=_(cfg.box_name)),
choices=[('auto', _('Automatic (DHCP)')), ('shared', _('Shared')), choices=[('auto', _('Automatic (DHCP)')), ('shared', _('Shared')),
('manual', _('Manual')), ('disabled', _('Disabled'))]) ('manual', pgettext_lazy('Not automatically', 'Manual')),
('disabled', _('Disabled'))])
ipv4_address = forms.CharField( ipv4_address = forms.CharField(
label=_('Address'), validators=[validators.validate_ipv4_address], label=_('Address'), validators=[validators.validate_ipv4_address],
required=False) required=False)
@ -74,7 +76,8 @@ class ConnectionForm(forms.Form):
'configuration from this network making it a client.'), 'configuration from this network making it a client.'),
box_name=_(cfg.box_name)), box_name=_(cfg.box_name)),
choices=[('auto', _('Automatic')), ('dhcp', _('Automatic, DHCP only')), choices=[('auto', _('Automatic')), ('dhcp', _('Automatic, DHCP only')),
('manual', _('Manual')), ('ignore', _('Ignore'))]) ('manual', pgettext_lazy('Not automatically', 'Manual')),
('ignore', _('Ignore'))])
ipv6_address = forms.CharField( ipv6_address = forms.CharField(
label=_('Address'), validators=[validators.validate_ipv6_address], label=_('Address'), validators=[validators.validate_ipv6_address],
required=False) required=False)

4
plinth/templates/help-menu.html
View File

@ -17,8 +17,8 @@
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li> <li>
<a href="{% url 'help:manual' %}" <a href="{% url 'help:manual' %}"
title="{% trans "Manual"%}"> title="{% trans "Manual" context "User guide" %}">
{% trans "Manual" %} {% trans "Manual" context "User guide" %}
</a> </a>
</li> </li>
<li role="separator" class="divider hidden-xs"></li> <li role="separator" class="divider hidden-xs"></li>

2
plinth/templates/index.html
View File

@ -125,7 +125,7 @@
<div class="col-md-2 col-md-offset-3"> <div class="col-md-2 col-md-offset-3">
<p> <p>
<a href="https://wiki.debian.org/FreedomBox/Manual"> <a href="https://wiki.debian.org/FreedomBox/Manual">
{% trans "Manual" %} {% trans "Manual" context "User guide"%}
</a> </a>
</p> </p>
<p> <p>