Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
f5d10027
Commit
f5d10027
authored
Nov 26, 2013
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly reutrn empty text in case of no advertisement
parent
c2df7585
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
trans/templatetags/translations.py
trans/templatetags/translations.py
+2
-2
No files found.
trans/templatetags/translations.py
View file @
f5d10027
...
@@ -450,7 +450,7 @@ def get_advertisement_text_mail():
...
@@ -450,7 +450,7 @@ def get_advertisement_text_mail():
Advertisement
.
PLACEMENT_MAIL_TEXT
Advertisement
.
PLACEMENT_MAIL_TEXT
)
)
if
advertisement
is
None
:
if
advertisement
is
None
:
return
None
return
''
return
advertisement
.
text
return
advertisement
.
text
...
@@ -463,5 +463,5 @@ def get_advertisement_html_mail():
...
@@ -463,5 +463,5 @@ def get_advertisement_html_mail():
Advertisement
.
PLACEMENT_MAIL_HTML
Advertisement
.
PLACEMENT_MAIL_HTML
)
)
if
advertisement
is
None
:
if
advertisement
is
None
:
return
None
return
''
return
mark_safe
(
advertisement
.
text
)
return
mark_safe
(
advertisement
.
text
)
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