MDL-14679 dml/native_mysqli adding lang strings

diff --git a/install/stringnames.txt b/install/stringnames.txt
index 4bdd85a46d918591a024f7d81af1b2b025c5922d..24c3ffac717fbdea5e7051252395d1c51d638b47 100644 (file)
--- a/install/stringnames.txt
+++ b/install/stringnames.txt
@@ -166,6 +166,7 @@ mysql416required
 mysqlextensionisnotpresentinphp
 mysqliextensionisnotpresentinphp
 name
+nativemysqli
 newline
 next
 oci8po

diff --git a/lang/en_utf8/install.php b/lang/en_utf8/install.php
index e01c98f5db74a5fee034c8383aac5f45c78ed1ce..d43460270aa7b103549f5f49be675980e150a636 100644 (file)
--- a/lang/en_utf8/install.php
+++ b/lang/en_utf8/install.php
@@ -295,6 +295,7 @@ $string['mysql'] = 'MySQL (mysql)';
 $string['mysqli'] = 'Improved MySQL (mysqli)';
 $string['mysqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the MySQL extension so that it can communicate with MySQL.  Please check your php.ini file or recompile PHP.';
 $string['mysqliextensionisnotpresentinphp'] = 'PHP has not been properly configured with the MySQLi extension so that it can communicate with MySQL.  Please check your php.ini file or recompile PHP.  MySQLi extension is not available for PHP 4.';
+$string['nativemysqli'] = 'Improved MySQL (native/mysqli)';
 $string['oci8po'] = 'Oracle (oci8po)';
 $string['ociextensionisnotpresentinphp'] = 'PHP has not been properly configured with the OCI8 extension so that it can communicate with Oracle.  Please check your php.ini file or recompile PHP.';
 $string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';

diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index d7df9e6e7cdaf329a645c1dca12dd2e648373390..1acb4b6bfaa8a8e2b7c289419773ee80f4a51daa 100644 (file)
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -57,7 +57,7 @@ class mysqli_native_moodle_database extends moodle_database {
      * @return string
      */
     public function get_name() {
-        return get_string('nativemysqli', 'install'); //TODO: localise
+        return get_string('nativemysqli', 'install');
     }
 
     /**
@@ -66,7 +66,7 @@ class mysqli_native_moodle_database extends moodle_database {
      * @return string
      */
     public function get_configuration_hints() {
-        return get_string('databasesettingssub_mysqlinative', 'install'); //TODO: localise
+        return get_string('databasesettingssub_mysqli', 'install');
     }
 
     /**