MDL-14129, fix incorrect print_error() call

diff --git a/filter/tex/lib.php b/filter/tex/lib.php
index 4c358781bef7d4251bace82cfd7a2748dad54cd4..f02fba5252f795f51bb530028579091881bb604e 100644 (file)
--- a/filter/tex/lib.php
+++ b/filter/tex/lib.php
@@ -21,7 +21,7 @@ function tex_filter_get_executable($debug=false) {
         if (is_executable($custom_commandpath)) {
             return $custom_commandpath;
         } else {
-            print_error($error_message2.$error_message1);
+            print_error('mimetexnotexecutable', 'error');
         }
     }
 
@@ -31,7 +31,7 @@ function tex_filter_get_executable($debug=false) {
         case "FreeBSD": return "$CFG->dirroot/filter/tex/mimetex.freebsd";
     }
 
-    print_error($error_message1);
+    print_error('mimetexisnotexist', 'error');
 }
 
 

diff --git a/lang/en_utf8/auth.php b/lang/en_utf8/auth.php
index 76878e8c2753edb05bd151f5dc00a4682f4b7352..a3ad50f673951b4014fb7aa7826b24f47bd1b1d1 100644 (file)
--- a/lang/en_utf8/auth.php
+++ b/lang/en_utf8/auth.php
@@ -7,10 +7,8 @@ $string['alternatelogin'] = 'If you enter a URL here, it will be used as the log
 $string['alternateloginurl'] = 'Alternate Login URL';
 $string['forgottenpassword'] = 'If you enter a URL here, it will be used as the lost password recovery page for this site. This is intended for sites where passwords are handled entirely outside of Moodle. Leave this blank to use the default password recovery.';
 $string['forgottenpasswordurl'] = 'Forgotten password URL';
-
 $string['pluginnotenabled'] = 'Authentication plugin \'$a\' is not enabled.';
 $string['pluginnotinstalled'] = 'Authentication plugin \'$a\' is not installed.';
-
 // syncronization
 $string['auth_sync_script'] ='Cron synchronization script';
 $string['auth_dbinsertuser'] ='Inserted user $a[0] id $a[1]';

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index 2d3a6701a9629f8a9bf701bec6a4be992e894bba..7f259564abd563dc5bb614fdce4895453ad7c46b 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -102,6 +102,8 @@ $string['loginasnoenrol'] = 'You can not use enrol or unenrol when in course \"L
 $string['messagingdisable'] = 'Messaging is disabled on this site';
 $string['missingfield'] = 'Field \"$a\" is missing.';
 $string['missingrequiredfield'] = 'Some required field is missing';
+$string['mimetexisnotexist'] = 'Your system is not configured to run mimeTeX. You need to download the appropriate executable for you PHP_OS platform from <a href=\"http://moodle.org/download/mimetex/\">http://moodle.org/download/mimetex/</a>, or obtain the C source from <a href=\"http://www.forkosh.com/mimetex.zip\"> http://www.forkosh.com/mimetex.zip</a>, compile it and put the executable into your moodle/filter/tex/ directory.';
+$string['mimetexnotexecutable'] = 'Custom mimetex is not executable!';
 $string['moduledoesnotexist'] = 'The instance of this module doesn\'t exist';
 $string['modulemissingcode'] = 'Module $a is missing the code needed to perform this function';
 $string['modulerequirementsnotmet'] = 'Module \"$a->modulename\" ($a->moduleversion) could not be installed.  It requires a newer version of Moodle (currently you are using $a->currentmoodle, you need $a->requiremoodle).';

diff --git a/lang/en_utf8/mnet.php b/lang/en_utf8/mnet.php
index e6833cc827de83cb3f142bcfdb25033e34d7ee8b..c6c20c3a4f6ffc5958b70f9f15753d5b0e9bae7b 100644 (file)
--- a/lang/en_utf8/mnet.php
+++ b/lang/en_utf8/mnet.php
@@ -166,7 +166,7 @@ $string['reviewhostservices']           = 'Review Host Services';
 $string['moodle_home_help']             = 'The path to the homepage of Moodle on the remote host, e.g. /moodle/.';
 $string['hostnamehelp']                 = 'The fully-qualified domain name of the remote host, e.g. www.example.com';
 $string['idhelp']                       = 'This value is automatically assigned and cannot be changed';
-$string['invalidpubkey']                = 'The key is not a valid SSL key.';
+$string['invalidpubkey']                = 'The key is not a valid SSL key. ($a)';
 $string['nopubkey']                     = 'There was a problem retrieving the public key.<br />Maybe the host does not allow Moodle Networking or the key is invalid.';
 $string['last_connect_time_help']       = 'The time that you last connected to this host.';
 $string['last_transport_help']          = 'The transport that you used for the last connection to this host.';