[geeklog-cvs] geeklog: Initial screen of the install script did not work when ...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Jan 5 05:07:06 EST 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/f6f7ccea3966
changeset: 6627:f6f7ccea3966
user: Dirk Haun <dirk at haun-online.de>
date: Thu Jan 01 16:12:27 2009 +0100
description:
Initial screen of the install script did not work when switching the language
diffstat:
3 files changed, 12 insertions(+), 9 deletions(-)
public_html/admin/install/index.php | 7 ++++---
public_html/admin/install/language/english.php | 3 ++-
public_html/admin/install/language/german.php | 11 ++++++-----
diffs (102 lines):
diff -r 0002d085bfd2 -r f6f7ccea3966 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php Thu Jan 01 14:30:50 2009 +0100
+++ b/public_html/admin/install/index.php Thu Jan 01 16:12:27 2009 +0100
@@ -8,7 +8,7 @@
// | |
// | Geeklog installation script. |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors: |
+// | Copyright (C) 2000-2009 by the following authors: |
// | |
// | Authors: Matt West - matt AT mattdanger DOT net |
// | Tony Bibbs - tony AT tonybibbs DOT com |
@@ -1137,7 +1137,7 @@
// If they did, determine which method they selected
switch ($install_type) {
- case 'Migrate':
+ case $LANG_INSTALL[16]:
$install_type = 'migrate';
break;
case $LANG_INSTALL[24]:
@@ -1166,10 +1166,11 @@
. INST_printTab(3) . '<p><form action="index.php" method="GET">' . LB
. INST_printTab(3) . '<input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>' . LB
. INST_printTab(3) . '<input type="hidden" name="mode" value="' . $mode . '"' . XHTML . '>' . LB
+ . INST_printTab(3) . '<input type="hidden" name="language" value="' . $language . '"' . XHTML . '>' . LB
. INST_printTab(3) . '<input type="hidden" name="display_step" value="' . ($display_step+1) . '"' . XHTML . '>' . LB
. INST_printTab(3) . '<input type="submit" name="install_type" value="' . $LANG_INSTALL[24] . '"' . XHTML .'>' . LB
. INST_printTab(3) . '<input type="submit" name="install_type" value="' . $LANG_INSTALL[25] . '"' . XHTML .'>' . LB
- . INST_printTab(3) . '<input type="submit" name="install_type" value="' . 'Migrate' . '"' . XHTML .'>' . LB
+ . INST_printTab(3) . '<input type="submit" name="install_type" value="' . $LANG_INSTALL[16] . '"' . XHTML .'>' . LB
. INST_printTab(3) . '</form> </p> <br' . XHTML . '>' . LB;
}
diff -r 0002d085bfd2 -r f6f7ccea3966 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php Thu Jan 01 14:30:50 2009 +0100
+++ b/public_html/admin/install/language/english.php Thu Jan 01 16:12:27 2009 +0100
@@ -8,7 +8,7 @@
// | |
// | English language file for the Geeklog installation script |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors: |
+// | Copyright (C) 2000-2009 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -65,6 +65,7 @@
13 => 'Currently',
14 => '',
15 => 'Export of Geeklog headlines is switched off. The <code>backend</code> directory was not tested',
+ 16 => 'Migrate',
17 => 'User photos are disabled. The <code>userphotos</code> directory was not tested',
18 => 'Images in articles are disabled. The <code>articles</code> directory was not tested',
19 => 'In order to operate correctly Geeklog requires that certain files and directories be writable by the web server. Below is a list of file and directory permissions that you need to modify before continuing with the your installation.',
diff -r 0002d085bfd2 -r f6f7ccea3966 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php Thu Jan 01 14:30:50 2009 +0100
+++ b/public_html/admin/install/language/german.php Thu Jan 01 16:12:27 2009 +0100
@@ -8,7 +8,7 @@
// | |
// | German language file for the Geeklog installation script |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors: |
+// | Copyright (C) 2000-2009 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -65,13 +65,14 @@
13 => 'Derzeit',
14 => 'Change directory to',
15 => 'Export of Geeklog headlines is switched off. The <code>backend</code> directory was not tested',
+ 16 => 'Migration',
17 => 'User photos are disabled. The <code>userphotos</code> directory was not tested',
18 => 'Images in articles are disabled. The <code>articles</code> directory was not tested',
19 => 'Geeklog setzt voraus, dass bestimmte Dateien und Verzeichnisse für den Webserver schreibbar sind. Es folgt eine Liste der Dateien und Verzeichnisse, die geändert werden müssen.',
20 => 'Warnung!',
21 => 'Geeklog und Deine Website werden nicht funktionsfähig sein, solange diese Fehler nicht korrigiert werden. Bitte nimm die notwendigen Änderungen vor, bevor Du mit der Installation fortfährst.',
22 => 'unbekannt',
- 23 => 'Bitte wähle eine Installationsmethode:',
+ 23 => 'Bitte wähle eine Installationsmethode',
24 => 'Neuinstallation',
25 => 'Upgrade',
26 => 'Unable to modify',
@@ -107,7 +108,7 @@
56 => 'Could not connect to database',
57 => 'Sorry, but the installer could not find the database you specified. Either the database does not exist or you misspelled the name. Please go back and try again.',
58 => '. Did you make sure the file is write-able by the web server?',
- 59 => 'Hinweis:',
+ 59 => 'Hinweis',
60 => 'InnoDB tables are not supported by your version of MySQL. Would you like to continue the installation without InnoDB support?',
61 => 'zurück',
62 => 'weiter',
@@ -220,8 +221,8 @@
13 => '. If your backup file is larger than ',
14 => ' or if you experience a timeout, then you should upload the file to Geeklog\'s backups directory via FTP.',
15 => 'Your backups directory is not writable by the web server. Permissions need to be 777.',
- 16 => 'Migrate',
- 17 => 'Migrate From Backup',
+ 16 => 'Migration',
+ 17 => 'Migration vom Backup',
18 => 'No backup file was selected',
19 => 'Could not save ',
20 => ' to ',
More information about the geeklog-cvs
mailing list