Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
c75bcb23
Commit
c75bcb23
authored
May 23, 2016
by
Peter Fogg
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12546 from edx/peter-fogg/date-summary-unicode-fixes
Fix date summaries with Unicode format issues.
parents
569ac193
c1a59cc0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
lms/djangoapps/courseware/date_summary.py
+4
-2
No files found.
lms/djangoapps/courseware/date_summary.py
View file @
c75bcb23
...
@@ -111,7 +111,7 @@ class DateSummary(object):
...
@@ -111,7 +111,7 @@ class DateSummary(object):
date_format
=
_
(
u"{relative} ago - {absolute}"
)
if
date_has_passed
else
_
(
u"in {relative} - {absolute}"
)
date_format
=
_
(
u"{relative} ago - {absolute}"
)
if
date_has_passed
else
_
(
u"in {relative} - {absolute}"
)
return
date_format
.
format
(
return
date_format
.
format
(
relative
=
relative_date
,
relative
=
relative_date
,
absolute
=
self
.
date
.
strftime
(
self
.
date_format
),
absolute
=
self
.
date
.
strftime
(
self
.
date_format
.
encode
(
'utf-8'
))
.
decode
(
'utf-8'
),
)
)
@property
@property
...
@@ -157,7 +157,9 @@ class TodaysDate(DateSummary):
...
@@ -157,7 +157,9 @@ class TodaysDate(DateSummary):
@property
@property
def
title
(
self
):
def
title
(
self
):
return
_
(
u'Today is {date}'
)
.
format
(
date
=
datetime
.
now
(
pytz
.
UTC
)
.
strftime
(
self
.
date_format
))
return
_
(
u'Today is {date}'
)
.
format
(
date
=
datetime
.
now
(
pytz
.
UTC
)
.
strftime
(
self
.
date_format
.
encode
(
'utf-8'
))
.
decode
(
'utf-8'
)
)
class
CourseStartDate
(
DateSummary
):
class
CourseStartDate
(
DateSummary
):
...
...
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