holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added possebility to make an utf-8 installation right from the start (no need to convert the DB later) plus some other UI cosmetics

Browse Source
This commit is contained in:
Ralf Becker 2004-10-23 15:01:58 +00:00
parent 630c88d766
commit 521c73a38a
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup/index.php
View File

@ -230,6 +230,8 @@
$setup_tpl->set_var('proceed',lang('We can proceed'));
$setup_tpl->set_var('coreapps',lang('all applications'));
$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
$setup_tpl->set_var('lang_system_charset',lang('use utf-8 (unicode) as system-charset (recomended if you use languages with different charsets or your language uses utf-8 as charset)'));
$setup_tpl->set_var('utf8_checked',lang('charset') == 'uft-8' ? 'checked' : '');
$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
@ -252,7 +254,7 @@
$setup_tpl->set_var('language_management',lang('Manage Languages'));
$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
$setup_tpl->set_var('dropwarn',lang('Your tables may be altered and you may lose data'));
$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
@ -320,7 +322,7 @@
else
{
$setup_info = $GLOBALS['phpgw_setup']->detection->upgrade_exclude($setup_info);
$setup_info = $GLOBALS['phpgw_setup']->process->pass($setup_info,'new',$_REQUEST['debug'],True);
$setup_info = $GLOBALS['phpgw_setup']->process->pass($setup_info,'new',$_REQUEST['debug'],True,$_REQUEST['system_charset']);
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
}
break;

4
setup/lang/phpgw_de.lang
View File

@ -456,6 +456,7 @@ uploads a backup and installs it on your db setup de l
uploads a backup to the backup-dir, from where you can restore it setup de Läde eine Datensicherung in das Datensicherungsverzeichnis, von wo sie diese zurücksichern können
use cookies to pass sessionid setup de SitzungsId in einem Cookie speichern
use pure html compliant code (not fully working yet) setup de Vollständig HTML kompatiblen Code verwenden (nicht vollständig implementiert)
use utf-8 (unicode) as system-charset (recomended if you use languages with different charsets or your language uses utf-8 as charset) setup de utf-8 (Unicode) als Systemzeichensatz benutzen (empfohlen wenn Sie Sprachen mit verschiedenem Zeichensätzen verwenden oder ihrer Sprache utf-8 als Zeichensatz verwendet)
user account prefix setup de Präfix für Benutzernamen
usernames are casesensitive setup de Benutzername mit Unterscheidung zwischen Groß- und Kleinschreibung
users choice setup de Benutzerauswahl
@ -518,6 +519,5 @@ your header.inc.php needs upgrading. setup de Ihre header.inc.php muss aktualisi
your header.inc.php needs upgrading.<br><blink><b class="msg">warning!</b></blink><br><b>make backups!</b> setup de Ihre header.inc.php muss aktualisiert werden.<br><blink><b class="msg">WARNUNG!</b></blink><br><b>MACHEN SIE EINE SICHERUNG!</b>
your php installation does not have appropriate gd support. you need gd library version 1.8 or newer to see gantt charts in projects. setup de Ihre PHP Installation hat nicht die benötigte GD Unterstützung. Die Anwendung Projekte benötigen die GD Bibliothek in der Version 1.8 um Gantcharts anzeigen zu können.
your tables are current setup de Ihre Tabellen sind aktuell
your tables may be altered and you may lose data setup de Ihre Tabellen könnten verändert werden, und Sie könnten Daten verlieren!
your tables will be dropped and you will lose data setup de Ihre Tabellen werden gelöscht werden und Sie werden Daten verlieren!
your tables will be dropped and you will lose data setup de Ihre Tabellen werden gelöscht werden und Sie werden alle Daten verlieren!
your temporary directory '%1' %2 setup de Ihr temporäres Verzeichnis '%1' %2

2
setup/lang/phpgw_en.lang
View File

@ -452,6 +452,7 @@ uploads a backup and installs it on your db setup en uploads a backup and instal
uploads a backup to the backup-dir, from where you can restore it setup en uploads a backup to the backup-dir, from where you can restore it
use cookies to pass sessionid setup en Use cookies to pass sessionid
use pure html compliant code (not fully working yet) setup en Use pure HTML compliant code (not fully working yet)
use utf-8 (unicode) as system-charset (recomended if you use languages with different charsets or your language uses utf-8 as charset) setup en use utf-8 (unicode) as system-charset (recomended if you use languages with different charsets or your language uses utf-8 as charset)
user account prefix setup en User account prefix
usernames are casesensitive setup en Usernames are casesensitive
users choice setup en Users Choice
@ -514,6 +515,5 @@ your header.inc.php needs upgrading. setup en Your header.inc.php needs upgradin
your header.inc.php needs upgrading.<br><blink><b class="msg">warning!</b></blink><br><b>make backups!</b> setup en Your header.inc.php needs upgrading.<br><blink><b class="msg">WARNING!</b></blink><br><b>MAKE BACKUPS!</b>
your php installation does not have appropriate gd support. you need gd library version 1.8 or newer to see gantt charts in projects. setup en Your PHP installation does not have appropriate GD support. You need gd library version 1.8 or newer to see Gantt charts in projects.
your tables are current setup en Your tables are current
your tables may be altered and you may lose data setup en Your tables may be altered and you may lose data.
your tables will be dropped and you will lose data setup en Your tables will be dropped and you will lose data !!
your temporary directory '%1' %2 setup en Your temporary directory '%1' %2

9
setup/templates/default/setup_db_blocks.tpl
View File

@ -68,8 +68,9 @@
{dbexists}<br>
<input type="hidden" name="action" value="Install">
<input type="submit" name="label" value="{install}"> {coreapps}<br>
<input type="checkbox" name="debug" value="1"> {lang_debug}
<input type="checkbox" name="debug" value="1"> {lang_debug}<br>
<input type="checkbox" name="system_charset" value="utf-8" {utf8_checked}> {lang_system_charset}<br>
<input type="submit" name="label" value="{install}"> {coreapps}
<hr>
{lang_restore}<br>
{upload}
@ -94,10 +95,10 @@
<input type="hidden" name="useglobalconfigsettings">
<input type="hidden" name="action" value="Upgrade">
<input type="checkbox" name="backup" value="1" checked="1"> {lang_backup}<br>
<input type="submit" name="label" value="{upgrade}"><br>
<input type="checkbox" name="debug" value="1"> {lang_debug}<br>
<input type="submit" name="label" value="{upgrade}"><br>
</form>
<hr>
<form method="POST" action="index.php">
<input type="hidden" name="oldversion" value="{oldver}">
<input type="hidden" name="useglobalconfigsettings">