From 1970043b598cd8b68ab7e5d2f78456b079db4115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 15 Nov 2015 14:54:50 +0100 Subject: [PATCH] misc: use dict replacement for translated strings with several parts (#8952) --- wcs/backoffice/submission.py | 4 ++-- wcs/forms/common.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wcs/backoffice/submission.py b/wcs/backoffice/submission.py index 40466bb..2e0f9d0 100644 --- a/wcs/backoffice/submission.py +++ b/wcs/backoffice/submission.py @@ -208,8 +208,8 @@ class SubmissionDirectory(Directory): label = '' if formdata.submission_channel: label = '%s ' % formdata.get_submission_channel_label() - label += _('#%s, %s') % (formdata.id, - misc.localstrftime(formdata.receipt_time)) + label += _('#%(id)s, %(time)ss') % {'id': formdata.id, + 'time': misc.localstrftime(formdata.receipt_time)} r += htmltext('%s') % ( formdef.url_name, formdata.id, label) r += htmltext('') diff --git a/wcs/forms/common.py b/wcs/forms/common.py index 21cf594..6d7dadc 100644 --- a/wcs/forms/common.py +++ b/wcs/forms/common.py @@ -557,8 +557,8 @@ class FormStatusPage(Directory): r += htmltext(' %s') % _('not validated') r += htmltext('
') if status: - r += htmltext('

%s

') % _('%s validated by %s on %s') % ( - status['label'], status['creator'], status['created']) + r += htmltext('

%s

') % _( + '%(label)s validated by %(creator)s on %(created)s') % status r += htmltext('