A free, self-hostable news aggregator…
Improve add feed (#8683)
pe1uca6d76dfe822f8
diff --git a/README.fr.md b/README.fr.mdindex 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.mdindex 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.phpindex 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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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', // TODOdiff --git a/app/i18n/en-US/sub.php b/app/i18n/en-US/sub.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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', // IGNOREdiff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 1fc0027ac..f8a8c6179 100644--- a/app/i18n/fa/sub.php+++ b/app/i18n/fa/sub.php@@ -86,6 +86,7 @@ return array('http_headers_help' => 'سر برگ ها با یک خط جدید از هم جدا میشوند و نام و مقدار سربرگ ها با یک دونقطه از هم جدا میشوند (مثلاً: <kbd><code>پذیرش: application/atom+xml<br />مجوز: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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. : <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // TODO'icon' => 'Icon', // TODO'information' => 'מידע',+ 'keep_adding_feed' => 'Then add more feeds', // TODO'keep_min' => 'מסםר מינימלי של מאמרים לשמור','kind' => array('_' => 'Type of feed source', // TODOdiff --git a/app/i18n/hu/sub.php b/app/i18n/hu/sub.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex d82f736b1..a578f1009 100644--- a/app/i18n/ja/sub.php+++ b/app/i18n/ja/sub.php@@ -86,6 +86,7 @@ return array('http_headers_help' => 'ヘッダは改行で区切られ、ヘッダの名前と値はコロンで区切られます (例: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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.phpindex 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.: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer een-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer jakiś-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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.phpindex a2915eb0e..03b52d5a9 100644--- a/app/i18n/ru/sub.php+++ b/app/i18n/ru/sub.php@@ -86,6 +86,7 @@ return array('http_headers_help' => 'Заголовки разделяются новой строкой, имя и значение заголовка разделяются двоеточием (например: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).','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.phpindex 55be88c3a..ce440332b 100644--- a/app/i18n/uk/sub.php+++ b/app/i18n/uk/sub.php@@ -86,6 +86,7 @@ return array('http_headers_help' => 'По заголовку на рядок. Назву й значення відокремлено двокрапкою (наприклад, <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer деякий-токен</code></kbd>).','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.phpindex 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' => '头部之间用换行符分隔,头部名称和值用冒号分隔(例如:<kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>)。','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.phpindex 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: <kbd><code>Accept: application/atom+xml<br />Authorization: Bearer some-token</code></kbd>).', // 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.phtmlindex 5df063791..fdef69571 100644--- a/app/views/subscription/add.phtml+++ b/app/views/subscription/add.phtml@@ -5,23 +5,6 @@?><main class="post drop-section" data-auto-leave-validation="1"><h1><?= _t('sub.menu.add') ?></h1>- <h2><?= _t('sub.title.add_category') ?></h2>- <form action="<?= _url('category', 'create') ?>" method="post">- <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />- <div class="form-group">- <label class="group-name" for="new-category"><?= _t('sub.category') ?></label>- <div class="group-controls">- <input id="new-category" name="new-category" type="text" required="required" autocomplete="off" />- </div>- </div>-- <div class="form-group form-actions">- <div class="group-controls">- <button type="submit" class="btn btn-important"><?= _t('gen.action.add') ?></button>- </div>- </div>- </form>-<h2><?= _t('sub.title.add_feed') ?></h2><form id="add_rss" method="post" action="<?= _url('feed', 'add') ?>" autocomplete="off">@@ -52,6 +35,10 @@</option><?php } ?></select>+ <label for="keep_adding_feed">+ <input type="checkbox" name="keep_adding_feed" id="keep_adding_feed" value="1" <?= Minz_Request::paramBoolean('keep_adding_feed') ? "checked" : "" ?> />+ <?= _t('sub.feed.keep_adding_feed') ?>+ </label></div></div>@@ -378,6 +365,23 @@</div></form>+ <h2><?= _t('sub.title.add_category') ?></h2>+ <form action="<?= _url('category', 'create') ?>" method="post">+ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />+ <div class="form-group">+ <label class="group-name" for="new-category"><?= _t('sub.category') ?></label>+ <div class="group-controls">+ <input id="new-category" name="new-category" type="text" required="required" autocomplete="off" />+ </div>+ </div>++ <div class="form-group form-actions">+ <div class="group-controls">+ <button type="submit" class="btn btn-important"><?= _t('gen.action.add') ?></button>+ </div>+ </div>+ </form>+<h2><?= _t('sub.title.add_dynamic_opml') ?><?= _i('opml-dyn') ?>