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

[community/staging] Fix spelling mistakes and improve phrasing.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit f0439f0b1cec908bd8222eee1da79c32987abdca Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Nov 12 08:58:14 2019 -0800 Fix spelling mistakes and improve phrasing. --- .../technical-setup/exit/contents.lr | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/content/relay-operations/technical-setup/exit/contents.lr b/content/relay-operations/technical-setup/exit/contents.lr index ee0148c..43d6f39 100644 --- a/content/relay-operations/technical-setup/exit/contents.lr +++ b/content/relay-operations/technical-setup/exit/contents.lr @@ -60,29 +60,29 @@ ExitRelay 1 ## DNS on Exit Relays Unlike other types of relays, exit relays also do DNS resolution for Tor clients. -DNS resolution on exit relays is crucial for Tor clients, it should be reliable and fast by using caching. +DNS resolution on exit relays is crucial for Tor clients and it should be reliable and fast by using caching. -* DNS resolution can have a significant impact on the performance and reliability your exit relay provides. - Poor DNS performance will result in less traffic going through your exit relay. -* Don't use any of the big DNS resolvers as your primary or fallback DNS resolver to avoid centralization (Google, OpenDNS, Quad9, Cloudflare, 4.2.2.1-6) -* We recommend running a local caching and DNSSEC-validating resolver without using any forwarders (specific instructions follow bellow for each operating systems) - * If you want to add a second DNS resolver as a fallback to your /etc/resolv.conf configuration, try to choose a resolver within your autonomous system and make sure it is not your first entry in that file (the first entry should be your local resolver) - * If a local resolver like unbound is not an option for you try to use a resolver that your provider runs in the same autonomous system (to find out if an IP address is in the same AS as your relay, you can look it up, using for example https://bgp.he.net) -* Try to avoid adding too many resolvers to your /etc/resolv.conf file to limit exposure on an AS-level (try to not use more than two entries) +* DNS resolution can have a significant impact on the performance and reliability that your exit relay provides. +* Don't use any of the big DNS resolvers (Google, OpenDNS, Quad9, Cloudflare, 4.2.2.1-6) as your primary or fallback DNS resolver to avoid centralization. +* We recommend running a local caching and DNSSEC-validating resolver without using any forwarders (specific instructions follow below, for various operating systems). + * If you want to add a second DNS resolver as a fallback to your /etc/resolv.conf configuration, choose a resolver within your autonomous system and make sure that it is not your first entry in that file (the first entry should be your local resolver). + * If a local resolver like unbound is not an option for you, use a resolver that your provider runs in the same autonomous system (to find out if an IP address is in the same AS as your relay, you can look it up using [bgp.he.net](https://bgp.he.net)). +* Avoid adding more than two resolvers to your /etc/resolv.conf file to limit AS-level exposure of DNS queries. -There are multiple options for DNS server software, unbound has become a popular one but **feel free to use any other you are comfortable with**. -When choosing your DNS resolver software try to ensure it supports DNSSEC validation and QNAME minimisation (RFC7816). -In every case the software should be installed using the OS package manager to ensure it is updated with the rest of the system. +There are multiple options for DNS server software. [Unbound](https://nlnetlabs.nl/projects/unbound/about/) has become +a popular one but feel free to use any other software that you are comfortable with. +When choosing your DNS resolver software, make sure that it supports DNSSEC validation and QNAME minimization (RFC7816). +Install the resolver software over your operating system's package manager, to ensure that it is updated automatically. -By using your own DNS resolver you are less vulnerable to DNS-based censorship that your upstream resolver might impose. +By using your own DNS resolver, you are less vulnerable to DNS-based censorship that your upstream resolver might impose. -Here follow specific instructions on how to install and configure unbound on your exit - a DNSSEC-validating and caching resolver. unbound has many configuration and tuning nobs but we try to keep these instructions as simple and short as possible and the basic setup will do just fine for most operators. +Below are instructions on how to install and configure unbound – a DNSSEC-validating and caching resolver – on your exit relay. Unbound has many configuration and tuning knobs but we keep these instructions simple and short; the basic setup will do just fine for most operators. -After switching to unbound verify it works as expected by resolving a valid hostname, if it does not work, you can restore the old resolv.conf file. +After switching to unbound, verify it works as expected by resolving a valid hostname. If it does not work, you can restore your old resolv.conf file. ### Debian/Ubuntu -The following 3 commands install unbound, backup your DNS configuration and tell the system to use the local unbound: +The following three commands install unbound, backup your DNS configuration, and tell the system to use the local unbound: ``` apt install unbound @@ -96,8 +96,8 @@ To avoid that the configuration gets changed (for example by the DHCP client): chattr +i /etc/resolv.conf ``` -The Debian configuration ships with QNAME minimisation (RFC7816) enabled by default so you don't need to enable it explicitly. -The unbound resolver you just installed does also DNSSEC validation. +The Debian configuration ships with QNAME minimization (RFC7816) enabled by default, so you don't need to enable it explicitly. +The unbound resolver you just installed also does DNSSEC validation. ### CentOS/RHEL @@ -141,7 +141,7 @@ chattr +i /etc/resolv.conf ### FreeBSD -FreeBSD ships unbound in the base system but the one in ports is usually following upstream more closely so we install the unbound package: +FreeBSD ships unbound in the base system but the one in ports is usually following upstream more closely, so we install the unbound package: ``` pkg install unbound

1 0

[community/staging] Update lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 3275b534bbe477311c74f7e2ddd58884e5d7c3d3 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 25 18:14:46 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index c77ce2b..7f196bc 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit c77ce2bfb2262e87a00566184a7193bf491445f5 +Subproject commit 7f196bc35e6bc2555e9a13ee024f322840433954

1 0

[community/staging] Update lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 512dcdce9e586e9784bd7034d89b73a74f55adea Author: hiro <hiro(a)torproject.org> Date: Wed Nov 20 18:41:10 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index bbf8108..c77ce2b 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit bbf8108b622ef4c8b1d96b9790fc3e77aa1c030f +Subproject commit c77ce2bfb2262e87a00566184a7193bf491445f5

1 0

[community/staging] slight grammar and flow edits
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 0b1d62e945bc050583c227e452e09cc3cfb31d2f Author: Stephanie A. Whited <steph(a)torproject.org> Date: Thu Oct 31 19:11:46 2019 +0000 slight grammar and flow edits --- content/training/risks/contents.lr | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/content/training/risks/contents.lr b/content/training/risks/contents.lr index c1fea57..967ab61 100644 --- a/content/training/risks/contents.lr +++ b/content/training/risks/contents.lr @@ -5,27 +5,27 @@ title: Risks body: To our knowledge, no Tor trainer has ever faced consequences as a result of training others or speaking about Tor. -However, in some countries and in certain circumstances, it's possible that a simply gathering of human rights defenders could be very risky, illegal or even subject of imprisonment, physical assaults, large fines, threats, placement on government watch lists and targeting for surveillance. +However, in some countries and in certain circumstances, it's possible that simply a gathering of human rights defenders could be risky, illegal, or even subject someone to imprisonment, physical assaults, large fines, threats, placement on government watch lists, and targeting for surveillance. -If you want to run a Tor training for the first time and you don't know how to assess the political and social environment, we strongly encourage you read this document and, in case of doubt, to reach out Tor Community Team privately. +If you want to run a Tor training for the first time and you don't know how to assess the political and social environment, we strongly encourage you read this document and, in case of doubt, to reach out to the Tor Community Team privately. -Some of potential risks of running a digital security training are only valid in specific contexts. -Therefore the potential risks associated to running a Tor training depend on: +Some potential risks of running a digital security training are only valid in specific contexts. +The potential risks associated with running a Tor training depend on: 1. **Your threat model.** A high-profile activist already under a lot of surveillance, for example, might attract more attention when reaching out other activists to run a digital security training. -2. **The laws and regulations in the country.** Best to consult with local lawyers and local freedom of expression organizations, and learn whether your country has a record in prosecuting individuals engaging in similar types of activities. +2. **The laws and regulations in the country.** Consult with local lawyers and local freedom of expression organizations and learn whether your country has a record in prosecuting individuals engaging in similar types of activities. 3. **The types of training.** Not all trainings carry the same weight in terms of potential risk. - For example, talking about privacy on digital age might be appreciable, but teaching how to circumvent government censorship could be a serious felony. -4. **The audience.** Gathering university students might not attract attention, but in case of a group of journalists working on leaked documents about government corruption, you might need to be extra careful on how to reach out them in a private way. -5. **The training venue.** Running a Tor training in some spaces could expose your participants identity. - Ideally, you should use a private space that you can control the participants entrance. - Check before the training if participants are comfortable on revealing their identity to a third party, if it's the case. + For example, talking about privacy in the digital age might be appreciable, but teaching how to circumvent government censorship could be a serious felony. +4. **The audience.** Gathering university students might not attract attention, but if you're gathering a group of journalists working with leaked documents about government corruption, you might need to be extra careful on how to reach out them in a private way. +5. **The training venue.** Running a Tor training in some spaces could expose your participants' identities. + Ideally, you should use a private space where you control the participants' entrance. + If the space isn't private, check before the training to find out if participants are comfortable revealing their identity to a third party. ## Evaluating risks Some questions you may want to answer before running a digital security training include: -* Has anyone in my country ever been criminalized based on their internet activity? (This does not necessarily need to be specific to digital security training or use of Tor) +* Has anyone in my country ever been criminalized based on their internet activity? (This does not necessarily need to be specific to digital security training or use of Tor.) * Are there laws in my country that require Internet Service Providers (ISPs) to track my online activity? * Is it illegal for me to access certain websites? * Does my country prohibit me from using: @@ -34,11 +34,11 @@ Some questions you may want to answer before running a digital security training Note, this is not an exhaustive list of questions. -Additionally, while many countries do not have laws specifically prohibiting the activity of running digital security training, the use of digital security tools may still be criminalized in certain countries under other, broader laws. +Additionally, while many countries do not have laws specifically prohibiting the activity of running a digital security training, the use of digital security tools may still be criminalized in certain countries under other, broader laws. For example, using Tor Browser may be viewed as illegal or anti-government activity. Please note that we are not lawyers, and any information we give you does not constitute legal advice. -Additionally, your communication with us is not protected by any legal privilege so law enforcement may subpoena and obtain any information you give us. +Additionally, your communication with us is not protected by any legal privilege, so law enforcement may subpoena and obtain any information you give us. However, we may be able to put you in touch with lawyers who are capable of addressing your questions and/or concerns. Some relevant resources include: @@ -57,4 +57,4 @@ section: training --- section_id: training --- -subtitle: Things you should be aware before running a digital security training +subtitle: Things you should be aware of before running a digital security training.

1 0

[community/staging] Update lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit c0c07feb0a9d8830a8cf266794ed9ef0dc0104b4 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 11 16:09:03 2019 +0100 Update lego --- databags/menu.ini | 1 + databags/menu_footer.ini | 1 + lego | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/databags/menu.ini b/databags/menu.ini new file mode 120000 index 0000000..94f62ff --- /dev/null +++ b/databags/menu.ini @@ -0,0 +1 @@ +../lego/databags/menu.ini \ No newline at end of file diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini new file mode 120000 index 0000000..e6c1f3b --- /dev/null +++ b/databags/menu_footer.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer.ini \ No newline at end of file diff --git a/lego b/lego index ae51128..07eaef9 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40 +Subproject commit 07eaef9800b90b8de1c490dedc95928d3b789cbf

1 0

[community/staging] Update lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit d7439ded9c45796a0b872054aa25da72ef46eb22 Author: hiro <hiro(a)torproject.org> Date: Tue Nov 5 14:59:13 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 8a4ddc7..ae51128 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5 +Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40

1 0

[community/staging] Fix floating menu issue
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit dbf5e4c0f1b0d39ab3c19d1cf7debddb716cc1f0 Author: Antonela <hola(a)antonela.me> Date: Tue Nov 12 19:57:42 2019 +0900 Fix floating menu issue --- templates/pagenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/pagenav.html b/templates/pagenav.html index 7d38397..617242d 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -1,4 +1,4 @@ -<div class="container-fluid border-bottom border-light bg-white sticky"> +<div class="container-fluid border-bottom border-light bg-white sticky-top"> <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> <div class="row col-12 justify-content-center"> <ul class="nav">

1 0

[community/staging] better strings for l10n. please add one sentence per line.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit d8e9c59d9311e93045db94c491a8615523a33bf8 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Oct 31 15:41:39 2019 +0100 better strings for l10n. please add one sentence per line. --- content/user-research/contents.lr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 2ad1aeb..31b93ef 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -20,4 +20,7 @@ body: ## We respect our users' privacy when we conduct research. -We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research. +We practice human-centered design when we build tools for internet freedom. +The way we build tools also builds community. +Our user research is founded on the premises of consent, respect, and empathy. +You can make an impact in your community by learning from our methods and helping us with user research.

1 0

[community/staging] Restore lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 9ef6d1404feba7ebc0018812a701ebd39302c14d Author: hiro <hiro(a)torproject.org> Date: Tue Nov 12 11:34:33 2019 +0100 Restore lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 09c5813..6a550fa 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 +Subproject commit 6a550faea39a534af47923a01bd29d138365819f

1 0

[community/staging] Remove unused menu and update template
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit a5f03cebf373c48b3dd7516baeeeebce036adf31 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 11 17:09:11 2019 +0100 Remove unused menu and update template --- databags/menu+bn-BD.ini | 1 - databags/menu+de.ini | 1 - databags/menu+en.ini | 1 - databags/menu+es.ini | 1 - databags/menu+fr.ini | 1 - databags/menu+id.ini | 1 - databags/menu+is.ini | 1 - databags/menu+it.ini | 1 - databags/menu+ka.ini | 1 - databags/menu+ko.ini | 1 - databags/menu+pt-BR.ini | 1 - databags/menu+ru.ini | 1 - databags/menu+tr.ini | 1 - databags/menu+zh-CN.ini | 1 - databags/menu_footer+bn-BD.ini | 1 - databags/menu_footer+de.ini | 1 - databags/menu_footer+en.ini | 1 - databags/menu_footer+es.ini | 1 - databags/menu_footer+fr.ini | 1 - databags/menu_footer+id.ini | 1 - databags/menu_footer+is.ini | 1 - databags/menu_footer+it.ini | 1 - databags/menu_footer+ka.ini | 1 - databags/menu_footer+ko.ini | 1 - databags/menu_footer+pt-BR.ini | 1 - databags/menu_footer+ru.ini | 1 - databags/menu_footer+tr.ini | 1 - databags/menu_footer+zh-CN.ini | 1 - databags/pagenav+de.ini | 1 - databags/pagenav+es.ini | 1 - databags/pagenav+fr.ini | 1 - databags/pagenav+it.ini | 1 - databags/pagenav+pt-BR.ini | 1 - databags/pagenav+ru.ini | 1 - databags/{pagenav+en.ini => pagenav.ini} | 0 lego | 2 +- templates/pagenav.html | 2 +- 37 files changed, 2 insertions(+), 36 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini deleted file mode 120000 index c9b2dc8..0000000 --- a/databags/menu+bn-BD.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+bn-BD.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini deleted file mode 120000 index 6bb02de..0000000 --- a/databags/menu+de.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+de.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 120000 index 1fa7edf..0000000 --- a/databags/menu+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini deleted file mode 120000 index fd8def3..0000000 --- a/databags/menu+es.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+es.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini deleted file mode 120000 index 5366289..0000000 --- a/databags/menu+fr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+fr.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini deleted file mode 120000 index 7c2858b..0000000 --- a/databags/menu+id.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+id.ini \ No newline at end of file diff --git a/databags/menu+is.ini b/databags/menu+is.ini deleted file mode 120000 index b02aed7..0000000 --- a/databags/menu+is.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+is.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini deleted file mode 120000 index fcdde73..0000000 --- a/databags/menu+it.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+it.ini \ No newline at end of file diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini deleted file mode 120000 index 336d4ad..0000000 --- a/databags/menu+ka.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ka.ini \ No newline at end of file diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini deleted file mode 120000 index 31e262b..0000000 --- a/databags/menu+ko.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ko.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini deleted file mode 120000 index fd27afb..0000000 --- a/databags/menu+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+pt-BR.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini deleted file mode 120000 index 6f30a3e..0000000 --- a/databags/menu+ru.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ru.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini deleted file mode 120000 index 8a01592..0000000 --- a/databags/menu+tr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+tr.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini deleted file mode 120000 index 425a6f8..0000000 --- a/databags/menu+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+zh-CN.ini \ No newline at end of file diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini deleted file mode 120000 index 5dd8aed..0000000 --- a/databags/menu_footer+bn-BD.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+bn-BD.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini deleted file mode 120000 index 851da53..0000000 --- a/databags/menu_footer+de.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+de.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini deleted file mode 120000 index c52cdcb..0000000 --- a/databags/menu_footer+es.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini deleted file mode 120000 index 7ce02c3..0000000 --- a/databags/menu_footer+fr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+fr.ini \ No newline at end of file diff --git a/databags/menu_footer+id.ini b/databags/menu_footer+id.ini deleted file mode 120000 index 056defd..0000000 --- a/databags/menu_footer+id.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+id.ini \ No newline at end of file diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini deleted file mode 120000 index 2474621..0000000 --- a/databags/menu_footer+is.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+is.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini deleted file mode 120000 index 8225a53..0000000 --- a/databags/menu_footer+it.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+it.ini \ No newline at end of file diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini deleted file mode 120000 index fd41467..0000000 --- a/databags/menu_footer+ka.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ka.ini \ No newline at end of file diff --git a/databags/menu_footer+ko.ini b/databags/menu_footer+ko.ini deleted file mode 120000 index 6ff3bf2..0000000 --- a/databags/menu_footer+ko.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ko.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini deleted file mode 120000 index 5198e0f..0000000 --- a/databags/menu_footer+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+pt-BR.ini \ No newline at end of file diff --git a/databags/menu_footer+ru.ini b/databags/menu_footer+ru.ini deleted file mode 120000 index ad782bc..0000000 --- a/databags/menu_footer+ru.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ru.ini \ No newline at end of file diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini deleted file mode 120000 index 2c88858..0000000 --- a/databags/menu_footer+tr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+tr.ini \ No newline at end of file diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini deleted file mode 120000 index 0fd8366..0000000 --- a/databags/menu_footer+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+zh-CN.ini \ No newline at end of file diff --git a/databags/pagenav+de.ini b/databags/pagenav+de.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+de.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+es.ini b/databags/pagenav+es.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+es.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+fr.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+it.ini b/databags/pagenav+it.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+it.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+pt-BR.ini b/databags/pagenav+pt-BR.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+ru.ini b/databags/pagenav+ru.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+ru.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+en.ini b/databags/pagenav.ini similarity index 100% rename from databags/pagenav+en.ini rename to databags/pagenav.ini diff --git a/lego b/lego index 07eaef9..6a550fa 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 07eaef9800b90b8de1c490dedc95928d3b789cbf +Subproject commit 6a550faea39a534af47923a01bd29d138365819f diff --git a/templates/pagenav.html b/templates/pagenav.html index 0a6aa0f..7d38397 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -2,7 +2,7 @@ <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> <div class="row col-12 justify-content-center"> <ul class="nav"> - {% set menubag = 'pagenav' + '+' + this.alt %} + {% set menubag = 'pagenav' %} {% for id, item in bag(menubag).items() %} {% set abs_path = item.path %} <li{% if this.is_child_of(abs_path) %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}>

1 0