Commit c78594b2 by Renzo Lucioni

Restore copy originally present on the registration page

parent 66187ab9
...@@ -280,7 +280,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -280,7 +280,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
def assert_register_response_before_pipeline_looks_correct(self, response): def assert_register_response_before_pipeline_looks_correct(self, response):
"""Asserts a GET of /register not in the pipeline looks correct.""" """Asserts a GET of /register not in the pipeline looks correct."""
self.assertEqual(200, response.status_code) self.assertEqual(200, response.status_code)
self.assertIn('Register with ' + self.PROVIDER_CLASS.NAME, response.content) self.assertIn('Sign up with ' + self.PROVIDER_CLASS.NAME, response.content)
self.assert_signin_button_looks_functional(response.content, pipeline.AUTH_ENTRY_REGISTER) self.assert_signin_button_looks_functional(response.content, pipeline.AUTH_ENTRY_REGISTER)
def assert_signin_button_looks_functional(self, content, auth_entry): def assert_signin_button_looks_functional(self, content, auth_entry):
......
...@@ -37,8 +37,8 @@ msgid "" ...@@ -37,8 +37,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1a\n" "Project-Id-Version: 0.1a\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-09-17 18:34+0000\n" "POT-Creation-Date: 2014-09-17 20:49+0000\n"
"PO-Revision-Date: 2014-09-17 18:34:42.614943\n" "PO-Revision-Date: 2014-09-17 20:49:46.218598\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -8656,7 +8656,7 @@ msgstr "Pröçéssïng ýöür äççöünt ïnförmätïön … Ⱡ'σяєм ι ...@@ -8656,7 +8656,7 @@ msgstr "Pröçéssïng ýöür äççöünt ïnförmätïön … Ⱡ'σяєм ι
msgid "Welcome {username}! Please set your preferences below" msgid "Welcome {username}! Please set your preferences below"
msgstr "Wélçömé {username}! Pléäsé sét ýöür préférénçés ßélöw Ⱡ'σяєм ιρѕυм #" msgstr "Wélçömé {username}! Pléäsé sét ýöür préférénçés ßélöw Ⱡ'σяєм ιρѕυм #"
#: lms/templates/register-shib.html #: lms/templates/register-shib.html lms/templates/register.html
msgid "" msgid ""
"We're sorry, {platform_name} enrollment is not available in your region" "We're sorry, {platform_name} enrollment is not available in your region"
msgstr "" msgstr ""
...@@ -8669,7 +8669,8 @@ msgstr "" ...@@ -8669,7 +8669,8 @@ msgstr ""
"Thé föllöwïng érrörs öççürréd whïlé pröçéssïng ýöür régïsträtïön: Ⱡ'σяєм " "Thé föllöwïng érrörs öççürréd whïlé pröçéssïng ýöür régïsträtïön: Ⱡ'σяєм "
"ιρѕυм ∂σłσя #" "ιρѕυм ∂σłσя #"
#: lms/templates/register-shib.html #: lms/templates/register-shib.html lms/templates/register.html
#: lms/templates/register.html
msgid "" msgid ""
"Required fields are noted by <strong class=\"indicator\">bold text and an " "Required fields are noted by <strong class=\"indicator\">bold text and an "
"asterisk (*)</strong>." "asterisk (*)</strong>."
...@@ -8687,6 +8688,7 @@ msgid "example: JaneDoe" ...@@ -8687,6 +8688,7 @@ msgid "example: JaneDoe"
msgstr "éxämplé: JänéDöé Ⱡ'σ#" msgstr "éxämplé: JänéDöé Ⱡ'σ#"
#: lms/templates/register-shib.html lms/templates/register.html #: lms/templates/register-shib.html lms/templates/register.html
#: lms/templates/register.html
msgid "Will be shown in any discussions or forums you participate in" msgid "Will be shown in any discussions or forums you participate in"
msgstr "" msgstr ""
"Wïll ßé shöwn ïn äný dïsçüssïöns ör förüms ýöü pärtïçïpäté ïn Ⱡ'σяєм ιρѕυм " "Wïll ßé shöwn ïn äný dïsçüssïöns ör förüms ýöü pärtïçïpäté ïn Ⱡ'σяєм ιρѕυм "
...@@ -8719,19 +8721,19 @@ msgid "Already registered?" ...@@ -8719,19 +8721,19 @@ msgid "Already registered?"
msgstr "Àlréädý régïstéréd? Ⱡ'σя#" msgstr "Àlréädý régïstéréd? Ⱡ'σя#"
#: lms/templates/register-sidebar.html #: lms/templates/register-sidebar.html
msgid "Welcome to {platform_name}!" msgid "Welcome to {platform_name}"
msgstr "Wélçömé tö {platform_name}! Ⱡ'#" msgstr "Wélçömé tö {platform_name} Ⱡ'#"
#: lms/templates/register-sidebar.html #: lms/templates/register-sidebar.html
msgid "" msgid ""
"Registering with {platform_name} gives you access to all of our current and " "Registering with {platform_name} gives you access to all of our current and "
"future free courses. Not ready to take a course just yet? Registering also " "future free courses. Not ready to take a course just yet? Registering puts "
"adds you to our mailing list - we will update you as courses are added." "you on our mailing list - we will update you as courses are added."
msgstr "" msgstr ""
"Régïstérïng wïth {platform_name} gïvés ýöü äççéss tö äll öf öür çürrént änd " "Régïstérïng wïth {platform_name} gïvés ýöü äççéss tö äll öf öür çürrént änd "
"fütüré fréé çöürsés. Nöt réädý tö täké ä çöürsé jüst ýét? Régïstérïng älsö " "fütüré fréé çöürsés. Nöt réädý tö täké ä çöürsé jüst ýét? Régïstérïng püts "
"ädds ýöü tö öür mäïlïng lïst - wé wïll üpdäté ýöü äs çöürsés äré äddéd. " "ýöü ön öür mäïlïng lïst - wé wïll üpdäté ýöü äs çöürsés äré äddéd. Ⱡ'σяєм "
"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ є#" "ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ#"
#: lms/templates/register-sidebar.html #: lms/templates/register-sidebar.html
msgid "Next Steps" msgid "Next Steps"
...@@ -8752,22 +8754,20 @@ msgstr "" ...@@ -8752,22 +8754,20 @@ msgstr ""
#: lms/templates/register-sidebar.html #: lms/templates/register-sidebar.html
msgid "" msgid ""
"As part of registering with {platform_name}, you will receive an activation " "As part of joining {platform_name}, you will receive an activation email. "
"email. You must click on the activation link to complete the registration " "You must click on the activation link to complete the process. Don't see "
"process. Don't see the email? Check your spam folder and mark " "the email? Check your spam folder and mark {platform_name} emails as 'not "
"{platform_name} emails as 'not spam'. At {platform_name}, we communicate " "spam'. At {platform_name}, we communicate mostly through email."
"mostly through email."
msgstr "" msgstr ""
"Às pärt öf régïstérïng wïth {platform_name}, ýöü wïll réçéïvé än äçtïvätïön " "Às pärt öf jöïnïng {platform_name}, ýöü wïll réçéïvé än äçtïvätïön émäïl. "
"émäïl. Ýöü müst çlïçk ön thé äçtïvätïön lïnk tö çömplété thé régïsträtïön " "Ýöü müst çlïçk ön thé äçtïvätïön lïnk tö çömplété thé pröçéss. Dön't séé "
"pröçéss. Dön't séé thé émäïl? Çhéçk ýöür späm földér änd märk " "thé émäïl? Çhéçk ýöür späm földér änd märk {platform_name} émäïls äs 'nöt "
"{platform_name} émäïls äs 'nöt späm'. Àt {platform_name}, wé çömmünïçäté " "späm'. Àt {platform_name}, wé çömmünïçäté möstlý thröügh émäïl. Ⱡ'σяєм "
"möstlý thröügh émäïl. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg " "ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя #"
"єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂#"
#: lms/templates/register-sidebar.html #: lms/templates/register-sidebar.html
msgid "Need help registering with {platform_name}?" msgid "Need help in registering with {platform_name}?"
msgstr "Nééd hélp régïstérïng wïth {platform_name}? Ⱡ'σяєм ι#" msgstr "Nééd hélp ïn régïstérïng wïth {platform_name}? Ⱡ'σяєм ιρ#"
#: lms/templates/register-sidebar.html #: lms/templates/register-sidebar.html
msgid "View our FAQs for answers to commonly asked questions." msgid "View our FAQs for answers to commonly asked questions."
...@@ -8776,11 +8776,11 @@ msgstr "" ...@@ -8776,11 +8776,11 @@ msgstr ""
#: lms/templates/register-sidebar.html #: lms/templates/register-sidebar.html
msgid "" msgid ""
"After you register, you can find answers to most of your questions in " "Once registered, most questions can be answered in the course specific "
"course-specific FAQs and discussions." "discussion forums or through the FAQs."
msgstr "" msgstr ""
"Àftér ýöü régïstér, ýöü çän fïnd änswérs tö möst öf ýöür qüéstïöns ïn " "Önçé régïstéréd, möst qüéstïöns çän ßé änswéréd ïn thé çöürsé spéçïfïç "
"çöürsé-spéçïfïç FÀQs änd dïsçüssïöns. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#" "dïsçüssïön förüms ör thröügh thé FÀQs. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
#: lms/templates/register.html #: lms/templates/register.html
msgid "Register for {platform_name}" msgid "Register for {platform_name}"
...@@ -8798,31 +8798,16 @@ msgstr "Wélçömé! #" ...@@ -8798,31 +8798,16 @@ msgstr "Wélçömé! #"
msgid "Register below to create your {platform_name} account" msgid "Register below to create your {platform_name} account"
msgstr "Régïstér ßélöw tö çréäté ýöür {platform_name} äççöünt Ⱡ'σяєм ιρѕυ#" msgstr "Régïstér ßélöw tö çréäté ýöür {platform_name} äççöünt Ⱡ'σяєм ιρѕυ#"
#: lms/templates/register.html
msgid ""
"We're sorry. Unfortunately, {platform_name} is not available in your region."
msgstr ""
"Wé'ré sörrý. Ûnförtünätélý, {platform_name} ïs nöt äväïläßlé ïn ýöür régïön."
" Ⱡ'σяєм ιρѕυм ∂σłσя #"
#. Translators: provider_name is the name of an external, third-party user #. Translators: provider_name is the name of an external, third-party user
#. authentication service (like Google or LinkedIn). #. authentication service (like Google or LinkedIn).
#: lms/templates/register.html #: lms/templates/register.html
msgid "Register with {provider_name}" msgid "Sign up with {provider_name}"
msgstr "Régïstér wïth {provider_name} Ⱡ'σ#" msgstr "Sïgn üp wïth {provider_name} Ⱡ'σ#"
#: lms/templates/register.html #: lms/templates/register.html
msgid "Create your own {platform_name} account below" msgid "Create your own {platform_name} account below"
msgstr "Çréäté ýöür öwn {platform_name} äççöünt ßélöw Ⱡ'σяєм ι#" msgstr "Çréäté ýöür öwn {platform_name} äççöünt ßélöw Ⱡ'σяєм ι#"
#: lms/templates/register.html lms/templates/register.html
msgid ""
"Required fields are indicated by <strong class=\"indicator\">bold text and "
"an asterisk (*)</strong>."
msgstr ""
"Réqüïréd fïélds äré ïndïçätéd ßý <strong class=\"indicator\">ßöld téxt änd "
"än ästérïsk (*)</strong>. Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
#. Translators: selected_provider is the name of an external, third-party user #. Translators: selected_provider is the name of an external, third-party user
#. authentication service (like Google or LinkedIn). #. authentication service (like Google or LinkedIn).
#: lms/templates/register.html #: lms/templates/register.html
...@@ -8850,10 +8835,6 @@ msgstr "éxämplé: Jäné Döé Ⱡ'σ#" ...@@ -8850,10 +8835,6 @@ msgstr "éxämplé: Jäné Döé Ⱡ'σ#"
msgid "Needed for any certificates you may earn" msgid "Needed for any certificates you may earn"
msgstr "Néédéd för äný çértïfïçätés ýöü mäý éärn Ⱡ'σяєм ιρѕυ#" msgstr "Néédéd för äný çértïfïçätés ýöü mäý éärn Ⱡ'σяєм ιρѕυ#"
#: lms/templates/register.html
msgid "The name that will identify you in your courses"
msgstr "Thé nämé thät wïll ïdéntïfý ýöü ïn ýöür çöürsés Ⱡ'σяєм ιρѕυм #"
#: lms/templates/register.html lms/templates/register.html #: lms/templates/register.html lms/templates/register.html
msgid "cannot be changed later" msgid "cannot be changed later"
msgstr "çännöt ßé çhängéd lätér Ⱡ'σяє#" msgstr "çännöt ßé çhängéd lätér Ⱡ'σяє#"
......
...@@ -26,8 +26,8 @@ msgid "" ...@@ -26,8 +26,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1a\n" "Project-Id-Version: 0.1a\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-09-17 18:33+0000\n" "POT-Creation-Date: 2014-09-17 20:48+0000\n"
"PO-Revision-Date: 2014-09-17 18:34:42.947003\n" "PO-Revision-Date: 2014-09-17 20:49:46.533441\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
......
...@@ -27,8 +27,8 @@ from django.core.urlresolvers import reverse ...@@ -27,8 +27,8 @@ from django.core.urlresolvers import reverse
## override in a more generalizable fashion. ## override in a more generalizable fashion.
% if not stanford_theme_enabled(): % if not stanford_theme_enabled():
<div class="cta cta-welcome"> <div class="cta cta-welcome">
<h3>${_("Welcome to {platform_name}!").format(platform_name=platform_name)}</h3> <h3>${_("Welcome to {platform_name}").format(platform_name=platform_name)}</h3>
<p>${_("Registering with {platform_name} gives you access to all of our current and future free courses. Not ready to take a course just yet? Registering also adds you to our mailing list - we will update you as courses are added.").format(platform_name=platform_name)}</p> <p>${_("Registering with {platform_name} gives you access to all of our current and future free courses. Not ready to take a course just yet? Registering puts you on our mailing list - we will update you as courses are added.").format(platform_name=platform_name)}</p>
</div> </div>
% endif % endif
...@@ -37,17 +37,17 @@ from django.core.urlresolvers import reverse ...@@ -37,17 +37,17 @@ from django.core.urlresolvers import reverse
% if stanford_theme_enabled(): % if stanford_theme_enabled():
<p>${_("You will receive an activation email. You must click on the activation link to complete the process. Don't see the email? Check your spam folder and mark emails from class.stanford.edu as 'not spam', since you'll want to be able to receive email from your courses.")}</p> <p>${_("You will receive an activation email. You must click on the activation link to complete the process. Don't see the email? Check your spam folder and mark emails from class.stanford.edu as 'not spam', since you'll want to be able to receive email from your courses.")}</p>
% else: % else:
<p>${_("As part of registering with {platform_name}, you will receive an activation email. You must click on the activation link to complete the registration process. Don't see the email? Check your spam folder and mark {platform_name} emails as 'not spam'. At {platform_name}, we communicate mostly through email.").format(platform_name=platform_name)}</p> <p>${_("As part of joining {platform_name}, you will receive an activation email. You must click on the activation link to complete the process. Don't see the email? Check your spam folder and mark {platform_name} emails as 'not spam'. At {platform_name}, we communicate mostly through email.").format(platform_name=platform_name)}</p>
% endif % endif
</div> </div>
% if settings.MKTG_URL_LINK_MAP.get('FAQ'): % if settings.MKTG_URL_LINK_MAP.get('FAQ'):
<div class="cta cta-help"> <div class="cta cta-help">
<h3>${_("Need Help?")}</h3> <h3>${_("Need Help?")}</h3>
<p>${_("Need help registering with {platform_name}?").format(platform_name=platform_name)} <p>${_("Need help in registering with {platform_name}?").format(platform_name=platform_name)}
<a href="${marketing_link('FAQ')}"> <a href="${marketing_link('FAQ')}">
${_("View our FAQs for answers to commonly asked questions.")} ${_("View our FAQs for answers to commonly asked questions.")}
</a> </a>
${_("After you register, you can find answers to most of your questions in course-specific FAQs and discussions.")}</p> ${_("Once registered, most questions can be answered in the course specific discussion forums or through the FAQs.")}</p>
</div> </div>
% endif % endif
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<!-- status messages --> <!-- status messages -->
<div role="alert" class="status message"> <div role="alert" class="status message">
<h3 class="message-title">${_("We're sorry. Unfortunately, {platform_name} is not available in your region.").format(platform_name=platform_name)}</h3> <h3 class="message-title">${_("We're sorry, {platform_name} enrollment is not available in your region").format(platform_name=platform_name)}</h3>
</div> </div>
<div role="alert" class="status message submission-error" tabindex="-1"> <div role="alert" class="status message submission-error" tabindex="-1">
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
% for enabled in provider.Registry.enabled(): % for enabled in provider.Registry.enabled():
## Translators: provider_name is the name of an external, third-party user authentication service (like Google or LinkedIn). ## Translators: provider_name is the name of an external, third-party user authentication service (like Google or LinkedIn).
<button type="submit" class="button button-primary button-${enabled.NAME}" onclick="thirdPartySignin(event, '${pipeline.get_login_url(enabled.NAME, pipeline.AUTH_ENTRY_REGISTER)}');"><span class="icon ${enabled.ICON_CLASS}"></span>${_('Register with {provider_name}').format(provider_name=enabled.NAME)}</button> <button type="submit" class="button button-primary button-${enabled.NAME}" onclick="thirdPartySignin(event, '${pipeline.get_login_url(enabled.NAME, pipeline.AUTH_ENTRY_REGISTER)}');"><span class="icon ${enabled.ICON_CLASS}"></span>${_('Sign up with {provider_name}').format(provider_name=enabled.NAME)}</button>
% endfor % endfor
</div> </div>
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<p class="instructions"> <p class="instructions">
${_('Create your own {platform_name} account below').format(platform_name=platform_name)} ${_('Create your own {platform_name} account below').format(platform_name=platform_name)}
<span class="note">${_('Required fields are indicated by <strong class="indicator">bold text and an asterisk (*)</strong>.')}</span> <span class="note">${_('Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.')}</span>
</p> </p>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<p class="instructions"> <p class="instructions">
${_("Please complete the following fields to register for an account. ")}<br /> ${_("Please complete the following fields to register for an account. ")}<br />
${_('Required fields are indicated by <strong class="indicator">bold text and an asterisk (*)</strong>.')} ${_('Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.')}
</p> </p>
% endif % endif
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
<li class="field required text" id="field-username"> <li class="field required text" id="field-username">
<label for="username">${_('Public Username')}</label> <label for="username">${_('Public Username')}</label>
<input id="username" type="text" name="username" value="${username}" placeholder="${_('example: JaneDoe')}" required aria-required="true" aria-describedby="username-tip"/> <input id="username" type="text" name="username" value="${username}" placeholder="${_('example: JaneDoe')}" required aria-required="true" aria-describedby="username-tip"/>
<span class="tip tip-input" id="username-tip">${_('The name that will identify you in your courses')} <strong>(${_('cannot be changed later')})</strong></span> <span class="tip tip-input" id="username-tip">${_('Will be shown in any discussions or forums you participate in')} <strong>(${_('cannot be changed later')})</strong></span>
</li> </li>
% if settings.FEATURES.get('ENABLE_THIRD_PARTY_AUTH') and running_pipeline: % if settings.FEATURES.get('ENABLE_THIRD_PARTY_AUTH') and running_pipeline:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment