Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
8fb8e14a
Commit
8fb8e14a
authored
Apr 13, 2018
by
Mael Kervella
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Use string and not variables in %-notation fornat
parent
0f35bfe7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
cotisations/forms.py
cotisations/forms.py
+2
-2
cotisations/payment.py
cotisations/payment.py
+1
-1
cotisations/views.py
cotisations/views.py
+8
-8
No files found.
cotisations/forms.py
View file @
8fb8e14a
...
...
@@ -355,7 +355,7 @@ class RechargeForm(FormRevMixin, Form):
raise
forms
.
ValidationError
(
_
(
"Requested amount is too small. Minimum amount possible :
\
%(min_online_amount)s €."
)
%
{
min_online_amount
:
OptionalUser
.
get_cached_value
(
'min_online_amount'
:
OptionalUser
.
get_cached_value
(
'min_online_payment'
)
}
...
...
@@ -364,7 +364,7 @@ class RechargeForm(FormRevMixin, Form):
raise
forms
.
ValidationError
(
_
(
"Requested amount is too high. Your balance can't exceed
\
%(max_online_balance)s €."
)
%
{
max_online_balance
:
OptionalUser
.
get_cached_value
(
'max_online_balance'
:
OptionalUser
.
get_cached_value
(
'max_solde'
)
}
...
...
cotisations/payment.py
View file @
8fb8e14a
...
...
@@ -27,7 +27,7 @@ def accept_payment(request, factureid):
messages
.
success
(
request
,
_
(
"The payment of %(amount)s € has been accepted."
)
%
{
amount
:
facture
.
prix
()
'amount'
:
facture
.
prix
()
}
)
return
redirect
(
reverse
(
'users:profil'
,
kwargs
=
{
'userid'
:
request
.
user
.
id
}))
...
...
cotisations/views.py
View file @
8fb8e14a
...
...
@@ -161,8 +161,8 @@ def new_facture(request, user, userid):
request
,
_
(
"The cotisation of %(member_name)s has been
\
extended to %(end_date)s."
)
%
{
member_name
:
user
.
pseudo
,
end_date
:
user
.
end_adhesion
()
'member_name'
:
user
.
pseudo
,
'end_date'
:
user
.
end_adhesion
()
}
)
# Else, only tell the invoice was created
...
...
@@ -508,7 +508,7 @@ def del_paiement(request, instances):
request
,
_
(
"The payment method %(method_name)s has been
\
successfully deleted."
)
%
{
method_name
:
payment_del
'method_name'
:
payment_del
}
)
except
ProtectedError
:
...
...
@@ -516,7 +516,7 @@ def del_paiement(request, instances):
request
,
_
(
"The payment method %(method_name)s can't be deleted
\
because there are invoices using it."
)
%
{
method_name
:
payment_del
'method_name'
:
payment_del
}
)
return
redirect
(
reverse
(
'cotisations:index-paiement'
))
...
...
@@ -586,7 +586,7 @@ def del_banque(request, instances):
request
,
_
(
"The bank %(bank_name)s has been successfully
\
deleted."
)
%
{
bank_name
:
bank_del
'bank_name'
:
bank_del
}
)
except
ProtectedError
:
...
...
@@ -594,7 +594,7 @@ def del_banque(request, instances):
request
,
_
(
"The bank %(bank_name)s can't be deleted
\
because there are invoices using it."
)
%
{
bank_name
:
bank_del
'bank_name'
:
bank_del
}
)
return
redirect
(
reverse
(
'cotisations:index-banque'
))
...
...
@@ -779,8 +779,8 @@ def new_facture_solde(request, userid):
request
,
_
(
"The cotisation of %(member_name)s has been successfully
\
extended to %(end_date)s."
)
%
{
member_name
:
user
.
pseudo
,
end_date
:
user
.
end_adhesion
()
'member_name'
:
user
.
pseudo
,
'end_date'
:
user
.
end_adhesion
()
}
)
# Else, only tell the invoice was created
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment