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
ea55c51c
Commit
ea55c51c
authored
Sep 09, 2017
by
Maël Kervella
Committed by
Pierre Cadart
Sep 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Précision que le texte est pour le mail de bienvenue
parent
6383016f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
preferences/forms.py
preferences/forms.py
+2
-2
preferences/templates/preferences/display_preferences.html
preferences/templates/preferences/display_preferences.html
+2
-2
No files found.
preferences/forms.py
View file @
ea55c51c
...
...
@@ -93,8 +93,8 @@ class EditMailMessageOptionForm(ModelForm):
def
__init__
(
self
,
*
args
,
**
kwargs
):
super
(
EditMailMessageOptionForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
self
.
fields
[
'welcome_mail_fr'
].
label
=
'Message dans le mail d
\'
accueil
en français'
self
.
fields
[
'welcome_mail_en'
].
label
=
'Message dans le mail d
\'
accueil
en anglais'
self
.
fields
[
'welcome_mail_fr'
].
label
=
'Message dans le mail d
e bienvenue
en français'
self
.
fields
[
'welcome_mail_en'
].
label
=
'Message dans le mail d
e bienvenue
en anglais'
class
ServiceForm
(
ModelForm
):
class
Meta
:
...
...
preferences/templates/preferences/display_preferences.html
View file @
ea55c51c
...
...
@@ -171,11 +171,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</p>
<table
class=
"table table-striped"
>
<tr>
<th>
M
essage Français
</th>
<th>
M
ail de bienvenue (Français)
</th>
<td>
{{ mailmessageoptions.welcome_mail_fr | safe }}
</td>
</tr>
<tr>
<th>
M
essage Anglais
</th>
<th>
M
ail de bienvenue (Anglais)
</th>
<td>
{{ mailmessageoptions.welcome_mail_en | safe }}
</td>
</tr>
</table>
...
...
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