You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2014/05/03 00:12:30 UTC

svn commit: r907821 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/globalvars_droplist.js

Author: buildbot
Date: Fri May  2 22:12:30 2014
New Revision: 907821

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/globalvars_droplist.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May  2 22:12:30 2014
@@ -1 +1 @@
-1592040
+1592062

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May  2 22:12:30 2014
@@ -1 +1 @@
-1592040
+1592062

Modified: websites/staging/ooo-site/trunk/content/download/test/globalvars_droplist.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/globalvars_droplist.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/globalvars_droplist.js Fri May  2 22:12:30 2014
@@ -1,32 +1,36 @@
 /* This file is to maintain version information that can be used on all websites via JavaScript when including this file.
-
-   Instead of hard coded version data please use these variables. Example:
-
-   Wrong:   "We are proud to announce the availability of the new Apache OpenOffice 3.4.1 release."
-   Correct: "We are proud to announce the availability of the new Apache OpenOffice " + VERSION + " release."
-
-   VERSION: Set the release version (e.g., "3.4.1") that is currently on the mirrors.
-   MIRROR:  Set default mirror site ("sourceforge", "apache" or "mirrorbrain") (not used as only 1 mirror system is used)
-   SCHEMA:  Set the naming-schema for the download-set (e.g., "aoo") (not used as only 1 mirror system is used)
-*/
-
-// Most recent stable release: General variables 
-var VERSION			= "4.0.1";
-var MILESTONE			= "AOO401m5";
-var BUILD			= "9714";
-var SVN_REV			= "r1524958";
-var REL_DATE			= "2013-Oct-01";
+ *
+ * Instead of hard coded version data please use these variables. Example:
+ *
+ * Wrong:   "We are proud to announce the availability of the new Apache OpenOffice 4.1.0 release."
+ * Correct: "We are proud to announce the availability of the new Apache OpenOffice " + VERSION + " release."
+ *
+ * VERSION: Set the release version (e.g., "4.1.0") that is currently on the mirrors.
+ */
+
+// Stable release: General variables 
+var VERSION			= "4.1.0";
+var VERSION_SHORT		= VERSION;
+// If last char of VERSION == 0, assign only the first 3 chars to VERSION_SHORT
+if ( VERSION.slice( 4, 5 ) == "0" )
+    VERSION_SHORT = VERSION.substring( 0, 3 );
+var MILESTONE			= "AOO410m18";
+var BUILD			= "9764";
+var SVN_REV			= "r1589052";
+var REL_DATE			= "2014-Apr-29";
 var PRE_VERSION			= "4.0.1";
 var OLDVERSION			= "3.4.1";
 var LEGACYVERSION		= "3.3.0";
 
+// Only used on the "other.html" webpage
 var PLATFORM			= [ "Win_x86", "Linux_x86_rpm", "Linux_x86_deb", "Linux_x86-64_rpm", "Linux_x86-64_deb", "MacOS_x86" ];
 var FULL_LANG			= [ "ast","cs","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hu","it","ja","km","ko","lt","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","tr","vi","zh-CN","zh-TW" ];
 var LP_LANG			= [ "ast","cs","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hu","it","ja","km","ko","lt","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","tr","vi","zh-CN","zh-TW" ];
 var SDK_LANG			= [ "en-US" ];
 
-var SEL_OS			= [ "e1",     "Choose OS",                          "",                  "",
-				    "e2",     "----------------------------------", "",                  "",
+// OS data for the <select> element
+var SEL_OS			= [ "e1",     "Choose OS / platform",        "",                         "",
+				    "e2",     "-----------------------------------", "",                 "",
 				    "win32",  "Windows 32-bit (x86) (EXE)",  "Win_x86_install",          ".exe",
 				    "lnx64d", "Linux 64-bit (x86-64) (DEB)", "Linux_x86-64_install-deb", ".tar.gz",
 				    "lnx64r", "Linux 64-bit (x86-64) (RPM)", "Linux_x86-64_install-rpm", ".tar.gz",
@@ -35,44 +39,59 @@ var SEL_OS			= [ "e1",     "Choose OS", 
 				    "mac64",  "OS X 64-bit (x86-64) (DMG)",  "MacOS_x86-64_install",     ".dmg",
 				    "mac32",  "OS X 32-bit (x86) (DMG)",     "MacOS_x86_install",        ".dmg" ];
 
+// Language data for the <select> element
 var SEL_LANG			= [ "e1",    "Choose language",
 				    "e2",    "--------------------------------------------------------------",
-				    "ast",   "Asturian (Asturianu) (ast)", "eu", "Basque (Euskara) (eu)",
+				    "ast",   "Asturian (Asturianu) (ast)",
+				    "eu",    "Basque (Euskara) (eu)",
 				    "bg",    "Bulgarian (български език) (bg)",
 				    "zh-CN", "Chinese [simplified] (简体中文) (zh-CN)",
 				    "zh-TW", "Chinese [traditional] (正體中文) (zh-TW)",
-				    "cs",    "Czech (Čeština) (cs)", "da", "Danish (Dansk) (da)",
+				    "cs",    "Czech (Čeština) (cs)",
+				    "da",    "Danish (Dansk) (da)",
 				    "nl",    "Dutch (Nederlands) (nl)",
 				    "en-GB", "English [British] (English [British]) (en-GB)",
 				    "en-US", "English [US] (English [US]) (en-US)",
-				    "fi",    "Finnish (Suomi) (fi)", "fr", "French (Français) (fr)",
-				    "gl",    "Galician (Galego) (gl)", "de", "German (Deutsch) (de)",
+				    "fi",    "Finnish (Suomi) (fi)",
+				    "fr",    "French (Français) (fr)",
+				    "gl",    "Galician (Galego) (gl)",
+				    "de",    "German (Deutsch) (de)",
 				    "el",    "Greek (ελληνικά) (el)",
-				    "hi",    "Hindi (hi)", "hu", "Hungarian (Magyar) (hu)",
-				    "it",    "Italian (Italiano) (it)", "ja", "Japanese (日本語) (ja)",
-				    "km",    "Khmer (ភាសាខ្មែរ) (km)", "ko", "Korean (한국어) (ko)",	
-				    "lt",    "Lithuanian (Lietuvių) (lt)", "nb", "Norwegian [Bokmal] (Norsk [Bokmål]) (nb)",
+				    "hi",    "Hindi (hi)",
+				    "hu",    "Hungarian (Magyar) (hu)",
+				    "it",    "Italian (Italiano) (it)",
+				    "ja",    "Japanese (日本語) (ja)",
+				    "km",    "Khmer (ភាសាខ្មែរ) (km)",
+				    "ko",    "Korean (한국어) (ko)",	
+				    "lt",    "Lithuanian (Lietuvių) (lt)",
+				    "nb",    "Norwegian [Bokmal] (Norsk [Bokmål]) (nb)",
 				    "pl",    "Polish (Polski) (pl)", 
 				    "pt-BR", "Portuguese [Brazilian] (Português [do Brasil]) (pt-BR)",
 				    "pt-PT", "Portuguese [European] (Português [Europeu]) (pt-PT)",
-				    "ru",    "Russian (Русский) (ru)", "gd", "Scottish [Gaelic] (Gàidhlig) (gd)",
+				    "ru",    "Russian (Русский) (ru)",
+				    "gd",    "Scottish [Gaelic] (Gàidhlig) (gd)",
 				    "sr",    "Serbian [Cyrillic] (Cрпски [ћирилицом]) (sr)", 
 				    "sk",    "Slovak (Slovenský jazyk [slovenčina]) (sk)",
 				    "sl",    "Slovenian (Slovenski jezik [slovenščina]) (sl)",
-				    "es",    "Spanish (Español) (es)", "sv", "Swedish (Svenska) (sv)",
-				    "ta",    "Tamil (ta)", "th", "Thai (th)",
-				    "tr",    "Turkish (Türkçe) (tr)", "vi", "Vietnamese (Tiếng Việt) (vi)" ];
+				    "es",    "Spanish (Español) (es)",
+				    "sv",    "Swedish (Svenska) (sv)",
+				    "ta",    "Tamil (ta)",
+				    "th",    "Thai (th)",
+				    "tr",    "Turkish (Türkçe) (tr)",
+				    "vi",    "Vietnamese (Tiếng Việt) (vi)" ];
 
+// Version data for the <select> element
 var SEL_VER			= [ "e1",    "Choose version",
-				    "e2",    "-----------------------",
-				    "3.4.1", "Apache OpenOffice 3.4.1",
-				    "4.0.0", "Apache OpenOffice 4.0.0",
-				    "4.0.1", "Apache OpenOffice 4.0.1",
-				    "4.1.0", "Apache OpenOffice 4.1.0" ];
-/*
-var SEL_TYPE			= [ "e1", "Choose install type", "e2", "-------------------",
-				    "full", "Full Installation", "lp", "Language Pack" ];
-*/
+				    "e2",    "---------------------",
+				    "4.1.0", "4.1.0",
+				    "4.0.1", "4.0.1",
+				    "4.0.0", "4.0.0",
+				    "3.4.1", "3.4.1" ];
+
+// Install type data for the <select> element
+// var SEL_TYPE			= [ "e1", "Choose install type", "e2", "-------------------",
+//				    "full", "Full Installation", "lp", "Language Pack" ];
+
 // Base URLs to the Sourceforge and Apache mirror server
 var SOURCEFORGE_BASE_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/" + VERSION     + "/binaries/";
 var SOURCEFORGE_PREVIOUS_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/files/" + PRE_VERSION + "/binaries/";
@@ -87,9 +106,9 @@ var BETA_MILESTONE		= "AOO410m14";
 var BETA_BUILD			= "9760";
 var BETA_SVN_REV		= "r1573601";
 var BETA_REL_DATE		= "2014-Mar-10";
-// var BETA_ACTIVE		= true;
 var BETA_ACTIVE			= -1;		// 1 = activate download, 0 = display "coming soon", -1 = display nothing
 
+// Only used on the "all_beta.html" webpage
 var BETA_PLATFORM		= new Array( "Win_x86", "Linux_x86_rpm", "Linux_x86_deb", "Linux_x86-64_rpm", "Linux_x86-64_deb", "MacOS_x86-64" );
 var BETA_FULL_LANG		= new Array( "ast","bg","cs","da","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hi","hu","it","ja","km","ko","lt","nb","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","th","tr","vi","zh-CN","zh-TW" );
 var BETA_LP_LANG		= new Array( "ast","bg","cs","da","de","el","en-GB","en-US","es","eu","fi","fr","gd","gl","hi","hu","it","ja","km","ko","lt","nb","nl","pl","pt","pt-BR","ru","sk","sl","sr","sv","ta","th","tr","vi","zh-CN","zh-TW" );