Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5248 from edx/renzo/cleanup-translated-strings

Browse Source 
Clean up translated strings in registration page, dashboard, and track selection flow
This commit is contained in:
Renzo Lucioni
2014-09-19 12:57:39 -04:00
parent afc07cdac2 c78594b286
commit 135ce24977
8 changed files with 223 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lms/templates/dashboard.html
View File

@@ -73,7 +73,7 @@
$("#unenroll_course_id").val() + "&enrollment_action=unenroll";
} else {
$('#unenroll_error').html(
xhr.responseText ? xhr.responseText : "${_('An error occurred. Please try again later.')}"
xhr.responseText ? xhr.responseText : "${_("An error occurred. Please try again later.")}"
).stop().css("display", "block");
}
});
@@ -106,10 +106,10 @@
{"new_email" : new_email, "password" : new_password},
function(data) {
if (data.success) {
$("#change_email_title").html("${_('Please verify your new email')}");
$("#change_email_form").html("<p>${_('You\'ll receive a confirmation in your inbox.'
' Please click the link in the email to confirm'
' the email change.')}</p>");
$("#change_email_title").html("${_("Please verify your new email address")}");
$("#change_email_form").html("<p>${_("You'll receive a confirmation in your inbox."
" Please follow the link in the email to confirm"
" your email address change.")}</p>");
} else {
$("#change_email_error").html(data.error).stop().css("display", "block");
}
@@ -195,7 +195,7 @@
% if duplicate_provider:
<section class="dashboard-banner third-party-auth">
## Translators: this message is displayed when a user tries to link their account with a third-party authentication provider (for example, Google or LinkedIn) with a given edX account, but their third-party account is already associated with another edX account. provider_name is the name of the third-party authentication provider, and platform_name is the name of the edX deployment.
<p>${_('The {provider_name} account you selected is already linked to another {platform_name} account.').format(provider_name='<strong>%s</strong>' % duplicate_provider.NAME, platform_name=platform_name)}
<p>${_("The {provider_name} account you selected is already linked to another {platform_name} account.").format(provider_name='<strong>%s</strong>' % duplicate_provider.NAME, platform_name=platform_name)}
</section>
% endif
@@ -235,9 +235,9 @@
<div class="status">
% if state.has_account:
<i class="icon icon-link"></i> <span class="copy">${_('Linked')}</span>
<i class="icon icon-link"></i> <span class="copy">${_("Linked")}</span>
% else:
<i class="icon icon-unlink"></i><span class="copy">${_('Not Linked')}</span>
<i class="icon icon-unlink"></i><span class="copy">${_("Not Linked")}</span>
% endif
</div>
@@ -275,7 +275,7 @@
<span class="title"><a href="#password_reset_complete" rel="leanModal" id="pwd_reset_button">${_("Reset Password")}</a></span>
<form id="password_reset_form" method="post" data-remote="true" action="${reverse('password_reset')}">
<input id="id_email" type="hidden" name="email" maxlength="75" value="${user.email}" />
<!-- <input type="submit" id="pwd_reset_button" value="${_('Reset Password')}" /> -->
<!-- <input type="submit" id="pwd_reset_button" value="${_("Reset Password")}" /> -->
</form>
</li>
% endif
@@ -345,13 +345,13 @@
<i class="icon-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}
${_("Close")}
</span>
</button>
<header>
<h2 id="email-settings-title">
${_('Email Settings for {course_number}').format(course_number='<span id="email_settings_course_number"></span>')}
${_("Email Settings for {course_number}").format(course_number='<span id="email_settings_course_number"></span>')}
<span class="sr">,
## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
${_("window open")}
@@ -364,7 +364,7 @@
<input name="course_id" id="email_settings_course_id" type="hidden" />
<label>${_("Receive course emails")} <input type="checkbox" id="receive_emails" name="receive_emails" /></label>
<div class="submit">
<input type="submit" id="submit" value="${_('Save Settings')}" />
<input type="submit" id="submit" value="${_("Save Settings")}" />
</div>
</form>
</div>
@@ -378,13 +378,13 @@
<i class="icon-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}
${_("Close")}
</span>
</button>
<header>
<h2 id="password-reset-email">
${_('Password Reset Email Sent')}
${_("Password Reset Email Sent")}
<span class="sr">,
## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
${_("window open")}
@@ -395,7 +395,7 @@
<div>
<form> <!-- Here for styling reasons -->
<section>
<p>${_('An email has been sent to {email}. Follow the link in the email to change your password.').format(email=user.email)}</p>
<p>${_("An email has been sent to {email}. Follow the link in the email to change your password.").format(email=user.email)}</p>
</section>
</form>
</div>
@@ -408,7 +408,7 @@
<i class="icon-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}
${_("Close")}
</span>
</button>
@@ -427,16 +427,16 @@
<div id="change_email_error" class="modal-form-error"> </div>
<fieldset>
<div class="input-group">
<label>${_('Please enter your new email address:')}</label>
<label>${_("Please enter your new email address:")}</label>
<input id="new_email_field" type="email" value="" />
<label>${_('Please confirm your password:')}</label>
<label>${_("Please confirm your password:")}</label>
<input id="new_email_password" value="" type="password" />
</div>
<section>
<p>${_('We will send a confirmation to both {email} and your new email as part of the process.').format(email=user.email)}</p>
<p>${_("We will send a confirmation to both {email} and your new email address as part of the process.").format(email=user.email)}</p>
</section>
<div class="submit">
<input type="submit" id="submit_email_change" value="${_('Change Email')}"/>
<input type="submit" id="submit_email_change" value="${_("Change Email")}"/>
</div>
</fieldset>
</form>
@@ -452,7 +452,7 @@
<i class="icon-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}
${_("Close")}
</span>
</button>
@@ -470,7 +470,7 @@
<form id="change_name_form">
<div id="change_name_error" class="modal-form-error"> </div>
## Translators: note that {platform} {cert_name_short} will look something like: "edX certificate". Please do not change the order of these placeholders.
<p>${_("To uphold the credibility of your {platform} {cert_name_short}, all name changes will be logged and recorded.").format(platform=settings.PLATFORM_NAME, cert_name_short=cert_name_short)}</p>
<p>${_("To uphold the credibility of your {platform} {cert_name_short}, all name changes will be recorded.").format(platform=settings.PLATFORM_NAME, cert_name_short=cert_name_short)}</p>
<br/>
<fieldset>
<div class="input-group">
@@ -481,7 +481,7 @@
<textarea id="name_rationale_field" value=""></textarea>
</div>
<div class="submit">
<input type="submit" id="submit" value="${_('Change My Name')}">
<input type="submit" id="submit" value="${_("Change My Name")}">
</div>
</fieldset>
</form>
@@ -495,13 +495,13 @@
<i class="icon-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}
${_("Close")}
</span>
</button>
<header>
<h2 id="unenrollment-modal-title">
${_('<span id="track-info"></span> {course_number}? <span id="refund-info"></span>').format(course_number='<span id="unenroll_course_number"></span>')}
${_("<span id='track-info'></span> {course_number}? <span id='refund-info'></span>").format(course_number="<span id='unenroll_course_number'></span>")}
<span class="sr">,
## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
${_("window open")}
@@ -514,7 +514,7 @@
<input name="course_id" id="unenroll_course_id" type="hidden" />
<input name="enrollment_action" type="hidden" value="unenroll" />
<div class="submit">
<input name="submit" type="submit" value="${_('Unregister')}" />
<input name="submit" type="submit" value="${_("Unregister")}" />
</div>
</form>
</div>

2
lms/templates/verify_student/_reverification_support.html
View File

@@ -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>

4
lms/templates/verify_student/_verification_support.html
View File

@@ -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>

14
lms/templates/verify_student/show_requirements.html
View File

@@ -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>