From e955dba7afd7cc1c9515bef6baabecc34155631f Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Tue, 3 May 2016 23:42:17 +0200 Subject: [PATCH] i18n: using format strings with named arguments (#10821) --- wcs/file_validation.py | 6 ++++-- wcs/workflows.py | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wcs/file_validation.py b/wcs/file_validation.py index 6a047b0..99ae976 100644 --- a/wcs/file_validation.py +++ b/wcs/file_validation.py @@ -193,8 +193,10 @@ def push_document(user, filename, stream): % (filename, user.display_name)) get_response().add_after_job( - N_('Sending file %s in portfolio of %s') % (filename, user.display_name), - afterjob) + N_('Sending file %(filename)s in portfolio of %(user_name)s') % { + 'filename': filename, + 'user_name': user.display_name + }, afterjob) class FargoDirectory(Directory): diff --git a/wcs/workflows.py b/wcs/workflows.py index 28dbb56..77e62e7 100644 --- a/wcs/workflows.py +++ b/wcs/workflows.py @@ -2006,7 +2006,9 @@ def validate_ezt(template): ezt.UnknownFormatConstantError: _('unknown format constant'), }.get(e.__class__)) if e.line: - parts.append(_('at line %d and column %d') % (e.line+1, e.column+1)) + parts.append(_('at line %(line)d and column %(column)d') % { + 'line': e.line+1, + 'column': e.column+1}) raise ValueError(_('error in template (%s)') % ' '.join(parts)) class SendSMSWorkflowStatusItem(WorkflowStatusItem): -- 2.8.1