From 6291b598495732d0470bbfb2f26c7025d64e7880 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Fri, 29 Nov 2019 13:48:56 -0800 Subject: Use V to open original link in current tab - To avoid a breaking change, keep v to open the original link in new tab. - People who prefers to open the link in the current tab should use V. --- locale/translations.go | 29 +++++++++++++++++++---------- locale/translations/de_DE.json | 1 + locale/translations/en_US.json | 1 + locale/translations/es_ES.json | 1 + locale/translations/fr_FR.json | 3 ++- locale/translations/it_IT.json | 1 + locale/translations/nl_NL.json | 1 + locale/translations/pl_PL.json | 1 + locale/translations/ru_RU.json | 1 + locale/translations/zh_CN.json | 1 + template/common.go | 3 ++- template/html/common/layout.html | 1 + ui/static/css.go | 24 ++++++++++++------------ ui/static/css/common.css | 2 +- ui/static/js.go | 7 ++++--- ui/static/js/app.js | 8 ++++++-- ui/static/js/bootstrap.js | 1 + 17 files changed, 56 insertions(+), 30 deletions(-) diff --git a/locale/translations.go b/locale/translations.go index fa04cde..d73b6b0 100644 --- a/locale/translations.go +++ b/locale/translations.go @@ -134,6 +134,7 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_next_page": "Zur nächsten Seite gehen", "page.keyboard_shortcuts.open_item": "Gewählten Artikel öffnen", "page.keyboard_shortcuts.open_original": "Original-Artikel öffnen", + "page.keyboard_shortcuts.open_original_same_window": "Öffne den Original-Link in der aktuellen Registerkarte", "page.keyboard_shortcuts.toggle_read_status": "Gewählten Artikel als gelesen/ungelesen markieren", "page.keyboard_shortcuts.mark_page_as_read": "Aktuelle Seite als gelesen markieren", "page.keyboard_shortcuts.download_content": "Vollständigen Inhalt herunterladen", @@ -439,6 +440,7 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_next_page": "Go to next page", "page.keyboard_shortcuts.open_item": "Open selected item", "page.keyboard_shortcuts.open_original": "Open original link", + "page.keyboard_shortcuts.open_original_same_window": "Open original link in current tab", "page.keyboard_shortcuts.toggle_read_status": "Toggle read/unread", "page.keyboard_shortcuts.mark_page_as_read": "Mark current page as read", "page.keyboard_shortcuts.download_content": "Download original content", @@ -724,6 +726,7 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_next_page": "Ir al pagína siguiente", "page.keyboard_shortcuts.open_item": "Abrir el elemento seleccionado", "page.keyboard_shortcuts.open_original": "Abrir el enlace original", + "page.keyboard_shortcuts.open_original_same_window": "Abrir enlace original en la pestaña actual", "page.keyboard_shortcuts.toggle_read_status": "Marcar como leído o no leído", "page.keyboard_shortcuts.mark_page_as_read": "Marcar pagína actual como leída", "page.keyboard_shortcuts.download_content": "Descargar el contento original", @@ -1008,7 +1011,8 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_previous_page": "Page précédente", "page.keyboard_shortcuts.go_to_next_page": "Page suivante", "page.keyboard_shortcuts.open_item": "Ouvrir élément sélectionné", - "page.keyboard_shortcuts.open_original": "Ouvrir lien original", + "page.keyboard_shortcuts.open_original": "Ouvrir le lien original", + "page.keyboard_shortcuts.open_original_same_window": "Ouvrir le lien original dans l'onglet en cours", "page.keyboard_shortcuts.toggle_read_status": "Basculer entre lu/non lu", "page.keyboard_shortcuts.mark_page_as_read": "Marquer la page actuelle comme lu", "page.keyboard_shortcuts.download_content": "Télécharger le contenu original", @@ -1314,6 +1318,7 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_next_page": "Mostra la pagina successiva", "page.keyboard_shortcuts.open_item": "Apri l'articolo selezionato", "page.keyboard_shortcuts.open_original": "Apri la pagina web originale", + "page.keyboard_shortcuts.open_original_same_window": "Apri il link originale nella scheda corrente", "page.keyboard_shortcuts.toggle_read_status": "Cambia lo stato di lettura (letto/da leggere)", "page.keyboard_shortcuts.mark_page_as_read": "Segna la pagina attuale come letta", "page.keyboard_shortcuts.download_content": "Scarica il contenuto integrale", @@ -1600,6 +1605,7 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_next_page": "Volgende pagina", "page.keyboard_shortcuts.open_item": "Open geselecteerde link", "page.keyboard_shortcuts.open_original": "Open originele link", + "page.keyboard_shortcuts.open_original_same_window": "Oorspronkelijke koppeling op huidig tabblad openen", "page.keyboard_shortcuts.toggle_read_status": "Markeer gelezen/ongelezen", "page.keyboard_shortcuts.mark_page_as_read": "Markeer deze pagina als gelezen", "page.keyboard_shortcuts.download_content": "Download originele content", @@ -1904,6 +1910,7 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_next_page": "Przejdź do następnej strony", "page.keyboard_shortcuts.open_item": "Otwórz zaznaczony artykuł", "page.keyboard_shortcuts.open_original": "Otwórz oryginalny artykuł", + "page.keyboard_shortcuts.open_original_same_window": "Otwórz oryginalny link w bieżącej karcie", "page.keyboard_shortcuts.toggle_read_status": "Oznacz jako przeczytane/nieprzeczytane", "page.keyboard_shortcuts.mark_page_as_read": "Zaznacz aktualną stronę jako przeczytaną", "page.keyboard_shortcuts.download_content": "Pobierz oryginalną zawartość", @@ -2214,6 +2221,7 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_previous_page": "Перейти к предыдущей странице", "page.keyboard_shortcuts.go_to_next_page": "Перейти к следующей странице", "page.keyboard_shortcuts.open_item": "Открыть выбранный элемент", + "page.keyboard_shortcuts.open_original_same_window": "Открыть оригинальную ссылку в текущей вкладке", "page.keyboard_shortcuts.open_original": "Открыть оригинальную ссылку", "page.keyboard_shortcuts.toggle_read_status": "Переключатель прочитанного", "page.keyboard_shortcuts.mark_page_as_read": "Отметить текущую страницу прочитанной", @@ -2504,6 +2512,7 @@ var translations = map[string]string{ "page.keyboard_shortcuts.go_to_next_page": "下一页", "page.keyboard_shortcuts.open_item": "打开选定的条目", "page.keyboard_shortcuts.open_original": "打开原始链接", + "page.keyboard_shortcuts.open_original_same_window": "在当前标签页中打开原始链接", "page.keyboard_shortcuts.toggle_read_status": "切换已读/未读状态", "page.keyboard_shortcuts.mark_page_as_read": "标记当前页已读", "page.keyboard_shortcuts.download_content": "下载原始内容", @@ -2674,13 +2683,13 @@ var translations = map[string]string{ } var translationsChecksums = map[string]string{ - "de_DE": "08618fb4a57b1d427ec627ac6c46958bbe16b262a588aa640ad5be8b5e15562d", - "en_US": "a611f133d106bb896bbe15df036838f33b7c7848abbf15829e918233e91783eb", - "es_ES": "f47862bcd9af07d96510c3c24f89f0718f1325cde375954babe73766c62a6eca", - "fr_FR": "0aca382d06630935b905452960a8dceac6f062cd5ebe2967b3837006a282f171", - "it_IT": "60716683ca6d6e311154900508c0f8c389664096f3ab41eb9dd745914d497034", - "nl_NL": "516c91a2be0f0b5c09e0183d61e53bfce2c8f60b8a5cb06593f0170ad6043f99", - "pl_PL": "1fcf9422514fc7ebac57355a50c37d146fad6d19b879ba0dad29c49dfb20e00a", - "ru_RU": "e701297d7c1b456dda066877bc5c6d18c9523f96eff3b4d53d13c6e6bf8f84a6", - "zh_CN": "4da796ef2fdaf1898d2a17be6668b8308daebc97185bf69a698809067856c6ce", + "de_DE": "7b608117d1f832440680696aa796d0c950218e9d2ce0cc7a58c3fd183ce8527f", + "en_US": "7842b6735d09ff9aef21439ae3b99a9bd85f6fe3764e31f77e56261f12a0d4bc", + "es_ES": "2372fe8e0a45125b345904d1c661a81e4e5003240837cf347e78f236809b4121", + "fr_FR": "c9371fc612b4fc75a10e2480d2fe6da1916e45b45d057fedf626eed82d75b5fa", + "it_IT": "d86a4e99e451c0a38810c20326f6b6ac9dcb0810bdef4d4e168c025a3be3b063", + "nl_NL": "ef7e7d20c8548a6ef96b12c3709c4da4e663a2cdc54fcdc8cfaf6f987eb4126a", + "pl_PL": "083af42ed3123e8fcfe54204928b4f27f505bd2fdf9dc2b949f77e0c09c18ce9", + "ru_RU": "c78a1655230afc5c4fb9ebb4ef8970b944e4b8c157db4f8b0cfc29f126de75fa", + "zh_CN": "4c43cab1df36f656a7f8912daf5ef8fbf01a35c87f8569bca3716dbb3117f33a", } diff --git a/locale/translations/de_DE.json b/locale/translations/de_DE.json index 4960836..6989050 100644 --- a/locale/translations/de_DE.json +++ b/locale/translations/de_DE.json @@ -129,6 +129,7 @@ "page.keyboard_shortcuts.go_to_next_page": "Zur nächsten Seite gehen", "page.keyboard_shortcuts.open_item": "Gewählten Artikel öffnen", "page.keyboard_shortcuts.open_original": "Original-Artikel öffnen", + "page.keyboard_shortcuts.open_original_same_window": "Öffne den Original-Link in der aktuellen Registerkarte", "page.keyboard_shortcuts.toggle_read_status": "Gewählten Artikel als gelesen/ungelesen markieren", "page.keyboard_shortcuts.mark_page_as_read": "Aktuelle Seite als gelesen markieren", "page.keyboard_shortcuts.download_content": "Vollständigen Inhalt herunterladen", diff --git a/locale/translations/en_US.json b/locale/translations/en_US.json index 2153243..d342360 100644 --- a/locale/translations/en_US.json +++ b/locale/translations/en_US.json @@ -129,6 +129,7 @@ "page.keyboard_shortcuts.go_to_next_page": "Go to next page", "page.keyboard_shortcuts.open_item": "Open selected item", "page.keyboard_shortcuts.open_original": "Open original link", + "page.keyboard_shortcuts.open_original_same_window": "Open original link in current tab", "page.keyboard_shortcuts.toggle_read_status": "Toggle read/unread", "page.keyboard_shortcuts.mark_page_as_read": "Mark current page as read", "page.keyboard_shortcuts.download_content": "Download original content", diff --git a/locale/translations/es_ES.json b/locale/translations/es_ES.json index de2912a..a73e6d1 100644 --- a/locale/translations/es_ES.json +++ b/locale/translations/es_ES.json @@ -129,6 +129,7 @@ "page.keyboard_shortcuts.go_to_next_page": "Ir al pagína siguiente", "page.keyboard_shortcuts.open_item": "Abrir el elemento seleccionado", "page.keyboard_shortcuts.open_original": "Abrir el enlace original", + "page.keyboard_shortcuts.open_original_same_window": "Abrir enlace original en la pestaña actual", "page.keyboard_shortcuts.toggle_read_status": "Marcar como leído o no leído", "page.keyboard_shortcuts.mark_page_as_read": "Marcar pagína actual como leída", "page.keyboard_shortcuts.download_content": "Descargar el contento original", diff --git a/locale/translations/fr_FR.json b/locale/translations/fr_FR.json index 9df25d6..94fad16 100644 --- a/locale/translations/fr_FR.json +++ b/locale/translations/fr_FR.json @@ -128,7 +128,8 @@ "page.keyboard_shortcuts.go_to_previous_page": "Page précédente", "page.keyboard_shortcuts.go_to_next_page": "Page suivante", "page.keyboard_shortcuts.open_item": "Ouvrir élément sélectionné", - "page.keyboard_shortcuts.open_original": "Ouvrir lien original", + "page.keyboard_shortcuts.open_original": "Ouvrir le lien original", + "page.keyboard_shortcuts.open_original_same_window": "Ouvrir le lien original dans l'onglet en cours", "page.keyboard_shortcuts.toggle_read_status": "Basculer entre lu/non lu", "page.keyboard_shortcuts.mark_page_as_read": "Marquer la page actuelle comme lu", "page.keyboard_shortcuts.download_content": "Télécharger le contenu original", diff --git a/locale/translations/it_IT.json b/locale/translations/it_IT.json index 9d84f96..9a4bb0c 100644 --- a/locale/translations/it_IT.json +++ b/locale/translations/it_IT.json @@ -129,6 +129,7 @@ "page.keyboard_shortcuts.go_to_next_page": "Mostra la pagina successiva", "page.keyboard_shortcuts.open_item": "Apri l'articolo selezionato", "page.keyboard_shortcuts.open_original": "Apri la pagina web originale", + "page.keyboard_shortcuts.open_original_same_window": "Apri il link originale nella scheda corrente", "page.keyboard_shortcuts.toggle_read_status": "Cambia lo stato di lettura (letto/da leggere)", "page.keyboard_shortcuts.mark_page_as_read": "Segna la pagina attuale come letta", "page.keyboard_shortcuts.download_content": "Scarica il contenuto integrale", diff --git a/locale/translations/nl_NL.json b/locale/translations/nl_NL.json index 0765a7d..3fd3ac5 100644 --- a/locale/translations/nl_NL.json +++ b/locale/translations/nl_NL.json @@ -130,6 +130,7 @@ "page.keyboard_shortcuts.go_to_next_page": "Volgende pagina", "page.keyboard_shortcuts.open_item": "Open geselecteerde link", "page.keyboard_shortcuts.open_original": "Open originele link", + "page.keyboard_shortcuts.open_original_same_window": "Oorspronkelijke koppeling op huidig tabblad openen", "page.keyboard_shortcuts.toggle_read_status": "Markeer gelezen/ongelezen", "page.keyboard_shortcuts.mark_page_as_read": "Markeer deze pagina als gelezen", "page.keyboard_shortcuts.download_content": "Download originele content", diff --git a/locale/translations/pl_PL.json b/locale/translations/pl_PL.json index 413945b..5e4d017 100644 --- a/locale/translations/pl_PL.json +++ b/locale/translations/pl_PL.json @@ -131,6 +131,7 @@ "page.keyboard_shortcuts.go_to_next_page": "Przejdź do następnej strony", "page.keyboard_shortcuts.open_item": "Otwórz zaznaczony artykuł", "page.keyboard_shortcuts.open_original": "Otwórz oryginalny artykuł", + "page.keyboard_shortcuts.open_original_same_window": "Otwórz oryginalny link w bieżącej karcie", "page.keyboard_shortcuts.toggle_read_status": "Oznacz jako przeczytane/nieprzeczytane", "page.keyboard_shortcuts.mark_page_as_read": "Zaznacz aktualną stronę jako przeczytaną", "page.keyboard_shortcuts.download_content": "Pobierz oryginalną zawartość", diff --git a/locale/translations/ru_RU.json b/locale/translations/ru_RU.json index 03ba8cb..e47ba9b 100644 --- a/locale/translations/ru_RU.json +++ b/locale/translations/ru_RU.json @@ -130,6 +130,7 @@ "page.keyboard_shortcuts.go_to_previous_page": "Перейти к предыдущей странице", "page.keyboard_shortcuts.go_to_next_page": "Перейти к следующей странице", "page.keyboard_shortcuts.open_item": "Открыть выбранный элемент", + "page.keyboard_shortcuts.open_original_same_window": "Открыть оригинальную ссылку в текущей вкладке", "page.keyboard_shortcuts.open_original": "Открыть оригинальную ссылку", "page.keyboard_shortcuts.toggle_read_status": "Переключатель прочитанного", "page.keyboard_shortcuts.mark_page_as_read": "Отметить текущую страницу прочитанной", diff --git a/locale/translations/zh_CN.json b/locale/translations/zh_CN.json index da0febc..b4e0f31 100644 --- a/locale/translations/zh_CN.json +++ b/locale/translations/zh_CN.json @@ -127,6 +127,7 @@ "page.keyboard_shortcuts.go_to_next_page": "下一页", "page.keyboard_shortcuts.open_item": "打开选定的条目", "page.keyboard_shortcuts.open_original": "打开原始链接", + "page.keyboard_shortcuts.open_original_same_window": "在当前标签页中打开原始链接", "page.keyboard_shortcuts.toggle_read_status": "切换已读/未读状态", "page.keyboard_shortcuts.mark_page_as_read": "标记当前页已读", "page.keyboard_shortcuts.download_content": "下载原始内容", diff --git a/template/common.go b/template/common.go index 2539cad..cb90fe3 100644 --- a/template/common.go +++ b/template/common.go @@ -266,6 +266,7 @@ var templateCommonMap = map[string]string{