From 1555115be70d80988f6a27ffffa055d226f9cc22 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 14 Feb 2010 05:51:51 +0000 Subject: [PATCH] moved aspell_path config to setup, vor obvious reasons --- admin/lang/egw_cs.lang | 1 - admin/lang/egw_de.lang | 1 - admin/lang/egw_en.lang | 1 - admin/lang/egw_es-es.lang | 1 - admin/lang/egw_nl.lang | 1 - admin/lang/egw_pt-br.lang | 1 - admin/lang/egw_ru.lang | 1 - admin/lang/egw_sk.lang | 1 - admin/lang/egw_zh.lang | 1 - admin/templates/default/config.tpl | 7 ------- setup/inc/class.setup_process.inc.php | 13 ++++++++++--- setup/lang/egw_cs.lang | 1 + setup/lang/egw_da.lang | 0 setup/lang/egw_de.lang | 1 + setup/lang/egw_el.lang | 0 setup/lang/egw_en.lang | 1 + setup/lang/egw_es-es.lang | 1 + setup/lang/egw_eu.lang | 0 setup/lang/egw_nl.lang | 1 + setup/lang/egw_pt-br.lang | 1 + setup/lang/egw_ru.lang | 1 + setup/lang/egw_rw.lang | 0 setup/lang/egw_sk.lang | 1 + setup/lang/egw_tr.lang | 0 setup/lang/egw_uk.lang | 0 setup/lang/egw_zh.lang | 1 + setup/templates/default/config.tpl | 8 ++++++++ 27 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 setup/lang/egw_da.lang create mode 100644 setup/lang/egw_el.lang create mode 100644 setup/lang/egw_eu.lang create mode 100644 setup/lang/egw_rw.lang create mode 100644 setup/lang/egw_tr.lang create mode 100644 setup/lang/egw_uk.lang diff --git a/admin/lang/egw_cs.lang b/admin/lang/egw_cs.lang index 9f567f188c..6668277e93 100644 --- a/admin/lang/egw_cs.lang +++ b/admin/lang/egw_cs.lang @@ -112,7 +112,6 @@ check items to %1 to %2 for %3 admin cs Zkontrolovat položky k %1 click to select a color admin cs Klikněte pro výběr barvy color admin cs Barva command scheduled to run at %1 admin cs Spuštění příkazu naplánováno na %1 -complete path to aspell program admin cs Celá cesta k programu aspell cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin cs Cookie doména (výchozí prázdná hodnota znamená použití celého doménového jména; ve Správci webu např. ".domena.cz" dovoluje použít stejnou cookie pro egw.domena.cz i www.domena.cz) cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin cs Cookie cesta (umožňuje několik eGW relací s různými adresáři, nefunguje korektně ve Správci webu!) could not remote execute the command admin cs Příkaz nebylo možné vzdáleně spustit. diff --git a/admin/lang/egw_de.lang b/admin/lang/egw_de.lang index 1f59a7acfd..ade04d4614 100644 --- a/admin/lang/egw_de.lang +++ b/admin/lang/egw_de.lang @@ -116,7 +116,6 @@ click to select a color admin de Anclicken um eine Farbe auszuwählen color admin de Farbe command scheduled to run at %1 admin de Ausführung des Befehls eingeplant am/um %1 commercial: all sorts of companies admin de Kommerziell: alle Arten von Firmen -complete path to aspell program admin de Vollständiger Pfad zum Programm ASPELL config password or md5 hash from the header.inc.php admin de Konfigurationspasswort oder md5 Hash von der header.inc.php Datei cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin de Cookie Domain (Vorgabe 'leer' bedeutet den kompletten Domainnamen, für SiteMgr erlaubt zB. ".domain.com" das gleiche Cookie für egw.domain.com und www.domain.com zu verwenden) cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin de Cookie Pfad (erlaubt mehrere eGW Sitzungen mit unterschiedlichen Verzeichnissen, hat Probleme mit SiteMgr!) diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang index f6706c93ef..6f70078168 100644 --- a/admin/lang/egw_en.lang +++ b/admin/lang/egw_en.lang @@ -116,7 +116,6 @@ click to select a color admin en Click to select a color color admin en Color command scheduled to run at %1 admin en Command scheduled to run at %1 commercial: all sorts of companies admin en Commercial: all sorts of companies -complete path to aspell program admin en Complete path to aspell program config password or md5 hash from the header.inc.php admin en Config password or md5 hash from the header.inc.php cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin en Cookie domain (default empty means use full domain name, for SiteMgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin en Cookie path (allows multiple eGW sessions with different directories, has problemes with SiteMgr!) diff --git a/admin/lang/egw_es-es.lang b/admin/lang/egw_es-es.lang index f7bb594022..fd5b132508 100644 --- a/admin/lang/egw_es-es.lang +++ b/admin/lang/egw_es-es.lang @@ -115,7 +115,6 @@ click to select a color admin es-es Pulse para seleccionar un color color admin es-es Color command scheduled to run at %1 admin es-es El comando se ha planificado para ejecutarse a %1 commercial: all sorts of companies admin es-es Comercial: todo tipo de empresas -complete path to aspell program admin es-es Ruta completa al programa aspell config password or md5 hash from the header.inc.php admin es-es Configurar contraseña o hash md5 del fichero header.inc.php cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin es-es Dominio de la cookie (vacío significa usar el nombre del dominio completo, para el Administrador de sitios web, p. ej. "dominio.com" permite usar la misma cookie para egw.dominio.com y www.dominio.com) cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin es-es Ruta de la cookie (permite múltiples sesiones de egw con distintos directorios, pero ¡tiene problemas con el Administrador de sitios web!) diff --git a/admin/lang/egw_nl.lang b/admin/lang/egw_nl.lang index f067488ff2..c47dada9ff 100644 --- a/admin/lang/egw_nl.lang +++ b/admin/lang/egw_nl.lang @@ -108,7 +108,6 @@ check items to %1 to %2 for %3 admin nl Controleer items van %1 to click to select a color admin nl Klik om een kleur te kiezen color admin nl Kleur command scheduled to run at %1 admin nl Command is gepland om om %1 uitgevoerd te worden -complete path to aspell program admin nl Volledige pad naar aspell programma cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin nl Cook domein (standaard leeg wat betekent dat de volledige domeinnaam gebruikt wordt. Voorbeeld: ".domein.nl" maakt het mogelijk om hetzelfde cookie te gebruiken voor verschillende subdomeinen als egw.domein.nl en www.domein.nl. cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin nl Cookie pad (maakt het mogelijk om meerdere eGW sessies in verschillende directories te gebruiken. Dit geeft problemen met SiteMgr! could not remote execute the command admin nl Kon het commando op afstand niet uivoeren diff --git a/admin/lang/egw_pt-br.lang b/admin/lang/egw_pt-br.lang index 8cb46aab8a..336f238f0c 100644 --- a/admin/lang/egw_pt-br.lang +++ b/admin/lang/egw_pt-br.lang @@ -108,7 +108,6 @@ check items to %1 to %2 for %3 admin pt-br Marcar itens de %1 a % click to select a color admin pt-br Clique para selecionar uma cor color admin pt-br Cor command scheduled to run at %1 admin pt-br Comando agendado para rodar às %1 -complete path to aspell program admin pt-br Caminho completo para o programa aspell cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin pt-br Cookie domínio (o padrão vazio significa usar o nome completo do domínio, por exemplo: para SiteMgr ".dominio.com.br" permite usar o mesmo domínio para egw.dominio.com.br e www.dominio.com.br) cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin pt-br Cookie caminho (permite múltiplas sessões eGW com diferentes diretórios, mas tem problemas com SiteMgr!) could not remote execute the command admin pt-br Não foi possível executar remotamente o comando diff --git a/admin/lang/egw_ru.lang b/admin/lang/egw_ru.lang index fdc3c9d3e6..cdde53f45b 100644 --- a/admin/lang/egw_ru.lang +++ b/admin/lang/egw_ru.lang @@ -108,7 +108,6 @@ check items to %1 to %2 for %3 admin ru Проверить элемент click to select a color admin ru Щелкните для выбора цвета color admin ru Цвет command scheduled to run at %1 admin ru Команда запланирована на запуск %1 -complete path to aspell program admin ru Полный путь до программы проверки орфографии(?) cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin ru Домен куки (по-умолчанию пуст и позволяет использовать полное имя домена, для менеджера сайта (SiteMgr) например ".domain.ru" позволяет использовать один файл куки как для egw.domain.ru так и www.domain.ru) cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin ru Путь куки (позволяет одновременно работать нескольким сессиям с различными папками, имеются проблемы с менеджером сайта (SiteMgr!) could not remote execute the command admin ru Не могу удаленно запустить команду diff --git a/admin/lang/egw_sk.lang b/admin/lang/egw_sk.lang index 5230770312..b620414b6d 100644 --- a/admin/lang/egw_sk.lang +++ b/admin/lang/egw_sk.lang @@ -112,7 +112,6 @@ check items to %1 to %2 for %3 admin sk Skontrolovať položky po %1%1 to %2 for %3 admin zh 检查%3对%2的权限项目 % click to select a color admin zh 点击选择一种颜色 color admin zh 颜色 command scheduled to run at %1 admin zh 计划命令运行在%1 -complete path to aspell program admin zh Aspell (拼写检查软件)程序的完整路径 cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin zh Cookie 域 (默认为空表示使用完整域名，对于 SiteMgr 等 ".domain.com" 允许 egw.domain.com 与 www.domain.com 使用同一个 cookie) cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin zh Cookie 路径 (允许多个 eGW 会话使用不同的目录，与 SiteMgr 会有问题！) could not remote execute the command admin zh 不能远程执行命令 diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl index dc3cf039d0..9956f873c8 100644 --- a/admin/templates/default/config.tpl +++ b/admin/templates/default/config.tpl @@ -136,13 +136,6 @@ - - {lang_Complete_path_to_aspell_program}: - - - - -  {lang_security} diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php index 142184e300..4f9f64be5f 100755 --- a/setup/inc/class.setup_process.inc.php +++ b/setup/inc/class.setup_process.inc.php @@ -206,7 +206,7 @@ class setup_process { $is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN'; - $current_config['site_title'] = 'eGroupWare'; + $current_config['site_title'] = 'EGroupware'; $current_config['hostname'] = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost'; // guessing the eGW url @@ -235,6 +235,7 @@ class setup_process } $current_config['files_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/files'; $current_config['backup_dir'] = '/var/lib/'.$egroupwareDirName.'/'.$GLOBALS['egw_setup']->ConfigDomain.'/backup'; + $current_config['aspell_path'] = '/usr/bin/aspell'; } else { @@ -246,8 +247,14 @@ class setup_process { $current_config['temp_dir'] = 'c:\\path\\to\\temp\\dir'; } - $current_config['files_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files'; - $current_config['backup_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\backup'; + $current_config['files_dir'] = 'C:\\Program Files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files'; + $current_config['backup_dir'] = 'C:\\Program Files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\backup'; + $current_config['aspell_path'] = 'C:\Program Files\Aspell\bin\aspell.exe'; + } + // only set aspell path, if it's installed + if (!is_executable($current_config['aspell_path'])) + { + unset($current_config['aspell_path']); } // RalfBecker: php.net recommend this for security reasons, it should be our default too $current_config['usecookies'] = 'True'; diff --git a/setup/lang/egw_cs.lang b/setup/lang/egw_cs.lang index ccc2f614be..e86b169204 100644 --- a/setup/lang/egw_cs.lang +++ b/setup/lang/egw_cs.lang @@ -679,3 +679,4 @@ your tables will be dropped and you will lose data setup cs Vaše tabulky budou your temporary directory '%1' %2 setup cs Váš dočasný adresář '%1' %2 {db | php(default) | php-restore} setup cs {db | php(výchozí) | php-restore} {off(default) | on} setup cs {off(výchozí) | on} +complete path to aspell program setup cs Celá cesta k programu aspell diff --git a/setup/lang/egw_da.lang b/setup/lang/egw_da.lang new file mode 100644 index 0000000000..e69de29bb2 diff --git a/setup/lang/egw_de.lang b/setup/lang/egw_de.lang index 01899145df..b0e10eb368 100644 --- a/setup/lang/egw_de.lang +++ b/setup/lang/egw_de.lang @@ -681,3 +681,4 @@ your tables will be dropped and you will lose data setup de Ihre Tabellen werden your temporary directory '%1' %2 setup de Ihr temporäres Verzeichnis '%1' %2 {db | php(default) | php-restore} setup de {db | php(Vorgabe) | php-restore} {off(default) | on} setup de {off(Vorgabe) | on} +complete path to aspell program setup de Vollständiger Pfad zum Programm ASPELL diff --git a/setup/lang/egw_el.lang b/setup/lang/egw_el.lang new file mode 100644 index 0000000000..e69de29bb2 diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang index 4f29f56383..6a6191dacf 100644 --- a/setup/lang/egw_en.lang +++ b/setup/lang/egw_en.lang @@ -679,3 +679,4 @@ your tables will be dropped and you will lose data setup en Your tables will be your temporary directory '%1' %2 setup en Your temporary directory '%1' %2 {db | php(default) | php-restore} setup en {db | php(default) | php-restore} {off(default) | on} setup en {off(default) | on} +complete path to aspell program setup en Complete path to aspell program diff --git a/setup/lang/egw_es-es.lang b/setup/lang/egw_es-es.lang index aeef6c2f02..7190eeaf72 100644 --- a/setup/lang/egw_es-es.lang +++ b/setup/lang/egw_es-es.lang @@ -673,3 +673,4 @@ your tables will be dropped and you will lose data setup es-es ¡¡Sus tablas se your temporary directory '%1' %2 setup es-es Su directorio temporal '%1' %2 {db | php(default) | php-restore} setup es-es {db | php (predeterminado) | php-restore} {off(default) | on} setup es-es {off (predeterminado) | on} +complete path to aspell program setup es-es Ruta completa al programa aspell diff --git a/setup/lang/egw_eu.lang b/setup/lang/egw_eu.lang new file mode 100644 index 0000000000..e69de29bb2 diff --git a/setup/lang/egw_nl.lang b/setup/lang/egw_nl.lang index 6d690ff8b1..e4a5dbebbb 100644 --- a/setup/lang/egw_nl.lang +++ b/setup/lang/egw_nl.lang @@ -672,3 +672,4 @@ your tables will be dropped and you will lose data setup nl Uw tabellen worden v your temporary directory '%1' %2 setup nl Uw tijdelijke directory '%1' %2 {db | php(default) | php-restore} setup nl {db | php(default) | php-restore} {off(default) | on} setup nl {off(default) | on} +complete path to aspell program setup nl Volledige pad naar aspell programma diff --git a/setup/lang/egw_pt-br.lang b/setup/lang/egw_pt-br.lang index 5b2128c65a..89c5dbdc61 100644 --- a/setup/lang/egw_pt-br.lang +++ b/setup/lang/egw_pt-br.lang @@ -673,3 +673,4 @@ your tables will be dropped and you will lose data setup pt-br Suas tabelas ser your temporary directory '%1' %2 setup pt-br Seu diretório temporário '%1' %2 {db | php(default) | php-restore} setup pt-br {db | php(default) | php-restore} {off(default) | on} setup pt-br {off(default | on} +complete path to aspell program setup pt-br Caminho completo para o programa aspell diff --git a/setup/lang/egw_ru.lang b/setup/lang/egw_ru.lang index 814c2d97ec..2eefb5b19c 100644 --- a/setup/lang/egw_ru.lang +++ b/setup/lang/egw_ru.lang @@ -665,3 +665,4 @@ your tables will be dropped and you will lose data setup ru Ваши табли your temporary directory '%1' %2 setup ru Ваша папка временных файлов '%1' %2 {db | php(default) | php-restore} setup ru {БД | php(по-умолчанию)| php-восстановление} {off(default) | on} setup ru {выкл(по-умолчанию) | вкл} +complete path to aspell program setup ru Полный путь до программы проверки орфографии(?) diff --git a/setup/lang/egw_rw.lang b/setup/lang/egw_rw.lang new file mode 100644 index 0000000000..e69de29bb2 diff --git a/setup/lang/egw_sk.lang b/setup/lang/egw_sk.lang index d7f6028229..eddc133e2b 100644 --- a/setup/lang/egw_sk.lang +++ b/setup/lang/egw_sk.lang @@ -657,3 +657,4 @@ your tables will be dropped and you will lose data setup sk Vaše tabuľky budú your temporary directory '%1' %2 setup sk Váš adresár dočasných súborov '%1' %2 {db | php(default) | php-restore} setup sk {db | php(predvolené) | php-restore} {off(default) | on} setup sk {vypnúť(predvolené) | zapnúť} +complete path to aspell program setup sk Plná cesta ku programu aspell diff --git a/setup/lang/egw_tr.lang b/setup/lang/egw_tr.lang new file mode 100644 index 0000000000..e69de29bb2 diff --git a/setup/lang/egw_uk.lang b/setup/lang/egw_uk.lang new file mode 100644 index 0000000000..e69de29bb2 diff --git a/setup/lang/egw_zh.lang b/setup/lang/egw_zh.lang index ef1f3c90bc..1557ab7539 100644 --- a/setup/lang/egw_zh.lang +++ b/setup/lang/egw_zh.lang @@ -646,3 +646,4 @@ your tables will be dropped and you will lose data setup zh 您的数据表将 your temporary directory '%1' %2 setup zh 您的暂存文件夹 '%1' %2 {db | php(default) | php-restore} setup zh {db | php(默认) | php-restore} {off(default) | on} setup zh {off(默认) | on} +complete path to aspell program setup zh Aspell (拼写检查软件)程序的完整路径 diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl index 5cba618da7..ec67c46634 100644 --- a/setup/templates/default/config.tpl +++ b/setup/templates/default/config.tpl @@ -74,6 +74,14 @@ + + + {lang_Complete_path_to_aspell_program}: + + + + +