Merge pull request #5917 from edx/sarina/fix-i18n

Fix Solutions i18n issues

lms/templates/dashboard/_dashboard_course_listing.html

@@ -185,9 +185,14 @@
       %endif
       % if is_course_blocked:
         <p id="block-course-msg" class="course-block">
-            ${_('You can no longer access this course because payment has not yet been received. you can <a href="#">contact the account holder</a> to request payment, or you can')}
-            <a id="unregister_block_course" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" href="#unenroll-modal" > ${_('unenroll')} </a>
-            ${_('for this course.')}
+            ${_("You can no longer access this course because payment has not yet been received. You "
+	    "can {link_start}contact the account holder{link_end} to request payment, or you can "
+	    "{unenroll_link_start}unenroll{unenroll_link_end} from this course").format(
+   	        link_start='<a href="#">',
+	        link_end='</a>',
+	        unenroll_link_start='<a id="unregister_block_course" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" href="#unenroll-modal">',
+	        unenroll_link_end="</a>"
+	    )}
         </p>
       %endif
 

lms/templates/emails/account_creation_and_enroll_emailMessage.txt

@@ -9,6 +9,6 @@ ${_("password: {password}").format(password=password)}
 
 ${_("It is recommended that you change your password.")}
 
-${_("Sincerely yours,")}
-
-${_("The {course_name} Team").format(course_name=course.display_name_with_default)}
+${_("Sincerely yours,"
+""
+"The {course_name} Team").format(course_name=course.display_name_with_default)}

lms/templates/emails/business_order_confirmation_email.txt

@@ -46,9 +46,11 @@ ${_('Company Contact Name:')} ${order.company_contact_name}<br>
 ${_('Company Contact Email:')} ${order.company_contact_email}<br>
 %endif
 % if order.recipient_name:
+# Translators: this will be the name of a person receiving an email
 ${_('Recipient Name:')} ${order.recipient_name}<br>
  %endif
 % if order.recipient_email:
+# Translators: this will be the email address of a person receiving an email
 ${_('Recipient Email:')} ${order.recipient_email}<br>
  %endif
 
@@ -65,11 +67,14 @@ ${order.bill_to_country.upper()}
 
 <p><b>${_("A CSV file of your registration URLs is attached. Please distribute registration URLs to each student planning to enroll using the email template below.")}</b></p>
 
-<p>${_("Warm regards,")}<br>
 % if payment_email_signature:
+# Translators: This is followed by the instructor or course team name (so could be singular or plural)
+<p>${_("Warm regards,")}<br>
 ${payment_email_signature}
 % else:
-${_("The {platform_name} Team").format(platform_name=platform_name)}
+# Translators: The <br> is a line break (empty line), please keep this html in the string after the sign off.
+<p>${_("Warm regards,<br>"
+"The {platform_name} Team").format(platform_name=platform_name)}
 %endif
 </p>
 
@@ -77,17 +82,22 @@ ${_("The {platform_name} Team").format(platform_name=platform_name)}
 ———————————————————————————————————————————
 
 
-<p>Dear [[Name]]</p>
+# Translators: please translate the text inside [[ ]]. This is meant as a template for course teams to use.
+<p>${_("Dear [[Name]]")}</p>
 
-<p>To enroll in ${course_names} we have provided a registration URL for you.  Please follow the instructions below to claim your access.</p>
+<p>${_("To enroll in ${course_names} we have provided a registration URL for you.  Please follow the instructions below to claim your access.")}</p>
 
-<p>Your redeem url is: [[Enter Redeem URL here from the attached CSV]]</p>
+# Translators: please translate the text inside [[ ]]. This is meant as a template for course teams to use.
+<p>${_("Your redeem url is: [[Enter Redeem URL here from the attached CSV]]")}</p>
 
-<p>${_("(1) Register for an account at <a href='https://{site_name}' >https://{site_name}</a>.").format(site_name=site_name)}<br>
+<p>${_("(1) Register for an account at {site_name}").format(site_name=u"<a href='https://{sn}'>https://{sn}</a>".format(sn=site_name))}<br>
 ${_("(2) Once registered, copy the redeem URL and paste it in your web browser.")}<br>
 ${_("(3) On the enrollment confirmation page, Click the 'Activate Enrollment Code' button. This will show the enrollment confirmation.")}<br>
-${_("(4) You should be able to click on 'view course' button or see your course on your student dashboard at <a href='https://{dashboard_url}'>https://{dashboard_url}</a>").format(dashboard_url=dashboard_url)}<br>
+${_("(4) You should be able to click on 'view course' button or see your course on your student dashboard at {url}").format(
+	 url=u"<a href='https://{dashboard_url}'>https://{dashboard_url}</a>".format(dashboard_url=dashboard_url)
+)}<br>
 ${_("(5) Course materials will not be available until the course start date.")}</p>
 
-<p>Sincerely,</p>
-<p>[[Your Signature]]</p>
+# Translators: please translate the text inside [[ ]]. This is meant as a template for course teams to use. Please also keep the <p> and </p> HTML tags in place.
+${_("<p>Sincerely,</p>"
+"<p>[[Your Signature]]</p>")}

lms/templates/emails/registration_codes_sale_email.txt

@@ -6,26 +6,29 @@ ${_("An invoice for {currency_symbol}{total_price} is attached. Payment is due i
 
 ${_("A CSV file of your registration codes is attached. Please distribute registration codes to each student planning to enroll using the email template below.")}
 
-${_("Thanks,")}
-${_("Your {platform_name} Team").format(platform_name=platform_name)}
+${_("Thanks,"
+"The {platform_name} Team").format(platform_name=platform_name)}
 
 
 ———————————————————————————————————————————
 
 
+# Translators: please translate the text inside [[ ]]. This is meant as a template for course teams to use.
 ${_("Dear [[Name]]:")}
 
 ${_("We have provided an enrollment for you in the course {course_name} from {platform_name}. Please follow the instructions below to claim your access.").format(course_name=course.display_name, platform_name=platform_name)}
 
+# Translators: please translate the text inside [[ ]]. This is meant as a template for course teams to use.
 ${_("Your redeem code is: [[Enter Redeem Code here from the attached CSV]]")}
 
-${_("(1) Register for an account at https://{site_name}.").format(site_name=site_name)}
-${_("(2) Once registered, navigate to https://{course_url}").format(course_url=course_url)}
+${_("(1) Register for an account at {site_name}.").format(site_name=u"https://{}".format(site_name))}
+${_("(2) Once registered, navigate to {course_url}").format(course_url=u"https://{}".format(course_url))}
 ${_("(3) Click 'Add {course_number} to Cart'").format(course_number=course.display_coursenumber)}
-${_("(4) On the shopping cart page, enter your redeem code and click apply code. This will make payment equal to $0.")}
+${_("(4) On the shopping cart page, enter your redeem code and click 'Apply Code'. This will make payment equal to $0.")}
 ${_("(5) Click 'Register'")}
-${_("(6) You should be able to see your course on your student dashboard at https://{dashboard_url}").format(dashboard_url=dashboard_url)}
+${_("(6) You should be able to see your course on your student dashboard at {dashboard_url}").format(dashboard_url=u"https://{}".format(dashboard_url))}
 ${_("(7) Course materials will not be available until the course start date.")}
 
-${_("Sincerely,")}
-${_("[[Your Signature]]")}
+# Translators: please translate the text inside [[ ]]. This is meant as a template for course teams to use.
+${_("Sincerely,"
+"[[Your Signature]]")}