[geeklog-cvs] geeklog: Moved hard-coded text strings to the language file

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/05fc48ded7de
changeset: 6610:05fc48ded7de
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Dec 30 10:45:19 2008 +0100
description:
Moved hard-coded text strings to the language file

diffstat:

2 files changed, 10 insertions(+), 7 deletions(-)
public_html/admin/install/index.php            |   12 ++++++------
public_html/admin/install/language/english.php |    5 ++++-

diffs (51 lines):

diff -r 1f658d7e55a2 -r 05fc48ded7de public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Tue Dec 30 10:30:26 2008 +0100
+++ b/public_html/admin/install/index.php	Tue Dec 30 10:45:19 2008 +0100
@@ -1794,8 +1794,8 @@
                 // Also, list the auto-generated chmod command for advanced users
                 $display .= INST_printTab(3) . '<div class="file-permissions">' . LB
                     . $display_permissions . INST_printTab(3) . '</div>' . LB
-                    . INST_printTab(3) . '<h2>' . 'Advanced Users' . '</h2>' . LB
-                    . INST_printTab(3) . '<p>' . 'If you have command line (SSH) access to your web server then you can simple copy and paste the following command into your shell: ' . '</p>' . LB
+                    . INST_printTab(3) . '<h2>' . $LANG_INSTALL[98] . '</h2>' . LB
+                    . INST_printTab(3) . '<p>' . $LANG_INSTALL[99] . '</p>' . LB
                     . INST_printTab(3) . '<p><div class="codeblock"><code>' . $chmod_string . LB 
                     . INST_printTab(3) . '</code></div></p><br ' . XHTML . '>' . LB;
                 $step++;
@@ -1893,8 +1893,8 @@
                 . '&display_step=' . $_REQUEST['display_step']);
             break;
         default:
-            $display .= '<p>Invalid mode specified</p>' . LB;
-        
+            $display .= '<p>' . $LANG_INSTALL[100] . '</p>' . LB;
+            break;
         }
 
         break;
@@ -1905,8 +1905,8 @@
     case 'install': // Deliberate fall-through, no "break"
     case 'upgrade':
 
-        if (($mode == 'upgrade') && ($step == 4)) {
-            // for the plugin upgrade,
+        if ($step == 4) {
+            // for the plugin install and upgrade,
             // we need lib-common.php in the global(!) namespace
             require_once '../../lib-common.php';
         }
diff -r 1f658d7e55a2 -r 05fc48ded7de public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Tue Dec 30 10:30:26 2008 +0100
+++ b/public_html/admin/install/language/english.php	Tue Dec 30 10:45:19 2008 +0100
@@ -145,7 +145,10 @@
     94 => 'Here are some hints to find the correct path:',
     95 => 'The complete path to this file (the install script) is:',
     96 => 'The installer was looking for %s in:',
-    97 => 'Set File Permissions'
+    97 => 'Set File Permissions',
+    98 => 'Advanced Users',
+    99 => 'If you have command line (SSH) access to your web server then you can simple copy and paste the following command into your shell:',
+    100 => 'Invalid mode specified'
 );
 
 // +---------------------------------------------------------------------------+