Skip to content

E
edx-platform
Commit 66187ab9 by Renzo Lucioni
Options

Clean up translated strings in registration page, dashboard, and track selection flow

parent 43ce6421
Showing with 100 additions and 89 deletions
common/djangoapps/third_party_auth/tests/specs/base.py
......@@ -280,7 +280,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
def assert_register_response_before_pipeline_looks_correct(self, response):
"""Asserts a GET of /register not in the pipeline looks correct."""
self.assertEqual(200, response.status_code)
self.assertIn('Sign up with ' + self.PROVIDER_CLASS.NAME, response.content)
self.assertIn('Register with ' + self.PROVIDER_CLASS.NAME, response.content)
self.assert_signin_button_looks_functional(response.content, pipeline.AUTH_ENTRY_REGISTER)
def assert_signin_button_looks_functional(self, content, auth_entry):
......
conf/locale/eo/LC_MESSAGES/djangojs.po
......@@ -26,8 +26,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1a\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-09-16 10:49-0400\n"
"PO-Revision-Date: 2014-09-16 14:50:40.693688\n"
"POT-Creation-Date: 2014-09-17 18:33+0000\n"
"PO-Revision-Date: 2014-09-17 18:34:42.947003\n"
"Last-Translator: \n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"MIME-Version: 1.0\n"
......@@ -1548,6 +1548,38 @@ msgstr ""
"αмєт, ¢ση#"
#: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
#: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
msgid "Play"
msgstr "Pläý Ⱡ'σяєм#"
#: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
#: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
msgid "Pause"
msgstr "Päüsé Ⱡ'σяєм ι#"
#: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
msgid "Mute"
msgstr "Müté Ⱡ'σяєм#"
#: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
msgid "Unmute"
msgstr "Ûnmüté Ⱡ'σяєм ιρѕ#"
#: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
#: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
msgid "Exit full browser"
msgstr "Éxït füll ßröwsér Ⱡ'σ#"
#: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
#: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
msgid "Fill browser"
msgstr "Fïll ßröwsér Ⱡ#"
#: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
msgid "Speed"
msgstr "Spééd Ⱡ'σяєм ι#"
#: common/lib/xmodule/xmodule/js/src/video/00_i18n.js
msgid "Volume"
msgstr "Völümé Ⱡ'σяєм ιρѕ#"
......@@ -1606,22 +1638,6 @@ msgstr ""
msgid "Video slider"
msgstr "Vïdéö slïdér Ⱡ#"
#: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
msgid "Pause"
msgstr "Päüsé Ⱡ'σяєм ι#"
#: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
msgid "Play"
msgstr "Pläý Ⱡ'σяєм#"
#: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
msgid "Fill browser"
msgstr "Fïll ßröwsér Ⱡ#"
#: common/lib/xmodule/xmodule/js/src/video/04_video_control.js
msgid "Exit full browser"
msgstr "Éxït füll ßröwsér Ⱡ'σ#"
#: common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js
msgid "HD on"
msgstr "HD ön Ⱡ'σяєм ι#"
......@@ -2357,33 +2373,6 @@ msgstr "Çlösé Çälçülätör Ⱡ'σ#"
msgid "Post body"
msgstr "Pöst ßödý #"
#. Translators: "Distribution" refers to a grade distribution. This error
#. message appears when there is an error getting the data on grade
#. distribution.;
#: lms/static/coffee/src/instructor_dashboard/analytics.js
msgid "Error fetching distribution."
msgstr "Érrör fétçhïng dïstrïßütïön. Ⱡ'σяєм #"
#: lms/static/coffee/src/instructor_dashboard/analytics.js
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Unavailable metric display."
msgstr "Ûnäväïläßlé métrïç dïspläý. Ⱡ'σяєм#"
#: lms/static/coffee/src/instructor_dashboard/analytics.js
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Error fetching grade distributions."
msgstr "Érrör fétçhïng grädé dïstrïßütïöns. Ⱡ'σяєм ιρ#"
#: lms/static/coffee/src/instructor_dashboard/analytics.js
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Last Updated: <%= timestamp %>"
msgstr "Läst Ûpdätéd: <%= timestamp %> Ⱡ'σ#"
#: lms/static/coffee/src/instructor_dashboard/analytics.js
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "<%= num_students %> students scored."
msgstr "<%= num_students %> stüdénts sçöréd. Ⱡ'σя#"
#: lms/static/coffee/src/instructor_dashboard/data_download.js
#: cms/templates/js/mock/mock-group-configuration-page.underscore
msgid "Loading..."
......@@ -2413,6 +2402,22 @@ msgstr ""
"Lïnks äré générätéd ön démänd änd éxpïré wïthïn 5 mïnütés düé tö thé "
"sénsïtïvé nätüré öf stüdént ïnförmätïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Unavailable metric display."
msgstr "Ûnäväïläßlé métrïç dïspläý. Ⱡ'σяєм#"
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Error fetching grade distributions."
msgstr "Érrör fétçhïng grädé dïstrïßütïöns. Ⱡ'σяєм ιρ#"
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Last Updated: <%= timestamp %>"
msgstr "Läst Ûpdätéd: <%= timestamp %> Ⱡ'σ#"
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "<%= num_students %> students scored."
msgstr "<%= num_students %> stüdénts sçöréd. Ⱡ'σя#"
#: lms/static/coffee/src/instructor_dashboard/membership.js
msgid "Username"
msgstr "Ûsérnämé #"
......
lms/templates/register-sidebar.html
......@@ -27,8 +27,8 @@ from django.core.urlresolvers import reverse
## override in a more generalizable fashion.
% if not stanford_theme_enabled():
<div class="cta cta-welcome">
<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 puts you on our mailing list - we will update you as courses are added.").format(platform_name=platform_name)}</p>
<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>
</div>
% endif
......@@ -37,17 +37,17 @@ from django.core.urlresolvers import reverse
% 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>
% else:
<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>
<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>
% endif
</div>
% if settings.MKTG_URL_LINK_MAP.get('FAQ'):
<div class="cta cta-help">
<h3>${_("Need Help?")}</h3>
<p>${_("Need help in registering with {platform_name}?").format(platform_name=platform_name)}
<p>${_("Need help registering with {platform_name}?").format(platform_name=platform_name)}
<a href="${marketing_link('FAQ')}">
${_("View our FAQs for answers to commonly asked questions.")}
</a>
${_("Once registered, most questions can be answered in the course specific discussion forums or through the FAQs.")}</p>
${_("After you register, you can find answers to most of your questions in course-specific FAQs and discussions.")}</p>
</div>
% endif
lms/templates/register.html
......@@ -108,7 +108,7 @@
<!-- status messages -->
<div role="alert" class="status message">
<h3 class="message-title">${_("We're sorry, {platform_name} enrollment is not available in your region").format(platform_name=platform_name)}</h3>
<h3 class="message-title">${_("We're sorry. Unfortunately, {platform_name} is not available in your region.").format(platform_name=platform_name)}</h3>
</div>
<div role="alert" class="status message submission-error" tabindex="-1">
......@@ -124,7 +124,7 @@
% for enabled in provider.Registry.enabled():
## 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>${_('Sign up 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>${_('Register with {provider_name}').format(provider_name=enabled.NAME)}</button>
% endfor
</div>
......@@ -137,7 +137,7 @@
<p class="instructions">
${_('Create your own {platform_name} account below').format(platform_name=platform_name)}
<span class="note">${_('Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.')}</span>
<span class="note">${_('Required fields are indicated by <strong class="indicator">bold text and an asterisk (*)</strong>.')}</span>
</p>
......@@ -155,7 +155,7 @@
<p class="instructions">
${_("Please complete the following fields to register for an account. ")}<br />
${_('Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.')}
${_('Required fields are indicated by <strong class="indicator">bold text and an asterisk (*)</strong>.')}
</p>
% endif
......@@ -179,7 +179,7 @@
<li class="field required text" id="field-username">
<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"/>
<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>
<span class="tip tip-input" id="username-tip">${_('The name that will identify you in your courses')} <strong>(${_('cannot be changed later')})</strong></span>
</li>
% if settings.FEATURES.get('ENABLE_THIRD_PARTY_AUTH') and running_pipeline:
......
lms/templates/verify_student/_reverification_support.html
......@@ -13,7 +13,7 @@
<li class="help-item help-item-technical">
<h3 class="title">${_("Having Technical Trouble?")}</h3>
<div class="copy">
<p>${_("Please make sure your browser is updated to the <strong>{a_start}most recent version possible{a_end}</strong>. Also, please make sure your <strong>web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings)</strong>").format(a_start='<a rel="external" href="http://browsehappy.com/">', a_end="</a>")}</p>
<p>${_("Please make sure your browser is updated to the <strong>{a_start}most recent version possible{a_end}</strong>. Also, please make sure your <strong>webcam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings)</strong>").format(a_start='<a rel="external" href="http://browsehappy.com/">', a_end="</a>")}</p>
</div>
</li>
......
lms/templates/verify_student/_verification_support.html
......@@ -34,7 +34,7 @@
<li class="help-item help-item-technical">
<h3 class="title">${_("Technical Requirements")}</h3>
<div class="copy">
<p>${_("Please make sure your browser is updated to the {a_start}most recent version possible{a_end}. Also, please make sure your <strong>web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).</strong>").format(a_start='<strong><a rel="external" href="http://browsehappy.com/">', a_end="</a></strong>")}</p>
<p>${_("Please make sure your browser is updated to the {a_start}most recent version possible{a_end}. Also, please make sure your <strong>webcam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).</strong>").format(a_start='<strong><a rel="external" href="http://browsehappy.com/">', a_end="</a></strong>")}</p>
</div>
</li>
</ul>
......@@ -56,7 +56,7 @@
<li class="help-item help-item-technical">
<h3 class="title">${_("Technical Requirements")}</h3>
<div class="copy">
<p>${_("Please make sure your browser is updated to the {a_start}most recent version possible{a_end}. Also, please make sure your <strong>web cam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).</strong>").format(a_start='<strong><a rel="external" href="http://browsehappy.com/">', a_end="</a></strong>")}</p>
<p>${_("Please make sure your browser is updated to the {a_start}most recent version possible{a_end}. Also, please make sure your <strong>webcam is plugged in, turned on, and allowed to function in your web browser (commonly adjustable in your browser settings).</strong>").format(a_start='<strong><a rel="external" href="http://browsehappy.com/">', a_end="</a></strong>")}</p>
</div>
</li>
</ul>
......
lms/templates/verify_student/show_requirements.html
......@@ -103,7 +103,7 @@
<div class="copy">
<p>
<span class="copy-super">${_("Check your email")}</span>
<span class="copy-sub">${_("you need an active edX account before registering - check your email for instructions")}</span>
<span class="copy-sub">${_("You need to activate your {platform_name} account before you can register for courses. Check your inbox for an activation email.").format(platform_name=settings.PLATFORM_NAME)}</span>
</p>
</div>
</li>
......@@ -119,7 +119,7 @@
<div class="copy">
<p>
<span class="copy-super">${_("A photo identification document")}</span>
<span class="copy-sub">${_("A driver's license, passport, or other government or school-issued ID with your name and picture on it")}</span>
<span class="copy-sub">${_("A driver's license, passport, or other government or school-issued ID with your name and picture on it.")}</span>
</p>
</div>
</li>
......@@ -133,7 +133,13 @@
<div class="copy">
<p>
<span class="copy-super">${_("A webcam and a modern browser")}</span>
<span class="copy-sub"><strong><a rel="external" href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a>, <a rel="external" href="https://www.google.com/intl/en/chrome/browser/">Chrome</a>, <a rel="external" href="http://www.apple.com/safari/">Safari</a>, <a rel="external" href="http://windows.microsoft.com/en-us/internet-explorer/download-ie">IE9+</a></strong> - ${_("Please make sure your browser is updated to the most recent version possible")}
<span class="copy-sub"><strong>
<a rel="external" href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a>,
<a rel="external" href="https://www.google.com/intl/en/chrome/browser/">Chrome</a>,
<a rel="external" href="http://www.apple.com/safari/">Safari</a>,
## Translators: This phrase will look like this: "Internet Explorer 9 or later"
<a rel="external" href="http://windows.microsoft.com/en-us/internet-explorer/download-ie">${_("{internet_explorer_version} or later").format(internet_explorer_version="Internet Explorer 9")}</a></strong>.
${_("Please make sure your browser is updated to the most recent version possible.")}
</span>
</p>
</div>
......@@ -148,7 +154,7 @@
<div class="copy">
<p>
<span class="copy-super">${_("A major credit or debit card")}</span>
<span class="copy-sub">${_("Visa, Master Card, American Express, Discover, Diners Club, JCB with Discover logo")}</span>
<span class="copy-sub">${_("Visa, MasterCard, American Express, Discover, Diners Club, or JCB with the Discover logo.")}</span>
</p>
</div>
</li>
......
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