Skip to content

Commit a274f0e

Browse files
RicardoalsoRicardoalso
committed
account_move_base_import: passing values as arguments in translations
1 parent cefbed8 commit a274f0e

File tree

3 files changed

+66
-71
lines changed

3 files changed

+66
-71
lines changed

‎account_move_base_import/models/account_journal.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,10 @@ def write_logs_after_import(self, move, num_lines):
221221
"""
222222
self.message_post(
223223
body=self.env._(
224-
"Move %(move_name)s have been imported with %(num_lines)s " "lines."
224+
"Move %(move_name)s have been imported with %(num_lines)s lines.",
225+
move_name=move.name,
226+
num_lines=num_lines,
225227
)
226-
% {"move_name": move.name, "num_lines": num_lines}
227228
)
228229
return True
229230

@@ -351,10 +352,10 @@ def _move_import(self, parser, file_stream, result_row_list=None, ftype="csv"):
351352
if col not in move_line_obj._fields:
352353
raise UserError(
353354
self.env._(
354-
"Missing column! Column %s you try to import is not "
355-
"present in the move line!"
355+
"Missing column! Column %(column)s you try to import is not "
356+
"present in the move line!",
357+
column=col,
356358
)
357-
% col
358359
)
359360
move_vals = self.prepare_move_vals(result_row_list, parser)
360361
move = move_obj.create(move_vals)
@@ -397,8 +398,9 @@ def _move_import(self, parser, file_stream, result_row_list=None, ftype="csv"):
397398
st += "".join(traceback.format_tb(trbk, 30))
398399
raise ValidationError(
399400
self.env._(
400-
"Statement import error " "The statement cannot be created: %s"
401+
"Statement import error "
402+
"The statement cannot be created: %(statement)s",
403+
statement=st,
401404
)
402-
% st
403405
) from None
404406
return move

‎account_move_base_import/models/account_move.py‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ def _find_invoice(self, line, inv_type):
8282
number_field = "name"
8383
else:
8484
raise ValidationError(
85-
self.env._("Invalid invoice type for completion: %s") % inv_type
85+
self.env._("Invalid invoice type for completion: %(invoice_type)s"),
86+
invoice_type=inv_type,
8687
)
8788

8889
invoices = inv_obj.search(
@@ -95,17 +96,20 @@ def _find_invoice(self, line, inv_type):
9596
raise ErrorTooManyPartner(
9697
self.env._(
9798
'Line named "%(line_name)s" was matched by more than one '
98-
"partner while looking on %(inv_type)s invoices"
99+
"partner while looking on %(inv_type)s invoices",
100+
line_name=line.name,
101+
inv_type=inv_type,
99102
)
100-
% {"line_name": line.name, "inv_type": inv_type}
101103
)
102104
return False
103105

104106
def _from_invoice(self, line, inv_type):
105107
"""Populate statement line values"""
106108
if inv_type not in ("supplier", "customer"):
107109
raise ValidationError(
108-
self.env._("Invalid invoice type for completion: %s") % inv_type
110+
self.env._(
111+
"Invalid invoice type for completion: %(inv_type)s", inv_type
112+
)
109113
)
110114
res = {}
111115
invoice = self._find_invoice(line, inv_type)
@@ -178,11 +182,10 @@ def get_from_name_and_partner_field(self, line):
178182
if len(partners) > 1:
179183
msg = self.env._(
180184
'Line named "%(line_name)s" was matched by more than '
181-
"one partner while looking on partner label: %(partner_labels)s"
182-
) % {
183-
"line_name": line.name,
184-
"partner_labels": ",".join([x.name for x in partners]),
185-
}
185+
"one partner while looking on partner label: %(partner_labels)s",
186+
line_name=line.name,
187+
partner_labels=",".join([x.name for x in partners]),
188+
)
186189
raise ErrorTooManyPartner(msg)
187190
res["partner_id"] = partners[0].id
188191
return res
@@ -227,10 +230,10 @@ def get_from_name_and_partner_name(self, line):
227230
if len(result) > 1:
228231
raise ErrorTooManyPartner(
229232
self.env._(
230-
'Line named "%s" was matched by more than one '
231-
"partner while looking on partner by name"
233+
'Line named "%(line)s" was matched by more than one '
234+
"partner while looking on partner by name",
235+
line=line.name,
232236
)
233-
% line.name
234237
)
235238
res["partner_id"] = result[0][0]
236239
return res
@@ -338,30 +341,23 @@ def write_completion_log(self, error_msg, number_imported):
338341
message = self.env._(
339342
"%(completion_date)s Account Move %(move_name)s has %(num_imported)s/"
340343
"%(number_line)s lines completed by "
341-
"%(user_name)s \n%(error_msg)s\n%(log)s\n"
342-
) % {
343-
"completion_date": completion_date,
344-
"move_name": self.name,
345-
"num_imported": number_imported,
346-
"number_line": number_line,
347-
"user_name": user_name,
348-
"error_msg": error_msg,
349-
"log": log,
350-
}
344+
"%(user_name)s \n%(error_msg)s\n%(log)s\n",
345+
completion_date=completion_date,
346+
move_name=self.name,
347+
num_imported=number_imported,
348+
number_line=number_line,
349+
user_name=user_name,
350+
error_msg=error_msg,
351+
log=log,
352+
)
351353
self.write({"completion_logs": message})
352354

353-
body = (
354-
(
355-
self.env._(
356-
"Statement ID %(move_name)s auto-completed for %(num_imported)s/"
357-
"%(number_line)s lines completed"
358-
)
359-
% {
360-
"move_name": self.name,
361-
"num_imported": number_imported,
362-
"number_line": number_line,
363-
}
364-
),
355+
body = self.env._(
356+
"Statement ID %(move_name)s auto-completed for %(num_imported)s/"
357+
"%(number_line)s lines completed",
358+
move_name=self.name,
359+
num_imported=number_imported,
360+
number_line=number_line,
365361
)
366362
self.message_post(body=body)
367363
return True

‎account_move_base_import/parser/file_parser.py‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ def __init__(
5555
self.ftype = ftype[0:3]
5656
else:
5757
raise UserError(
58-
self.env._("Invalid file type %s. Please use csv, xls or xlsx") % ftype
58+
self.env._(
59+
"Invalid file type %(ftype)s. Please use csv, xls or xlsx",
60+
ftype=ftype,
61+
)
5962
)
6063
self.conversion_dict = extra_fields
6164
self.keys_to_validate = list(self.conversion_dict.keys())
@@ -108,7 +111,9 @@ def _validate(self, *args, **kwargs):
108111
parsed_cols = list(self.result_row_list[0].keys())
109112
for col in self.keys_to_validate:
110113
if col not in parsed_cols:
111-
raise UserError(self.env._("Column %s not present in file") % col)
114+
raise UserError(
115+
self.env._("Column %(col)s not present in file", col=col)
116+
)
112117
return True
113118

114119
def _post(self, *args, **kwargs):
@@ -162,14 +167,12 @@ def _from_csv(self, result_set, conversion_rules):
162167
" It should be YYYY-MM-DD for column: %(rule)s"
163168
" value: %(line_value)s \n \n \n Please check"
164169
" the line with ref: %(ref_value)s \n \n Detail: "
165-
"%(error)s"
170+
"%(error)s",
171+
rule=rule,
172+
line_value=line.get(rule, self.env._("Missing")),
173+
ref_value=line.get("ref", line),
174+
error=repr(err),
166175
)
167-
% {
168-
"rule": rule,
169-
"line_value": line.get(rule, self.env._("Missing")),
170-
"ref_value": line.get("ref", line),
171-
"error": repr(err),
172-
}
173176
) from err
174177
else:
175178
try:
@@ -179,14 +182,12 @@ def _from_csv(self, result_set, conversion_rules):
179182
self.env._(
180183
"Value %(line_value)s of column %(rule)s is not valid."
181184
"\n Please check the line with ref %(value_ref)s:\n "
182-
"\n Detail: %(error)s"
185+
"\n Detail: %(error)s",
186+
line_value=line.get(rule, self.env._("Missing")),
187+
rule=rule,
188+
value_ref=line.get("ref", line),
189+
error=repr(err),
183190
)
184-
% {
185-
"line_value": line.get(rule, self.env._("Missing")),
186-
"rule": rule,
187-
"value_ref": line.get("ref", line),
188-
"error": repr(err),
189-
}
190191
) from err
191192
return result_set
192193

@@ -207,14 +208,12 @@ def _from_xls(self, result_set, conversion_rules):
207208
"Please modify the cell formatting to date "
208209
"format for column: %(rule)s value: %(line_value)s\n "
209210
"Please check the line with ref: %(value_ref)s\n "
210-
"\n Detail: %(error)s"
211+
"\n Detail: %(error)s",
212+
rule=rule,
213+
line_value=line.get(rule, self.env._("Missing")),
214+
value_ref=line.get("ref", line),
215+
error=repr(err),
211216
)
212-
% {
213-
"rule": rule,
214-
"line_value": line.get(rule, self.env._("Missing")),
215-
"value_ref": line.get("ref", line),
216-
"error": repr(err),
217-
}
218217
) from err
219218
else:
220219
try:
@@ -224,14 +223,12 @@ def _from_xls(self, result_set, conversion_rules):
224223
self.env._(
225224
"Value %(line_value)s of column %(rule)s is not valid."
226225
"\n Please check the line with ref %(value_ref)s:\n "
227-
"\n Detail: %(error)s"
226+
"\n Detail: %(error)s",
227+
line_value=line.get(rule, self.env._("Missing")),
228+
rule=rule,
229+
value_ref=line.get("ref", line),
230+
error=repr(err),
228231
)
229-
% {
230-
"line_value": line.get(rule, self.env._("Missing")),
231-
"rule": rule,
232-
"value_ref": line.get("ref", line),
233-
"error": repr(err),
234-
}
235232
) from err
236233
return result_set
237234

0 commit comments

Comments
 (0)