Author: buildbot
Date: Wed Aug 20 22:06:44 2014
New Revision: 919967
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 Wed Aug 20 22:06:44 2014
@@ -1 +1 @@
-1619239
+1619245
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Aug 20 22:06:44 2014
@@ -1 +1 @@
-1619239
+1619245
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 Wed Aug 20
22:06:44 2014
@@ -433,7 +433,7 @@ DL.setVersionSelection = function() {
// Default: Assign "4.1.0".
for( var i = 0, j = DL.SEL_VER.length; i < j; i = i + 2 ) {
// If the version was found, set it as pre-selected.
- if( DL.SEL_VER[ i ] === "4.1.0" ) {
+ if( DL.SEL_VER[ i ] === "4.1.1" ) {
selection.selectedIndex = i / 2;
break;
}
@@ -599,6 +599,9 @@ DL.isLanguageSupported = function() {
// Get the release matrix depending on the version.
switch( DL.VERSION_SEL ) {
+ case "4.1.1":
+ DL.RELEASE_LANG = DL.release_matrix_411[ DL.LANG_ISO ][
0 ];
+ break;
case "4.1.0":
DL.RELEASE_LANG = DL.release_matrix_410[ DL.LANG_ISO ][
0 ];
break;
@@ -681,7 +684,7 @@ DL.checkForLinkExceptions = function() {
}
// If version is '4.1.0' (or newer) and platform is 'Mac OS X <= 10.6',
show the none-availability to the user.
- if( DL.VERSION_SEL === "4.1.0" && DL.PLATFORM === "mac32" ) {
+ if( ( DL.VERSION_SEL === "4.1.1" || DL.VERSION_SEL === "4.1.0" ) &&
DL.PLATFORM === "mac32" ) {
// 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.
@@ -1209,6 +1212,28 @@ DL.getFileData = function( version ) {
// Depending on $ver, a different release matrix has to be used to
assemble the download filenames.
switch( version ) {
+ case "4.1.1":
+ // Assign all values from the release matrix of
language and platform.
+ DL.RELEASE_PLATFORM = DL.release_matrix_411[
DL.LANG_ISO ][ DL.RELEASE_PLATFORM_POS_FULL ];
+
+ // Assemble filename: Product name + version + platform
as URL part + language ISO + file extension.
+ DL.FILENAME_FULL = "Apache_OpenOffice_" +
version + "_" + DL.PLATFORM_FULL + "_" + DL.LANG_ISO + DL.EXTENSION;
+ DL.FILENAME_LP = "Apache_OpenOffice_" +
version + "_" + DL.PLATFORM_LP + "_" + DL.LANG_ISO + DL.EXTENSION;
+
+ // Assign the file size (column 2) from the release
matrix of language and platform.
+ DL.FILESIZE_FULL = DL.release_matrix_411[
DL.LANG_ISO ][ DL.RELEASE_PLATFORM_POS_FULL ][ 1 ];
+ DL.FILESIZE_LP = DL.release_matrix_411[
DL.LANG_ISO ][ DL.RELEASE_PLATFORM_POS_LP ][ 1 ];
+
+ // Assign all values from the release data.
+ DL.REL_TEXT =
l10n.dl_rel_info_milestone_text + DL.release_matrix_411[ "src" ][
1 ][ 0 ]
+ + " | " +
l10n.dl_rel_info_buildid_text + DL.release_matrix_411[ "src" ][ 1 ][ 1 ]
+ + " | " +
l10n.dl_rel_info_svn_text + DL.release_matrix_411[ "src" ][ 1 ][ 2 ]
+ + " | " +
l10n.dl_rel_info_rel_date_text + DL.release_matrix_411[ "src" ][ 1 ][ 3
];
+
+ // Assign the link for release notes, depending on the
version.
+ DL.REL_NOTES = l10n.dl_rel_notes_aoo411_link;
+ break;
+
case "4.1.0":
// Assign all values from the release matrix of
language and platform.
DL.RELEASE_PLATFORM = DL.release_matrix_410[
DL.LANG_ISO ][ DL.RELEASE_PLATFORM_POS_FULL ];
@@ -1228,7 +1253,7 @@ DL.getFileData = function( version ) {
+ " | " +
l10n.dl_rel_info_rel_date_text + DL.release_matrix_410[ "src" ][ 1 ][ 3
];
// Assign the link for release notes, depending on the
version.
- DL.REL_NOTES = l10n.dl_rel_notes_aoo410_link;
+ DL.REL_NOTES = l10n.dl_rel_notes_aoo411_link;
break;
case "4.0.1":
// Assign all values from the release matrix of
language and platform.
