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
9e6a63b6
Commit
9e6a63b6
authored
Jul 31, 2016
by
Ned Batchelder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix translation-of-non-string errors
parent
0c8fcf6a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
+2
-1
common/djangoapps/external_auth/views.py
+1
-1
openedx/core/djangoapps/user_api/preferences/api.py
+1
-0
No files found.
common/djangoapps/external_auth/views.py
View file @
9e6a63b6
...
@@ -496,7 +496,7 @@ def shib_login(request):
...
@@ -496,7 +496,7 @@ def shib_login(request):
http://www.incommonfederation.org/attributesummary.html#eduPersonPrincipal
http://www.incommonfederation.org/attributesummary.html#eduPersonPrincipal
but the configuration is in the shibboleth software.
but the configuration is in the shibboleth software.
"""
"""
shib_error_msg
=
_
(
dedent
(
shib_error_msg
=
dedent
(
_
(
"""
"""
Your university identity server did not return your ID information to us.
Your university identity server did not return your ID information to us.
Please try logging in again. (You may need to restart your browser.)
Please try logging in again. (You may need to restart your browser.)
...
...
openedx/core/djangoapps/user_api/preferences/api.py
View file @
9e6a63b6
...
@@ -369,6 +369,7 @@ def validate_user_preference_serializer(serializer, preference_key, preference_v
...
@@ -369,6 +369,7 @@ def validate_user_preference_serializer(serializer, preference_key, preference_v
PreferenceValidationError: the supplied key and/or value for a user preference are invalid.
PreferenceValidationError: the supplied key and/or value for a user preference are invalid.
"""
"""
if
preference_value
is
None
or
unicode
(
preference_value
)
.
strip
()
==
''
:
if
preference_value
is
None
or
unicode
(
preference_value
)
.
strip
()
==
''
:
# pylint: disable=translation-of-non-string
format_string
=
ugettext_noop
(
u"Preference '{preference_key}' cannot be set to an empty value."
)
format_string
=
ugettext_noop
(
u"Preference '{preference_key}' cannot be set to an empty value."
)
raise
PreferenceValidationError
({
raise
PreferenceValidationError
({
preference_key
:
{
preference_key
:
{
...
...
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