Merge pull request #198 from Fraenkiman/upstream/issue197

The setup, the blog and the admin area starts automatically in the language of the user.
This commit is contained in:
Arvid Zimmermann 2023-06-11 14:01:43 +02:00 committed by GitHub
commit 61aee176b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 10 deletions

View File

@ -93,7 +93,8 @@ define('IMAGES_DIR', FP_CONTENT . 'images/');
// here is where all the attachments will be saved
define('ATTACHS_DIR', FP_CONTENT . 'attachs/');
define('LANG_DEFAULT', 'en-us');
include(LANG_DIR . 'browserlang.php');
define('LANG_DEFAULT', $browserLang);
define('BPT_SORT', SORT_DESC);
set_include_path(ABS_PATH);

View File

@ -21,7 +21,7 @@ $fp_config = array(
'dateformat' => '%A, %B %e, %Y',
'dateformatshort' => '%Y-%m-%d',
'charset' => 'utf-8',
'lang' => 'en-us'
'lang' => ''
),
'plugins' => array(
'blockparser' => array(
@ -38,3 +38,5 @@ $fp_config = array(
),
),
);
?>

View File

@ -0,0 +1,64 @@
<?php
/**
* Get the language code from the browser
*
* @param array Allowed Languages "array('cs-cz','de-de','en-us','it-it','ja-jp','nl-nl','pt-br')"
* @param string Default language
* @param string Language string from HTTP-Header
* @param bool Strict-Mode
* @return array|int Data as array or null
*/
error_reporting(0);
function getBrowserLanguage($arrAllowedLanguages, $strDefaultLanguage, $strLangVariable = null, $boolStrictMode = true) {
if (isset($_REQUEST ['language'])) {
if (strlen($_REQUEST ['language']) == 2) {
return strtolower($_REQUEST ['language']);
}
foreach ($arrAllowedLanguages as $strValue) {
if (preg_match('/^' . $strValue . '\-/i', $_REQUEST ['language'])) {
return strtolower($strValue);
}
}
}
if (!is_array($arrAllowedLanguages)) {
if (strpos($arrAllowedLanguages,';')) {
$array = explode(';', $arrAllowedLanguages);
$arrAllowedLanguages = $array;
}
}
if (!isset($_SERVER ['HTTP_ACCEPT_LANGUAGE'])) {
return $arrAllowedLanguages [0];
}
if ($strLangVariable === null) $strLangVariable = $_SERVER ['HTTP_ACCEPT_LANGUAGE'];
if (empty($strLangVariable)) return $strDefaultLanguage;
$arrAcceptedLanguages = preg_split('/,\s*/', $strLangVariable);
$strCurrentLanguage = $strDefaultLanguage;
$intCurrentQ = 0;
foreach ($arrAcceptedLanguages as $arrAcceptedLanguage) {
$boolResult = preg_match ('/^([a-z]{1,8}(?:-[a-z]{1,8})*)' . '(?:;\s*q=(0(?:\.[0-9]{1,3})?|1(?:\.0{1,3})?))?$/i', $arrAcceptedLanguage, $arrMatches);
if (!$boolResult) continue;
$arrLangCode = explode ('-', $arrMatches [1]);
if (isset($arrMatches [2]))
$intLangQuality = (float)$arrMatches [2];
else
$intLangQuality = 1.0;
while (count ($arrLangCode)) {
if (!is_array($arrAllowedLanguages)) $arrAllowedLanguages = array($arrAllowedLanguages);
if (in_array (strtolower (join ('-', $arrLangCode)), $arrAllowedLanguages)) {
if ($intLangQuality > $intCurrentQ) {
$strCurrentLanguage = strtolower (join ('-', $arrLangCode));
$intCurrentQ = $intLangQuality;
break;
}
}
if ($boolStrictMode) break;
array_pop ($arrLangCode);
}
}
return $strCurrentLanguage;
}
// accept the following languages, otherwise fall back to "en-us"
$browserLang = getBrowserLanguage(array('cs-cz', 'de-de', 'en-us', 'it-it', 'ja-jp', 'nl-nl', 'pt-br'), 'en-us');
?>

View File

@ -1,6 +1,5 @@
<?php
$language = @$_POST['language']? $_POST['language'] :'en-us';
$language = @$_POST ['language']? $_POST ['language'] : $browserLang;
$lf = "lang.$language.php";
if (!preg_match('|^lang\.[a-z]{2}-[a-z]{2}\.php$|', $lf))
@ -15,10 +14,8 @@ $id = getstep($step);
$l =& $lang [$step];
include("./setup/tpls/header.tpl.php");
include("./setup/tpls/{$step}.tpl.php");
include("./setup/tpls/footer.tpl.php");
?>