L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-11-23 02:00:53 +01:00
parent ba54648b45 ad6fbb6074
commit 689461f4d8
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/admin.php
+1
View File
@@ -901,6 +901,7 @@ $string['slasharguments'] = 'Use slash arguments';
$string['smartpix'] = 'Smart pix search';
$string['soaprecommended'] = 'Installing the optional soap extension is useful for web services and some contrib modules.';
$string['spellengine'] = 'Spell engine';
$string['spelllanguagelist'] = 'Spell language list';
$string['splrequired'] = 'The SPL PHP extension is now required by Moodle.';
$string['stats'] = 'Statistics';
$string['statsfirstrun'] = 'Maximum processing interval';
lib/editor/tinymce/lib.php
+2 -1
View File
@@ -147,7 +147,8 @@ class tinymce_texteditor extends texteditor {
'theme_advanced_resizing_min_height' => 30,
'theme_advanced_toolbar_location' => "top",
'theme_advanced_statusbar_location' => "bottom",
'spellchecker_rpc_url' => $CFG->wwwroot."/lib/editor/tinymce/tiny_mce/$this->version/plugins/spellchecker/rpc.php"
'spellchecker_rpc_url' => $CFG->wwwroot."/lib/editor/tinymce/tiny_mce/$this->version/plugins/spellchecker/rpc.php",
'spellchecker_languages' => get_config('editor_tinymce', 'spelllanguagelist')
);
if ($xemoticon) {
lib/editor/tinymce/settings.php
+6 -2
View File
@@ -31,6 +31,10 @@ if ($ADMIN->fulltree) {
'PSpell'=>'PSpell',
'GoogleSpell'=>'Google Spell',
'PSpellShell'=>'PSpellShell');
$settings->add(new admin_setting_configselect('editor_tinymce/spellengine', get_string('spellengine', 'admin'), '', 'GoogleSpell', $options));
$settings->add(new admin_setting_configselect('editor_tinymce/spellengine',
get_string('spellengine', 'admin'), '', 'GoogleSpell', $options));
$settings->add(new admin_setting_configtext('editor_tinymce/spelllanguagelist',
get_string('spelllanguagelist', 'admin'), '',
'+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,' .
'Portuguese=pt,Spanish=es,Swedish=sv', PARAM_RAW));
}