fixes

cms/envs/common.py

@@ -178,9 +178,9 @@ IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'registration@edx.org'
-DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
-SERVER_EMAIL = 'devops@edx.org'
+DEFAULT_FROM_EMAIL = 'noreply.edu@olimpiada.ru'
+DEFAULT_FEEDBACK_EMAIL = 'edu@olimpiada.ru'
+SERVER_EMAIL = 'edu@olimpiada.ru'
 ADMINS = ()
 MANAGERS = ADMINS
 

common/djangoapps/student/views.py

@@ -636,6 +636,8 @@ def create_account(request, post_override=None):
         post_vars.update(dict(email=email, name=name, password=password))
         log.debug(u'In create_account with external_auth: user = %s, email=%s', name, email)
 
+    post_vars = dict(post_vars.items())
+    
     # Confirm we have a properly formed request
     for a in ['email', 'password', "lastname", "firstname", "middlename", "year_of_birth",
         "level_of_education", "education_place", "education_year",
@@ -724,7 +726,7 @@ def create_account(request, post_override=None):
             js['value'] = error_str[a]
             js['field'] = a
             return HttpResponse(json.dumps(js))
-        if len(post_vars[a] < 1):
+        if len(post_vars[a]) < 1:
             post_vars[a] = '0'
 
     try:

lms/envs/common.py

@@ -366,15 +366,15 @@ IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'registration@edx.org'
-DEFAULT_BULK_FROM_EMAIL = 'course-updates@edx.org'
+DEFAULT_FROM_EMAIL = 'noreply.edu@olimpiada.ru'
+DEFAULT_BULK_FROM_EMAIL = 'noreply.edu@olimpiada.ru'
 EMAILS_PER_TASK = 100
 EMAILS_PER_QUERY = 1000
-DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
-SERVER_EMAIL = 'devops@edx.org'
-TECH_SUPPORT_EMAIL = 'technical@edx.org'
-CONTACT_EMAIL = 'info@edx.org'
-BUGS_EMAIL = 'bugs@edx.org'
+DEFAULT_FEEDBACK_EMAIL = 'edu@olimpiada.ru'
+SERVER_EMAIL = 'edu@olimpiada.ru'
+TECH_SUPPORT_EMAIL = 'edu@olimpiada.ru'
+CONTACT_EMAIL = 'edu@olimpiada.ru'
+BUGS_EMAIL = 'edu@olimpiada.ru'
 ADMINS = ()
 MANAGERS = ADMINS
 

lms/templates/dashboard.html

@@ -350,9 +350,9 @@ padding-left: 20px;
     % else:
       <section class="empty-dashboard-message">
         <p>${_("Looks like you haven't registered for any courses yet.")}</p>
-        <a href="${marketing_link('COURSES')}">
+<!--        <a href="${marketing_link('COURSES')}">
             ${_("Find courses now!")}
-        </a>
+        </a>-->
       </section>
     % endif
 

lms/templates/footer.html

@@ -8,7 +8,7 @@
     <div class="colophon">
       <nav class="nav-colophon">
       <ol>
-          <li class="nav-colophon-01">
+<!--          <li class="nav-colophon-01">
           <a id="about" href="${marketing_link('ABOUT')}">
               ${_("About")}
           </a>
@@ -27,7 +27,7 @@
           <a id="faq" href="${marketing_link('FAQ')}">
               ${_("FAQ")}
           </a>
-          </li>
+          </li>-->
           <li class="nav-colophon-05">
           <a id="contact" href="${marketing_link('CONTACT')}">
               ${_("Contact")}

lms/templates/navigation.html

@@ -58,7 +58,7 @@ site_status_msg = get_site_status_msg(course_id)
     <ol class="left nav-global authenticated">
       <%block name="navigation_global_links_authenticated">
         <li class="nav-global-01">
-          <a href="${marketing_link('COURSES')}">${_('Find Courses')}</a>
+          <!-- <a href="${marketing_link('COURSES')}">${_('Find Courses')}</a> -->
         </li>
       </%block>
     </ol>

lms/templates/registration/password_reset_email.html

@@ -6,10 +6,10 @@
 https://{{domain}}{% url 'student.views.password_reset_confirm_wrapper' uidb36=uid token=token %}
 {% endblock %}
 
-If you didn't request this change, you can disregard this email - we have not yet reset your password.
+{% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." %}
 
 {% trans "Thanks for using our site!" %}
 
-{% blocktrans %}The edX Team{% endblocktrans %}
+{% blocktrans %}The edX Team{% endblocktrans %}С
 
 {% endautoescape %}

lms/templates/university_profile/edge.html

@@ -27,7 +27,7 @@
     </div>
     <div class="sign-up">
       <h3>${_("Register for classes")}</h3>
-      <p>${_("Take free online courses from today's leading universities.")}</p>
+<!--      <p>${_("Take free online courses from today's leading universities.")}</p> -->
       <p><a href="#signup-modal" id="signup" rel="leanModal" class="register-button">${_("Register")}</a></p>
     </div>
   </div>