forked from GNUsocial/gnu-social
[Posting] Add dropdown with language choice, with preferred choice according to user choice and context (group, etc)
This commit is contained in:
parent
9444c34071
commit
019ad794d1
@ -35,6 +35,7 @@ use App\Entity\Actor;
|
|||||||
use App\Entity\ActorToAttachment;
|
use App\Entity\ActorToAttachment;
|
||||||
use App\Entity\Attachment;
|
use App\Entity\Attachment;
|
||||||
use App\Entity\AttachmentToNote;
|
use App\Entity\AttachmentToNote;
|
||||||
|
use App\Entity\Language;
|
||||||
use App\Entity\Note;
|
use App\Entity\Note;
|
||||||
use App\Util\Common;
|
use App\Util\Common;
|
||||||
use App\Util\Exception\ClientException;
|
use App\Util\Exception\ClientException;
|
||||||
@ -44,7 +45,6 @@ use App\Util\Exception\ServerException;
|
|||||||
use App\Util\Formatting;
|
use App\Util\Formatting;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\FileType;
|
use Symfony\Component\Form\Extension\Core\Type\FileType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\LocaleType;
|
|
||||||
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
|
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
|
||||||
use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
|
use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
|
||||||
@ -92,6 +92,10 @@ class Posting extends Component
|
|||||||
Event::handle('PostingAvailableContentTypes', [&$available_content_types]);
|
Event::handle('PostingAvailableContentTypes', [&$available_content_types]);
|
||||||
|
|
||||||
$context_actor = null; // This is where we'd plug in the group in which the actor is posting, or whom they're replying to
|
$context_actor = null; // This is where we'd plug in the group in which the actor is posting, or whom they're replying to
|
||||||
|
$preferred_language_choices = $actor->getPreferredLanguageChoices($context_actor);
|
||||||
|
$language_choices = Language::getLanguageChoices();
|
||||||
|
|
||||||
|
// TODO short display
|
||||||
|
|
||||||
$request = $vars['request'];
|
$request = $vars['request'];
|
||||||
$form_params = [
|
$form_params = [
|
||||||
@ -99,7 +103,7 @@ class Posting extends Component
|
|||||||
['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'multiple' => false, 'expanded' => false, 'data' => 'public', 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]],
|
['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'multiple' => false, 'expanded' => false, 'data' => 'public', 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]],
|
||||||
['content', TextareaType::class, ['label' => _m('Content:'), 'data' => $initial_content, 'attr' => ['placeholder' => _m($placeholder)], 'constraints' => [new Length(['max' => Common::config('site', 'text_limit')])]]],
|
['content', TextareaType::class, ['label' => _m('Content:'), 'data' => $initial_content, 'attr' => ['placeholder' => _m($placeholder)], 'constraints' => [new Length(['max' => Common::config('site', 'text_limit')])]]],
|
||||||
['attachments', FileType::class, ['label' => _m('Attachments:'), 'multiple' => true, 'required' => false, 'invalid_message' => _m('Attachment not valid.')]],
|
['attachments', FileType::class, ['label' => _m('Attachments:'), 'multiple' => true, 'required' => false, 'invalid_message' => _m('Attachment not valid.')]],
|
||||||
['language', LocaleType::class, ['label' => _m('Note language:'), 'multiple' => false, 'preferred_choices' => $actor->getPreferredLanguageChoice($context_actor)]],
|
['language', ChoiceType::class, ['label' => _m('Note language:'), 'preferred_choices' => $preferred_language_choices, 'choices' => $language_choices, 'required' => true, 'multiple' => false]],
|
||||||
];
|
];
|
||||||
|
|
||||||
if (\count($available_content_types) > 1) {
|
if (\count($available_content_types) > 1) {
|
||||||
|
@ -363,10 +363,12 @@ class Actor extends Entity
|
|||||||
$id = $context?->getId() ?? $this->getId();
|
$id = $context?->getId() ?? $this->getId();
|
||||||
return Cache::get(
|
return Cache::get(
|
||||||
'actor-' . $this->getId() . '-langs' . (!\is_null($context) ? '-' . $context->getId() : ''),
|
'actor-' . $this->getId() . '-langs' . (!\is_null($context) ? '-' . $context->getId() : ''),
|
||||||
fn () => DB::dql(
|
fn () => array_merge( // TODO replace with F\transform
|
||||||
|
...F\map(DB::dql(
|
||||||
'select l from actor_language al join language l with al.language_id = l.id where al.actor_id = :id order by al.order ASC',
|
'select l from actor_language al join language l with al.language_id = l.id where al.actor_id = :id order by al.order ASC',
|
||||||
['id' => $id],
|
['id' => $id],
|
||||||
) ?: [DB::findOneBy('language', ['locale' => Common::config('site', 'language')])],
|
), fn ($l) => $l->toChoiceFormat()),
|
||||||
|
) ?: DB::findOneBy('language', ['locale' => Common::config('site', 'language')])->toChoiceFormat(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,8 +23,12 @@ declare(strict_types = 1);
|
|||||||
|
|
||||||
namespace App\Entity;
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use App\Core\Cache;
|
||||||
|
use App\Core\DB\DB;
|
||||||
use App\Core\Entity;
|
use App\Core\Entity;
|
||||||
|
use function App\Core\I18n\_m;
|
||||||
use DateTimeInterface;
|
use DateTimeInterface;
|
||||||
|
use Functional as F;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Entity for languages
|
* Entity for languages
|
||||||
@ -103,9 +107,17 @@ class Language extends Entity
|
|||||||
// @codeCoverageIgnoreEnd
|
// @codeCoverageIgnoreEnd
|
||||||
// }}} Autocode
|
// }}} Autocode
|
||||||
|
|
||||||
public function __toString()
|
public static function getLanguageChoices(): array
|
||||||
{
|
{
|
||||||
return $this->getLongDisplay();
|
return Cache::getList(
|
||||||
|
'languages', // TODO replace with F\transform
|
||||||
|
fn () => array_merge(...F\map(DB::dql('select l from language l'), fn ($e) => $e->toChoiceFormat())),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function toChoiceFormat(): array
|
||||||
|
{
|
||||||
|
return [_m($this->getLongDisplay()) => $this->getShortDisplay()];
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function schemaDef(): array
|
public static function schemaDef(): array
|
||||||
|
Loading…
Reference in New Issue
Block a user