Merge lp:~alexharrington/xibo/1.1-fix-translations into lp:~dangarner/xibo/translate-xibo

[Alex Harrington]

[Dan Garner (dangarner)]

Looks fine to me, will merge

review: Approve

=== modified file 'server/config/config.class.php'
--- server/config/config.class.php	2009-04-05 19:44:26 +0000
+++ server/config/config.class.php	2009-04-26 15:11:53 +0000
@@ -120,182 +120,149 @@
 		$output .= '<div class="checks">';
 		
 		// Check for PHP version
-		$message = 'PHP Version 5.0.2 or later';
+		$message = __('PHP Version 5.0.2 or later');
 
 		if ($this->CheckPHP()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo requires PHP version 5.0.2 or later.</p>
-      		</div>
-END;
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"> <p>' . __("Xibo requires PHP version 5.0.2 or later.") . '</p></div>';
 		}
 		
 		// Check for file system permissions
-		$message = 'Filesystem Permissions';
+		$message = __('Filesystem Permissions');
 
 		if ($this->CheckFsPermissions()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __("Xibo needs to be able to write to the following:");
 			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo needs to be able to write to the following
       			<ul>
         			<li> settings.php
         			<li> install.php
-					<li> upgrade.php
+				<li> upgrade.php
       			</ul>
-      			Please fix this, and retest.</p>
-      		</div>
 END;
+      			$output .= __('Please fix this, and retest.') . '</p></div>';
 		}
 		
 		// Check for MySQL
-		$message = 'MySQL';
+		$message = __('MySQL Extension');
 
 		if ($this->CheckMySQL()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo requires a MySQL database.</p>
-      		</div>
-END;
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('Xibo requires a MySQL database. Ensure PHP MySQL client extension is installed') . '</p></div>';
 		}
 		
 		// Check for JSON
-		$message = 'JSON Extension';
+		$message = __('JSON Extension');
 
 		if ($this->CheckJson()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo needs the PHP JSON extension to function.</p>
-      		</div>
-END;
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP JSON extension to function.') . '</p></div>';
 		}
 		
 		// Check for GD (graphics)
-		$message = 'GD Extension';
+		$message = __('GD Extension');
 
 		if ($this->CheckGd()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo needs the PHP GD extension to function.</p>
-      		</div>
-END;
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP GD extension to function.') . '</p></div>';
 		}
 		
 		
 		// Check for Calendar
-		$message = 'Calendar Extension';
+		$message = __('Calendar Extension');
 
 		if ($this->CheckCal()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo needs the PHP Calendar extension to function.</p>
-      		</div>
-END;
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP Calendar extension to function.') . '</p></div>';
 		}
 		
 		// Check for DOM
-		$message = 'DOM Extension';
+		$message = __('DOM Extension');
 
 		if ($this->CheckDom()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo needs the PHP DOM core functionality enabled.</p>
-      		</div>
-END;
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP DOM core functionality enabled.') . '</p></div>';
 		}
 		
 		// Check for DOM XML
-		$message = 'DOM XML Extension';
+		$message = __('DOM XML Extension');
 
 		if ($this->CheckDomXml()) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
 			$this->envFault = true;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>Xibo needs the PHP DOM XML extension to function.</p>
-      		</div>
-END;
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP DOM XML extension to function.') . '</p></div>';
 		}
 		
-		// Check to see if we are allowed to open remote URL's (homecall will not work otherwise)
-		$message = 'Allow PHP to open external URL\'s';
+		// Check to see if we are allowed to open remote URLs (homecall will not work otherwise)
+		$message = __("Allow PHP to open external URLs");
 
 		if (ini_get('allow_url_fopen')) 
 		{
-			$output .= $imgGood.$message.'<br />';
+			$output .= $imgGood.' '.$message.'<br />';
 		}
 		else
 		{
-			$this->envFault = true;
+			// Not a fault as this will not block installation/upgrade. Informational.
+			$this->envFault = false;
 			
-			$output .= $imgBad.$message.'<br />';
-			$output .= <<<END
-			<div class="check_explain">
-      			<p>You must have allow_url_fopen = On in your PHP.ini file for homecall to function.<br />
-				If you do not intend to enable homecall you need not worry about this problem.</p>
-      		</div>
-END;
+			$output .= $imgBad.' '.$message.'<br />';
+			$output .= '<div class="check_explain"><p>' . __('You must have allow_url_fopen = On in your PHP.ini file for statistics gathering to function.') . '<br />';
+			$output .= __('If you do not intend to enable homecall you need not worry about this problem.') . '</p></div>';
 		}
 				
 		$output .= '</div>';
@@ -394,4 +361,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>

=== modified file 'server/install.php'
--- server/install.php	2009-04-08 18:54:13 +0000
+++ server/install.php	2009-04-26 15:11:53 +0000
@@ -19,13 +19,6 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */ 
  
-// Start default to fr_FR
-$locale = "fr_FR";
-if (isset($_GET["locale"])) $locale = $_GET["locale"];
-putenv("LC_ALL=$locale");
-setlocale(LC_ALL, $locale);
-bindtextdomain("default", "./locale");
-textdomain("default");
 
 DEFINE('XIBO', true);
 
@@ -37,6 +30,10 @@
 include('install/header.inc');
 include('config/config.class.php');
 include('config/db_config.php');
+
+// Setup the translations for gettext
+require_once("lib/app/translationengine.class.php");
+TranslationEngine::InitLocale($db);
 
 $fault = false;
 
@@ -65,113 +62,6 @@
   <?php
     echo $cObj->CheckEnvironment();
     if ($cObj->EnvironmentFault()) {
-## Filesystem Permissions
-    if (checkFsPermissions()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("Filesystem Permissions"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("Filesystem Permissions"); ?></br>
-      <div class="check_explain">
-      <?php echo __("Xibo needs to be able to write to the following"); ?>
-      <ul>
-        <li> settings.php
-        <li> install.php
-	<li> upgrade.php
-      </ul>
-      <?php echo __("Please fix this, and retest."); ?><br />
-      </div>
-    <?php
-    }
-## PHP5
-    if (checkPHP()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP Version"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP Version"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo requires PHP version 5 or later."); ?><br />
-      <?php echo __("Please fix this, and retest."); ?><br />
-      </div>
-    <?php
-    }
-## MYSQL
-  if (checkMySQL()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP MySQL Extension"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP MySQL Extension"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo needs to access a MySQL database to function."); ?><br />
-      <?php echo __("Please install MySQL and the appropriate MySQL extension and retest."); ?><br />
-      </div>
-    <?php
-    }
-## JSON
-  if (checkJson()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP JSON Extension"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP JSON Extension"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo needs the PHP JSON extension to function."); ?><br />
-      <?php echo __("Please install the PHP JSON extension and retest."); ?><br />
-      </div>
-    <?php
-    }
-## GD
-  if (checkGd()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP GD Extension"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP GD Extension"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo needs to manipulate images to function."); ?><br />
-      <?php echo __("Please install the GD libraries and extension and retest."); ?><br />
-      </div>
-    <?php
-    }
-## Calendar
-  if (checkCal()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP Calendar Extension"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP Calendar Extension"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo needs the calendar extension to function."); ?><br />
-      <?php echo __("Please install the calendar extension and retest."); ?><br />
-      </div>
-    <?php
-    }
-    ?>
-    <br /><br />
-    </div>
-    <?php
-    if ($fault) {
->>>>>>> MERGE-SOURCE
     ?>
       <form action="install.php" method="POST">
         <input type="hidden" name="xibo_step" value="1" />

=== modified file 'server/upgrade.php'
--- server/upgrade.php	2009-04-08 18:56:00 +0000
+++ server/upgrade.php	2009-04-26 15:11:53 +0000
@@ -19,20 +19,20 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */ 
 
-// Start default to fr_FR
-$locale = "fr_FR";
-if (isset($_GET["locale"])) $locale = $_GET["locale"];
-putenv("LC_ALL=$locale");
-setlocale(LC_ALL, $locale);
-bindtextdomain("default", "./locale");
-textdomain("default");
-
-DEFINE('XIBO', true);
+DEFINE('XIBO', true);
+
+if (! checkPHP()) {
+  die(__("Xibo requires PHP 5.0.2 or later"));
+}
 
 include('lib/app/kit.class.php');
 include('config/db_config.php');
 include('config/config.class.php');
-require('settings.php');
+require('settings.php');
+
+// Setup the translations for gettext
+require_once("lib/app/translationengine.class.php");
+TranslationEngine::InitLocale($db);
 
 // Once we've calculated the upgrade in step 2 below, we need
 // to have included the appropriate upgrade php files
@@ -129,112 +129,6 @@
     $cObj = new Config($db);
     echo $cObj->CheckEnvironment();
     if ($cObj->EnvironmentFault()) {
-## Filesystem Permissions
-    if (checkFsPermissions()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("Filesystem Permissions"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("Filesystem Permissions"); ?></br>
-      <div class="check_explain">
-      <?php echo __("Xibo needs to be able to write to the following"); ?>
-      <ul>
-        <li> settings.php
-        <li> install.php
-	<li> upgrade.php
-      </ul>
-      <?php echo __("Please fix this, and retest."); ?><br />
-      </div>
-    <?php
-    }
-## PHP5
-    if (checkPHP()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP Version"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP Version"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo requires PHP version 5.02 or later."); ?><br />
-      <?php echo __("Please fix this, and retest."); ?><br />
-      </div>
-    <?php
-    }
-## MYSQL
-  if (checkMySQL()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP MySQL Extension"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP MySQL Extension"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo needs to access a MySQL database to function."); ?><br />
-      <?php echo __("Please install MySQL and the appropriate MySQL extension and retest."); ?><br />
-      </div>
-    <?php
-    }
-## JSON
-  if (checkJson()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP JSON Extension"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP JSON Extension"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo needs the PHP JSON extension to function."); ?><br />
-      <?php echo __("Please install the PHP JSON extension and retest."); ?><br />
-      </div>
-    <?php
-    }
-## GD
-  if (checkGd()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP GD Extension"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP GD Extension"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo needs to manipulate images to function."); ?><br />
-      <?php echo __("Please install the GD libraries and extension and retest."); ?><br />
-      </div>
-    <?php
-    }
-## Calendar
-  if (checkCal()) {
-    ?>
-      <img src="install/dot_green.gif" align="absmiddle">&nbsp;<?php echo __("PHP Calendar Extension"); ?><br />
-    <?php
-    }
-    else {
-      $fault = true;
-    ?>
-      <img src="install/dot_red.gif" align="absmiddle">&nbsp;<?php echo __("PHP Calendar Extension"); ?><br />
-      <div class="check_explain">
-      <?php echo __("Xibo needs the calendar extension to function."); ?><br />
-      <?php echo __("Please install the calendar extension and retest."); ?><br />
-      </div>
-    <?php
-    }
-    ?>
-    <br /><br />
-    </div>
-    <?php
-    if ($fault) {
 	$_SESSION['step'] = 1;
     ?>
       <form action="upgrade.php" method="POST">
@@ -704,4 +598,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>