PrivateCoffee/wishthis
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve translations logic

Browse source
This commit is contained in:
Jay Trees 2022-03-22 13:43:54 +01:00
parent c131afaf64
commit c811b9e315
3 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
index.php
View file

@ -79,6 +79,32 @@ if (isset($api)) {
return; return;
} }
/**
* Language
*/
/** Determine Locale */
$userLocale = \Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE']);
$locales = array_filter(
array_map(
function ($value) {
if ('po' === pathinfo($value, PATHINFO_EXTENSION)) {
return pathinfo($value, PATHINFO_FILENAME);
}
},
scandir(ROOT . '/translations')
)
);
$locale = \Locale::lookup($locales, $userLocale, false, 'en');
/** Load Translation */
$translationFilepath = ROOT . '/translations/' . $locale . '.po';
$translations = null;
if (file_exists($translationFilepath)) {
$loader = new \Gettext\Loader\PoLoader();
$translations = $loader->loadFile($translationFilepath);
}
/** /**
* Install * Install
*/ */

15
src/classes/page.php
View file

@ -157,20 +157,9 @@ class Page
} }
/** /**
* Determine Locale * Locale
*/ */
$userLocale = \Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE']); global $locale;
$locales = array_filter(
array_map(
function ($value) {
if ('po' === pathinfo($value, PATHINFO_EXTENSION)) {
return pathinfo($value, PATHINFO_FILENAME);
}
},
scandir(ROOT . '/translations')
)
);
$locale = \Locale::lookup($locales, $userLocale, false, 'en');
$this->language = $locale; $this->language = $locale;
} }

19
src/functions/gettext.php
View file

@ -6,25 +6,14 @@
* @author Jay Trees <github.jay@grandel.anonaddy.me> * @author Jay Trees <github.jay@grandel.anonaddy.me>
*/ */
use Gettext\Loader\PoLoader;
function __(string $text) function __(string $text)
{ {
global $page; global $translations;
if (!isset($page->language)) { $translation = null;
return $text;
}
/** if ($translations) {
* Use file $translation = $translations->find(null, $text);
*/
$translationFilepath = ROOT . '/translations/' . $page->language . '.po';
if (file_exists($translationFilepath)) {
$loader = new PoLoader();
$translations = $loader->loadFile($translationFilepath);
$translation = $translations->find(null, $text);
if ($translation) { if ($translation) {
return $translation->getTranslation(); return $translation->getTranslation();