svn commit: r986687 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/index.html

[bu...@apache.org]

Author: buildbot
Date: Tue Apr 26 09:34:08 2016
New Revision: 986687

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/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Apr 26 09:34:08 2016
@@ -1 +1 @@
-1740976
+1740979

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Apr 26 09:34:08 2016
@@ -1 +1 @@
-1740976
+1740979

Modified: websites/staging/ooo-site/trunk/content/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/index.html (original)
+++ websites/staging/ooo-site/trunk/content/index.html Tue Apr 26 09:34:08 2016
@@ -146,6 +146,11 @@
 		lang_iso = "pt";
 	}
 
+    // Fix for Norwegian to map both "nb" and "nn" -> "nb", then after looking up globalvars we change "nb" -> "no"
+    if( lang_iso === "no" || lang_iso === "no-NO" || lang_iso === "nn" || lang_iso === "nb-NO" || lang_iso === "nn-NO" ) {
+        lang_iso = "nb";
+    }
+
 	// Query if the browser language is one of the released languages.
 	// The array has 3 elements per language (defined in "/download/globalvars.js"
 	for( var i = 0, j = DL.SEL_LANG.length; i < j; i = i + 3 ) {
@@ -177,6 +182,11 @@
 		lang_iso = "";
 	}
 
+    // Fix for Norwegian, since Download language is "nb" but site language is "no".
+    if( lang_iso === "nb" ) {
+        lang_iso = "no";
+    }
+
 	switch( lang_mode ) {
 		case "hard":
 			// Do not show a message, just redirect.