Merge pull request #66 from edx-solutions/asadiqbal08/WL-373

WL-373 i18n support drag and drop v2

Author: Asad Iqbal

.travis.yml

@@ -9,7 +9,7 @@ install:
     - "sh install_test_deps.sh"
     - "pip uninstall -y xblock-drag-and-drop-v2"
     - "python setup.py sdist"
-    - "pip install dist/xblock-drag-and-drop-v2-2.0.4.tar.gz"
+    - "pip install dist/xblock-drag-and-drop-v2-2.0.5.tar.gz"
 script:
     - pep8 drag_and_drop_v2 tests --max-line-length=120
     - pylint drag_and_drop_v2 tests

Changelog.md

@@ -1,6 +1,7 @@
-Development version:
---------------------
+Version 2.0.5 (2016-03-30)
+--------------------------
 
+* Marked strings for translations (PR #66)
 * Added the ability to specify automatic alignment of dropped items. (PR #57)
 
 Version 2.0.4 (2016-03-10)

drag_and_drop_v2/drag_and_drop_v2.py

@@ -27,6 +27,7 @@
 # Classes ###########################################################
 
 @XBlock.wants('settings')
+@XBlock.needs('i18n')
 class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin):
     """
     XBlock that implements a friendly Drag-and-Drop problem
@@ -106,10 +107,6 @@ class DragAndDropBlock(XBlock, XBlockWithSettingsMixin, ThemableXBlockMixin):
     block_settings_key = 'drag-and-drop-v2'
     has_score = True
 
-    def _(self, text):
-        """ Translate text """
-        return self.runtime.service(self, "i18n").ugettext(text)
-
     @XBlock.supports("multi_device")  # Enable this block for use in the mobile app via webview
     def student_view(self, context):
         """
@@ -186,7 +183,7 @@ def studio_view(self, context):
 
         js_templates = loader.load_unicode('/templates/html/js_templates.html')
         help_texts = {
-            field_name: self._(field.help)
+            field_name: self.ugettext(field.help)
             for field_name, field in self.fields.viewitems() if hasattr(field, "help")
         }
         context = {