January 2020 - tor-commits - lists.torproject.org

[manual/develop] add language information to html declaration, better for external indexing
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit db0347d24e7f75ee2b2b153a84ed794e1385431b Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 19:06:36 2019 +0100 add language information to html declaration, better for external indexing --- templates/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/layout.html b/templates/layout.html index 27166a1..c5929cc 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,5 +1,5 @@ <!doctype html> -<html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> +<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl" {% endif %}> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}">

1 0

[manual/develop] add link for translation
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 17db52a53cbe7bb9b783ee2cd18ad19643e8236a Author: emma peel <emma.peel(a)riseup.net> Date: Thu Nov 7 13:54:29 2019 +0100 add link for translation --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 375536a..2341b80 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ Update translation ------------------ To translate the Tor Browser Manual, please join the Tor Project team in Transifex. Learn how you can [become a Tor translator](https://community.torproject.org/localization/becoming-tor-tran…. +The transifex link is: https://www.transifex.com/otf/tor-project-support-community-portal/tbmanual… Translations are managed with the i18n plugin: https://github.com/numericube/lektor-i18n-plugin

1 0

[manual/develop] fix some footers broken links, ref: https://dip.torproject.org/torproject/web/lego/issues/3
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit fcefe753749fa4364f9730801593c250be985b00 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Nov 8 09:25:43 2019 +0100 fix some footers broken links, ref: https://dip.torproject.org/torproject/web/lego/issues/3 --- databags/menu_footer+ca.ini | 16 +--------------- databags/menu_footer+el.ini | 16 +--------------- databags/menu_footer+es-ES.ini | 16 +--------------- databags/menu_footer+he.ini | 16 +--------------- databags/menu_footer+hr.ini | 16 +--------------- databags/menu_footer+ro.ini | 16 +--------------- 6 files changed, 6 insertions(+), 90 deletions(-) diff --git a/databags/menu_footer+ca.ini b/databags/menu_footer+ca.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+ca.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+ca.ini b/databags/menu_footer+ca.ini new file mode 120000 index 0000000..946b589 --- /dev/null +++ b/databags/menu_footer+ca.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+ca.ini \ No newline at end of file diff --git a/databags/menu_footer+el.ini b/databags/menu_footer+el.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+el.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+el.ini b/databags/menu_footer+el.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+el.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+es-ES.ini b/databags/menu_footer+es-ES.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+es-ES.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+es-ES.ini b/databags/menu_footer+es-ES.ini new file mode 120000 index 0000000..c52cdcb --- /dev/null +++ b/databags/menu_footer+es-ES.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+he.ini b/databags/menu_footer+he.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+he.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+he.ini b/databags/menu_footer+he.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+he.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+hr.ini b/databags/menu_footer+hr.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+hr.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+hr.ini b/databags/menu_footer+hr.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+hr.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+ro.ini b/databags/menu_footer+ro.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+ro.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+ro.ini b/databags/menu_footer+ro.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+ro.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file

1 0

[manual/develop] Update lego
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit e57fbb8d421919c616306287f3746a78e505666f Author: hiro <hiro(a)torproject.org> Date: Mon Nov 11 17:09:57 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 924e3db..6a550fa 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 924e3dbdec864fa02075515a48f915dc811ec12b +Subproject commit 6a550faea39a534af47923a01bd29d138365819f

1 0

[manual/develop] Prevent 404 when new locales users click on browser links.
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 073a115f9af810ccec9f6db966b33665ff590ad8 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Nov 21 11:56:03 2019 +0100 Prevent 404 when new locales users click on browser links. --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index f965d3d..c055b0a 100644 --- a/.htaccess +++ b/.htaccess @@ -19,8 +19,8 @@ RewriteRule ^(es-ES|es-MX|es-CO)/(.*) /es/$2 [R=302,L] # Rewrites for languages that have a Tor Browser release # but don't have a translated manual # this languages are the priority for translation of the Tor Browser User Manual! -RewriteRule ^(cs|da|fa|hu|ja|ko|nb-NO|nl|pl|sv-SE|vi|zh-TW)$ / [R=302,L] -RewriteRule ^(cs|da|fa|hu|ja|ko|nb-NO|nl|pl|sv-SE|vi|zh-TW)/(.*) /$2 [R=302,L] +RewriteRule ^(cs|da|fa|hu|ja|ko|ms|lt|nb-NO|nl|pl|sv-SE|vi|zh-TW)$ / [R=302,L] +RewriteRule ^(cs|da|fa|hu|ja|ko|ms|lt|nb-NO|nl|pl|sv-SE|vi|zh-TW)/(.*) /$2 [R=302,L] # we have only one translation for this locales RewriteRule ^bn-(BD|IN)$ /bn [R=302,L]

1 0

[manual/develop] small edits, updated l10n section
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 60e49ceca091ed2a2f3ce21c77d7de9a7909b43a Author: emma peel <emma.peel(a)riseup.net> Date: Fri Nov 15 13:02:46 2019 +0100 small edits, updated l10n section --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2341b80..f3f9c90 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ or browse it online: http://jqs44zhtxl2uo6gk.onion/project/web/manual.git How to report bugs or feedback ============================== -Please file a [trac ticket](https://trac.torproject.org) and choose the component: Community/Tor Browser Manual +Please file a [trac ticket](https://trac.torproject.org) and choose the component: Community/Tor Browser Manual What is Lektor? @@ -29,12 +29,13 @@ Update translation To translate the Tor Browser Manual, please join the Tor Project team in Transifex. Learn how you can [become a Tor translator](https://community.torproject.org/localization/becoming-tor-tran…. The transifex link is: https://www.transifex.com/otf/tor-project-support-community-portal/tbmanual… +The translation statistics for this website can be seen at https://torpat.ch/manual-locales (courtesy of [arthuredelstein](https://github.com/arthuredelstein/)) + Translations are managed with the i18n plugin: https://github.com/numericube/lektor-i18n-plugin To add new languages see [Add new languages to support portal documentation](https://trac.torproject.org/projects/tor/wiki/org/operations… | or via [Onion Services](http://ea5faa5po25cf7fb.onion/projects/tor/wiki/org/operations/services/support#Addanewlanguagetothesupportportal). -See bug [#28236](https://trac.torproject.org/projects/tor/ticket/28236) for translations of the tb-manual. Generate screenshots ------------------

1 0

[manual/develop] Update lego and reduce menu databags
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 5faa6faadc75f598f8ade06a81add702dd6f46e5 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 11 16:54:00 2019 +0100 Update lego and reduce menu databags --- databags/links.ini | 1 + databags/menu+ar.ini | 1 - databags/menu+bn-BD.ini | 1 - databags/menu+bn.ini | 1 - databags/menu+ca.ini | 1 - databags/menu+de.ini | 1 - databags/menu+el.ini | 1 - databags/menu+en-US.ini | 1 - databags/menu+en.ini | 1 - databags/menu+es-AR.ini | 1 - databags/menu+es-ES.ini | 1 - databags/menu+es.ini | 1 - databags/menu+fr.ini | 1 - databags/menu+ga.ini | 1 - databags/menu+he.ini | 1 - databags/menu+hr.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+mk.ini | 1 - databags/menu+pt-BR.ini | 1 - databags/menu+pt-PT.ini | 1 - databags/menu+ro.ini | 1 - databags/menu+ru.ini | 1 - databags/menu+th.ini | 1 - databags/menu+tr.ini | 1 - databags/menu+zh-CN.ini | 1 - databags/menu_footer+ar.ini | 1 - databags/menu_footer+bn-BD.ini | 1 - databags/menu_footer+bn.ini | 15 --------------- databags/menu_footer+ca.ini | 1 - databags/menu_footer+de.ini | 1 - databags/menu_footer+el.ini | 1 - databags/menu_footer+en-US.ini | 15 --------------- databags/menu_footer+en.ini | 1 - databags/menu_footer+es-AR.ini | 1 - databags/menu_footer+es-ES.ini | 1 - databags/menu_footer+es.ini | 1 - databags/menu_footer+fr.ini | 1 - databags/menu_footer+ga.ini | 1 - databags/menu_footer+he.ini | 1 - databags/menu_footer+hr.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+mk.ini | 15 --------------- databags/menu_footer+pt-BR.ini | 1 - databags/menu_footer+pt-PT.ini | 15 --------------- databags/menu_footer+ro.ini | 1 - databags/menu_footer+ru.ini | 1 - databags/menu_footer+th.ini | 1 - databags/menu_footer+tr.ini | 1 - databags/menu_footer+zh-CN.ini | 1 - databags/menu_footer+zh-HK.ini | 15 --------------- databags/menu_footer+zh-TW.ini | 15 --------------- databags/topics+ar.ini | 1 - databags/topics+bn.ini | 1 - databags/topics+ca.ini | 1 - databags/topics+de.ini | 1 - databags/topics+el.ini | 1 - databags/topics+en-US.ini | 1 - databags/topics+es-AR.ini | 1 - databags/topics+es-ES.ini | 1 - databags/topics+es.ini | 1 - databags/topics+fr.ini | 1 - databags/topics+ga.ini | 1 - databags/topics+he.ini | 1 - databags/topics+hr.ini | 1 - databags/topics+id.ini | 1 - databags/topics+is.ini | 1 - databags/topics+it.ini | 1 - databags/topics+ka.ini | 1 - databags/topics+mk.ini | 1 - databags/topics+pt-BR.ini | 1 - databags/topics+pt-PT.ini | 1 - databags/topics+ro.ini | 1 - databags/topics+ru.ini | 1 - databags/topics+th.ini | 1 - databags/topics+tr.ini | 1 - databags/topics+zh-CN.ini | 1 - databags/{topics+en.ini => topics.ini} | 0 lego | 2 +- templates/macros/topic.html | 2 +- templates/sidenav.html | 4 ++-- 88 files changed, 5 insertions(+), 171 deletions(-) diff --git a/databags/links.ini b/databags/links.ini new file mode 120000 index 0000000..fa8bbfe --- /dev/null +++ b/databags/links.ini @@ -0,0 +1 @@ +../lego/databags/links.ini \ No newline at end of file diff --git a/databags/menu+ar.ini b/databags/menu+ar.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+ar.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.ini \ No newline at end of file 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+bn.ini b/databags/menu+bn.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+bn.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.ini \ No newline at end of file diff --git a/databags/menu+ca.ini b/databags/menu+ca.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+ca.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.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+el.ini b/databags/menu+el.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+el.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.ini \ No newline at end of file diff --git a/databags/menu+en-US.ini b/databags/menu+en-US.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+en-US.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.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-AR.ini b/databags/menu+es-AR.ini deleted file mode 120000 index a994764..0000000 --- a/databags/menu+es-AR.ini +++ /dev/null @@ -1 +0,0 @@ -menu+es.ini \ No newline at end of file diff --git a/databags/menu+es-ES.ini b/databags/menu+es-ES.ini deleted file mode 120000 index a994764..0000000 --- a/databags/menu+es-ES.ini +++ /dev/null @@ -1 +0,0 @@ -menu+es.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+ga.ini b/databags/menu+ga.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+ga.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.ini \ No newline at end of file diff --git a/databags/menu+he.ini b/databags/menu+he.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+he.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.ini \ No newline at end of file diff --git a/databags/menu+hr.ini b/databags/menu+hr.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+hr.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.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+mk.ini b/databags/menu+mk.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+mk.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.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+pt-PT.ini b/databags/menu+pt-PT.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+pt-PT.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.ini \ No newline at end of file diff --git a/databags/menu+ro.ini b/databags/menu+ro.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+ro.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.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+th.ini b/databags/menu+th.ini deleted file mode 120000 index 23a525b..0000000 --- a/databags/menu+th.ini +++ /dev/null @@ -1 +0,0 @@ -menu+en.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+ar.ini b/databags/menu_footer+ar.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+ar.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.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+bn.ini b/databags/menu_footer+bn.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+bn.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+ca.ini b/databags/menu_footer+ca.ini deleted file mode 120000 index 946b589..0000000 --- a/databags/menu_footer+ca.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ca.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+el.ini b/databags/menu_footer+el.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+el.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+en-US.ini b/databags/menu_footer+en-US.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+en-US.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press 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-AR.ini b/databags/menu_footer+es-AR.ini deleted file mode 120000 index c52cdcb..0000000 --- a/databags/menu_footer+es-AR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+es-ES.ini b/databags/menu_footer+es-ES.ini deleted file mode 120000 index c52cdcb..0000000 --- a/databags/menu_footer+es-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+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+ga.ini b/databags/menu_footer+ga.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+ga.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+he.ini b/databags/menu_footer+he.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+he.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+hr.ini b/databags/menu_footer+hr.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+hr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.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+mk.ini b/databags/menu_footer+mk.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+mk.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press 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+pt-PT.ini b/databags/menu_footer+pt-PT.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+pt-PT.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+ro.ini b/databags/menu_footer+ro.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+ro.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.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+th.ini b/databags/menu_footer+th.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+th.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.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/menu_footer+zh-HK.ini b/databags/menu_footer+zh-HK.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+zh-HK.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+zh-TW.ini b/databags/menu_footer+zh-TW.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+zh-TW.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/topics+ar.ini b/databags/topics+ar.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+ar.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+bn.ini b/databags/topics+bn.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+bn.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+ca.ini b/databags/topics+ca.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+ca.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+de.ini b/databags/topics+de.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+de.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+el.ini b/databags/topics+el.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+el.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+en-US.ini b/databags/topics+en-US.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+en-US.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+es-AR.ini b/databags/topics+es-AR.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+es-AR.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+es-ES.ini b/databags/topics+es-ES.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+es-ES.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+es.ini b/databags/topics+es.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+es.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+fr.ini b/databags/topics+fr.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+fr.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+ga.ini b/databags/topics+ga.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+ga.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+he.ini b/databags/topics+he.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+he.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+hr.ini b/databags/topics+hr.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+hr.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+id.ini b/databags/topics+id.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+id.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+is.ini b/databags/topics+is.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+is.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+it.ini b/databags/topics+it.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+it.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+ka.ini b/databags/topics+ka.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+ka.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+mk.ini b/databags/topics+mk.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+mk.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+pt-BR.ini b/databags/topics+pt-BR.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+pt-PT.ini b/databags/topics+pt-PT.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+pt-PT.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+ro.ini b/databags/topics+ro.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+ro.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+ru.ini b/databags/topics+ru.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+ru.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+th.ini b/databags/topics+th.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+th.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+tr.ini b/databags/topics+tr.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+tr.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+zh-CN.ini b/databags/topics+zh-CN.ini deleted file mode 120000 index 69233b1..0000000 --- a/databags/topics+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -topics+en.ini \ No newline at end of file diff --git a/databags/topics+en.ini b/databags/topics.ini similarity index 100% rename from databags/topics+en.ini rename to databags/topics.ini diff --git a/lego b/lego index 07eaef9..924e3db 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 07eaef9800b90b8de1c490dedc95928d3b789cbf +Subproject commit 924e3dbdec864fa02075515a48f915dc811ec12b diff --git a/templates/macros/topic.html b/templates/macros/topic.html index 3e2ae5e..d7146c4 100644 --- a/templates/macros/topic.html +++ b/templates/macros/topic.html @@ -1,5 +1,5 @@ {% macro render_topic(item, alternative) %} -{% set b_alt = 'topics+'+alternative %} +{% set b_alt = 'topics' %} {% set t = bag(b_alt, item._id) %} <div class="item"> <h3 class="text-primary"> diff --git a/templates/sidenav.html b/templates/sidenav.html index 9376a52..3a154a1 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -13,7 +13,7 @@ <div class="collapse navbar-collapse burger-menu" id="navbarSupportedTopicsContent"> <ul class="nav nav-pills flex-column"> - {% set topicbag = 'topics+en' %} + {% set topicbag = 'topics' %} {% for id, item in bag(topicbag).items() %} <li{% if this.is_child_of(item.path) %} class="nav-item" {% else %} class="toc-entry toc-h2 nav-item"{% endif %}> {% if this.alt != "en" %} @@ -34,7 +34,7 @@ <nav class="d-none d-sm-block section-nav bg-white sidetopics sticky {{ bag('alternatives', this.alt, 'direction') }}" id="sidenav-topics"> <h4 class="text-primary pl-4">{{ _('Topics') }}</h4> <ul class="nav nav-pills flex-column"> - {% set topicbag = 'topics+en' %} + {% set topicbag = 'topics' %} {% for id, item in bag(topicbag).items() %} <li{% if this.is_child_of(item.path) %} class="toc-entry toc-h2 active nav-item" {% else %} class="toc-entry toc-h2 nav-item" {% endif %}> {% if this.alt != "en" %}

1 0

[manual/develop] Update lego
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit e0a4db38a8bfb5f944167900647d1139eb70c807 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 20 18:41:29 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

[manual/develop] correct Catalan spelling. ref: #3160
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit 53387fa0bcd79aa83e1f5e1a198c10e41e20631d Author: emma peel <emma.peel(a)riseup.net> Date: Fri Nov 15 11:50:06 2019 +0100 correct Catalan spelling. ref: #3160 --- manual.lektorproject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual.lektorproject b/manual.lektorproject index 25fa892..63769e6 100644 --- a/manual.lektorproject +++ b/manual.lektorproject @@ -21,7 +21,7 @@ url_prefix = /bn/ locale = bn [alternatives.ca] -name = Catala (ca) +name = Català (ca) url_prefix = /ca/ locale = ca

1 0

[manual/develop] Update lego
by emmapeel＠torproject.org 15 Jan '20

15 Jan '20

commit d813b902eb2f58d2a287a7807b714ba1fb0bc6b6 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:03:56 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 3409e3e..7c0e9ee 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3409e3eebc2ffca079bf890b5ecb5add6fceccbc +Subproject commit 7c0e9ee42a4cdef87ebb8eefa7dde2df89403c94

1 0