Author: buildbot Date: Sat Jul 26 15:16:55 2014 New Revision: 917497 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/test/download.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sat Jul 26 15:16:55 2014 @@ -1 +1 @@ -1613648 +1613649 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sat Jul 26 15:16:55 2014 @@ -1 +1 @@ -1613648 +1613649 Modified: websites/staging/ooo-site/trunk/content/download/test/download.js ============================================================================== --- websites/staging/ooo-site/trunk/content/download/test/download.js (original) +++ websites/staging/ooo-site/trunk/content/download/test/download.js Sat Jul 26 15:16:55 2014 @@ -186,13 +186,20 @@ DL.getLanguage = function() { thisLanguageSet = DL.language_matrix[ languageCode ]; } +// language = "pt-PT"; +// languageCode = "pt"; +// regionCode = "pt"; +// regionCode = "PT"; + +// alert( language + "\n" + languageCode + "\n" + regionCode ); + if( regionCode != null ) { -/* // Fix for Portuguese (European) downloads as they are named only "pt" without region code! - if( languageCode === "pt" && regionCode === "pt" ) { + if( languageCode === "pt" && ( regionCode === "pt" || regionCode === "PT" )) { language = languageCode; +// alert( language + "\n" + languageCode + "\n" + regionCode ); } -*/ + // If an additional region code was found. if( thisLanguageSet[ regionCode ] != null ) { // Assign langCode-regionCode. @@ -217,6 +224,8 @@ DL.getLanguage = function() { thisLanguage = thisLanguageSet[ "-" ]; } +// alert( DL.LANG_ISO + "\n" + language ); + DL.LANG_ISO = language; return DL.LANG_ISO; }