diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php index 7ce175ce64..7c2f9be955 100644 --- a/components/Posting/Posting.php +++ b/components/Posting/Posting.php @@ -101,7 +101,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']]], ['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.')]], - FormFields::language($actor, $context_actor, label: _m('Note language:')), + FormFields::language($actor, $context_actor, label: _m('Note language:'), help: _m('The selected language will be federated and added as a lang attribute, preferred language can be set up in settings')), ]; if (\count($available_content_types) > 1) { diff --git a/components/RightPanel/templates/right_panel/view.html.twig b/components/RightPanel/templates/right_panel/view.html.twig index 714ba9f285..03430affa0 100644 --- a/components/RightPanel/templates/right_panel/view.html.twig +++ b/components/RightPanel/templates/right_panel/view.html.twig @@ -9,9 +9,9 @@ {% set blocks = handle_event('AppendRightPostingBlock', request) %} {% if blocks['post_form'] is defined %} -
+
+ title="{{ 'Expand if you want to access more options.' | trans }}"> {{ "Create a note" | trans }}{{ icon('arrow-down', 'icon icon-details-open') | raw }} @@ -31,6 +31,7 @@ {{ form_row(blocks['post_form'].language) }} {{ form_row(blocks['post_form'].tag_use_canonical) }}
+ {{ form_rest(blocks['post_form']) }} {{ form_end(blocks['post_form']) }} diff --git a/components/Tag/Tag.php b/components/Tag/Tag.php index 56edfb44bc..7ab079e06c 100644 --- a/components/Tag/Tag.php +++ b/components/Tag/Tag.php @@ -177,7 +177,7 @@ class Tag extends Component public function onPostingAddFormEntries(Request $request, Actor $actor, array &$form_params) { - $form_params[] = ['tag_use_canonical', CheckboxType::class, ['required' => false, 'data' => true, 'label' => _m('Make note tags canonical')]]; + $form_params[] = ['tag_use_canonical', CheckboxType::class, ['required' => false, 'data' => true, 'label' => _m('Make note tags canonical'), 'help' => _m('Canonical tags will be treated as a version of an existing tag with the same root/stem (e.g. \'#great_tag\' will be considered as a version of \'#great\', if it already exists)')]]; return Event::next; } diff --git a/components/Tag/templates/note_tag_feed.html.twig b/components/Tag/templates/note_tag_feed.html.twig index 9a4788de02..06040e62a4 100644 --- a/components/Tag/templates/note_tag_feed.html.twig +++ b/components/Tag/templates/note_tag_feed.html.twig @@ -9,7 +9,7 @@ {% block body %} {% if tag_name is defined and tag_name is not null %} {% if tag_name is instanceof('string') %} -

{% trans %}People with tag: %tag_name%{% endtrans %}

+

{% trans %}Notes with tag: %tag_name%{% endtrans %}

{% else %} {% set tags = tag_name|join(', ') %} {# TODO Not ideal, hard to translate #}

{% trans %}People with tags: %tags%{% endtrans %}