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/26 16:22:32 UTC
svn commit: r917485 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/
content/download/download.js
Author: buildbot
Date: Sat Jul 26 14:22:31 2014
New Revision: 917485
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 26 14:22:31 2014
@@ -1 +1 @@
-1613633
+1613634
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 26 14:22:31 2014
@@ -1 +1 @@
-1613633
+1613634
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 26 14:22:31 2014
@@ -187,12 +187,6 @@ 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.
@@ -212,6 +206,11 @@ 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[ "-" ];