Merge branch 'release'

2014-06-11 21:30:05 -04:00
parent 1816f97fba 2e36fb293b
commit 7e36c35043
12 changed files with 133 additions and 26 deletions
--- a/common/lib/xmodule/xmodule/imageannotation_module.py
+++ b/common/lib/xmodule/xmodule/imageannotation_module.py
@@ -19,7 +19,9 @@ _ = lambda text: text

 class AnnotatableFields(object):
    """ Fields for `ImageModule` and `ImageDescriptor`. """
-    data = String(help="XML data for the annotation", scope=Scope.content, default=textwrap.dedent("""\
+    data = String(help=_("XML data for the annotation"),
+        scope=Scope.content,
+        default=textwrap.dedent("""\
        <annotatable>
            <instructions>
                <p>