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
614bcafb
Commit
614bcafb
authored
Jun 28, 2015
by
Sarina Canelake
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8696 from edx/sarina/update-i18n-tools
Update i18n-tools to latest version LOC-67
parents
072ae99d
e83e8817
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
.gitignore
+1
-0
lms/djangoapps/shoppingcart/tests/test_views.py
+3
-3
requirements/edx/github.txt
+1
-1
No files found.
.gitignore
View file @
614bcafb
...
...
@@ -33,6 +33,7 @@ codekit-config.json
*.mo
*.po
*.prob
*.dup
!django.po
!django.mo
!djangojs.po
...
...
lms/djangoapps/shoppingcart/tests/test_views.py
View file @
614bcafb
...
...
@@ -730,7 +730,7 @@ class ShoppingCartViewsTests(ModuleStoreTestCase):
self
.
login_user
()
resp
=
self
.
client
.
post
(
reverse
(
'shoppingcart.views.add_course_to_cart'
,
args
=
[
'non/existent/course'
]))
self
.
assertEqual
(
resp
.
status_code
,
404
)
self
.
assertIn
(
_
(
"The course you requested does not exist."
)
,
resp
.
content
)
self
.
assertIn
(
"The course you requested does not exist."
,
resp
.
content
)
def
test_add_course_to_cart_success
(
self
):
self
.
login_user
()
...
...
@@ -1924,7 +1924,7 @@ class CSVReportViewsTest(ModuleStoreTestCase):
self
.
assertEqual
(
template
,
'shoppingcart/download_report.html'
)
self
.
assertFalse
(
context
[
'total_count_error'
])
self
.
assertFalse
(
context
[
'date_fmt_error'
])
self
.
assertIn
(
_
(
"Download CSV Reports"
)
,
response
.
content
.
decode
(
'UTF-8'
))
self
.
assertIn
(
"Download CSV Reports"
,
response
.
content
.
decode
(
'UTF-8'
))
@patch
(
'shoppingcart.views.render_to_response'
,
render_mock
)
def
test_report_csv_bad_date
(
self
):
...
...
@@ -1936,7 +1936,7 @@ class CSVReportViewsTest(ModuleStoreTestCase):
self
.
assertEqual
(
template
,
'shoppingcart/download_report.html'
)
self
.
assertFalse
(
context
[
'total_count_error'
])
self
.
assertTrue
(
context
[
'date_fmt_error'
])
self
.
assertIn
(
_
(
"There was an error in your date input. It should be formatted as YYYY-MM-DD"
)
,
self
.
assertIn
(
"There was an error in your date input. It should be formatted as YYYY-MM-DD"
,
response
.
content
.
decode
(
'UTF-8'
))
CORRECT_CSV_NO_DATE_ITEMIZED_PURCHASE
=
",1,purchased,1,40,40,usd,Registration for Course: Robot Super Course,"
...
...
requirements/edx/github.txt
View file @
614bcafb
...
...
@@ -42,7 +42,7 @@ git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c
-e git+https://github.com/edx/edx-submissions.git@7c766502058e04bc9094e6cbe286e949794b80b3#egg=edx-submissions
-e git+https://github.com/edx/opaque-keys.git@df0dd602869e498e512659bb4bd243309e30e19a#egg=opaque-keys
-e git+https://github.com/edx/ease.git@b67d2928a26fe497826b6ea359b9a3d0371548a7#egg=ease==0.1.3
-e git+https://github.com/edx/i18n-tools.git@
3478455a2cc59a734432264e409b8eade1e4b167
#egg=i18n-tools
-e git+https://github.com/edx/i18n-tools.git@
v0.1.1
#egg=i18n-tools
-e git+https://github.com/edx/edx-oauth2-provider.git@0.5.1#egg=oauth2-provider
-e git+https://github.com/edx/edx-val.git@v0.0.5#egg=edx-val
-e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-xblock
...
...
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