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

Merge pull request #2139 from edx/ned/add-apostrophe-to-lorem

Browse Source 
Add apostrophe to lorem and fix single-quoted strings
This commit is contained in:
Ned Batchelder
2014-01-13 13:48:23 -08:00
parent bd079648e2 fd13908b90
commit c4792e667e
9 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/templates/component.html
View File

@@ -31,6 +31,6 @@
<a href="#" class="edit-button standard"><span class="edit-icon"></span>${_("Edit")}</a>
<a href="#" class="delete-button standard"><span class="delete-icon"></span>${_("Delete")}</a>
</div>
<span data-tooltip='${_("Drag to reorder")}' class="drag-handle"></span>
<span data-tooltip="${_("Drag to reorder")}" class="drag-handle"></span>
${preview}

16
cms/templates/import.html
View File

@@ -163,10 +163,10 @@ var allStats = $('#status-infos');
var feedbackUrl = "${import_status_url}";
var defaults = [
'${_("There was an error during the upload process.")}\n',
'${_("There was an error while unpacking the file.")}\n',
'${_("There was an error while verifying the file you submitted.")}\n',
'${_("There was an error while importing the new course to our database.")}\n'
"${_("There was an error during the upload process.")}\n",
"${_("There was an error while unpacking the file.")}\n",
"${_("There was an error while verifying the file you submitted.")}\n",
"${_("There was an error while importing the new course to our database.")}\n"
];
$('#fileupload').fileupload({
@@ -201,12 +201,12 @@ $('#fileupload').fileupload({
CourseImport.stageError(stage, defaults[stage] + errMsg);
}
else {
alert('${_("Your import has failed.")}\n\n' + errMsg);
alert("${_("Your import has failed.")}\n\n" + errMsg);
}
chooseBtn.html('${_("Choose new file")}').show();
chooseBtn.html("${_("Choose new file")}").show();
bar.hide();
}
chooseBtn.html('${_("Choose new file")}').show();
chooseBtn.html("${_("Choose new file")}").show();
bar.hide();
});
});
@@ -243,7 +243,7 @@ $('#fileupload').fileupload({
},
start: function(e) {
window.onbeforeunload = function() {
return '${_("Your import is in progress; navigating away will abort it.")}';
return "${_("Your import is in progress; navigating away will abort it.")}";
}
},
sequentialUploads: true,

16
cms/templates/widgets/problem-edit.html
View File

@@ -7,24 +7,24 @@
%if enable_markdown:
<div class="editor-bar">
<ul class="format-buttons">
<li><a href="#" class="header-button" data-tooltip='${_("Heading 1")}'><span
<li><a href="#" class="header-button" data-tooltip="${_("Heading 1")}"><span
class="problem-editor-icon heading1"></span></a></li>
<li><a href="#" class="multiple-choice-button" data-tooltip='${_("Multiple Choice")}'><span
<li><a href="#" class="multiple-choice-button" data-tooltip="${_("Multiple Choice")}"><span
class="problem-editor-icon multiple-choice"></span></a></li>
<li><a href="#" class="checks-button" data-tooltip='${_("Checkboxes")}'><span
<li><a href="#" class="checks-button" data-tooltip="${_("Checkboxes")}"><span
class="problem-editor-icon checks"></span></a></li>
<li><a href="#" class="string-button" data-tooltip='${_("Text Input")}'><span
<li><a href="#" class="string-button" data-tooltip="${_("Text Input")}"><span
class="problem-editor-icon string"></span></a></li>
<li><a href="#" class="number-button" data-tooltip='${_("Numerical Input")}'><span
<li><a href="#" class="number-button" data-tooltip="${_("Numerical Input")}"><span
class="problem-editor-icon number"></span></a></li>
<li><a href="#" class="dropdown-button" data-tooltip='${_("Dropdown")}'><span
<li><a href="#" class="dropdown-button" data-tooltip="${_("Dropdown")}"><span
class="problem-editor-icon dropdown"></span></a></li>
<li><a href="#" class="explanation-button" data-tooltip='${_("Explanation")}'><span
<li><a href="#" class="explanation-button" data-tooltip="${_("Explanation")}"><span
class="problem-editor-icon explanation"></span></a></li>
</ul>
<ul class="editor-tabs">
<li><a href="#" class="xml-tab advanced-toggle" data-tab="xml">${_("Advanced Editor")}</a></li>
<li><a href="#" class="cheatsheet-toggle" data-tooltip='${_("Toggle Cheatsheet")}'>?</a></li>
<li><a href="#" class="cheatsheet-toggle" data-tooltip="${_("Toggle Cheatsheet")}">?</a></li>
</ul>
</div>
<textarea class="markdown-box">${markdown | h}</textarea>

4
cms/templates/widgets/sock.html
View File

@@ -22,7 +22,7 @@
<ul class="list-actions">
<li class="action-item">
<a href="http://files.edx.org/Getting_Started_with_Studio.pdf" class="action action-primary" title='${_("This is a PDF Document")}'>${_("Download Studio Documentation")}</a>
<a href="http://files.edx.org/Getting_Started_with_Studio.pdf" class="action action-primary" title="${_("This is a PDF Document")}">${_("Download Studio Documentation")}</a>
<span class="tip">${_("How to use Studio to build your course")}</span>
</li>
<li class="action-item">
@@ -46,7 +46,7 @@
<ul class="list-actions">
<li class="action-item">
<a href="http://help.edge.edx.org/discussion/new" class="action action-primary show-tender" title='${_("Use our feedback tool, Tender, to share your feedback")}'><i class="icon-comments"></i>${_("Contact Us")}</a>
<a href="http://help.edge.edx.org/discussion/new" class="action action-primary show-tender" title="${_("Use our feedback tool, Tender, to share your feedback")}"><i class="icon-comments"></i>${_("Contact Us")}</a>
</li>
</ul>
</div>