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

Make sure locale is always set, even on first request

Browse source
This commit is contained in:
Pierre Rudloff 2020-11-21 14:20:01 +01:00
parent 05959b17f0
commit f184bda59b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
classes/Factory/ViewFactory.php
View file

@ -81,7 +81,7 @@ class ViewFactory
$view->registerPlugin('block', 't', [$localeManager, 'smartyTranslate']);
$view->offsetSet('canonical', self::getCanonicalUrl($request));
$view->offsetSet('locale', $container->get('locale')->getLocale());
$view->offsetSet('locale', $container->get('locale'));
$view->offsetSet('config', $container->get('config'));
$view->offsetSet('domain', $uri->withBasePath('')->getBaseUrl());

2
templates/inc/head.tpl
View file

@ -1,5 +1,5 @@
<!doctype html>
<html {if isset($locale)}lang="{$locale->getBcp47()}"{/if}>
<html lang="{$locale->getLocale()->getBcp47()}">
<head>
<meta charset="UTF-8"/>
<meta name=viewport content="width=device-width, initial-scale=1"/>

4
templates/inc/header.tpl
View file

@ -2,8 +2,8 @@
{if isset($supportedLocales) AND count($supportedLocales) > 1}
<div class="locales small-font">
<button class="localesBtn small-font" title="{t}Switch language{/t}">
{if isset($locale) AND $locale->getCountry()}
{$locale->getCountry()->getEmoji()}
{if $locale->getLocale()->getCountry()}
{$locale->getLocale()->getCountry()->getEmoji()}
{else}
{t}Set language{/t}
{/if}