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

[donate-static/master] Add static-shim deploy job to gitlab ci file
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 80a0be3cca40ab893dc71b192ba8106803e3154d Author: kez <kez(a)torproject.org> Date: Wed Nov 3 09:31:16 2021 -0700 Add static-shim deploy job to gitlab ci file --- .gitlab-ci.yml | 61 +++++++++++++++++++--------------------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0abc34f6..012760e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,10 @@ image: node:current-bullseye # This template should be usable on any system that's based on apt. # taken from tor gitlabci +include: + project: tpo/tpa/ci-templates + file: static-shim-deploy.yml + .apt-template: &apt-template | export LC_ALL=C.UTF-8 echo Etc/UTC > /etc/timezone @@ -23,12 +27,15 @@ variables: GIT_SUBMODULE_STRATEGY: recursive PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" TRANSLATION_BRANCH: "donate-static-contentspot" + SITE_URL: styleguide.torproject.org + SUBDIR: public/ stages: - build + - deploy - test_l10n -pages: +build: cache: key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} paths: @@ -40,6 +47,10 @@ pages: - .cache/lektor/builds/ stage: build script: + # This sets LEKTOR_ENV to prod or dev respectively + - LEKTOR_ENV=dev + - if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then LEKTOR_ENV=prod; fi + - export LEKTOR_ENV - *apt-template - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector apt-utils ca-certificates -y - pip3 install virtualenv @@ -61,7 +72,7 @@ pages: rules: - when: always -check_new_strings: +pages: cache: key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} paths: @@ -70,46 +81,14 @@ check_new_strings: - apt-cache - venv - .cache/pip - - stage: test_l10n - needs: [pages] - allow_failure: true - rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH - - if: '$CI_COMMIT_BRANCH == "translations"' - when: never - - changes: - - content/**/*.lr - - templates/**/* + - .cache/lektor/builds/ + stage: pages + dependencies: + - build script: - - *apt-template - - DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev python3-setuptools i18nspector python3-polib python3-requests ca-certificates apt-utils -y - - git clone https://gitlab.torproject.org/tpo/community/l10n.git - - echo 'lets see if there are any updates in the strings for translation' - - l10n/bin/check_po_status.py $TRANSLATION_BRANCH + - rm -r public/.lektor artifacts: paths: - public - - i18n - - l10n - -check_l10n: - allow_failure: true - cache: - key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} - paths: - - packages - - lego - - apt-cache - - venv - - i18n - - .cache/pip - stage: test_l10n - needs: [pages] - only: - - translations - script: - - DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector python3-polib ca-certificates -y - - echo 'lets see if there are any broken links on the translations' - - l10n/bin/check_markdown_links.py i18n/ + rules: + - when: always

1 0

[donate-static/master] Merge remote-tracking branch 'gitlab/duncan-donate-patch-35721'
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 589513472e6cca611b0d3d1985cde560c5672868 Merge: 617699de 2b5326b6 Author: kez <kez(a)torproject.org> Date: Wed Nov 3 09:18:05 2021 -0700 Merge remote-tracking branch 'gitlab/duncan-donate-patch-35721' assets/static/images/donate/yec-metacard.png | Bin 43541 -> 43882 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[donate-static/master] Decided against the pink text, but keeping other fixes
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 2b5326b638dbaa5bae87e523f624c9f23f0afce3 Author: Duncan <duncan(a)torproject.org> Date: Wed Oct 27 23:30:21 2021 +0000 Decided against the pink text, but keeping other fixes --- assets/static/images/donate/yec-metacard.png | Bin 43541 -> 43882 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/donate/yec-metacard.png b/assets/static/images/donate/yec-metacard.png index d016f2c2..d207153c 100644 Binary files a/assets/static/images/donate/yec-metacard.png and b/assets/static/images/donate/yec-metacard.png differ

1 0

[translation/gettor-website-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
by translation＠torproject.org 03 Nov '21

03 Nov '21

commit bc40f31adfcee3c2bfc0510be51423c50462050b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 3 16:15:35 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-cont… --- contents+hu.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+hu.po b/contents+hu.po index 88461d1987..962d2544e9 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -1,9 +1,9 @@ # # Translators: # István Dávid <istvandavid(a)icloud.com>, 2021 -# vargaviktor <viktor.varga(a)gmail.com>, 2021 # erinm, 2021 # Emma Peel, 2021 +# vargaviktor <viktor.varga(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-22 09:52+CET\n" "PO-Revision-Date: 2021-03-24 14:33+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2021\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -211,7 +211,7 @@ msgstr "A magánélet emberi jog" #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" -"A támogatásoddal egyező összeget ad a Friends of Tor, 150 000 dollárig." +"A támogatásával egyező összeget ad a Friends of Tor, 150 000 dollárig." #: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

1 0

[donate-static/master] Make sure we use a full URL in og and twitter image
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 7cb2d7f9c63e9ae9dff241bc230408060c587b68 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Wed Oct 27 20:46:35 2021 +0000 Make sure we use a full URL in og and twitter image Fix #50 --- templates/meta.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/meta.html b/templates/meta.html index 664f4d6f..73742b67 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -7,11 +7,11 @@ <meta name="twitter:card" content="summary_large_image"/> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> - <meta name="twitter:image" content="{{ '/static/images/donate/yec-metacard.png'|url(absolute=True) }}"/> + <meta name="twitter:image" content="{{ '/static/images/donate/yec-metacard.png'|url(absolute=True,external=True) }}"/> <meta property="og:url" content="https://donate.torproject.org/" /> <meta property="og:title" content="{{ _('Privacy is a Human Right') }}" /> <meta property="og:description" content="{{ _('Stand up for the right to privacy. Donate to the Tor Project') }}" /> - <meta property="og:image" content="{{ '/static/images/donate/yec-metacard.png'|url(absolute=True) }}" /> + <meta property="og:image" content="{{ '/static/images/donate/yec-metacard.png'|url(absolute=True,external=True) }}" /> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">

1 0

[donate-static/master] Update lektorproject url
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 1ea1d6c213fa7686722afe27fe7c0a6a7dd2757f Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Wed Oct 27 20:58:04 2021 +0000 Update lektorproject url --- donate.lektorproject | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate.lektorproject b/donate.lektorproject index 0875b0dc..e75e3607 100644 --- a/donate.lektorproject +++ b/donate.lektorproject @@ -1,6 +1,6 @@ [project] name = Tor Project Website -url = https://www.torproject.org/ +url = https://donate.torproject.org/ url_style = relative locale = en included_assets = .well-known

1 0

[donate-static/master] Merge remote-tracking branch 'hackerncoder/i-50'
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 617699def4045a95e4bd7fe5865d335a4dadcbbd Merge: 99d2eac4 1ea1d6c2 Author: kez <kez(a)torproject.org> Date: Wed Nov 3 09:12:03 2021 -0700 Merge remote-tracking branch 'hackerncoder/i-50' donate.lektorproject | 2 +- templates/meta.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[lego/master] Delete yec-activist-light-en.png
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 534eba200f023a2b104c9f48692ff5ef5b13ede0 Author: Duncan <duncan(a)torproject.org> Date: Wed Nov 3 15:01:44 2021 +0000 Delete yec-activist-light-en.png --- assets/static/images/yec-activist-light-en.png | Bin 113486 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/yec-activist-light-en.png b/assets/static/images/yec-activist-light-en.png deleted file mode 100644 index db68dfb..0000000 Binary files a/assets/static/images/yec-activist-light-en.png and /dev/null differ

1 0

[lego/master] Update assets/static/css/images/home/png/yec-activist-de@2x.png, assets/static/css/images/home/png/yec-activist-de@3x.png, assets/static/css/images/home/png/yec-activist-el@2x.png, assets/static/css/images/home/png/yec-activist-el@3x.png, assets/static/css/images/home/png/yec-activist-mk@2x.png, assets/static/css/images/home/png/yec-activist-mk@3x.png
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 0d9efebbaec064730fba8438dda2d666585247a0 Author: Duncan <duncan(a)torproject.org> Date: Wed Nov 3 15:04:34 2021 +0000 Update assets/static/css/images/home/png/yec-activist-de(a)2x.png, assets/static/css/images/home/png/yec-activist-de(a)3x.png, assets/static/css/images/home/png/yec-activist-el(a)2x.png, assets/static/css/images/home/png/yec-activist-el(a)3x.png, assets/static/css/images/home/png/yec-activist-mk(a)2x.png, assets/static/css/images/home/png/yec-activist-mk(a)3x.png --- .../png/{yec-activist-de_2x.png => yec-activist-de(a)2x.png} | Bin .../png/{yec-activist-de_3x.png => yec-activist-de(a)3x.png} | Bin .../png/{yec-activist-el_2x.png => yec-activist-el(a)2x.png} | Bin .../png/{yec-activist-el_3x.png => yec-activist-el(a)3x.png} | Bin .../png/{yec-activist-mk_2x.png => yec-activist-mk(a)2x.png} | Bin .../png/{yec-activist-mk_3x.png => yec-activist-mk(a)3x.png} | Bin 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/css/images/home/png/yec-activist-de_2x.png b/assets/static/css/images/home/png/yec-activist-de(a)2x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-de_2x.png rename to assets/static/css/images/home/png/yec-activist-de(a)2x.png diff --git a/assets/static/css/images/home/png/yec-activist-de_3x.png b/assets/static/css/images/home/png/yec-activist-de(a)3x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-de_3x.png rename to assets/static/css/images/home/png/yec-activist-de(a)3x.png diff --git a/assets/static/css/images/home/png/yec-activist-el_2x.png b/assets/static/css/images/home/png/yec-activist-el(a)2x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-el_2x.png rename to assets/static/css/images/home/png/yec-activist-el(a)2x.png diff --git a/assets/static/css/images/home/png/yec-activist-el_3x.png b/assets/static/css/images/home/png/yec-activist-el(a)3x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-el_3x.png rename to assets/static/css/images/home/png/yec-activist-el(a)3x.png diff --git a/assets/static/css/images/home/png/yec-activist-mk_2x.png b/assets/static/css/images/home/png/yec-activist-mk(a)2x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-mk_2x.png rename to assets/static/css/images/home/png/yec-activist-mk(a)2x.png diff --git a/assets/static/css/images/home/png/yec-activist-mk_3x.png b/assets/static/css/images/home/png/yec-activist-mk(a)3x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-mk_3x.png rename to assets/static/css/images/home/png/yec-activist-mk(a)3x.png

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 03 Nov '21

03 Nov '21

commit 4d2e2fbb8092ff430fd90c1e29b5754c357fc94e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 3 15:48:05 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+hu.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+hu.po b/contents+hu.po index ed1df10340..9c6f801fb8 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -6,8 +6,8 @@ # erinm, 2020 # AdminLMH <lehetmashogy(a)i2pmail.org>, 2021 # Tamas Pajor <tpajor17(a)icloud.com>, 2021 -# vargaviktor <viktor.varga(a)gmail.com>, 2021 # Emma Peel, 2021 +# vargaviktor <viktor.varga(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-28 13:28+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2021\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1603,11 +1603,12 @@ msgstr "Banner bezárása" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Privacy is a human right" -msgstr "" +msgstr "A magánélet emberi jog" #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" +"A támogatásával egyező összeget ad a Friends of Tor, 150 000 dollárig." #: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000." @@ -1618,7 +1619,7 @@ msgstr "" #: lego/templates/banner.html:31 lego/templates/banner.html:33 #: templates/banner.html:31 templates/banner.html:33 msgid "Donate now" -msgstr "" +msgstr "Adományozzon most" #: lego/templates/footer.html:13 lego/templates/footer.html:22 #: lego/templates/navbar.html:96 templates/footer.html:13

1 0