DNS app translation

dns/forms.py

@@ -2,9 +2,10 @@ import re
 
 from crispy_forms.bootstrap import FormActions
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Fieldset, Div, Field, Submit, HTML
+from crispy_forms.layout import Div, Field, Fieldset, HTML, Layout, Submit
 from django import forms
 from django.core.exceptions import ValidationError
+from django.utils.translation import gettext_lazy as _
 
 from .models import DNSFilterList
 from .models import DNSSettings, StaticHost
@@ -18,13 +19,14 @@ class DNSSettingsForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(DNSSettingsForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper()
-        self.fields['dns_primary'].label = 'Primary Resolver'
-        self.fields['dns_secondary'].label = 'Secondary Resolver'
+        self.fields['dns_primary'].label = _('Primary Resolver')
+        self.fields['dns_secondary'].label = _('Secondary Resolver')
         self.fields['dns_primary'].required = True
+        back_label = _('Back')
         self.helper.form_method = 'post'
         self.helper.layout = Layout(
             Fieldset(
-                'Resolver Settings',
+                _('Resolver Settings'),
                 Div(
                     Field('dns_primary', css_class='form-control'),
                     Field('dns_secondary', css_class='form-control'),
@@ -32,8 +34,8 @@ class DNSSettingsForm(forms.ModelForm):
                 ),
             ),
             FormActions(
-                Submit('save', 'Save', css_class='btn btn-primary'),
-                HTML('<a class="btn btn-outline-primary" href="/dns/">Back</a>'),
+                Submit('save', _('Save'), css_class='btn btn-primary'),
+                HTML(f'<a class="btn btn-outline-primary" href="/dns/">{back_label}</a>'),
             )
         )
 
@@ -60,13 +62,17 @@ class StaticHostForm(forms.ModelForm):
         super(StaticHostForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper()
         self.helper.form_method = 'post'
+        self.fields['hostname'].label = _('Hostname')
+        self.fields['ip_address'].label = _('IP Address')
+        back_label = _('Back')
+        delete_label = _('Delete')
         if self.instance.pk:
-            delete_html = "<a href='javascript:void(0)' class='btn btn-outline-danger' data-command='delete' onclick='openCommandDialog(this)'>Delete</a>"
+            delete_html = f"<a href='javascript:void(0)' class='btn btn-outline-danger' data-command='delete' onclick='openCommandDialog(this)'>{delete_label}</a>"
         else:
             delete_html = ''
         self.helper.layout = Layout(
             Fieldset(
-                'Static DNS',
+                _('Static DNS'),
                 Div(
                     Field('hostname', css_class='form-control'),
                     Field('ip_address', css_class='form-control'),
@@ -74,8 +80,8 @@ class StaticHostForm(forms.ModelForm):
                 ),
             ),
             FormActions(
-                Submit('save', 'Save', css_class='btn btn-primary'),
-                HTML('<a class="btn btn-outline-primary" href="/dns/">Back</a> '),
+                Submit('save', _('Save'), css_class='btn btn-primary'),
+                HTML(f'<a class="btn btn-outline-primary" href="/dns/">{back_label}</a> '),
                 HTML(delete_html),
             )
         )
@@ -100,18 +106,23 @@ class DNSFilterListForm(forms.ModelForm):
         super(DNSFilterListForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper()
         self.helper.form_method = 'post'
-        # Add a delete button if editing an existing instance
+        back_label = _('Back')
+        delete_label = _('Delete')
+        self.fields['name'].label = _('Name')
+        self.fields['description'].label = _('Description')
+        self.fields['list_url'].label = _('List URL')
+
         if self.instance.pk:
             delete_html = (
                 "<a href='javascript:void(0)' class='btn btn-outline-danger' "
-                "data-command='delete' onclick='openCommandDialog(this)'>Delete</a>"
+                f"data-command='delete' onclick='openCommandDialog(this)'>{delete_label}</a>"
             )
             self.fields['name'].widget.attrs['readonly'] = True
         else:
             delete_html = ''
         self.helper.layout = Layout(
             Fieldset(
-                'DNS Filter List Details',
+                _('DNS Filter List Details'),
                 Div(
                     Div(Field('name', css_class='form-control'), css_class='col-md-12'),
                     Div(Field('description', css_class='form-control'), css_class='col-md-12'),
@@ -120,8 +131,8 @@ class DNSFilterListForm(forms.ModelForm):
                 ),
             ),
             FormActions(
-                Submit('save', 'Save', css_class='btn btn-primary'),
-                HTML('<a class="btn btn-outline-primary" href="/dns/">Back</a>'),
+                Submit('save', _('Save'), css_class='btn btn-primary'),
+                HTML(f'<a class="btn btn-outline-primary" href="/dns/">{back_label}</a>'),
                 HTML(delete_html),
             )
         )

dns/views.py

@@ -5,12 +5,13 @@ import requests
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import render, get_object_or_404, redirect
+from django.shortcuts import get_object_or_404, redirect, render
 from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 
 from user_manager.models import UserAcl
 from .forms import DNSFilterListForm
-from .forms import StaticHostForm, DNSSettingsForm
+from .forms import DNSSettingsForm, StaticHostForm
 from .functions import generate_dnsmasq_config
 from .models import DNSFilterList, DNSSettings
 from .models import StaticHost
@@ -29,13 +30,13 @@ def export_dns_configuration():
 @login_required
 def view_apply_dns_config(request):
     export_dns_configuration()
-    messages.success(request, 'DNS settings applied successfully')
+    messages.success(request, _('DNS settings applied successfully'))
     return redirect('/dns/')
 
 
 @login_required
 def view_static_host_list(request):
-    dns_settings, _ = DNSSettings.objects.get_or_create(name='dns_settings')
+    dns_settings, dns_settings_created = DNSSettings.objects.get_or_create(name='dns_settings')
     static_host_list = StaticHost.objects.all().order_by('hostname')
     filter_lists = DNSFilterList.objects.all().order_by('-recommended', 'name')
     if not filter_lists:
@@ -64,10 +65,10 @@ def view_static_host_list(request):
         )
 
         filter_lists = DNSFilterList.objects.all().order_by('-recommended', 'name')
-        messages.success(request, 'Default DNS Filter List created successfully')
+        messages.success(request, _('Default DNS Filter List created successfully'))
 
     if dns_settings.pending_changes:
-        messages.warning(request, 'Pending Changes|There are pending DNS changes that have not been applied')
+        messages.warning(request, _('Pending Changes|There are pending DNS changes that have not been applied'))
     context = {
         'dns_settings': dns_settings,
         'static_host_list': static_host_list,
@@ -80,19 +81,16 @@ def view_static_host_list(request):
 def view_manage_dns_settings(request):
     if not UserAcl.objects.filter(user=request.user).filter(user_level__gte=50).exists():
         return render(request, 'access_denied.html', {'page_title': 'Access Denied'})
-    dns_settings, _ = DNSSettings.objects.get_or_create(name='dns_settings')
+    dns_settings, dns_settings_created = DNSSettings.objects.get_or_create(name='dns_settings')
     form = DNSSettingsForm(request.POST or None, instance=dns_settings)
     if form.is_valid():
         form.save()
         return redirect('/dns/apply_config/')
 
-    form_description_content = '''
-        <strong>DNS Forwarders</strong>
-        <p>
-        All DNS queries will be forwarded to the primary resolver. If the primary resolver is not available, the secondary resolver will be used.
-        </p>
-        
-        '''
+    description_title = _('DNS Forwarders')
+    description_message = _('All DNS queries will be forwarded to the primary resolver. If the primary resolver is not available, the secondary resolver will be used.')
+    form_description_content = f'<strong>{description_title}</strong><p>{description_message}</p>'
+
 
     context = {
         'dns_settings': dns_settings,
@@ -109,7 +107,7 @@ def view_manage_dns_settings(request):
 def view_manage_static_host(request):
     if not UserAcl.objects.filter(user=request.user).filter(user_level__gte=40).exists():
         return render(request, 'access_denied.html', {'page_title': 'Access Denied'})
-    dns_settings, _ = DNSSettings.objects.get_or_create(name='dns_settings')
+    dns_settings, dns_settings_created = DNSSettings.objects.get_or_create(name='dns_settings')
     if request.GET.get('uuid'):
         static_dns = get_object_or_404(StaticHost, uuid=request.GET.get('uuid'))
         if request.GET.get('action') == 'delete':
@@ -117,10 +115,10 @@ def view_manage_static_host(request):
                 static_dns.delete()
                 dns_settings.pending_changes = True
                 dns_settings.save()
-                messages.success(request, 'Static DNS deleted successfully')
+                messages.success(request, _('Static DNS deleted successfully'))
                 return redirect('/dns/')
             else:
-                messages.warning(request, 'Static DNS not deleted|Invalid confirmation')
+                messages.warning(request, _('Static DNS not deleted|Invalid confirmation'))
                 return redirect('/dns/')
     else:
         static_dns = None
@@ -130,7 +128,7 @@ def view_manage_static_host(request):
         form.save()
         dns_settings.pending_changes = True
         dns_settings.save()
-        messages.success(request, 'Static DNS saved successfully')
+        messages.success(request, _('Static DNS saved successfully'))
         return redirect('/dns/')
 
     context = {
@@ -146,27 +144,27 @@ def view_manage_filter_list(request):
     if not UserAcl.objects.filter(user=request.user, user_level__gte=40).exists():
         return render(request, 'access_denied.html', {'page_title': 'Access Denied'})
 
-    dns_settings, _ = DNSSettings.objects.get_or_create(name='dns_settings')
+    dns_settings, dns_settings_created = DNSSettings.objects.get_or_create(name='dns_settings')
 
     if request.GET.get('uuid'):
         filter_list = get_object_or_404(DNSFilterList, uuid=request.GET.get('uuid'))
         if request.GET.get('action') == 'delete':
             if request.GET.get('confirmation') == 'delete':
                 if filter_list.enabled:
-                    messages.warning(request, 'DNS Filter List not deleted | Filter List is enabled')
+                    messages.warning(request, _('DNS Filter List not deleted | Filter List is enabled'))
                     return redirect('/dns/')
                 file_path = os.path.join("/etc/dnsmasq/", f"{filter_list.uuid}.conf")
                 if os.path.exists(file_path):
                     try:
                         os.remove(file_path)
                     except Exception as e:
-                        messages.error(request, f"Error removing config file: {e}")
+                        messages.error(request, _("Error removing config file: ") + e)
                         return redirect('/dns/')
                 filter_list.delete()
-                messages.success(request, 'DNS Filter List deleted successfully')
+                messages.success(request, _('DNS Filter List deleted successfully'))
                 return redirect('/dns/')
             else:
-                messages.warning(request, 'DNS Filter List not deleted | Invalid confirmation')
+                messages.warning(request, _('DNS Filter List not deleted | Invalid confirmation'))
                 return redirect('/dns/')
     else:
         filter_list = None
@@ -176,7 +174,7 @@ def view_manage_filter_list(request):
         form.save()
         dns_settings.pending_changes = True
         dns_settings.save()
-        messages.success(request, 'DNS Filter List saved successfully')
+        messages.success(request, _('DNS Filter List saved successfully'))
         return redirect('/dns/')
 
     context = {
@@ -193,7 +191,7 @@ def view_update_dns_list(request):
         return render(request, 'access_denied.html', {'page_title': 'Access Denied'})
 
     dns_list = get_object_or_404(DNSFilterList, uuid=request.GET.get('uuid'))
-    dns_settings, _ = DNSSettings.objects.get_or_create(name='dns_settings')
+    dns_settings, dns_settings_created = DNSSettings.objects.get_or_create(name='dns_settings')
     file_path = os.path.join("/etc/dnsmasq/", f"{dns_list.uuid}.conf")
 
     old_checksum = None
@@ -203,7 +201,7 @@ def view_update_dns_list(request):
                 old_content = f.read()
             old_checksum = hashlib.sha256(old_content).hexdigest()
         except Exception as e:
-            messages.error(request, f"Failed to read existing config file: {e}")
+            messages.error(request, _("Failed to read existing config file: ") + e)
             if dns_list.enabled:
                 dns_list.enabled = False
                 dns_list.save()
@@ -221,7 +219,7 @@ def view_update_dns_list(request):
             dns_list.save()
             dns_settings.pending_changes = True
             dns_settings.save()
-        messages.error(request, f"Failed to fetch the host list: {e}")
+        messages.error(request, _("Failed to fetch the host list: ") + e)
         return redirect('/dns/')
 
     new_checksum = hashlib.sha256(content.encode('utf-8')).hexdigest()
@@ -231,7 +229,7 @@ def view_update_dns_list(request):
         with open(file_path, "w") as f:
             f.write(content)
     except Exception as e:
-        messages.error(request, f"Failed to write config file: {e}")
+        messages.error(request, _("Failed to write config file: ") + e)
         if dns_list.enabled:
             dns_list.enabled = False
             dns_list.save()
@@ -256,7 +254,7 @@ def view_update_dns_list(request):
     # Save changes to the DNSFilterList instance.
     dns_list.save()
 
-    messages.success(request, 'DNS Filter List updated successfully')
+    messages.success(request, _('DNS Filter List updated successfully'))
     return redirect('/dns/')
 
 
@@ -265,7 +263,7 @@ def view_toggle_dns_list(request):
         return render(request, 'access_denied.html', {'page_title': 'Access Denied'})
 
     dns_list = get_object_or_404(DNSFilterList, uuid=request.GET.get('uuid'))
-    dns_settings, _ = DNSSettings.objects.get_or_create(name='dns_settings')
+    dns_settings, dns_settings_created = DNSSettings.objects.get_or_create(name='dns_settings')
     file_path = os.path.join("/etc/dnsmasq/", f"{dns_list.uuid}.conf")
 
     if request.GET.get('action') == 'enable':
@@ -273,12 +271,12 @@ def view_toggle_dns_list(request):
             dns_list.enabled = True
             dns_list.save()
             export_dns_configuration()
-            messages.success(request, 'DNS Filter List enabled successfully')
+            messages.success(request, _('DNS Filter List enabled successfully'))
         else:
-            messages.error(request, 'DNS Filter List not enabled | No valid hosts found')
+            messages.error(request, _('DNS Filter List not enabled | No valid hosts found'))
     else:
         dns_list.enabled = False
         dns_list.save()
         export_dns_configuration()
-        messages.success(request, 'DNS Filter List disabled successfully')
+        messages.success(request, _('DNS Filter List disabled successfully'))
     return redirect('/dns/')