Author: marcus Date: Thu Jun 20 21:31:44 2013 New Revision: 1495196 URL: http://svn.apache.org/r1495196 Log: Fixed white-spaces, added comments
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=1495196&r1=1495195&r2=1495196&view=diff ============================================================================== --- openoffice/ooo-site/trunk/content/download/test/download.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download.js Thu Jun 20 21:31:44 2013 @@ -48,11 +48,11 @@ function getLanguage() { if ( language.indexOf( "_" ) != -1 ) language = language.split( "_" ).join( "-" ); - language = language.toLowerCase(); - var languageCode = language.split( "-" )[ 0 ]; - var regionCode = language.split( "-" )[ 1 ]; + language = language.toLowerCase(); + var languageCode = language.split( "-" )[ 0 ]; + var regionCode = language.split( "-" )[ 1 ]; - var thisLanguageSet = languages[ languageCode ]; + var thisLanguageSet = languages[ languageCode ]; if ( thisLanguageSet == null ) { // Language code not found inside array language = "en-US"; @@ -99,8 +99,8 @@ function getLanguage() { * Depends on array-list */ function hasMirrorLink() { - if ( PLATFORM == "no_mirror_platform" ) - return false; + // if ( PLATFORM == "unknown" ) + // return false; // Check the flag in "languages.js", 'y' -> provide download link, 'n' -> redirect to alternative webpage if ( LANG_ARRAY[ 3 ] == 'y' ) @@ -114,8 +114,8 @@ function hasMirrorLink() { * Depends on array-list */ function getLink() { - var file_link = ""; - var chk_link = ""; + var file_link = ""; + var chk_link = ""; getLanguage(); getPlatform(); @@ -128,9 +128,9 @@ function getLink() { // version = version.split( "_" )[0]; if ( hasMirrorLink() ) { - if ( UI_PLATFORM == "unknown" && PLATFORM == "unknown" && EXTENSION == "unknown" ) { - file_link = "http://www.openoffice.org/download/other.html"; - UI_PLATFORM = "(OS unknown)"; + if ( UI_PLATFORM == "unknown" || PLATFORM == "unknown" || EXTENSION == "unknown" ) { + UI_PLATFORM = "(OS unknown)"; + file_link = "http://www.openoffice.org/download/other.html"; return file_link; } @@ -141,8 +141,8 @@ function getLink() { file_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE; file_link = file_link + "/Apache_OpenOffice_" + VERSION + "_" + PLATFORM; file_link = file_link + "_" + NL_LANGUAGE + EXTENSION; - FILENAME = "Apache_OpenOffice_" + VERSION + "_" + PLATFORM + "_" - FILENAME = FILENAME + NL_LANGUAGE + EXTENSION; + FILENAME = "Apache_OpenOffice_" + VERSION + "_" + PLATFORM + "_" + FILENAME = FILENAME + NL_LANGUAGE + EXTENSION; // chk_link = APACHE_DIST_BASE_URL + "Apache_OpenOffice_" + VERSION + "_"; // chk_link = chk_link + PLATFORM + "_" + NL_LANGUAGE + EXTENSION; @@ -260,6 +260,7 @@ function getPlatform() { EXTENSION = "unknown"; } } else { + // No platform / OS was recognized UI_PLATFORM = "unknown"; PLATFORM = "unknown"; EXTENSION = "unknown";