You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2014/07/12 19:52:39 UTC

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

Author: buildbot
Date: Sat Jul 12 17:52:39 2014
New Revision: 915957

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 Sat Jul 12 17:52:39 2014
@@ -1 +1 @@
-1610011
+1610012

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 12 17:52:39 2014
@@ -1 +1 @@
-1610011
+1610012

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 Sat Jul 12 17:52:39 2014
@@ -161,11 +161,12 @@ DL.getLanguage = function() {
 	if( !language || language === "" || language == null || language === "en" ) {
 		language = "en-US";
 	}
+/*
 	// Assign "pt-PT" if only "pt" is set.
 	if( language === "pt" ) {
 		language = "pt-PT";
 	}
-
+*/
 	// Konqueror uses '_' where other browsers use '-'.
 	if( language.indexOf( "_" ) !== -1 ) {
 		// Change a contained '_' into a '-'.
@@ -186,11 +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.