svn commit: r1740979 - /openoffice/ooo-site/trunk/content/index.html

[ja...@apache.org]

Author: janhoy
Date: Tue Apr 26 09:33:37 2016
New Revision: 1740979

URL: http://svn.apache.org/viewvc?rev=1740979&view=rev
Log:
Fix no/nb/nn stuff for Norwegian language soft redirect

Modified:
    openoffice/ooo-site/trunk/content/index.html

Modified: openoffice/ooo-site/trunk/content/index.html
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/index.html?rev=1740979&r1=1740978&r2=1740979&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/index.html (original)
+++ openoffice/ooo-site/trunk/content/index.html Tue Apr 26 09:33:37 2016
@@ -144,6 +144,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 ) {
@@ -175,6 +180,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.