Add missing translations

This commit is contained in:
ErikKalkoken
2020-03-24 20:21:35 +01:00
parent 32e0621b0a
commit 73f262ce4b
17 changed files with 102 additions and 80 deletions

View File

@@ -17,6 +17,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMix
from django.db import models, IntegrityError
from django.core.exceptions import ObjectDoesNotExist
from django.shortcuts import render, Http404, redirect
from django.utils.translation import gettext_lazy as _
from .forms import ServicePasswordModelForm
@@ -68,7 +69,7 @@ class BaseCreatePasswordServiceAccountView(BaseServiceView, ServiceCredentialsVi
try:
svc_obj = self.model.objects.create(user=request.user)
except IntegrityError:
messages.error(request, "That service account already exists")
messages.error(request, _("That service account already exists"))
return redirect(self.index_redirect)
return render(request, self.template_name,
@@ -100,7 +101,7 @@ class BaseSetPasswordServiceAccountView(ServicesCRUDMixin, BaseServiceView, Upda
def post(self, request, *args, **kwargs):
result = super(BaseSetPasswordServiceAccountView, self).post(request, *args, **kwargs)
if self.get_form().is_valid():
messages.success(request, "Successfully set your {} password".format(self.service_name))
messages.success(request, _("Successfully set your {} password".format(self.service_name)))
return result

View File

@@ -1,4 +1,6 @@
from django.utils.translation import gettext_lazy as _
from allianceauth import hooks
from .hooks import MenuItemHook
from .hooks import ServicesHook
@@ -6,7 +8,7 @@ from .hooks import ServicesHook
class Services(MenuItemHook):
def __init__(self):
MenuItemHook.__init__(self,
'Services',
_('Services'),
'fa fa-cogs fa-fw',
'services:services', 100)

View File

@@ -5,8 +5,10 @@ from django.contrib.auth.decorators import login_required
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.decorators import user_passes_test
from django.shortcuts import redirect
from django.utils.translation import gettext_lazy as _
from allianceauth.services.views import superuser_test
from .manager import DiscordOAuthManager
from .tasks import DiscordTasks
@@ -21,10 +23,10 @@ def deactivate_discord(request):
logger.debug("deactivate_discord called by user %s" % request.user)
if DiscordTasks.delete_user(request.user):
logger.info("Successfully deactivated discord for user %s" % request.user)
messages.success(request, 'Deactivated Discord account.')
messages.success(request, _('Deactivated Discord account.'))
else:
logger.error("Unsuccessful attempt to deactivate discord for user %s" % request.user)
messages.error(request, 'An error occurred while processing your Discord account.')
messages.error(request, _('An error occurred while processing your Discord account.'))
return redirect("services:services")
@@ -36,7 +38,7 @@ def reset_discord(request):
logger.info("Successfully deleted discord user for user %s - forwarding to discord activation." % request.user)
return redirect("discord:activate")
logger.error("Unsuccessful attempt to reset discord for user %s" % request.user)
messages.error(request, 'An error occurred while processing your Discord account.')
messages.error(request, _('An error occurred while processing your Discord account.'))
return redirect("services:services")
@@ -57,10 +59,10 @@ def discord_callback(request):
return redirect("services:services")
if DiscordTasks.add_user(request.user, code):
logger.info("Successfully activated Discord for user %s" % request.user)
messages.success(request, 'Activated Discord account.')
messages.success(request, _('Activated Discord account.'))
else:
logger.error("Failed to activate Discord for user %s" % request.user)
messages.error(request, 'An error occurred while processing your Discord account.')
messages.error(request, _('An error occurred while processing your Discord account.'))
return redirect("services:services")

View File

@@ -2,6 +2,7 @@ from django.conf import settings
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.shortcuts import render, redirect
from django.utils.translation import gettext_lazy as _
from .manager import DiscourseManager
from .tasks import DiscourseTasks
@@ -33,12 +34,12 @@ def discourse_sso(request):
# Check if user has access
if not request.user.has_perm(ACCESS_PERM):
messages.error(request, 'You are not authorized to access Discourse.')
messages.error(request, _('You are not authorized to access Discourse.'))
logger.warning('User %s attempted to access Discourse but does not have permission.' % request.user)
return redirect('authentication:dashboard')
if not request.user.profile.main_character:
messages.error(request, "You must have a main character set to access Discourse.")
messages.error(request, _("You must have a main character set to access Discourse."))
logger.warning('User %s attempted to access Discourse but does not have a main character.' % request.user)
return redirect('authentication:characters')
@@ -48,7 +49,7 @@ def discourse_sso(request):
signature = request.GET.get('sig')
if None in [payload, signature]:
messages.error(request, 'No SSO payload or signature. Please contact support if this problem persists.')
messages.error(request, _('No SSO payload or signature. Please contact support if this problem persists.'))
return redirect('authentication:dashboard')
# Validate the payload
@@ -58,7 +59,7 @@ def discourse_sso(request):
assert 'nonce' in decoded
assert len(payload) > 0
except AssertionError:
messages.error(request, 'Invalid payload. Please contact support if this problem persists.')
messages.error(request, _('Invalid payload. Please contact support if this problem persists.'))
return redirect('authentication:dashboard')
key = str(settings.DISCOURSE_SSO_SECRET).encode('utf-8')
@@ -66,7 +67,7 @@ def discourse_sso(request):
this_signature = h.hexdigest()
if this_signature != signature:
messages.error(request, 'Invalid payload. Please contact support if this problem persists.')
messages.error(request, _('Invalid payload. Please contact support if this problem persists.'))
return redirect('authentication:dashboard')
## Build the return payload

View File

@@ -3,6 +3,7 @@ import logging
from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
from django.shortcuts import render, redirect
from django.utils.translation import gettext_lazy as _
from allianceauth.services.forms import ServicePasswordForm
from .manager import Ips4Manager
@@ -27,7 +28,7 @@ def activate_ips4(request):
logger.debug("Updated authserviceinfo for user %s with IPS4 credentials." % request.user)
# update_ips4_groups.delay(request.user.pk)
logger.info("Successfully activated IPS4 for user %s" % request.user)
messages.success(request, 'Activated IPSuite4 account.')
messages.success(request, _('Activated IPSuite4 account.'))
credentials = {
'username': result[0],
'password': result[1],
@@ -36,7 +37,7 @@ def activate_ips4(request):
context={'credentials': credentials, 'service': 'IPSuite4'})
else:
logger.error("Unsuccessful attempt to activate IPS4 for user %s" % request.user)
messages.error(request, 'An error occurred while processing your IPSuite4 account.')
messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
return redirect("services:services")
@@ -49,7 +50,7 @@ def reset_ips4_password(request):
# false we failed
if result != "":
logger.info("Successfully reset IPS4 password for user %s" % request.user)
messages.success(request, 'Reset IPSuite4 password.')
messages.success(request, _('Reset IPSuite4 password.'))
credentials = {
'username': request.user.ips4.username,
'password': result,
@@ -58,7 +59,7 @@ def reset_ips4_password(request):
context={'credentials': credentials, 'service': 'IPSuite4'})
logger.error("Unsuccessful attempt to reset IPS4 password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your IPSuite4 account.')
messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
return redirect("services:services")
@@ -76,10 +77,10 @@ def set_ips4_password(request):
result = Ips4Manager.update_custom_password(request.user.ips4.username, plain_password=password)
if result != "":
logger.info("Successfully set IPS4 password for user %s" % request.user)
messages.success(request, 'Set IPSuite4 password.')
messages.success(request, _('Set IPSuite4 password.'))
else:
logger.error("Failed to install custom IPS4 password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your IPSuite4 account.')
messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
return redirect('services:services')
else:
logger.debug("Request is not type POST - providing empty form.")
@@ -96,9 +97,9 @@ def deactivate_ips4(request):
logger.debug("deactivate_ips4 called by user %s" % request.user)
if Ips4Tasks.delete_user(request.user):
logger.info("Successfully deactivated IPS4 for user %s" % request.user)
messages.success(request, 'Deactivated IPSuite4 account.')
messages.success(request, _('Deactivated IPSuite4 account.'))
else:
logger.error("Unsuccessful attempt to deactivate IPS4 for user %s" % request.user)
messages.error(request, 'An error occurred while processing your IPSuite4 account.')
messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
return redirect("services:services")

View File

@@ -2,6 +2,7 @@ import logging
from django.conf import settings
from django.template.loader import render_to_string
from django.utils.translation import gettext_lazy as _
from allianceauth import hooks
from allianceauth.services.hooks import ServicesHook, MenuItemHook
@@ -22,7 +23,7 @@ class OpenfireService(ServicesHook):
@property
def title(self):
return "Jabber"
return _("Jabber")
def delete_user(self, user, notify_user=False):
logger.debug('Deleting user %s %s account' % (user, self.name))
@@ -74,7 +75,7 @@ def register_service():
class JabberBroadcast(MenuItemHook):
def __init__(self):
MenuItemHook.__init__(self,
'Jabber Broadcast',
_('Jabber Broadcast'),
'fa fa-lock fa-fw fa-bullhorn',
'openfire:broadcast')
@@ -87,7 +88,7 @@ class JabberBroadcast(MenuItemHook):
class FleetBroadcastFormatter(MenuItemHook):
def __init__(self):
MenuItemHook.__init__(self,
'Fleet Broadcast Formatter',
_('Fleet Broadcast Formatter'),
'fa fa-lock fa-fw fa-space-shuttle',
'services:fleet_format_tool')

View File

@@ -5,8 +5,10 @@ from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.auth.models import Group
from django.shortcuts import render, redirect
from django.utils.translation import gettext_lazy as _
from allianceauth.services.forms import ServicePasswordForm
from .forms import JabberBroadcastForm
from .manager import OpenfireManager, PingBotException
from .models import OpenfireUser
@@ -30,7 +32,7 @@ def activate_jabber(request):
logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user)
OpenfireTasks.update_groups.delay(request.user.pk)
logger.info("Successfully activated jabber for user %s" % request.user)
messages.success(request, 'Activated jabber account.')
messages.success(request, _('Activated jabber account.'))
credentials = {
'username': info[0],
'password': info[1],
@@ -39,7 +41,7 @@ def activate_jabber(request):
context={'credentials': credentials, 'service': 'Jabber'})
else:
logger.error("Unsuccessful attempt to activate jabber for user %s" % request.user)
messages.error(request, 'An error occurred while processing your jabber account.')
messages.error(request, _('An error occurred while processing your jabber account.'))
return redirect("services:services")
@@ -52,7 +54,7 @@ def deactivate_jabber(request):
messages.success(request, 'Deactivated jabber account.')
else:
logger.error("Unsuccessful attempt to deactivate jabber for user %s" % request.user)
messages.error(request, 'An error occurred while processing your jabber account.')
messages.error(request, _('An error occurred while processing your jabber account.'))
return redirect("services:services")
@@ -65,7 +67,7 @@ def reset_jabber_password(request):
# If our username is blank means we failed
if result != "":
logger.info("Successfully reset jabber password for user %s" % request.user)
messages.success(request, 'Reset jabber password.')
messages.success(request, _('Reset jabber password.'))
credentials = {
'username': request.user.openfire.username,
'password': result,
@@ -73,7 +75,7 @@ def reset_jabber_password(request):
return render(request, 'services/service_credentials.html',
context={'credentials': credentials, 'service': 'Jabber'})
logger.error("Unsuccessful attempt to reset jabber for user %s" % request.user)
messages.error(request, 'An error occurred while processing your jabber account.')
messages.error(request, _('An error occurred while processing your jabber account.'))
return redirect("services:services")
@@ -114,7 +116,7 @@ def jabber_broadcast_view(request):
OpenfireManager.send_broadcast_message(group_to_send, message_to_send)
messages.success(request, 'Sent jabber broadcast to %s' % group_to_send)
messages.success(request, _('Sent jabber broadcast to %s' % group_to_send))
logger.info("Sent jabber broadcast on behalf of user %s" % request.user)
except PingBotException as e:
messages.error(request, e)
@@ -143,10 +145,10 @@ def set_jabber_password(request):
result = OpenfireManager.update_user_pass(request.user.openfire.username, password=password)
if result != "":
logger.info("Successfully set jabber password for user %s" % request.user)
messages.success(request, 'Set jabber password.')
messages.success(request, _('Set jabber password.'))
else:
logger.error("Failed to install custom jabber password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your jabber account.')
messages.error(request, _('An error occurred while processing your jabber account.'))
return redirect("services:services")
else:
logger.debug("Request is not type POST - providing empty form.")

View File

@@ -3,8 +3,10 @@ import logging
from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
from django.shortcuts import render, redirect
from django.utils.translation import gettext_lazy as _
from allianceauth.services.forms import ServicePasswordForm
from .manager import Phpbb3Manager
from .models import Phpbb3User
from .tasks import Phpbb3Tasks
@@ -29,7 +31,7 @@ def activate_forum(request):
logger.debug("Updated authserviceinfo for user %s with forum credentials. Updating groups." % request.user)
Phpbb3Tasks.update_groups.delay(request.user.pk)
logger.info("Successfully activated forum for user %s" % request.user)
messages.success(request, 'Activated forum account.')
messages.success(request, _('Activated forum account.'))
credentials = {
'username': result[0],
'password': result[1],
@@ -38,7 +40,7 @@ def activate_forum(request):
context={'credentials': credentials, 'service': 'Forum'})
else:
logger.error("Unsuccessful attempt to activate forum for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum account.')
messages.error(request, _('An error occurred while processing your forum account.'))
return redirect("services:services")
@@ -49,10 +51,10 @@ def deactivate_forum(request):
# false we failed
if Phpbb3Tasks.delete_user(request.user):
logger.info("Successfully deactivated forum for user %s" % request.user)
messages.success(request, 'Deactivated forum account.')
messages.success(request, _('Deactivated forum account.'))
else:
logger.error("Unsuccessful attempt to activate forum for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum account.')
messages.error(request, _('An error occurred while processing your forum account.'))
return redirect("services:services")
@@ -66,7 +68,7 @@ def reset_forum_password(request):
# false we failed
if result != "":
logger.info("Successfully reset forum password for user %s" % request.user)
messages.success(request, 'Reset forum password.')
messages.success(request, _('Reset forum password.'))
credentials = {
'username': request.user.phpbb3.username,
'password': result,
@@ -75,7 +77,7 @@ def reset_forum_password(request):
context={'credentials': credentials, 'service': 'Forum'})
logger.error("Unsuccessful attempt to reset forum password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum account.')
messages.error(request, _('An error occurred while processing your forum account.'))
return redirect("services:services")
@@ -95,10 +97,10 @@ def set_forum_password(request):
password=password)
if result != "":
logger.info("Successfully set forum password for user %s" % request.user)
messages.success(request, 'Set forum password.')
messages.success(request, _('Set forum password.'))
else:
logger.error("Failed to install custom forum password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum account.')
messages.error(request, _('An error occurred while processing your forum account.'))
return redirect("services:services")
else:
logger.debug("Request is not type POST - providing empty form.")

View File

@@ -3,8 +3,10 @@ import logging
from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
from django.shortcuts import render, redirect
from django.utils.translation import gettext_lazy as _
from allianceauth.services.forms import ServicePasswordForm
from .manager import SmfManager
from .models import SmfUser
from .tasks import SmfTasks
@@ -29,7 +31,7 @@ def activate_smf(request):
logger.debug("Updated authserviceinfo for user %s with smf credentials. Updating groups." % request.user)
SmfTasks.update_groups.delay(request.user.pk)
logger.info("Successfully activated smf for user %s" % request.user)
messages.success(request, 'Activated SMF account.')
messages.success(request, _('Activated SMF account.'))
credentials = {
'username': result[0],
'password': result[1],
@@ -38,7 +40,7 @@ def activate_smf(request):
context={'credentials': credentials, 'service': 'SMF'})
else:
logger.error("Unsuccessful attempt to activate smf for user %s" % request.user)
messages.error(request, 'An error occurred while processing your SMF account.')
messages.error(request, _('An error occurred while processing your SMF account.'))
return redirect("services:services")
@@ -50,10 +52,10 @@ def deactivate_smf(request):
# false we failed
if result:
logger.info("Successfully deactivated smf for user %s" % request.user)
messages.success(request, 'Deactivated SMF account.')
messages.success(request, _('Deactivated SMF account.'))
else:
logger.error("Unsuccessful attempt to activate smf for user %s" % request.user)
messages.error(request, 'An error occurred while processing your SMF account.')
messages.error(request, _('An error occurred while processing your SMF account.'))
return redirect("services:services")
@@ -67,7 +69,7 @@ def reset_smf_password(request):
# false we failed
if result != "":
logger.info("Successfully reset smf password for user %s" % request.user)
messages.success(request, 'Reset SMF password.')
messages.success(request, _('Reset SMF password.'))
credentials = {
'username': request.user.smf.username,
'password': result,
@@ -75,7 +77,7 @@ def reset_smf_password(request):
return render(request, 'services/service_credentials.html',
context={'credentials': credentials, 'service': 'SMF'})
logger.error("Unsuccessful attempt to reset smf password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your SMF account.')
messages.error(request, _('An error occurred while processing your SMF account.'))
return redirect("services:services")
@@ -95,10 +97,10 @@ def set_smf_password(request):
password=password)
if result != "":
logger.info("Successfully set smf password for user %s" % request.user)
messages.success(request, 'Set SMF password.')
messages.success(request, _('Set SMF password.'))
else:
logger.error("Failed to install custom smf password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your SMF account.')
messages.error(request, _('An error occurred while processing your SMF account.'))
return redirect("services:services")
else:
logger.debug("Request is not type POST - providing empty form.")

View File

@@ -4,6 +4,8 @@ from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
from django.shortcuts import render, redirect
from django.conf import settings
from django.utils.translation import gettext_lazy as _
from .manager import Teamspeak3Manager
from .forms import TeamspeakJoinForm
from .models import Teamspeak3User
@@ -29,10 +31,10 @@ def activate_teamspeak3(request):
Teamspeak3User.objects.update_or_create(user=request.user, defaults={'uid': result[0], 'perm_key': result[1]})
logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
logger.info("Successfully activated TS3 for user %s" % request.user)
messages.success(request, 'Activated TeamSpeak3 account.')
messages.success(request, _('Activated TeamSpeak3 account.'))
return redirect("teamspeak3:verify")
logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user)
messages.error(request, 'An error occurred while processing your TeamSpeak3 account.')
messages.error(request, _('An error occurred while processing your TeamSpeak3 account.'))
return redirect("services:services")
@@ -66,10 +68,10 @@ def deactivate_teamspeak3(request):
logger.debug("deactivate_teamspeak3 called by user %s" % request.user)
if Teamspeak3Tasks.has_account(request.user) and Teamspeak3Tasks.delete_user(request.user):
logger.info("Successfully deactivated TS3 for user %s" % request.user)
messages.success(request, 'Deactivated TeamSpeak3 account.')
messages.success(request, _('Deactivated TeamSpeak3 account.'))
else:
logger.error("Unsuccessful attempt to deactivate TS3 for user %s" % request.user)
messages.error(request, 'An error occurred while processing your TeamSpeak3 account.')
messages.error(request, _('An error occurred while processing your TeamSpeak3 account.'))
return redirect("services:services")
@@ -92,8 +94,8 @@ def reset_teamspeak3_perm(request):
logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
Teamspeak3Tasks.update_groups.delay(request.user.pk)
logger.info("Successfully reset TS3 permission key for user %s" % request.user)
messages.success(request, 'Reset TeamSpeak3 permission key.')
messages.success(request, _('Reset TeamSpeak3 permission key.'))
else:
logger.error("Unsuccessful attempt to reset TS3 permission key for user %s" % request.user)
messages.error(request, 'An error occurred while processing your TeamSpeak3 account.')
messages.error(request, _('An error occurred while processing your TeamSpeak3 account.'))
return redirect("services:services")

View File

@@ -3,8 +3,10 @@ import logging
from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
from django.shortcuts import render, redirect
from django.utils.translation import gettext_lazy as _
from allianceauth.services.forms import ServicePasswordForm
from .manager import XenForoManager
from .models import XenforoUser
from .tasks import XenforoTasks
@@ -25,7 +27,7 @@ def activate_xenforo_forum(request):
if result['response']['status_code'] == 200:
XenforoUser.objects.update_or_create(user=request.user, defaults={'username': result['username']})
logger.info("Updated user %s with XenForo credentials. Updating groups." % request.user)
messages.success(request, 'Activated XenForo account.')
messages.success(request, _('Activated XenForo account.'))
credentials = {
'username': result['username'],
'password': result['password'],
@@ -35,7 +37,7 @@ def activate_xenforo_forum(request):
else:
logger.error("Unsuccessful attempt to activate xenforo for user %s" % request.user)
messages.error(request, 'An error occurred while processing your XenForo account.')
messages.error(request, _('An error occurred while processing your XenForo account.'))
return redirect("services:services")
@@ -45,9 +47,9 @@ def deactivate_xenforo_forum(request):
logger.debug("deactivate_xenforo_forum called by user %s" % request.user)
if XenforoTasks.delete_user(request.user):
logger.info("Successfully deactivated XenForo for user %s" % request.user)
messages.success(request, 'Deactivated XenForo account.')
messages.success(request, _('Deactivated XenForo account.'))
else:
messages.error(request, 'An error occurred while processing your XenForo account.')
messages.error(request, _('An error occurred while processing your XenForo account.'))
return redirect("services:services")
@@ -60,7 +62,7 @@ def reset_xenforo_password(request):
# Based on XenAPI's response codes
if result['response']['status_code'] == 200:
logger.info("Successfully reset XenForo password for user %s" % request.user)
messages.success(request, 'Reset XenForo account password.')
messages.success(request, _('Reset XenForo account password.'))
credentials = {
'username': request.user.xenforo.username,
'password': result['password'],
@@ -68,7 +70,7 @@ def reset_xenforo_password(request):
return render(request, 'services/service_credentials.html',
context={'credentials': credentials, 'service': 'XenForo'})
logger.error("Unsuccessful attempt to reset XenForo password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your XenForo account.')
messages.error(request, _('An error occurred while processing your XenForo account.'))
return redirect("services:services")
@@ -86,10 +88,10 @@ def set_xenforo_password(request):
result = XenForoManager.update_user_password(request.user.xenforo.username, password)
if result['response']['status_code'] == 200:
logger.info("Successfully reset XenForo password for user %s" % request.user)
messages.success(request, 'Changed XenForo password.')
messages.success(request, _('Changed XenForo password.'))
else:
logger.error("Failed to install custom XenForo password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your XenForo account.')
messages.error(request, _('An error occurred while processing your XenForo account.'))
return redirect('services:services')
else:
logger.debug("Request is not type POST - providing empty form.")