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
ad11c1b6
Commit
ad11c1b6
authored
Oct 14, 2014
by
Will Daly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update django-countries to 2.1.2, override country name for Taiwan
parent
61dbd70c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
8 deletions
+13
-8
common/djangoapps/student/models.py
+1
-1
lms/envs/common.py
+7
-2
lms/templates/register-shib.html
+1
-1
lms/templates/register.html
+2
-2
lms/templates/signup_modal.html
+1
-1
requirements/edx/base.txt
+1
-1
No files found.
common/djangoapps/student/models.py
View file @
ad11c1b6
...
@@ -31,7 +31,7 @@ from django.db.models import Count
...
@@ -31,7 +31,7 @@ from django.db.models import Count
from
django.dispatch
import
receiver
,
Signal
from
django.dispatch
import
receiver
,
Signal
from
django.core.exceptions
import
ObjectDoesNotExist
from
django.core.exceptions
import
ObjectDoesNotExist
from
django.utils.translation
import
ugettext_noop
from
django.utils.translation
import
ugettext_noop
from
django_countries
import
CountryField
from
django_countries
.fields
import
CountryField
from
config_models.models
import
ConfigurationModel
from
config_models.models
import
ConfigurationModel
from
track
import
contexts
from
track
import
contexts
from
eventtracking
import
tracker
from
eventtracking
import
tracker
...
...
lms/envs/common.py
View file @
ad11c1b6
...
@@ -27,14 +27,13 @@ Longer TODO:
...
@@ -27,14 +27,13 @@ Longer TODO:
import
sys
import
sys
import
os
import
os
import
imp
import
imp
import
json
from
path
import
path
from
path
import
path
from
warnings
import
simplefilter
from
warnings
import
simplefilter
from
django.utils.translation
import
ugettext_lazy
as
_
from
.discussionsettings
import
*
from
.discussionsettings
import
*
from
xmodule.modulestore.modulestore_settings
import
update_module_store_settings
from
xmodule.modulestore.modulestore_settings
import
update_module_store_settings
from
lms.lib.xblock.mixin
import
LmsBlockMixin
from
lms.lib.xblock.mixin
import
LmsBlockMixin
################################### FEATURES ###################################
################################### FEATURES ###################################
...
@@ -1838,3 +1837,9 @@ AUTO_REGISTRATION_AB_TEST_EXCLUDE_COURSES = set([
...
@@ -1838,3 +1837,9 @@ AUTO_REGISTRATION_AB_TEST_EXCLUDE_COURSES = set([
# REGISTRATION CODES DISPLAY INFORMATION SUBTITUTIONS IN THE INVOICE ATTACHMENT
# REGISTRATION CODES DISPLAY INFORMATION SUBTITUTIONS IN THE INVOICE ATTACHMENT
INVOICE_CORP_ADDRESS
=
"Please place your corporate address
\n
in this configuration"
INVOICE_CORP_ADDRESS
=
"Please place your corporate address
\n
in this configuration"
INVOICE_PAYMENT_INSTRUCTIONS
=
"This is where you can
\n
put directions on how people
\n
buying registration codes"
INVOICE_PAYMENT_INSTRUCTIONS
=
"This is where you can
\n
put directions on how people
\n
buying registration codes"
# Country code overrides
# Used by django-countries
COUNTRIES_OVERRIDE
=
{
"TW"
:
_
(
"Taiwan"
),
}
lms/templates/register-shib.html
View file @
ad11c1b6
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<
%!
from
django
.
utils
import
html
%
>
<
%!
from
django
.
utils
import
html
%
>
<
%!
from
django_countries
.
countries
import
COUNTRIES
%
>
<
%!
from
django_countries
import
countries
%
>
<
%!
from
student
.
models
import
UserProfile
%
>
<
%!
from
student
.
models
import
UserProfile
%
>
<
%!
from
datetime
import
date
%
>
<
%!
from
datetime
import
date
%
>
<
%!
import
calendar
%
>
<
%!
import
calendar
%
>
...
...
lms/templates/register.html
View file @
ad11c1b6
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<
%!
from
django
.
utils
import
html
%
>
<
%!
from
django
.
utils
import
html
%
>
<
%!
from
django_countries
.
countries
import
COUNTRIES
%
>
<
%!
from
django_countries
import
countries
%
>
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<
%!
from
django
.
utils
.
translation
import
ugettext
as
_
%
>
<
%!
from
student
.
models
import
UserProfile
%
>
<
%!
from
student
.
models
import
UserProfile
%
>
<
%!
from
datetime
import
date
%
>
<
%!
from
datetime
import
date
%
>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
<label
for=
"country"
>
${_("Country")}
</label>
<label
for=
"country"
>
${_("Country")}
</label>
<select
id=
"country"
name=
"country"
${'
required
aria-required=
"true"
'
if
settings
.
REGISTRATION_EXTRA_FIELDS
['
country
']
==
'
required
'
else
''}
>
<select
id=
"country"
name=
"country"
${'
required
aria-required=
"true"
'
if
settings
.
REGISTRATION_EXTRA_FIELDS
['
country
']
==
'
required
'
else
''}
>
<option
value=
""
>
--
</option>
<option
value=
""
>
--
</option>
%for code, country_name in
COUNTRIES
:
%for code, country_name in
sorted(countries.countries, key=lambda (__, name): unicode(name))
:
<option
value=
"${code}"
>
${ unicode(country_name) }
</option>
<option
value=
"${code}"
>
${ unicode(country_name) }
</option>
%endfor
%endfor
</select>
</select>
...
...
lms/templates/signup_modal.html
View file @
ad11c1b6
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<
%
namespace
name=
'static'
file=
'static_content.html'
/>
<
%
namespace
name=
'static'
file=
'static_content.html'
/>
<
%!
from
django
.
conf
import
settings
%
>
<
%!
from
django
.
conf
import
settings
%
>
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<
%!
from
django_countries
.
countries
import
COUNTRIES
%
>
<
%!
from
django_countries
import
countries
%
>
<
%!
from
student
.
models
import
UserProfile
%
>
<
%!
from
student
.
models
import
UserProfile
%
>
<
%!
from
datetime
import
date
%
>
<
%!
from
datetime
import
date
%
>
<
%!
import
calendar
%
>
<
%!
import
calendar
%
>
...
...
requirements/edx/base.txt
View file @
ad11c1b6
...
@@ -16,7 +16,7 @@ defusedxml==0.4.1
...
@@ -16,7 +16,7 @@ defusedxml==0.4.1
distribute>=0.6.28, <0.7
distribute>=0.6.28, <0.7
django-babel-underscore==0.1.0
django-babel-underscore==0.1.0
django-celery==3.0.17
django-celery==3.0.17
django-countries==
1.5
django-countries==
2.1.2
django-extensions==1.2.5
django-extensions==1.2.5
django-filter==0.6.0
django-filter==0.6.0
django-followit==0.0.3
django-followit==0.0.3
...
...
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