added english and german translations and only show 'Check install' and 'Logout' if one is loged in

This commit is contained in:
Ralf Becker 2003-11-02 10:44:50 +00:00
parent f6a498f68e
commit 30d3bedaa4
5 changed files with 38 additions and 18 deletions

View File

@ -74,7 +74,7 @@
function show_header($title='',$nologoutbutton=False, $logoutfrom='config', $configdomain='')
{
$GLOBALS['setup_tpl']->set_var('lang_charset',lang('charset'));
$GLOBALS['setup_tpl']->set_var('charset',lang('charset'));
$style = array(
'th_bg' => '#486591',
'th_text' => '#FFFFFF',
@ -86,13 +86,13 @@
$GLOBALS['setup_tpl']->set_var($style);
if ($nologoutbutton)
{
$icon_logout=' ';
$btn_logout = ' ';
$GLOBALS['setup_tpl']->set_block('T_head','loged_in');
$GLOBALS['setup_tpl']->set_var('loged_in','');
}
else
{
$btn_logout = '<a href="index.php?FormLogout=' . $logoutfrom . '" class="link">' . lang('Logout').'</a>';
$icon_logout='*';
$check_install = '<a class="textsidebox" href="check_install.php">'.lang('Check installation').'</a>';
}
$GLOBALS['setup_tpl']->set_var('lang_setup', lang('setup'));
@ -106,8 +106,12 @@
$GLOBALS['setup_tpl']->set_var('configdomain',' - ' . lang('Domain') . ': ' . $configdomain);
}
$GLOBALS['setup_tpl']->set_var('pgw_ver',@$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
$GLOBALS['setup_tpl']->set_var('logouticon',$icon_logout);
$GLOBALS['setup_tpl']->set_var('logoutbutton',$btn_logout);
$GLOBALS['setup_tpl']->set_var(array(
'logoutbutton' => $btn_logout,
'check_install' => $check_install,
'main_menu' => lang('Setup Main Menu'),
'user_login' => lang('Back to user login')
));
$GLOBALS['setup_tpl']->pparse('out','T_head');
/* $setup_tpl->set_var('T_head',''); */
}

View File

@ -28,7 +28,7 @@ if ($run_by_webserver)
if ($GLOBALS['phpgw_info']['setup']['stage']['header'] == '10')
{
// Check header and authentication
if (!$GLOBALS['phpgw_setup']->auth('Config'))
if (!$GLOBALS['phpgw_setup']->auth('Config') && !$GLOBALS['phpgw_setup']->auth('Header'))
{
Header('Location: index.php');
exit;
@ -350,7 +350,7 @@ if ($run_by_webserver)
}
else
{
echo '<h3><a href="index.php">'.lang('Return to Setup')."</a></h3>\n";
echo '<h3><a href="'.$_SERVER['HTTP_REFERER'].'">'.lang('Return to Setup')."</a></h3>\n";
}
$setup_tpl->pparse('out','T_footer');
//echo "</body>\n</html>\n";

View File

@ -41,6 +41,7 @@ auto create account records for authenticated users setup de Benutzerkonten f
auto-created user accounts expire setup de Automatisch angelegte Benutzerkonten laufen ab am
available version setup de Verfügbare Version
back to the previous screen setup de Zurück zur vorhergehenden Seite
back to user login setup de Zurück zur Benutzer Anmeldung
backupwarn setup de Aber wir <u>raten Ihnen dringend, eine Sicherungskopie</u> anzulegen f&uuml;r den Fall, da&szlig; dieses Script Ihre bestehenden Daten besch&auml;digt !<br><strong>Diese automatisierten Scripts k&ouml;nnen leicht Ihre Daten besch&auml;digen !.</strong><br
because an application it depends upon was upgraded setup de da eine Applikation von der sie abhängt upgeradet wurde
because it depends upon setup de weil es abhängt von
@ -56,7 +57,9 @@ cannot create the header.inc.php due to file permission restrictions.<br> instea
change system-charset setup de Systemzeichensatz wechseln
charset setup de ISO-8859-1
charset to convert to setup de Zeichensatz in den konvertiert werden soll
check installation setup de Installation überprüfen
check ip address of all sessions setup de IP Adresse bei allen Sessions überprüfen
checking the egroupware installation setup de Überprüfe die eGroupWare Installation
click <a href="index.php">here</a> to return to setup. setup de <a href="index.php">Hier clicken</a> um zum Setup zurück zu kommen.
click here setup de Hier clicken
completed setup de Abgeschlossen
@ -65,6 +68,7 @@ configuration completed setup de Konfiguration abgeschlossen
configuration password setup de Konfigurationspasswort
configure now setup de Jetzt konfigurieren
continue setup de Weiter
continue to the header admin setup de Weiter zum Header Admin
convert setup de Konvertieren
could not open header.inc.php for writing! setup de Konnte die Datei header.inc.php nicht zum schreiben öffen!
country selection setup de Länderauswahl
@ -242,6 +246,7 @@ please check for sql scripts within the application's directory setup de Bitte s
please check read/write permissions on directories, or back up and use another option. setup de Bitte überprüfen sie die lese/schreib Rechte der Verzeichnisse oder gehen sie zurück und benutzen eine andere Option.
please configure phpgroupware for your environment setup de Bitte konfigurieren Sie phpGroupWare für Ihre Umgebung
please consult the %1. setup de Bitte konsultieren sie das %1.
please fix the above errors (***) and %1continue to the header admin%2 setup de Bitte beheben sie die obigen Fehler (***) und machen Sie %1weiter mit dem Header Admin%2
please install setup de Bitte installieren
please login setup de Bitte einlogen
please login to phpgroupware and run the admin application for additional site configuration setup de Bitte in phpGroupWare einloggen und die Administration für weitere Konfigurationen aufrufen.
@ -265,6 +270,7 @@ remove all setup de Alle Entfernen
requires reinstall or manual repair setup de Erfordert Neuinstallation oder manuelle Reparatur
requires upgrade setup de Erfordert Aktualisierung
resolve setup de Lösen
return to setup setup de Zurück zum Setup
sample configuration not found. using built in defaults setup de Beispiel Konfiguration nicht gefunden, benutze eingebaute Voreinstellungen
save setup de Speichern
save this text as contents of your header.inc.php setup de Sichern sie diesen Text als Datei header.inc.php
@ -295,6 +301,7 @@ set this to "old" for versions &lt; 2.4, otherwise the exact mcrypt version you
settings setup de Einstellungen
setup setup de Einrichtung
setup demo accounts in ldap setup de Demo-Benutzer in LDAP einrichten
setup main menu setup de Setup Hauptmenü
setup the database setup de Datenbank einzurichten
show 'powered by' logo on setup de Zeige 'powered by' Logo
some or all of its tables are missing setup de Einige oder alle Tabellen fehlen
@ -376,6 +383,7 @@ you do not have any languages installed. please install one now <br> setup de si
you have not created your header.inc.php yet!<br> you can create it now. setup de Sie haben bisher noch keine header.inc.php angelegt!<br>Sie können sie jetzt anlegen.
you have successfully logged out setup de Sie haben sich erfolgreich abgemeldet.
you must enter a username for the admin setup de sie müssen einen Benutzernamen für den Administrator eingeben !
you need to add some domains to your header.inc.php. setup de Sie müssen mindestens eine Domain zu ihrer header.inc.php zufügen.
you need to select your current charset! setup de Sie müssen ihren aktuellen Zeichensatz auswählen!
you should either uninstall and then reinstall it, or attempt manual repairs setup de Sie sollten entweder de- und neuinstallieren, oder manuelle Reparaturen versuchen
you're using an old configuration file format... setup de Sie verwenden ein altes Format der Konfigurationdatei ...

View File

@ -39,6 +39,7 @@ auto create account records for authenticated users setup en Auto create account
auto-created user accounts expire setup en Auto-created user accounts expire
available version setup en Available Version
back to the previous screen setup en Back to the previous screen
back to user login setup en Back to user login
backupwarn setup en but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br><strong>These automated scripts can easily destroy your data.</strong><br><em>Please backup before going any further!</em>
because an application it depends upon was upgraded setup en because an application it depends upon was upgraded
because it depends upon setup en because it depends upon
@ -54,7 +55,9 @@ cannot create the header.inc.php due to file permission restrictions.<br> instea
change system-charset setup en Change system-charset
charset setup en ISO-8859-1
charset to convert to setup en Charset to convert to
check installation setup en Check installation
check ip address of all sessions setup en check ip address of all sessions
checking the egroupware installation setup en Checking the eGroupWare Installation
click <a href="index.php">here</a> to return to setup. setup en Click <a href="index.php">here</a> to return to setup.
click here setup en Click Here
completed setup en Completed
@ -63,6 +66,7 @@ configuration completed setup en Configuration completed
configuration password setup en Configuration Password
configure now setup en Configure Now
continue setup en Continue
continue to the header admin setup en Continue to the Header Admin
convert setup en Convert
could not open header.inc.php for writing! setup en Could not open header.inc.php for writing!
country selection setup en Country Selection
@ -240,6 +244,7 @@ please check for sql scripts within the application's directory setup en Please
please check read/write permissions on directories, or back up and use another option. setup en Please check read/write permissions on directories, or back up and use another option.
please configure phpgroupware for your environment setup en Please configure phpGroupWare for your environment
please consult the %1. setup en Please consult the %1.
please fix the above errors (***) and %1continue to the header admin%2 setup en Please fix the above errors (***) and %1continue to the Header Admin%2
please install setup en Please install
please login setup en Please login
please login to phpgroupware and run the admin application for additional site configuration setup en Please login to phpgroupware and run the admin application for additional site configuration
@ -263,6 +268,7 @@ remove all setup en Remove All
requires reinstall or manual repair setup en Requires reinstall or manual repair
requires upgrade setup en Requires upgrade
resolve setup en Resolve
return to setup setup en Return to Setup
sample configuration not found. using built in defaults setup en Sample configuration not found. using built in defaults
save setup en Save
save this text as contents of your header.inc.php setup en Save this text as contents of your header.inc.php
@ -293,6 +299,7 @@ set this to "old" for versions &lt; 2.4, otherwise the exact mcrypt version you
settings setup en Settings
setup setup en Setup
setup demo accounts in ldap setup en Setup demo accounts in LDAP
setup main menu setup en Setup Main Menu
setup the database setup en Setup the database
show 'powered by' logo on setup en Show 'powered by' logo on
some or all of its tables are missing setup en Some or all of its tables are missing
@ -373,8 +380,8 @@ you do not have any languages installed. please install one now <br> setup en Yo
you have not created your header.inc.php yet!<br> you can create it now. setup en You have not created your header.inc.php yet!<br> You can create it now.
you have successfully logged out setup en You have successfully logged out
you must enter a username for the admin setup en You must enter a username for the admin
you need to select your current charset! setup en You need to select your current charset!
you need to add some domains to your header.inc.php. setup en You need to add some domains to your header.inc.php.
you need to select your current charset! setup en You need to select your current charset!
you should either uninstall and then reinstall it, or attempt manual repairs setup en You should either uninstall and then reinstall it, or attempt manual repairs
you're using an old configuration file format... setup en You're using an old configuration file format...
you're using an old header.inc.php version... setup en You're using an old header.inc.php version...

View File

@ -91,22 +91,23 @@
<div class="divSidebox">
<div class="divSideboxHeader"><span>setup main menu</span></div>
<div class="divSideboxHeader"><span>{main_menu}</span></div>
<div>
<table width="100%" cellspacing="0" cellpadding="0">
<tr class="divSideboxEntry">
<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox"><a class="textsidebox" href="../home.php">back to user login</a></td>
<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox"><a class="textsidebox" href="../home.php">{user_login}</a></td>
</tr>
<!-- BEGIN loged_in -->
<tr class="divSideboxEntry">
<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox">{check_install}</td>
</tr>
<tr class="divSideboxEntry">
<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox"><a class="textsidebox" href="check_install.php">check installation</a></td>
</tr>
<tr class="divSideboxEntry">
<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox"><!--<a class="textsidebox" href="check_install.php">check installation</a>-->{logoutbutton}</td>
</tr>
</table>
<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox">{logoutbutton}</td>
</tr>
<!-- END loged_in -->
</table>
</div>
</div>
<div class="sideboxSpace"></div>