Merge branch 'master' of boinc.berkeley.edu:boinc-v2

doc/index.php

@@ -13,6 +13,7 @@ if ($host == "bolt.berkeley.edu") {
 
 require_once("docutil.php");
 require_once("../html/inc/translation.inc");
+require_once("../html/inc/language_names.inc");
 
 function show_participant() {
     $i = rand(0, 99);
@@ -90,15 +91,11 @@ function show_participate() {
         </td></tr>
         <tr><td>
         <p>
-        ".sprintf(
-            tra(" Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:  %sChoose%s projects  %sDownload%s and run BOINC software  %sEnter%s an email address and password. "),
-            "<ol> <li> <a href=projects.php><b>",
-            "</b></a>",
-            "<li> <a href=download.php><b>",
-            "</b></a>",
-            "<li> <b>",
-            "</b>"
-        )."
+        ".tra("Use the idle time on your computer (Windows, Mac, Linux, or Android) to cure diseases, study global warming, discover pulsars, and do many other types of scientific research.  It's safe, secure, and easy:")."
+        <ol>
+        <li> <a href=projects.php>".tra("Choose projects")."</a>
+        <li> <a href=download.php>".tra("Download BOINC software")."</a>
+        <li> ".tra("Enter an email address and password.")."
         </ol>
         <p>
         ".sprintf(
@@ -200,42 +197,6 @@ function show_nsf() {
     ";
 }
 
-require_once("../html/inc/language_names.inc");
-
-function language_select() {
-    global $language_names;
-    $supported_languages = getSupportedLanguages();
-    $bd = tra("Browser default");
-    echo "
-        <option value=auto selected=\"selected\">-- language --
-        <option value=auto>$bd
-    ";
-    if ($bd != "Browser default") echo " (Browser default)";
-    foreach ($language_names as $lang) {
-        if (!in_array($lang[0], $supported_languages)) continue;
-        echo "<option value=".$lang[0].">".$lang[1]." (".$lang[2].")";
-    }
-}
-
-// how to add language names:
-// paste into notepad++, select ANSI format,
-// then copy/paste into here
-function language_form() {
-    echo "
-        <table><tr><td>
-        <form name=language method=get action=set_language.php>
-        <select class=selectbox name=lang onchange=\"javascript: submit()\">
-    ";
-    language_select();
-    echo "</select>
-        </form>
-        <script type=\"text/javascript\">
-        document.language.lang.selectedIndex=0;
-        </script>
-            </td></tr></table>
-    ";
-}
-
 header("Content-type: text/html; charset=utf-8");
 
 html_tag();

html/inc/language_names.inc

@@ -17,41 +17,79 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 $language_names = array(
-        array("ar", "العربية", "Arabic"),
-        array("be", "Беларускі", "Belarusian"),
-        array("bg", "Български", "Bulgarian"),
-        array("ca", "Català", "Catalan"),
-        array("cs", "Čeština ", "Czech"),
-        array("cy", "Cymraeg", "Welsh"),
-        array("da", "Dansk", "Danish"),
-        array("de", "Deutsch ", "German"),
-        array("el", "Ελληνικά", "Greek"),
-        array("en", "English", "English"),
-        array("es", "Espa&ntilde;ol", "Spanish"),
-        array("sa", "فارسی", "Persian"),
-        array("fi", "Suomi", "Finnish"),
-        array("fr", "Fran&ccedil;ais", "French"),
-        array("gl", "Galego", "Galician"),
-        array("he", "עִבְרִית", "Hebrew"),
-        array("hr", "Hrvatski", "Croatian"),
-        array("hu", "Magyar", "Hungarian"),
-        array("it", "Italiano", "Italian"),
-        array("ja", "日本語", "Japanese"),
-        array("ko", "한국어", "Korean"),
-        array("lt", "Lietuvių", "Lithuanian"),
-        array("lv", "Latviešu", "Latvian"),
-        array("nl", "Nederlands", "Dutch"),
-        array("pl", "Polski", "Polish"),
-        array("pt_BR", "Portugu&ecirc;s - Brasil", "Portuguese - Brazil"),
-        array("pt_PT", "Portugu&ecirc;s", "Portuguese"),
-        array("ro", "Română", "Romanian"),
-        array("ru", "Русский", "Russian"),
-        array("sk", "Slovenčina", "Slovakian"),
-        array("sl", "Slovenščina", "Slovenian"),
-        array("sv", "Svenska", "Swedish"),
-        array("tr", "Türkçe", "Turkish"),
-        array("zh_CN", "简体中文", "Chinese"),
-		array("zh_TW", "繁體中文", "Chinese (Taiwan)"),
+    array("ar", "العربية", "Arabic"),
+    array("be", "Беларускі", "Belarusian"),
+    array("bg", "Български", "Bulgarian"),
+    array("ca", "Català", "Catalan"),
+    array("cs", "Čeština ", "Czech"),
+    array("cy", "Cymraeg", "Welsh"),
+    array("da", "Dansk", "Danish"),
+    array("de", "Deutsch ", "German"),
+    array("el", "Ελληνικά", "Greek"),
+    array("en", "English", "English"),
+    array("es", "Espa&ntilde;ol", "Spanish"),
+    array("sa", "فارسی", "Persian"),
+    array("fi", "Suomi", "Finnish"),
+    array("fr", "Fran&ccedil;ais", "French"),
+    array("gl", "Galego", "Galician"),
+    array("he", "עִבְרִית", "Hebrew"),
+    array("hr", "Hrvatski", "Croatian"),
+    array("hu", "Magyar", "Hungarian"),
+    array("it", "Italiano", "Italian"),
+    array("ja", "日本語", "Japanese"),
+    array("ko", "한국어", "Korean"),
+    array("lt", "Lietuvių", "Lithuanian"),
+    array("lv", "Latviešu", "Latvian"),
+    array("nl", "Nederlands", "Dutch"),
+    array("pl", "Polski", "Polish"),
+    array("pt_BR", "Portugu&ecirc;s - Brasil", "Portuguese - Brazil"),
+    array("pt_PT", "Portugu&ecirc;s", "Portuguese"),
+    array("ro", "Română", "Romanian"),
+    array("ru", "Русский", "Russian"),
+    array("sk", "Slovenčina", "Slovakian"),
+    array("sl", "Slovenščina", "Slovenian"),
+    array("sv", "Svenska", "Swedish"),
+    array("tr", "Türkçe", "Turkish"),
+    array("zh_CN", "简体中文", "Chinese"),
+    array("zh_TW", "繁體中文", "Chinese (Taiwan)"),
 );
 
+function language_select() {
+    global $language_names;
+    $supported_languages = getSupportedLanguages();
+    $supported_languages[] = "en";
+    $bd = tra("Browser default");
+    echo "
+        <option value=auto selected=\"selected\">-- language --
+        <option value=auto>$bd
+    ";
+    if ($bd != "Browser default") echo " (Browser default)";
+    foreach ($language_names as $lang) {
+        if (!in_array($lang[0], $supported_languages)) continue;
+        if ($lang[0] == "en") {
+            echo "<option value=".$lang[0].">".$lang[1];
+        } else {
+            echo "<option value=".$lang[0].">".$lang[1]." (".$lang[2].")";
+        }
+    }
+}
+
+// show a menu of supported languages
+//
+function language_form() {
+    echo "
+        <table><tr><td>
+        <form name=language method=get action=set_language.php>
+        <select class=selectbox name=lang onchange=\"javascript: submit()\">
+    ";
+    language_select();
+    echo "</select>
+        </form>
+        <script type=\"text/javascript\">
+        document.language.lang.selectedIndex=0;
+        </script>
+        </td></tr></table>
+    ";
+}
+
 ?>