Author: buildbot
Date: Thu May 29 00:05:33 2014
New Revision: 910346
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 00:05:33 2014
@@ -1 +1 @@
-1598173
+1598175
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 00:05:33 2014
@@ -1 +1 @@
-1598173
+1598175
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 00:05:33 2014
@@ -920,16 +920,16 @@ function showErrorMessage( error_text )
document.getElementById( "dl_f_lnk" ).style.display = "inline";
document.getElementById( "dl_f_lnk" ).style.cursor = "not-allowed";
document.getElementById( "dl_f_lnk" ).href =
"javascript:void( 0 )";
- document.getElementById( "dl_f_lnk" ).innerHTML = error_text[ 0
];
- document.getElementById( "dl_f_lnk" ).title = error_text[ 1
];
+ document.getElementById( "dl_f_lnk" ).innerHTML = "No full
installation available";
+ document.getElementById( "dl_f_lnk" ).title = "Please
select another language, platform or version.";
document.getElementById( "dl_lp_lnk" ).style.display = "inline";
document.getElementById( "dl_lp_lnk" ).style.cursor = "not-allowed";
document.getElementById( "dl_lp_lnk" ).href =
"javascript:void( 0 )";
- document.getElementById( "dl_lp_lnk" ).innerHTML = error_text[ 2
];
- document.getElementById( "dl_lp_lnk" ).title = error_text[ 3
];
+ document.getElementById( "dl_lp_lnk" ).innerHTML = "No language
pack available";
+ document.getElementById( "dl_lp_lnk" ).title = "Please
select another language, platform or version.";
document.getElementById( "dl_f_size_hl" ).style.display = "inline";
document.getElementById( "dl_f_size_hl" ).style.cursor = "default";
- document.getElementById( "dl_f_size_hl" ).innerHTML = error_text[ 4
];
+ document.getElementById( "dl_f_size_hl" ).innerHTML = error_text;
SF = false;
OTHER = false;
@@ -1135,7 +1135,7 @@ function getLink( rel_mode ) {
* Depends on chosen OS, language and type
*/
function getLinkSel( rel_mode ) {
- var error_text;
+ var error_text = "";
// Reset all error flags.
SF = false;
@@ -1173,10 +1173,8 @@ function getLinkSel( rel_mode ) {
// If version is '4.1.0' (or newer) + platform is 'Mac OS X <= 10.6',
show the none-availability to the user.
if( VERSION_SEL == "4.1.0" && URL_PLATFORM == "MacOS_x86_install" ) {
// Show an error message that the chosen items do not lead to a
download.
- error_text = [ "No full installation available", "Please
select another language, platform or version.",
- "No language pack available", "Please select
another language, platform or version.",
- "Apache OpenOffice " + VERSION_SEL + " for <b>"
+ UI_PLATFORM + "</b> is not available. "
- + "<br />Please select version 4.0.1 or older." ];
+ error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for <b>" + UI_PLATFORM + "</b>."
+ + "<br />Please select version 4.0.1 or older.";
showErrorMessage( error_text );
@@ -1186,10 +1184,8 @@ function getLinkSel( rel_mode ) {
// If version is '4.0.1' (or older) + platform is 'Mac OS X => 10.7',
show the none-availability to the user.
if( ( VERSION_SEL == "4.0.1" || VERSION_SEL == "4.0.0" ) &&
URL_PLATFORM == "MacOS_x86-64_install" ) {
// Set the values for all elements that should not be empty.
- error_text = [ "No full installation available", "Please
select another language, platform or version.",
- "No language pack available", "Please select
another language, platform or version.",
- "Apache OpenOffice " + VERSION_SEL + " for <b>"
+ UI_PLATFORM + "</b> is not available. "
- + "<br />Please select version 4.1.0 or newer." ];
+ error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for <b>" + UI_PLATFORM + "</b>."
+ + "<br />Please select version 4.1.0 or newer.";
showErrorMessage( error_text );
@@ -1199,10 +1195,8 @@ function getLinkSel( rel_mode ) {
// If recognized platform is not 'Windows', 'Linux' or 'Mac', show the
none-availability to the user.
if( UI_PLATFORM_NO_SUP != "" ) {
// Show an error message that the chosen items do not lead to a
download.
- error_text = [ "No full installation available", "Please
select another language, platform or version.",
- "No language pack available", "Please select
another language, platform or version.",
- "Apache OpenOffice " + VERSION_SEL + " for <b>"
+ UI_PLATFORM_NO_SUP + "</b> is not "
- + "available. <br />Please select a platform for
Windows, Linux or OS X." ];
+ 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.";
showErrorMessage( error_text );
@@ -1226,11 +1220,8 @@ function getLinkSel( rel_mode ) {
LINK_LP = LINK_LP;
}
// Show an error message that the chosen items do not lead to a
download.
- error_text = [ "No full installation available", "Please
select another language, platform or version.",
- "No language pack available", "Please select
another language, platform or version.",
- "Apache OpenOffice " + VERSION_SEL + " for <b>"
+ RELEASE_MATRIX_LANG[ 1 ]
- + " (" + RELEASE_MATRIX_LANG[ 2 ] + ")</b> is not
available. "
- + "<br />Please choose another language or
version." ];
+ error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for <b>" + RELEASE_MATRIX_LANG[ 1 ]
+ + " (" + RELEASE_MATRIX_LANG[ 2 ] + ")</b>.<br
/>Please choose another language or version.";
showErrorMessage( error_text );
return;
