MDLSITE-2493 glossary filter alert dialog button string now translatable

Conflicts: filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js filter/glossary/yui/src/autolinker/js/autolinker.js -- M.core.alert api was changed.
reskit · Nov 8, 2013 · cbb6e0d · cbb6e0d
1 parent 069c29b
commit cbb6e0d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/filter/glossary/filter.php b/filter/glossary/filter.php
@@ -43,6 +43,7 @@ public function setup($page, $context) {
                     'moodle-filter_glossary-autolinker',
                     'M.filter_glossary.init_filter_autolinking',
                     array(array('courseid' => 0)));
+            $page->requires->strings_for_js(array('ok'), 'moodle');
             $jsinitialised = true;
         }
     }

diff --git a/...ry/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js b/...ry/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js
@@ -69,7 +69,8 @@ Y.extend(AUTOLINKER, Y.Base, {
 
                 for (key in data.entries) {
                     definition = data.entries[key].definition + data.entries[key].attachments;
-                    alertpanel = new M.core.alert({title:data.entries[key].concept, message:definition, lightbox:false});
+                    alertpanel = new M.core.alert({title:data.entries[key].concept,
+                        message:definition, lightbox:false, yesLabel: M.util.get_string('ok', 'moodle')});
                     alertpanel.show();
                     Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
                 }

diff --git a/...sary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js b/...sary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js
diff --git a/...glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js b/...glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js
@@ -69,7 +69,8 @@ Y.extend(AUTOLINKER, Y.Base, {
 
                 for (key in data.entries) {
                     definition = data.entries[key].definition + data.entries[key].attachments;
-                    alertpanel = new M.core.alert({title:data.entries[key].concept, message:definition, lightbox:false});
+                    alertpanel = new M.core.alert({title:data.entries[key].concept,
+                        message:definition, lightbox:false, yesLabel: M.util.get_string('ok', 'moodle')});
                     alertpanel.show();
                     Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
                 }

diff --git a/filter/glossary/yui/src/autolinker/js/autolinker.js b/filter/glossary/yui/src/autolinker/js/autolinker.js
@@ -67,7 +67,8 @@ Y.extend(AUTOLINKER, Y.Base, {
 
                 for (key in data.entries) {
                     definition = data.entries[key].definition + data.entries[key].attachments;
-                    alertpanel = new M.core.alert({title:data.entries[key].concept, message:definition, lightbox:false});
+                    alertpanel = new M.core.alert({title:data.entries[key].concept,
+                        message:definition, lightbox:false, yesLabel: M.util.get_string('ok', 'moodle')});
                     alertpanel.show();
                     Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
                 }