From beb163cfd15b93bf664b6a0590e114d4432e3ef9 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Fri, 9 Sep 2022 11:44:59 +0200 Subject: [proxy] allow prompting the user when a package suitable for current site is found; add proxy's options page This commit also causes uncached responses to be forced on all HTTP request to external servers. This is needed to make sure that changes Haketilo makes to HTTP response headers are always picked up by the browser. The drawback is that this increases network traffic causing a performance hit. We might optimize this in the future. --- src/hydrilla/locales/en_US/LC_MESSAGES/messages.po | 130 ++++++++++++++++++--- 1 file changed, 113 insertions(+), 17 deletions(-) (limited to 'src/hydrilla/locales') diff --git a/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po b/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po index 4807509..c8d8831 100644 --- a/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po +++ b/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hydrilla 2.0\n" "Report-Msgid-Bugs-To: koszko@koszko.org\n" -"POT-Creation-Date: 2022-09-08 17:52+0200\n" +"POT-Creation-Date: 2022-09-09 11:30+0200\n" "PO-Revision-Date: 2022-02-12 00:00+0000\n" "Last-Translator: Wojtek Kosior \n" "Language: en_US\n" @@ -190,7 +190,7 @@ msgstr "" "Attempt was made to configure Haketilo Mitmproxy addon with data " "directory path but it has already been configured." -#: src/hydrilla/proxy/addon.py:166 +#: src/hydrilla/proxy/addon.py:165 msgid "err.proxy.unknown_error_{}_try_again" msgstr "" "Haketilo experienced an error. Try again.\n" @@ -205,39 +205,43 @@ msgstr "Requested file could not be found." msgid "api.resource_not_enabled_for_access" msgstr "Requested resource is not enabled for access." -#: src/hydrilla/proxy/state_impl/concrete_state.py:106 +#: src/hydrilla/proxy/state_impl/concrete_state.py:120 msgid "err.proxy.unknown_db_schema" msgstr "" "Haketilo's data files have been altered, possibly by a newer version of " "Haketilo." -#: src/hydrilla/proxy/state_impl/concrete_state.py:110 +#: src/hydrilla/proxy/state_impl/concrete_state.py:124 msgid "err.proxy.no_sqlite_foreign_keys" msgstr "" "This installation of Haketilo uses an SQLite version which does not " "support foreign key constraints." -#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:63 +#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:69 msgid "web_ui.base.title.haketilo_proxy" msgstr "Haketilo" -#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:228 +#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:238 msgid "web_ui.base.nav.home" msgstr "Home" -#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:229 +#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:239 +msgid "web_ui.base.nav.options" +msgstr "Options" + +#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:240 msgid "web_ui.base.nav.packages" msgstr "Packages" -#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:230 +#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:241 msgid "web_ui.base.nav.libraries" msgstr "Libraries" -#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:231 +#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:242 msgid "web_ui.base.nav.repos" msgstr "Repositories" -#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:232 +#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:243 msgid "web_ui.base.nav.load" msgstr "Import from file" @@ -257,7 +261,7 @@ msgstr "" #: src/hydrilla/proxy/web_ui/templates/index.html.jinja:37 msgid "web_ui.home.heading.about_haketilo" -msgstr "About Haketilo" +msgstr "About this tool" #: src/hydrilla/proxy/web_ui/templates/index.html.jinja:41 msgid "web_ui.home.haketilo_is_blah_blah" @@ -268,6 +272,7 @@ msgstr "" "extension but has since been made into an HTTP proxy." #: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:25 +#: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:30 #: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:33 msgid "web_ui.err.file_installation_error" msgstr "Failed to install needed items from repository." @@ -277,6 +282,7 @@ msgid "web_ui.err.uninstall_disallowed" msgstr "This item is required and cannot be uninstalled." #: src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja:33 +#: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:34 #: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:37 msgid "web_ui.err.repo_communication_error" msgstr "Couldn't communicate with repository." @@ -515,15 +521,83 @@ msgstr "Available packages" msgid "web_ui.packages.enabled_version_{}" msgstr "enabled version {}" +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:23 +msgid "web_ui.options.title" +msgstr "Global options" + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:27 +msgid "web_ui.options.heading" +msgstr "Haketilo global options" + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:37 +msgid "web_ui.options.packages_are_used_when_enabled" +msgstr "" +"Hektilo is currently configured to only use packages that were explicitly" +" enabled." + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:40 +msgid "web_ui.options.user_gets_asked_whether_to_enable_package" +msgstr "" +"Hektilo is currently configured to ask whenever a package is found that " +"could be used for the current site." + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:44 +msgid "web_ui.options.packages_are_used_automatically" +msgstr "" +"Hektilo is currently configured to automatically use packages that are " +"available for the current site." + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:51 +msgid "web_ui.options.use_enabled_button" +msgstr "Use when enabled" + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:54 +msgid "web_ui.options.use_question_button" +msgstr "Ask whether to use" + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:57 +msgid "web_ui.options.use_auto_button" +msgstr "Use automatically" + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:70 +msgid "web_ui.options.scripts_are_allowed_by_default" +msgstr "" +"By default Haketilo currently allows JavaScript sent by websites to the " +"browser to execute." + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:73 +msgid "web_ui.options.scripts_are_blocked_by_default" +msgstr "" +"By default Haketilo currently blocks JavaScript sent by websites to the " +"browser from executing." + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:77 +msgid "web_ui.options.allow_scripts_button" +msgstr "Allow scripts" + +#: src/hydrilla/proxy/web_ui/templates/options.html.jinja:78 +msgid "web_ui.options.block_scripts_button" +msgstr "Block scripts" + #: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:24 msgid "web_ui.prompts.auto_install_error.title" msgstr "Installation failure" -#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:41 +#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:29 +msgid "web_ui.err.retry_install.file_installation_error" +msgstr "" +"Another failure occured when retrying to install needed items from " +"repository." + +#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:33 +msgid "web_ui.err.retry_install.repo_communication_error" +msgstr "Another failure occured when retrying to communicate with repository." + +#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:37 msgid "web_ui.prompts.auto_install_error.heading" msgstr "Installation failure" -#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:46 +#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:42 msgid "web_ui.prompts.auto_install_error.package_{}_failed_to_install" msgstr "" "Automatically activated package '{}' failed to install because Haketilo " @@ -531,14 +605,36 @@ msgstr "" "that you do have network connection and try again. You can also choose to" " permanently disable the package." -#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:52 +#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:47 msgid "web_ui.prompts.auto_install_error.disable_button" msgstr "Disable" -#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:57 +#: src/hydrilla/proxy/web_ui/templates/prompts/auto_install_error.html.jinja:48 msgid "web_ui.prompts.auto_install_error.retry_button" msgstr "Retry installation" +#: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:25 +msgid "web_ui.prompts.package_suggestion.title" +msgstr "Package suggestion" + +#: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:38 +msgid "web_ui.prompts.package_suggestion.heading" +msgstr "Package suitable for current site was found" + +#: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:43 +msgid "web_ui.prompts.package_suggestion.do_you_want_to_enable_package_{}" +msgstr "" +"Do you want to enable package '{}'? It will then be used whenever you " +"visit this site." + +#: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:48 +msgid "web_ui.prompts.package_suggestion.disable_button" +msgstr "Disable" + +#: src/hydrilla/proxy/web_ui/templates/prompts/package_suggestion.html.jinja:49 +msgid "web_ui.prompts.package_suggestion.enable_button" +msgstr "Enable" + #: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:23 msgid "web_ui.repos.add.title" msgstr "New repository" @@ -660,11 +756,11 @@ msgstr "Last refreshed on {}." msgid "web_ui.repos.single.refresh_now_button" msgstr "Refresh" -#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:162 +#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:163 msgid "web_ui.repos.item_count_{mappings}_{resources}" msgstr "packages: {mappings}; libraries: {resources}" -#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:173 +#: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:174 msgid "web_ui.repos.single.remove_button" msgstr "Remove repository" -- cgit v1.2.3