zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-07-21 10:06:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed language selector

Browse source
This commit is contained in:
Pinga 2023-08-30 21:08:17 +03:00
parent 014b679b46
commit 93ce342f64
4 changed files with 45 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cp/bootstrap/app.php
View file

@ -10,6 +10,7 @@ use Slim\Views\TwigMiddleware;
use Twig\TwigFunction; use Twig\TwigFunction;
use Gettext\Loader\PoLoader; use Gettext\Loader\PoLoader;
use Gettext\Translations; use Gettext\Translations;
use Punic\Language;
if (session_status() == PHP_SESSION_NONE) { if (session_status() == PHP_SESSION_NONE) {
session_start(); session_start();
@ -51,12 +52,20 @@ if (isset($_SESSION['_lang']) && in_array($_SESSION['_lang'], $allowedLanguages)
// Use regex to validate the format: two letters, underscore, two letters // Use regex to validate the format: two letters, underscore, two letters
if (preg_match('/^[a-z]{2}_[A-Z]{2}$/', $_SESSION['_lang'])) { if (preg_match('/^[a-z]{2}_[A-Z]{2}$/', $_SESSION['_lang'])) {
$desiredLanguage = $_SESSION['_lang']; $desiredLanguage = $_SESSION['_lang'];
$parts = explode('_', $_SESSION['_lang']);
if (isset($parts[1])) {
$uiLang = strtolower($parts[1]);
}
} else { } else {
$desiredLanguage = 'en_US'; $desiredLanguage = 'en_US';
$uiLang = 'us';
} }
} else { } else {
$desiredLanguage = 'en_US'; $desiredLanguage = 'en_US';
$uiLang = 'us';
} }
$lang_full = Language::getName($desiredLanguage, 'en');
$lang = trim(strstr($lang_full, ' (', true));
$languageFile = '../lang/' . $desiredLanguage . '/messages.po'; $languageFile = '../lang/' . $desiredLanguage . '/messages.po';
if (!file_exists($languageFile)) { if (!file_exists($languageFile)) {
@ -87,7 +96,7 @@ $container->set('flash', function() {
return new \Slim\Flash\Messages; return new \Slim\Flash\Messages;
}); });
$container->set('view', function ($container) use ($translations) { $container->set('view', function ($container) use ($translations, $uiLang, $lang) {
$view = Twig::create(__DIR__ . '/../resources/views', [ $view = Twig::create(__DIR__ . '/../resources/views', [
'cache' => false, 'cache' => false,
]); ]);
@ -95,6 +104,8 @@ $container->set('view', function ($container) use ($translations) {
'isLogin' => $container->get('auth')->isLogin(), 'isLogin' => $container->get('auth')->isLogin(),
'user' => $container->get('auth')->user(), 'user' => $container->get('auth')->user(),
]); ]);
$view->getEnvironment()->addGlobal('uiLang', $uiLang);
$view->getEnvironment()->addGlobal('lang', $lang);
$view->getEnvironment()->addGlobal('flash', $container->get('flash')); $view->getEnvironment()->addGlobal('flash', $container->get('flash'));
if (isset($_SESSION['_screen_mode'])) { if (isset($_SESSION['_screen_mode'])) {
$view->getEnvironment()->addGlobal('screen_mode', $_SESSION['_screen_mode']); $view->getEnvironment()->addGlobal('screen_mode', $_SESSION['_screen_mode']);
@ -119,11 +130,11 @@ $container->set('view', function ($container) use ($translations) {
}); });
$view->getEnvironment()->addFunction($route); $view->getEnvironment()->addFunction($route);
// Define the route_is function // Define the route_is function
$routeIs = new \Twig\TwigFunction('route_is', function ($routeName) { $routeIs = new \Twig\TwigFunction('route_is', function ($routeName) {
return strpos($_SERVER['REQUEST_URI'], $routeName) !== false; return strpos($_SERVER['REQUEST_URI'], $routeName) !== false;
}); });
$view->getEnvironment()->addFunction($routeIs); $view->getEnvironment()->addFunction($routeIs);
//assets //assets
$assets = new TwigFunction('assets', function ($location) { $assets = new TwigFunction('assets', function ($location) {

6
cp/resources/views/layouts/app.twig
View file

@ -34,10 +34,10 @@
<div class="navbar-nav flex-row order-md-last"> <div class="navbar-nav flex-row order-md-last">
<div class="nav-item d-none d-md-flex me-3"> <div class="nav-item d-none d-md-flex me-3">
<div class="btn-list"> <div class="btn-list">
<div class="dropdown"> <div class="dropdown small-dropdown">
<a href="#" class="btn dropdown-toggle" data-bs-toggle="dropdown"><span class="flag flag-country-gb-eng"></span>&nbsp;English</a> <a href="#" class="btn dropdown-toggle" data-bs-toggle="dropdown"><span class="flag flag-country-{{ uiLang }}"></span>&nbsp;{{ lang }}</a>
<div class="dropdown-menu"> <div class="dropdown-menu">
<a href="/lang?en_US" class="dropdown-item"><span class="flag flag-country-gb-eng"></span>&nbsp;English</a> <a href="/lang?en_US" class="dropdown-item"><span class="flag flag-country-us"></span>&nbsp;English</a>
<a href="/lang?uk_UA" class="dropdown-item"><span class="flag flag-country-ua"></span>&nbsp;Ukrainian</a> <a href="/lang?uk_UA" class="dropdown-item"><span class="flag flag-country-ua"></span>&nbsp;Ukrainian</a>
</div> </div>
</div> </div>

11
cp/resources/views/partials/css-tables.twig
View file

@ -4,3 +4,14 @@
<link href="/assets/css/tabler-vendors.min.css" rel="stylesheet"/> <link href="/assets/css/tabler-vendors.min.css" rel="stylesheet"/>
<link href="/assets/css/tabulator.min.css" rel="stylesheet"> <link href="/assets/css/tabulator.min.css" rel="stylesheet">
<link href="/assets/css/tabulator_bootstrap5.min.css" rel="stylesheet"> <link href="/assets/css/tabulator_bootstrap5.min.css" rel="stylesheet">
<style>
.small-dropdown .dropdown-item {
padding: 0.25rem 1.5rem;
}
.small-dropdown .flag {
width: 20px;
height: 15px;
display: inline-block;
}
</style>

11
cp/resources/views/partials/css.twig
View file

@ -2,3 +2,14 @@
<link href="/assets/css/tabler-flags.min.css" rel="stylesheet"/> <link href="/assets/css/tabler-flags.min.css" rel="stylesheet"/>
<link href="/assets/css/tabler-payments.min.css" rel="stylesheet"/> <link href="/assets/css/tabler-payments.min.css" rel="stylesheet"/>
<link href="/assets/css/tabler-vendors.min.css" rel="stylesheet"/> <link href="/assets/css/tabler-vendors.min.css" rel="stylesheet"/>
<style>
.small-dropdown .dropdown-item {
padding: 0.25rem 1.5rem;
}
.small-dropdown .flag {
width: 20px;
height: 15px;
display: inline-block;
}
</style>