openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r1573403 - /openoffice/ooo-site/trunk/content/download/test/download.js
Date Sun, 02 Mar 2014 23:13:04 GMT
Author: marcus
Date: Sun Mar  2 23:13:03 2014
New Revision: 1573403

URL: http://svn.apache.org/r1573403
Log:
Rely on the value of the 'LANG_ISO' variable

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

Modified: openoffice/ooo-site/trunk/content/download/test/download.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download.js?rev=1573403&r1=1573402&r2=1573403&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download.js Sun Mar  2 23:13:03 2014
@@ -129,10 +129,10 @@ function getLink( rel_mode ) {
 	if ( hasMirrorLink() ) {
 		getFilesize( rel_mode );
 	}
-
+	/*
 	if ( NL_LANGUAGE == "" )
 		NL_LANGUAGE = LANG_ISO;
-
+	*/
 	/*
 	Trim timestamp from version, required for RC
 	if ( version.indexOf( "_" ) > -1 )
@@ -149,11 +149,11 @@ function getLink( rel_mode ) {
 				if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
 
 					FILENAME	= "Apache_OpenOffice_" + PRE_VERSION + "_" + URL_PLATFORM + "_";
-					FILENAME	= FILENAME + NL_LANGUAGE + EXTENSION;
-					LINK		= SOURCEFORGE_PREVIOUS_URL + NL_LANGUAGE + "/" + FILENAME;
+					FILENAME	= FILENAME + LANG_ISO + EXTENSION;
+					LINK		= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME;
 					LINK		= LINK + "/download";
 
-					chk_link	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + NL_LANGUAGE + "/";
+					chk_link	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
 					chk_link	= chk_link + FILENAME;
 
 					CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
@@ -212,19 +212,19 @@ function getLink( rel_mode ) {
 
 			// If platform was recognized, assemble the filenames for download and checksums
 
-			// FILENAME	= "Apache_OpenOffice_" + VERSION + "_" + URL_PLATFORM + "_" + NL_LANGUAGE;
+			// FILENAME	= "Apache_OpenOffice_" + VERSION + "_" + URL_PLATFORM + "_" + LANG_ISO;
 			// FILENAME	= FILENAME + EXTENSION;
 
 			// Assign the file name (column 3) from the release matrix of language and platform
 			FILENAME	= release_matrix[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
 
-			// LINK	= SOURCEFORGE_BASE_URL + NL_LANGUAGE + "/Apache_OpenOffice_" + VERSION + "_";
-			// LINK	= LINK + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION + "/download";
-			LINK		= SOURCEFORGE_BASE_URL + NL_LANGUAGE + "/" + FILENAME + "/download";
-
-			// chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_";
-			// chk_link	= chk_link + VERSION + "_" + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
-			chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + NL_LANGUAGE + "/" + FILENAME;
+			// LINK	= SOURCEFORGE_BASE_URL + LANG_ISO + "/Apache_OpenOffice_" + VERSION + "_";
+			// LINK	= LINK + URL_PLATFORM + "_" + LANG_ISO + EXTENSION + "/download";
+			LINK		= SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME + "/download";
+
+			// chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_";
+			// chk_link	= chk_link + VERSION + "_" + URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
+			chk_link	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME;
 
 			CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
 			CHECKSUM_ASC	= chk_link + ".asc";
@@ -233,10 +233,10 @@ function getLink( rel_mode ) {
 
 			/*
 			// Used for debugging
-			LINK		= PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_";
-			LINK		= LINK + "/Apache_OpenOffice_" + "_" + NL_LANGUAGE + EXTENSION;
-			chk_link	= PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_" + VERSION;
-			chk_link	= chk_link + "_" + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
+			LINK		= PEOPLE_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_";
+			LINK		= LINK + "/Apache_OpenOffice_" + "_" + LANG_ISO + EXTENSION;
+			chk_link	= PEOPLE_BASE_URL + "/binaries/" + LANG_ISO + "/Apache_OpenOffice_" + VERSION;
+			chk_link	= chk_link + "_" + URL_PLATFORM + "_" + LANG_ISO + EXTENSION;
 			*/
 
 			SOURCEFORGE	= true;
@@ -253,11 +253,11 @@ function getLink( rel_mode ) {
 				if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
 
 					FILENAME	= "Apache_OpenOffice_" + PRE_VERSION + "_" + URL_PLATFORM + "_";
-					FILENAME	= FILENAME + NL_LANGUAGE + EXTENSION;
-					LINK		= SOURCEFORGE_PREVIOUS_URL + NL_LANGUAGE + "/" + FILENAME;
+					FILENAME	= FILENAME + LANG_ISO + EXTENSION;
+					LINK		= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + FILENAME;
 					LINK		= LINK + "/download";
 
-					chk_link	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + NL_LANGUAGE + "/";
+					chk_link	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
 					chk_link	= chk_link + FILENAME;
 
 					CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
@@ -282,14 +282,14 @@ function getLink( rel_mode ) {
 			// Assign the file name (column 3) from the release matrix of language and platform
 			FILENAME	= release_matrix_beta[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS ][ 3 ];
 
-			// LINK	= SOURCEFORGE_BASE_URL_BETA + NL_LANGUAGE + "/Apache_OpenOffice_Beta_" + VERSION
+ "_";
-			// LINK	= LINK + URL_PLATFORM + "_" + NL_LANGUAGE + EXTENSION + "/download";
-			LINK		= SOURCEFORGE_BASE_URL_BETA + NL_LANGUAGE + "/" + FILENAME + "/download";
+			// LINK	= SOURCEFORGE_BASE_URL_BETA + LANG_ISO + "/Apache_OpenOffice_Beta_" + VERSION
+ "_";
+			// LINK	= LINK + URL_PLATFORM + "_" + LANG_ISO + EXTENSION + "/download";
+			LINK		= SOURCEFORGE_BASE_URL_BETA + LANG_ISO + "/" + FILENAME + "/download";
 
-			// chk_link	= APACHE_DIST_BASE_URL_BETA + "/binaries/" + NL_LANGUAGE;
+			// chk_link	= APACHE_DIST_BASE_URL_BETA + "/binaries/" + LANG_ISO;
 			// chk_link	= chk_link + "/Apache_OpenOffice_Beta_" + VERSION + "_" + URL_PLATFORM + "_";
-			// chk_link	= chk_link + NL_LANGUAGE + EXTENSION;
-			chk_link	= APACHE_DIST_BASE_URL_BETA + "/binaries/" + NL_LANGUAGE + "/" + FILENAME;
+			// chk_link	= chk_link + LANG_ISO + EXTENSION;
+			chk_link	= APACHE_DIST_BASE_URL_BETA + "/binaries/" + LANG_ISO + "/" + FILENAME;
 
 			CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
 			CHECKSUM_ASC	= chk_link + ".asc";



Mime
View raw message