svn commit: r922446 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/download_kay.js

[bu...@apache.org]

Author: buildbot
Date: Tue Sep 16 21:14:04 2014
New Revision: 922446

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/download_kay.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 16 21:14:04 2014
@@ -1 +1 @@
-1625386
+1625393

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 16 21:14:04 2014
@@ -1 +1 @@
-1625386
+1625393

Modified: websites/staging/ooo-site/trunk/content/download/download_kay.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download_kay.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download_kay.js Tue Sep 16 21:14:04 2014
@@ -380,7 +380,7 @@ DL.setLanguageSelection = function() {
 	// Depending on $DL.LANG_ISO assign the language position of the release matrix.
 
 	var selection = document.getElementById( "language" );
-	var found     = false;
+//	var found     = false;
 
 	// Set the recognized browser language as default for the select box.
 	for( var i = 0, j = DL.SEL_LANG.length; i < j; i = i + 3 ) {
@@ -394,7 +394,8 @@ DL.setLanguageSelection = function() {
 
 	// If no selected language was set in the select box because it was not recognized from browser data,
 	// assign "en-US" as default.
-	if( ! found ) {
+//	if( ! found ) {
+	if( selection.selectedIndex === 0 ) {
 		// Default: Assign "en-US".
 		for( var i = 0, j = DL.SEL_LANG.length; i < j; i = i + 2 ) {
 			// If the language was found, set it as pre-selected.
@@ -427,7 +428,7 @@ DL.setVersionSelection = function() {
 			break;
 		}
 	}
-
+/*
 	// If no version was set as global variable,
 	// assign the most recent version as default.
 	if( selection.selectedIndex === 0 ) {
@@ -440,7 +441,7 @@ DL.setVersionSelection = function() {
 			}
 		}
 	}
-
+*/
 	DL.VERSION_SEL = selection.value;
 	return DL.VERSION_SEL;
 }