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 2015/01/20 19:48:30 UTC

svn commit: r1653335 - /openoffice/ooo-site/trunk/content/scripts/ooo.js

Author: marcus
Date: Tue Jan 20 18:48:30 2015
New Revision: 1653335

URL: http://svn.apache.org/r1653335
Log:
Fixed the error of an empty text box with changing the position of the 'if()' statement

Modified:
    openoffice/ooo-site/trunk/content/scripts/ooo.js

Modified: openoffice/ooo-site/trunk/content/scripts/ooo.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/scripts/ooo.js?rev=1653335&r1=1653334&r2=1653335&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/scripts/ooo.js (original)
+++ openoffice/ooo-site/trunk/content/scripts/ooo.js Tue Jan 20 18:48:30 2015
@@ -282,12 +282,6 @@ INDEX.setRedirect = function() {
 		lang_iso = "pt";
 	}
 
-	// Fix for English as main language for the website, it does not need a language code.
-	if( lang_iso === "en-us" || lang_iso === "en-gb" || lang_iso === "en-uk" || lang_iso === "en" ||
-	    lang_iso === "en-US" || lang_iso === "en-GB" || lang_iso === "en-UK" ) {
-		lang_iso = "";
-	}
-
 	// Query if the browser language is one of the released languages.
 	// The array has 3 elements per language (defined in "/download/globalvars.js"
 	for( var i = 0, j = DL.SEL_LANG.length; i < j; i = i + 3 ) {
@@ -313,6 +307,12 @@ INDEX.setRedirect = function() {
 	    lang_mode = "none";
 	}
 
+	// Fix for English as main language for the website, it does not need a language code.
+	if( lang_iso === "en-us" || lang_iso === "en-gb" || lang_iso === "en-uk" || lang_iso === "en" ||
+	    lang_iso === "en-US" || lang_iso === "en-GB" || lang_iso === "en-UK" ) {
+		lang_iso = "";
+	}
+
 	switch( lang_mode ) {
 		case "hard":
 			// Do not show a message, just redirect.