svn commit: r1613649 - /openoffice/ooo-site/trunk/content/download/test/download.js

[marcus]

Author: marcus
Date: Sat Jul 26 15:15:50 2014
New Revision: 1613649

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

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

Modified: openoffice/ooo-site/trunk/content/download/test/download.js
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download.js?rev=1613649&r1=1613648&r2=1613649&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download.js Sat Jul 26 
15:15:50 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;
 }