Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@openoffice.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1613648 -
 /openoffice/ooo-site/trunk/content/download/download.js
Date: Sat, 26 Jul 2014 15:12:57 -0000
To: commits@openoffice.apache.org
From: marcus@apache.org
Message-Id: <20140726151257.2A3EF2388831@eris.apache.org>

Author: marcus
Date: Sat Jul 26 15:12:56 2014
New Revision: 1613648

URL: http://svn.apache.org/r1613648
Log:
Convert 'pt-pt' or 'pt-PT' into 'pt', otherwise the ISO code cannot be processed correctly

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

Modified: openoffice/ooo-site/trunk/content/download/download.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/download.js?rev=1613648&r1=1613647&r2=1613648&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/download.js (original)
+++ openoffice/ooo-site/trunk/content/download/download.js Sat Jul 26 15:12:56 2014
@@ -187,6 +187,12 @@ DL.getLanguage = function() {
 	}
 
 	if( regionCode != null ) {
+/*
+		// Fix for Portuguese (European) downloads as they are named only "pt" without region code!
+		if( languageCode === "pt" && regionCode === "pt" ) {
+			language = languageCode;
+		}
+*/
 		// If an additional region code was found.
 		if( thisLanguageSet[ regionCode ] != null ) {
 			// Assign langCode-regionCode.
@@ -206,11 +212,6 @@ DL.getLanguage = function() {
 				language	= languageCode;
 			}
 		}
-
-		// Fix for Portuguese (European) downloads as they are named only "pt" without region code!
-		if( languageCode === "pt" && regionCode.toLowerCase === "pt" ) {
-			language = languageCode;
-		}
 	} else {
 		// Choose the default for none given region code.
 		thisLanguage = thisLanguageSet[ "-" ];