hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-24 22:11:01 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #812 from openclassify/vedat

Browse Source 
trans fixed
This commit is contained in:
spektra2147 2020-11-24 14:50:03 +03:00 committed by GitHub
commit 6a0be045cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
View File

@ -124,7 +124,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
$cats = $cats->leftJoin('cats_category_translations', function ($join) { $cats = $cats->leftJoin('cats_category_translations', function ($join) {
$join->on('cats_category.id', '=', 'cats_category_translations.entry_id'); $join->on('cats_category.id', '=', 'cats_category_translations.entry_id');
$join->whereIn('cats_category_translations.locale', [config('app.locale'), setting_value('streams::default_locale'),'en']);//active lang $join->whereIn('cats_category_translations.locale', [config('app.locale'), setting_value('streams::default_locale'), 'en']);//active lang
}); });
$cats = $cats->select('cats_category.*', 'cats_category_translations.name as name'); $cats = $cats->select('cats_category.*', 'cats_category_translations.name as name');
$cats = $cats->orderBy('id', 'DESC') $cats = $cats->orderBy('id', 'DESC')
@ -132,7 +132,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
->get(); ->get();
foreach ($cats as $cat) { foreach ($cats as $cat) {
$link = ''; $link = '';
$parents = $this->getParentCats($cat->id, null); $parents = $this->getParentCats($cat->id, null, false);
krsort($parents); krsort($parents);
foreach ($parents as $key => $parent) { foreach ($parents as $key => $parent) {
if ($key == 0) { if ($key == 0) {

2
addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php
View File

@ -77,7 +77,7 @@ class UsersFieldsSeeder extends Seeder
'slug' => 'register_type', 'slug' => 'register_type',
'type' => 'anomaly.field_type.select', 'type' => 'anomaly.field_type.select',
"config" => [ "config" => [
'options' => '1: ' . trans('visiosoft.module.profile::field.individual.name') . "\n2: " . trans('visiosoft.module.profile::field.corporate.name') 'options' => '1: ' . 'visiosoft.module.profile::field.individual.name' . "\n2: " . 'visiosoft.module.profile::field.corporate.name'
] ]
], ],
[ [