Commit: 3dd619f3bbf5b8e09293080d3f236bc996bc3a4a Author: Roman Pronskiy <ro...@pronskiy.com> Wed, 18 Nov 2020 07:30:33 +0200 Committer: Sara Golemon <poll...@php.net> Wed, 25 Nov 2020 20:28:13 +0000 Parents: f6b4bbc86a463dd6c1faf37a450bace509989e97 Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=3dd619f3bbf5b8e09293080d3f236bc996bc3a4a Log: Move lang chooser to a function Changed paths: M include/layout.inc M releases/8_0_x.php M releases/8_0_x_ru.php Diff: diff --git a/include/layout.inc b/include/layout.inc index 207d6323c..57c8d766a 100644 --- a/include/layout.inc +++ b/include/layout.inc @@ -694,4 +694,43 @@ function doc_toc_title($lang, $index, $file, $elm = "dt") { echo "<$elm><a href='/manual/$lang/$link'>$title</a></$elm>\n"; } + +function release_language_chooser($currentlang) { + $LANGUAGES = array( + 'en' => 'English', +// 'pt_BR' => 'Brazilian Portuguese', +// 'zh' => 'Chinese (Simplified)', +// 'nl' => 'Dutch', +// 'fr' => 'French', +// 'de' => 'German', + 'ru' => 'Russian', + ); + + // Print out the form with all the options + $othersel = ' selected="selected"'; + $format_options = function () use ($currentlang, $LANGUAGES) { + $out = ''; + $tab = str_repeat(' ', 6); + foreach ($LANGUAGES as $lang => $text) { + $selected = ''; + if ($lang == $currentlang) { + $selected = ' selected="selected"'; + } + $out .= "$tab<option value='$lang'$selected>$text</option>\n"; + } + return trim($out); + }; + $r = <<<CHANGE_LANG + <form action="" method="get" id="changelang" name="changelang"> + <fieldset> + <label for="changelang-langs">Change language:</label> + <select onchange="document.changelang.submit()" name="lang" id="changelang-langs"> + {$format_options()} + </select> + </fieldset> + </form> +CHANGE_LANG; + return trim($r); +} + /* vim: set et ts=4 sw=4 ft=php: : */ diff --git a/releases/8_0_x.php b/releases/8_0_x.php index fc4338415..16a1adecc 100644 --- a/releases/8_0_x.php +++ b/releases/8_0_x.php @@ -3,8 +3,7 @@ $_SERVER['BASE_PAGE'] = 'releases/8_0_x.php'; include_once __DIR__ . '/../include/prepend.inc'; if ($LANG !== 'en' && file_exists("8_0_x_$LANG.php")) { - header("Location: /releases/8_0_x_$LANG.php?lang=$LANG"); - exit(); + mirror_redirect("/releases/8_0_x_$LANG.php?lang=$LANG"); } site_header("PHP 8.0.0 Release Announcement", array( @@ -18,15 +17,7 @@ site_header("PHP 8.0.0 Release Announcement", array( <section> <div class="page-tools"> <div class="change-language"> - <form action="" method="get" id="changelang" name="changelang"> - <fieldset> - <label for="changelang-langs">Change language:</label> - <select onchange="document.changelang.submit()" name="lang" id="changelang-langs"> - <option value="en" selected>English</option> - <option value="ru">Русский</option> - </select> - </fieldset> - </form> + <?php echo release_language_chooser($LANG); ?> </div> </div> </section> diff --git a/releases/8_0_x_ru.php b/releases/8_0_x_ru.php index 491913bb1..27d99e5fd 100644 --- a/releases/8_0_x_ru.php +++ b/releases/8_0_x_ru.php @@ -3,12 +3,12 @@ $_SERVER['BASE_PAGE'] = 'releases/8_0_x_ru.php'; include_once __DIR__ . '/../include/prepend.inc'; if ($LANG === 'en') { - header("Location: /releases/8_0_x.php?lang=$LANG"); + mirror_redirect("/releases/8_0_x.php?lang=$LANG"); exit(); } if ($LANG !== 'ru' && file_exists("8_0_x_$LANG.php")) { - header("Location: /releases/8_0_x_$LANG.php?lang=$LANG"); + mirror_redirect("/releases/8_0_x_$LANG.php?lang=$LANG"); exit(); } @@ -24,15 +24,7 @@ site_header("PHP 8.0.0, релиз", array( <section> <div class="page-tools"> <div class="change-language"> - <form action="" method="get" id="changelang" name="changelang"> - <fieldset> - <label for="changelang-langs">Change language:</label> - <select onchange="document.changelang.submit()" name="lang" id="changelang-langs"> - <option value="en">English</option> - <option value="ru" selected>Русский</option> - </select> - </fieldset> - </form> + <?php echo release_language_chooser($LANG); ?> </div> </div> </section> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
