From 6d76dfe822f85578538efffb2c4fc864a4a5b73f Mon Sep 17 00:00:00 2001 From: pe1uca <15692727+pe1uca@users.noreply.github.com> Date: Thu, 16 Apr 2026 02:23:43 -0400 Subject: [PATCH] Improve add feed (#8683) * Reorder add feed and add category Implements some suggestions made in https://github.com/FreshRSS/FreshRSS/issues/2014 Changes proposed in this pull request: - Move "Add feed" as the first section of the Subscriptions add page. - Add checkbox "Keep adding feeds" to stay on the "add" page. How to test the feature manually: 1. Navigate to the page "Add a feed or category" 2. See new order. 3. Type URL of a new feed, select a category, and check "Keep adding feeds " 4. See FreshRSS confirm the feed was added while staying in the same page. * Add checkbox to stay in the add feed page * Update i18n * PHP CS * Manually set i18n progress * Change i18n --------- Co-authored-by: Alexandre Alapetite --- README.fr.md | 4 ++-- README.md | 4 ++-- app/Controllers/feedController.php | 14 ++++++++--- app/i18n/cs/sub.php | 1 + app/i18n/de/sub.php | 1 + app/i18n/el/sub.php | 1 + app/i18n/en-US/sub.php | 1 + app/i18n/en/sub.php | 1 + app/i18n/es/sub.php | 1 + app/i18n/fa/sub.php | 1 + app/i18n/fi/sub.php | 1 + app/i18n/fr/sub.php | 1 + app/i18n/he/sub.php | 1 + app/i18n/hu/sub.php | 1 + app/i18n/id/sub.php | 1 + app/i18n/it/sub.php | 1 + app/i18n/ja/sub.php | 1 + app/i18n/ko/sub.php | 1 + app/i18n/lv/sub.php | 1 + app/i18n/nl/sub.php | 1 + app/i18n/oc/sub.php | 1 + app/i18n/pl/sub.php | 1 + app/i18n/pt-BR/sub.php | 1 + app/i18n/pt-PT/sub.php | 1 + app/i18n/ru/sub.php | 1 + app/i18n/sk/sub.php | 1 + app/i18n/tr/sub.php | 1 + app/i18n/uk/sub.php | 1 + app/i18n/zh-CN/sub.php | 1 + app/i18n/zh-TW/sub.php | 1 + app/views/subscription/add.phtml | 38 +++++++++++++++++------------- 31 files changed, 63 insertions(+), 24 deletions(-) diff --git a/README.fr.md b/README.fr.md index d5bd8156d..4bce1cf2f 100644 --- a/README.fr.md +++ b/README.fr.md @@ -240,10 +240,10 @@ Voir le [dépôt dédié à ces extensions](https://github.com/FreshRSS/Extensio | Magyar (hu) | ￭￭￭￭￭￭￭￭￭･ 97% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fhu+%2F%28TODO%7CDIRTY%29%24%2F) | | Bahasa Indonesia (id) | ￭￭￭￭￭￭￭￭￭･ 90% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fid+%2F%28TODO%7CDIRTY%29%24%2F) | | Italiano (it) | ￭￭￭￭￭￭￭￭￭･ 99% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fit+%2F%28TODO%7CDIRTY%29%24%2F) | -| 日本語 (ja) | ￭￭￭￭￭￭￭￭･･ 89% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fja+%2F%28TODO%7CDIRTY%29%24%2F) | +| 日本語 (ja) | ￭￭￭￭￭￭￭￭･･ 88% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fja+%2F%28TODO%7CDIRTY%29%24%2F) | | 한국어 (ko) | ￭￭￭￭￭￭￭￭･･ 82% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fko+%2F%28TODO%7CDIRTY%29%24%2F) | | Latviešu (lv) | ￭￭￭￭￭￭￭･･･ 76% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Flv+%2F%28TODO%7CDIRTY%29%24%2F) | -| Nederlands (nl) | ￭￭￭￭￭￭￭￭￭･ 98% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fnl+%2F%28TODO%7CDIRTY%29%24%2F) | +| Nederlands (nl) | ￭￭￭￭￭￭￭￭￭･ 97% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fnl+%2F%28TODO%7CDIRTY%29%24%2F) | | Occitan (oc) | ￭￭￭￭￭￭￭･･･ 75% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Foc+%2F%28TODO%7CDIRTY%29%24%2F) | | Polski (pl) | ￭￭￭￭￭￭￭￭￭･ 99% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fpl+%2F%28TODO%7CDIRTY%29%24%2F) | | Português (Brasil) (pt-BR) | ￭￭￭￭￭￭￭￭￭･ 98% | [contribuer](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fpt-BR+%2F%28TODO%7CDIRTY%29%24%2F) | diff --git a/README.md b/README.md index 719a0803c..b20f259fb 100644 --- a/README.md +++ b/README.md @@ -136,10 +136,10 @@ See the [repository dedicated to those extensions](https://github.com/FreshRSS/E | Magyar (hu) | ￭￭￭￭￭￭￭￭￭･ 97% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fhu+%2F%28TODO%7CDIRTY%29%24%2F) | | Bahasa Indonesia (id) | ￭￭￭￭￭￭￭￭￭･ 90% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fid+%2F%28TODO%7CDIRTY%29%24%2F) | | Italiano (it) | ￭￭￭￭￭￭￭￭￭･ 99% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fit+%2F%28TODO%7CDIRTY%29%24%2F) | -| 日本語 (ja) | ￭￭￭￭￭￭￭￭･･ 89% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fja+%2F%28TODO%7CDIRTY%29%24%2F) | +| 日本語 (ja) | ￭￭￭￭￭￭￭￭･･ 88% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fja+%2F%28TODO%7CDIRTY%29%24%2F) | | 한국어 (ko) | ￭￭￭￭￭￭￭￭･･ 82% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fko+%2F%28TODO%7CDIRTY%29%24%2F) | | Latviešu (lv) | ￭￭￭￭￭￭￭･･･ 76% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Flv+%2F%28TODO%7CDIRTY%29%24%2F) | -| Nederlands (nl) | ￭￭￭￭￭￭￭￭￭･ 98% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fnl+%2F%28TODO%7CDIRTY%29%24%2F) | +| Nederlands (nl) | ￭￭￭￭￭￭￭￭￭･ 97% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fnl+%2F%28TODO%7CDIRTY%29%24%2F) | | Occitan (oc) | ￭￭￭￭￭￭￭･･･ 75% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Foc+%2F%28TODO%7CDIRTY%29%24%2F) | | Polski (pl) | ￭￭￭￭￭￭￭￭￭･ 99% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fpl+%2F%28TODO%7CDIRTY%29%24%2F) | | Português (Brasil) (pt-BR) | ￭￭￭￭￭￭￭￭￭･ 98% | [contribute](https://github.com/search?q=repo%3AFreshRSS%2FFreshRSS+path%3Aapp%2Fi18n%2Fpt-BR+%2F%28TODO%7CDIRTY%29%24%2F) | diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 81c27a171..e629c09d3 100644 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -334,9 +334,17 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { return; } - // Entries are in DB, we redirect to feed configuration page. - $url_redirect['a'] = 'feed'; - $url_redirect['params']['id'] = '' . $feed->id(); + // Entries are in DB + $keep_adding_feed = Minz_Request::paramBoolean('keep_adding_feed'); + if ($keep_adding_feed) { + // We stay in add feed while maintaining some fields + $url_redirect['params']['cat_id'] = $feed->categoryId(); + $url_redirect['params']['keep_adding_feed'] = $keep_adding_feed; + } else { + // we redirect to feed configuration page. + $url_redirect['a'] = 'feed'; + $url_redirect['params']['id'] = '' . $feed->id(); + } Minz_Request::good( _t('feedback.sub.feed.added', $feed->name()), $url_redirect, diff --git a/app/i18n/cs/sub.php b/app/i18n/cs/sub.php index 37ef8c54e..e12529913 100644 --- a/app/i18n/cs/sub.php +++ b/app/i18n/cs/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => 'Informace', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Minimální počet článků pro ponechání', 'kind' => array( '_' => 'Typ zdroje feedu', diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index 27bc876c5..58c222cd7 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers werden durch einen Zeilenumbruch getrennt. Name und Wert des Headers werden per Doppelpunkt getrennt (z.B: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Icon', // IGNORE 'information' => 'Informationen', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Minimale Anzahl an Artikeln, die behalten wird', 'kind' => array( '_' => 'Art der Feed-Quelle', diff --git a/app/i18n/el/sub.php b/app/i18n/el/sub.php index 56f848f74..dead053d0 100644 --- a/app/i18n/el/sub.php +++ b/app/i18n/el/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => 'Information', // TODO + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Minimum number of articles to keep', // TODO 'kind' => array( '_' => 'Type of feed source', // TODO diff --git a/app/i18n/en-US/sub.php b/app/i18n/en-US/sub.php index 23efaa8af..7845768b9 100644 --- a/app/i18n/en-US/sub.php +++ b/app/i18n/en-US/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // IGNORE 'icon' => 'Icon', // IGNORE 'information' => 'Information', // IGNORE + 'keep_adding_feed' => 'Then add more feeds', // IGNORE 'keep_min' => 'Minimum number of articles to keep', // IGNORE 'kind' => array( '_' => 'Type of feed source', // IGNORE diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index 42d037e3f..39769452d 100644 --- a/app/i18n/en/sub.php +++ b/app/i18n/en/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Icon', 'information' => 'Information', + 'keep_adding_feed' => 'Then add more feeds', 'keep_min' => 'Minimum number of articles to keep', 'kind' => array( '_' => 'Type of feed source', diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index 3e8686cbd..952e1f1a8 100644 --- a/app/i18n/es/sub.php +++ b/app/i18n/es/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Las cabeceras son separadas por un salto de línea, y el nombre y valor de una cabecera son separadas por dos puntos (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Icono', 'information' => 'Información', + 'keep_adding_feed' => 'Seguir añadiendo fuentes', 'keep_min' => 'Número mínimo de artículos a conservar', 'kind' => array( '_' => 'Tipo de origen de la fuente', diff --git a/app/i18n/fa/sub.php b/app/i18n/fa/sub.php index 1fc0027ac..f8a8c6179 100644 --- a/app/i18n/fa/sub.php +++ b/app/i18n/fa/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'سر برگ ها با یک خط جدید از هم جدا می‌شوند و نام و مقدار سربرگ ها با یک دونقطه از هم جدا می‌شوند (مثلاً: پذیرش: application/atom+xml
مجوز: Bearer some-token).', 'icon' => 'آیکون', 'information' => ' اطلاعات', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => ' حداقل تعداد مقالات برای نگهداری', 'kind' => array( '_' => ' نوع منبع خوراک', diff --git a/app/i18n/fi/sub.php b/app/i18n/fi/sub.php index 77e4f86a2..d1cb1f753 100644 --- a/app/i18n/fi/sub.php +++ b/app/i18n/fi/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Otsikot erotellaan rivinvaihdoin, ja nimi ja arvo erotellaan kaksoispisteellä. Esimerkki: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Kuvake', 'information' => 'Tiedot', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Säilytettävien artikkeleiden vähimmäismäärä', 'kind' => array( '_' => 'Syötteen lähteen laji', diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index c74545ec1..7fae285a9 100644 --- a/app/i18n/fr/sub.php +++ b/app/i18n/fr/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Un entête HTTP par ligne, avec le nom et la valeur séparés par un deux-points (ex. : Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Icône', 'information' => 'Informations', + 'keep_adding_feed' => 'Puis ajouter d’autres flux', 'keep_min' => 'Nombre minimum d’articles à conserver', 'kind' => array( '_' => 'Type de source de flux', diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php index 8d0108f99..9297bfaf2 100644 --- a/app/i18n/he/sub.php +++ b/app/i18n/he/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => 'מידע', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'מסםר מינימלי של מאמרים לשמור', 'kind' => array( '_' => 'Type of feed source', // TODO diff --git a/app/i18n/hu/sub.php b/app/i18n/hu/sub.php index 018855222..e6891efda 100644 --- a/app/i18n/hu/sub.php +++ b/app/i18n/hu/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'A fejléceket újsor választja el, a fejléc nevét és értékét kettőspont választja el (pl: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Icon', // IGNORE 'information' => 'Információ', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Megtartandó cikkek minimális száma', 'kind' => array( '_' => 'Hírforrás típusa', diff --git a/app/i18n/id/sub.php b/app/i18n/id/sub.php index 38d6187cc..c95b5cb06 100644 --- a/app/i18n/id/sub.php +++ b/app/i18n/id/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Tajuk dipisahkan dengan baris baru dan nama dan nilai dari tajuk dipisahkan dengan titik dua (contoh: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Ikon', 'information' => 'Informasi', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Jumlah minimum artikel yang harus disimpan', 'kind' => array( '_' => 'Jenis sumber umpan', diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index 4feea6611..ca0f20585 100644 --- a/app/i18n/it/sub.php +++ b/app/i18n/it/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Le intestazioni sono separate da una linea e il nome e il valore di un’intestazione sono separati da due punti (p.es: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Icona', 'information' => 'Informazioni', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Numero minimo di articoli da mantenere', 'kind' => array( '_' => 'Tipo di sorgente del feed', diff --git a/app/i18n/ja/sub.php b/app/i18n/ja/sub.php index d82f736b1..a578f1009 100644 --- a/app/i18n/ja/sub.php +++ b/app/i18n/ja/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'ヘッダは改行で区切られ、ヘッダの名前と値はコロンで区切られます (例: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Icon', // TODO 'information' => 'インフォメーション', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => '最小数の記事は保持されます', 'kind' => array( '_' => 'フィードソースの種類', diff --git a/app/i18n/ko/sub.php b/app/i18n/ko/sub.php index 22000a4c9..9d21fa827 100644 --- a/app/i18n/ko/sub.php +++ b/app/i18n/ko/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => '정보', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => '최소 유지 글 개수', 'kind' => array( '_' => '피드 소스 유형', diff --git a/app/i18n/lv/sub.php b/app/i18n/lv/sub.php index e9aa81916..84eaa05aa 100644 --- a/app/i18n/lv/sub.php +++ b/app/i18n/lv/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => 'Informācija', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Minimālais saglabājamo izstrādājumu skaits', 'kind' => array( '_' => 'Barotnes avota veids', diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index d4c91b27f..d3d7ca088 100644 --- a/app/i18n/nl/sub.php +++ b/app/i18n/nl/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers worden gescheiden door een regeleinde, en de naam en waarde van een header worden gescheiden door een dubbele punt (bijv.: Accept: application/atom+xml
Authorization: Bearer een-token).', 'icon' => 'Pictogram', 'information' => 'Informatie', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Minimum aantal artikelen om te houden', 'kind' => array( '_' => 'Feedbron-type', diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index ccdad10dd..2a04bb5cc 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => 'Informacions', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Nombre minimum d’articles de servar', 'kind' => array( '_' => 'Tipe de font de flux', diff --git a/app/i18n/pl/sub.php b/app/i18n/pl/sub.php index df1c205b5..41740e263 100644 --- a/app/i18n/pl/sub.php +++ b/app/i18n/pl/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Nagłówki są oddzielane przez nową linię, a nazwa i wartość nagłówka są oddzielane przez dwukropek (np: Accept: application/atom+xml
Authorization: Bearer jakiś-token).', 'icon' => 'Ikona', 'information' => 'Informacja', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Minimalna liczba wiadomości do przechowywania', 'kind' => array( '_' => 'Rodzaj źródła kanału', diff --git a/app/i18n/pt-BR/sub.php b/app/i18n/pt-BR/sub.php index bcecf8dd9..f4d0282c2 100644 --- a/app/i18n/pt-BR/sub.php +++ b/app/i18n/pt-BR/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Os cabeçalhos são separados por uma nova linha, e o nome e o valor de um cabeçalho são separados por dois pontos (ex: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Ícone', 'information' => 'Informações', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Número mínimo de artigos para manter', 'kind' => array( '_' => 'Tipo de fonte de alimentação do Feed', diff --git a/app/i18n/pt-PT/sub.php b/app/i18n/pt-PT/sub.php index 976a221e3..e64a882ef 100644 --- a/app/i18n/pt-PT/sub.php +++ b/app/i18n/pt-PT/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => 'Informações', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Número mínimo de artigos para manter', 'kind' => array( '_' => 'Tipo de fonte de alimentação do Feed', diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index a2915eb0e..03b52d5a9 100644 --- a/app/i18n/ru/sub.php +++ b/app/i18n/ru/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Заголовки разделяются новой строкой, имя и значение заголовка разделяются двоеточием (например: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Иконка', 'information' => 'Информация', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Оставлять статей не менее', 'kind' => array( '_' => 'Тип источника ленты', diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php index d9c90117d..8e68c5418 100644 --- a/app/i18n/sk/sub.php +++ b/app/i18n/sk/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => 'Informácia', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Minimálny počet článkov na uchovanie', 'kind' => array( '_' => 'Typ zdroja kanála', diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index e43a6e96d..1eb2f498f 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Başlıklar yeni bir satırla ayrılır ve bir başlığın adı ile değeri iki nokta üst üste ile ayrılır (örneğin: Accept: application/atom+xml
Authorization: Bearer some-token).', 'icon' => 'Icon', // TODO 'information' => 'Bilgi', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Saklanacak minimum makale sayısı', 'kind' => array( '_' => 'Besleme kaynağı türü', diff --git a/app/i18n/uk/sub.php b/app/i18n/uk/sub.php index 55be88c3a..ce440332b 100644 --- a/app/i18n/uk/sub.php +++ b/app/i18n/uk/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'По заголовку на рядок. Назву й значення відокремлено двокрапкою (наприклад, Accept: application/atom+xml
Authorization: Bearer деякий-токен).', 'icon' => 'Піктограма', 'information' => 'Інформація', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => 'Мінімум збережених статей', 'kind' => array( '_' => 'Тип джерела стрічки', diff --git a/app/i18n/zh-CN/sub.php b/app/i18n/zh-CN/sub.php index 6133f5816..f6867be19 100644 --- a/app/i18n/zh-CN/sub.php +++ b/app/i18n/zh-CN/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => '头部之间用换行符分隔，头部名称和值用冒号分隔（例如：Accept: application/atom+xml
Authorization: Bearer some-token）。', 'icon' => '图标', 'information' => '信息', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => '至少保存的文章数', 'kind' => array( '_' => '订阅源类型', diff --git a/app/i18n/zh-TW/sub.php b/app/i18n/zh-TW/sub.php index 88b049b89..bb0ebcdd9 100644 --- a/app/i18n/zh-TW/sub.php +++ b/app/i18n/zh-TW/sub.php @@ -86,6 +86,7 @@ return array( 'http_headers_help' => 'Headers are separated by a newline, and the name and value of a header are separated by a colon (e.g: Accept: application/atom+xml
Authorization: Bearer some-token).', // TODO 'icon' => 'Icon', // TODO 'information' => '信息', + 'keep_adding_feed' => 'Then add more feeds', // TODO 'keep_min' => '至少保存的文章數', 'kind' => array( '_' => '訂閱源類型', diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml index 5df063791..fdef69571 100644 --- a/app/views/subscription/add.phtml +++ b/app/views/subscription/add.phtml @@ -5,23 +5,6 @@ ?>

-

-
- -
- -
- -
-
- -
-
- -
-
-
-

@@ -52,6 +35,10 @@ + @@ -378,6 +365,23 @@
+

+
+ +
+ +
+ +
+
+ +
+
+ +
+
+
+