Author: buildbot
Date: Wed Jul 2 20:30:32 2014
New Revision: 914802
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.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul 2 20:30:32 2014
@@ -1 +1 @@
-1607439
+1607470
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul 2 20:30:32 2014
@@ -1 +1 @@
-1607439
+1607470
Modified: websites/staging/ooo-site/trunk/content/download/test/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download.js Wed Jul
2 20:30:32 2014
@@ -539,30 +539,50 @@ function isLanguageSupported() {
* Depends on chosen OS, language and version
*/
function checkForLinkExceptions() {
- // If recognized platform is not Windows, Linux or Mac, show the
none-availability to the user.
+ // If recognized resp. selected platform, language or version does not
lead to a normal download link,
+ // show the none-availability to the user.
- var error_text = "";
SHOW_SUB_BOX = true;
ERROR = false;
// If language is not supported, show the none-availability to the user.
if( ! isLanguageSupported() ) {
// Show an error message that the chosen items do not lead to a
download.
- error_text = "<b>" + l10n_download_error_problem_text + "</b>"
+ l10n_download_error_aoo_text + VERSION_SEL
- + l10n_download_error_not_available_for_text +
"<b>" + RELEASE_LANG[ 1 ] + " ("
- + RELEASE_LANG[ 2 ] + ") (" + LANG_SEL + ")</b>."
- + "<br /><b>" + l10n_download_error_solution_text
+ "</b>"
- + l10n_download_error_please_select_4_text;
+
+ // If a customized string is not available in the
"msg_prop_l10n_XX.js" file.
+ if( l10n_download_error_custom_4_text === "" ) {
+ // Show the default error text.
+ var error_text = "<b>" +
l10n_download_error_problem_text + "</b>"
+ + l10n_download_error_aoo_text +
VERSION_SEL
+ +
l10n_download_error_not_available_for_text
+ + "<b>" + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") (" + LANG_SEL + ")</b>."
+ + "<br />"
+ + "<b>" +
l10n_download_error_solution_text + "</b>"
+ +
l10n_download_error_please_select_4_text;
+ } else
+ // Show the customized error text.
+ var error_text = l10n_download_error_custom_4_text;
showErrorMessage( error_text );
}
+ // If the browser-guessed platform is not supported, 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 = "<b>" + l10n_download_error_problem_text + "</b>"
+ l10n_download_error_aoo_text + VERSION_SEL
- + l10n_download_error_not_available_for_text +
"<b>" + UI_PLATFORM_NO_SUP + "</b>."
- + "<br /><b>" + l10n_download_error_solution_text
+ "</b>"
- + l10n_download_error_please_select_3_text;
+
+ // If a customized string is not available in the
"msg_prop_l10n_XX.js" file.
+ if( l10n_download_error_custom_3_text === "" ) {
+ // Show the default error text.
+ var error_text = "<b>" +
l10n_download_error_problem_text + "</b>"
+ + l10n_download_error_aoo_text +
VERSION_SEL
+ +
l10n_download_error_not_available_for_text
+ + "<b>" + UI_PLATFORM_NO_SUP + "</b>."
+ + "<br />"
+ + "<b>" +
l10n_download_error_solution_text + "</b>"
+ +
l10n_download_error_please_select_3_text;
+ } else
+ // Show the customized error text.
+ var error_text = l10n_download_error_custom_3_text;
showErrorMessage( error_text );
}
@@ -570,21 +590,41 @@ function checkForLinkExceptions() {
// If version is '4.1.0' (or newer) and platform is 'Mac OS X <= 10.6',
show the none-availability to the user.
if( VERSION_SEL === "4.1.0" && PLATFORM === "mac32" ) {
// Show an error message that the chosen items do not lead to a
download.
- error_text = "<b>" + l10n_download_error_problem_text + "</b>"
+ l10n_download_error_aoo_text + VERSION_SEL
- + l10n_download_error_not_available_for_text +
"<b>" + UI_PLATFORM + "</b>."
- + "<br /><b>" + l10n_download_error_solution_text
+ "</b>"
- + l10n_download_error_please_select_1_text;
+
+ // If a customized string is not available in the
"msg_prop_l10n_XX.js" file.
+ if( l10n_download_error_custom_1_text === "" ) {
+ // Show the default error text.
+ var error_text = "<b>" +
l10n_download_error_problem_text + "</b>"
+ + l10n_download_error_aoo_text +
VERSION_SEL
+ +
l10n_download_error_not_available_for_text
+ + "<b>" + UI_PLATFORM + "</b>."
+ + "<br />"
+ + "<b>" +
l10n_download_error_solution_text + "</b>"
+ +
l10n_download_error_please_select_1_text;
+ } else
+ // Show the customized error text.
+ var error_text = l10n_download_error_custom_1_text;
showErrorMessage( error_text );
}
// If version is '4.0.1' (or older) and 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" ) && PLATFORM
=== "mac64" ) {
- // Set the values for all elements that should not be empty.
- error_text = "<b>" + l10n_download_error_problem_text + "</b>"
+ l10n_download_error_aoo_text + VERSION_SEL
- + l10n_download_error_not_available_for_text +
"<b>" + UI_PLATFORM + "</b>."
- + "<br /><b>" + l10n_download_error_solution_text
+ "</b>"
- + l10n_download_error_please_select_2_text;
+ // Show an error message that the chosen items do not lead to a
download.
+
+ // If a customized string is not available in the
"msg_prop_l10n_XX.js" file.
+ if( l10n_download_error_custom_2_text === "" ) {
+ // Show the default error text.
+ var error_text = "<b>" +
l10n_download_error_problem_text + "</b>"
+ + l10n_download_error_aoo_text +
VERSION_SEL
+ +
l10n_download_error_not_available_for_text
+ + "<b>" + UI_PLATFORM + "</b>."
+ + "<br />"
+ + "<b>" +
l10n_download_error_solution_text + "</b>"
+ +
l10n_download_error_please_select_2_text;
+ } else
+ // Show the customized error text.
+ var error_text = l10n_download_error_custom_2_text;
showErrorMessage( error_text );
}
@@ -695,11 +735,15 @@ function getLinkSelection() {
document.getElementById( "dl_lp_link" ).title =
l10n_download_langpack_link_title + FILENAME_LP;
// Set the values in the sub-box for the 3 text lines.
- document.getElementById( "dl_rel_info" ).innerHTML = "<b>"
+ l10n_download_rel_info_headline_text + "</b> " + REL_TEXT + " | ";
+ document.getElementById( "dl_rel_info" ).innerHTML = "<b>"
+ l10n_download_rel_info_headline_text
+ + "</b>
" + REL_TEXT + " | ";
document.getElementById( "dl_rel_notes" ).href =
REL_NOTES;
document.getElementById( "dl_rel_notes" ).innerHTML =
l10n_download_rel_notes_text;
document.getElementById( "dl_rel_notes" ).title =
l10n_download_rel_notes_title + VERSION_SEL;
- document.getElementById( "dl_f_info" ).innerHTML = "<b>"
+ l10n_download_headline_full_text + "</b>" + l10n_download_filesize_text +
FILESIZE_FULL + l10n_download_megabyte_text + " | " +
l10n_download_checksum_headline_text;
+ document.getElementById( "dl_f_info" ).innerHTML = "<b>"
+ l10n_download_headline_full_text + "</b>"
+ +
l10n_download_filesize_text + FILESIZE_FULL
+ +
l10n_download_megabyte_text + " | "
+ +
l10n_download_checksum_headline_text;
document.getElementById( "dl_f_chk_keys" ).href =
LINK_CHK_KEYS;
document.getElementById( "dl_f_chk_keys" ).innerHTML =
l10n_download_checksum_keys_text;
document.getElementById( "dl_f_chk_keys" ).title =
l10n_download_checksum_keys_title;
@@ -715,7 +759,10 @@ function getLinkSelection() {
document.getElementById( "dl_f_chk_sha256" ).href =
LINK_CHK_SHA256_FULL;
document.getElementById( "dl_f_chk_sha256" ).innerHTML =
l10n_download_checksum_sha256_text;
document.getElementById( "dl_f_chk_sha256" ).title =
l10n_download_checksum_sha256_title + FILENAME_FULL;
- document.getElementById( "dl_lp_info" ).innerHTML = "<b>"
+ l10n_download_headline_langpack_text + "</b>" + l10n_download_filesize_text +
FILESIZE_LP + l10n_download_megabyte_text + " | " +
l10n_download_checksum_headline_text;
+ document.getElementById( "dl_lp_info" ).innerHTML = "<b>"
+ l10n_download_headline_langpack_text
+ +
"</b>" + l10n_download_filesize_text
+ +
FILESIZE_LP + l10n_download_megabyte_text
+ + " | "
+ l10n_download_checksum_headline_text;
document.getElementById( "dl_lp_chk_keys" ).href =
LINK_CHK_KEYS;
document.getElementById( "dl_lp_chk_keys" ).innerHTML =
l10n_download_checksum_keys_text;
document.getElementById( "dl_lp_chk_keys" ).title =
l10n_download_checksum_keys_title;
