#391 setLocale for Page on Load

This commit is contained in:
vedatakd 2019-09-07 14:30:49 +03:00
parent 4bf1efdf72
commit 0d74543a43
3 changed files with 22 additions and 16 deletions

View File

@ -19,8 +19,7 @@ class AdvCriteria extends EntryCriteria
$advModel = new AdvModel(); $advModel = new AdvModel();
$popular_advs = $advModel->popularAdvs(); $popular_advs = $advModel->popularAdvs();
$ads = $advModel->getLocationNames($popular_advs); $ads = $advModel->getLocationNames($popular_advs);
foreach ($ads as $index => $ad) foreach ($ads as $index => $ad) {
{
$ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list');
$ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad);
} }
@ -45,8 +44,7 @@ class AdvCriteria extends EntryCriteria
->paginate($this->settings->value('visiosoft.theme.default::s-type-latest-limit')); ->paginate($this->settings->value('visiosoft.theme.default::s-type-latest-limit'));
$ads = $advModel->getLocationNames($latest_advs); $ads = $advModel->getLocationNames($latest_advs);
foreach ($ads as $index => $ad) foreach ($ads as $index => $ad) {
{
$ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list');
$ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad);
} }
@ -73,8 +71,7 @@ class AdvCriteria extends EntryCriteria
$ads = $advModel $ads = $advModel
->whereIn('advs_advs.id', $recently_viewed_ads) ->whereIn('advs_advs.id', $recently_viewed_ads)
->get(); ->get();
foreach ($ads as $index => $ad) foreach ($ads as $index => $ad) {
{
$ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list');
$ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad);
} }

View File

@ -6,6 +6,7 @@ use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryModel;
use Anomaly\Streams\Platform\Model\Advs\PurchasePurchaseEntryModel; use Anomaly\Streams\Platform\Model\Advs\PurchasePurchaseEntryModel;
use Anomaly\Streams\Platform\Model\Complaints\ComplaintsComplainTypesEntryModel; use Anomaly\Streams\Platform\Model\Complaints\ComplaintsComplainTypesEntryModel;
use Anomaly\Streams\Platform\Model\Options\OptionsAdvertisementEntryModel; use Anomaly\Streams\Platform\Model\Options\OptionsAdvertisementEntryModel;
use Illuminate\Support\Facades\App;
use Visiosoft\AdvsModule\Adv\Event\showAdPhone; use Visiosoft\AdvsModule\Adv\Event\showAdPhone;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;

View File

@ -161,8 +161,16 @@ class DefaultThemeServiceProvider extends AddonServiceProvider
*/ */
public function boot() public function boot()
{ {
// Run extra post-boot registration logic here. view()->composer('*', function ($view) {
// Use method injection or commands to bring in services.
if (Request()->session()->get('_locale') === null) {
$lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
$acceptLang = ['ar', 'de', 'el', 'en', 'es', 'fa', 'fr', 'it', 'nl', 'pt', 'ru', 'tr'];
$lang = in_array($lang, $acceptLang) ? $lang : 'en';
App()->setLocale($lang);
Request()->session()->put('_locale', $lang);
}
});
} }
/** /**