openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1022083 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/download.js
Date Mon, 11 Dec 2017 20:33:11 GMT
Author: buildbot
Date: Mon Dec 11 20:33:10 2017
New Revision: 1022083

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.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 11 20:33:10 2017
@@ -1 +1 @@
-1817820
+1817821

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 11 20:33:10 2017
@@ -1 +1 @@
-1817820
+1817821

Modified: websites/staging/ooo-site/trunk/content/download/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download.js Mon Dec 11 20:33:10 2017
@@ -128,6 +128,13 @@ DL.initVariables = function( init_all )
 	DL.SHOW_SUB_BOX			= true;	 // Is the download URL OK to show the sub-box (true) or not (false)?
 	DL.ERROR			= false; // Is the download URL in general OK (false) or not (true)?
 
+	// Check if all option names in the selection box for languages are localized.
+	// If the first string in the array element is larger than 0, assume all are localized and
should be used.
+	// Otherwise use the default names.
+	if ( l10n.dl_green_box_select_box_lang_values_custom[ 0 ].length > 0 ) {
+		DL.SEL_LANG = l10n.dl_green_box_select_box_lang_values_custom;
+	}
+
 	return;
 }
 
@@ -283,7 +290,7 @@ DL.fillLanguageSelection = function() {
 		selection.appendChild( option );
 	}
 
-	// Check if the option names are localized. 
+	// Check if only the option names are localized.
 	// If the first string in the array element is larger than 0, assume all are localized and
should be used.
 	if ( l10n.dl_green_box_select_box_language_values[ 0 ].length > 0 ) {
 		// Search through the localized names.
@@ -465,13 +472,14 @@ DL.getLanguageSelection = function() {
 	// Search through the <select> element until the chosen language is found.
 	for( var i = 0, j = DL.SEL_LANG.length; i < j; i = i + 3 ) {
 		if( DL.SEL_LANG[ i ] === language_value ) {
-			DL.LANG_SEL = language_value;
+			DL.SEL_LANG = language_value;
 			break;
 		}
 	}
 
-	DL.LANG_ISO = DL.LANG_SEL;
-	return DL.LANG_SEL;
+	DL.LANG_ISO = DL.SEL_LANG;
+	DL.LANG_SEL = DL.SEL_LANG;
+	return DL.SEL_LANG;
 }
 
 /*



Mime
View raw message