From 34211e6b0b9e0f47a1bfaa1048e8768270eccbf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Otr=C4=99ba?= Date: Fri, 12 Feb 2021 15:54:06 +0100 Subject: [PATCH 1/7] Polish translation --- plugins/Sidebar/languages/pl.json | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/Sidebar/languages/pl.json b/plugins/Sidebar/languages/pl.json index 93268507..740aaafd 100644 --- a/plugins/Sidebar/languages/pl.json +++ b/plugins/Sidebar/languages/pl.json @@ -1,9 +1,13 @@ { + "Total peers": "Łącznie użytkowników równorzędnych", + "Connected peers": "Łącznie połączonych użytkowników równorzędnych", "Peers": "Użytkownicy równorzędni", "Connected": "Połączony", - "Connectable": "Możliwy do podłączenia", + "Connectable": "Do połączenia", "Connectable peers": "Połączeni użytkownicy równorzędni", + "Copy to clipboard": "Kopiuj do schowka", + "Data transfer": "Transfer danych", "Received": "Odebrane", "Received bytes": "Odebrany bajty", @@ -11,7 +15,7 @@ "Sent bytes": "Wysłane bajty", "Files": "Pliki", - "Total": "Sumarycznie", + "Total": "Łącznie", "Image": "Obraz", "Other": "Inne", "User data": "Dane użytkownika", @@ -36,6 +40,10 @@ "Identity address": "Adres identyfikacyjny", "Change": "Zmień", + "Needs to be updated": "Muszą zostać zaktualizowane", + "Download previous files": "Pobierz wszystkie pliki", + "Help distribute added optional files": "Pomóż rozpowszechniać wszystkie pliki", + "Auto download big file size limit": "Limit dla automatycznego pobierania dużych plików", "Site control": "Kontrola strony", "Update": "Zaktualizuj", @@ -56,11 +64,15 @@ "Site title": "Tytuł strony", "Site description": "Opis strony", "Save site settings": "Zapisz ustawienia strony", + "Save as .zip": "Zapisz jako .zip", + "Browse files": "Przeglądaj pliki", + "Add saved private key": "Dodaj klucz prywatny", "Content publishing": "Publikowanie treści", "Choose": "Wybierz", "Sign": "Podpisz", "Publish": "Opublikuj", + "Sign and publish": "Zapisz i opublikuj", "This function is disabled on this proxy": "Ta funkcja jest zablokowana w tym proxy", "GeoLite2 City database download error: {}!
Please download manually and unpack to data dir:
{}": "Błąd ściągania bazy danych GeoLite2 City: {}!
Proszę ściągnąć ją recznie i wypakować do katalogu danych:
{}", From 785a02ce949420494338f7ecb7ce4ced8b62bdf3 Mon Sep 17 00:00:00 2001 From: sgmoore Date: Sun, 12 Dec 2021 22:22:23 -0800 Subject: [PATCH 2/7] Minor grammar fix Minor grammar fix at line 120 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d8e36a71..3d8f5e71 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network - https:/ ## Why? -* We believe in open, free, and uncensored network and communication. +* We believe in open, free, and uncensored networks and communication. * No single point of failure: Site remains online so long as at least 1 peer is serving it. * No hosting costs: Sites are served by visitors. @@ -117,7 +117,7 @@ There is an official image, built from source at: https://hub.docker.com/r/nofis * Click on **⋮** > **"Create new, empty site"** menu item on the site [ZeroHello](http://127.0.0.1:43110/1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D). * You will be **redirected** to a completely new site that is only modifiable by you! * You can find and modify your site's content in **data/[yoursiteaddress]** directory - * After the modifications open your site, drag the topright "0" button to left, then press **sign** and **publish** buttons on the bottom + * After the modifications open your site, drag the topright "0" button to the left, then press **sign** and **publish** buttons on the bottom Next steps: [ZeroNet Developer Documentation](https://zeronet.io/docs/site_development/getting_started/) From 75421ec82f588be591107bd381e7c7dc82f9bd7b Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Sat, 8 Jan 2022 09:32:27 +0000 Subject: [PATCH 3/7] improve source install instruction - use venv - android/termux instructions --- README.md | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 990dac08..1b0eb6e7 100644 --- a/README.md +++ b/README.md @@ -64,17 +64,34 @@ Following links relate to original ZeroNet: ## How to join -### Install from source +### Install from source (recommended) - - clone this repo - - install python3 and pip if needed (the following instructions are for apt-based distributions) - - `sudo apt update` - - `sudo apt install python3-pip` - - `python3 -m pip install -r requirements.txt` - - Start with: `python3 zeronet.py` - - Open the ZeroHello landing page in your browser by navigating to: http://127.0.0.1:43110/ +#### System dependencies -It is recommended to use python environments instead of installing all dependencies globally (TODO: find/write up the detailed instructions) +##### Generic unix-like + +Install autoconf and other basic development tools, python3 and pip. + +##### Apt-based (debian, ubuntu, etc) + - `sudo apt update` + - `sudo apt install python3-pip build-essential` + +##### Android/Termux + - install [Termux](https://termux.com/) + - in Termux install via `pkg install ` + - `pkg update` + - `pkg install python automake autoconf-dev git` (TODO: check fresh installation whether there are more dependencies to install) + +#### Building python dependencies & running + - clone this repo (NOTE: on Android/Termux you should clone it into "home" folder of Termux, because virtual environment cannot live in `storage/`) + - `python3 -m venv venv` (make python virtual environment, the last `venv` is just a name, if you use different you should replace it in later commands) + - `source venv/bin/activate` (activate environment) + - `python3 -m pip install -r requirements.txt` (install dependencies) + - `python3 zeronet.py` (**run zeronet-conservancy!**) + - open the landing page in your browser by navigating to: http://127.0.0.1:43110/ + - to start it again from fresh terminal, you need to navigate to repo directory and: + - `source venv/bin/activate` + - `python3 zeronet.py` ## Current limitations From 52bd46f3d783646abac6a9076190468317474ea2 Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Sat, 8 Jan 2022 11:05:07 +0000 Subject: [PATCH 4/7] disable update.py as unsafe users should use git to update until there's safety mechanisms in place for upgrading via update zite --- update.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/update.py b/update.py index cf9898f9..a7bd086a 100644 --- a/update.py +++ b/update.py @@ -115,6 +115,13 @@ def update(): if __name__ == "__main__": - sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) # Imports relative to src + print('please update zeronet-conservancy via git. usually it can be done via single commnad') + print(' git pull') + print('although it depends on your branches setup') + print('updating through 1update site is not considered safe at the moment') + print('if you really want to use it, edit this file') - update() + if False: + sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) # Imports relative to src + + update() From 6803379ad2025a52fddbcc73de49d8ba7db9c740 Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Fri, 14 Jan 2022 19:03:48 +0000 Subject: [PATCH 5/7] code improvements in UiRequest --- src/Ui/UiRequest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py index 8f00efcb..0cc27b84 100644 --- a/src/Ui/UiRequest.py +++ b/src/Ui/UiRequest.py @@ -329,7 +329,7 @@ class UiRequest(object): def renderReplacer(m): if m.group(1) in kwargs: - return "%s" % kwargs.get(m.group(1), "") + return str(kwargs[m.group(1)]) else: return m.group(0) @@ -545,13 +545,13 @@ class UiRequest(object): "src/Ui/template/wrapper.html", server_url=server_url, inner_path=inner_path, - file_url=re.escape(file_url), - file_inner_path=re.escape(file_inner_path), + file_url=html.escape(re.escape(file_url)), + file_inner_path=html.escape(re.escape(file_inner_path)), address=site.address, title=html.escape(title), body_style=body_style, meta_tags=meta_tags, - query_string=re.escape(inner_query_string), + query_string=html.escape(re.escape(inner_query_string)), wrapper_key=site.settings["wrapper_key"], ajax_key=site.settings["ajax_key"], wrapper_nonce=wrapper_nonce, From 93b896917eba8a7962c76965fe76432b63fcaf70 Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Fri, 14 Jan 2022 19:21:24 +0000 Subject: [PATCH 6/7] zeronet-conservancy branding --- zeronet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeronet.py b/zeronet.py index dacd2096..2a4194f5 100755 --- a/zeronet.py +++ b/zeronet.py @@ -9,7 +9,7 @@ def main(): sys.exit(0) if "--silent" not in sys.argv: - print("- Starting ZeroNet...") + print("- Starting zeronet-conservancy...") main = None try: @@ -27,7 +27,7 @@ def main(): error_log_path = config.log_dir + "/error.log" traceback.print_exc(file=open(error_log_path, "w")) print("---") - print("Please report it: https://github.com/HelloZeroNet/ZeroNet/issues/new?assignees=&labels=&template=bug-report.md") + print("Please report it: https://github.com/zeronet-conservancy/zeronet-conservancy/issues/new?template=bug-report.md") if sys.platform.startswith("win") and "python.exe" not in sys.executable: displayErrorMessage(err, error_log_path) From 6e4404d280523b6950b33d10abe61cff3726f196 Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Fri, 14 Jan 2022 22:16:51 +0000 Subject: [PATCH 7/7] Update FUNDING.yml --- .github/FUNDING.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index db8c40a5..89c3e46e 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ -custom: https://zeronet.io/docs/help_zeronet/donate/ +liberapay: caryoscelus +custom: https://caryoscelus.github.io/donate/