Commit 93a2e080 by Renzo Lucioni

Merge pull request #6465 from edx/renzo/update-split-payment-verification-copy

Apply most important copy changes from docs
parents a1104ceb fe691b05
......@@ -158,7 +158,7 @@ define([
view = createView( backends );
// Expect an error
expect( view.errorModel.get( 'errorTitle' ) ).toEqual( 'No Flash Detected' );
expect( view.errorModel.get( 'errorTitle' ) ).toEqual( 'Flash Not Detected' );
expect( view.errorModel.get( 'errorMsg' ) ).toContain( 'Get Flash' );
expect( view.errorModel.get( 'shown' ) ).toBe( true );
......
......@@ -134,7 +134,7 @@ var edx = edx || {};
},
handleCreateOrderError: function( xhr ) {
var errorMsg = gettext( 'An unexpected error occurred. Please try again.' );
var errorMsg = gettext( 'An error has occurred. Please try again.' );
if ( xhr.status === 400 ) {
errorMsg = xhr.responseText;
......
......@@ -66,7 +66,7 @@ var edx = edx || {};
},
handleSubmissionError: function( xhr ) {
var errorMsg = gettext( 'An unexpected error occurred. Please try again later.' );
var errorMsg = gettext( 'An error has occurred. Please try again later.' );
// Re-enable the submit button to allow the user to retry
this.setSubmitButtonEnabled( true );
......
......@@ -46,7 +46,7 @@
handleError: function( errorTitle, errorMsg ) {
this.errorModel.set({
errorTitle: errorTitle || gettext( "Error" ),
errorMsg: errorMsg || gettext( "An unexpected error occurred. Please reload the page to try again." ),
errorMsg: errorMsg || gettext( "An error has occurred. Please try reloading the page." ),
shown: true
});
},
......
......@@ -85,8 +85,8 @@
handleVideoFailure: function() {
this.trigger(
'error',
gettext( 'Video capture error' ),
gettext( 'Please check that your webcam is connected and you have allowed access to your webcam.' )
gettext( 'Video Capture Error' ),
gettext( 'Please verify that your webcam is connected and that you have allowed your browser to access it.' )
);
}
},
......@@ -211,7 +211,7 @@
if ( !this.backend ) {
this.handleError(
gettext( "No Flash Detected" ),
gettext( "Flash Not Detected" ),
gettext( "You don't seem to have Flash installed." ) + " " +
_.sprintf(
gettext( "%(a_start)s Get Flash %(a_end)s to continue your enrollment." ),
......
......@@ -47,7 +47,7 @@
<div class="enrollment-status-footer">
<h4 class="title"><%- gettext( "Verified Status" ) %></h4>
<p class="verify-pending-msg">
<%- gettext( "Thank you for submitting your identification photos, we will review them soon. If there is a problem with any of the items, we will contact you to resubmit. You can now enroll in any of the verified certificate courses for one year without having to re-verify." ) %></p>
<%- _.sprintf( gettext( "Thank you for submitting your photos. We will review them shortly. You can now sign up for any %(platformName)s course that offers verified certificates. Verification is good for one year. After one year, you must submit photos for verification again." ), { platformName: platformName } ) %></p>
</div>
</article>
</div>
......@@ -2,7 +2,7 @@
<div class="facephoto view">
<h3 class="title"><%- gettext( "Take Your Photo" ) %></h3>
<div class="instruction">
<p><%- gettext( "Use your webcam to take a picture of your face so we can match it with the picture on your ID." ) %></p>
<p><%- gettext( "Use your webcam to take a photo of your face. We will match this photo with the photo on your ID." ) %></p>
</div>
<div class="wrapper-task">
......@@ -17,7 +17,7 @@
<li class="help-item"><%- gettext( "Make sure your face is well-lit" ) %></li>
<li class="help-item"><%- gettext( "Be sure your entire face is inside the frame" ) %></li>
<li class="help-item">
<%= _.sprintf( gettext( "Once in position, use the camera button %(icon)s to capture your picture" ), { icon: '<span class="example">(<i class="icon-camera"></i>)</span>' } ) %>
<%= _.sprintf( gettext( "Once in position, use the camera button %(icon)s to capture your photo" ), { icon: '<span class="example">(<i class="icon-camera"></i>)</span>' } ) %>
</li>
<li class="help-item"><%- gettext( "Can we match the photo you took with the one on your ID?" ) %></li>
<li class="help-item"><%- gettext( "Use the retake photo button if you are not pleased with your photo" ) %></li>
......@@ -26,17 +26,17 @@
</div>
<div class="help help-faq facefaq">
<h4 class="sr title"><%- gettext( "Common Questions" ) %></h4>
<h4 class="sr title"><%- gettext( "Frequently Asked Questions" ) %></h4>
<div class="copy">
<dl class="list-faq">
<dt class="faq-question">
<%- _.sprintf( gettext( "Why does %(platformName)s need my photo?" ), { platformName: platformName } ) %>
</dt>
<dd class="faq-answer"><%- gettext( "As part of the verification process, we need your photo to confirm your identity." ) %></dd>
<dd class="faq-answer"><%- gettext( "As part of the verification process, you take a photo of both your face and a government-issued photo ID. Our authorization service confirms your identity by comparing the photo you take with the photo on your ID." ) %></dd>
<dt class="faq-question">
<%- _.sprintf( gettext( "What does %(platformName)s do with this picture?" ), { platformName: platformName } ) %>
<%- _.sprintf( gettext( "What does %(platformName)s do with this photo?" ), { platformName: platformName } ) %>
</dt>
<dd class="faq-answer"><%- gettext( "We encrypt it and send it to our secure authorization service for review. We use the highest levels of security and do not save the photo or information anywhere once the match has been completed." ) %></dd>
<dd class="faq-answer"><%- _.sprintf( gettext( "We use the highest levels of security available to encrypt your photo and send it to our authorization service for review. Your photo and information are not saved or visible anywhere on %(platformName)s after the verification process is complete." ), { platformName: platformName } ) %></dd>
</dl>
</div>
</div>
......
......@@ -2,7 +2,7 @@
<div class="idphoto view">
<h3 class="title"><%- gettext( "Take a Photo of Your ID" ) %></h3>
<div class="instruction">
<p><%- gettext("Use your webcam to take a picture of your ID so we can match it with your photo and the name on your account.") %></p>
<p><%- gettext("Use your webcam to take a photo of your ID. We will match this photo with the photo of your face and the name on your account.") %></p>
</div>
<div class="wrapper-task">
......@@ -27,19 +27,19 @@
</div>
<div class="help help-faq facefaq">
<h4 class="sr title"><%- gettext( "Common Questions" ) %></h4>
<h4 class="sr title"><%- gettext( "Frequently Asked Questions" ) %></h4>
<div class="copy">
<dl class="list-faq">
<dt class="faq-question">
<%- _.sprintf( gettext( "Why does %(platformName)s need my photo?" ), { platformName: platformName } ) %>
</dt>
<dd class="faq-answer"><%- gettext( "We need to match your ID with your photo and name to confirm your identity." ) %></dd>
<dd class="faq-answer"><%- gettext( "As part of the verification process, you take a photo of both your face and a government-issued photo ID. Our authorization service confirms your identity by comparing the photo you take with the photo on your ID." ) %></dd>
<dt class="faq-question">
<%- _.sprintf( gettext( "What does %(platformName)s do with this picture?" ), { platformName: platformName } ) %>
<%- _.sprintf( gettext( "What does %(platformName)s do with this photo?" ), { platformName: platformName } ) %>
</dt>
<dd class="faq-answer"><%- gettext( "We encrypt it and send it to our secure authorization service for review. We use the highest levels of security and do not save the photo or information anywhere once the match has been completed." ) %></dd>
<dd class="faq-answer"><%- _.sprintf( gettext( "We use the highest levels of security available to encrypt your photo and send it to our authorization service for review. Your photo and information are not saved or visible anywhere on %(platformName)s after the verification process is complete." ), { platformName: platformName } ) %></dd>
</dl>
</div>
</div>
......
......@@ -31,7 +31,7 @@
<div class="copy">
<p>
<span class="copy-super"><%- gettext( "Check your email" ) %></span>
<span class="copy-super"><%- gettext( "Check Your Email" ) %></span>
</p>
</div>
</li>
......@@ -46,7 +46,7 @@
<div class="copy">
<p>
<span class="copy-sub"><%- gettext( "A driver's license, passport, or government-issued ID with your name and picture" ) %></span>
<span class="copy-sub"><%- gettext( "A driver's license, passport, or other government-issued ID with your name and photo" ) %></span>
</p>
</div>
</li>
......
......@@ -15,7 +15,7 @@
) %>
</h3>
<div class="instruction">
<%- gettext( "We've already verified your identity through the photos of you and your ID you provided earlier. You can now pay and complete registration." ) %>
<%- gettext( "We have successfully verified your identity. You can now enter your payment information and complete your enrollment." ) %>
</div>
<% } %>
......@@ -79,7 +79,7 @@
<% } else {%>
<li class="review-task review-task-contribution">
<h4 class="title"><%- gettext( "Your Course Total" ) %></h4>
<h4 class="title"><%- gettext( "Your Total Contribution" ) %></h4>
<div class="copy">
<p><%- gettext( "To complete your enrollment, you will need to pay:" ) %></p>
</div>
......@@ -126,14 +126,14 @@
<div class="copy">
<p>
<span class="copy-super"><%- gettext( "Check your email" ) %></span>
<span class="copy-super"><%- gettext( "Check Your Email" ) %></span>
</p>
</div>
</li>
<% } else {%>
<% if ( requirements['photo-id-required'] ) { %>
<li class="req req-1 req-id">
<h4 class="title"><%- gettext( "Government-issued Photo ID" ) %></h4>
<h4 class="title"><%- gettext( "Government-Issued Photo ID" ) %></h4>
<div class="placeholder-art">
<i class="icon-list-alt icon-under"></i>
<i class="icon-user icon-over"></i>
......
<div class="wrapper-content-main payment-confirmation-step">
<article class="content-main">
<h3 class="title">
<%= _.sprintf( gettext( "Thank you! We have received your payment for %(courseName)s" ), { courseName: '<span class="course-title">' + courseName + '</span>' } ) %>
<%= _.sprintf( gettext( "Thank you! We have received your payment for %(courseName)s." ), { courseName: '<span class="course-title">' + courseName + '</span>' } ) %>
</h3>
<% if ( receipt ) { %>
......@@ -55,14 +55,14 @@
<div class="msg msg-refunds">
<h4 class="title sr"><%- gettext( "Please Note" ) %>: </h4>
<div class="copy">
<p><%- gettext( "Items with strikethough have been refunded." ) %></p>
<p><%- gettext( "Crossed out items have been refunded." ) %></p>
</div>
</div>
<% } %>
</div>
<div class="copy">
<p><%- gettext( "Billed To" ) %>:
<p><%- gettext( "Billed to" ) %>:
<span class="name-first"><%- receipt.billedTo.firstName %></span>
<span class="name-last"><%- receipt.billedTo.lastName %></span>
(<span class="address-city"><%- receipt.billedTo.city %></span>,
......@@ -74,7 +74,7 @@
</li>
</ul>
<% } else { %>
<p class="no-content"><%- gettext( "No receipt available." ) %></p>
<p class="no-content"><%- gettext( "No receipt available" ) %></p>
<% } %>
<% if ( nextStepTitle ) { %>
......@@ -110,7 +110,7 @@
<div class="copy">
<p>
<span class="copy-sub"><%- gettext( "A driver's license, passport, or government-issued ID with your name and picture." ) %></span>
<span class="copy-sub"><%- gettext( "A driver's license, passport, or government-issued ID with your name and photo." ) %></span>
</p>
</div>
</li>
......@@ -141,7 +141,7 @@
) %>
</a>
<a id="verify_later_button" class="next action-secondary verify-later nav-link" href="/dashboard" data-tooltip="<%- _.sprintf( gettext( "If you don't confirm your identity now, you can go to the dashboard to explore your course and %(platformName)s will remind you later." ), { platformName: platformName } ) %>">
<a id="verify_later_button" class="next action-secondary verify-later nav-link" href="/dashboard" data-tooltip="<%- _.sprintf( gettext( "If you don't verify your identity now, you can still explore your course from your dashboard. You will receive periodic reminders from %(platformName)s to verify your identity." ), { platformName: platformName } ) %>">
<%- gettext( "Want to confirm your identity later?" ) %>
</a>
</nav>
......
<div id="wrapper-review" class="wrapper-view review-photos-step">
<div class="review view">
<h3 class="title"><%- gettext( "Review your photos" ) %></h3>
<h3 class="title"><%- gettext( "Review Your Photos" ) %></h3>
<div class="instruction">
<p><%- gettext( "Make sure we can verify your identity from the photos below." ) %></p>
<p><%- gettext( "Make sure we can verify your identity with the photos and information you have provided." ) %></p>
</div>
<div class="wrapper-task">
......@@ -30,11 +30,11 @@
<li class="tip"><%- _.sprintf( gettext( "Does the name on your ID match your account name: %(fullName)s?" ), { fullName: fullName } ) %>
<div class="help-tip is-expandable">
<a href="#" class="title title-expand" aria-expanded="false" role="link">
<%- gettext( "Edit your name" ) %>
<%- gettext( "Edit Your Name" ) %>
</a>
<div class="copy expandable-area">
<p><%- gettext( "You should change the name on your account to match your ID." ) %></p>
<p><%- gettext( "Make sure that the full name on your account matches the name on your ID." ) %></p>
<input type="text" name="new-name" id="new-name" placeholder="<%= fullName %>">
</div>
</div>
......@@ -48,7 +48,7 @@
<p>
<%- gettext( "Photos don't meet the requirements?" ) %>
<a id="retake_photos_button" class="retake-photos">
<%- gettext( "Retake your photos" ) %>
<%- gettext( "Retake Your Photos" ) %>
</a>
</p>
</div>
......
......@@ -9,11 +9,11 @@
<div class="controls photo-controls">
<div class="control control-retake is-hidden" id="webcam_reset_button">
<a class="action action-redo"><%- gettext( "Retake photo" ) %></a>
<a class="action action-redo"><%- gettext( "Retake Photo" ) %></a>
</div>
<div class="control control-do is-hidden" id="webcam_capture_button">
<a class="action action-do">
<i class="icon-camera"></i> <span class="sr"><%- gettext( "Take photo" ) %></span>
<i class="icon-camera"></i> <span class="sr"><%- gettext( "Take Photo" ) %></span>
</a>
</div>
</div>
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