[ros-diffs] [cfinck] 28372: - Add an italian and spanish translation by Gabriel Ilardi (gabrielilardi AT hotmail DOT it) - Remove frik85's additional "margin: 5px; " statement. This problem only occurs in IE6 and probably older versions, so add a better workaround in a CSS file specifically for these old IE versions. - Move the $getbuilds_languages array to an extra file and also use it for validating the language. Attention: The "languages.inc.php" file has to be saved in UTF-8 format, but without a leading Byte-Order-Mark (BOM). Otherwise the BOM is included as content for index.php, thus sending any headers is not possible. - Combine "rangeinfo" and "rangeinfo2" in the translations to a single "rangeinfo", which is then written using printf.

cfinck at svn.reactos.org cfinck at svn.reactos.org
Thu Aug 16 20:11:46 CEST 2007 

Author: cfinck
Date: Thu Aug 16 22:11:46 2007
New Revision: 28372

URL: http://svn.reactos.org/svn/reactos?rev=28372&view=rev
Log:
- Add an italian and spanish translation by Gabriel Ilardi (gabrielilardi AT hotmail DOT it)
- Remove frik85's additional "margin: 5px;" statement.
  This problem only occurs in IE6 and probably older versions, so add a better workaround in a CSS file specifically for these old IE versions.
- Move the $getbuilds_languages array to an extra file and also use it for validating the language.
  Attention: The "languages.inc.php" file has to be saved in UTF-8 format, but without a leading Byte-Order-Mark (BOM). Otherwise the BOM is included as content for index.php, thus sending any headers is not possible.
- Combine "rangeinfo" and "rangeinfo2" in the translations to a single "rangeinfo", which is then written using printf.

Added:
    trunk/web/reactos.org/htdocs/getbuilds/ie-lt7-fixes.css
    trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php
    trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php
    trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php
Modified:
    trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css
    trunk/web/reactos.org/htdocs/getbuilds/index.php
    trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php
    trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php

Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
--- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css Thu Aug 16 22:11:46 2007
@@ -22,7 +22,6 @@
 	color: #000000;
 }
 
-
 h1 {
 	display: block;
 	line-height: normal;
@@ -33,21 +32,22 @@
 	padding: 0px 0px 1px 10px;
 	margin-top: 0;
 }
+
 h1 a {
 	font-size: 14px;
 	font-weight: bold;
 	color: #FFFFFF;
 	background-color: #5984C3;
-	text-decoration:none;
-}
+	text-decoration: none;
+}
+
 h1 a:hover {
 	font-size: 14px;
 	font-weight: bold;
 	color: #FFFFFF;
 	background-color: #5984C3;
-	text-decoration:underline;
-}
-
+	text-decoration: underline;
+}
 
 h2 {
 	font-size: 22px;
@@ -156,7 +156,7 @@
 
 .bubble_bg {
 	background: #C9DAF8 none repeat scroll 0%;
-	margin-bottom: 5pt;
+	margin-bottom: 10px;
 }
 
 .bubble {

Added: trunk/web/reactos.org/htdocs/getbuilds/ie-lt7-fixes.css
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/ie-lt7-fixes.css?rev=28372&view=auto
==============================================================================
--- trunk/web/reactos.org/htdocs/getbuilds/ie-lt7-fixes.css (added)
+++ trunk/web/reactos.org/htdocs/getbuilds/ie-lt7-fixes.css Thu Aug 16 22:11:46 2007
@@ -1,0 +1,14 @@
+/*
+  PROJECT:    ReactOS Website
+  LICENSE:    GPL v2 or any later version
+  FILE:       web/reactos.org/htdocs/getbuilds/ie-lt7-fixes.css
+  PURPOSE:    Easily download prebuilt ReactOS Revisions
+  COPYRIGHT:  Copyright 2007 Colin Finck <mail at colinfinck.de>
+  
+  This file contains fixes for Internet Explorer versions older than IE 7
+*/
+
+/* IE versions older than IE7 don't add the size of the edges to the box height. So we have to add this space by enhancing the "padding-bottom" value */
+.bubble_bg {
+	padding-bottom: 4px;
+}

Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/index.php?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
--- trunk/web/reactos.org/htdocs/getbuilds/index.php (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/index.php Thu Aug 16 22:11:46 2007
@@ -8,6 +8,7 @@
 */
 	
 	require_once("config.inc.php");
+	require_once("languages.inc.php");
 	
 	// Get the domain for the cookie (with a leading dot if possible). Borrowed from "utils.php" of RosCMS.
 	function cookie_domain()
@@ -29,17 +30,20 @@
 	else if( isset($_COOKIE["roscms_usrset_lang"]) )
 		$lang = $_COOKIE["roscms_usrset_lang"];
 	
-	// Use this switch statement to prevent users from entering invalid languages and fall back to english if no language has been set
-	switch($lang)
+	// Check if the language is valid
+	$lang_valid = false;
+	
+	foreach( $getbuilds_languages as $lang_key => $lang_name )
 	{
-		case "de":
-		case "en":
-			// Language is valid, nothing to be done
+		if( $lang == $lang_key )
+		{
+			$lang_valid = true;
 			break;
-			
-		default:
-			$lang = "en";
+		}
 	}
+	
+	if( !$lang_valid )
+		$lang = "en";
 	
 	setcookie( "roscms_usrset_lang", $lang, time() + 5 * 30 * 24 * 3600, "/", cookie_domain() );
 	require_once("lang/$lang.inc.php");
@@ -69,6 +73,7 @@
 	<meta http-equiv="content-type" content="text/html; charset=utf-8">
 	<title><?php echo $getbuilds_langres["title"]; ?></title>
 	<link rel="stylesheet" type="text/css" href="getbuilds.css">
+	<!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="ie-lt7-fixes.css"><![endif]-->
 	<script type="text/javascript">
 	<?php require_once("getbuilds.js.php"); ?>
 	</script>
@@ -85,11 +90,6 @@
 		<li style="text-align: center;">
 			<select size="1" onchange="window.location.href = '<?php echo "http://" . $_SERVER["SERVER_NAME"] . $_SERVER["PHP_SELF"]; ?>?lang=' + this.options[this.selectedIndex].value;">
 				<?php
-					$getbuilds_languages = array(
-						"en" => "English",
-						"de" => "Deutsch (German)"
-					);
-					
 					foreach($getbuilds_languages as $lang_key => $lang_name)
 						printf('<option value="%s"%s>%s</option>', $lang_key, ($lang_key == $lang ? ' selected' : ''), $lang_name);
 				?>
@@ -131,7 +131,7 @@
 	</div>
 	</div>
 </div>
-<div style="margin:5px;">&nbsp;</div>
+
 <div class="bubble_bg">
 	<div class="rounded_ll">
 	<div class="rounded_lr">
@@ -157,14 +157,7 @@
 								'<img src="images/rightarrow.gif" alt="&gt;" title="<?php echo $getbuilds_langres["nextrev"]; ?>" onclick="nextRev();"><br>' +
 							'</span>' +
 							
-							'<img src="images/info.gif" alt="INFO:"> <?php
-							
-								echo $getbuilds_langres["rangeinfo"];
-								echo " <i>".$rev."</i>";
-								echo $getbuilds_langres["rangeinfo2"];
-								echo " <i>".($rev-50)."-".$rev."</i>).";
-								
-							 ?>' +
+							'<img src="images/info.gif" alt="INFO:"> <?php printf( $getbuilds_langres["rangeinfo"], $rev, ($rev - 50), $rev ); ?>' +
 						'</td>' +
 					'</tr>' +
 					'<tr>' +

Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
--- trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php Thu Aug 16 22:11:46 2007
@@ -10,7 +10,7 @@
 	/**** German resources (charset=utf-8) ****/
 	$getbuilds_langres["language"] = "Sprache";
 	
-	$getbuilds_langres["header"] = "<a href=\"http://www.reactos.org/\">Startseite</a> &gt; ReactOS SVN Nightly-Builds";
+	$getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Startseite</a> &gt; ReactOS SVN Nightly-Builds';
 	$getbuilds_langres["title"] = "ReactOS Nightly-Builds Herunterladen";
 	$getbuilds_langres["intro"] = 'Hier können Sie aktuelle aber auch ältere ReactOS-Entwicklerversionen herunterladen, die von unserem <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a> erstellt wurden.';
 	
@@ -29,8 +29,7 @@
 	$getbuilds_langres["nextrev"] = "Nächste Revision";
 	$getbuilds_langres["showrev"] = "Anzeigen";
 	$getbuilds_langres["gettinglist"] = "Dateiliste wird geladen";
-	$getbuilds_langres["rangeinfo"] = "Sie können eine Revisionsnummer (z.B.";
-	$getbuilds_langres["rangeinfo2"] = ") oder einen Revisionsbereich eingeben (z.B.";
+	$getbuilds_langres["rangeinfo"] = "Sie können eine Revisionsnummer (z.B. %s) oder einen Revisionsbereich eingeben (z.B. %s-%s)";
 	$getbuilds_langres["isotype"] = "CD-Image-Typen anzeigen";
 	
 	$getbuilds_langres["foundfiles"] = "%s Dateien gefunden!";

Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php?rev=28372&r1=28371&r2=28372&view=diff
==============================================================================
--- trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php Thu Aug 16 22:11:46 2007
@@ -10,7 +10,7 @@
 	/**** English resources (charset=utf-8) ****/
 	$getbuilds_langres["language"] = "Language";
 	
-	$getbuilds_langres["header"] = "<a href=\"http://www.reactos.org/\">Home</a> &gt; ReactOS SVN Trunk Builds";
+	$getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Home</a> &gt; ReactOS SVN Trunk Builds';
 	$getbuilds_langres["title"] = "Download ReactOS Trunk Builds";
 	$getbuilds_langres["intro"] = 'Here you can download recent, but also older ReactOS Developer versions, which were created by our <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a>.';
 	
@@ -29,8 +29,7 @@
 	$getbuilds_langres["nextrev"] = "Next revision";
 	$getbuilds_langres["showrev"] = "Show";
 	$getbuilds_langres["gettinglist"] = "Getting file list";
-	$getbuilds_langres["rangeinfo"] = "You can enter a revision number (e.g.";
-	$getbuilds_langres["rangeinfo2"] = ") or a revision range (e.g.";
+	$getbuilds_langres["rangeinfo"] = "You can enter a revision number (e.g. %s) or a revision range (e.g. %s-%s)";
 	$getbuilds_langres["isotype"] = "Show CD Image types";
 	
 	$getbuilds_langres["foundfiles"] = "Found %s files!";

Added: trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php?rev=28372&view=auto
==============================================================================
--- trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php (added)
+++ trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php Thu Aug 16 22:11:46 2007
@@ -1,0 +1,55 @@
+<?php
+/*
+  PROJECT:    ReactOS Website
+  LICENSE:    GPL v2 or any later version
+  FILE:       web/reactos.org/htdocs/getbuilds/lang/es.inc.php
+  PURPOSE:    Easily download prebuilt ReactOS Revisions
+  COPYRIGHT:  Copyright 2007 Colin Finck <mail at colinfinck.de>
+  TRANSLATION: gabriel ilardi <gabrielilardi at hotmail.it>
+*/
+	
+	/**** Spanish resources (charset=utf-8) ****/
+	$getbuilds_langres["language"] = "Idioma";
+	
+	$getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Home</a> &gt; Builds del Trunk de ReactOS SVN';
+	$getbuilds_langres["title"] = "Descargar las builds del trunk";
+	$getbuilds_langres["intro"] = 'Aquí puedes descargar versiones recientes de desarrollo de ReactOS pero también viejas versiones, que han sido creadas por nuestro <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a>.';~
+	
+	$getbuilds_langres["overview"] = "Resumen";
+	$getbuilds_langres["latestrev"] = "Ultima revisión de ReactOS en el server SVN";
+	$getbuilds_langres["browsesvn"] = "Hojear el repositorio SVN online";
+	$getbuilds_langres["cia"] = "Ver los últimos commits en CIA.vc";
+	$getbuilds_langres["buildbot_status"] = "Estado de BuildBot";
+	$getbuilds_langres["buildbot_web"] = "Ver detalles de la interfaz web de BuildBot";
+	$getbuilds_langres["browsebuilds"] = "Hojear todas las builds creadas";
+	
+	$getbuilds_langres["downloadrev"] = "Descargar una revisión precompilada de ReactOS";
+	$getbuilds_langres["js_disclaimer"] = 'Tienes que tener JavaScript habilitado en tu browser para poder ver la lista de archivos de las revisiones.<br>Alternativamente, puedes descargar todas las versiones precompiladas desde <a href="http://svn.reactos.org/iso">aquí</a>.';
+	$getbuilds_langres["showrevfiles"] = "Mostrar los archivos de la revisión";
+	$getbuilds_langres["prevrev"] = "Revisión anterior";
+	$getbuilds_langres["nextrev"] = "Revisión siguiente";
+	$getbuilds_langres["showrev"] = "Mostrar";
+	$getbuilds_langres["gettinglist"] = "Obteniendo la lista de archivos";
+	$getbuilds_langres["rangeinfo"] = "Puedes entrar un numero de revisión (p.ej. %s) o un rango de revisiones (p.ej. %s-%s)";
+	$getbuilds_langres["isotype"] = "Mostrar tipos de imagen de CD";
+	
+	$getbuilds_langres["foundfiles"] = "Encontrado(s) %s archivo(s)!";
+	
+	$getbuilds_langres["firstpage_title"] = "Ir a la primera página";
+	$getbuilds_langres["prevpage_title"] = "Página anterior";
+	$getbuilds_langres["prevpage"] = "Anterior";
+	$getbuilds_langres["page"] = "Página";
+	$getbuilds_langres["nextpage"] = "Siguiente";
+	$getbuilds_langres["nextpage_title"] = "Página siguiente";
+	$getbuilds_langres["lastpage_title"] = "Ir a la última página";
+	
+	$getbuilds_langres["filename"] = "Nombre de archivo";
+	$getbuilds_langres["filesize"] = "Tamaño";
+	$getbuilds_langres["filedate"] = "Modificado";
+	$getbuilds_langres["pleasewait"] = "Espera por favor";
+	
+	$getbuilds_langres["nofiles"] 	 = "No hay archivos precompilados para la revisión %s!";
+	$getbuilds_langres["invalidrev"] = "Número de revisión inválido!";
+	
+	$getbuilds_langres["rangelimitexceeded"] = "El rango de revisiones puede contener un máximo de %s revisiones!";
+?>

Added: trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php?rev=28372&view=auto
==============================================================================
--- trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php (added)
+++ trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php Thu Aug 16 22:11:46 2007
@@ -1,0 +1,55 @@
+<?php
+/*
+  PROJECT:    ReactOS Website
+  LICENSE:    GPL v2 or any later version
+  FILE:       web/reactos.org/htdocs/getbuilds/lang/it.inc.php
+  PURPOSE:    Easily download prebuilt ReactOS Revisions
+  COPYRIGHT:  Copyright 2007 Colin Finck <mail at colinfinck.de>
+  TRANSLATION: gabriel ilardi <gabrielilardi at hotmail.it>
+*/
+	
+	/**** Italian resources (charset=utf-8) ****/
+	$getbuilds_langres["language"] = "Lingua";
+	
+	$getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Home</a> &gt; Builds del Trunk di ReactOS SVN';
+	$getbuilds_langres["title"] = "Scaricare le builds dal trunk";
+	$getbuilds_langres["intro"] = 'Qui puoi scaricare versioni di sviluppo di ReactOS recenti ma anche vecchie, che sono state create da <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a>.';
+	
+	$getbuilds_langres["overview"] = "Descrizone";
+	$getbuilds_langres["latestrev"] = "Ultima revisione di ReactOS sul server SVN";
+	$getbuilds_langres["browsesvn"] = "Sfogliare il repositorio online SVN";
+	$getbuilds_langres["cia"] = "Vedere gli ultimi commits in CIA.vc";
+	$getbuilds_langres["buildbot_status"] = "Stato di BuildBot";
+	$getbuilds_langres["buildbot_web"] = "Vedere i dettagli dall'interfaccia web di BuildBot";
+	$getbuilds_langres["browsebuilds"] = "Sfogliare tutte le Builds create";
+	
+	$getbuilds_langres["downloadrev"] = "Scaricare una revisione precompilata di ReactOS";
+	$getbuilds_langres["js_disclaimer"] = 'Serve JavaScript abilitato nel tuo browser per usare la lista di file delle revisioni.<br>Alternativamente, puoi scaricare tutte le revisioni precompilate da <a href="http://svn.reactos.org/iso">qui</a>.';
+	$getbuilds_langres["showrevfiles"] = "Mostrare i files della revisione";
+	$getbuilds_langres["prevrev"] = "Revisione precedente";
+	$getbuilds_langres["nextrev"] = "Revisione successiva";
+	$getbuilds_langres["showrev"] = "Mostrare";
+	$getbuilds_langres["gettinglist"] = "Ottentendo l\'elenco dei file";
+	$getbuilds_langres["rangeinfo"] = "Puoi inserire un numero di revisione (ad es. %s) oppure un range di revisioni (ad es. %s-%s)";
+	$getbuilds_langres["isotype"] = "Mostrare imagini cd";
+	
+	$getbuilds_langres["foundfiles"] = "Trovato(i) %s file(s)!";
+	
+	$getbuilds_langres["firstpage_title"] = "Andare alla prima pagina";
+	$getbuilds_langres["prevpage_title"] = "Pagina precendente";
+	$getbuilds_langres["prevpage"] = "Precedente";
+	$getbuilds_langres["page"] = "Pagina";
+	$getbuilds_langres["nextpage"] = "Successiva";
+	$getbuilds_langres["nextpage_title"] = "Pagina successiva";
+	$getbuilds_langres["lastpage_title"] = "Andare all\'ultima pagina";
+	
+	$getbuilds_langres["filename"] = "Nome file";
+	$getbuilds_langres["filesize"] = "Dimensioni";
+	$getbuilds_langres["filedate"] = "Modificato";
+	$getbuilds_langres["pleasewait"] = "Attendere prego";
+	
+	$getbuilds_langres["nofiles"] 	 = "Non ci sono files precompilati per la revisione %s!";
+	$getbuilds_langres["invalidrev"] = "Numero di revisione invalido!";
+	
+	$getbuilds_langres["rangelimitexceeded"] = "Il range delle revisioni può comprendere un massimo di %s revisioni!";
+?>

Added: trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php?rev=28372&view=auto
==============================================================================
--- trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php (added)
+++ trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php Thu Aug 16 22:11:46 2007
@@ -1,0 +1,17 @@
+<?php
+/*
+  PROJECT:    ReactOS Website
+  LICENSE:    GPL v2 or any later version
+  FILE:       web/reactos.org/htdocs/getbuilds/inc/languages.inc.php
+  PURPOSE:    Easily download prebuilt ReactOS Revisions
+  COPYRIGHT:  Copyright 2007 Colin Finck <mail at colinfinck.de>
+*/
+
+	// The language names have to be saved in an UTF-8 file without the Byte-Order-Mark
+	$getbuilds_languages = array(
+		"en" => "English",
+		"de" => "Deutsch (German)",
+		"es" => "Español (Spanish)",
+		"it" => "Italiano (Italian)"
+	);
+?>

More information about the Ros-diffs mailing list