Merge branch 'MDL-53942-master' of git://github.com/junpataleta/moodle

2016-04-26 10:52:27 +01:00
parent 23f1dbde67 1388b618d9
commit 0ea74d855f
2 changed files with 4 additions and 2 deletions
@@ -712,7 +712,9 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
                options.showSuggestions = showSuggestions;
            }
            if (typeof noSelectionString === "undefined") {
-                options.noSelectionString = str.get_string('noselection', 'form');
+                str.get_string('noselection', 'form').done(function (result) {
+                    options.noSelectionString = result;
+                }).fail(notification.exception);
            }

            // Look for the select element.