Changeset 591

Timestamp:

09/08/08 23:57:14 (4 months ago)

Author:

Jamie

Message:

Added the ability to select which language the install script should be displayed in.

Location:

fluxbb/branches/fluxbb-1.3-dev/upload

Files:

• admin/install.php (modified) (7 diffs)
• lang/English/install.php (modified) (2 diffs)

fluxbb/branches/fluxbb-1.3-dev/upload/admin/install.php

@@ -53 +53 @@
 }
 
+$language = isset($_GET['lang']) ? preg_replace('#[\.\\\/]#', '', $_GET['lang']) : 'English';
+if (!file_exists(FORUM_ROOT.'lang/'.$language.'/install.php'))
+        exit('The language pack you have chosen doesn\'t seem to exist or is corrupt. Please recheck and try again.');
 
 // Load the language file
-require FORUM_ROOT.'lang/English/install.php';
+require FORUM_ROOT.'lang/'.$language.'/install.php';
 
 
@@ -110 +113 @@
         if (substr($base_url_guess, -1) == '/')
                 $base_url_guess = substr($base_url_guess, 0, -1);
+        
+        // Check for available language packs
+        $languages = get_language_packs();
 
 ?>
@@ -139 +145 @@
         </div>
 
+<?php
+        
+        if (count($languages) > 1) {
+
+?>
+        <form class="frm-form" method="get" accept-charset="utf-8" action="install.php">
+        <div class="main-subhead">
+                <h2 class="hn"><span><?php echo $lang_install['Choose language'] ?></span></h2>
+        </div>
+        <div class="main-content main-frm">
+                <fieldset class="frm-group group1">
+                        <legend class="group-legend"><strong><?php echo $lang_install['Choose language legend'] ?></strong></legend>
+                        <div class="sf-set set1">
+                                <div class="sf-box text">
+                                        <label for="fld0"><span><?php echo $lang_install['Installer language'] ?></span> <small><?php echo $lang_install['Choose language help'] ?></small></label><br />
+                                        <span class="fld-input"><select id="fld0" name="lang">
+<?php
+
+        foreach ($languages as $temp)
+                echo "\t\t\t\t\t".'<option value="'.$temp.'"'.($language == $temp ? ' selected="selected"' : '').'>'.$temp.'</option>'."\n";
+
+?>
+                                        </select></span>
+                                </div>
+                        </div>
+                </fieldset>
+                <div class="frm-buttons">
+                        <span class="submit"><input type="submit" name="changelang" value="<?php echo $lang_install['Choose language'] ?>" /></span>
+                </div>
+        </div>
+        </form>
+<?php
+
+}
+
+?>
         <form class="frm-form" method="post" accept-charset="utf-8" action="install.php">
         <div class="hidden">
@@ -274 +316 @@
                                 </div>
                         </div>
+                        <div class="sf-set set4">
+                                <div class="sf-box text">
+                                        <label for="fld14"><span><?php echo $lang_install['Default language'] ?></span> <small><?php echo $lang_install['Default language help'] ?></small></label><br />
+                                        <span class="fld-input"><select id="fld14" name="req_language">
+<?php
+
+        foreach ($languages as $temp)
+                echo "\t\t\t\t\t".'<option value="'.$temp.'"'.($language == $temp ? ' selected="selected"' : '').'>'.$temp.'</option>'."\n";
+
+?>
+                                        </select></span>
+                                </div>
+                        </div>
                 </fieldset>
                 <div class="frm-buttons">
@@ -312 +367 @@
         $board_title = unescape(forum_trim($_POST['board_title']));
         $board_descrip = unescape(forum_trim($_POST['board_descrip']));
-
+        $default_lang = preg_replace('#[\.\\\/]#', '', unescape(forum_trim($_POST['req_language'])));
 
         // Make sure base_url doesn't end with a slash
@@ -355 +410 @@
         if (utf8_strlen($base_url) == 0)
                 error($lang_install['Missing base url']);
-
+        
+        if (!file_exists(FORUM_ROOT.'lang/'.$default_lang.'/common.php'))
+                error($lang_install['Invalid language']);
 
         // Load the appropriate DB layer class
@@ -1532 +1589 @@
                 'o_smilies_sig'                         => "'1'",
                 'o_make_links'                          => "'1'",
-                'o_default_lang'                        => "'English'",
+                'o_default_lang'                        => "'".$forum_db->escape($default_lang)."'",
                 'o_default_style'                       => "'Oxygen'",
                 'o_default_user_group'          => "'3'",

fluxbb/branches/fluxbb-1.3-dev/upload/lang/English/install.php

@@ -54 +54 @@
 'Required'                                      =>      '(Required)',
 'Required warn'                         =>      'All fields labelled %s must be completed before this form is submitted.',
+'Default language'                      =>      'Default Language:',
+'Default language help'                 =>      'The default language for your FluxBB installation. This can be changed later.',
+'Choose language'                       =>      'Change installer language',
+'Choose language help'                  =>      'You can change the language of this install script if you find it easier to follow the instructions in your own language. Just choose your language from the list of installed ones below.',
+'Installer language'                    =>      'Installer language:',
+'Choose language legend'                =>      'Installer language',
 
 // Install errors
@@ -74 +80 @@
 'FluxBB already installed'      =>      'A table called "%1$susers" is already present in the database "%2$s". This could mean that FluxBB is already installed or that another piece of software is installed and is occupying one or more of the table names FluxBB requires. If you want to install multiple copies of FluxBB in the same database, you must choose a different table prefix.',
 'InnoDB not enabled'            =>      'InnoDB does not seem to be enabled. Please choose a database layer that does not have InnoDB support, or enable InnoDB on your MySQL server.',
+'Invalid language'              =>      'The language pack you have chosen doesn\'t seem to exist or is corrupt. Please recheck and try again.',
 
 // Used in the install