fix for MDL-8585, adding additonal CFG setting for latinexcelexport

diff --git a/admin/settings/language.php b/admin/settings/language.php
index 88f5baa218cced24eb7a7c6022c504561aad4497..79d1fff2ca54016e698d87d45d69c9a9f01b946c 100644 (file)
--- a/admin/settings/language.php
+++ b/admin/settings/language.php
@@ -9,11 +9,17 @@ $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', '
 $temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), '', PARAM_NOTAGS));
 $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
 $temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
-$ADMIN->add('language', $temp);
+
+// new CFG variable for excel encoding
+$temp->add(new admin_setting_configselect('latinexcelexport', get_string('latinexcelexport', 'admin'), get_string('configlatinexcelexport', 'admin'), 'Unicode', array('UTF-16LE'=>'Unicode','WIN-1252'=>'Latin')));
 
 
+$ADMIN->add('language', $temp);
 
 $ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php"));
 $ADMIN->add('language', new admin_externalpage('langimport', get_string('langpacks', 'admin'), "$CFG->wwwroot/$CFG->admin/langimport.php"));
 
+
+
+
 ?>

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index b59a2f349ac4441095c965b6c6d5aaa44fba9b89..94ecec90d9833fa6de3894c3e9518de8e62d7c46 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -118,6 +118,7 @@ $string['configlangcache'] = 'Cache the language menu. Saves a lot of memory and
 $string['configlangdir'] = 'Most languages are printed left-to-right, but some, like Arabic and Hebrew, are printed right-to-left.';
 $string['configlanglist'] = 'Leave this blank to allow users to choose from any language you have in this installation of Moodle.  However, you can shorten the language menu by entering a comma-separated list of language codes that you want.  For example:  en,es_es,fr,it';
 $string['configlangmenu'] = 'Choose whether or not you want to display the general-purpose language menu on the home page, login page etc.  This does not affect the user\'s ability to set the preferred language in their own profile.';
+$string['configlatinexcelexport'] = 'Choose the encoding for Excel exports.';
 $string['configlocale'] = 'Choose a sitewide locale - this will override the format and language of dates for all language packs (though names of days in calendar are not affected). You need to have this locale data installed on your operating system (eg for linux en_US.UTF-8 or es_ES.UTF-8). In most cases this field should be left blank.';
 $string['configloginhttps'] = 'Turning this on will make Moodle use a secure https connection just for the login page (providing a secure login), and then afterwards revert back to the normal http URL for general speed.  CAUTION: this setting REQUIRES https to be specifically enabled on the web server - if it is not then YOU COULD LOCK YOURSELF OUT OF YOUR SITE.';
 $string['configloglifetime'] = 'This specifies the length of time you want to keep logs about user activity.  Logs that are older than this age are automatically deleted.  It is best to keep logs as long as possible, in case you need them, but if you have a very busy server and are experiencing performance problems, then you may want to lower the log lifetime.';
@@ -335,6 +336,7 @@ $string['languagesettings'] = 'Language settings';
 $string['langupdatecomplete'] = 'Language pack update completed';
 $string['latexpreamble'] = 'LaTeX preamble';
 $string['latexsettings'] = 'LaTeX renderer Settings';
+$string['latinexcelexport'] = 'Excel encoding';
 $string['localetext'] = 'Sitewide locale';
 $string['location'] = 'Location';
 $string['locationsettings'] = 'Location settings';