You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2014/07/21 00:26:31 UTC

svn commit: r1612170 - /openoffice/ooo-site/trunk/content/download/test/download_other.js

Author: marcus
Date: Sun Jul 20 22:26:31 2014
New Revision: 1612170

URL: http://svn.apache.org/r1612170
Log:
Fixed wrong variables

Modified:
    openoffice/ooo-site/trunk/content/download/test/download_other.js

Modified: openoffice/ooo-site/trunk/content/download/test/download_other.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_other.js?rev=1612170&r1=1612169&r2=1612170&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download_other.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download_other.js Sun Jul 20 22:26:31 2014
@@ -26,11 +26,11 @@ function write_table( rel_mode ) {
 		// Release mode
 		var AOO		= "Apache_OpenOffice_";
 		var AOO_SDK	= "Apache_OpenOffice-SDK_";
-		var AOO_SRC	= "/source/apache-openoffice-" + VERSION + "-" + SVN_REV + "-src";
-		var URL_AOO	= SOURCEFORGE + VERSION + "/binaries/";
-		var URL_SDK	= SOURCEFORGE + VERSION + "/binaries/" + "SDK/" + AOO_SDK + VERSION;
-		var URL_SRC	= ASF_ARC + VERSION + AOO_SRC;
-		var URL_HASH	= ASF_ARC + VERSION;
+		var AOO_SRC	= "/source/apache-openoffice-" + DL.VERSION + "-" + DL.SVN_REV + "-src";
+		var URL_AOO	= DL.SF      + DL.VERSION + "/binaries/";
+		var URL_SDK	= DL.SF      + DL.VERSION + "/binaries/" + "SDK/" + AOO_SDK + DL.VERSION;
+		var URL_SRC	= DL.ASF_ARC + DL.VERSION + AOO_SRC;
+		var URL_HASH	= DL.ASF_ARC + DL.VERSION;
 
 // Debug: Uncomment to use different base URLs
 /*
@@ -40,20 +40,20 @@ function write_table( rel_mode ) {
 */
 	} else if ( rel_mode == 2 ) {
 		// Beta release mode
-		BETA_VERSION	= "4.1.0";
-		VERSION		= BETA_VERSION;
-		SVN_REV		= BETA_SVN_REV;
-		PLATFORM	= BETA_PLATFORM;
-		FULL_LANG	= BETA_FULL_LANG;
-		LP_LANG		= BETA_LP_LANG;
-		SDK_LANG	= BETA_SDK_LANG;
+		var BETA_VERSION = "4.1.0";
+		var VERSION	= DL_BETA.BETA_VERSION;
+		var SVN_REV	= DL_BETA.BETA_SVN_REV;
+		var PLATFORM	= DL_BETA.BETA_PLATFORM;
+		var FULL_LANG	= DL_BETA.BETA_FULL_LANG;
+		var LP_LANG	= DL_BETA.BETA_LP_LANG;
+		var SDK_LANG	= DL_BETA.BETA_SDK_LANG;
 		var AOO		= "Apache_OpenOffice_Beta_";
 		var AOO_SDK	= "Apache_OpenOffice_Beta-SDK_";
-		var AOO_SRC	= "/source/apache-openoffice-" + BETA_VERSION + "-beta-" + SVN_REV + "-src";
+		var AOO_SRC	= "/source/apache-openoffice-" + DL_BETA.BETA_VERSION + "-beta-" + DL_BETA.SVN_REV + "-src";
 		var URL_AOO	= BETA_SOURCEFORGE_BASE_URL;
-		var URL_SDK	= BETA_SOURCEFORGE_BASE_URL + "SDK/" + AOO_SDK + BETA_VERSION;
-		var URL_SRC	= BETA_ASF_DIST_BASE_URL + AOO_SRC;
-		var URL_HASH	= BETA_ASF_DIST_BASE_URL;
+		var URL_SDK	= BETA_SOURCEFORGE_BASE_URL + "SDK/" + AOO_SDK + DL_BETA.BETA_VERSION;
+		var URL_SRC	= DL_BETA.BETA_ASF_DIST + AOO_SRC;
+		var URL_HASH	= DL_BETA.BETA_ASF_DIST;
 
 // Debug: Uncomment to use different base URLs
 /*
@@ -67,8 +67,8 @@ function write_table( rel_mode ) {
 
 	write_header( rel_mode, 1 );
 	document.write( "<tbody>" );
-	write_lang( rel_mode, URL_AOO,                   URL_HASH,          REL_PLATFORM, REL_FULL_LANG, REL_LP_LANG, VERSION, AOO     );
-	write_sdk(  rel_mode,          URL_SDK, URL_SRC, URL_HASH, AOO_SRC, REL_PLATFORM, REL_SDK_LANG,               VERSION, AOO_SDK );
+	write_lang( rel_mode, URL_AOO,                   URL_HASH,          DL.REL_PLATFORM, DL.REL_FULL_LANG, DL.REL_LP_LANG, DL.VERSION, AOO     );
+	write_sdk(  rel_mode,          URL_SDK, URL_SRC, URL_HASH, AOO_SRC, DL.REL_PLATFORM, DL.REL_SDK_LANG,                  DL.VERSION, AOO_SDK );
 	write_top();
 
 	document.write( "</tbody>" );
@@ -136,24 +136,24 @@ function write_header( rel_mode, FIRST_H
 	document.write( "<thead><tr>" );
 	document.write( "<th colspan='2' style='text-align: center'>"                  + SMALL1 + "Language<br />The names do not refer to countries.<br />&nbsp;" + SMALL2 + "</th>" );
 	document.write( "<th><span style='text-align: center' class='builds'>"         + SMALL1 + "Type<br />&nbsp;<br />&nbsp;"     + SMALL2 + "</span></th>" );
-	if ( REL_PLATFORM.indexOf( "Win_x86" ) > -1 )
+	if ( DL.REL_PLATFORM.indexOf( "Win_x86" ) > -1 )
 		document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "Windows    <br />Intel <br />EXE" + SMALL2 + "</span></th>" );
-	if ( REL_PLATFORM.indexOf( "Linux_x86_rpm" ) > -1 )
+	if ( DL.REL_PLATFORM.indexOf( "Linux_x86_rpm" ) > -1 )
 		document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "Linux      <br />Intel <br />RPM" + SMALL2 + "</span></th>" );
-	if ( REL_PLATFORM.indexOf( "Linux_x86_deb" ) > -1 )
+	if ( DL.REL_PLATFORM.indexOf( "Linux_x86_deb" ) > -1 )
 		document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "Linux      <br />Intel <br />DEB" + SMALL2 + "</span></th>" );
-	if ( REL_PLATFORM.indexOf( "Linux_x86-64_rpm" ) > -1 )
+	if ( DL.REL_PLATFORM.indexOf( "Linux_x86-64_rpm" ) > -1 )
 		document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "Linux      <br />x86-64<br />RPM" + SMALL2 + "</span></th>" );
-	if ( REL_PLATFORM.indexOf( "Linux_x86-64_deb" ) > -1 )
+	if ( DL.REL_PLATFORM.indexOf( "Linux_x86-64_deb" ) > -1 )
 		document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "Linux      <br />x86-64<br />DEB" + SMALL2 + "</span></th>" );
 	if ( rel_mode == 1 ) {
 		// Release mode
-		if ( REL_PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
+		if ( DL.REL_PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
 			document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "OS&nbsp;X  <br />x86-64<br />DMG" + SMALL2 + "</span></th>" );
 	} else if ( rel_mode == 2 ) {
 		// Beta release mode
-		REL_PLATFORM = BETA_REL_PLATFORM;
-		if ( REL_PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
+		DL.REL_PLATFORM = DL_BETA.BETA_REL_PLATFORM;
+		if ( DL.REL_PLATFORM.indexOf( "MacOS_x86-64" ) > -1 )
 			document.write( "<th><span style='text-align: center' class='builds'>" + SMALL1 + "OS&nbsp;X  <br />x86-64<br />DMG" + SMALL2 + "</span></th>" );
 	}
 	document.write( "</tr></thead>" );
@@ -317,7 +317,7 @@ function write_lang( rel_mode, URL_AOO, 
 	document.write( "<br />" );
 */
 	if ( FULL_LANG.length == 1 ) {
-		for ( var i = 0; i < LANG_MAX; i++ ) {
+		for ( var i = 0; i < DL.LANG_MAX; i++ ) {
 			for ( var k = 0; k < FULL_LANG.length; k++ ) {
 				if ( FULL_LANG[ k ] == LANG[ i ][ "ISO" ] ) {
 					if ( FULL_LANG[ k ] == "en-US" ) {
@@ -333,7 +333,7 @@ function write_lang( rel_mode, URL_AOO, 
 		}
 	}
 
-	for ( var i = 0; i < LANG_MAX; i++ ) {
+	for ( var i = 0; i < DL.LANG_MAX; i++ ) {
 		for ( var j = 0; j < LP_LANG.length; j++ ) {
 			if ( LP_LANG[ j ] == LANG[ i ][ "ISO" ] ) {
 				for ( var k = 0; k < FULL_LANG.length; k++ ) {