diff --git a/locales/fr_FR/LC_MESSAGES/main.mo b/locales/fr_FR/LC_MESSAGES/main.mo index d212616d5..532874642 100644 Binary files a/locales/fr_FR/LC_MESSAGES/main.mo and b/locales/fr_FR/LC_MESSAGES/main.mo differ diff --git a/locales/fr_FR/LC_MESSAGES/main.po b/locales/fr_FR/LC_MESSAGES/main.po index c84a6daef..a877b3584 100644 --- a/locales/fr_FR/LC_MESSAGES/main.po +++ b/locales/fr_FR/LC_MESSAGES/main.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Flus\n" -"POT-Creation-Date: 2026-02-08 22:16+0100\n" -"PO-Revision-Date: 2026-02-08 22:16+0100\n" +"POT-Creation-Date: 2026-02-14 22:24+0100\n" +"PO-Revision-Date: 2026-02-14 22:24+0100\n" "Last-Translator: Marien Fressinaud \n" "Language-Team: \n" "Language: fr_FR\n" @@ -281,8 +281,8 @@ msgstr "Le nom ne doit pas faire plus de {max} caractères." #: models/Collection.php:139 models/Collection.php:229 #: navigations/ReadingNavigation.php:30 -msgid "Bookmarks" -msgstr "Signets" +msgid "To read" +msgstr "À lire" #: models/Collection.php:150 models/Collection.php:231 #: navigations/ReadingNavigation.php:37 diff --git a/src/models/Collection.php b/src/models/Collection.php index d52e512ab..da2d37652 100644 --- a/src/models/Collection.php +++ b/src/models/Collection.php @@ -136,7 +136,7 @@ public static function initBookmarks(string $user_id): self { $collection = new self(); - $collection->name = _('Bookmarks'); + $collection->name = _('To read'); $collection->type = 'bookmarks'; $collection->user_id = $user_id; @@ -226,7 +226,7 @@ public function isCollection(): bool public function name(): string { if ($this->type === 'bookmarks') { - return _('Bookmarks'); + return _('To read'); } elseif ($this->type === 'read') { return _('Links read'); } elseif ($this->type === 'news') { diff --git a/src/navigations/ReadingNavigation.php b/src/navigations/ReadingNavigation.php index c2ddb8a5d..68f5950d1 100644 --- a/src/navigations/ReadingNavigation.php +++ b/src/navigations/ReadingNavigation.php @@ -27,7 +27,7 @@ public function elements(): array 'bookmarks', \Minz\Url::for('bookmarks'), 'bookmark', - TwigExtension::translate('Bookmarks'), + TwigExtension::translate('To read'), ), new Item( diff --git a/src/views/bookmarks/index.html.twig b/src/views/bookmarks/index.html.twig index c7cc4d098..5576a7cb2 100644 --- a/src/views/bookmarks/index.html.twig +++ b/src/views/bookmarks/index.html.twig @@ -6,7 +6,7 @@ {% set current_url_params = { page: pagination.currentPage } %} {% endif %} -{% block title %}{{ collection.name }}{% endblock %} +{% block title %}{{ collection.name() }}{% endblock %} {% block canonical %}{{ url_full('bookmarks', current_url_params) }}{% endblock %} {% block layout_header %} @@ -18,11 +18,11 @@ {% endblock %} {% block back %} - {{ include('layouts/_back.html.twig', { title: collection.name, reset: true }) }} + {{ include('layouts/_back.html.twig', { title: collection.name(), reset: true }) }} {% endblock %} {% block body %} -

{{ collection.name }}

+

{{ collection.name() }}

{{ t('Place here the links you want to consult later on.') }} diff --git a/src/views/collections/_collection.html.twig b/src/views/collections/_collection.html.twig index b44669fb6..2470e2a1e 100644 --- a/src/views/collections/_collection.html.twig +++ b/src/views/collections/_collection.html.twig @@ -9,7 +9,7 @@ >

- {{ collection.name }} + {{ collection.name() }}
diff --git a/src/views/collections/_collection.opml.xml.twig b/src/views/collections/_collection.opml.xml.twig index 820efce19..60e3ab632 100644 --- a/src/views/collections/_collection.opml.xml.twig +++ b/src/views/collections/_collection.opml.xml.twig @@ -3,7 +3,7 @@ {% if collection.isFeed %}
- {{ collection.name }} + {{ collection.name() }}
diff --git a/src/views/collections/_collections_by_others.html.twig b/src/views/collections/_collections_by_others.html.twig index 2796ae0ca..4db070bfd 100644 --- a/src/views/collections/_collections_by_others.html.twig +++ b/src/views/collections/_collections_by_others.html.twig @@ -6,9 +6,9 @@ {% if collection.user_id == app.user.id %} - {{ t('%s added this link to %s.', [owner.username | escape, collection.name | escape]) | raw }} + {{ t('%s added this link to %s.', [owner.username | escape, collection.name() | escape]) | raw }} {% else %} - {{ t('%s added this link to %s (shared by %s).', [owner.username | escape, collection.name | escape, collection.owner.username | escape]) | raw }} + {{ t('%s added this link to %s (shared by %s).', [owner.username | escape, collection.name() | escape, collection.owner.username | escape]) | raw }} {% endif %} {% endfor %} diff --git a/src/views/collections/_selector.html.twig b/src/views/collections/_selector.html.twig index bc8c0b2c7..91deaa9ed 100644 --- a/src/views/collections/_selector.html.twig +++ b/src/views/collections/_selector.html.twig @@ -126,7 +126,7 @@ {{ collection.is_public ? 'data-public' : '' }} data-illustration="{{ url_media('covers', collection.image_filename, 'collection-card.png') }}" > - {{ collection.name }} + {{ collection.name() }} {% endfor %} diff --git a/src/views/collections/exportation.atom.xml.twig b/src/views/collections/exportation.atom.xml.twig index de202212b..253fb32af 100644 --- a/src/views/collections/exportation.atom.xml.twig +++ b/src/views/collections/exportation.atom.xml.twig @@ -1,6 +1,6 @@ - {{ collection.name }} + {{ collection.name() }} {% if collection.description %} {% endif %} diff --git a/src/views/collections/feeds/show.atom.xml.twig b/src/views/collections/feeds/show.atom.xml.twig index cf502d2cc..35f2c33fa 100644 --- a/src/views/collections/feeds/show.atom.xml.twig +++ b/src/views/collections/feeds/show.atom.xml.twig @@ -1,7 +1,7 @@ - {{ collection.name }} + {{ collection.name() }} {% if collection.description %} diff --git a/src/views/collections/filters/edit.html.twig b/src/views/collections/filters/edit.html.twig index bdbac7598..e644eb4e4 100644 --- a/src/views/collections/filters/edit.html.twig +++ b/src/views/collections/filters/edit.html.twig @@ -5,7 +5,7 @@ {% block body %}

- {{ collection.name }} + {{ collection.name() }}

diff --git a/src/views/collections/groups/edit.html.twig b/src/views/collections/groups/edit.html.twig index 96cf62080..5a80fd021 100644 --- a/src/views/collections/groups/edit.html.twig +++ b/src/views/collections/groups/edit.html.twig @@ -5,7 +5,7 @@ {% block body %}
-

{{ collection.name }}

+

{{ collection.name() }}

{{ t('Groups help you to organize your collections. They are only visible to you on the main collections page.') }} diff --git a/src/views/collections/images/edit.html.twig b/src/views/collections/images/edit.html.twig index 3e62b441e..1207b927a 100644 --- a/src/views/collections/images/edit.html.twig +++ b/src/views/collections/images/edit.html.twig @@ -5,7 +5,7 @@ {% block body %}

-

{{ collection.name }}

+

{{ collection.name() }}

{{ t('Illustrations help to distinguish your collection among the others.') }} diff --git a/src/views/collections/shares/index.html.twig b/src/views/collections/shares/index.html.twig index 8dd9af88e..977efb535 100644 --- a/src/views/collections/shares/index.html.twig +++ b/src/views/collections/shares/index.html.twig @@ -1,6 +1,6 @@ {% extends 'layouts/modal.html.twig' %} -{% block title %}{{ t('Sharing access to “%s”', [collection.name]) }}{% endblock %} +{% block title %}{{ t('Sharing access to “%s”', [collection.name()]) }}{% endblock %} {% block body %}

diff --git a/src/views/collections/show.html.twig b/src/views/collections/show.html.twig index becd6a816..ebc4f6ed4 100644 --- a/src/views/collections/show.html.twig +++ b/src/views/collections/show.html.twig @@ -23,16 +23,16 @@ {% set current_tab = can_update ? 'links' : 'reading' %} {% endif %} -{% block title %}{{ collection.name }}{% endblock %} +{% block title %}{{ collection.name() }}{% endblock %} {% block canonical %}{{ url_full('collection', current_url_params) }}{% endblock %} {% block alternates %} - + {% endblock %} {% block opengraph %} {{ include('layouts/_opengraph.html.twig', { - title: collection.name, + title: collection.name(), description: opengraph_description, locale: owner.locale, url: url_full('collection', { id: collection.id }), @@ -45,7 +45,7 @@ {% endblock %} {% block back %} - {{ include('layouts/_back.html.twig', { title: collection.name }) }} + {{ include('layouts/_back.html.twig', { title: collection.name() }) }} {% endblock %} {% block body %} @@ -83,7 +83,7 @@
-

{{ collection.name }}

+

{{ collection.name() }}

{% if app.user and is_following %} diff --git a/src/views/links/_link.html.twig b/src/views/links/_link.html.twig index e613e9799..7db1dbcdb 100644 --- a/src/views/links/_link.html.twig +++ b/src/views/links/_link.html.twig @@ -160,14 +160,14 @@ {% set owner = source_collection.owner %} {{ t('via %s by
%s', [ url('collection', { id: source_collection.id }), - source_collection.name | escape, + source_collection.name() | escape, url('profile', { id: owner.id }), owner.username | escape, ]) | raw }} {% else %} {{ t('via %s', [ url('collection', { id: source_collection.id }), - source_collection.name | escape, + source_collection.name() | escape, ]) | raw }} {% endif %} {% elseif source_user %} diff --git a/src/views/read/index.html.twig b/src/views/read/index.html.twig index d03ce8650..7e4693a35 100644 --- a/src/views/read/index.html.twig +++ b/src/views/read/index.html.twig @@ -6,7 +6,7 @@ {% set current_url_params = { page: pagination.currentPage } %} {% endif %} -{% block title %}{{ collection.name }}{% endblock %} +{% block title %}{{ collection.name() }}{% endblock %} {% block canonical %}{{ url_full('read list', current_url_params) }}{% endblock %} {% block layout_header %} @@ -18,11 +18,11 @@ {% endblock %} {% block back %} - {{ include('layouts/_back.html.twig', { title: collection.name, reset: true }) }} + {{ include('layouts/_back.html.twig', { title: collection.name(), reset: true }) }} {% endblock %} {% block body %} -

{{ collection.name }}

+

{{ collection.name() }}

{{ t('Find here all the links you’ve marked as read.') }} diff --git a/tests/controllers/collections/GroupsTest.php b/tests/controllers/collections/GroupsTest.php index 7c7bd9fd2..9ce690221 100644 --- a/tests/controllers/collections/GroupsTest.php +++ b/tests/controllers/collections/GroupsTest.php @@ -64,6 +64,7 @@ public function testEditRendersIfCollectionIsFollowed(): void /** @var string */ $collection_name = $this->fake('text', 50); $collection = CollectionFactory::create([ + 'type' => 'collection', 'user_id' => $other_user->id, 'name' => $collection_name, 'is_public' => true,