Author: buildbot
Date: Tue Aug 27 18:11:35 2013
New Revision: 876384
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/download.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Aug 27 18:11:35 2013
@@ -1 +1 @@
-1517902
+1517904
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Aug 27 18:11:35 2013
@@ -1 +1 @@
-1517902
+1517904
Modified: websites/staging/ooo-site/trunk/content/download/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download.js Tue Aug 27
18:11:35 2013
@@ -40,7 +40,7 @@ function initializeDL() {
/*
* Get array and ISO code for language
- * Depends on nl_language
+ * Depends on $NL_LANGUAGE
*/
function getLanguage() {
var language = "";
@@ -210,9 +210,8 @@ function getPlatform() {
if ( os.indexOf( "sunos" ) != -1 ) { UI_PLATFORM
= "Solaris x86 (PKG)";
if ( ua.indexOf( "sun4u" ) != -1 ) UI_PLATFORM
= "Solaris SPARC (PKG)";
}
- if ( os.indexOf( "freebsd" ) != -1 ) UI_PLATFORM
= "FreeBSD (PKG)";
if ( os.indexOf( "os/2" ) != -1 ) UI_PLATFORM
= "OS/2";
- if ( os.indexOf( "freebsd" ) != -1 ) UI_PLATFORM
= "FreeBSD";
+ if ( os.indexOf( "freebsd" ) != -1 ) UI_PLATFORM
= "FreeBSD (PKG)";
if ( os.indexOf( "openbsd" ) != -1 ) UI_PLATFORM
= "OpenBSD";
if ( os.indexOf( "netbsd" ) != -1 ) UI_PLATFORM
= "NetBSD";
if ( os.indexOf( "pcbsd" ) != -1 ) UI_PLATFORM
= "PC-BSD";
@@ -226,15 +225,15 @@ function getPlatform() {
if ( os.indexOf( "qnx" ) != -1 ) UI_PLATFORM
= "QNX";
if ( os.indexOf( "x11" ) != -1 ) UI_PLATFORM
= "an unknown OS with X11 support";
- if ( os.indexOf( "arm" ) != -1 ) UI_PLATFORM
= "ARM mobile/tablet devices";
+ if ( os.indexOf( "arm" ) != -1 ) UI_PLATFORM
= "ARM mobile devices";
if ( ua.indexOf( "ppc" ) != -1 ||
ua.indexOf( "power_pc" ) != -1 ) UI_PLATFORM
= "Mac OS PPC (DMG)";
if ( ua.indexOf( "iphone" ) != -1 ||
ua.indexOf( "ipad" ) != -1 ||
- ua.indexOf( "ipod" ) != -1 ) UI_PLATFORM
= "Apple mobile devices (iPhone/iPad/iPod)";
+ ua.indexOf( "ipod" ) != -1 ) UI_PLATFORM
= "Apple iPhone/iPad/iPod";
if ( ua.indexOf( "android" ) != -1 ||
- av.indexOf( "android" ) != -1 ) UI_PLATFORM
= "Android mobile/tablet devices";
+ av.indexOf( "android" ) != -1 ) UI_PLATFORM
= "Android mobile devices";
if ( ua.indexOf( "blackberry" ) != -1 ) UI_PLATFORM
= "Blackberry smartphones";
if ( ua.indexOf( "nokia" ) != -1 ) UI_PLATFORM
= "Nokia mobile devices";
if ( ua.indexOf( "symbian" ) != -1 ) UI_PLATFORM
= "mobile phones with Symbian OS";
@@ -252,9 +251,9 @@ function getPlatform() {
if ( ua.indexOf( "playstation" ) != -1 ) UI_PLATFORM
= "Sony Playstation";
if ( ua.indexOf( "psp" ) != -1 ) UI_PLATFORM
= "Sony Playstation Portable";
if ( ua.indexOf( "nintendo" ) != -1 ) UI_PLATFORM
= "Nintendo game console";
- if ( ua.indexOf( "wii" ) != -1 ) UI_PLATFORM
= "Wii game console";
+ if ( ua.indexOf( "wii" ) != -1 ) UI_PLATFORM
= "Nintendo Wii game console";
- // If variable is already filled, then something was recognized and
no more work is need
+ // If the $UI_PLATFORM variable is already filled, then something was
recognized and no more work is need
if ( UI_PLATFORM ) {
return;
}
@@ -270,9 +269,12 @@ function getPlatform() {
// Linux, x86 or x86_64, DEB or RPM?
if ( os.indexOf( "linux" ) != -1 ) {
+ // 32-bit, DEB or RPM?
if ( os.indexOf( "x86" ) != -1 ||
- os.indexOf( "i686" ) != -1 ) { UI_PLATFORM
= "Linux 32-bit (RPM)";
- // UI_PLATFORM
= "Linux 32-bit (RPM/DEB ?)";
+ os.indexOf( "i686" ) != -1 ||
+ os.indexOf( "i586" ) != -1 ||
+ os.indexOf( "i486" ) != -1 ||
+ os.indexOf( "i386" ) != -1 ) { UI_PLATFORM
= "Linux 32-bit (RPM)";
URL_PLATFORM
= "Linux_x86_install-rpm";
EXTENSION
= ".tar.gz";
if ( ua.indexOf( "debian" ) != -1 ||
@@ -282,9 +284,11 @@ function getPlatform() {
EXTENSION
= ".tar.gz";
}
}
+ // 64-bit, DEB or RPM?
if ( os.indexOf( "_64" ) != -1 ||
- os.indexOf( "-64" ) != -1 ) { UI_PLATFORM
= "Linux 64-bit (RPM)";
- // UI_PLATFORM
= "Linux 64-bit (RPM/DEB ?)";
+ os.indexOf( "-64" ) != -1 ||
+ os.indexOf( "x64" ) != -1 ||
+ os.indexOf( "amd64" ) != -1 ) { UI_PLATFORM
= "Linux 64-bit (RPM)";
URL_PLATFORM
= "Linux_x86-64_install-rpm";
EXTENSION
= ".tar.gz";
if ( ua.indexOf( "debian" ) != -1 ||
@@ -296,14 +300,14 @@ function getPlatform() {
}
}
- // Mac OS x86
+ // Mac OS x86?
if ( os.indexOf( "mac" ) != -1 ) { UI_PLATFORM
= "Mac OS 32-bit Intel (DMG)";
URL_PLATFORM
= "Mac_x86_install";
EXTENSION
= ".dmg";
}
}
- // If variable is not filled until now, then nothing was recognized,
set $UI_PLATFORM to show it to the user
+ // If nothing was recognized until now, set $UI_PLATFORM to show it to
the user
if ( ! UI_PLATFORM ) {
ERROR = true;
UI_PLATFORM = "an unknown platform/OS";
@@ -316,7 +320,7 @@ function getPlatform() {
* Depends on array-list
*/
function getFilesize() {
- // Depending on URL_PLATFORM assign the platform position of the
release matrix
+ // Depending on $URL_PLATFORM assign the platform position of the
release matrix
switch ( URL_PLATFORM ) {
case "Linux_x86-64_install-deb":
RELEASE_MATRIX_PLATFORM_POS = 0;
