Skip to content

E
edx-platform
Commit 0d1545a8 by Sarina Canelake
Options

Merge pull request #3214 from edx/sarina/remove-weird-i18n-strings 

Sarina/remove weird i18n strings
parents b18a0675 9a352b91
Showing with 139 additions and 62 deletions
common/static/coffee/src/discussion/views/discussion_content_view.coffee
......@@ -170,16 +170,17 @@ if Backbone?
buttonTextFmt =
if voted
ngettext(
"%(voteNum)s%(startSrSpan)s vote (click to remove your vote)%(endSrSpan)s",
"%(voteNum)s%(startSrSpan)s votes (click to remove your vote)%(endSrSpan)s",
"vote (click to remove your vote)",
"votes (click to remove your vote)",
voteNum
)
else
ngettext(
"%(voteNum)s%(startSrSpan)s vote (click to vote)%(endSrSpan)s",
"%(voteNum)s%(startSrSpan)s votes (click to vote)%(endSrSpan)s",
"vote (click to vote)",
"votes (click to vote)",
voteNum
)
buttonTextFmt = "%(voteNum)s%(startSrSpan)s " + buttonTextFmt + "%(endSrSpan)s"
buttonText = interpolate(
buttonTextFmt,
{voteNum: voteNum, startSrSpan: "<span class='sr'>", endSrSpan: "</span>"},
......
lms/static/js/Markdown.Editor.js
......@@ -27,8 +27,12 @@
// The text that appears on the upper part of the dialog box when
// entering links.
var linkDialogText = gettext("<p><b>Insert Hyperlink</b></p><p>http://example.com/ \"optional title\"</p>");
var imageDialogText = gettext("<p><b>Insert Image (upload file or type url)</b></p><p>http://example.com/images/diagram.jpg \"optional title\"<br><br></p>");
var linkDialogText = "<p><b>" + gettext("Insert Hyperlink") + "</b></p><p>http://example.com/ " +
// Translators: Please keep the quotation marks (") around this text
gettext("\"optional title\"") + "</p>";
var imageDialogText = "<p><b>" + gettext("Insert Image (upload file or type url)") + "</b></p><p>http://example.com/images/diagram.jpg " +
// Translators: Please keep the quotation marks (") around this text
gettext("\"optional title\"") + "<br><br></p>";
// The default text that appears in the dialog input box when entering
// links.
......
lms/templates/contact.html
......@@ -21,31 +21,49 @@
<p>${_("We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that&nbsp;class.")}</p>
<h2>${_("General Inquiries and Feedback")}</h2>
<p>${_('If you have a general question about {platform_name} please email <a href="mailto:{contact_email}">{contact_email}</a>. To see if your question has already been answered, visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may not have a chance to respond to every email, we take all feedback into consideration.').format(
platform_name=settings.PLATFORM_NAME,
contact_email=settings.CONTACT_EMAIL,
faq_link_start='<a href="{url}">'.format(url=reverse('faq_edx')),
faq_link_end='</a>',
fb_link_start='<a href="http://www.facebook.com/EdxOnline">',
fb_link_end='</a>'
)}</p>
<p>
${_('If you have a general question about {platform_name} please email '
'{contact_email}. To see if your question has already been answered, '
'visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the '
'discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may '
'not have a chance to respond to every email, we take all feedback into consideration.').format(
platform_name=settings.PLATFORM_NAME,
contact_email=u'<a href="mailto:{0}">{0}</a>'.format(settings.CONTACT_EMAIL),
faq_link_start=u'<a href="{url}">'.format(url=reverse('faq_edx')),
faq_link_end='</a>',
fb_link_start='<a href="http://www.facebook.com/EdxOnline">',
fb_link_end='</a>'
)}
</p>
<h2>${_("Technical Inquiries and Feedback")}</h2>
<p>${_('If you have suggestions/feedback about the overall {platform_name} platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at <a href="mailto:{tech_email}">{tech_email}</a>. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: <a href="mailto:{bugs_email}">{bugs_email}</a>.').format(
tech_email=settings.TECH_SUPPORT_EMAIL,
bug_email=settings.BUGS_EMAIL,
platform_name=settings.PLATFORM_NAME
)}</p>
<p>
${_('If you have suggestions/feedback about the overall {platform_name} platform, '
'or are facing general technical issues with the platform (e.g., issues with email '
'addresses and passwords), you can reach us at {tech_email}. For technical questions, '
'please make sure you are using a current version of Firefox or Chrome, and include '
'browser and version in your e-mail, as well as screenshots or other pertinent details. '
'If you find a bug or other issues, you can reach us at the following: {bugs_email}.').format(
tech_email=u'<a href="mailto:{0}">{0}</a>'.format(settings.TECH_SUPPORT_EMAIL),
bug_email=u'<a href="mailto:{0}">{0}</a>'.format(settings.BUGS_EMAIL),
platform_name=settings.PLATFORM_NAME
)}
</p>
<h2>${_("Media")}</h2>
<p>${_('Please visit our {link_start}media/press page{link_end} for more information. For any media or press inquiries, please email {email}.').format(
link_start='<a href="{url}">'.format(url=reverse('faq_edx')),
link_start=u'<a href="{url}">'.format(url=reverse('faq_edx')),
link_end='</a>',
email='<a href="mailto:press@edx.org">press@edx.org</a>',
email=u'<a href="mailto:press@edx.org">press@edx.org</a>',
)}</p>
<h2>${_("Universities")}</h2>
<p>${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.').format(email='<a href="mailto:university@edx.org">university@edx.org</a>', platform_name="edX")}</p>
<p>
${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.').format(
email=u'<a href="mailto:university@edx.org">university@edx.org</a>',
platform_name=settings.PLATFORM_NAME
)}
</p>
</div>
</section>
</section>
......
lms/templates/courseware/courseware-error.html
......@@ -13,7 +13,16 @@
<section class="container">
<section class="outside-app">
<h1>${_('There has been an error on the {span_start}{platform_name}{span_end} servers').format(platform_name=settings.PLATFORM_NAME, span_start='<span class="edx">', span_end='</span>')}</h1>
<p>${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at '<a href=\"mailto:{tech_support_email}\">{tech_support_email}</a>' to report any problems or downtime.").format(tech_support_email=settings.TECH_SUPPORT_EMAIL)}</p>
<h1>
${_('There has been an error on the {platform_name} servers').format(
platform_name=u'<span class="edx">{}</span>'.format(settings.PLATFORM_NAME)
)}
</h1>
<p>
${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix "
"it as soon as possible. Please email us at {tech_support_email}' to report any problems or downtime.").format(
tech_support_email=u'<a href=\"mailto:{0}\">{0}</a>'.format(settings.TECH_SUPPORT_EMAIL)
)}
</p>
</section>
</section>
lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html
......@@ -15,7 +15,10 @@
<ul class="reverify-list">
% for item in reverifications["must_reverify"]:
<li class="item">
${_('{course_name}: Re-verify by {date}').format(course_name="<strong>item.course_name</strong>", date=item.date)}
${_('{course_name}: Re-verify by {date}').format(
course_name=u"<strong>{0}</strong>".format(item.course_name),
date=item.date
)}
</li>
% endfor
</ul>
......@@ -39,7 +42,10 @@
% for item in reverifications["must_reverify"]:
<div class="copy">
<p class='activation-message'>
${_('To continue in the ID Verified track in {course_name}, you need to re-verify your identity by {date}.').format(course_name="<strong>" + item.course_name + "</strong>", date=item.date)}
${_('To continue in the ID Verified track in {course_name}, you need to re-verify your identity by {date}.').format(
course_name=u"<strong>{}</strong>".format(item.course_name),
date=item.date
)}
</p>
</div>
</div>
......@@ -65,9 +71,12 @@
% if item.display:
<div class="copy">
<p class='activation-message'>
${_('Your re-verification for {course_name} failed and you are no longer eligible for a Verified Certificate. If you think this is in error, please contact us at {email}.').format(course_name="<strong>" + item.course_name+ "</strong>", email='<a class="contact-link" href="mailto:{email}">{email}</a>'.format(
email=billing_email
))}
${_('Your re-verification for {course_name} failed and you are no longer eligible for a Verified Certificate. If you think this is in error, please contact us at {email}.').format(
course_name=u"<strong>{}</strong>".format(item.course_name),
email=u'<a class="contact-link" href="mailto:{email}">{email}</a>'.format(
email=billing_email
)
)}
</p>
</div>
</div>
......
lms/templates/enroll_students.html
......@@ -24,8 +24,3 @@ ${ rejected_students }
<p> ${_("Debug: ")}
<p> ${ debug }
<p> ${_("foo")}
<p> ${_("bar")}
<p> ${_("biff")}
lms/templates/help_modal.html
......@@ -27,7 +27,11 @@
</button>
<header>
<h2>${_('{span_start}{platform_name}{span_end} Help').format(span_start='<span class="edx">', span_end='</span>', platform_name=platform_name)}</h2>
<h2>
${_('{platform_name} Help').format(
platform_name=u'<span class="edx">{}</span>'.format(platform_name)
)}
</h2>
<hr>
</header>
......
lms/templates/module-error.html
<%! from django.utils.translation import ugettext as _ %>
<section class="outside-app">
<h1>${_("There has been an error on the <em>{platform_name}</em> servers").format(platform_name=settings.PLATFORM_NAME)}</h1>
<p>${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at <a href=\"mailto:{tech_support_email}\">{tech_support_email}</a> to report any problems or downtime.").format(platform_name=settings.PLATFORM_NAME, tech_support_email=settings.TECH_SUPPORT_EMAIL)}</p>
<h1>
${_("There has been an error on the {platform_name} servers").format(
platform_name=u"<em>{}</em>".format(settings.PLATFORM_NAME)
)}
</h1>
<p>
${_("We're sorry, this module is temporarily unavailable. Our staff is working "
"to fix it as soon as possible. Please email us at {tech_support_email} to "
"report any problems or downtime.").format(
tech_support_email=u"<a href=\"mailto:{0}\">{0}</a>".format(settings.TECH_SUPPORT_EMAIL)
)}
</p>
% if staff_access:
<h1>${_("Details")}</h1>
......
lms/templates/signup_modal.html
......@@ -20,7 +20,11 @@
<div id="register">
<header>
<h2>${_('Sign Up for {span_start}{platform_name}{span_end}').format(span_start='<span class="edx">', span_end='</span>', platform_name=settings.PLATFORM_NAME)}</h2>
<h2>
${_('Sign Up for {platform_name}').format(
platform_name=u'<span class="edx">{}</span>'.format(settings.PLATFORM_NAME)
)}
</h2>
<hr>
</header>
......@@ -31,26 +35,26 @@
<div class="input-group">
% if has_extauth_info is UNDEFINED:
<label data-field="email" for="signup_email">${_('E-mail *')}</label>
<label data-field="email" for="signup_email">${_('E-mail')} + ' *'</label>
<input id="signup_email" type="email" name="email" placeholder="${_('e.g. yourname@domain.com')}" required />
<label data-field="password" for="signup_password">${_('Password *')}</label>
<label data-field="password" for="signup_password">${_('Password')} + ' *'</label>
<input id="signup_password" type="password" name="password" placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;" required />
<label data-field="username" for="signup_username">${_('Public Username *')}</label>
<label data-field="username" for="signup_username">${_('Public Username')} + ' *'</label>
<input id="signup_username" type="text" name="username" placeholder="${_('e.g. yourname (shown on forums)')}" required />
<label data-field="name" for="signup_fullname">${_('Full Name *')}</label>
<label data-field="name" for="signup_fullname">${_('Full Name')} + ' *'</label>
<input id="signup_fullname" type="text" name="name" placeholder="${_('e.g. Your Name (for certificates)')}" required />
% else:
<p>${_('<i>Welcome</i> {name}').format(name=extauth_id)}</p><br/>
<p><i>${_('Enter a public username:')}</i></p>
<label data-field="username" for="signup_username">${_('Public Username *')}</label>
<label data-field="username" for="signup_username">${_('Public Username')} + ' *'</label>
<input id="signup_username" type="text" name="username" value="${extauth_username}" placeholder="${_('e.g. yourname (shown on forums)')}" required />
% if ask_for_email:
<label data-field="email" for="signup_email">${_('E-mail *')}</label>
<label data-field="email" for="signup_email">${_('E-mail')} + ' *'</label>
<input id="signup_email" type="email" name="email" placeholder="${_('e.g. yourname@domain.com')}" required />
% endif
......@@ -123,17 +127,17 @@
<div class="input-group">
<label data-field="terms_of_service" class="terms-of-service" for="signup_tos">
<input id="signup_tos" name="terms_of_service" type="checkbox" value="true">
${_('I agree to the {link_start}Terms of Service{link_end}*').format(
${_('I agree to the {link_start}Terms of Service{link_end}').format(
link_start='<a href="{url}" target="_blank">'.format(url=reverse('tos')),
link_end='</a>')}
link_end='</a>') + ' *'}
</label>
% if settings.REGISTRATION_EXTRA_FIELDS['honor_code'] != 'hidden':
<label data-field="honor_code" class="honor-code" for="signup_honor">
<input id="signup_honor" name="honor_code" type="checkbox" value="true">
${_('I agree to the {link_start}Honor Code{link_end}*').format(
${_('I agree to the {link_start}Honor Code{link_end}').format(
link_start='<a href="{url}" target="_blank">'.format(url=reverse('honor')),
link_end='</a>')}
link_end='</a>') + ' *'}
</label>
% endif
</div>
......
lms/templates/staff_problem_info.html
......@@ -35,7 +35,7 @@ ${block_content}
<label>${_("Comment")}</label>
<input id="${element_id}_xqa_entry" type="text" placeholder="${_('comment')}">
<label>${_("Tag")}</label>
<span style="color:black;vertical-align: -10pt">${_('Optional tag (eg "done" or "broken"):&nbsp; ')} </span>
<span style="color:black;vertical-align: -10pt">${_('Optional tag (eg "done" or "broken"):') + '&nbsp; '} </span>
<input id="${element_id}_xqa_tag" type="text" placeholder="${_('tag')}" style="width:80px;display:inline">
<div class="submit">
<button name="submit" type="submit">${_('Add comment')}</button>
......
lms/templates/static_templates/server-down.html
......@@ -2,6 +2,14 @@
<%inherit file="../main.html" />
<section class="outside-app">
<h1>${_("Currently the <em>{platform_name}</em> servers are down").format(platform_name=settings.PLATFORM_NAME)}</h1>
<p>${_("Our staff is currently working to get the site back up as soon as possible. Please email us at <a href=\"mailto:{tech_support_email}\">{tech_support_email}</a> to report any problems or downtime.").format(settings.TECH_SUPPORT_EMAIL)}</p>
<h1>
${_("Currently the {platform_name} servers are down").format(
platform_name=u"<em>{}</em>".format(settings.PLATFORM_NAME)
)}
</h1>
<p>
${_("Our staff is currently working to get the site back up as soon as possible. "
"Please email us at {tech_support_email} to report any problems or downtime.").format(
tech_support_email=u"<a href=\"mailto:{0}\">{0}</a>".format(settings.TECH_SUPPORT_EMAIL)
)}</p>
</section>
lms/templates/static_templates/server-error.html
......@@ -2,12 +2,16 @@
<%inherit file="../main.html" />
<section class="outside-app">
<h1>${_(u"There has been a 500 error on the <em>{platform_name}</em> servers").format(
platform_name=settings.PLATFORM_NAME
)}</h1>
<p>${_(u'Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.').format(
<h1>
${_(u"There has been a 500 error on the {platform_name} servers").format(
platform_name=u"<em>{}</em>".format(platform_name=settings.PLATFORM_NAME)
)}
</h1>
<p>
${_(u'Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.').format(
email=u'<a href="mailto:{email}">{email}</a>'.format(
email=settings.TECH_SUPPORT_EMAIL
)
)}</p>
)}
</p>
</section>
lms/templates/static_templates/server-overloaded.html
......@@ -2,6 +2,15 @@
<%inherit file="../main.html" />
<section class="outside-app">
<h1>${_("Currently the <em>{platform_name}</em> servers are overloaded").format(platform_name=settings.PLATFORM_NAME)}</h1>
<p>${_("Our staff is currently working to get the site back up as soon as possible. Please email us at <a href=\"mailto:{tech_support_email}\">{tech_support_email}</a> to report any problems or downtime.").format(tech_support_email=settings.TECH_SUPPORT_EMAIL)}</p>
<h1>
${_("Currently the {platform_name} servers are overloaded").format(
platform_name=u"<em>{}</em>".format(platform_name=settings.PLATFORM_NAME)
)}
</h1>
<p>
${_("Our staff is currently working to get the site back up as soon as possible. "
"Please email us at {tech_support_email} to report any problems or downtime.").format(
tech_support_email=u"<a href=\"mailto:{0}\">{0}</a>".format(tech_support_email=settings.TECH_SUPPORT_EMAIL)
)}
</p>
</section>
lms/templates/verify_student/midcourse_reverify_dash.html
......@@ -25,7 +25,7 @@
<h3 class="course-name">${item.course_name} (${item.course_number})</h3>
<p class="deadline">${_('Re-verify by {date}').format(date="<strong>" + item.date + "</strong>")}</p>
</div>
<p class="reverify-status"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify', kwargs={'course_id': item.course_id})}">Re-verify for ${item.course_number}</a></p>
<p class="reverify-status"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify', kwargs={'course_id': item.course_id})}">Re-verify for ${item.course_number}</a></p>
</li>
% endfor
</ul>
......@@ -42,7 +42,7 @@
<h3 class="course-name">${item.course_name} (${item.course_number})</h3>
<p class="deadline">${_('Re-verify by {date}').format(date="<strong>" + item.date + "</strong>")}</p>
</div>
<p class="reverify-status"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify', kwargs={'course_id': item.course_id})}">Re-verify for ${item.course_number}</a></p>
<p class="reverify-status"><a class="btn action-primary action-reverify" href="${reverse('verify_student_midcourse_reverify', kwargs={'course_id': item.course_id})}">Re-verify for ${item.course_number}</a></p>
</li>
% endfor
</ul>
......@@ -94,12 +94,14 @@
% endif
% if reverifications["must_reverify"]:
<p class="support">${_("Don't want to re-verify right now? {a_start}Return to where you left off{a_end}").format(
<p class="support">${_("Don't want to re-verify right now?") + u" {a_start}{text}{a_end}".format(
text=_("Return to where you left off"),
a_start='<a href="{url}">'.format(url=referer),
a_end="</a>",
)}</p>
% else:
<p class="support">${_("{a_start}Return to where you left off{a_end}").format(
<p class="support">${u"{a_start}{text}{a_end}".format(
text=_("Return to where you left off"),
a_start='<a href="{url}">'.format(url=referer),
a_end="</a>",
)}</p>
......
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