March 2021 - tor-commits - lists.torproject.org

[community/staging] Add new section name
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit bc61b18756a80821cc2d22bada21ce91d47f7c07 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 11:36:04 2019 -0400 Add new section name --- .../relay-operations/technical-setup/guard/debianubuntu/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr index c3e1f15..3942b8e 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr @@ -47,8 +47,10 @@ html: two-columns-page.html --- key: 1 --- -section: relay operations +section: Middle/Guard relay --- section_id: relay-operations --- subtitle: How to deploy a middle/Guard relay on Debian/Ubuntu +--- +_discoverable: no

1 0

[community/staging] Hiding BSD updates page
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 7762dde9c04f55e9b9006ebeea74f549eaa01e23 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 07:33:28 2019 -0400 Hiding BSD updates page will-fix: https://dip.torproject.org/web/community/issues/80 --- .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr index bc1dd05..6746558 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -2,7 +2,7 @@ _model: page --- title: Automatic Updates on BSD* --- -_hidden: no +_hidden: yes --- _slug: updates ---

1 0

[community/staging] Update colors in relay guide
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 43c584877255c628207c5bf4f014c845df03030f Author: hiro <hiro(a)torproject.org> Date: Thu Aug 29 15:17:14 2019 +0200 Update colors in relay guide --- .../bridge/centos-rhel-opensuse/contents.lr | 14 ++++++++------ .../technical-setup/bridge/debian-ubuntu/contents.lr | 2 ++ .../technical-setup/bridge/docker/contents.lr | 2 ++ .../technical-setup/bridge/freebsd/contents.lr | 6 ++++-- .../technical-setup/bridge/getting-help/contents.lr | 2 ++ 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index 091dbb5..2d232a7 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -1,10 +1,12 @@ _model: page --- +color: primary +--- title: CentOS / RHEL / OpenSUSE --- body: -### 1. Install tor and dependencies +### 1. Install tor and dependencies * Redhat / RHEL: @@ -19,7 +21,7 @@ yum install git golang tor zypper install tor go git ``` -### 2. Build obfs4proxy and move it into place. +### 2. Build obfs4proxy and move it into place. Heavily outdated versions of git can make `go get` fail, so try upgrading to a more recent git version if you're running into this problem. @@ -71,7 +73,7 @@ ContactInfo <address(a)email.com> Nickname PickANickname ``` - Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. + Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. * Note that both Tor's OR port and its obfs4 port must be reachable. If your bridge is behind a firewall or NAT, make sure to open both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. @@ -83,7 +85,7 @@ Nickname PickANickname To confirm your bridge is running with no issues, you should see something like this: -``` +``` [notice] Your Tor server's identity key fingerprint is '<NICKNAME> <FINGERPRINT>' [notice] Your Tor bridge's hashed identity key fingerprint is '<NICKNAME> <HASHED FINGERPRINT>' [notice] Registered server transport 'obfs4' at '[::]:46396' @@ -91,7 +93,7 @@ To confirm your bridge is running with no issues, you should see something like [notice] Bootstrapped 100%: Done [notice] Now checking whether ORPort <redacted>:3818 is reachable... (this may take up to 20 minutes -- look for log messages indicating success) [notice] Self-testing indicates your ORPort is reachable from the outside. Excellent. Publishing server descriptor. -``` +``` ### 6. Final notes @@ -105,7 +107,7 @@ html: two-columns-page.html --- key: -2 +2 --- color: primary --- diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index d1eeb17..41b4f76 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Debian / Ubuntu --- body: diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 1c36012..f8925a1 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Docker --- body: diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr index d4bb28e..9088fa5 100644 --- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: FreeBSD --- html: two-columns-page.html @@ -47,7 +49,7 @@ Nickname PickANickname Log notice file /var/log/tor/notices.log ``` -Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. +Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. * Note that both Tor's OR port and its obfs4 port must be reachable. If your bridge is behind a firewall or NAT, make sure to open both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. @@ -67,7 +69,7 @@ sysrc tor_enable=YES service tor start ``` -### 5. Monitor your logs +### 5. Monitor your logs To confirm your bridge is running with no issues, you should see something like this in `/var/log/tor/notices.log`: diff --git a/content/relay-operations/technical-setup/bridge/getting-help/contents.lr b/content/relay-operations/technical-setup/bridge/getting-help/contents.lr index 828d351..cb72875 100644 --- a/content/relay-operations/technical-setup/bridge/getting-help/contents.lr +++ b/content/relay-operations/technical-setup/bridge/getting-help/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Getting help --- body:

1 0

[community/staging] Make updates page public
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 4436b334906113f6b3608da10e7c3631f24b00bd Author: gus <gus(a)torproject.org> Date: Thu Aug 29 11:36:42 2019 -0400 Make updates page public --- .../technical-setup/guard/debianubuntu/updates/contents.lr | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr index 7d9645f..7053759 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr @@ -1,11 +1,9 @@ _model: page --- -title: Automatic updates on Debian and Ubuntu +title: Debian and Ubuntu --- _discoverable: no --- -_hidden: yes ---- body: # 1. Install the required packages @@ -54,8 +52,8 @@ html: two-columns-page.html --- key: 1 --- -section: Relays Operations +section: Automatic Updates --- -section_id: relays-operations +section_id: automatic-updates --- _slug: updates

1 0

[community/staging] Change section name
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 0eeef42555ff8e0fe7087b6513f50b9d263c7664 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 11:45:59 2019 -0400 Change section name --- content/relay-operations/technical-setup/guard/fedora/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay-operations/technical-setup/guard/fedora/contents.lr index b89a8ce..8182829 100644 --- a/content/relay-operations/technical-setup/guard/fedora/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr @@ -38,7 +38,7 @@ html: two-columns-page.html --- key: 3 --- -section: relay operations +section: Middle/Guard relay --- section_id: relay-operations ---

1 0

[community/staging] Add new section name
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 94ad20a34044d3326ee9c89d323c11b58eba9883 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 11:42:19 2019 -0400 Add new section name --- content/relay-operations/technical-setup/guard/centosrhel/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr index 47ee38c..18eb67a 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr @@ -57,7 +57,7 @@ html: two-columns-page.html --- key: 5 --- -section: relay operations +section: Middle/Guard relay --- section_id: relay-operations ---

1 0

[community/staging] Change page title and section, make lektor generate page
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit c69e36915f954aa495fcc2b17f1033803b2bde81 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 11:44:53 2019 -0400 Change page title and section, make lektor generate page --- .../technical-setup/guard/centosrhel/updates/contents.lr | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr index fb1db91..543587d 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr @@ -1,8 +1,6 @@ _model: page --- -title: Automatic Updates on RPM Distributions ---- -_hidden: yes +title: RPM Distributions --- body: @@ -59,9 +57,9 @@ html: two-columns-page.html --- key: 1 --- -section: Relay Operations +section: Automatic Updates --- -section_id: relay-operations +section_id: automatic-updates --- _slug: updates ---

1 0

[community/slideshow] Use string for localization
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 62bc0a3a324c3f40002d3578b6b339523f727c6e Author: hiro <hiro(a)torproject.org> Date: Sun Mar 21 20:06:09 2021 +0100 Use string for localization --- content/outreach/contents.lr | 2 +- templates/hero.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/outreach/contents.lr b/content/outreach/contents.lr index cd2b5fe..9cf4a65 100644 --- a/content/outreach/contents.lr +++ b/content/outreach/contents.lr @@ -1,4 +1,4 @@ -section: Community +section: community --- section_id: outreach --- diff --git a/templates/hero.html b/templates/hero.html index f02d70c..5c215c8 100644 --- a/templates/hero.html +++ b/templates/hero.html @@ -2,7 +2,7 @@ <div class="row"> <div class="col-12 content-center"> <div class="row"> - <h6 class="mx-auto text-white pt-3">{{ _(Community) }}</h6> + <h6 class="mx-auto text-white pt-3">{{ _('Community') }}</h6> </div> <div class="row"> <h2 class="mx-auto display-3 text-white">{% block title %}{{ this.title }}{% endblock %}</h2>

1 0

[community/slideshow] Update slideshow template with ordering for localization
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 4fd0dde667b2172c1b9383bdcbab32e6879022af Author: hiro <hiro(a)torproject.org> Date: Sun Mar 21 19:52:13 2021 +0100 Update slideshow template with ordering for localization --- assets/static/revealjs/dist/theme/tor.css | 21 ++++++++++++++++++++ lego | 2 +- templates/slideshow.html | 32 ++++++++++++++++--------------- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/assets/static/revealjs/dist/theme/tor.css b/assets/static/revealjs/dist/theme/tor.css index 0ff2e67..7dc1a42 100644 --- a/assets/static/revealjs/dist/theme/tor.css +++ b/assets/static/revealjs/dist/theme/tor.css @@ -313,6 +313,19 @@ section.has-dark-background, section.has-dark-background h1, section.has-dark-ba .footer { background-color: #683086; + min-height: 10%; +} + +.footer img { + position:relative; + min-height: 1.5em; + padding: 5px; +} + +.footer a { + font-size: 1.5em !important; + padding: 5px; + top: 10px; } /********************************************* @@ -329,3 +342,11 @@ section.has-dark-background, section.has-dark-background h1, section.has-dark-ba hr.dark { border: 5px solid #683086; } + +.order-last { + text-align: left !important; +} + +.order-first { + text-align: right !important; +} diff --git a/lego b/lego index 4cb4064..842b8e9 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 4cb4064486b300f04573b4dde54afa6835dafa63 +Subproject commit 842b8e924653b41b382d9a26eb33ecb4f4638553 diff --git a/templates/slideshow.html b/templates/slideshow.html index f1d6065..c6b330e 100644 --- a/templates/slideshow.html +++ b/templates/slideshow.html @@ -16,24 +16,26 @@ <body> <div class="reveal">  - <div class="slides"> - <section class="title" data-background-color="#683086" data-background-image="{{ this.image|asseturl }}" data-background-position="right bottom" data-background-size="3em"> - <h3>{{ this.title }}</h3> - <hr /> - <h4>{{ this.subtitle }}</h4> - <p>{{ this.author }}</p> - </section> + <div class="slides {{ bag('alternatives', this.alt, 'order') }}"> + <section> + <section class="title" data-background-color="#683086" data-background-image="{{ this.image|asseturl }}" data-background-position="right bottom" data-background-size="3em"> + <h3>{{ this.title }}</h3> + <hr /> + <h4>{{ this.subtitle }}</h4> + <p>{{ this.author }}</p> + </section> - {{ this.slides }} + {{ this.slides }} - <div class="footer"> - <div class="left"> - <a href="https://torproject.org">torproject.org</a> - </div> - <div class="right"> - <img src="{{ '/static/images/tor-logo/White.png'|asseturl }}"> + <div class="footer"> + <div class="left"> + <a href="https://torproject.org">torproject.org</a> + </div> + <div class="right"> + <img src="{{ '/static/images/tor-logo/White.png'|asseturl }}"> + </div> </div> - </div> + </section> </div> </div>

1 0

[lego/master] Update i18n plugin
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 842b8e924653b41b382d9a26eb33ecb4f4638553 Author: hiro <hiro(a)torproject.org> Date: Sun Mar 21 19:05:29 2021 +0100 Update i18n plugin --- packages/i18n/.gitignore | 61 ++++++++++++++++++++++++++++++++++++++++++++ packages/i18n/lektor_i18n.py | 44 +++++++++++++++++++++++++++----- packages/i18n/setup.py | 2 +- 3 files changed, 100 insertions(+), 7 deletions(-) diff --git a/packages/i18n/.gitignore b/packages/i18n/.gitignore new file mode 100644 index 0000000..ba2b311 --- /dev/null +++ b/packages/i18n/.gitignore @@ -0,0 +1,61 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover +.hypothesis/ + +# Translations +*.mo + +# Django stuff: +*.log + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +#Ipython Notebook +.ipynb_checkpoints diff --git a/packages/i18n/lektor_i18n.py b/packages/i18n/lektor_i18n.py index 34fa20a..400878d 100644 --- a/packages/i18n/lektor_i18n.py +++ b/packages/i18n/lektor_i18n.py @@ -119,7 +119,7 @@ class Translations(): for msg, paths in self.translations.items(): result += "#: %s\n"%" ".join(paths) - for token, repl in {'\n': '\\n', '\t': '\\t', '"': '\\"'}.items(): + for token, repl in {'\\': '\\\\', '\n': '\\n', '\t': '\\t', '"': '\\"'}.items(): msg = msg.replace(token, repl) result+='msgid "%s"\n' % msg result+='msgstr ""\n\n' @@ -223,8 +223,36 @@ class I18NPlugin(Plugin): name = u'i18n' description = u'Internationalisation helper' + def translate_tag(self, s, *args, **kwargs): + if not self.enabled: + return s # no operation + s = s.strip() + ctx = get_ctx() + if self.content_language==ctx.locale: + translations.add(s,'(dynamic)') + reporter.report_debug_info('added to translation memory (dynamic): ', truncate(s)) + return s + else: + translator = gettext.translation("contents", join(self.i18npath,'_compiled'), languages=[ctx.locale], fallback = True) + return trans(translator, s) + + def choose_language(self, l, language, fallback='en', attribute='language'): + """Will return from list 'l' the element with attribute 'attribute' set to given 'language'. + If none is found, will try to return element with attribute 'attribute' set to given 'fallback'. + Else returns None.""" + language=language.strip().lower() + fallback=fallback.strip().lower() + for item in l: + if item[attribute].strip().lower()==language: + return item + # fallback + for item in l: + if item[attribute].strip().lower()==fallback: + return item + return None + #pylint: disable=attribute-defined-outside-init - def on_setup_env(self): + def on_setup_env(self, **extra): """Setup `env` for the plugin""" # Read configuration self.enabled = self.get_config().get('enable', 'true') in ('true','True','1') @@ -240,7 +268,7 @@ class I18NPlugin(Plugin): self.env.jinja_env.add_extension('jinja2.ext.i18n') self.env.jinja_env.policies['ext.i18n.trimmed'] = True # do a .strip() self.env.jinja_env.install_gettext_translations(TemplateTranslator(self.i18npath)) - # ToDo: is this stil required + # ToDo: is this still required try: self.translations_languages=self.get_config().get('translations').replace(' ','').split(',') except AttributeError: @@ -249,8 +277,12 @@ class I18NPlugin(Plugin): if not self.content_language in self.translations_languages: self.translations_languages.append(self.content_language) + self.env.jinja_env.filters['translate'] = self.translate_tag + self.env.jinja_env.globals['_'] = self.translate_tag + self.env.jinja_env.globals['choose_language'] = self.choose_language + def process_node(self, fields, sections, source, zone, root_path): - """For a give node (), identify all fields to translate, and add new + """For a given node (), identify all fields to translate, and add new fields to translations memory. Flow blocks are handled recursively.""" for field in fields: if ('translate' in field.options) \ @@ -326,7 +358,7 @@ class I18NPlugin(Plugin): return newblocks - def on_before_build(self, builder, build_state, source, prog): + def on_before_build(self, builder, build_state, source, prog, **extra): """Before building a page, produce all its alternatives (=translated pages) using the gettext translations available.""" if self.enabled and isinstance(source,Page) and source.alt in (PRIMARY_ALT, self.content_language): @@ -382,7 +414,7 @@ class I18NPlugin(Plugin): return '\n\n'.join(result) - def on_after_build(self, builder, build_state, source, prog): + def on_after_build(self, builder, build_state, source, prog, **extra): if self.enabled and isinstance(source,Page): try: text = source.contents.as_text() diff --git a/packages/i18n/setup.py b/packages/i18n/setup.py index 388d1d4..2f30cf1 100644 --- a/packages/i18n/setup.py +++ b/packages/i18n/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name='lektor-i18n', - version='0.2', + version='0.4.4', author=u'NumeriCube', author_email='support(a)numericube.com', url='https://github.com/numericube/lektor-i18n-plugin',

1 0