disply next check at in the feed edit page.

shizunge · shizunge · commit e4d7c6c642d9 · 2021-02-14T21:49:34.000-08:00
diff --git a/locale/translations.go b/locale/translations.go
diff --git a/locale/translations/de_DE.json b/locale/translations/de_DE.json
@@ -122,6 +122,8 @@
     "page.add_feed.choose_feed": "Abonnement auswählen",
     "page.edit_feed.title": "Abonnement bearbeiten: %s",
     "page.edit_feed.last_check": "Letzte Aktualisierung:",
+    "page.edit_feed.next_check": "Nächste Überprüfung:",
+    "page.edit_feed.next_check_note": "Vorbehaltlich globaler Optionen POLLING FREQUENCY und BATCH_SIZE",
     "page.edit_feed.last_modified_header": "Zuletzt geändert:",
     "page.edit_feed.etag_header": "ETag-Kopfzeile:",
     "page.edit_feed.no_header": "Nicht verfügbar",
diff --git a/locale/translations/en_US.json b/locale/translations/en_US.json
@@ -122,6 +122,8 @@
     "page.add_feed.choose_feed": "Choose a Subscription",
     "page.edit_feed.title": "Edit Feed: %s",
     "page.edit_feed.last_check": "Last check:",
+    "page.edit_feed.next_check": "Next check:",
+    "page.edit_feed.next_check_note": "Subject to global options POLLING_FREQUENCY and BATCH_SIZE",
     "page.edit_feed.last_modified_header": "LastModified header:",
     "page.edit_feed.etag_header": "ETag header:",
     "page.edit_feed.no_header": "None",
diff --git a/locale/translations/es_ES.json b/locale/translations/es_ES.json
@@ -122,6 +122,8 @@
     "page.add_feed.choose_feed": "Elegir una suscripción",
     "page.edit_feed.title": "Editar fuente: %s",
     "page.edit_feed.last_check": "Última verificación:",
+    "page.edit_feed.next_check": "Siguiente comprobación:",
+    "page.edit_feed.next_check_note": "Sujeto a opciones globales POLLING FREQUENCY y BATCH_SIZE",
     "page.edit_feed.last_modified_header": "Cabecera de LastModified:",
     "page.edit_feed.etag_header": "Cabecera de ETag:",
     "page.edit_feed.no_header": "Sin cabecera",
diff --git a/locale/translations/fr_FR.json b/locale/translations/fr_FR.json
@@ -122,6 +122,8 @@
     "page.add_feed.choose_feed": "Choisissez un abonnement",
     "page.edit_feed.title": "Modification de l'abonnement : %s",
     "page.edit_feed.last_check": "Dernière vérification :",
+    "page.edit_feed.next_check": "Prochaine vérification :",
+    "page.edit_feed.next_check_note": "Sous réserve des options globales POLLING FREQUENCY et BATCH_SIZE",
     "page.edit_feed.last_modified_header": "En-tête LastModified :",
     "page.edit_feed.etag_header": "En-tête ETag :",
     "page.edit_feed.no_header": "Aucune",
diff --git a/locale/translations/it_IT.json b/locale/translations/it_IT.json
@@ -122,6 +122,8 @@
     "page.add_feed.choose_feed": "Scegli un feed",
     "page.edit_feed.title": "Modifica feed: %s",
     "page.edit_feed.last_check": "Ultimo controllo:",
+    "page.edit_feed.next_check": "Prossimo controllo:",
+    "page.edit_feed.next_check_note": "Soggetto alle opzioni globali POLLING FREQUENCY e BATCH_SIZE",
     "page.edit_feed.last_modified_header": "Header LastModified:",
     "page.edit_feed.etag_header": "Header ETag:",
     "page.edit_feed.no_header": "Nessun header",
diff --git a/locale/translations/ja_JP.json b/locale/translations/ja_JP.json
@@ -122,6 +122,8 @@
     "page.add_feed.choose_feed": "購読を選択",
     "page.edit_feed.title": "フィード(%s)を編集",
     "page.edit_feed.last_check": "最終チェック:",
+    "page.edit_feed.next_check": "次のチェック:",
+    "page.edit_feed.next_check_note": "グローバルオプションPOLLINGFREQUENCYおよびBATCH_SIZEに従います",
     "page.edit_feed.last_modified_header": "最後に更新されたヘッダー:",
     "page.edit_feed.etag_header": "ETag ヘッダー:",
     "page.edit_feed.no_header": " なし",
diff --git a/locale/translations/nl_NL.json b/locale/translations/nl_NL.json
@@ -123,6 +123,8 @@
     "page.add_feed.choose_feed": "Feed kiezen",
     "page.edit_feed.title": "Bewerken van feed: %s",
     "page.edit_feed.last_check": "Laatste update:",
+    "page.edit_feed.next_check": "Volgende controle:",
+    "page.edit_feed.next_check_note": "Onderworpen aan globale opties POLLING FREQUENCY en BATCH_SIZE",
     "page.edit_feed.last_modified_header": "LastModified-header:",
     "page.edit_feed.etag_header": "ETAG-header:",
     "page.edit_feed.no_header": "Geen",
diff --git a/locale/translations/pl_PL.json b/locale/translations/pl_PL.json
@@ -124,6 +124,8 @@
     "page.add_feed.choose_feed": "Wybierz subskrypcję",
     "page.edit_feed.title": "Edytuj kanał: %s",
     "page.edit_feed.last_check": "Ostatnia aktualizacja:",
+    "page.edit_feed.next_check": "Następna kontrola:",
+    "page.edit_feed.next_check_note": "Z zastrzeżeniem opcji globalnych POLLING FREQUENCY i BATCH_SIZE",
     "page.edit_feed.last_modified_header": "Ostatnio zmienione:",
     "page.edit_feed.etag_header": "Nagłówek ETag:",
     "page.edit_feed.no_header": "Brak",
diff --git a/locale/translations/pt_BR.json b/locale/translations/pt_BR.json
@@ -122,6 +122,8 @@
     "page.add_feed.choose_feed": "Escolher uma fonte",
     "page.edit_feed.title": "Editar fonte: %s",
     "page.edit_feed.last_check": "Última verificação:",
+    "page.edit_feed.next_check": "Próxima verificação:",
+    "page.edit_feed.next_check_note": "Sujeito às opções globais POLLING FREQUENCY e BATCH_SIZE",
     "page.edit_feed.last_modified_header": "Cabeçalho 'LastModified':",
     "page.edit_feed.etag_header": "Cabeçalho 'ETag':",
     "page.edit_feed.no_header": "Sem cabeçalhos",
diff --git a/locale/translations/ru_RU.json b/locale/translations/ru_RU.json
@@ -124,6 +124,8 @@
     "page.add_feed.choose_feed": "Выбрать подписку",
     "page.edit_feed.title": "Изменить подписку: %s",
     "page.edit_feed.last_check": "Последняя проверка:",
+    "page.edit_feed.next_check": "Следующая проверка:",
+    "page.edit_feed.next_check_note": "В соответствии с глобальными параметрами POLLING FREQUENCY и BATCH_SIZE",
     "page.edit_feed.last_modified_header": "Заголовок LastModified:",
     "page.edit_feed.etag_header": "Заголовок ETag:",
     "page.edit_feed.no_header": "Отсутствует",
diff --git a/locale/translations/zh_CN.json b/locale/translations/zh_CN.json
@@ -120,6 +120,8 @@
     "page.add_feed.choose_feed": "选择一个订阅",
     "page.edit_feed.title": "编辑源 : %s",
     "page.edit_feed.last_check": "最后检查时间：",
+    "page.edit_feed.next_check": "下次检查时间:",
+    "page.edit_feed.next_check_note": "取决于全局选项POLLING FREQUENCY和BATCH_SIZE",
     "page.edit_feed.last_modified_header": "最后修改的 Header：",
     "page.edit_feed.etag_header": "ETag 标题：",
     "page.edit_feed.no_header": "无",
diff --git a/storage/feed_query_builder.go b/storage/feed_query_builder.go
@@ -151,6 +151,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
 			f.last_modified_header,
 			f.user_id,
 			f.checked_at at time zone u.timezone,
+			f.next_check_at at time zone u.timezone,
 			f.parsing_error_count,
 			f.parsing_error_msg,
 			f.scraper_rules,
@@ -209,6 +210,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
 			&feed.LastModifiedHeader,
 			&feed.UserID,
 			&feed.CheckedAt,
+			&feed.NextCheckAt,
 			&feed.ParsingErrorCount,
 			&feed.ParsingErrorMsg,
 			&feed.ScraperRules,
@@ -250,6 +252,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) {
 		}
 
 		feed.CheckedAt = timezone.Convert(tz, feed.CheckedAt)
+		feed.NextCheckAt = timezone.Convert(tz, feed.NextCheckAt)
 		feed.Category.UserID = feed.UserID
 		feeds = append(feeds, &feed)
 	}
diff --git a/template/html/edit_feed.html b/template/html/edit_feed.html
@@ -92,6 +92,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
     <div class="panel">
         <ul>
             <li><strong>{{ t "page.edit_feed.last_check" }} </strong><time datetime="{{ isodate .feed.CheckedAt }}" title="{{ isodate .feed.CheckedAt }}">{{ elapsed $.user.Timezone .feed.CheckedAt }}</time></li>
+            <li><strong>{{ t "page.edit_feed.next_check" }} </strong><time datetime="{{ isodate .feed.NextCheckAt }}" title="{{ isodate .feed.NextCheckAt }}">{{ .feed.NextCheckAt }}</time><br />({{ t "page.edit_feed.next_check_note" }})</li>
             <li><strong>{{ t "page.edit_feed.etag_header" }} </strong>{{ if .feed.EtagHeader }}{{ .feed.EtagHeader }}{{ else }}{{ t "page.edit_feed.no_header" }}{{ end }}</li>
             <li><strong>{{ t "page.edit_feed.last_modified_header" }} </strong>{{ if .feed.LastModifiedHeader }}{{ .feed.LastModifiedHeader }}{{ else }}{{ t "page.edit_feed.no_header" }}{{ end }}</li>
         </ul>
diff --git a/template/views.go b/template/views.go
