Author: buildbot
Date: Tue Jan 20 18:50:12 2015
New Revision: 936996
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/scripts/ooo.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 20 18:50:12 2015
@@ -1 +1 @@
-1653334
+1653335
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 20 18:50:12 2015
@@ -1 +1 @@
-1653334
+1653335
Modified: websites/staging/ooo-site/trunk/content/scripts/ooo.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/scripts/ooo.js (original)
+++ websites/staging/ooo-site/trunk/content/scripts/ooo.js Tue Jan 20 18:50:12
2015
@@ -282,12 +282,6 @@ INDEX.setRedirect = function() {
lang_iso = "pt";
}
- // Fix for English as main language for the website, it does not need a
language code.
- if( lang_iso === "en-us" || lang_iso === "en-gb" || lang_iso ===
"en-uk" || lang_iso === "en" ||
- lang_iso === "en-US" || lang_iso === "en-GB" || lang_iso ===
"en-UK" ) {
- lang_iso = "";
- }
-
// 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 ) {
@@ -313,6 +307,12 @@ INDEX.setRedirect = function() {
lang_mode = "none";
}
+ // Fix for English as main language for the website, it does not need a
language code.
+ if( lang_iso === "en-us" || lang_iso === "en-gb" || lang_iso ===
"en-uk" || lang_iso === "en" ||
+ lang_iso === "en-US" || lang_iso === "en-GB" || lang_iso ===
"en-UK" ) {
+ lang_iso = "";
+ }
+
switch( lang_mode ) {
case "hard":
// Do not show a message, just redirect.
