From ae112d8c54bbccff31a9c9bd59ef9b3db8a70582 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 23 Nov 2007 13:58:40 +0100 Subject: Spellchecker removed With spell checkers available in all modern browsers, having a spell checker in DokuWiki's core code is no longer necessary. This patch removes the spell checking feature. It will be made available as optional plugin. darcs-hash:20071123125840-7ad00-faf7aa4673421dbb3fad904ba5b46b4927a5176d.gz --- conf/dokuwiki.php | 1 - inc/aspell.php | 322 ----------------- inc/lang/ar/lang.php | 7 - inc/lang/bg/lang.php | 7 - inc/lang/ca/lang.php | 6 - inc/lang/cs/lang.php | 6 - inc/lang/da/lang.php | 9 +- inc/lang/de/lang.php | 6 - inc/lang/el/lang.php | 11 - inc/lang/en/lang.php | 7 - inc/lang/eo/lang.php | 6 - inc/lang/es/lang.php | 6 - inc/lang/et/lang.php | 7 +- inc/lang/fi/lang.php | 6 - inc/lang/fo/lang.php | 7 - inc/lang/fr/lang.php | 6 - inc/lang/gl/lang.php | 6 - inc/lang/he/lang.php | 7 - inc/lang/hr/lang.php | 7 - inc/lang/id/lang.php | 6 - inc/lang/it/lang.php | 7 - inc/lang/ja/lang.php | 9 - inc/lang/ko/lang.php | 7 - inc/lang/lt/lang.php | 7 - inc/lang/lv/lang.php | 7 - inc/lang/mg/lang.php | 15 +- inc/lang/nl/lang.php | 6 - inc/lang/no/lang.php | 6 - inc/lang/pl/lang.php | 6 - inc/lang/pt-br/lang.php | 6 - inc/lang/pt/lang.php | 6 - inc/lang/ru/lang.php | 6 - inc/lang/sk/lang.php | 6 - inc/lang/sr/lang.php | 7 - inc/lang/sv/lang.php | 7 - inc/lang/tr/lang.php | 7 - inc/lang/uk/lang.php | 7 - inc/lang/zh-tw/lang.php | 7 - inc/lang/zh/lang.php | 7 - lib/exe/js.php | 14 - lib/exe/spellcheck.php | 302 ---------------- lib/images/toolbar/spellcheck.png | Bin 558 -> 0 bytes lib/images/toolbar/spellnoerr.png | Bin 593 -> 0 bytes lib/images/toolbar/spellstop.png | Bin 576 -> 0 bytes lib/images/toolbar/spellwait.gif | Bin 3035 -> 0 bytes lib/plugins/config/lang/bg/lang.php | 1 - lib/plugins/config/lang/ca/lang.php | 1 - lib/plugins/config/lang/cs/lang.php | 1 - lib/plugins/config/lang/da/lang.php | 1 - lib/plugins/config/lang/de/lang.php | 1 - lib/plugins/config/lang/el/lang.php | 1 - lib/plugins/config/lang/en/lang.php | 1 - lib/plugins/config/lang/eo/lang.php | 1 - lib/plugins/config/lang/es/lang.php | 1 - lib/plugins/config/lang/fr/lang.php | 1 - lib/plugins/config/lang/gl/lang.php | 1 - lib/plugins/config/lang/he/lang.php | 1 - lib/plugins/config/lang/it/lang.php | 1 - lib/plugins/config/lang/ja/lang.php | 1 - lib/plugins/config/lang/ko/lang.php | 1 - lib/plugins/config/lang/nl/lang.php | 1 - lib/plugins/config/lang/no/lang.php | 1 - lib/plugins/config/lang/pl/lang.php | 1 - lib/plugins/config/lang/pt-br/lang.php | 1 - lib/plugins/config/lang/ru/lang.php | 1 - lib/plugins/config/lang/sv/lang.php | 1 - lib/plugins/config/lang/uk/lang.php | 1 - lib/plugins/config/lang/zh/lang.php | 1 - lib/plugins/config/settings/config.metadata.php | 1 - lib/scripts/spellcheck.js | 456 ------------------------ lib/styles/spellcheck.css | 21 -- lib/tpl/default/design.css | 32 -- 72 files changed, 4 insertions(+), 1427 deletions(-) delete mode 100644 inc/aspell.php delete mode 100644 lib/exe/spellcheck.php delete mode 100644 lib/images/toolbar/spellcheck.png delete mode 100644 lib/images/toolbar/spellnoerr.png delete mode 100644 lib/images/toolbar/spellstop.png delete mode 100644 lib/images/toolbar/spellwait.gif delete mode 100644 lib/scripts/spellcheck.js delete mode 100644 lib/styles/spellcheck.css diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index bd92f4730..ab2995d80 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -92,7 +92,6 @@ $conf['gzip_output'] = 0; //use gzip content encodeing for the ou $conf['gdlib'] = 2; //the GDlib version (0, 1 or 2) 2 tries to autodetect $conf['im_convert'] = ''; //path to ImageMagicks convert (will be used instead of GD) $conf['jpg_quality'] = '70'; //quality of compression when scaling jpg images (0-100) -$conf['spellchecker']= 0; //enable Spellchecker (needs PHP >= 4.3.0 and aspell installed) $conf['subscribers'] = 0; //enable change notice subscription support $conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0 $conf['hidepages'] = ''; //Regexp for pages to be skipped from RSS, Search and Recent Changes diff --git a/inc/aspell.php b/inc/aspell.php deleted file mode 100644 index 9030d25c7..000000000 --- a/inc/aspell.php +++ /dev/null @@ -1,322 +0,0 @@ - - * @todo Not all pspell functions are supported - * - */ - -// path to your aspell binary -if(!defined('ASPELL_BIN')) define('ASPELL_BIN','aspell'); - - -// different spelling modes supported by aspell -if(!defined('PSPELL_FAST')) define(PSPELL_FAST,1); # Fast mode (least number of suggestions) -if(!defined('PSPELL_NORMAL')) define(PSPELL_NORMAL,2); # Normal mode (more suggestions) -if(!defined('PSPELL_BAD_SPELLERS')) define(PSPELL_BAD_SPELLERS,3); # Slow mode (a lot of suggestions) -if(!defined('ASPELL_ULTRA')) define(ASPELL_ULTRA,4); # Ultra fast mode (not available in Pspell!) - - - -/** - * You can define PSPELL_COMP to use this class as drop in replacement - * for the pspell extension - */ -if(defined('PSPELL_COMP')){ - // spelling is not supported by aspell and ignored - function pspell_config_create($language, $spelling=null, $jargon=null, $encoding='iso8859-1'){ - return new Aspell($language, $jargon, $encoding); - } - - function pspell_config_mode(&$config, $mode){ - return $config->setMode($mode); - } - - function pspell_new_config(&$config){ - return $config; - } - - function pspell_check(&$dict,$word){ - return $dict->check($word); - } - - function pspell_suggest(&$dict, $word){ - return $dict->suggest($word); - } -} - -/** - * Class to interface aspell - * - * Needs PHP >= 4.3.0 - */ -class Aspell{ - var $language = null; - var $jargon = null; - var $personal = null; - var $encoding = 'iso8859-1'; - var $mode = PSPELL_NORMAL; - var $version = 0; - - var $args=''; - - /** - * Constructor. Works like pspell_config_create() - * - * @author Andreas Gohr - */ - function Aspell($language, $jargon=null, $encoding='iso8859-1'){ - $this->language = $language; - $this->jargon = $jargon; - $this->encoding = $encoding; - } - - /** - * Set the spelling mode like pspell_config_mode() - * - * Mode can be PSPELL_FAST, PSPELL_NORMAL, PSPELL_BAD_SPELLER or ASPELL_ULTRA - * - * @author Andreas Gohr - */ - function setMode($mode){ - if(!in_array($mode,array(PSPELL_FAST,PSPELL_NORMAL,PSPELL_BAD_SPELLER,ASPELL_ULTRA))){ - $mode = PSPELL_NORMAL; - } - - $this->mode = $mode; - return $mode; - } - - /** - * Prepares the needed arguments for the call to the aspell binary - * - * No need to call this directly - * - * @author Andreas Gohr - */ - function _prepareArgs(){ - $this->args = ''; - - if($this->language != null){ - $this->args .= ' --lang='.escapeshellarg($this->language); - }else{ - return false; // no lang no spell - } - - if($this->jargon != null){ - $this->args .= ' --jargon='.escapeshellarg($this->jargon); - } - - if($this->personal != null){ - $this->args .= ' --personal='.escapeshellarg($this->personal); - } - - if($this->encoding != null){ - $this->args .= ' --encoding='.escapeshellarg($this->encoding); - } - - switch ($this->mode){ - case PSPELL_FAST: - $this->args .= ' --sug-mode=fast'; - break; - case PSPELL_BAD_SPELLERS: - $this->args .= ' --sug-mode=bad-spellers'; - break; - case ASPELL_ULTRA: - $this->args .= ' --sug-mode=ultra'; - break; - default: - $this->args .= ' --sug-mode=normal'; - } - - return true; - } - - - /** - * Pipes a text to aspell - * - * This opens a bidirectional pipe to the aspell binary, writes - * the given text to STDIN and returns STDOUT and STDERR - * - * You can give an array of special commands to be executed first - * as $specials parameter. Data lines are escaped automatically - * - * @author Andreas Gohr - * @link http://aspell.sf.net/man-html/Through-A-Pipe.html - */ - function runAspell($text,&$out,&$err,$specials=null){ - if(empty($text)) return true; - $terse = true; - - // prepare arguments - $this->_prepareArgs(); - $command = ASPELL_BIN.' -a'.$this->args; - $stdin = ''; - - // prepare specials - if(is_array($specials)){ - foreach($specials as $s){ - if ($s == '!') $terse = false; - $stdin .= "$s\n"; - } - } - - // prepare text - $stdin .= "^".str_replace("\n", "\n^",$text); - - // run aspell through the pipe - $rc = $this->execPipe($command,$stdin,$out,$err); - if(is_null($rc)){ - $err = "Could not run Aspell '".ASPELL_BIN."'"; - return false; - } - - // Aspell has a bug that can't be autodetected because both versions - // might produce the same output but under different conditions. So - // we check Aspells version number here to divide broken and working - // versions of Aspell. - $tmp = array(); - preg_match('/^\@.*Aspell (\d+)\.(\d+).(\d+)/',$out,$tmp); - $this->version = $tmp[1]*100 + $tmp[2]*10 + $tmp[3]; - - if ($this->version <= 603) // version 0.60.3 - $r = $terse ? "\n*\n\$1" : "\n\$1"; // replacement for broken Aspell - else - $r = $terse ? "\n*\n" : "\n"; // replacement for good Aspell - - // lines starting with a '?' are no realy misspelled words and some - // Aspell versions doesn't produce usable output anyway so we filter - // them out here. - $out = preg_replace('/\n\? [^\n\&\*]*([\n]?)/',$r, $out); - - if ($err){ - //something went wrong - $err = "Aspell returned an error(".ASPELL_BIN." exitcode: $rc ):\n".$err; - return false; - } - return true; - } - - - /** - * Runs the given command with the given input on STDIN - * - * STDOUT and STDERR are written to the given vars, the command's - * exit code is returned. If the pip couldn't be opened null is returned - * - * @author - * @link http://www.php.net/manual/en/function.proc-open.php#64116 - */ - function execPipe($command,$stdin,&$stdout,&$stderr){ - $descriptorSpec = array(0 => array("pipe", "r"), - 1 => array('pipe', 'w'), - 2 => array('pipe', 'w')); - $process = proc_open($command, $descriptorSpec, $pipes); - if(!$process) return null; - - $txOff = 0; - $txLen = strlen($stdin); - $stdoutDone = false; - $stderrDone = false; - - stream_set_blocking($pipes[0], 0); // Make stdin/stdout/stderr non-blocking - stream_set_blocking($pipes[1], 0); - stream_set_blocking($pipes[2], 0); - - if ($txLen == 0) fclose($pipes[0]); - while (true) { - $rx = array(); // The program's stdout/stderr - if (!$stdoutDone) $rx[] = $pipes[1]; - if (!$stderrDone) $rx[] = $pipes[2]; - $tx = array(); // The program's stdin - if ($txOff < $txLen) $tx[] = $pipes[0]; - stream_select($rx, $tx, $ex = NULL, NULL, NULL); // Block til r/w possible - - if (!empty($tx)) { - $txRet = fwrite($pipes[0], substr($stdin, $txOff, 8192)); - if ($txRet !== false) $txOff += $txRet; - if ($txOff >= $txLen) fclose($pipes[0]); - } - - foreach ($rx as $r) { - if ($r == $pipes[1]) { - $stdout .= fread($pipes[1], 8192); - if (feof($pipes[1])) { - fclose($pipes[1]); - $stdoutDone = true; - } - } else if ($r == $pipes[2]) { - $stderr .= fread($pipes[2], 8192); - if (feof($pipes[2])) { - fclose($pipes[2]); - $stderrDone = true; - } - } - } - if (!is_resource($process)) break; - if ($txOff >= $txLen && $stdoutDone && $stderrDone) break; - } - return proc_close($process); - } - - - - - /** - * Checks a single word for correctness - * - * @returns array of suggestions or true on correct spelling - * @author Andreas Gohr - */ - function suggest($word){ - if($this->runAspell("^$word",$out,$err)){ - //parse output - $lines = split("\n",$out); - foreach ($lines as $line){ - $line = trim($line); - if(empty($line)) continue; // empty line - if($line[0] == '@') continue; // comment - if($line[0] == '*') return true; // no mistakes made - if($line[0] == '#') return array(); // mistake but no suggestions - if($line[0] == '&'){ - $line = preg_replace('/&.*?: /','',$line); - return split(', ',$line); - } - } - } - return array(); - } - - /** - * Check if a word is mispelled like pspell_check - * - * @author Andreas Gohr - */ - function check($word){ - if(is_array($this->suggest($word))){ - return false; - }else{ - return true; - } - } -} - -//Setup VIM: ex: et ts=4 enc=utf-8 : diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index a70775118..d6148c115 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -129,13 +129,6 @@ $lang['qb_sig'] = 'أضف توقيعك'; $lang['del_confirm']= 'مسح؟'; $lang['admin_register']= 'أضف مستخدم جديد'; -$lang['spell_start'] = 'تدقيق إملائى'; -$lang['spell_stop'] = 'أكمل التحرير'; -$lang['spell_wait'] = 'برجاء الأنتظار...'; -$lang['spell_noerr'] = 'لا توجد أخطاء'; -$lang['spell_nosug'] = 'لايوجد أقتراحات'; -$lang['spell_change']= 'تعديل'; - $lang['metaedit'] = 'حرر البيانات الشمولية '; $lang['metasaveerr'] = 'فشل كتابة البيانات الشمولية'; $lang['metasaveok'] = 'تم حفظ البيانت الشمولية'; diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index f24d167fd..582efe93a 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -4,7 +4,6 @@ * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Nikolay Vladimirov - * @author Nikolay Vladimirof */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -155,12 +154,6 @@ $lang['qb_smileys'] = 'Усмивчици'; $lang['qb_chars'] = 'Специални знаци'; $lang['del_confirm'] = 'Да бъдат ли изтрити избраните елементи?'; $lang['admin_register'] = 'Добабяне на нов потребител'; -$lang['spell_start'] = 'Проверка на правописа'; -$lang['spell_stop'] = 'Продължаване на редактирането'; -$lang['spell_wait'] = 'Поля изчакайте...'; -$lang['spell_noerr'] = 'Не бяха намерени грешки'; -$lang['spell_nosug'] = 'Няма предложения'; -$lang['spell_change'] = 'Промяна'; $lang['metaedit'] = 'Редактиране на метаданните'; $lang['metasaveerr'] = 'Запазването на метаданните не бе успешно'; $lang['metasaveok'] = 'Метаданните запазени'; diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php index 1a77453ef..c6b8157d3 100644 --- a/inc/lang/ca/lang.php +++ b/inc/lang/ca/lang.php @@ -157,12 +157,6 @@ $lang['qb_smileys'] = 'Emoticones'; $lang['qb_chars'] = 'Caràcters especials'; $lang['del_confirm'] = 'Suprimiu aquesta entrada?'; $lang['admin_register'] = 'Afegeix nou usuari'; -$lang['spell_start'] = 'Revisa l\'ortografia'; -$lang['spell_stop'] = 'Torna a edició'; -$lang['spell_wait'] = 'Espereu un moment...'; -$lang['spell_noerr'] = 'No s\'han trobat errors'; -$lang['spell_nosug'] = 'No hi ha suggeriments'; -$lang['spell_change'] = 'Canvia'; $lang['metaedit'] = 'Edita metadades'; $lang['metasaveerr'] = 'No s\'han pogut escriure les metadades'; $lang['metasaveok'] = 'S\'han desat les metadades'; diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index 23c3cf181..4ff26a621 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -155,12 +155,6 @@ $lang['qb_smileys'] = 'Emotikony'; $lang['qb_chars'] = 'Speciální znaky'; $lang['del_confirm'] = 'Vymazat tuto položku?'; $lang['admin_register'] = 'Přidat nového uživatele'; -$lang['spell_start'] = 'Zkontrolovat pravopis'; -$lang['spell_stop'] = 'Pokračovat v úpravách'; -$lang['spell_wait'] = 'Prosím počkejte...'; -$lang['spell_noerr'] = 'Bez chyb'; -$lang['spell_nosug'] = 'Žádné návrhy'; -$lang['spell_change'] = 'Změnit'; $lang['metaedit'] = 'Upravit Metadata'; $lang['metasaveerr'] = 'Chyba při zápisu metadat'; $lang['metasaveok'] = 'Metadata uložena'; diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index c50374c95..e00d399ae 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -105,7 +105,7 @@ $lang['uploadwrong'] = 'Upload afvist. Filtypen er ikke tilladt'; $lang['uploadexist'] = 'Filen eksisterer allerede.'; $lang['uploadbadcontent'] = 'Upload indhold matchede ikke %s fil-endelsen.'; $lang['uploadspam'] = 'Upload blev blokeret af spam sortlisten.'; -$lang['uploadxss'] = 'Upload blev blokeret p grund af mulig skadeligt indhold.'; +$lang['uploadxss'] = 'Upload blev blokeret på grund af mulig skadeligt indhold.'; $lang['deletesucc'] = 'Filen "%s" er blevet slettet.'; $lang['deletefail'] = '"%s" kunne ikke slettes - check rettighederne.'; $lang['mediainuse'] = 'Filen "%s" er ikke slettet - den er stadig i brug.'; @@ -171,13 +171,6 @@ $lang['qb_chars'] = 'Specialtegn'; $lang['del_confirm']= 'Slet valgte post(er)?'; $lang['admin_register']= 'Tilføj ny bruger'; -$lang['spell_start']= 'Stavekontrol'; -$lang['spell_stop'] = 'Fortsæt redigering'; -$lang['spell_wait'] = 'Vent et øjeblik...'; -$lang['spell_noerr']= 'Der blev ikke fundet nogle fejl'; -$lang['spell_nosug']= 'Ingen forslag fundet'; -$lang['spell_change']= 'Ændr'; - $lang['metaedit'] = 'Rediger metadata'; $lang['metasaveerr'] = 'Skrivning af metadata fejlede'; $lang['metasaveok'] = 'Metadata gemt'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 87803d50d..832a8bd74 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -161,12 +161,6 @@ $lang['qb_smileys'] = 'Smileys'; $lang['qb_chars'] = 'Sonderzeichen'; $lang['del_confirm'] = 'Eintrag wirklich löschen?'; $lang['admin_register'] = 'Neuen Benutzer anmelden'; -$lang['spell_start'] = 'Rechtschreibung prüfen'; -$lang['spell_stop'] = 'Bearbeiten fortsetzen'; -$lang['spell_wait'] = 'Bitte warten...'; -$lang['spell_noerr'] = 'Keine Fehler gefunden'; -$lang['spell_nosug'] = 'Keine Vorschläge'; -$lang['spell_change'] = 'Ändern'; $lang['metaedit'] = 'Metadaten bearbeiten'; $lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden'; $lang['metasaveok'] = 'Metadaten gesichert'; diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php index b2abbab49..5c66d7dbf 100644 --- a/inc/lang/el/lang.php +++ b/inc/lang/el/lang.php @@ -2,12 +2,7 @@ /** * Greek language file * - * Based on DokuWiki Version rc2007-05-24 english language file - * Original english language file contents included for reference - * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Andreas Gohr - * @author Anika Henke * @author Thanos Massias * @author Αθανάσιος Νταής */ @@ -162,12 +157,6 @@ $lang['qb_smileys'] = 'Smileys'; $lang['qb_chars'] = 'Ειδικοί Χαρακτήρες'; $lang['del_confirm'] = 'Να διαγραφεί?'; $lang['admin_register'] = 'Προσθήκη νέου χρήστη'; -$lang['spell_start'] = 'Ορθογραφικός Έλεγχος'; -$lang['spell_stop'] = 'Συνέχιση Ελέγχου'; -$lang['spell_wait'] = 'Παρακαλώ περιμένετε...'; -$lang['spell_noerr'] = 'Δεν βρέθηκαν λάθη'; -$lang['spell_nosug'] = 'Δεν υπάρχουν υποδείξεις'; -$lang['spell_change'] = 'Αλλαγή'; $lang['metaedit'] = 'Τροποποίηση metadata'; $lang['metasaveerr'] = 'Η αποθήκευση των metadata απέτυχε'; $lang['metasaveok'] = 'Επιτυχής αποθήκευση metadata'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index f8558621f..c2fdaf5db 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -174,13 +174,6 @@ $lang['qb_chars'] = 'Special Chars'; $lang['del_confirm']= 'Really delete selected item(s)?'; $lang['admin_register']= 'Add new user'; -$lang['spell_start'] = 'Check Spelling'; -$lang['spell_stop'] = 'Resume Editing'; -$lang['spell_wait'] = 'Please wait...'; -$lang['spell_noerr'] = 'No Mistakes found'; -$lang['spell_nosug'] = 'No Suggestions'; -$lang['spell_change']= 'Change'; - $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Writing metadata failed'; $lang['metasaveok'] = 'Metadata saved'; diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 3d07a735b..58a73e09c 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -160,12 +160,6 @@ $lang['qb_smileys'] = 'Ridetuloj'; $lang['qb_chars'] = 'Specialaj signaĵoj'; $lang['del_confirm'] = 'Ĉu vere forigi elektitajn ero(j)n?'; $lang['admin_register'] = 'Aldoni novan uzulon'; -$lang['spell_start'] = 'Kontroli ortografion'; -$lang['spell_stop'] = 'Reiri al redaktado'; -$lang['spell_wait'] = 'Bonvolu atendi...'; -$lang['spell_noerr'] = 'Neniu eraro estis trovata'; -$lang['spell_nosug'] = 'Neniu sugestoj'; -$lang['spell_change'] = 'Ŝangi'; $lang['metaedit'] = 'Redakti metadatenon'; $lang['metasaveerr'] = 'La registro de metadatenon malsukcesis'; $lang['metasaveok'] = 'La metadatenon estas registrita'; diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index d86c824ca..b5237af02 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -161,12 +161,6 @@ $lang['qb_smileys'] = 'Sonrisas'; $lang['qb_chars'] = 'Caracteres especiales'; $lang['del_confirm'] = '¿Quieres realmente borrar los ítem seleccionados?'; $lang['admin_register'] = 'Añadir nuevo usuario...'; -$lang['spell_start'] = 'Comprobar Ortografía'; -$lang['spell_stop'] = 'Continuar Edición'; -$lang['spell_wait'] = 'Por favor espera...'; -$lang['spell_noerr'] = 'No se encontraron errores'; -$lang['spell_nosug'] = 'No hay sugerencias'; -$lang['spell_change'] = 'Cambio'; $lang['metaedit'] = 'Editar los metadatos'; $lang['metasaveerr'] = 'La escritura de los metadatos ha fallado'; $lang['metasaveok'] = 'Los metadatos han sido guardados.'; diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index 58b3cfa02..84502c4ef 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -70,12 +70,7 @@ $lang['qb_strike'] = 'Läbijoonitud tekst'; $lang['qb_smileys'] = 'Emotikonid'; $lang['qb_chars'] = 'Erisümbolid'; $lang['admin_register'] = 'Lisa kasutaja'; -$lang['spell_start'] = 'Kontrolli õigekirja'; -$lang['spell_stop'] = 'Jätka toimetamist'; -$lang['spell_wait'] = 'Palun oota...'; -$lang['spell_noerr'] = 'Vigu ei leitud'; -$lang['spell_nosug'] = 'Soovitusi ei ole'; -$lang['spell_change'] = 'Muuda'; + #$lang['reference'] = ''; #$lang['btn_backlink'] = ''; diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index d8c52bc9a..61dd12582 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -157,12 +157,6 @@ $lang['qb_smileys'] = 'Hymiöt'; $lang['qb_chars'] = 'Erikoismerkit'; $lang['del_confirm'] = 'Haluatko todella poistaa valitut kohteet?'; $lang['admin_register'] = 'Lisää uusi käyttäjä'; -$lang['spell_start'] = 'Tarkista oikeinkirjoitus'; -$lang['spell_stop'] = 'Jatka muokkaamista'; -$lang['spell_wait'] = 'Hetkinen...'; -$lang['spell_noerr'] = 'Virheitä ei löytynyt'; -$lang['spell_nosug'] = 'Ei ehdotuksia'; -$lang['spell_change'] = 'Muuta'; $lang['metaedit'] = 'Muokkaa metadataa'; $lang['metasaveerr'] = 'Metadatan kirjoittaminen epäonnistui'; $lang['metasaveok'] = 'Metadata tallennettu'; diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php index 3e5d6a050..542b2e9d1 100644 --- a/inc/lang/fo/lang.php +++ b/inc/lang/fo/lang.php @@ -146,13 +146,6 @@ $lang['qb_chars'] = 'Sertekn'; $lang['del_confirm']= 'Strika post(ar)?'; $lang['admin_register']= 'Upprætta nýggjan brúkara'; -$lang['spell_start']= 'Staveftirlit'; -$lang['spell_stop'] = 'Hald áfram við rætting'; -$lang['spell_wait'] = 'Bíða eitt bil...'; -$lang['spell_noerr']= 'Ongin villa var funnin'; -$lang['spell_nosug']= 'Ongin uppskot funnin'; -$lang['spell_change']= 'Broyt'; - $lang['metaedit'] = 'Rætta metadáta'; $lang['metasaveerr'] = 'Brek við skriving av metadáta'; $lang['metasaveok'] = 'Metadáta goymt'; diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index ff396901d..651936755 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -163,12 +163,6 @@ $lang['qb_smileys'] = 'Émoticons'; $lang['qb_chars'] = 'Caractères spéciaux'; $lang['del_confirm'] = 'Effacer cette entrée ?'; $lang['admin_register'] = 'Ajouter un nouvel utilisateur'; -$lang['spell_start'] = 'Vérifier l\'orthographe'; -$lang['spell_stop'] = 'Reprendre l\'édition'; -$lang['spell_wait'] = 'Patientez SVP...'; -$lang['spell_noerr'] = 'Aucune erreur trouvée'; -$lang['spell_nosug'] = 'Pas de suggestion'; -$lang['spell_change'] = 'Changer'; $lang['metaedit'] = 'Éditer les metadonnées'; $lang['metasaveerr'] = 'Erreur à l\'écriture des metadonnées'; $lang['metasaveok'] = 'Metadonnées enregistrées'; diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index a4efb947c..80d646515 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -156,12 +156,6 @@ $lang['qb_smileys'] = 'Risoños'; $lang['qb_chars'] = 'Caracteres Especiais'; $lang['del_confirm'] = 'Eliminar o(s) elemento(s) seleccionado(s) realmente?'; $lang['admin_register'] = 'Engadir novo usuario'; -$lang['spell_start'] = 'Comprobar Ortografía'; -$lang['spell_stop'] = 'Continuar coa Edición'; -$lang['spell_wait'] = 'Por favor, agarda...'; -$lang['spell_noerr'] = 'Non se atoparon grallas'; -$lang['spell_nosug'] = 'Non hai Suxestións'; -$lang['spell_change'] = 'Mudar'; $lang['metaedit'] = 'Editar Metadatos'; $lang['metasaveerr'] = 'Non se puideron escribir os metadatos'; $lang['metasaveok'] = 'Metadatos gardados'; diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index 43a36baed..9465060ff 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -203,13 +203,6 @@ $lang['qb_chars'] = 'סימנים מיוחדים'; $lang['del_confirm']= 'באמת למחוק?'; $lang['admin_register']= 'להוסיף משתמש חדש'; -$lang['spell_start'] = 'בדוק איות'; -$lang['spell_stop'] = 'חזור לעריכה'; -$lang['spell_wait'] = 'נא להמתין...'; -$lang['spell_noerr'] = 'לא נמצאו שגיאות'; -$lang['spell_nosug'] = 'אין הצעות'; -$lang['spell_change']= 'החלף'; - $lang['metaedit'] = 'ערוך נתונים'; $lang['metasaveerr'] = 'כשל בשמירת נתונים'; $lang['metasaveok'] = 'נתונים נשמרו'; diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index 14298125e..e6d02ba79 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -146,13 +146,6 @@ $lang['qb_chars'] = 'Posebni znakovi'; $lang['del_confirm']= 'Jeste li sigurni da ćelite obrisati?'; $lang['admin_register']= 'Dodavanje korisnika'; -$lang['spell_start'] = 'Provjerite ispravnost teksta'; -$lang['spell_stop'] = 'Nastavite s izmjenama'; -$lang['spell_wait'] = 'Pričekajte trenutak...'; -$lang['spell_noerr'] = 'Nema grešaka'; -$lang['spell_nosug'] = 'Nema prijedloga'; -$lang['spell_change']= 'Izmjena'; - $lang['metaedit'] = 'Izmjena metapodataka'; $lang['metasaveerr'] = 'Izmjena metapodataka nije uspjela'; $lang['metasaveok'] = 'Meta'; diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php index 90b3ae6a1..2e8d89f26 100644 --- a/inc/lang/id/lang.php +++ b/inc/lang/id/lang.php @@ -156,12 +156,6 @@ $lang['qb_smileys'] = 'Smileys'; $lang['qb_chars'] = 'Karakter Khusus'; $lang['del_confirm'] = 'Hapus tulisan ini?'; $lang['admin_register'] = 'Tambah user baru'; -$lang['spell_start'] = 'Cek Ejaan'; -$lang['spell_stop'] = 'Lanjutkan perubahan'; -$lang['spell_wait'] = 'Harap tunggu...'; -$lang['spell_noerr'] = 'Tidak ada kesalahan ditemukan'; -$lang['spell_nosug'] = 'Tidak ada saran'; -$lang['spell_change'] = 'Ubah'; $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Gagal menulis metadata'; $lang['metasaveok'] = 'Metadata tersimpan'; diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index c9f2c1dcd..565a3a777 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -167,13 +167,6 @@ $lang['qb_chars'] = 'Caratteri speciali'; $lang['del_confirm']= 'Cancellare questa voce?'; $lang['admin_register']= 'Aggiungi un nuovo utente'; -$lang['spell_start'] = 'Controllo ortografico'; -$lang['spell_stop'] = 'Interrompi controllo'; -$lang['spell_wait'] = 'Attendere...'; -$lang['spell_noerr'] = 'Nessun errore trovato'; -$lang['spell_nosug'] = 'Nessun suggerimento'; -$lang['spell_change']= 'Cambia'; - $lang['metaedit'] = 'Modifica metadati'; $lang['metasaveerr'] = 'Scrittura metadati fallita'; $lang['metasaveok'] = 'Metadati salvati'; diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 599025590..a349cdae9 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -4,9 +4,6 @@ * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Yuji Takenaka - * @author Andreas Gohr - * @author Anika Henke - * @author Matthias Grimm */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -158,12 +155,6 @@ $lang['qb_smileys'] = 'スマイリー'; $lang['qb_chars'] = '特殊文字'; $lang['del_confirm'] = '選択した項目を本当に削除しますか?'; $lang['admin_register'] = '新規ユーザー作成'; -$lang['spell_start'] = 'スペルチェック'; -$lang['spell_stop'] = '再開'; -$lang['spell_wait'] = 'しばらくお待ち下さい...'; -$lang['spell_noerr'] = 'スペルエラーなし'; -$lang['spell_nosug'] = '候補なし'; -$lang['spell_change'] = '変更'; $lang['metaedit'] = 'メタデータ編集'; $lang['metasaveerr'] = 'メタデータの書き込みに失敗しました'; $lang['metasaveok'] = 'メタデータは保存されました'; diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 2755fe37c..ddf30aed5 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -167,13 +167,6 @@ $lang['qb_chars'] = '특수문자'; $lang['del_confirm']= '정말로 선택된 항목(들)을 삭제하시겠습니까?'; $lang['admin_register']= '새로운 사용자 추가'; -$lang['spell_start'] = '맞춤법 검사'; -$lang['spell_stop'] = '편집모드로'; -$lang['spell_wait'] = '잠시 기다려주세요.'; -$lang['spell_noerr'] = '틀린 맞춤법이 없습니다.'; -$lang['spell_nosug'] = '제안되는 단어가 없습니다.'; -$lang['spell_change']= '변경'; - $lang['metaedit'] = '메타 데이타를 편집합니다.'; $lang['metasaveerr'] = '메타 데이타 쓰기가 실패했습니다.'; $lang['metasaveok'] = '메타 데이타가 저장되었습니다.'; diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php index 37ff27c8a..07e90a429 100644 --- a/inc/lang/lt/lang.php +++ b/inc/lang/lt/lang.php @@ -156,13 +156,6 @@ $lang['qb_chars'] = 'Specialūs simboliai'; $lang['del_confirm']= 'Ar tikrai ištrinti pažymėtą(us) įrašą(us)?'; $lang['admin_register']= 'Sukurti naują vartotoją'; -$lang['spell_start'] = 'Patikrinti rašybą'; -$lang['spell_stop'] = 'Tęsti redagavimą'; -$lang['spell_wait'] = 'Prašau palaukti...'; -$lang['spell_noerr'] = 'Klaidų nerasta'; -$lang['spell_nosug'] = 'Taisymo pasiūlymų nėra'; -$lang['spell_change']= 'Keisti'; - $lang['metaedit'] = 'Redaguoti metaduomenis'; $lang['metasaveerr'] = 'Nepavyko išsaugoti metaduomenų'; $lang['metasaveok'] = 'Metaduomenys išsaugoti'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 2301df26b..c1cf1b74b 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -170,13 +170,6 @@ $lang['qb_chars'] = 'Īpašās zīmes'; $lang['del_confirm']= 'Dzēst šo šķirkli?'; $lang['admin_register']= 'Pievienot jaunu lietotāju'; -$lang['spell_start'] = 'Pārbaudīt pareizrakstību'; -$lang['spell_stop'] = 'Turpināt labošanu'; -$lang['spell_wait'] = 'Lūdzu uzgaidīt...'; -$lang['spell_noerr'] = 'Kļūdu nav'; -$lang['spell_nosug'] = 'Ieteikumu nav'; -$lang['spell_change']= 'Aizstāt'; - $lang['metaedit'] = 'Labot metadatus'; $lang['metasaveerr'] = 'Metadati nav saglabāti'; $lang['metasaveok'] = 'Metadati saglabāti'; diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php index 80a482fda..efb99fb88 100644 --- a/inc/lang/mg/lang.php +++ b/inc/lang/mg/lang.php @@ -1,10 +1,6 @@ - * @author Anika Henke + * mg language file */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -136,12 +132,5 @@ $lang['acl_perm4'] = 'Manamboatra'; $lang['acl_perm8'] = 'Mandefa rakitra'; $lang['acl_perm16'] = 'Mamafa'; $lang['acl_new'] = 'Ampio andalana vaovao'; - -$lang['spell_start'] = 'Ahitsio ny tsipelina'; -$lang['spell_stop'] = 'Resume Editing'; -$lang['spell_wait'] = 'Andraso kely...'; -$lang['spell_noerr'] = 'Tsy nahitana diso'; -$lang['spell_nosug'] = 'Tsy misy soso-kevitra'; -$lang['spell_change']= 'Fiovana'; - + //Setup VIM: ex: et ts=2 enc=utf-8 : diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index f65dee517..cd4cc1cf0 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -160,12 +160,6 @@ $lang['qb_smileys'] = 'Smileys'; $lang['qb_chars'] = 'Speciale tekens'; $lang['del_confirm'] = 'Dit item verwijderen?'; $lang['admin_register'] = 'Nieuwe gebruiker toevoegen'; -$lang['spell_start'] = 'Controleer spelling'; -$lang['spell_stop'] = 'Doorgaan met aanpassen'; -$lang['spell_wait'] = 'Even wachten a.u.b...'; -$lang['spell_noerr'] = 'Geen fouten gevonden'; -$lang['spell_nosug'] = 'Geen suggesties'; -$lang['spell_change'] = 'Wijzig'; $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Writing metadata failed'; $lang['metasaveok'] = 'Metadata saved'; diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 1bf7fb0ed..e961292b4 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -153,12 +153,6 @@ $lang['qb_smileys'] = 'Humørfjes'; $lang['qb_chars'] = 'Spesialtegn'; $lang['del_confirm'] = 'Slett denne oppføringen?'; $lang['admin_register'] = 'Legg til ny bruker'; -$lang['spell_start'] = 'Sjekk stavelse'; -$lang['spell_stop'] = 'Tilbake til redigering'; -$lang['spell_wait'] = 'Vennligst vent...'; -$lang['spell_noerr'] = 'Ingen feil funnet'; -$lang['spell_nosug'] = 'Ingen forslag'; -$lang['spell_change'] = 'Endre'; $lang['metaedit'] = 'Rediger Metadata'; $lang['metasaveerr'] = 'Skriving av metadata feilet'; $lang['metasaveok'] = 'Metadata lagret'; diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index 2a2cb96b3..1cff60f06 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -155,12 +155,6 @@ $lang['qb_smileys'] = 'Emotikony'; $lang['qb_chars'] = 'Znaki specjalne'; $lang['del_confirm'] = 'Czy na pewno usunąć?'; $lang['admin_register'] = 'Dodawanie użytkownika'; -$lang['spell_start'] = 'Sprawdź pisownię'; -$lang['spell_stop'] = 'Zakończ sprawdzanie'; -$lang['spell_wait'] = 'Proszę czekać...'; -$lang['spell_noerr'] = 'Nie znaleziono błędów'; -$lang['spell_nosug'] = 'Brak podpowiedzi'; -$lang['spell_change'] = 'Zmień'; $lang['metaedit'] = 'Edytuj metadane'; $lang['metasaveerr'] = 'Zapis metadanych nie powiódł się'; $lang['metasaveok'] = 'Metadane zapisano'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index 6feeb53f9..59e067a95 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -158,12 +158,6 @@ $lang['qb_smileys'] = 'Carinhas'; $lang['qb_chars'] = 'Caracteres especiais'; $lang['del_confirm'] = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?'; $lang['admin_register'] = 'Adicionar novo usuário'; -$lang['spell_start'] = 'Verificar ortografia'; -$lang['spell_stop'] = 'Continuar edição'; -$lang['spell_wait'] = 'Por favor, aguarde...'; -$lang['spell_noerr'] = 'Nenhum erro encontrado'; -$lang['spell_nosug'] = 'Sem sugestões'; -$lang['spell_change'] = 'Alterar'; $lang['metaedit'] = 'Editar metadados'; $lang['metasaveerr'] = 'Não foi possível escrever os metadados'; $lang['metasaveok'] = 'Os metadados foram salvos'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 119366da6..be3d29a81 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -156,12 +156,6 @@ $lang['qb_smileys'] = 'Smileys'; $lang['qb_chars'] = 'Caracteres Especiais'; $lang['del_confirm'] = 'Remover esta entrada?'; $lang['admin_register'] = 'Inscrever Novo Utilizador'; -$lang['spell_start'] = 'Verificar Ortografia'; -$lang['spell_stop'] = 'Retomar a Edição'; -$lang['spell_wait'] = 'Por favor aguarde...'; -$lang['spell_noerr'] = 'Não existem erros de ortografia'; -$lang['spell_nosug'] = 'Nenhuma sugestão'; -$lang['spell_change'] = 'Alterar'; $lang['metaedit'] = 'Editar Metadata'; $lang['metasaveerr'] = 'Falhou a escrita de Metadata'; $lang['metasaveok'] = 'Metadata gravada'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 568b03461..9b42db9ef 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -159,12 +159,6 @@ $lang['qb_smileys'] = 'Смайлики'; $lang['qb_chars'] = 'Специальные символы'; $lang['del_confirm'] = 'Вы на самом деле желаете удалить выбранное?'; $lang['admin_register'] = 'Добавить пользователя'; -$lang['spell_start'] = 'Проверить орфографию'; -$lang['spell_stop'] = 'Продолжить редактирование'; -$lang['spell_wait'] = 'Пожалуйста, ждите...'; -$lang['spell_noerr'] = 'Ошибок не найдено'; -$lang['spell_nosug'] = 'Нет вариантов'; -$lang['spell_change'] = 'Заменить'; $lang['metaedit'] = 'Править метаданные'; $lang['metasaveerr'] = 'Ошибка записи метаданных'; $lang['metasaveok'] = 'Метаданные сохранены'; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index 981005902..6156c6d29 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -155,12 +155,6 @@ $lang['qb_smileys'] = 'Smajlíky'; $lang['qb_chars'] = 'Špeciálne znaky'; $lang['del_confirm'] = 'Zmazať túto položku?'; $lang['admin_register'] = 'Pridaj nového užívateľa'; -$lang['spell_start'] = 'Skontrolovať pravopis'; -$lang['spell_stop'] = 'Úprava výsledku'; -$lang['spell_wait'] = 'Prosím čakajte...'; -$lang['spell_noerr'] = 'Žiadne chyby nenájdené'; -$lang['spell_nosug'] = 'Žiadne doporučenia'; -$lang['spell_change'] = 'Zmena'; $lang['metaedit'] = 'Upraviť metainformácie'; $lang['metasaveerr'] = 'Zápis metainformácií zlyhal'; $lang['metasaveok'] = 'Metainformácie uložené'; diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php index e9a386ecb..c9c16a7fe 100644 --- a/inc/lang/sr/lang.php +++ b/inc/lang/sr/lang.php @@ -129,13 +129,6 @@ $lang['qb_sig'] = 'Убаци потпис'; $lang['del_confirm']= 'Обриши овај унос?'; $lang['admin_register']= 'Додај новог корисника'; -$lang['spell_start'] = 'Провери правопис'; -$lang['spell_stop'] = 'Настави са изменама'; -$lang['spell_wait'] = 'Молим Вас, сачекајте...'; -$lang['spell_noerr'] = 'Нису нађене грешке'; -$lang['spell_nosug'] = 'Нема сугестија'; -$lang['spell_change']= 'Измени'; - $lang['metaedit'] = 'Измени мета-податке'; $lang['metasaveerr'] = 'Записивање мета-података није било успешно'; $lang['metasaveok'] = 'Мета-подаци су сачувани'; diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index c9f709dab..903aabeb0 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -172,13 +172,6 @@ $lang['qb_chars'] = 'Specialtecken'; $lang['del_confirm']= 'Vill du verkligen radera?'; $lang['admin_register']= 'Lägg till ny användare'; -$lang['spell_start'] = 'Kontrollera stavning'; -$lang['spell_stop'] = 'Tillbaka till redigering'; -$lang['spell_wait'] = 'Vänta...'; -$lang['spell_noerr'] = 'Inga fel hittades'; -$lang['spell_nosug'] = 'Inga förslag'; -$lang['spell_change']= 'Ändra'; - $lang['metaedit'] = 'Redigera metadata'; $lang['metasaveerr'] = 'Skrivning av metadata misslyckades'; $lang['metasaveok'] = 'Metadata sparad'; diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php index 633325b4b..63baf4e13 100644 --- a/inc/lang/tr/lang.php +++ b/inc/lang/tr/lang.php @@ -129,13 +129,6 @@ $lang['qb_sig'] = 'İmza Ekle'; $lang['del_confirm']= 'Bu girişi sil?'; $lang['admin_register']= 'Yeni kullanıcı ekle...'; -$lang['spell_start'] = 'Hecelemeyi kontrol et'; -$lang['spell_stop'] = 'Değiştirmeye Devam et'; -$lang['spell_wait'] = 'Lütfen bekleyiniz...'; -$lang['spell_noerr'] = 'Hata bulunamadı'; -$lang['spell_nosug'] = 'Öneri yok'; -$lang['spell_change']= 'Değiştir'; - $lang['metaedit'] = 'Metaverileri Değiştir'; $lang['metasaveerr'] = 'Metaveri yazma başarısız '; $lang['metasaveok'] = 'Metaveri kaydedildi'; diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php index 69c24a7f6..2e126c4d1 100644 --- a/inc/lang/uk/lang.php +++ b/inc/lang/uk/lang.php @@ -161,13 +161,6 @@ $lang['qb_chars'] = 'Спеціальні символи'; $lang['del_confirm']= 'Дійсно знищити обрані елементи?'; $lang['admin_register']= 'Додати нового користувача'; -$lang['spell_start'] = 'Перевірити правопис'; -$lang['spell_stop'] = 'Продовжити редагування'; -$lang['spell_wait'] = 'Зачекайте, будь ласка...'; -$lang['spell_noerr'] = 'Помилок не знайдено'; -$lang['spell_nosug'] = 'Немає варіантів'; -$lang['spell_change']= 'Замінити'; - $lang['metaedit'] = 'Редагувати метадані'; $lang['metasaveerr'] = 'Помилка запису метаданих'; $lang['metasaveok'] = 'Метадані збережено'; diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index d3c78130a..db6e8ceec 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -158,13 +158,6 @@ $lang['qb_chars'] = '特殊字元'; $lang['del_confirm']= '確定要刪除該管理規則?'; $lang['admin_register']= '新增使用者中'; -$lang['spell_start'] = '檢查拼字中'; -$lang['spell_stop'] = '恢復編輯'; -$lang['spell_wait'] = '請稍後...'; -$lang['spell_noerr'] = '未發現任何錯誤'; -$lang['spell_nosug'] = '沒有建議事項'; -$lang['spell_change']= '更改'; - $lang['metaedit'] = '更改相片資料(EXIF)'; $lang['metasaveerr'] = '相片資料(EXIF)儲存失敗喔'; $lang['metasaveok'] = '相片資料已成功儲存'; diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index bf2cb7642..317ca02e6 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -171,13 +171,6 @@ $lang['qb_chars'] = '特殊字符'; $lang['del_confirm']= '真的要删除选中的项目吗?'; $lang['admin_register']= '添加新用户'; -$lang['spell_start'] = '拼写检查'; -$lang['spell_stop'] = '继续编辑'; -$lang['spell_wait'] = '请等待...'; -$lang['spell_noerr'] = '没有找到拼写错误'; -$lang['spell_nosug'] = '没有建议'; -$lang['spell_change']= '更改'; - $lang['metaedit'] = '编辑元数据'; $lang['metasaveerr'] = '写入元数据失败'; $lang['metasaveok'] = '元数据已保存'; diff --git a/lib/exe/js.php b/lib/exe/js.php index c4fd81616..ad166da8d 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -50,9 +50,6 @@ function js_out(){ if($edit){ if($write){ $files[] = DOKU_INC.'lib/scripts/edit.js'; - if($conf['spellchecker']){ - $files[] = DOKU_INC.'lib/scripts/spellcheck.js'; - } } $files[] = DOKU_INC.'lib/scripts/media.js'; } @@ -118,17 +115,6 @@ function js_out(){ // add lock timer js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")"); - - // load spell checker - if($conf['spellchecker']){ - js_runonstart("ajax_spell.init('". - js_escape($lang['spell_start'])."','". - js_escape($lang['spell_stop'])."','". - js_escape($lang['spell_wait'])."','". - js_escape($lang['spell_noerr'])."','". - js_escape($lang['spell_nosug'])."','". - js_escape($lang['spell_change'])."')"); - } } } diff --git a/lib/exe/spellcheck.php b/lib/exe/spellcheck.php deleted file mode 100644 index 01c70832e..000000000 --- a/lib/exe/spellcheck.php +++ /dev/null @@ -1,302 +0,0 @@ - - */ - -/** - * Licence info: This spellchecker is inspired by code by Garrison Locke available - * at http://www.broken-notebook.com/spell_checker/index.php (licensed under the Terms - * of an BSD license). The code in this file was nearly completly rewritten for DokuWiki - * and is licensed under GPL version 2 (See COPYING for details). - * - * Original Copyright notice follows: - * - * Copyright (c) 2005, Garrison Locke - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the http://www.broken-notebook.com nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - */ - -//fix for Opera XMLHttpRequests -if(!count($_POST) && $HTTP_RAW_POST_DATA){ - parse_str($HTTP_RAW_POST_DATA, $_POST); -} - -if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); -require_once (DOKU_INC.'inc/init.php'); -session_write_close(); -require_once (DOKU_INC.'inc/utf8.php'); -require_once (DOKU_INC.'inc/aspell.php'); -require_once (DOKU_INC.'inc/common.php'); - -header('Content-Type: text/plain; charset=utf-8'); - -//create spell object -$spell = new Aspell($conf['lang'],null,'utf-8'); -$spell->setMode(PSPELL_FAST); - -//add personal dictionary -if(@file_exists(DOKU_INC.'conf/words.aspell')){ - $spell->personal = DOKU_INC.'conf/words.aspell'; -} - -//call the requested function -$call = 'spell_'.$_POST['call']; -if(function_exists($call)){ - $call(); -}else{ - print "The called function does not exist!"; -} - -/** - * replaces a link with blanks of same length - * The first string is the complete link and - * and the second optional string might be the - * alternative text that would become part of - * the result string and will be checked for - * spelling errors again. - * - * callback for preg_replace_callback - * - * @author Matthias Grimm - * @author Andreas Gohr - */ -function spaceslink($matches){ - $string = unslash($matches[1]); - $check = unslash($matches[2]); - $result = ' '; //opening [[ - $result .= str_pad('',utf8_strlen($string),' '); - $result .= $check; - $result .= ' '; //closing ]] - - return $result; -} - -/** - * Spellchecker. Called by an AJAX request - * - * Runs the given Text through Aspell and prints XHTML with - * markup. The first char represents the error code: - * - * 0 - No spelling mistakes - * 1 - Spelling mistakes found - * 2 - An error occurred error message follows - * - * @author Andreas Gohr - */ -function spell_check() { - global $spell; - $string = $_POST['data']; - $misspell = false; - - // for streamlined line endings - $string = preg_replace("/(\015\012)|(\015)/","\012",$string); - $string = htmlspecialchars($string); - - // make sure multiple spaces and leading are kept - $string = preg_replace('/^ /m',' ',$string); - $string = preg_replace('/ /','  ',$string); - - // we need the text as array later - $data = explode("\n",$string); - - // don't check links and medialinks for spelling errors - $string = preg_replace_callback('/\{\{(.*?)(\|(.*?))?(\}\})/','spaceslink',$string); - $string = preg_replace_callback('/\[\[(.*?)(\|(.*?))?(\]\])/','spaceslink',$string); - - // run aspell in terse sgml mode, ignore nbsp as correct word - if(!$spell->runAspell($string,$out,$err,array('!','+html','@nbsp'))){ - print '2'; //to indicate an error - print "An error occurred while trying to run the spellchecker:\n"; - print $err; - return; - } - - #use this to debug raw aspell output - #print "1$out"; return; - - // go through the result - $lines = split("\n",$out); - $rcnt = count($lines)-1; // aspell result count - $lcnt = count($data)+1; // original line counter - - - for($i=$rcnt; $i>=0; $i--){ - $line = trim($lines[$i]); - if($line[0] == '@') continue; // comment - if($line[0] == '*') continue; // no mistake in this word - if($line[0] == '+') continue; // root of word was found - if($line[0] == '?') continue; // word was guessed - if(empty($line)){ - // empty line -> new source line - $lcnt--; - continue; - } - // now get the misspelled words - if(preg_match('/^& ([^ ]+) (\d+) (\d+): (.*)/',$line,$match)){ - // match with suggestions - $word = $match[1]; - $off = $match[3]-1; - $sug = split(', ',$match[4]); - }elseif(preg_match('/^# ([^ ]+) (\d+)/',$line,$match)){ - // match without suggestions - $word = $match[1]; - $off = $match[2]-1; - $sug = null; - }else{ - // couldn't parse output - print '2'; - print "The spellchecker output couldn't be parsed.\n"; - print "Line $i:".$line; - return; - } - - $misspell = true; - //aspell < 0.60 returns singlebyte offsets - if($spell->version >= 600){ - $len = utf8_strlen($word); - $data[$lcnt] = utf8_substr_replace($data[$lcnt],spell_formatword($word,$sug),$off, $len); - }else{ - $len = strlen($word); - $data[$lcnt] = substr_replace($data[$lcnt],spell_formatword($word,$sug),$off, $len); - } - - }//end of output parsing - - // the first char returns the spell info - if($misspell){ - $string = '1'.join('
',$data); - }else{ - $string = '0'.join('
',$data); - } - - if(!$_POST['utf8']){ - // encode multibyte chars as entities for broken Konqueror - $string = utf8_tohtml($string); - } - - //output - print $string; -} - -/** - * Formats a word with needed markup for the Suggestion Popup - * - * @author Andreas Gohr - */ -function spell_formatword($word,$suggestions=null){ - static $i = 1; - - if(is_array($suggestions)){ - //restrict to maximum of 7 elements - $suggestions = array_slice($suggestions,0,7); - $suggestions = array_map('htmlspecialchars',$suggestions); - - if(!$_POST['utf8']){ - //konqueror's broken UTF-8 handling needs this - $suggestions = array_map('utf8_tohtml',$suggestions); - } - - $suggestions = array_map('addslashes',$suggestions); - - $sug = ",'".join("','",$suggestions)."'"; // build javascript args - }else{ - $sug = ''; - } - - $link = ''.htmlspecialchars($word).''; - $i++; - return $link; -} - -/** - * Rewrite markuped XHTML back to plain Text. AJAX callback - * - * @author Andreas Gohr - */ -function spell_resume(){ - $text = $_POST['data']; - - //some browsers insert newlines instead of spaces - $text = preg_replace("/(\r\n|\n|\r)/", ' ', $text); - $text = preg_replace("=
=i", "\n", $text); - - // remove HTML tags - $text = strip_tags($text); - - // restore spaces - $text = preg_replace('/ /',' ',$text); - $text = preg_replace('/\xC2\xA0/',' ',$text); - - // restore quoted special chars - $text = unhtmlspecialchars($text); - - // check if UTF-8 is accepted - if(!$_POST['utf8']){ - // protect '&' (gets removed in JS later) - $text = str_replace('&','&',$text); - // encode multibyte chars as entities for broken Konqueror - $text = utf8_tohtml($text); - } - - // output - print $text; -} - -/** - * Just send data back as received for UTF-8 testing - */ -function spell_utf8test(){ - // we need to return the raw value - substr protects against XSS - print substr($_POST['data'],0,3); -} - -/** - * Reverse htmlspecialchars - * - * @author - * @author Andreas Gohr - */ -function unhtmlspecialchars($string, $quotstyle=ENT_COMPAT){ - $string = str_replace ( '&', '&', $string ); - $string = str_replace ( '<', '<', $string ); - $string = str_replace ( '>', '>', $string ); - - if($quotstyle != ENT_NOQUOTES){ - $string = str_replace ( '"', '\"', $string ); - } - if($quotstyle == ENT_QUOTES){ - $string = str_replace ( ''', '\'', $string ); - $string = str_replace ( ''', '\'', $string ); - } - - return $string; -} - -//Setup VIM: ex: et ts=2 enc=utf-8 : -?> diff --git a/lib/images/toolbar/spellcheck.png b/lib/images/toolbar/spellcheck.png deleted file mode 100644 index 8be69f115..000000000 Binary files a/lib/images/toolbar/spellcheck.png and /dev/null differ diff --git a/lib/images/toolbar/spellnoerr.png b/lib/images/toolbar/spellnoerr.png deleted file mode 100644 index 9dd7db976..000000000 Binary files a/lib/images/toolbar/spellnoerr.png and /dev/null differ diff --git a/lib/images/toolbar/spellstop.png b/lib/images/toolbar/spellstop.png deleted file mode 100644 index 234083e28..000000000 Binary files a/lib/images/toolbar/spellstop.png and /dev/null differ diff --git a/lib/images/toolbar/spellwait.gif b/lib/images/toolbar/spellwait.gif deleted file mode 100644 index ac2e96f05..000000000 Binary files a/lib/images/toolbar/spellwait.gif and /dev/null differ diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index d25a23493..da5b83685 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -96,7 +96,6 @@ $lang['gzip_output'] = 'Използване gzip Кодиране $lang['gdlib'] = 'Версия на GD Lib'; $lang['im_convert'] = 'Път до инструмента за трансформация на ImageMagick'; $lang['jpg_quality'] = 'Kачество на JPG компресията (0-100)'; -$lang['spellchecker'] = 'Проверка за правопис '; $lang['subscribers'] = 'Поддръжка за абониране към страница'; $lang['compress'] = 'Компактен CSS и javascript изход'; $lang['hidepages'] = 'Скриване на съвпадащи имена на страници(regular expressions)'; diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php index 158c9d125..186026fa6 100644 --- a/lib/plugins/config/lang/ca/lang.php +++ b/lib/plugins/config/lang/ca/lang.php @@ -94,7 +94,6 @@ $lang['gzip_output'] = 'Codifica contingut xhtml com a gzip'; $lang['gdlib'] = 'Versió GD Lib'; $lang['im_convert'] = 'Camí de la utilitat convert d\'ImageMagick'; $lang['jpg_quality'] = 'Qualitat de compressió JPEG (0-100)'; -$lang['spellchecker'] = 'Habilita la verificació de l\'ortografia'; $lang['subscribers'] = 'Habilita la subscripció a pàgines'; $lang['compress'] = 'Sortida CSS i Javascript compacta'; $lang['hidepages'] = 'Oculta pàgines coincidents (expressions regulars)'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index c6c9ac6d2..4f02249f8 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -103,7 +103,6 @@ $lang['gzip_output'] = 'Používat pro xhtml Content-Encoding gzip'; $lang['gdlib'] = 'Verze GD knihovny'; $lang['im_convert'] = 'Cesta k nástroji convert z balíku ImageMagick'; $lang['jpg_quality'] = 'Kvalita komprese JPEG (0-100)'; -$lang['spellchecker'] = 'Zapnout kontrolu pravopisu'; $lang['subscribers'] = 'Možnost přihlásit se k odběru novinek stránky'; $lang['compress'] = 'Zahustit CSS a JavaScript výstup'; $lang['hidepages'] = 'Skrýt stránky odpovídající vzoru (regulární výrazy)'; diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php index 74c2fa6a3..1580ccc74 100644 --- a/lib/plugins/config/lang/da/lang.php +++ b/lib/plugins/config/lang/da/lang.php @@ -117,7 +117,6 @@ $lang['gzip_output'] = 'Benyt gzip Content-Encoding til XHTML'; $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Sti til ImageMagick\'s convert værktøj'; $lang['jpg_quality'] = 'JPG komprimeringskvalitet (0-100)'; -$lang['spellchecker']= 'Slå stavekontrol til'; $lang['subscribers'] = 'Slå understøttelse af abonnement på sider til'; $lang['compress'] = 'Komprimer CSS og Javascript filer'; $lang['hidepages'] = 'Skjul matchende sider (regulære udtryk)'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index ef2fc296a..7cf190f10 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -97,7 +97,6 @@ $lang['gzip_output'] = 'Seiten mit gzip komprimiert ausliefern'; $lang['gdlib'] = 'GD Lib Version'; $lang['im_convert'] = 'Pfad zu ImageMagicks Konvertierwerkzeug'; $lang['jpg_quality'] = 'JPEG Kompressionsqualität (0-100)'; -$lang['spellchecker'] = 'Rechtschreibprüfung aktivieren'; $lang['subscribers'] = 'E-Mail-Abos zulassen'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; $lang['hidepages'] = 'Seiten verstecken (Regulärer Ausdruck)'; diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php index 7d3352ab8..957e53f57 100644 --- a/lib/plugins/config/lang/el/lang.php +++ b/lib/plugins/config/lang/el/lang.php @@ -102,7 +102,6 @@ $lang['gzip_output'] = 'Χρήση gzip Content-Encoding για την $lang['gdlib'] = 'Έκδοση βιβλιοθήκης GD'; $lang['im_convert'] = 'Διαδρομή προς το εργαλείο μετατροπής εικόνων του ImageMagick'; $lang['jpg_quality'] = 'Ποιότητα συμπίεσης JPG (0-100)'; -$lang['spellchecker'] = 'Ενεργοποίηση ελέγχου ορθογραφίας'; $lang['subscribers'] = 'Να επιτρέπεται η εγγραφή στην ενημέρωση αλλαγών σελίδας'; $lang['compress'] = 'Συμπίεση αρχείων CSS και javascript'; $lang['hidepages'] = 'Φίλτρο απόκρυψης σελίδων (regular expressions)'; diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 639c138f3..d385086ca 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -118,7 +118,6 @@ $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; $lang['jpg_quality'] = 'JPG compression quality (0-100)'; -$lang['spellchecker']= 'Enable spellchecker'; $lang['subscribers'] = 'Enable page subscription support'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['hidepages'] = 'Hide matching pages (regular expressions)'; diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index 1605333d9..8c2c23e70 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -96,7 +96,6 @@ $lang['gzip_output'] = 'Uzi gzip-a Enhav-Enkodigo por XHTML'; $lang['gdlib'] = 'Versio e GD Lib'; $lang['im_convert'] = 'Pado al la konvertilo de ImageMagick'; $lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)'; -$lang['spellchecker'] = 'Ebligi literumilon'; $lang['subscribers'] = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj'; $lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn'; $lang['hidepages'] = 'Kaŝi kongruantajn paĝojn (al regulaj esprimoj)'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index ed1d87ccc..4f0336044 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -95,7 +95,6 @@ $lang['gzip_output'] = 'Usar gzip Content-Encoding para xhtml'; $lang['gdlib'] = 'Versión de GD Lib'; $lang['im_convert'] = 'Ruta a la herramienta de conversión de ImageMagick'; $lang['jpg_quality'] = 'Calidad de compresión de JPG (0-100)'; -$lang['spellchecker'] = 'Habilitar corrector ortográfico'; $lang['subscribers'] = 'Habilitar soporte para subscripción a páginas'; $lang['compress'] = 'Compactar la salida de CSS y javascript'; $lang['hidepages'] = 'Ocultar páginas con coincidencias (expresiones regulares)'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 0f80501ff..7eda18d4e 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -97,7 +97,6 @@ $lang['gzip_output'] = 'Utiliser Content-Encoding gzip pour xhtml'; $lang['gdlib'] = 'Version GD Lib'; $lang['im_convert'] = 'Chemin vers l\'outil de conversion d\'ImageMagick'; $lang['jpg_quality'] = 'Qualité de compression JPG (0-100)'; -$lang['spellchecker'] = 'Activer la correction d\'orthographe'; $lang['subscribers'] = 'Activer l\'abonnement aux pages'; $lang['compress'] = 'Compresser CSS & javascript'; $lang['hidepages'] = 'Cacher pages correspondant à (expression régulière)'; diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index c4ab0c1b7..e937df621 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -95,7 +95,6 @@ $lang['gzip_output'] = 'Utilizar Contido-Codificación gzip para o xht $lang['gdlib'] = 'Versión da Libraría GD'; $lang['im_convert'] = 'Ruta deica a ferramenta de conversión ImageMagick'; $lang['jpg_quality'] = 'Calidade de compresión dos JPG (0-100)'; -$lang['spellchecker'] = 'Activar corrector ortográfico'; $lang['subscribers'] = 'Activar posibilidade de subscrición de páxina'; $lang['compress'] = 'Saída compacta de CSS e javascript'; $lang['hidepages'] = 'Agochar páxinas que coincidan (expresións regulares)'; diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php index d55685a09..6a5627e49 100644 --- a/lib/plugins/config/lang/he/lang.php +++ b/lib/plugins/config/lang/he/lang.php @@ -115,7 +115,6 @@ $lang['gzip_output'] = 'השתמש בקידוד תוכן של gzip עבור xhtm $lang['gdlib'] = 'גרסת ספרית ה-GD'; $lang['im_convert'] = 'נתיב לכלי ה-convert של ImageMagick'; $lang['jpg_quality'] = 'איכות הדחיסה של JPG (0-100)'; -$lang['spellchecker']= 'השתמש בבודק איות'; $lang['subscribers'] = 'התר תמיכה ברישום לדפים'; $lang['compress'] = 'פלט קומפקטי של CSS ו-javascript'; $lang['hidepages'] = 'הסתר דפים תואמים (ביטויים רגולריים)'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index 0d8f181d0..755d361d7 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -116,7 +116,6 @@ $lang['gzip_output'] = 'Usa il Content-Encoding gzip per xhtml'; $lang['gdlib'] = 'Versione GD Lib '; $lang['im_convert'] = 'Percorso per il convertitore di ImageMagick'; $lang['jpg_quality'] = 'Qualità di compressione JPG (0-100)'; -$lang['spellchecker']= 'Abilita il controllo ortografico'; $lang['subscribers'] = 'Abilita la sottoscrizione alle pagine'; $lang['compress'] = 'Comprimi i file CSS e javascript'; $lang['hidepages'] = 'Nascondi le pagine che soddisfano la condizione (inserire un\'espressione regolare)'; diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 20d8a1ecb..f6a5ef56f 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -97,7 +97,6 @@ $lang['gzip_output'] = 'xhtmlに対するコンテンツ圧縮(gzi $lang['gdlib'] = 'GDlibバージョン'; $lang['im_convert'] = 'ImageMagick変換ツールへのパス'; $lang['jpg_quality'] = 'JPG圧縮品質(0-100)'; -$lang['spellchecker'] = 'スペルチェック'; $lang['subscribers'] = '更新通知機能'; $lang['compress'] = 'CSSとJavaScriptを圧縮'; $lang['hidepages'] = '非公開ページ(Regex)'; diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 9ab158a6c..761acdfea 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -116,7 +116,6 @@ $lang['gzip_output'] = 'xhml내용 gzip압출 여부'; $lang['gdlib'] = 'GD 라이브러리 버전'; $lang['im_convert'] = 'ImageMagick 위치'; $lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; -$lang['spellchecker']= '맞춤법 검사기 사용'; $lang['subscribers'] = '페이지 갱신 알람 기능'; $lang['compress'] = '최적화된 CSS, javascript 출력'; $lang['hidepages'] = '매칭된 페이지 숨기기(정규식 매칭)'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index afdfa26e9..62a14906a 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -95,7 +95,6 @@ $lang['gzip_output'] = 'Gebruik gzip Content-Encoding voor xhtml'; $lang['gdlib'] = 'GD Lib versie'; $lang['im_convert'] = 'Path naar ImageMagick\'s convert tool'; $lang['jpg_quality'] = 'JPG compressie kwaliteit (0-100)'; -$lang['spellchecker'] = 'Spellingscontrole aanzetten'; $lang['subscribers'] = 'Page subscription ondersteuning aanzetten'; $lang['compress'] = 'Compacte CSS en javascript output'; $lang['hidepages'] = 'Verberg deze pagina\'s (regular expressions)'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index c2c6410db..b43e807c1 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -96,7 +96,6 @@ $lang['gzip_output'] = 'Bruk gzip Content-Encoding for XHTML'; $lang['gdlib'] = 'Versjon av libGD'; $lang['im_convert'] = 'Sti til ImageMagicks konverteringsverktøy'; $lang['jpg_quality'] = 'JPEG-kvalitet (0-100)'; -$lang['spellchecker'] = 'Bruk stavekontroll'; $lang['subscribers'] = 'Åpne for abonnement på endringer av en side'; $lang['compress'] = 'Kompakt CSS og JavaScript'; $lang['hidepages'] = 'Skjul sider fra automatiske lister (regulære uttrykk)'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 90449ed0a..5da22571b 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -94,7 +94,6 @@ $lang['gzip_output'] = 'Używaj GZIP dla XHTML'; $lang['gdlib'] = 'Wersja biblioteki GDLib'; $lang['im_convert'] = 'Ścieżka do programu imagemagick'; $lang['jpg_quality'] = 'Jakość kompresji JPG (0-100)'; -$lang['spellchecker'] = 'Sprawdzanie pisowni'; $lang['subscribers'] = 'Subskrypcja'; $lang['compress'] = 'Kompresja arkuszy CSS i plików JavaScript'; $lang['hidepages'] = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)'; diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 3f5ce964e..4cd06a54c 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -94,7 +94,6 @@ $lang['gzip_output'] = 'Usar Content-Encoding gzip para o xhtml'; $lang['gdlib'] = 'Versão da GD Lib'; $lang['im_convert'] = 'Caminho para a ferramenta de conversão ImageMagick'; $lang['jpg_quality'] = 'Qualidade de compressão do JPG (0-100)'; -$lang['spellchecker'] = 'Habilitar verificação ortográfica'; $lang['subscribers'] = 'Habilitar o suporte a monitoramento de páginas'; $lang['compress'] = 'Compactar as saídas de CSS e JavaScript'; $lang['hidepages'] = 'Esconder páginas correspondentes (expressão regular)'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index 9f2ebd4ea..0c6eac0c9 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -97,7 +97,6 @@ $lang['gzip_output'] = 'Использовать gzip Content-Encoding $lang['gdlib'] = 'Версия GD Lib'; $lang['im_convert'] = 'Путь к imagemagick'; $lang['jpg_quality'] = 'Качество сжатия JPG (0-100)'; -$lang['spellchecker'] = 'Включить проверку орфографии'; $lang['subscribers'] = 'Разрешить подписку на изменения'; $lang['compress'] = 'Сжимать файлы CSS и javascript'; $lang['hidepages'] = 'Скрыть страницы (рег. выражение)'; diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php index 1ad397784..a0844e855 100644 --- a/lib/plugins/config/lang/sv/lang.php +++ b/lib/plugins/config/lang/sv/lang.php @@ -117,7 +117,6 @@ $lang['gzip_output'] = 'Använd gzip Content-Encoding för xhtml'; $lang['gdlib'] = 'Version av GD-biblioteket'; $lang['im_convert'] = 'Sökväg till ImageMagicks konverteringsverktyg'; $lang['jpg_quality'] = 'Kvalitet för JPG-komprimering (0-100)'; -$lang['spellchecker']= 'Aktivera stavningskontroll'; $lang['subscribers'] = 'Aktivera stöd för prenumeration på ändringar'; $lang['compress'] = 'Komprimera CSS och javascript'; $lang['hidepages'] = 'Dölj matchande sidor (reguljära uttryck)'; diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php index 43241a458..de122915f 100644 --- a/lib/plugins/config/lang/uk/lang.php +++ b/lib/plugins/config/lang/uk/lang.php @@ -116,7 +116,6 @@ $lang['gdlib'] = 'Версія GD Lib'; $lang['gzip_output'] = 'Використовувати gzip, як Content-Encoding для xhtml'; $lang['im_convert'] = 'Шлях до ImageMagick'; $lang['jpg_quality'] = 'Якість компресії JPG (0-100)'; -$lang['spellchecker']= 'Дозволити перевірку орфографії'; $lang['subscribers'] = 'Підписка на зміни'; $lang['compress'] = 'Стискати файли CSS та javascript'; $lang['hidepages'] = 'Ховати сторінки (regular expressions)'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index d099cbd02..accd85d47 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -118,7 +118,6 @@ $lang['gzip_output'] = '对 xhtml 使用 gzip 内容编码'; $lang['gdlib'] = 'GD 库版本'; $lang['im_convert'] = 'ImageMagick 转换工具的路径'; $lang['jpg_quality'] = 'JPG 压缩质量(0-100)'; -$lang['spellchecker']= '启用拼写检查'; $lang['subscribers'] = '启用页面订阅支持'; $lang['compress'] = '使 CSS 和 javascript 输出更紧密'; $lang['hidepages'] = '隐藏匹配的界面(正则表达式)'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 1f886737d..099848b94 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -130,7 +130,6 @@ $meta['iexssprotect']= array('onoff'); $meta['_editing'] = array('fieldset'); $meta['usedraft'] = array('onoff'); -$meta['spellchecker']= array('onoff'); $meta['htmlok'] = array('onoff'); $meta['phpok'] = array('onoff'); $meta['notify'] = array('email'); diff --git a/lib/scripts/spellcheck.js b/lib/scripts/spellcheck.js deleted file mode 100644 index 73b392f5b..000000000 --- a/lib/scripts/spellcheck.js +++ /dev/null @@ -1,456 +0,0 @@ -/** - * DokuWiki Spellcheck AJAX clientside script - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Andreas Gohr - */ - -/** - * Licence info: This spellchecker is inspired by code by Garrison Locke available - * at http://www.broken-notebook.com/spell_checker/index.php (licensed under the Terms - * of an BSD license). The code in this file was nearly completly rewritten for DokuWiki - * and is licensed under GPL version 2 (See COPYING for details). - * - * Original Copyright notice follows: - * - * Copyright (c) 2005, Garrison Locke - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the http://www.broken-notebook.com nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - */ - -/* - * Uses some general functions defined elsewhere. Here is a list: - * - * Defined in script.js: - * - * findPosX() - * findPosY() - * - * Defined in events.js: - * - * addEvent() - * - * Defined in edit.js: - * - * createToolButton() - */ - -/** - * quotes single quotes - * - * @author Andreas Gohr - */ -function qquote(str){ - return str.split('\'').join('\\\''); -} - -/** - * AJAX Spellchecker Class - * - * Note to some function use a hardcoded instance named ajax_spell to make - * references to object members. Used Object-IDs are hardcoded in the init() - * method. - * - * @author Andreas Gohr - * @author Garrison Locke - */ -function ajax_spell_class(){ - this.inited = false; - this.utf8ok = 1; - this.handler = DOKU_BASE+'lib/exe/spellcheck.php'; - // to hold the page objects (initialized with init()) - this.textboxObj = null; - this.showboxObj = null; - this.suggestObj = null; - this.editbarObj = null; - this.buttonObj = null; - this.imageObj = null; - - // hold translations - this.txtStart = 'Check Spelling'; - this.txtStop = 'Resume Editing'; - this.txtRun = 'Checking...'; - this.txtNoErr = 'No Mistakes'; - this.txtNoSug = 'No Suggestions'; - this.txtChange= 'Change'; - - this.timer = null; - - /** - * Initializes everything - * - * Call after the page was setup. Hardcoded element IDs here. - * - * @author Andreas Gohr - */ - this.init = function(txtStart,txtStop,txtRun,txtNoErr,txtNoSug,txtChange){ - // don't run twice - if (this.inited){ return; } - this.inited = true; - - // check for AJAX availability - var ajax = new sack(this.handler); - if(ajax.failed){ return; } - - // get Elements - this.textboxObj = document.getElementById('wiki__text'); - this.editbarObj = document.getElementById('wiki__editbar'); - this.showboxObj = document.getElementById('spell__result'); - this.suggestObj = document.getElementById('spell__suggest'); - - - // set wordwrap style with browser propritary attributes - if(is_gecko){ - this.showboxObj.style.whiteSpace = '-moz-pre-wrap'; // Mozilla, since 1999 - }else if(is_opera_preseven){ - this.showboxObj.style.whiteSpace = '-pre-wrap'; // Opera 4-6 - }else if(is_opera_seven){ - this.showboxObj.style.whiteSpace = '-o-pre-wrap'; // Opera 7 - }else{ - this.showboxObj.style['word-wrap'] = 'break-word'; //Internet Explorer 5.5+ - } - // Which browser supports this? - // this.showboxObj.style.whiteSpace = 'pre-wrap'; // css-3 - - - // set Translation Strings - this.txtStart = txtStart; - this.txtStop = txtStop; - this.txtRun = txtRun; - this.txtNoErr = txtNoErr; - this.txtNoSug = txtNoSug; - this.txtChange= txtChange; - - // create ToolBar Button with ID and add it to the toolbar with null action - var toolbarObj = document.getElementById('tool__bar'); - this.buttonObj = createToolButton('spellcheck.png',txtStart,'k','spell__check'); - this.buttonObj.onclick = function(){return false;}; - toolbarObj.appendChild(this.buttonObj); - this.imageObj = document.getElementById('spell__check_ico'); - - // start UTF-8 compliance test - send an UTF-8 char and see what comes back - ajax.AjaxFailedAlert = ''; - ajax.encodeURIString = false; - ajax.onCompletion = this.initReady; - ajax.runAJAX('call=utf8test&data='+encodeURIComponent('ü')); - - // second part of initialisation is in initReady() function - }; - - /** - * Eventhandler for click objects anywhere on the document - * - * Disables the suggestion box - * - * @author Andreas Gohr - * @author Garrison Locke - */ - this.docClick = function(e){ - // what was clicked? - try{ - target = window.event.srcElement; - }catch(ex){ - target = e.target; - } - - if (target.id != ajax_spell.suggestObj.id){ - ajax_spell.suggestObj.style.display = "none"; - } - }; - - /** - * Changes the Spellchecker link according to the given mode - * - * @author Andreas Gohr - */ - this.setState = function(state){ - switch (state){ - case 'stop': - ajax_spell.buttonObj.onclick = function(){ ajax_spell.resume(); return false; }; - ajax_spell.buttonObj.title = ajax_spell.txtStop; - ajax_spell.buttonObj.accessKey = ''; - ajax_spell.imageObj.src = DOKU_BASE+'lib/images/toolbar/spellstop.png'; - break; - case 'noerr': - ajax_spell.buttonObj.onclick = function(){ajax_spell.setState('start'); return false; }; - ajax_spell.buttonObj.title = ajax_spell.txtNoErr; - ajax_spell.buttonObj.accessKey = ''; - ajax_spell.imageObj.src = DOKU_BASE+'lib/images/toolbar/spellnoerr.png'; - break; - case 'run': - ajax_spell.buttonObj.onclick = function(){return false;}; - ajax_spell.buttonObj.title = ajax_spell.txtRun; - ajax_spell.buttonObj.accessKey = ''; - ajax_spell.imageObj.src = DOKU_BASE+'lib/images/toolbar/spellwait.gif'; - break; - default: - ajax_spell.buttonObj.onclick = function(){ ajax_spell.run(); return false; }; - ajax_spell.buttonObj.title = ajax_spell.txtStart+' [ALT-K]'; - ajax_spell.buttonObj.accessKey = 'k'; - ajax_spell.imageObj.src = DOKU_BASE+'lib/images/toolbar/spellcheck.png'; - break; - } - }; - - /** - * Replaces a word identified by id with its correction given in word - * - * @author Garrison Locke - */ - this.correct = function (id, word){ - var obj = document.getElementById('spell__error'+id); - obj.innerHTML = decodeURIComponent(word); - obj.style.color = "#005500"; - this.suggestObj.style.display = "none"; - }; - - /** - * Opens a prompt to let the user change the word her self - * - * @author Andreas Gohr - */ - this.ask = function(id){ - var word = document.getElementById('spell__error'+id).innerHTML; - word = prompt(this.txtChange,word); - if(word){ - this.correct(id,encodeURIComponent(word)); - } - }; - - /** - * Displays the suggestions for a misspelled word - * - * @author Andreas Gohr - * @author Garrison Locke - */ - this.suggest = function(){ - var args = this.suggest.arguments; - if(!args[0]){ return; } - var id = args[0]; - - // set position of the popup - this.suggestObj.style.display = "none"; - var x = findPosX('spell__error'+id); - var y = findPosY('spell__error'+id); - - // handle scrolling - var scrollPos; - if(is_opera){ - scrollPos = 0; //FIXME how to do this without browser sniffing? - }else{ - scrollPos = this.showboxObj.scrollTop; - } - - this.suggestObj.style.left = x+'px'; - this.suggestObj.style.top = (y+16-scrollPos)+'px'; - - // handle suggestions - var text = ''; - if(args.length == 1){ - text += this.txtNoSug+'
'; - }else{ - for(var i=1; i'; - text += args[i]; - text += '
'; - } - } - // add option for manual edit - text += ''; - text += '['+this.txtChange+']'; - text += '
'; - - this.suggestObj.innerHTML = text; - this.suggestObj.style.display = "block"; - }; - - // --- Callbacks --- - - /** - * Callback. Called after the object was initialized and UTF-8 tested - * Inside the callback 'this' is the SACK object!! - * - * @author Andreas Gohr - */ - this.initReady = function(){ - var data = this.response; - - //test for UTF-8 compliance (will fail for konqueror) - if(data != 'ü'){ - ajax_spell.utf8ok = 0; - } - - // register click event - addEvent(document,'click',ajax_spell.docClick); - - // register focus event - addEvent(ajax_spell.textboxObj,'focus',ajax_spell.setState); - - // get started - ajax_spell.setState('start'); - }; - - /** - * Callback. Called after finishing spellcheck. - * Inside the callback 'this' is the SACK object!! - * - * @author Andreas Gohr - */ - this.start = function(){ - if(ajax_spell.timer !== null){ - window.clearTimeout(ajax_spell.timer); - ajax_spell.timer = null; - }else{ - // there is no timer set, we timed out already - return; - } - - var data = this.response; - var error = data.charAt(0); - data = data.substring(1); - if(error == '1'){ - ajax_spell.setState('stop'); - - // convert numeric entities back to UTF-8 if needed - if(!ajax_spell.utf8ok){ - data = data.replace(/&#(\d+);/g, - function(whole,match1) { - return String.fromCharCode(+match1); - }); - } - - // replace textbox through div - ajax_spell.showboxObj.innerHTML = data; - ajax_spell.showboxObj.style.width = ajax_spell.textboxObj.style.width; - ajax_spell.showboxObj.style.height = ajax_spell.textboxObj.style.height; - ajax_spell.textboxObj.style.display = 'none'; - ajax_spell.showboxObj.style.display = 'block'; - }else{ - if(error == '2'){ - alert(data); - } - ajax_spell.textboxObj.disabled = false; - ajax_spell.editbarObj.style.visibility = 'visible'; - ajax_spell.setState('noerr'); - } - }; - - /** - * Callback. Gets called by resume() - switches back to edit mode - * Inside the callback 'this' is the SACK object!! - * - * @author Andreas Gohr - */ - this.stop = function(){ - var data = this.response; - - // convert numeric entities back to UTF-8 if needed - if(!ajax_spell.utf8ok){ - data = data.replace(/&#(\d+);/g, - function(whole,match1) { - return String.fromCharCode(+match1); - }); - // now remove & protection - data = data.replace(/&/g,'&'); - } - - // replace div with textbox again - ajax_spell.textboxObj.value = data; - ajax_spell.textboxObj.disabled = false; - ajax_spell.showboxObj.style.display = 'none'; - ajax_spell.textboxObj.style.display = 'block'; - ajax_spell.editbarObj.style.visibility = 'visible'; - ajax_spell.showboxObj.innerHTML = ''; - ajax_spell.setState('start'); - }; - - /** - * Calback for the timeout handling - * - * Will be called when the aspell backend didn't return - */ - this.timedOut = function(){ - if(ajax_spell.timer !== null){ - window.clearTimeout(ajax_spell.timer); - ajax_spell.timer = null; - - ajax_spell.textboxObj.disabled = false; - ajax_spell.showboxObj.style.display = 'none'; - ajax_spell.textboxObj.style.display = 'block'; - ajax_spell.editbarObj.style.visibility = 'visible'; - ajax_spell.showboxObj.innerHTML = ''; - ajax_spell.setState('start'); - - window.alert('Error: The spell checker did not respond'); - } - }; - - // --- Callers --- - - /** - * Starts the spellchecking by sending an AJAX request - * - * @author Andreas Gohr - */ - this.run = function(){ - ajax_spell.setState('run'); - ajax_spell.textboxObj.disabled = true; - ajax_spell.editbarObj.style.visibility = 'hidden'; - var ajax = new sack(ajax_spell.handler); - ajax.AjaxFailedAlert = ''; - ajax.encodeURIString = false; - ajax.onCompletion = this.start; - ajax.runAJAX('call=check&utf8='+ajax_spell.utf8ok+ - '&data='+encodeURIComponent(ajax_spell.textboxObj.value)); - - // abort after 13 seconds - this.timer = window.setTimeout(ajax_spell.timedOut,13000); - }; - - /** - * Rewrites the HTML back to text again using an AJAX request - * - * @author Andreas Gohr - */ - this.resume = function(){ - ajax_spell.setState('run'); - var text = ajax_spell.showboxObj.innerHTML; - if(text !== ''){ - var ajax = new sack(ajax_spell.handler); - ajax.AjaxFailedAlert = ''; - ajax.encodeURIString = false; - ajax.onCompletion = ajax_spell.stop; - ajax.runAJAX('call=resume&utf8='+ajax_spell.utf8ok+ - '&data='+encodeURIComponent(text)); - } - }; - -} - -// create the global object -ajax_spell = new ajax_spell_class(); - -//Setup VIM: ex: et ts=2 enc=utf-8 : diff --git a/lib/styles/spellcheck.css b/lib/styles/spellcheck.css deleted file mode 100644 index 51106f95a..000000000 --- a/lib/styles/spellcheck.css +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Basic styles for the spellchecker. Only included when the spellcheck option - * is enabled. These styles are the absolute minimum to make the spellchecker - * work. Templates should add addional styles for making it look nice. - */ - -div.dokuwiki div#spell__suggest { - position: absolute; - left: 0; - top: 0; - display: none; - z-index: 2; -} - -div.dokuwiki div#spell__result { - display:none; - font-family:monospace; - overflow: auto; - z-index: 1; -} - diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index c407de815..0b4e29634 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -745,38 +745,6 @@ button.pickerbutton { cursor: pointer; } -/* ---------- Spellchecking ------------- */ - -div.dokuwiki a.spell_error { - color: #f00; - text-decoration: underline; -} - -div.dokuwiki div#spell__suggest { - background-color: __background__; - padding: 2px; - border: 1px solid __text__; - font-size: 80%; - display: none; -} - -div.dokuwiki div#spell__result { - border: 1px solid __border__; - color: __text__; - font-size: 14px; - padding: 3px; - background-color: __background_other__; - display: none; -} - -div.dokuwiki span.spell_noerr { - color: #093; -} - -div.dokuwiki span.spell_wait { - color: #06c; -} - /* --------------- Image Details ----------------- */ div.dokuwiki div.img_big { -- cgit v1.2.3