Author: buildbot
Date: Thu May 29 12:03:43 2014
New Revision: 910388
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/test/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 12:03:43 2014
@@ -1 +1 @@
-1598262
+1598263
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 12:03:43 2014
@@ -1 +1 @@
-1598262
+1598263
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Thu May 29 12:03:43 2014
@@ -1001,7 +1001,7 @@ function getLink( rel_mode ) {
// If platform is too old, provide a general download link to
the archive.
if( OLD_PLATFORM ) {
// If platform is 'Mac OS X <= 10.6', provide a
download link with previous AOO version.
- if( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
+ if( UI_PLATFORM == "Mac OS X (<= 10.6)" ) {
getReleaseMatrixPos()
getFilesize( PREV_VERSION );
getFilename( PREV_VERSION );
@@ -1068,7 +1068,8 @@ function getLink( rel_mode ) {
} else if( URL_PLATFORM == "" ) {
// If no UI string was set, show it to the user.
if( UI_PLATFORM == "" ) {
- UI_PLATFORM = "unknown platform/OS";
+ UI_PLATFORM = "an unknown operating system /
platform";
+// UI_PLATFORM = l10n_download_unknown_platform;
}
LINK_FULL =
"http://www.openoffice.org/download/other.html";;
@@ -1196,7 +1197,7 @@ function getLinkSel( rel_mode ) {
if( UI_PLATFORM_NO_SUP != "" ) {
// Show an error message that the chosen items do not lead to a
download.
error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for <b>" + UI_PLATFORM_NO_SUP + "</b>."
- + "<br />Please select a platform for Windows,
Linux or OS X.";
+ + "<br />Please select a download for Windows,
Linux or OS X.";
showErrorMessage( error_text );
@@ -1520,7 +1521,7 @@ function getPlatform() {
ua.indexOf( "10.4" ) != -1 ||
ua.indexOf( "10_4" ) != -1 ||
ua.indexOf( "10.3" ) != -1 ||
- ua.indexOf( "10_3" ) != -1 ) {
UI_PLATFORM = "Mac OS X (10.6 or older)";
+ ua.indexOf( "10_3" ) != -1 ) {
UI_PLATFORM = "Mac OS X (<= 10.6)";
URL_PLATFORM = "MacOS_x86_install";
OLD_PLATFORM = true;
}
