Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
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
course-discovery
Commits
4c494a4f
Commit
4c494a4f
authored
Aug 16, 2016
by
Clinton Blackburn
Committed by
GitHub
Aug 16, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #251 from edx/clintonb/minor-improvements
Miscellaneous updates
parents
c303d2cc
1792fc2b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
55 additions
and
21 deletions
+55
-21
bower.json
+1
-1
course_discovery/apps/ietf_language_tags/migrations/0004_add_chinese_tags.py
+34
-0
requirements/base.txt
+8
-8
requirements/production.txt
+3
-3
requirements/test.txt
+9
-9
No files found.
bower.json
View file @
4c494a4f
...
...
@@ -12,7 +12,7 @@
"dependencies"
:
{
"edx-pattern-library"
:
"0.16.3"
,
"underscore"
:
"~1.8.3"
,
"moment"
:
"~2.1
0.3
"
,
"moment"
:
"~2.1
3.0
"
,
"pikaday"
:
"https://github.com/owenmead/Pikaday.git#1.4.0"
,
"clipboard"
:
"1.5.12"
}
...
...
course_discovery/apps/ietf_language_tags/migrations/0004_add_chinese_tags.py
0 → 100644
View file @
4c494a4f
# -*- coding: utf-8 -*-
from
__future__
import
unicode_literals
from
django.db
import
migrations
LANGTAGS
=
(
(
"Chinese - Mandarin"
,
"zh-cmn"
),
(
"Chinese - Simplified"
,
"zh-Hans"
),
(
"Chinese - Traditional"
,
"zh-Hant"
),
)
def
add_language_tags
(
apps
,
schema_editor
):
LanguageTag
=
apps
.
get_model
(
'ietf_language_tags'
,
'LanguageTag'
)
for
name
,
code
in
LANGTAGS
:
LanguageTag
.
objects
.
update_or_create
(
code
=
code
,
defaults
=
{
'name'
:
name
})
def
drop_language_tags
(
apps
,
schema_editor
):
LanguageTag
=
apps
.
get_model
(
'ietf_language_tags'
,
'LanguageTag'
)
codes
=
[
code
for
__
,
code
in
LANGTAGS
]
LanguageTag
.
objects
.
filter
(
code__in
=
codes
)
.
delete
()
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'ietf_language_tags'
,
'0003_fix_language_tag_names'
),
]
operations
=
[
migrations
.
RunPython
(
add_language_tags
,
drop_language_tags
)
]
requirements/base.txt
View file @
4c494a4f
...
...
@@ -3,11 +3,12 @@ cryptography==1.4
django==1.8.14
django-choices==1.4.3
django-compressor==2.0
django-extensions==1.6.7
django-filter==0.13.0
django-fsm==2.2.0
django-guardian==1.4.4
django-haystack==2.4.1
django-contrib-comments==1.7.2
django-extensions==1.7.2
django-filter==0.14.0
django-fsm==2.4.0
django-guardian==1.4.5
django-haystack==2.5.0
django-libsass==0.7
django-simple-history==1.8.1
django-sortedm2m==1.3.2
...
...
@@ -26,12 +27,11 @@ edx-auth-backends==0.5.2
edx-ccx-keys==0.2.0
edx-django-release-util==0.1.0
edx-drf-extensions==1.1.1
edx-opaque-keys==0.3.
1
edx-opaque-keys==0.3.
2
edx-rest-api-client==1.6.0
elasticsearch>=1.0.0,<2.0.0
html2text==2016.5.29
pillow==3.3.0
pycountry==1.20
python-dateutil==2.5.3
pytz==2016.4
django-contrib-comments==1.7.2
pytz==2016.6.1
requirements/production.txt
View file @
4c494a4f
# Packages required in a production environment
-r base.txt
certifi==2016.
2.2
8
gevent==1.1.
1
certifi==2016.
8.
8
gevent==1.1.
2
gunicorn==19.6.0
mysqlclient==1.3.7
newrelic==2.6
6.0.49
newrelic==2.6
8.0.50
nodeenv==0.13.6
python-memcached==1.58
PyYAML==3.11
requirements/test.txt
View file @
4c494a4f
# Packages required for testing
-r base.txt
coverage==4.
0.
2
ddt==1.
0.1
django-nose==1.4.
2
edx-lint==0.5.
0
coverage==4.2
ddt==1.
1.0
django-nose==1.4.
4
edx-lint==0.5.
1
factory-boy==2.7.0
freezegun==0.3.7
lxml==3.
4.2
mock==
1.3
.0
lxml==3.
6.1
mock==
2.0
.0
nose-ignore-docstring==0.2
pep8==1.
6.2
responses==0.5.
0
pep8==1.
7.0
responses==0.5.
1
selenium==2.53.2
testfixtures==4.7.0
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