Merged from MOODLE_19_STABLE: MDL-13001 - adding support for language files in local...

diff --git a/lib/locallib.php b/lib/locallib.php
index a4b89a83c857d5d9e58742e9a1dc4c3ebedc9cc4..a1db1ed24e16d43ae71001b9db37e20284862590 100644 (file)
--- a/lib/locallib.php
+++ b/lib/locallib.php
@@ -48,6 +48,16 @@
  * with $oldversion set to 0, so that all the updates run.
  *
  *
+ * Local language support
+ * ----------------------
+ *
+ * Moodle supports looking in the local/ directory for language files.
+ * You would need to create local/lang/en_utf8/local.php 
+ * and then could call strings like get_string('key', 'local');
+ * Make sure you don't call the language file something that moodle already has one of, 
+ * stick to local or $clientname)
+ * 
+ *
  * Local admin menu items
  * ----------------------
  *

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index c0ed3c321b4ec66849af3947524dec1dead11dfe..0165e364642fb6d39160bcb01b4c82ac242f1eca 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -5005,6 +5005,7 @@ function get_string($identifier, $module='', $a=NULL, $extralocations=NULL) {
     } else {
         $locations[] = $CFG->dataroot.'/lang/';
         $locations[] = $CFG->dirroot.'/lang/';
+        $locations[] = $CFG->dirroot.'/local/lang/';
     }
 
 /// Add extra places to look for strings for particular plugin types.