Algov/qrcode.chapril.org
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug when all requested locales are unavailable + automatically list locales

Browse Source
This commit is contained in:
Miraty 2022-05-30 20:51:16 +02:00
parent 68cbec8a8d
commit acc7409bfe
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.php
View File

@ -13,19 +13,19 @@ require "vendor/autoload.php";
define("LIBREQR_VERSION", "2.0.0dev"); define("LIBREQR_VERSION", "2.0.0dev");
// Defines the locale to be used // Defines the locale to be used
$locale = DEFAULT_LOCALE;
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
$clientLocales = $_SERVER['HTTP_ACCEPT_LANGUAGE']; $clientLocales = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
$clientLocales = preg_replace("#[A-Z0-9]|q=|;|-|\.#", "", $clientLocales); $clientLocales = preg_replace("#[A-Z0-9]|q=|;|-|\.#", "", $clientLocales);
$clientLocales = explode(',', $clientLocales); $clientLocales = explode(',', $clientLocales);
$availableLocales = array('en', 'fr', 'oc', 'template'); foreach (array_diff(scandir("locales"), array('..', '.')) as $key => $localeFile)
$availableLocales[$key] = basename($localeFile, ".php");
foreach ($clientLocales as $clientLocale) { foreach ($clientLocales as $clientLocale) {
if (in_array($clientLocale, $availableLocales)) { if (in_array($clientLocale, $availableLocales)) {
$locale = $clientLocale; $locale = $clientLocale;
break; break;
} }
} }
} else {
$locale = DEFAULT_LOCALE;
} }
require "locales/" . $locale . ".php"; require "locales/" . $locale . ".php";

1
locales/template.php
View File

@ -11,6 +11,7 @@ $loc = array(
'label_mainColor' => "label_mainColor", 'label_mainColor' => "label_mainColor",
'placeholder' => "placeholder", 'placeholder' => "placeholder",
'placeholder_pixels' => "placeholder_pixels",
'value_default' => "value_default", 'value_default' => "value_default",