From c38106cb11b644adeb5ecbf067e47aca97948acb Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 18 Feb 2019 10:26:13 +0100 Subject: [PATCH] Fix issues with msgid format string --- ivatar/ivataraccount/models.py | 5 +++-- ivatar/ivataraccount/views.py | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ivatar/ivataraccount/models.py b/ivatar/ivataraccount/models.py index 804d6c2..bef29df 100644 --- a/ivatar/ivataraccount/models.py +++ b/ivatar/ivataraccount/models.py @@ -221,8 +221,9 @@ class Photo(BaseAccountModel): if dimensions['a'] > MAX_PIXELS or dimensions['b'] > MAX_PIXELS: messages.error( request, - _('Image dimensions are too big(max: %s x %s' % - (MAX_PIXELS, MAX_PIXELS))) + _('Image dimensions are too big (max: %(max_pixels)s x %(max_pixels)s' % { + max_pixels: MAX_PIXELS, + })) return HttpResponseRedirect(reverse_lazy('profile')) if dimensions['w'] == 0 and dimensions['h'] == 0: diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py index 6802980..e0b3034 100644 --- a/ivatar/ivataraccount/views.py +++ b/ivatar/ivataraccount/views.py @@ -576,8 +576,11 @@ class RedirectOpenIDView(View): messages.error(request, _('OpenID discovery failed: %s' % exc)) return HttpResponseRedirect(reverse_lazy('profile')) except UnicodeDecodeError as exc: # pragma: no cover - msg = _('OpenID discovery failed (userid=%s) for %s: %s' % - (request.user.id, user_url.encode('utf-8'), exc)) + msg = _('OpenID discovery failed (userid=%(userid)s) for %(userurl)s: %(message)s' % { + userid: request.user.id, + userurl: user_url.encode('utf-8'), + message: exc, + }) print("message: %s" % msg) messages.error(request, msg)