aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/i18n/cs/sub.php2
-rw-r--r--app/i18n/de/sub.php2
-rw-r--r--app/i18n/el/sub.php2
-rw-r--r--app/i18n/en-us/sub.php2
-rw-r--r--app/i18n/en/sub.php2
-rw-r--r--app/i18n/es/sub.php2
-rw-r--r--app/i18n/fa/sub.php2
-rw-r--r--app/i18n/fr/sub.php2
-rw-r--r--app/i18n/hu/sub.php2
-rw-r--r--app/i18n/id/sub.php2
-rw-r--r--app/i18n/it/sub.php2
-rw-r--r--app/i18n/ja/sub.php2
-rw-r--r--app/i18n/ko/sub.php2
-rw-r--r--app/i18n/lv/sub.php2
-rw-r--r--app/i18n/nl/sub.php2
-rw-r--r--app/i18n/oc/sub.php2
-rw-r--r--app/i18n/pt-br/sub.php2
-rw-r--r--app/i18n/ru/sub.php2
-rw-r--r--app/i18n/sk/sub.php2
-rw-r--r--app/i18n/tr/sub.php2
-rw-r--r--app/layout/aside_feed.phtml2
-rw-r--r--app/views/subscription/index.phtml22
22 files changed, 34 insertions, 30 deletions
diff --git a/app/i18n/cs/sub.php b/app/i18n/cs/sub.php
index a9f7d198a..cb9bd02c6 100644
--- a/app/i18n/cs/sub.php
+++ b/app/i18n/cs/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Přijímat soubory cookie',
'accept_cookies_help' => 'Povolit serveru feedu nastavit soubory cookie (uložené v paměti pouze po dobu trvání požadavku).',
- 'add' => 'Přidat kanál RSS',
+ 'add' => 'Přidat kanál',
'advanced' => 'Rozšířené',
'archiving' => 'Archivace',
'auth' => array(
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index 958107e8a..f2b8012df 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Cookies zulassen',
'accept_cookies_help' => 'Erlaubt dem Feed-Server das Setzen von Cookies (wird nur für die Dauer der Anfrage im Speicher gehalten)',
- 'add' => 'Einen RSS-Feed hinzufügen',
+ 'add' => 'Einen Feed hinzufügen',
'advanced' => 'Erweitert',
'archiving' => 'Archivierung',
'auth' => array(
diff --git a/app/i18n/el/sub.php b/app/i18n/el/sub.php
index 3d95d0e31..80f420811 100644
--- a/app/i18n/el/sub.php
+++ b/app/i18n/el/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Accept cookies', // TODO
'accept_cookies_help' => 'Allow the feed server to set cookies (stored in memory for the duration of the request only)', // TODO
- 'add' => 'Add an RSS feed', // TODO
+ 'add' => 'Add a feed', // TODO
'advanced' => 'Advanced', // TODO
'archiving' => 'Archiving', // TODO
'auth' => array(
diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php
index 7c574f326..7f4469ff1 100644
--- a/app/i18n/en-us/sub.php
+++ b/app/i18n/en-us/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Accept cookies', // IGNORE
'accept_cookies_help' => 'Allow the feed server to set cookies (stored in memory for the duration of the request only)', // IGNORE
- 'add' => 'Add an RSS feed', // IGNORE
+ 'add' => 'Add a feed', // IGNORE
'advanced' => 'Advanced', // IGNORE
'archiving' => 'Archiving', // IGNORE
'auth' => array(
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 4c514ac0c..f514df5f3 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Accept cookies',
'accept_cookies_help' => 'Allow the feed server to set cookies (stored in memory for the duration of the request only)',
- 'add' => 'Add an RSS feed',
+ 'add' => 'Add a feed',
'advanced' => 'Advanced',
'archiving' => 'Archiving',
'auth' => array(
diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php
index 853684712..cfb2bf550 100644
--- a/app/i18n/es/sub.php
+++ b/app/i18n/es/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Aceptar cookies',
'accept_cookies_help' => 'Permitir que el servidor de fuentes configure las cookies (guardadas en memoria únicamente para el tiempo de vida de la solicitud)',
- 'add' => 'Añadir fuente RSS',
+ 'add' => 'Añadir fuente',
'advanced' => 'Avanzado',
'archiving' => 'Archivo',
'auth' => array(
diff --git a/app/i18n/fa/sub.php b/app/i18n/fa/sub.php
index 5dfd82c60..9aa388e27 100644
--- a/app/i18n/fa/sub.php
+++ b/app/i18n/fa/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => ' کوکی ها را بپذیرید',
'accept_cookies_help' => ' به سرور فید اجازه دهید تا کوکی ها را تنظیم کند (فقط برای مدت زمان درخواست در حافظه ذخیره می شود)',
- 'add' => ' یک فید RSS اضافه کنید',
+ 'add' => ' یک فید اضافه کنید',
'advanced' => ' پیشرفته',
'archiving' => ' بایگانی',
'auth' => array(
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index 4a8c21d69..6dd205356 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Autoriser les cookies',
'accept_cookies_help' => 'Accepte les cookies du flux (stocké en mémoire seulement le temps de la requête)',
- 'add' => 'Ajouter un flux RSS',
+ 'add' => 'Ajouter un flux',
'advanced' => 'Avancé',
'archiving' => 'Archivage',
'auth' => array(
diff --git a/app/i18n/hu/sub.php b/app/i18n/hu/sub.php
index c91a6c5b4..7c45b2951 100644
--- a/app/i18n/hu/sub.php
+++ b/app/i18n/hu/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Sütik elfogadása',
'accept_cookies_help' => 'Engedélyezze hogy a hírforrás szerver beállíthasson sütiket (memóriában lesznek tárolva a kapcsolat idejére)',
- 'add' => 'RSS hírforrás hozzáadása',
+ 'add' => 'hírforrás hozzáadása',
'advanced' => 'Haladó',
'archiving' => 'Archiválás',
'auth' => array(
diff --git a/app/i18n/id/sub.php b/app/i18n/id/sub.php
index 24a8dad2f..6f637c316 100644
--- a/app/i18n/id/sub.php
+++ b/app/i18n/id/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Accept cookies', // TODO
'accept_cookies_help' => 'Allow the feed server to set cookies (stored in memory for the duration of the request only)', // TODO
- 'add' => 'Add an RSS feed', // TODO
+ 'add' => 'Add a feed', // TODO
'advanced' => 'Advanced', // TODO
'archiving' => 'Archiving', // TODO
'auth' => array(
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index 683785d45..ff1c6f36b 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Accetta i cookie',
'accept_cookies_help' => 'Consenti al server dei feed di impostare dei cookie (salvati in memoria solo per la durata della richiesta)',
- 'add' => 'Aggiungi un Feed RSS',
+ 'add' => 'Aggiungi un Feed',
'advanced' => 'Avanzate',
'archiving' => 'Archiviazione',
'auth' => array(
diff --git a/app/i18n/ja/sub.php b/app/i18n/ja/sub.php
index 0395d78c9..465637307 100644
--- a/app/i18n/ja/sub.php
+++ b/app/i18n/ja/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'クッキーを受け入れる',
'accept_cookies_help' => 'クッキーをこのサーバーから受け入れます(このリクエストだけにメモリへ保存されます)',
- 'add' => 'RSSフィードに追加する',
+ 'add' => 'フィードに追加する',
'advanced' => '高度な設定',
'archiving' => 'アーカイブ',
'auth' => array(
diff --git a/app/i18n/ko/sub.php b/app/i18n/ko/sub.php
index 00190e9c8..470d61478 100644
--- a/app/i18n/ko/sub.php
+++ b/app/i18n/ko/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => '쿠키 사용 동의',
'accept_cookies_help' => '피드 서버가 쿠키를 사용하도록 허용 (요청 지속 기간 동안에만 메모리에 저장)',
- 'add' => 'RSS 피드 추가',
+ 'add' => '피드 추가',
'advanced' => '고급 설정',
'archiving' => '보관',
'auth' => array(
diff --git a/app/i18n/lv/sub.php b/app/i18n/lv/sub.php
index bacc28500..c5e5b388f 100644
--- a/app/i18n/lv/sub.php
+++ b/app/i18n/lv/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Pieņemt sīkfailus',
'accept_cookies_help' => 'Atļaut barotnes serverim iestatīt sīkfailus (atmiņā tiek saglabāti tikai uz pieprasījuma laiku).',
- 'add' => 'Pievienot RSS barotni',
+ 'add' => 'Pievienot barotni',
'advanced' => 'Advancēts',
'archiving' => 'Arhivēšana',
'auth' => array(
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index d624d01c4..38cd24d10 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Cookies accepteren',
'accept_cookies_help' => 'De feed-server toestaan cookies te plaatsen (die alleen voor de duur van de aanvraag in het geheugen worden opgeslagen)',
- 'add' => 'Voeg een RSS-feed toe',
+ 'add' => 'Voeg een feed toe',
'advanced' => 'Geavanceerd',
'archiving' => 'Archiveren',
'auth' => array(
diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php
index 95e810171..4fcc50781 100644
--- a/app/i18n/oc/sub.php
+++ b/app/i18n/oc/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Acceptar los cookies',
'accept_cookies_help' => 'Permetre al servidor del flux de definir de cookies (gardatz en memòria pendent la durada de la requèsta sonque)',
- 'add' => 'Ajustar un flux RSS',
+ 'add' => 'Ajustar un flux',
'advanced' => 'Avançat',
'archiving' => 'Archivar',
'auth' => array(
diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php
index d7fef476c..2593b3648 100644
--- a/app/i18n/pt-br/sub.php
+++ b/app/i18n/pt-br/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Aceitar cookies',
'accept_cookies_help' => 'Permitir que o servidor de Feed defina os cookies (sarmazenados na memória apenas durante a solicitação)',
- 'add' => 'Adicionar um RSS feed',
+ 'add' => 'Adicionar um feed',
'advanced' => 'Avançado',
'archiving' => 'Arquivar',
'auth' => array(
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index 6f4a4da18..a9f802738 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Разрешить файлы cookies',
'accept_cookies_help' => 'Разрешить серверу ленты использовать cookies (файлы будут храниться в памяти лишь в течение запроса)',
- 'add' => 'Добавить RSS-ленту',
+ 'add' => 'Добавить ленту',
'advanced' => 'Дополнительно',
'archiving' => 'Архивирование',
'auth' => array(
diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php
index a3b9856cd..766d75e8f 100644
--- a/app/i18n/sk/sub.php
+++ b/app/i18n/sk/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Prijať cookies',
'accept_cookies_help' => 'Povoliť serveru kanála nastaviť cookies (uložené v pamäti iba počas dopytu)',
- 'add' => 'Pridať RSS kanál',
+ 'add' => 'Pridať kanál',
'advanced' => 'Pokročilé',
'archiving' => 'Archivovanie',
'auth' => array(
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index c08132ce4..ad68d0611 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -40,7 +40,7 @@ return array(
'feed' => array(
'accept_cookies' => 'Cookieleri kabul et',
'accept_cookies_help' => 'Akış sağlayıcısının cookieler oluşturmasına izin ver. (Sadece istek süresince bellekte depolanmak üzere)',
- 'add' => 'RSS akışı ekle',
+ 'add' => 'akışı ekle',
'advanced' => 'Gelişmiş',
'archiving' => 'Arşiv',
'auth' => array(
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index cd0e0464c..7ca3bd3db 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -106,7 +106,7 @@
$error_class = '';
$error_title = '';
- if ($feed->inError() && !$feed->mute()) {
+ if ($feed->inError()) {
$error_class = ' error';
$error_title = _t('sub.feed.error');
}
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 27c6e02ef..47f549faf 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -22,7 +22,7 @@
<?php if (!$this->onlyFeedsWithError && $this->signalError) { ?>
<div>
- <a class="btn" href="<?= _url('subscription', 'index', 'error', '1') ?>"><?= _i('look') ?> <?= _t('sub.feed.show.error') ?></a>
+ <a class="btn btn-icon-text" href="<?= _url('subscription', 'index', 'error', '1') ?>"><?= _i('look') ?> <?= _t('sub.feed.show.error') ?></a>
</div>
<?php } ?>
@@ -34,7 +34,7 @@
?>
<div class="box">
<div class="box-title">
- <a class="configure open-slider" href="<?= _url('category', 'update', 'id', $cat->id()) ?>" data-cat-position="<?= $cat->attributeString('position') ?>"><?= _i('configure') ?></a>
+ <a class="configure open-slider" href="<?= _url('category', 'update', 'id', $cat->id()) ?>" title="<?= _t('gen.action.manage') ?>" data-cat-position="<?= $cat->attributeString('position') ?>"><?= _i('configure') ?></a>
<h2><?= $cat->name() ?><?php if ($cat->kind() === FreshRSS_Category::KIND_DYNAMIC_OPML) { echo " " . _i('opml-dyn'); } ?></h2>
</div>
<ul class="box-content drop-zone scrollbar-thin" dropzone="move" data-cat-id="<?= $cat->id() ?>">
@@ -59,21 +59,25 @@
$empty_title = _t('sub.feed.empty');
}
$mute_class = $feed->mute() ? ' mute' : '';
+
+ $title = $error_title !== '' ? '⚠ ' . $error_title . '&#13;' : '';
+ $title .= $empty_title !== '' ? $empty_title . '&#13;' : '';
+ $title .= $feed->mute() ? '🔇 ' . _t('sub.feed.mute.state_is_muted') : '';
?>
- <li class="item feed<?= $error_class, $empty_class, $mute_class ?>" title="<?= $error_title, $empty_title ?>"
+ <li class="item feed<?= $error_class, $empty_class, $mute_class ?>" title="<?= $title ?>"
draggable="true" data-feed-id="<?= $feed->id() ?>" data-priority="<?= $feed->priority() ?>">
- <a class="configure open-slider" href="<?= _url('subscription', 'feed', 'id', $feed->id()) ?>" title="<?= _t('gen.action.manage') ?>"><?= _i('configure') ?></a>
- <?php if (FreshRSS_Context::userConf()->show_favicons): ?><img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php endif; ?>
- <span class="item-title"><?= $feed->name() ?></span>
+ <a class="configure open-slider" href="<?= _url('subscription', 'feed', 'id', $feed->id()) ?>" title="<?= _t('gen.action.manage') ?>"><?= _i('configure') ?></a><?php
+ if (FreshRSS_Context::userConf()->show_favicons): ?><img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php
+ endif; ?><span class="item-title"><?= $feed->name() ?></span>
</li>
<?php
}
} else {
?>
- <li class="item feed disabled"><div class="alert-warn"><?= _t('sub.category.empty') ?></div></li>
+ <li class="item feed disabled emptyCategory"><div class="alert-warn"><?= _t('sub.category.empty') ?></div></li>
<?php } ?>
<?php if ($cat->kind() != FreshRSS_Category::KIND_DYNAMIC_OPML): ?>
- <li class="item feed">✚ <a href="<?= _url('subscription', 'add', 'cat_id', $cat->id()) ?>"><?= _t('sub.feed.add') ?></a></li>
+ <li class="item feed"><a href="<?= _url('subscription', 'add', 'cat_id', $cat->id()) ?>"><?= _i('add') ?><?= _t('sub.feed.add') ?></a></li>
<?php endif; ?>
</ul>
</div>
@@ -81,7 +85,7 @@
<div class="box visible-semi">
<div class="box-title">
- ✚ <a href="<?= _url('subscription', 'add') ?>"><h2><?= _t('sub.category.add') ?></h2></a>
+ <a href="<?= _url('subscription', 'add') ?>"><?= _i('add') ?> <h2><?= _t('sub.category.add') ?></h2></a>
</div>
<div class="box-content">
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 11:48:54 +0000