8000 [pull] main from miniflux:main by pull[bot] · Pull Request #361 · suhaoGe/miniflux · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/locale/translations/ar_SA.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "إلغاء",
"action.documentation": "التوثيق: %s",
"action.download": "تحميل",
"action.edit": "تعديل",
"action.home_screen": "إضافة إلى الشاشة الرئيسية",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/de_DE.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "abbrechen",
"action.documentation": "Dokumentation: %s",
"action.download": "Herunterladen",
"action.edit": "Bearbeiten",
"action.home_screen": "Zum Startbildschirm hinzufügen",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/el_EL.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "ακύρωση",
"action.documentation": "Τεκμηρίωση: %s",
"action.download": "Λήψη",
"action.edit": "Επεξεργασία",
"action.home_screen": "Προσθήκη στην αρχική οθόνη",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/en_US.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "cancel",
"action.documentation": "Documentation: %s",
"action.download": "Download",
"action.edit": "Edit",
"action.home_screen": "Add to home screen",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/es_ES.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "Cancelar",
"action.documentation": "Documentación: %s",
"action.download": "Descargar",
"action.edit": "Editar",
"action.home_screen": "Añadir a la pantalla principal",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/fi_FI.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "peru",
"action.documentation": "Dokumentaatio: %s",
"action.download": "Lataa",
"action.edit": "Muokkaa",
"action.home_screen": "Lisää aloitusnäytölle",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/fr_FR.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "annuler",
"action.documentation": "Documentation : %s",
"action.download": "Télécharger",
"action.edit": "Modifier",
"action.home_screen": "Ajouter à l'écran d'accueil",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/gl_ES.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "cancelar",
"action.documentation": "Documentación: %s",
"action.download": "Descargar",
"action.edit": "Editar",
"action.home_screen": "Engadir á pantalla de inicio",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/hi_IN.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "रद्द करें",
"action.documentation": "दस्तावेज़ीकरण: %s",
"action.download": "डाउनलोड",
"action.edit": "संपाद करे",
"action.home_screen": "होम स्क्रीन में शामिल करें",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/id_ID.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "batal",
"action.documentation": "Dokumentasi: %s",
"action.download": "Unduh",
"action.edit": "Sunting",
"action.home_screen": "Tambahkan ke beranda",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/it_IT.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "cancella",
"action.documentation": "Documentazione: %s",
"action.download": "Scarica",
"action.edit": "Modifica",
"action.home_screen": "Aggiungere alla schermata Home",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/ja_JP.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "取り消し",
"action.documentation": "ドキュメント: %s",
"action.download": "ダウンロード",
"action.edit": "編集",
"action.home_screen": "ホームスクリーンに追加",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/ko_KR.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "취소",
"action.documentation": "문서: %s",
"action.download": "다운로드",
"action.edit": "편집",
"action.home_screen": "홈 화면에 추가",
10BC8 Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/nan_Latn_pehoeji.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "Chhú-siau",
"action.documentation": "Soat-bêng bûn-kiāⁿ: %s",
"action.download": "Lia̍h----loh-lâi",
"action.edit": "Pian-chi̍p",
"action.home_screen": "Chng tī chú ōe-bīn",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/nl_NL.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "annuleren",
"action.documentation": "Documentatie: %s",
"action.download": "Downloaden",
"action.edit": "Bewerken",
"action.home_screen": "Toevoegen aan startscherm",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/pl_PL.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "anuluj",
"action.documentation": "Dokumentacja: %s",
"action.download": "Pobierz",
"action.edit": "Edytuj",
"action.home_screen": "Dodaj do ekranu głównego",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/pt_BR.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "Cancelar",
"action.documentation": "Documentação: %s",
"action.download": "Baixar",
"action.edit": "Editar",
"action.home_screen": "Voltar para a tela inicial",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/ro_RO.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "abandon",
"action.documentation": "Documentație: %s",
"action.download": "Descărcare",
"action.edit": "Editare",
"action.home_screen": "Adaugă pe ecranul principal",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/ru_RU.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "закрыть",
"action.documentation": "Документация: %s",
"action.download": "Загрузить",
"action.edit": "Изменить",
"action.home_screen": "Добавить на домашний экран",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/tr_TR.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "iptal",
"action.documentation": "Belgeler: %s",
"action.download": "İndir",
"action.edit": "Düzenle",
"action.home_screen": "Ana ekrana ekle",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/uk_UA.json
10BC8
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "скасувати",
"action.documentation": "Документація: %s",
"action.download": "Завантажити",
"action.edit": "Редагувати",
"action.home_screen": "Додати до головного екрану",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/zh_CN.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "取消",
"action.documentation": "文档:%s",
"action.download": "下载",
"action.edit": "编辑",
"action.home_screen": "添加到主屏幕",
Expand Down
1 change: 1 addition & 0 deletions internal/locale/translations/zh_TW.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"action.cancel": "取消",
"action.documentation": "說明文件:%s",
"action.download": "下載",
"action.edit": "編輯",
"action.home_screen": "新增到主螢幕",
Expand Down
14 changes: 7 additions & 7 deletions internal/template/templates/views/add_subscription.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1>
{{ t "form.feed.label.scraper_rules" }}
</label>
&nbsp;
<a href="https://miniflux.app/docs/rules.html#scraper-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://miniflux.app/docs/rules.html#scraper-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.scraper_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -78,7 +78,7 @@ <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1>
{{ t "form.feed.label.rewrite_rules" }}
</label>
&nbsp;
<a href="https://miniflux.app/docs/rules.html#rewrite-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://miniflux.app/docs/rules.html#rewrite-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.rewrite_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -89,7 +89,7 @@ <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1>
{{ t "form.feed.label.urlrewrite_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#rewriteurl-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#rewriteurl-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.urlrewrite_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -100,7 +100,7 @@ <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1>
{{ t "form.feed.label.blocklist_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#feed-filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#feed-filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.blocklist_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -111,7 +111,7 @@ <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1>
{{ t "form.feed.label.keeplist_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#feed-filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#feed-filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.keeplist_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -122,7 +122,7 @@ <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1>
{{ t "form.feed.label.block_filter_entry_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.block_filter_entry_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -133,7 +133,7 @@ <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1>
{{ t "form.feed.label.keep_filter_entry_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.keep_filter_entry_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand Down
18 changes: 9 additions & 9 deletions internal/template/templates/views/edit_feed.html
10BC8
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.scraper_rules" }}
</label>
&nbsp;
<a href="https://miniflux.app/docs/rules.html#scraper-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://miniflux.app/docs/rules.html#scraper-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.scraper_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -136,7 +136,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.rewrite_rules" }}
</label>
&nbsp;
<a href="https://miniflux.app/docs/rules.html#rewrite-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://miniflux.app/docs/rules.html#rewrite-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.rewrite_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -147,7 +147,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.urlrewrite_rules" }}
</label>
&nbsp;
<a href="https://miniflux.app/docs/rules.html#rewriteurl-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://miniflux.app/docs/rules.html#rewriteurl-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.urlrewrite_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -158,7 +158,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.blocklist_rules" }}
</label>
&nbsp;
<a href="https://miniflux.app/docs/rules.html#feed-filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://miniflux.app/docs/rules.html#feed-filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.blocklist_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -169,7 +169,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.keeplist_rules" }}
</label>
&nbsp;
<a href="https://miniflux.app/docs/rules.html#feed-filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://miniflux.app/docs/rules.html#feed-filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.keeplist_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -180,7 +180,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.block_filter_entry_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.block_filter_entry_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -191,7 +191,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.keep_filter_entry_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.keep_filter_entry_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand Down Expand Up @@ -229,7 +229,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.ntfy_priority" }}
</label>
&nbsp;
<a href="https://docs.ntfy.sh/publish/#message-priority" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://docs.ntfy.sh/publish/#message-priority" aria-label="{{ t "action.documentation" (t "form.feed.label.ntfy_priority") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -250,7 +250,7 @@ <h3>{{ t "page.edit_feed.last_parsing_error" }}</h3>
{{ t "form.feed.label.pushover_priority" }}
</label>
&nbsp;
<a href="https://pushover.net/api#priority" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://pushover.net/api#priority" aria-label="{{ t "action.documentation" (t "form.feed.label.pushover_priority") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion internal/template/templates/views/integrations.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h1 id="page-header-title">{{ t "page.integrations.title" }}</h1>
<input type="url" name="apprise_url" id="form-apprise-url" value="{{ .form.AppriseURL }}" placeholder="http://apprise:8080" spellcheck="false">

<label for="form-apprise-services-urls">{{ t "form.integration.apprise_services_url" }}
<a href="https://github.com/caronc/apprise/wiki" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://github.com/caronc/apprise/wiki" aria-label="{{ t "action.documentation" (t "form.integration.apprise_services_url") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</label>
Expand Down
6 changes: 3 additions & 3 deletions internal/template/templates/views/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ <h4>{{ t "page.settings.webauthn.register.error" }}</h4>
<div class="form-label-row">
<label for="form-display-mode">{{ t "form.prefs.label.display_mode" }}</label>
&nbsp;
<a href="https://developer.mozilla.org/en-US/docs/Web/Manifest/display" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href="https://developer.mozilla.org/en-US/docs/Web/Manifest/display" aria-label="{{ t "action.documentation" (t "form.prefs.label.display_mode") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand Down Expand Up @@ -246,7 +246,7 @@ <h4>{{ t "page.settings.webauthn.register.error" }}</h4>
{{ t "form.feed.label.block_filter_entry_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.block_filter_entry_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand All @@ -257,7 +257,7 @@ <h4>{{ t "page.settings.webauthn.register.error" }}</h4>
{{ t "form.feed.label.keep_filter_entry_rules" }}
</label>
&nbsp;
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
<a href=" https://miniflux.app/docs/rules.html#filtering-rules" aria-label="{{ t "action.documentation" (t "form.feed.label.keep_filter_entry_rules") }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }}>
{{ icon "external-link" }}
</a>
</div>
Expand Down
0