Skip to content

E
edx-platform
Commit 240d91da by Calen Pennington
Options

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 

Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
parents 16faafde 9407102b
Showing with 1287 additions and 334 deletions
AUTHORS
...@@ -143,3 +143,6 @@ Jonas Jelten <jelten@in.tum.de> ...@@ -143,3 +143,6 @@ Jonas Jelten <jelten@in.tum.de>
Christine Lytwynec <clytwynec@edx.org> Christine Lytwynec <clytwynec@edx.org>
John Cox <johncox@google.com> John Cox <johncox@google.com>
Ben Weeks <benweeks@mit.edu> Ben Weeks <benweeks@mit.edu>
David Bodor <david.gabor.bodor@gmail.com>
Sébastien Hinderer <Sebastien.Hinderer@inria.fr>
CHANGELOG.rst
...@@ -9,6 +9,10 @@ Studio: Add drag-and-drop support to the container page. STUD-1309. ...@@ -9,6 +9,10 @@ Studio: Add drag-and-drop support to the container page. STUD-1309.
Common: Add extensible third-party auth module. Common: Add extensible third-party auth module.
LMS: Switch default instructor dashboard to the new (formerly "beta")
instructor dashboard. Puts the old (now "legacy") dash behind a feature flag.
LMS-1296
Blades: Handle situation if no response were sent from XQueue to LMS in Matlab Blades: Handle situation if no response were sent from XQueue to LMS in Matlab
problem after Run Code button press. BLD-994. problem after Run Code button press. BLD-994.
......
cms/djangoapps/contentstore/management/commands/tests/test_import.py
...@@ -23,8 +23,26 @@ class TestImport(ModuleStoreTestCase): ...@@ -23,8 +23,26 @@ class TestImport(ModuleStoreTestCase):
Unit tests for importing a course from command line Unit tests for importing a course from command line
""" """
<<<<<<< HEAD
COURSE_KEY = SlashSeparatedCourseKey(u'edX', u'test_import_course', u'2013_Spring') COURSE_KEY = SlashSeparatedCourseKey(u'edX', u'test_import_course', u'2013_Spring')
DIFF_KEY = SlashSeparatedCourseKey(u'edX', u'test_import_course', u'2014_Spring') DIFF_KEY = SlashSeparatedCourseKey(u'edX', u'test_import_course', u'2014_Spring')
=======
BASE_COURSE_ID = ['EDx', '0.00x', '2013_Spring', ]
DIFF_RUN = ['EDx', '0.00x', '2014_Spring', ]
TRUNCATED_COURSE = ['EDx', '0.00', '2014_Spring', ]
def create_course_xml(self, content_dir, course_id):
directory = tempfile.mkdtemp(dir=content_dir)
os.makedirs(os.path.join(directory, "course"))
with open(os.path.join(directory, "course.xml"), "w+") as f:
f.write('<course url_name="{0[2]}" org="{0[0]}" '
'course="{0[1]}"/>'.format(course_id))
with open(os.path.join(directory, "course", "{0[2]}.xml".format(course_id)), "w+") as f:
f.write('<course></course>')
return directory
>>>>>>> edx/master
def setUp(self): def setUp(self):
""" """
...@@ -35,6 +53,7 @@ class TestImport(ModuleStoreTestCase): ...@@ -35,6 +53,7 @@ class TestImport(ModuleStoreTestCase):
self.addCleanup(shutil.rmtree, self.content_dir) self.addCleanup(shutil.rmtree, self.content_dir)
# Create good course xml # Create good course xml
<<<<<<< HEAD
self.good_dir = tempfile.mkdtemp(dir=self.content_dir) self.good_dir = tempfile.mkdtemp(dir=self.content_dir)
os.makedirs(os.path.join(self.good_dir, "course")) os.makedirs(os.path.join(self.good_dir, "course"))
with open(os.path.join(self.good_dir, "course.xml"), "w+") as f: with open(os.path.join(self.good_dir, "course.xml"), "w+") as f:
...@@ -53,14 +72,30 @@ class TestImport(ModuleStoreTestCase): ...@@ -53,14 +72,30 @@ class TestImport(ModuleStoreTestCase):
with open(os.path.join(self.dupe_dir, "course", "{0.run}.xml".format(self.DIFF_KEY)), "w+") as f: with open(os.path.join(self.dupe_dir, "course", "{0.run}.xml".format(self.DIFF_KEY)), "w+") as f:
f.write('<course></course>') f.write('<course></course>')
=======
self.good_dir = self.create_course_xml(self.content_dir, self.BASE_COURSE_ID)
# Create run changed course xml
self.dupe_dir = self.create_course_xml(self.content_dir, self.DIFF_RUN)
# Create course XML where TRUNCATED_COURSE.org == BASE_COURSE_ID.org
# and BASE_COURSE_ID.startswith(TRUNCATED_COURSE.course)
self.course_dir = self.create_course_xml(self.content_dir, self.TRUNCATED_COURSE)
>>>>>>> edx/master
def test_forum_seed(self): def test_forum_seed(self):
""" """
Tests that forum roles were created with import. Tests that forum roles were created with import.
""" """
<<<<<<< HEAD
self.assertFalse(are_permissions_roles_seeded(self.COURSE_KEY)) self.assertFalse(are_permissions_roles_seeded(self.COURSE_KEY))
call_command('import', self.content_dir, self.good_dir) call_command('import', self.content_dir, self.good_dir)
self.assertTrue(are_permissions_roles_seeded(self.COURSE_KEY)) self.assertTrue(are_permissions_roles_seeded(self.COURSE_KEY))
=======
self.assertFalse(are_permissions_roles_seeded('/'.join(self.BASE_COURSE_ID)))
call_command('import', self.content_dir, self.good_dir)
self.assertTrue(are_permissions_roles_seeded('/'.join(self.BASE_COURSE_ID)))
>>>>>>> edx/master
def test_duplicate_with_url(self): def test_duplicate_with_url(self):
""" """
...@@ -71,9 +106,33 @@ class TestImport(ModuleStoreTestCase): ...@@ -71,9 +106,33 @@ class TestImport(ModuleStoreTestCase):
# Load up base course and verify it is available # Load up base course and verify it is available
call_command('import', self.content_dir, self.good_dir) call_command('import', self.content_dir, self.good_dir)
store = modulestore() store = modulestore()
<<<<<<< HEAD
self.assertIsNotNone(store.get_course(self.COURSE_KEY)) self.assertIsNotNone(store.get_course(self.COURSE_KEY))
# Now load up duped course and verify it doesn't load # Now load up duped course and verify it doesn't load
call_command('import', self.content_dir, self.dupe_dir) call_command('import', self.content_dir, self.dupe_dir)
self.assertIsNone(store.get_course(self.DIFF_KEY)) self.assertIsNone(store.get_course(self.DIFF_KEY))
self.assertTrue(are_permissions_roles_seeded(self.COURSE_KEY)) self.assertTrue(are_permissions_roles_seeded(self.COURSE_KEY))
=======
self.assertIsNotNone(store.get_course('/'.join(self.BASE_COURSE_ID)))
# Now load up duped course and verify it doesn't load
call_command('import', self.content_dir, self.dupe_dir)
self.assertIsNone(store.get_course('/'.join(self.DIFF_RUN)))
def test_truncated_course_with_url(self):
"""
Check to make sure an import only blocks true duplicates: new
courses with similar but not unique org/course combinations aren't
blocked if the original course's course starts with the new course's
org/course combinations (i.e. EDx/0.00x/Spring -> EDx/0.00/Spring)
"""
# Load up base course and verify it is available
call_command('import', self.content_dir, self.good_dir)
store = modulestore()
self.assertIsNotNone(store.get_course('/'.join(self.BASE_COURSE_ID)))
# Now load up the course with a similar course_id and verify it loads
call_command('import', self.content_dir, self.course_dir)
self.assertIsNotNone(store.get_course('/'.join(self.TRUNCATED_COURSE)))
>>>>>>> edx/master
cms/djangoapps/contentstore/tests/test_import.py
...@@ -65,17 +65,47 @@ class ContentStoreImportTest(ModuleStoreTestCase): ...@@ -65,17 +65,47 @@ class ContentStoreImportTest(ModuleStoreTestCase):
def load_test_import_course(self): def load_test_import_course(self):
''' '''
Load the standard course used to test imports (for do_import_static=False behavior). Load the standard course used to test imports
(for do_import_static=False behavior).
''' '''
content_store = contentstore() content_store = contentstore()
module_store = modulestore('direct') module_store = modulestore('direct')
<<<<<<< HEAD
import_from_xml(module_store, 'common/test/data/', ['test_import_course'], static_content_store=content_store, do_import_static=False, verbose=True) import_from_xml(module_store, 'common/test/data/', ['test_import_course'], static_content_store=content_store, do_import_static=False, verbose=True)
course_id = SlashSeparatedCourseKey('edX', 'test_import_course', '2012_Fall') course_id = SlashSeparatedCourseKey('edX', 'test_import_course', '2012_Fall')
course = module_store.get_course(course_id) course = module_store.get_course(course_id)
=======
import_from_xml(
module_store,
'common/test/data/',
['test_import_course'],
static_content_store=content_store,
do_import_static=False,
verbose=True,
)
course_location = CourseDescriptor.id_to_location(
'edX/test_import_course/2012_Fall'
)
course = module_store.get_item(course_location)
>>>>>>> edx/master
self.assertIsNotNone(course) self.assertIsNotNone(course)
return module_store, content_store, course return module_store, content_store, course
def test_import_course_into_similar_namespace(self):
# Checks to make sure that a course with an org/course like
# edx/course can be imported into a namespace with an org/course
# like edx/course_name
module_store, __, __, course_location = self.load_test_import_course()
__, course_items = import_from_xml(
module_store,
'common/test/data',
['test_import_course_2'],
target_location_namespace=course_location,
verbose=True,
)
self.assertEqual(len(course_items), 1)
def test_unicode_chars_in_course_name_import(self): def test_unicode_chars_in_course_name_import(self):
""" """
# Test that importing course with unicode 'id' and 'display name' doesn't give UnicodeEncodeError # Test that importing course with unicode 'id' and 'display name' doesn't give UnicodeEncodeError
......
cms/envs/devstack.py
...@@ -59,7 +59,8 @@ DEBUG_TOOLBAR_PANELS = ( ...@@ -59,7 +59,8 @@ DEBUG_TOOLBAR_PANELS = (
) )
DEBUG_TOOLBAR_CONFIG = { DEBUG_TOOLBAR_CONFIG = {
'INTERCEPT_REDIRECTS': False 'INTERCEPT_REDIRECTS': False,
'SHOW_TOOLBAR_CALLBACK': lambda _: True,
} }
# To see stacktraces for MongoDB queries, set this to True. # To see stacktraces for MongoDB queries, set this to True.
......
cms/static/sass/elements/_modal-window.scss
...@@ -179,10 +179,6 @@ ...@@ -179,10 +179,6 @@
height: 365px; height: 365px;
} }
&.modal-type-problem .CodeMirror {
height: 435px;
}
.wrapper-comp-settings { .wrapper-comp-settings {
.list-input { .list-input {
......
common/lib/capa/capa/capa_problem.py
...@@ -429,16 +429,16 @@ class LoncapaProblem(object): ...@@ -429,16 +429,16 @@ class LoncapaProblem(object):
def do_targeted_feedback(self, tree): def do_targeted_feedback(self, tree):
""" """
Implements the targeted-feedback=N in-place on <multiplechoiceresponse> -- Implements targeted-feedback in-place on <multiplechoiceresponse> --
choice-level explanations shown to a student after submission. choice-level explanations shown to a student after submission.
Does nothing if there is no targeted-feedback attribute. Does nothing if there is no targeted-feedback attribute.
""" """
for mult_choice_response in tree.xpath('//multiplechoiceresponse[@targeted-feedback]'): # Note that the modifications has been done, avoiding problems if called twice.
# Note that the modifications has been done, avoiding problems if called twice. if hasattr(self, 'has_targeted'):
if hasattr(self, 'has_targeted'): return
continue self.has_targeted = True # pylint: disable=W0201
self.has_targeted = True # pylint: disable=W0201
for mult_choice_response in tree.xpath('//multiplechoiceresponse[@targeted-feedback]'):
show_explanation = mult_choice_response.get('targeted-feedback') == 'alwaysShowCorrectChoiceExplanation' show_explanation = mult_choice_response.get('targeted-feedback') == 'alwaysShowCorrectChoiceExplanation'
# Grab the first choicegroup (there should only be one within each <multiplechoiceresponse> tag) # Grab the first choicegroup (there should only be one within each <multiplechoiceresponse> tag)
......
common/lib/capa/capa/templates/matlabinput.html
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="external-grader-message" aria-live="polite"> <div class="external-grader-message" aria-live="polite">
${msg|n} ${msg|n}
</div> </div>
<div class="external-grader-message" aria-live="polite"> <div class="external-grader-message ungraded-matlab-result" aria-live="polite">
${queue_msg|n} ${queue_msg|n}
</div> </div>
...@@ -55,13 +55,11 @@ ...@@ -55,13 +55,11 @@
if($(parent_elt).find('.capa_alert').length) { if($(parent_elt).find('.capa_alert').length) {
$(parent_elt).find('.capa_alert').remove(); $(parent_elt).find('.capa_alert').remove();
} }
var alert_elem = "<div>" + msg + "</div>"; var alert_elem = $("<div>" + msg + "</div>");
alert_elem = $(alert_elem).addClass('capa_alert'); alert_elem.addClass('capa_alert').addClass('is-fading-in');
$(parent_elt).find('.action').after(alert_elem); $(parent_elt).find('.action').after(alert_elem);
$(parent_elt).find('.capa_alert').css({opacity: 0}).animate({opacity: 1}, 700);
} }
// hook up the plot button // hook up the plot button
var plot = function(event) { var plot = function(event) {
var problem_elt = $(event.target).closest('.problems-wrapper'); var problem_elt = $(event.target).closest('.problems-wrapper');
...@@ -72,7 +70,7 @@ ...@@ -72,7 +70,7 @@
// since there could be multiple codemirror instances on the page, // since there could be multiple codemirror instances on the page,
// save all of them. // save all of them.
$('.CodeMirror').each(function(i, el){ $('.CodeMirror').each(function(i, el){
el.CodeMirror.save(); el.CodeMirror.save();
}); });
var input = $("#input_${id}"); var input = $("#input_${id}");
...@@ -81,33 +79,39 @@ ...@@ -81,33 +79,39 @@
answer = input.serialize(); answer = input.serialize();
// setup callback for after we send information to plot // a chain of callbacks, each querying the server on success of the previous one
var get_callback = function(response) {
var new_result_elem = $(response.html).find(".ungraded-matlab-result");
new_result_elem.addClass("is-fading-in");
result_elem = $(problem_elt).find(".ungraded-matlab-result");
result_elem.replaceWith(new_result_elem);
console.log(response.html);
}
var plot_callback = function(response) { var plot_callback = function(response) {
if(response.success) { if(response.success) {
window.location.reload(); $.postWithPrefix(url + "/problem_get", get_callback);
} } else {
else {
gentle_alert(problem_elt, response.message); gentle_alert(problem_elt, response.message);
} }
} }
var save_callback = function(response) { var save_callback = function(response) {
if(response.success) { if(response.success) {
// send information to the problem's plot functionality // send information to the problem's plot functionality
Problem.inputAjax(url, input_id, 'plot', Problem.inputAjax(url, input_id, 'plot',
{'submission': submission}, plot_callback); {'submission': submission}, plot_callback);
} }
else { else {
gentle_alert(problem_elt, response.message); gentle_alert(problem_elt, response.message);
} }
} }
// save the answer // save the answer
$.postWithPrefix(url + '/problem_save', answer, save_callback); $.postWithPrefix(url + '/problem_save', answer, save_callback);
} }
$('#plot_${id}').click(plot); $('#plot_${id}').click(plot);
}); });
</script> </script>
</section> </section>
common/lib/capa/capa/tests/__init__.py
...@@ -57,3 +57,15 @@ def test_capa_system(): ...@@ -57,3 +57,15 @@ def test_capa_system():
def new_loncapa_problem(xml, capa_system=None, seed=723): def new_loncapa_problem(xml, capa_system=None, seed=723):
"""Construct a `LoncapaProblem` suitable for unit tests.""" """Construct a `LoncapaProblem` suitable for unit tests."""
return LoncapaProblem(xml, id='1', seed=seed, capa_system=capa_system or test_capa_system()) return LoncapaProblem(xml, id='1', seed=seed, capa_system=capa_system or test_capa_system())
def load_fixture(relpath):
"""
Return a `unicode` object representing the contents
of the fixture file at the given path within a test_files directory
in the same directory as the test file.
"""
abspath = os.path.join(os.path.dirname(__file__), 'test_files', relpath)
with open(abspath) as fixture_file:
contents = fixture_file.read()
return contents.decode('utf8')
common/lib/capa/capa/tests/test_files/targeted_feedback.xml 0 → 100644
<problem>
<p>What is the correct answer?</p>
<multiplechoiceresponse targeted-feedback="">
<choicegroup type="MultipleChoice">
<choice correct="false" explanation-id="feedback1">wrong-1</choice>
<choice correct="false" explanation-id="feedback2">wrong-2</choice>
<choice correct="true" explanation-id="feedbackC">correct-1</choice>
<choice correct="false" explanation-id="feedback3">wrong-3</choice>
</choicegroup>
</multiplechoiceresponse>
<targetedfeedbackset>
<targetedfeedback explanation-id="feedback1">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 1st WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedback2">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 2nd WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedback3">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 3rd WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedbackC">
<div class="detailed-targeted-feedback-correct">
<p>Targeted Feedback</p>
<p>Feedback on your correct solution...</p>
</div>
</targetedfeedback>
</targetedfeedbackset>
<solution explanation-id="feedbackC">
<div class="detailed-solution">
<p>Explanation</p>
<p>This is the solution explanation</p>
<p>Not much to explain here, sorry!</p>
</div>
</solution>
</problem>
\ No newline at end of file
common/lib/capa/capa/tests/test_files/targeted_feedback_multiple.xml 0 → 100644
<problem>
<p>Q1</p>
<multiplechoiceresponse targeted-feedback="">
<choicegroup type="MultipleChoice">
<choice correct="false" explanation-id="feedback1">wrong-1</choice>
<choice correct="false" explanation-id="feedback2">wrong-2</choice>
<choice correct="true" explanation-id="feedbackC">correct-1</choice>
<choice correct="false" explanation-id="feedback3">wrong-3</choice>
</choicegroup>
</multiplechoiceresponse>
<targetedfeedbackset>
<targetedfeedback explanation-id="feedback1">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 1st WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedback3">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 3rd WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedbackC">
<div class="detailed-targeted-feedback-correct">
<p>Targeted Feedback</p>
<p>Feedback on your correct solution...</p>
</div>
</targetedfeedback>
</targetedfeedbackset>
<solutionset>
<solution explanation-id="feedbackC">
<div class="detailed-solution">
<p>Explanation</p>
<p>This is the solution explanation</p>
<p>Not much to explain here, sorry!</p>
</div>
</solution>
</solutionset>
<hr/>
<p>Q2</p>
<multiplechoiceresponse targeted-feedback="">
<choicegroup type="MultipleChoice" answer-pool="3">
<choice correct="false" explanation-id="feedback1">wrong-1</choice>
<choice correct="false" explanation-id="feedback2">wrong-2</choice>
<choice correct="true" explanation-id="feedbackC">correct-1</choice>
<choice correct="false" explanation-id="feedback3">wrong-3</choice>
</choicegroup>
</multiplechoiceresponse>
<targetedfeedbackset>
<targetedfeedback explanation-id="feedback1">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 1st WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedback3">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 3rd WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedbackC">
<div class="detailed-targeted-feedback-correct">
<p>Targeted Feedback</p>
<p>Feedback on your correct solution...</p>
</div>
</targetedfeedback>
</targetedfeedbackset>
<solutionset>
<solution explanation-id="feedbackC">
<div class="detailed-solution">
<p>Explanation</p>
<p>This is the solution explanation</p>
<p>Not much to explain here, sorry!</p>
</div>
</solution>
</solutionset>
</problem>
\ No newline at end of file
common/lib/capa/capa/tests/test_responsetypes.py
...@@ -13,7 +13,7 @@ import textwrap ...@@ -13,7 +13,7 @@ import textwrap
import requests import requests
import mock import mock
from . import new_loncapa_problem, test_capa_system from . import new_loncapa_problem, test_capa_system, load_fixture
import calc import calc
from capa.responsetypes import LoncapaProblemError, \ from capa.responsetypes import LoncapaProblemError, \
...@@ -224,7 +224,7 @@ class SymbolicResponseTest(ResponseTest): ...@@ -224,7 +224,7 @@ class SymbolicResponseTest(ResponseTest):
for (input_str, input_mathml, server_fixture) in correct_inputs: for (input_str, input_mathml, server_fixture) in correct_inputs:
print "Testing input: {0}".format(input_str) print "Testing input: {0}".format(input_str)
server_resp = self._load_fixture(server_fixture) server_resp = load_fixture(server_fixture)
self._assert_symbolic_grade( self._assert_symbolic_grade(
problem, input_str, input_mathml, problem, input_str, input_mathml,
'correct', snuggletex_resp=server_resp 'correct', snuggletex_resp=server_resp
...@@ -253,8 +253,8 @@ class SymbolicResponseTest(ResponseTest): ...@@ -253,8 +253,8 @@ class SymbolicResponseTest(ResponseTest):
options=["matrix", "imaginary"] options=["matrix", "imaginary"]
) )
correct_snuggletex = self._load_fixture('snuggletex_correct.html') correct_snuggletex = load_fixture('snuggletex_correct.html')
dynamath_input = self._load_fixture('dynamath_input.txt') dynamath_input = load_fixture('dynamath_input.txt')
student_response = "cos(theta)*[[1,0],[0,1]] + i*sin(theta)*[[0,1],[1,0]]" student_response = "cos(theta)*[[1,0],[0,1]] + i*sin(theta)*[[0,1],[1,0]]"
self._assert_symbolic_grade( self._assert_symbolic_grade(
...@@ -269,7 +269,7 @@ class SymbolicResponseTest(ResponseTest): ...@@ -269,7 +269,7 @@ class SymbolicResponseTest(ResponseTest):
expect="[[cos(theta),i*sin(theta)],[i*sin(theta),cos(theta)]]", expect="[[cos(theta),i*sin(theta)],[i*sin(theta),cos(theta)]]",
options=["matrix", "imaginary"]) options=["matrix", "imaginary"])
wrong_snuggletex = self._load_fixture('snuggletex_wrong.html') wrong_snuggletex = load_fixture('snuggletex_wrong.html')
dynamath_input = textwrap.dedent(""" dynamath_input = textwrap.dedent("""
<math xmlns="http://www.w3.org/1998/Math/MathML"> <math xmlns="http://www.w3.org/1998/Math/MathML">
<mstyle displaystyle="true"><mn>2</mn></mstyle> <mstyle displaystyle="true"><mn>2</mn></mstyle>
...@@ -315,18 +315,6 @@ class SymbolicResponseTest(ResponseTest): ...@@ -315,18 +315,6 @@ class SymbolicResponseTest(ResponseTest):
correct_map.get_correctness('1_2_1'), expected_correctness correct_map.get_correctness('1_2_1'), expected_correctness
) )
@staticmethod
def _load_fixture(relpath):
"""
Return a `unicode` object representing the contents
of the fixture file at `relpath` (relative to the test files dir)
"""
abspath = os.path.join(os.path.dirname(__file__), 'test_files', relpath)
with open(abspath) as fixture_file:
contents = fixture_file.read()
return contents.decode('utf8')
class OptionResponseTest(ResponseTest): class OptionResponseTest(ResponseTest):
from capa.tests.response_xml_factory import OptionResponseXMLFactory from capa.tests.response_xml_factory import OptionResponseXMLFactory
......
common/lib/capa/capa/tests/test_targeted_feedback.py
...@@ -5,7 +5,7 @@ i.e. those with the <multiplechoiceresponse> element ...@@ -5,7 +5,7 @@ i.e. those with the <multiplechoiceresponse> element
import unittest import unittest
import textwrap import textwrap
from . import test_capa_system, new_loncapa_problem from . import test_capa_system, new_loncapa_problem, load_fixture
class CapaTargetedFeedbackTest(unittest.TestCase): class CapaTargetedFeedbackTest(unittest.TestCase):
...@@ -80,62 +80,8 @@ class CapaTargetedFeedbackTest(unittest.TestCase): ...@@ -80,62 +80,8 @@ class CapaTargetedFeedbackTest(unittest.TestCase):
self.assertRegexpMatches(without_new_lines, r"<div>.*'wrong-1'.*'wrong-2'.*'correct-1'.*'wrong-3'.*</div>") self.assertRegexpMatches(without_new_lines, r"<div>.*'wrong-1'.*'wrong-2'.*'correct-1'.*'wrong-3'.*</div>")
self.assertRegexpMatches(without_new_lines, r"feedback1|feedback2|feedback3|feedbackC") self.assertRegexpMatches(without_new_lines, r"feedback1|feedback2|feedback3|feedbackC")
# A targeted-feedback problem shared for a few tests
common_targeted_xml = textwrap.dedent("""
<problem>
<p>What is the correct answer?</p>
<multiplechoiceresponse targeted-feedback="">
<choicegroup type="MultipleChoice">
<choice correct="false" explanation-id="feedback1">wrong-1</choice>
<choice correct="false" explanation-id="feedback2">wrong-2</choice>
<choice correct="true" explanation-id="feedbackC">correct-1</choice>
<choice correct="false" explanation-id="feedback3">wrong-3</choice>
</choicegroup>
</multiplechoiceresponse>
<targetedfeedbackset>
<targetedfeedback explanation-id="feedback1">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 1st WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedback2">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 2nd WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedback3">
<div class="detailed-targeted-feedback">
<p>Targeted Feedback</p>
<p>This is the 3rd WRONG solution</p>
</div>
</targetedfeedback>
<targetedfeedback explanation-id="feedbackC">
<div class="detailed-targeted-feedback-correct">
<p>Targeted Feedback</p>
<p>Feedback on your correct solution...</p>
</div>
</targetedfeedback>
</targetedfeedbackset>
<solution explanation-id="feedbackC">
<div class="detailed-solution">
<p>Explanation</p>
<p>This is the solution explanation</p>
<p>Not much to explain here, sorry!</p>
</div>
</solution>
</problem>
""")
def test_targeted_feedback_not_finished(self): def test_targeted_feedback_not_finished(self):
problem = new_loncapa_problem(self.common_targeted_xml) problem = new_loncapa_problem(load_fixture('targeted_feedback.xml'))
the_html = problem.get_html() the_html = problem.get_html()
without_new_lines = the_html.replace("\n", "") without_new_lines = the_html.replace("\n", "")
...@@ -144,7 +90,7 @@ class CapaTargetedFeedbackTest(unittest.TestCase): ...@@ -144,7 +90,7 @@ class CapaTargetedFeedbackTest(unittest.TestCase):
self.assertEquals(the_html, problem.get_html(), "Should be able to call get_html() twice") self.assertEquals(the_html, problem.get_html(), "Should be able to call get_html() twice")
def test_targeted_feedback_student_answer1(self): def test_targeted_feedback_student_answer1(self):
problem = new_loncapa_problem(self.common_targeted_xml) problem = new_loncapa_problem(load_fixture('targeted_feedback.xml'))
problem.done = True problem.done = True
problem.student_answers = {'1_2_1': 'choice_3'} problem.student_answers = {'1_2_1': 'choice_3'}
...@@ -158,7 +104,7 @@ class CapaTargetedFeedbackTest(unittest.TestCase): ...@@ -158,7 +104,7 @@ class CapaTargetedFeedbackTest(unittest.TestCase):
self.assertEquals(the_html, the_html2) self.assertEquals(the_html, the_html2)
def test_targeted_feedback_student_answer2(self): def test_targeted_feedback_student_answer2(self):
problem = new_loncapa_problem(self.common_targeted_xml) problem = new_loncapa_problem(load_fixture('targeted_feedback.xml'))
problem.done = True problem.done = True
problem.student_answers = {'1_2_1': 'choice_0'} problem.student_answers = {'1_2_1': 'choice_0'}
...@@ -611,3 +557,41 @@ class CapaTargetedFeedbackTest(unittest.TestCase): ...@@ -611,3 +557,41 @@ class CapaTargetedFeedbackTest(unittest.TestCase):
self.assertNotRegexpMatches(without_new_lines, r"<targetedfeedback explanation-id=\"feedbackC\".*solution explanation") self.assertNotRegexpMatches(without_new_lines, r"<targetedfeedback explanation-id=\"feedbackC\".*solution explanation")
self.assertRegexpMatches(without_new_lines, r"<div>\{.*'1_solution_1'.*\}</div>") self.assertRegexpMatches(without_new_lines, r"<div>\{.*'1_solution_1'.*\}</div>")
self.assertNotRegexpMatches(without_new_lines, r"feedback1|feedback3|feedbackC") self.assertNotRegexpMatches(without_new_lines, r"feedback1|feedback3|feedbackC")
def test_targeted_feedback_multiple_not_answered(self):
# Not answered -> empty targeted feedback
problem = new_loncapa_problem(load_fixture('targeted_feedback_multiple.xml'))
the_html = problem.get_html()
without_new_lines = the_html.replace("\n", "")
# Q1 and Q2 have no feedback
self.assertRegexpMatches(
without_new_lines,
r'<targetedfeedbackset.*?>\s*</targetedfeedbackset>.*' +
r'<targetedfeedbackset.*?>\s*</targetedfeedbackset>'
)
def test_targeted_feedback_multiple_answer_1(self):
problem = new_loncapa_problem(load_fixture('targeted_feedback_multiple.xml'))
problem.done = True
problem.student_answers = {'1_2_1': 'choice_0'} # feedback1
the_html = problem.get_html()
without_new_lines = the_html.replace("\n", "")
# Q1 has feedback1 and Q2 has nothing
self.assertRegexpMatches(
without_new_lines,
r'<targetedfeedbackset.*?>.*?explanation-id="feedback1".*?</targetedfeedbackset>.*' +
r'<targetedfeedbackset.*?>\s*</targetedfeedbackset>'
)
def test_targeted_feedback_multiple_answer_2(self):
problem = new_loncapa_problem(load_fixture('targeted_feedback_multiple.xml'))
problem.done = True
problem.student_answers = {'1_2_1': 'choice_0', '1_3_1': 'mask_1'} # Q1 wrong, Q2 correct
the_html = problem.get_html()
without_new_lines = the_html.replace("\n", "")
# Q1 has feedback1 and Q2 has feedbackC
self.assertRegexpMatches(
without_new_lines,
r'<targetedfeedbackset.*?>.*?explanation-id="feedback1".*?</targetedfeedbackset>.*' +
r'<targetedfeedbackset.*?>.*explanation-id="feedbackC".*?</targetedfeedbackset>'
)
common/lib/xmodule/xmodule/js/spec/combinedopenended/display_spec.coffee
...@@ -81,7 +81,7 @@ describe 'CombinedOpenEnded', -> ...@@ -81,7 +81,7 @@ describe 'CombinedOpenEnded', ->
expect(window.setTimeout).toHaveBeenCalledWith(@combined.poll, 10000) expect(window.setTimeout).toHaveBeenCalledWith(@combined.poll, 10000)
expect(window.queuePollerID).toBe(5) expect(window.queuePollerID).toBe(5)
it 'polling stops properly', => xit 'polling stops properly', =>
fakeResponseDone = state: "done" fakeResponseDone = state: "done"
spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback(fakeResponseDone) spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback(fakeResponseDone)
@combined.poll() @combined.poll()
......
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
...@@ -109,7 +109,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor ...@@ -109,7 +109,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
$(".CodeMirror").css({"overflow": "visible"}) $(".CodeMirror").css({"overflow": "visible"})
$(".modal-content").css({"overflow-y": "visible", "overflow-x": "visible"}) $(".modal-content").css({"overflow-y": "visible", "overflow-x": "visible"})
else else
$(".CodeMirror").removeAttr("style") $(".CodeMirror").css({"overflow": "none"})
$(".modal-content").removeAttr("style") $(".modal-content").removeAttr("style")
### ###
......
common/lib/xmodule/xmodule/modulestore/inheritance.py
...@@ -5,7 +5,7 @@ Support for inheritance of fields down an XBlock hierarchy. ...@@ -5,7 +5,7 @@ Support for inheritance of fields down an XBlock hierarchy.
from datetime import datetime from datetime import datetime
from pytz import UTC from pytz import UTC
from xblock.fields import Scope, Boolean, String, Float, XBlockMixin, Dict from xblock.fields import Scope, Boolean, String, Float, XBlockMixin, Dict, Integer
from xblock.runtime import KeyValueStore, KvsFieldData from xblock.runtime import KeyValueStore, KvsFieldData
from xmodule.fields import Date, Timedelta from xmodule.fields import Date, Timedelta
...@@ -78,7 +78,15 @@ class InheritanceMixin(XBlockMixin): ...@@ -78,7 +78,15 @@ class InheritanceMixin(XBlockMixin):
use_latex_compiler = Boolean( use_latex_compiler = Boolean(
help="Enable LaTeX templates?", help="Enable LaTeX templates?",
default=False, default=False,
scope=Scope.settings) scope=Scope.settings
)
max_attempts = Integer(
display_name="Maximum Attempts",
help=("Defines the number of times a student can try to answer this problem. "
"If the value is not set, infinite attempts are allowed."),
values={"min": 0}, scope=Scope.settings
)
def compute_inherited_metadata(descriptor): def compute_inherited_metadata(descriptor):
......
common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
# pylint: disable=E0611 # pylint: disable=E0611
from nose.tools import assert_equals, assert_raises, \ from nose.tools import assert_equals, assert_raises, \
<<<<<<< HEAD
assert_not_equals, assert_false, assert_true, assert_greater, assert_is_instance assert_not_equals, assert_false, assert_true, assert_greater, assert_is_instance
=======
assert_not_equals, assert_false, assert_true
from itertools import ifilter
>>>>>>> edx/master
# pylint: enable=E0611 # pylint: enable=E0611
from path import path
import pymongo import pymongo
import logging import logging
import shutil
from tempfile import mkdtemp
from uuid import uuid4 from uuid import uuid4
import unittest import unittest
import bson.son import bson.son
...@@ -18,7 +26,11 @@ from xmodule.tests import DATA_DIR ...@@ -18,7 +26,11 @@ from xmodule.tests import DATA_DIR
from xmodule.modulestore import Location, MONGO_MODULESTORE_TYPE from xmodule.modulestore import Location, MONGO_MODULESTORE_TYPE
from xmodule.modulestore.mongo import MongoModuleStore, MongoKeyValueStore from xmodule.modulestore.mongo import MongoModuleStore, MongoKeyValueStore
from xmodule.modulestore.draft import DraftModuleStore from xmodule.modulestore.draft import DraftModuleStore
<<<<<<< HEAD
from xmodule.modulestore.locations import SlashSeparatedCourseKey, AssetLocation from xmodule.modulestore.locations import SlashSeparatedCourseKey, AssetLocation
=======
from xmodule.modulestore.xml_exporter import export_to_xml
>>>>>>> edx/master
from xmodule.modulestore.xml_importer import import_from_xml, perform_xlint from xmodule.modulestore.xml_importer import import_from_xml, perform_xlint
from xmodule.contentstore.mongo import MongoContentStore from xmodule.contentstore.mongo import MongoContentStore
...@@ -351,6 +363,7 @@ class TestMongoModuleStore(unittest.TestCase): ...@@ -351,6 +363,7 @@ class TestMongoModuleStore(unittest.TestCase):
} }
) )
<<<<<<< HEAD
def check_xblock_fields(): def check_xblock_fields():
def check_children(xblock): def check_children(xblock):
for child in xblock.children: for child in xblock.children:
...@@ -390,6 +403,58 @@ class TestMongoModuleStore(unittest.TestCase): ...@@ -390,6 +403,58 @@ class TestMongoModuleStore(unittest.TestCase):
setup_test() setup_test()
check_xblock_fields() check_xblock_fields()
check_mongo_fields() check_mongo_fields()
=======
def test_export_course_image(self):
"""
Test to make sure that we have a course image in the contentstore,
then export it to ensure it gets copied to both file locations.
"""
location = Location('c4x', 'edX', 'simple', 'asset', 'images_course_image.jpg')
course_location = Location('i4x', 'edX', 'simple', 'course', '2012_Fall')
# This will raise if the course image is missing
self.content_store.find(location)
root_dir = path(mkdtemp())
try:
export_to_xml(self.store, self.content_store, course_location, root_dir, 'test_export')
assert_true(path(root_dir / 'test_export/static/images/course_image.jpg').isfile())
assert_true(path(root_dir / 'test_export/static/images_course_image.jpg').isfile())
finally:
shutil.rmtree(root_dir)
def test_export_course_image_nondefault(self):
"""
Make sure that if a non-default image path is specified that we
don't export it to the static default location
"""
course = self.get_course_by_id('edX/toy/2012_Fall')
assert_true(course.course_image, 'just_a_test.jpg')
root_dir = path(mkdtemp())
try:
export_to_xml(self.store, self.content_store, course.location, root_dir, 'test_export')
assert_true(path(root_dir / 'test_export/static/just_a_test.jpg').isfile())
assert_false(path(root_dir / 'test_export/static/images/course_image.jpg').isfile())
finally:
shutil.rmtree(root_dir)
def test_course_without_image(self):
"""
Make sure we elegantly passover our code when there isn't a static
image
"""
course = self.get_course_by_id('edX/simple_with_draft/2012_Fall')
root_dir = path(mkdtemp())
try:
export_to_xml(self.store, self.content_store, course.location, root_dir, 'test_export')
assert_false(path(root_dir / 'test_export/static/images/course_image.jpg').isfile())
assert_false(path(root_dir / 'test_export/static/images_course_image.jpg').isfile())
finally:
shutil.rmtree(root_dir)
>>>>>>> edx/master
class TestMongoKeyValueStore(object): class TestMongoKeyValueStore(object):
""" """
......
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
...@@ -5,6 +5,8 @@ Methods for exporting course data to XML ...@@ -5,6 +5,8 @@ Methods for exporting course data to XML
import logging import logging
import lxml.etree import lxml.etree
from xblock.fields import Scope from xblock.fields import Scope
from xmodule.contentstore.content import StaticContent
from xmodule.exceptions import NotFoundError
from xmodule.modulestore import Location from xmodule.modulestore import Location
from xmodule.modulestore.inheritance import own_metadata from xmodule.modulestore.inheritance import own_metadata
from fs.osfs import OSFS from fs.osfs import OSFS
...@@ -78,6 +80,26 @@ def export_to_xml(modulestore, contentstore, course_key, root_dir, course_dir, d ...@@ -78,6 +80,26 @@ def export_to_xml(modulestore, contentstore, course_key, root_dir, course_dir, d
root_dir + '/' + course_dir + '/policies/assets.json', root_dir + '/' + course_dir + '/policies/assets.json',
) )
# If we are using the default course image, export it to the
# legacy location to support backwards compatibility.
if course.course_image == course.fields['course_image'].default:
try:
course_image = contentstore.find(
StaticContent.compute_location(
course.location.org,
course.location.course,
course.course_image
),
)
except NotFoundError:
pass
else:
output_dir = root_dir + '/' + course_dir + '/static/images/'
if not os.path.isdir(output_dir):
os.makedirs(output_dir)
with OSFS(output_dir).open('course_image.jpg', 'wb') as course_image_file:
course_image_file.write(course_image.data)
# export the static tabs # export the static tabs
export_extra_content(export_fs, modulestore, course_key, 'static_tab', 'tabs', '.html') export_extra_content(export_fs, modulestore, course_key, 'static_tab', 'tabs', '.html')
......
common/lib/xmodule/xmodule/modulestore/xml_importer.py
...@@ -188,6 +188,43 @@ def import_from_xml( ...@@ -188,6 +188,43 @@ def import_from_xml(
for module in xml_module_store.modules[course_key].itervalues(): for module in xml_module_store.modules[course_key].itervalues():
if module.scope_ids.block_type == 'course': if module.scope_ids.block_type == 'course':
course_data_path = path(data_dir) / module.data_dir course_data_path = path(data_dir) / module.data_dir
<<<<<<< HEAD
=======
course_location = module.location
course_org_lower = course_location.org.lower()
course_number_lower = course_location.course.lower()
# Check to see if a course with the same
# pseudo_course_id, but different run exists in
# the passed store to avoid broken courses
courses = store.get_courses()
bad_run = False
if target_location_namespace is None:
for course in courses:
if course.location.org.lower() == course_org_lower and \
course.location.course.lower() == course_number_lower:
log.debug('Import is overwriting existing course')
# Importing over existing course, check
# that runs match or fail
if course.location.name != module.location.name:
log.error(
'A course with ID %s exists, and this '
'course has the same organization and '
'course number, but a different term that '
'is fully identified as %s.',
course.location.course_id,
module.location.course_id
)
bad_run = True
break
if bad_run:
# Skip this course, but keep trying to import courses
continue
log.debug('======> IMPORTING course to location {loc}'.format(
loc=course_location
))
>>>>>>> edx/master
log.debug(u'======> IMPORTING course {course_key}'.format( log.debug(u'======> IMPORTING course {course_key}'.format(
course_key=course_key, course_key=course_key,
......
common/lib/xmodule/xmodule/templates/html/grade_me.yaml deleted 100644 → 0
---
metadata:
display_name: (Grade Me!) Button
data: |
<p>By clicking the button below, you assert that you have completed the course in its entirety.</p>
<input type=button value="Yes, I Agree." id="User_Verify_Button" style="margin-bottom: 20px;" />
<p class="verify-button-success-text" style="font-weight: bold; color: #008200;"></p>
<script type="text/javascript">
var success_message = "Your grading and certification request has been received, <br />if you have passed, your certificate should be available in the next 20 minutes.";
document.getElementById('User_Verify_Button').addEventListener("click",
function(event) {
(function(event) {
var linkcontents = $('a.user-link').contents();
$.ajax({
type: 'POST',
url: '/request_certificate',
data: {'course_id': $$course_id},
success: function(data) {
$('.verify-button-success-text').html(success_message);
}
});
}).call(document.getElementById('User_Verify_Button'), event);
});
</script>
common/lib/xmodule/xmodule/tests/test_xml_module.py
...@@ -538,14 +538,14 @@ class TestXmlAttributes(XModuleXmlImportTest): ...@@ -538,14 +538,14 @@ class TestXmlAttributes(XModuleXmlImportTest):
# name) # name)
assert_in('attempts', seq.xml_attributes) assert_in('attempts', seq.xml_attributes)
def test_inheritable_attribute(self): def check_inheritable_attribute(self, attribute, value):
# days_early_for_beta isn't a basic attribute of Sequence # `attribute` isn't a basic attribute of Sequence
assert_false(hasattr(SequenceDescriptor, 'days_early_for_beta')) assert_false(hasattr(SequenceDescriptor, attribute))
# days_early_for_beta is added by InheritanceMixin # `attribute` is added by InheritanceMixin
assert_true(hasattr(InheritanceMixin, 'days_early_for_beta')) assert_true(hasattr(InheritanceMixin, attribute))
root = SequenceFactory.build(policy={'days_early_for_beta': '2'}) root = SequenceFactory.build(policy={attribute: str(value)})
ProblemFactory.build(parent=root) ProblemFactory.build(parent=root)
# InheritanceMixin will be used when processing the XML # InheritanceMixin will be used when processing the XML
...@@ -556,10 +556,14 @@ class TestXmlAttributes(XModuleXmlImportTest): ...@@ -556,10 +556,14 @@ class TestXmlAttributes(XModuleXmlImportTest):
assert_equals(seq.unmixed_class, SequenceDescriptor) assert_equals(seq.unmixed_class, SequenceDescriptor)
assert_not_equals(type(seq), SequenceDescriptor) assert_not_equals(type(seq), SequenceDescriptor)
# days_early_for_beta is added to the constructed sequence, because # `attribute` is added to the constructed sequence, because
# it's in the InheritanceMixin # it's in the InheritanceMixin
assert_equals(2, seq.days_early_for_beta) assert_equals(value, getattr(seq, attribute))
# days_early_for_beta is a known attribute, so we shouldn't include it # `attribute` is a known attribute, so we shouldn't include it
# in xml_attributes # in xml_attributes
assert_not_in('days_early_for_beta', seq.xml_attributes) assert_not_in(attribute, seq.xml_attributes)
def test_inheritable_attributes(self):
self.check_inheritable_attribute('days_early_for_beta', 2)
self.check_inheritable_attribute('max_attempts', 5)
common/test/data/test_import_course_2/chapter/vertical_container.xml 0 → 100644
<sequential>
<sequential filename='vertical_sequential' slug='vertical_sequential' />
</sequential>
\ No newline at end of file
common/test/data/test_import_course_2/course.xml 0 → 100644
<course org="edX" course="test_import" url_name="2014_Fall"/>
\ No newline at end of file
common/test/data/test_import_course_2/course/2014_Fall.xml 0 → 100644
<course>
<textbook title="Textbook" book_url="https://s3.amazonaws.com/edx-textbooks/guttag_computation_v3/"/>
<chapter url_name="Overview">
<videosequence url_name="Toy_Videos">
<html url_name="secret:toylab"/>
<html url_name="toyjumpto"/>
<html url_name="toyhtml"/>
<html url_name="nonportable"/>
<html url_name="nonportable_link"/>
<video url_name="Video_Resources" youtube_id_1_0="1bK-WdDi6Qw" display_name="Video Resources"/>
</videosequence>
<video url_name="Welcome" youtube_id_1_0="p2Q6BrNhdh8" display_name="Welcome"/>
<video url_name="video_123456789012" youtube_id_1_0="p2Q6BrNhdh8" display_name='Test Video'/>
<video url_name="video_4f66f493ac8f" youtube_id_1_0="p2Q6BrNhdh8"/>
</chapter>
<chapter url_name="secret:magic"/>
<chapter url_name="poll_test"/>
<chapter url_name="vertical_container"/>
<chapter url_name="handout_container"/>
</course>
common/test/data/test_import_course_2/info/handouts.html 0 → 100644
<a href='/static/handouts/sample_handout.txt'>Sample</a>
\ No newline at end of file
common/test/data/test_import_course_2/policies/2012_Fall.json 0 → 100644
{
"course/2012_Fall": {
"graceperiod": "2 days 5 hours 59 minutes 59 seconds",
"start": "2015-07-17T12:00",
"display_name": "Toy Course",
"graded": "true",
"tabs": [
{"type": "courseware"},
{"type": "course_info", "name": "Course Info"},
{"type": "static_tab", "url_slug": "syllabus", "name": "Syllabus"},
{"type": "static_tab", "url_slug": "resources", "name": "Resources"},
{"type": "discussion", "name": "Discussion"},
{"type": "wiki", "name": "Wiki"},
{"type": "progress", "name": "Progress"}
]
},
"chapter/Overview": {
"display_name": "Overview"
},
"videosequence/Toy_Videos": {
"display_name": "Toy Videos",
"format": "Lecture Sequence"
},
"html/secret:toylab": {
"display_name": "Toy lab"
},
"video/Video_Resources": {
"display_name": "Video Resources"
},
"video/Welcome": {
"display_name": "Welcome"
}
}
common/test/data/test_import_course_2/sequential/vertical_sequential.xml 0 → 100644
<sequential>
<vertical filename="vertical_test" slug="vertical_test" />
<html slug="unicode">…</html>
</sequential>
\ No newline at end of file
common/test/data/test_import_course_2/vertical/vertical_test.xml 0 → 100644
<sequential>
<video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video"/>
<video url_name="separate_file_video"/>
<poll_question name="T1_changemind_poll_foo_2" display_name="Change your answer" reset="false">
<p>Have you changed your mind?</p>
<answer id="yes">Yes</answer>
<answer id="no">No</answer>
</poll_question>
</sequential>
common/test/data/test_import_course_2/video/separate_file_video.xml 0 → 100644
<video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video"/>
common/test/data/toy/course/2012_Fall.xml
<course> <course course_image="just_a_test.jpg">
<textbook title="Textbook" book_url="https://s3.amazonaws.com/edx-textbooks/guttag_computation_v3/"/> <textbook title="Textbook" book_url="https://s3.amazonaws.com/edx-textbooks/guttag_computation_v3/"/>
<chapter url_name="Overview"> <chapter url_name="Overview">
<videosequence url_name="Toy_Videos"> <videosequence url_name="Toy_Videos">
......
conf/locale/ar/LC_MESSAGES/django.po
This source diff could not be displayed because it is too large. You can view the blob instead.
conf/locale/az/LC_MESSAGES/djangojs.po
...@@ -14,8 +14,8 @@ msgid "" ...@@ -14,8 +14,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:00+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/edx-platform/language/az/)\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/edx-platform/language/az/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1331,6 +1331,34 @@ msgstr "" ...@@ -1331,6 +1331,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1354,7 +1382,8 @@ msgstr "" ...@@ -1354,7 +1382,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1586,19 +1615,26 @@ msgstr "" ...@@ -1586,19 +1615,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/bg_BG/LC_MESSAGES/djangojs.po
...@@ -14,8 +14,8 @@ msgid "" ...@@ -14,8 +14,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:00+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/edx-platform/language/bg_BG/)\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/edx-platform/language/bg_BG/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1331,6 +1331,34 @@ msgstr "" ...@@ -1331,6 +1331,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1354,7 +1382,8 @@ msgstr "" ...@@ -1354,7 +1382,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1586,19 +1615,26 @@ msgstr "" ...@@ -1586,19 +1615,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/bn_BD/LC_MESSAGES/djangojs.po
...@@ -15,8 +15,8 @@ msgid "" ...@@ -15,8 +15,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:20+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/edx-platform/language/bn_BD/)\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/edx-platform/language/bn_BD/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1332,6 +1332,34 @@ msgstr "" ...@@ -1332,6 +1332,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1355,7 +1383,8 @@ msgstr "" ...@@ -1355,7 +1383,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1587,19 +1616,26 @@ msgstr "" ...@@ -1587,19 +1616,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/bn_IN/LC_MESSAGES/djangojs.po
...@@ -14,9 +14,9 @@ msgid "" ...@@ -14,9 +14,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-01-21 20:18+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: \n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/edx-platform/language/bn_IN/)\n" "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/edx-platform/language/bn_IN/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
...@@ -1331,6 +1331,34 @@ msgstr "" ...@@ -1331,6 +1331,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1354,7 +1382,8 @@ msgstr "" ...@@ -1354,7 +1382,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1586,19 +1615,26 @@ msgstr "" ...@@ -1586,19 +1615,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/bs/LC_MESSAGES/djangojs.po
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE. # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
# #
# Translators: # Translators:
# Kenan Dervišević, 2014
# #-#-#-#-# djangojs-studio.po (edx-platform) #-#-#-#-# # #-#-#-#-# djangojs-studio.po (edx-platform) #-#-#-#-#
# edX translation file. # edX translation file.
# Copyright (C) 2014 EdX # Copyright (C) 2014 EdX
...@@ -14,8 +15,8 @@ msgid "" ...@@ -14,8 +15,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:00+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/edx-platform/language/bs/)\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/edx-platform/language/bs/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -520,7 +521,7 @@ msgstr "" ...@@ -520,7 +521,7 @@ msgstr ""
#: common/static/coffee/src/discussion/views/response_comment_show_view.js #: common/static/coffee/src/discussion/views/response_comment_show_view.js
msgid "anonymous" msgid "anonymous"
msgstr "" msgstr "anonimno"
#: common/static/coffee/src/discussion/views/response_comment_show_view.js #: common/static/coffee/src/discussion/views/response_comment_show_view.js
#: common/static/coffee/src/discussion/views/thread_response_show_view.js #: common/static/coffee/src/discussion/views/thread_response_show_view.js
...@@ -1347,6 +1348,34 @@ msgstr "" ...@@ -1347,6 +1348,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1370,7 +1399,8 @@ msgstr "" ...@@ -1370,7 +1399,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1602,19 +1632,26 @@ msgstr "" ...@@ -1602,19 +1632,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/ca/LC_MESSAGES/djangojs.po
...@@ -18,8 +18,8 @@ msgid "" ...@@ -18,8 +18,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-25 16:10+0000\n" "PO-Revision-Date: 2014-05-12 18:15+0000\n"
"Last-Translator: mcolomer <mcmlilhity@gmail.com>\n" "Last-Translator: mcolomer <mcmlilhity@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/edx-platform/language/ca/)\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/edx-platform/language/ca/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1451,6 +1451,34 @@ msgstr "Item de llista" ...@@ -1451,6 +1451,34 @@ msgstr "Item de llista"
msgid "Heading" msgid "Heading"
msgstr "Capçalera" msgstr "Capçalera"
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr "Hi ha hagut un error desconegut."
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr "S'han reiniciat amb èxit els intents per l'usuari {user}"
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr "No s'han pogut reinicialitzar els intents."
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr "S'ha esborrat l'estat de l'estudiant per l'usuari {user}"
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr "No s'ha pogut esborrar l'estat de l'estudiant."
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr "S'ha pogut reescriure la puntuació del problema de l'usuari {user}"
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr "No s'ha pogut reescriure la puntuació."
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1477,7 +1505,8 @@ msgstr "L'Studio té problemes guardant la teva feina." ...@@ -1477,7 +1505,8 @@ msgstr "L'Studio té problemes guardant la teva feina."
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1723,23 +1752,31 @@ msgstr "Edita la data de lliurament de la secció" ...@@ -1723,23 +1752,31 @@ msgstr "Edita la data de lliurament de la secció"
msgid "Not Graded" msgid "Not Graded"
msgstr "No puntuat" msgstr "No puntuat"
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
msgstr "ascendent" #: cms/static/js/views/paging_header.js
msgid ""
#: cms/static/js/views/paging.js "Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
msgid "descending" "%(sort_name)s ascending"
msgstr "descendent" msgstr ""
"S'està mostrant %(current_item_range)s de %(total_items_count)s en total, "
"ordenats per %(sort_name)s ascendent"
#. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
#. Added descending"
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid ""
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of " "Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(total_span)s%(total)s total%(end_span)s, sorted by " "%(sort_name)s descending"
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
"Mostrant %(current_span)s%(start)s-%(end)s%(end_span)s de " "S'està mostrant %(current_item_range)s de %(total_items_count)s en total, "
"%(total_span)s%(total)s total%(end_span)s, ordenats per " "ordenats per %(sort_name)s descendent"
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js
msgid "%(total_items)s total"
msgstr "%(total_items)s total"
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
msgid "Your change could not be saved" msgid "Your change could not be saved"
......
conf/locale/ca@valencia/LC_MESSAGES/djangojs.po
...@@ -15,8 +15,8 @@ msgid "" ...@@ -15,8 +15,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:00+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/edx-platform/language/ca@valencia/)\n" "Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/edx-platform/language/ca@valencia/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1332,6 +1332,34 @@ msgstr "" ...@@ -1332,6 +1332,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1355,7 +1383,8 @@ msgstr "" ...@@ -1355,7 +1383,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1587,19 +1616,26 @@ msgstr "" ...@@ -1587,19 +1616,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/cs/LC_MESSAGES/djangojs.po
...@@ -15,13 +15,14 @@ ...@@ -15,13 +15,14 @@
# #
# Translators: # Translators:
# m23 <black23@gmail.com>, 2013 # m23 <black23@gmail.com>, 2013
# m23 <black23@gmail.com>, 2014
# Slamic <michal.slama@implayo.cz>, 2014 # Slamic <michal.slama@implayo.cz>, 2014
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:20+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/edx-platform/language/cs/)\n" "Language-Team: Czech (http://www.transifex.com/projects/p/edx-platform/language/cs/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1353,6 +1354,34 @@ msgstr "" ...@@ -1353,6 +1354,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1376,7 +1405,8 @@ msgstr "" ...@@ -1376,7 +1405,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1608,19 +1638,26 @@ msgstr "" ...@@ -1608,19 +1638,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/cy/LC_MESSAGES/djangojs.po
...@@ -14,8 +14,8 @@ msgid "" ...@@ -14,8 +14,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:00+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/edx-platform/language/cy/)\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/edx-platform/language/cy/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1363,6 +1363,34 @@ msgstr "" ...@@ -1363,6 +1363,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1386,7 +1414,8 @@ msgstr "" ...@@ -1386,7 +1414,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1618,19 +1647,26 @@ msgstr "" ...@@ -1618,19 +1647,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/da/LC_MESSAGES/djangojs.po
...@@ -14,9 +14,9 @@ msgid "" ...@@ -14,9 +14,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-01-21 20:18+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: \n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/edx-platform/language/da/)\n" "Language-Team: Danish (http://www.transifex.com/projects/p/edx-platform/language/da/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
...@@ -1331,6 +1331,34 @@ msgstr "" ...@@ -1331,6 +1331,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1354,7 +1382,8 @@ msgstr "" ...@@ -1354,7 +1382,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1586,19 +1615,26 @@ msgstr "" ...@@ -1586,19 +1615,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/de_DE/LC_MESSAGES/djangojs.po
...@@ -28,9 +28,9 @@ msgid "" ...@@ -28,9 +28,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-29 14:20+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: s6lidaem <linda.daemmer@web.de>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/edx-platform/language/de_DE/)\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/edx-platform/language/de_DE/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
...@@ -1393,6 +1393,34 @@ msgstr "Listelement" ...@@ -1393,6 +1393,34 @@ msgstr "Listelement"
msgid "Heading" msgid "Heading"
msgstr "Überschrift" msgstr "Überschrift"
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1419,7 +1447,8 @@ msgstr "Studio's hat Probleme beim Speichern Ihrer Arbeit" ...@@ -1419,7 +1447,8 @@ msgstr "Studio's hat Probleme beim Speichern Ihrer Arbeit"
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1667,23 +1696,27 @@ msgstr "Sektionsveröffentlichungsdatum bearbeiten" ...@@ -1667,23 +1696,27 @@ msgstr "Sektionsveröffentlichungsdatum bearbeiten"
msgid "Not Graded" msgid "Not Graded"
msgstr "Unbenotet" msgstr "Unbenotet"
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
msgstr "aufsteigend" #: cms/static/js/views/paging_header.js
msgid ""
#: cms/static/js/views/paging.js "Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
msgid "descending" "%(sort_name)s ascending"
msgstr "absteigend" msgstr ""
#. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
#. Added descending"
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid ""
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of " "Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(total_span)s%(total)s total%(end_span)s, sorted by " "%(sort_name)s descending"
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js
msgid "%(total_items)s total"
msgstr "" msgstr ""
"Zeige %(current_span)s%(start)s-%(end)s%(end_span)s von "
"%(total_span)s%(total)s insgesamt %(end_span)s, Sortiert nach "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
msgid "Your change could not be saved" msgid "Your change could not be saved"
......
conf/locale/el/LC_MESSAGES/djangojs.po
...@@ -4,19 +4,21 @@ ...@@ -4,19 +4,21 @@
# This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE. # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
# #
# Translators: # Translators:
# almanean <almanean@yahoo.gr>, 2014
# #-#-#-#-# djangojs-studio.po (edx-platform) #-#-#-#-# # #-#-#-#-# djangojs-studio.po (edx-platform) #-#-#-#-#
# edX translation file. # edX translation file.
# Copyright (C) 2014 EdX # Copyright (C) 2014 EdX
# This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE. # This file is distributed under the GNU AFFERO GENERAL PUBLIC LICENSE.
# #
# Translators: # Translators:
# almanean <almanean@yahoo.gr>, 2014
# JohnMantas <mad._g@hotmail.com>, 2014 # JohnMantas <mad._g@hotmail.com>, 2014
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:00+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/edx-platform/language/el/)\n" "Language-Team: Greek (http://www.transifex.com/projects/p/edx-platform/language/el/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1332,6 +1334,34 @@ msgstr "" ...@@ -1332,6 +1334,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1355,7 +1385,8 @@ msgstr "" ...@@ -1355,7 +1385,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1587,19 +1618,26 @@ msgstr "" ...@@ -1587,19 +1618,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/en@lolcat/LC_MESSAGES/djangojs.po
...@@ -16,8 +16,8 @@ msgid "" ...@@ -16,8 +16,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:00+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: LOLCAT English (http://www.transifex.com/projects/p/edx-platform/language/en@lolcat/)\n" "Language-Team: LOLCAT English (http://www.transifex.com/projects/p/edx-platform/language/en@lolcat/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1378,6 +1378,34 @@ msgstr "LYST ITEM" ...@@ -1378,6 +1378,34 @@ msgstr "LYST ITEM"
msgid "Heading" msgid "Heading"
msgstr "HEADIN" msgstr "HEADIN"
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1401,7 +1429,8 @@ msgstr "" ...@@ -1401,7 +1429,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1633,19 +1662,26 @@ msgstr "" ...@@ -1633,19 +1662,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/en@pirate/LC_MESSAGES/djangojs.po
...@@ -16,8 +16,8 @@ msgid "" ...@@ -16,8 +16,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-02 17:09-0400\n" "POT-Creation-Date: 2014-05-13 09:30-0400\n"
"PO-Revision-Date: 2014-04-24 13:00+0000\n" "PO-Revision-Date: 2014-05-11 14:42+0000\n"
"Last-Translator: sarina <sarina@edx.org>\n" "Last-Translator: sarina <sarina@edx.org>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/edx-platform/language/en@pirate/)\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/edx-platform/language/en@pirate/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1336,6 +1336,34 @@ msgstr "" ...@@ -1336,6 +1336,34 @@ msgstr ""
msgid "Heading" msgid "Heading"
msgstr "" msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr ""
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr ""
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1359,7 +1387,8 @@ msgstr "" ...@@ -1359,7 +1387,8 @@ msgstr ""
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1591,19 +1620,26 @@ msgstr "" ...@@ -1591,19 +1620,26 @@ msgstr ""
msgid "Not Graded" msgid "Not Graded"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s ascending"
msgstr "" msgstr ""
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "descending" #. Added descending"
#: cms/static/js/views/paging_header.js
msgid ""
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(sort_name)s descending"
msgstr "" msgstr ""
#. Translators: turns into "25 total" to be used in other sentences, e.g.
#. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid "%(total_items)s total"
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of "
"%(total_span)s%(total)s total%(end_span)s, sorted by "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s"
msgstr "" msgstr ""
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
......
conf/locale/eo/LC_MESSAGES/djangojs.po
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1a\n" "Project-Id-Version: 0.1a\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-05-05 09:25-0400\n" "POT-Creation-Date: 2014-05-13 09:40-0400\n"
"PO-Revision-Date: 2014-05-05 13:26:48.910894\n" "PO-Revision-Date: 2014-05-13 13:41:26.703210\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -1465,6 +1465,34 @@ msgstr "Lïst ïtém #" ...@@ -1465,6 +1465,34 @@ msgstr "Lïst ïtém #"
msgid "Heading" msgid "Heading"
msgstr "Héädïng #" msgstr "Héädïng #"
#: lms/static/js/staff_debug_actions.js
msgid "Unknown Error Occurred."
msgstr "Ûnknöwn Érrör Öççürréd. Ⱡ'σяє#"
#: lms/static/js/staff_debug_actions.js
msgid "Successfully reset the attempts for user {user}"
msgstr "Süççéssfüllý rését thé ättémpts för üsér {user} Ⱡ'σяєм ιρѕυм#"
#: lms/static/js/staff_debug_actions.js
msgid "Failed to reset attempts."
msgstr "Fäïléd tö rését ättémpts. Ⱡ'σяєм#"
#: lms/static/js/staff_debug_actions.js
msgid "Successfully deleted student state for user {user}"
msgstr "Süççéssfüllý délétéd stüdént stäté för üsér {user} Ⱡ'σяєм ιρѕυм #"
#: lms/static/js/staff_debug_actions.js
msgid "Failed to delete student state."
msgstr "Fäïléd tö délété stüdént stäté. Ⱡ'σяєм ι#"
#: lms/static/js/staff_debug_actions.js
msgid "Successfully rescored problem for user {user}"
msgstr "Süççéssfüllý résçöréd prößlém för üsér {user} Ⱡ'σяєм ιρѕυ#"
#: lms/static/js/staff_debug_actions.js
msgid "Failed to rescore problem."
msgstr "Fäïléd tö résçöré prößlém. Ⱡ'σяєм#"
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
#: lms/templates/class_dashboard/all_section_metrics.js #: lms/templates/class_dashboard/all_section_metrics.js
msgid "Unable to retrieve data, please try again later." msgid "Unable to retrieve data, please try again later."
...@@ -1491,7 +1519,8 @@ msgstr "Stüdïö's hävïng tröüßlé sävïng ýöür wörk Ⱡ'σяєм ι ...@@ -1491,7 +1519,8 @@ msgstr "Stüdïö's hävïng tröüßlé sävïng ýöür wörk Ⱡ'σяєм ι
#: cms/static/coffee/src/views/unit.js #: cms/static/coffee/src/views/unit.js
#: cms/static/coffee/src/xblock/cms.runtime.v1.js #: cms/static/coffee/src/xblock/cms.runtime.v1.js
#: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js #: cms/static/js/models/section.js cms/static/js/utils/drag_and_drop.js
#: cms/static/js/views/asset.js cms/static/js/views/course_info_handout.js #: cms/static/js/views/asset.js cms/static/js/views/container.js
#: cms/static/js/views/course_info_handout.js
#: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js #: cms/static/js/views/course_info_update.js cms/static/js/views/overview.js
#: cms/static/js/views/xblock_editor.js #: cms/static/js/views/xblock_editor.js
msgid "Saving&hellip;" msgid "Saving&hellip;"
...@@ -1748,24 +1777,31 @@ msgstr "Édït séçtïön réléäsé däté Ⱡ'σяєм#" ...@@ -1748,24 +1777,31 @@ msgstr "Édït séçtïön réléäsé däté Ⱡ'σяєм#"
msgid "Not Graded" msgid "Not Graded"
msgstr "Nöt Grädéd Ⱡ#" msgstr "Nöt Grädéd Ⱡ#"
#: cms/static/js/views/paging.js #. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
msgid "ascending" #. Added ascending"
msgstr "äsçéndïng #" #: cms/static/js/views/paging_header.js
msgid ""
#: cms/static/js/views/paging.js "Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
msgid "descending" "%(sort_name)s ascending"
msgstr "désçéndïng Ⱡ#" msgstr ""
"Shöwïng %(current_item_range)s öüt öf %(total_items_count)s, sörtéd ßý "
"%(sort_name)s äsçéndïng Ⱡ'σяєм ιρѕυм #"
#. Translators: sample result: "Showing 0-9 out of 25 total, sorted by Date
#. Added descending"
#: cms/static/js/views/paging_header.js #: cms/static/js/views/paging_header.js
msgid "" msgid ""
"Showing %(current_span)s%(start)s-%(end)s%(end_span)s out of " "Showing %(current_item_range)s out of %(total_items_count)s, sorted by "
"%(total_span)s%(total)s total%(end_span)s, sorted by " "%(sort_name)s descending"
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s" msgstr ""
msgstr "" "Shöwïng %(current_item_range)s öüt öf %(total_items_count)s, sörtéd ßý "
"Shöwïng %(current_span)s%(start)s-%(end)s%(end_span)s öüt öf " "%(sort_name)s désçéndïng Ⱡ'σяєм ιρѕυм #"
"%(total_span)s%(total)s tötäl%(end_span)s, sörtéd ßý "
"%(order_span)s%(sort_order)s%(end_span)s %(sort_direction)s Ⱡ'σяєм ιρѕυм " #. Translators: turns into "25 total" to be used in other sentences, e.g.
"∂σłσя ѕι#" #. "Showing 0-9 out of 25 total".
#: cms/static/js/views/paging_header.js
msgid "%(total_items)s total"
msgstr "%(total_items)s tötäl #"
#: cms/static/js/views/section_edit.js #: cms/static/js/views/section_edit.js
msgid "Your change could not be saved" msgid "Your change could not be saved"
......
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