Skip to content

Commit

Permalink
Upgrade Hugo, fix broken links (#1625)
Browse files Browse the repository at this point in the history
  • Loading branch information
majakomel authored Nov 26, 2024
1 parent 91a5652 commit dd928a9
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
hugo-version: '0.120.4'
hugo-version: '0.138.0'

- name: Build the website
run: ./scripts/build_website.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,13 @@ We choose three sites with a similar number of blocking time for further analysi



* [Doan Trang page]([http://www.phamdoantrang.com/](http://www.phamdoantrang.com/))[^46],
* [Doan Trang page](http://www.phamdoantrang.com/)[^46],


* [Ba Sam]([https://anhbasam.wordpress.com/](https://anhbasam.wordpress.com/))[^47] and
* [Ba Sam](https://anhbasam.wordpress.com/)[^47] and


* [Viet Nam Times]([https://vietnamthoibao.org/](https://vietnamthoibao.org/))[^48]
* [Viet Nam Times](https://vietnamthoibao.org/)[^48]
The Doan Trang page is completely blocked by FPT Telecom and Viettel networks. However, VNPT opened for access from 16 June to 21 June 2022. At that time, there is an event on Human Rights Council to Hold its Fiftieth Regular Session from 13 June to 8 July 2022. The VNPT provider may have changed the moderation policy of this site and opened access to users. Until now they are still open access.

![](images/image4.png)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ tweet 762388008666591232
is no longer available
-->

{{% tweet 762569928205533184 %}}
{{< twitter user="horn__observer" id="762569928205533184" >}}


But Ethiopia is not the only country restricting access to the internet during
Expand Down
4 changes: 2 additions & 2 deletions content/support/faq.ar.md
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ OONI Probe، أيْ مِسْبار أوني، [برمجية حُرَّة مفت
يضغط زرّ "أجرِ الفحوص" في تطبيق OONI Probe فستُجرى الاختبارات على مواقع الوِب المُدرجة في القائمتين التاليتين:

* **[قائمة الفحص العالمية](https://github.com/citizenlab/test-lists/blob/master/lists/global.csv)** التي تضم مسارات مواقع هامة على مستوى العالم، منها مثلا facebook.com و معظمها باللغة الإنگليزية
* **[قائمة الفحص الدولية]([test-lists/lists at master · citizenlab/test-lists · GitHub](https://github.com/citizenlab/test-lists/tree/master/lists))** التي تعني دولة بعينها، و كثير منها باللغات المحليّة
* **[قائمة الفحص الدولية](https://github.com/citizenlab/test-lists/tree/master/lists)** التي تعني دولة بعينها، و كثير منها باللغات المحليّة

أيّا كانت الدولة التي تُشغّلون OONI Probe منها فإنكم دومًا ما ستجرون الاختبارات على قائمة [قائمة الفحص العالمية](https://github.com/citizenlab/test-lists/blob/master/lists/global.csv).

Expand All @@ -451,7 +451,7 @@ OONI Probe، أيْ مِسْبار أوني، [برمجية حُرَّة مفت

* تضم مختارات من **المواقع الهامة على مستوى العالم** (قائمة الفحص العالمية)
* تضم مختارات من **المواقع الهامة على مستوى الدولة التي يقيم فيها مُشغِّل الاختبار** (قوائم الفحص الدولية)
* تتصف **بالتنوع**، إذ تضم مواقع وِب تنتمي إلى [30 تصنيفًا]((https://github.com/citizenlab/test-lists/blob/master/lists/00-LEGEND-new_category_codes.csv))، مما يزيد احتمال الكشف عن ممارسات الرقابة
* تتصف **بالتنوع**، إذ تضم مواقع وِب تنتمي إلى [30 تصنيفًا](https://github.com/citizenlab/test-lists/blob/master/lists/00-LEGEND-new_category_codes.csv)، مما يزيد احتمال الكشف عن ممارسات الرقابة
* تتصف بالعلنية، و هو ما يعني أنَّ **المستخدمين بوسعهم معرفة مواقع الوِب التي سيجرون الاختبارات** عليها، و ذلك قبل إجراء الاختبارات فعليًّا
* هي مستضافة في موقع GitHub مما **يشجّع مجتمع المعنيين بمراجعتها و المشاركة** في تحسينها
* لكونها مستضافة على GitHub تمكن **مراجعة مقترحات التعديل** قبل إحداثها، مما يعني مثلا أن لا مواقع خبيثة ستُضاف
Expand Down
2 changes: 1 addition & 1 deletion content/support/faq.ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ aliases:
Этот раздел «Часто задаваемые вопросы» (FAQ) предназначен для ответа на вопросы, которые нам часто задают участники нашего сообщества.

Оригинал:
* **English,** [Frequently Asked Questions (FAQ)]([/about/risks](https://ooni.org/support/faq/))
* **English,** [Frequently Asked Questions (FAQ)](https://ooni.org/support/faq/)

На русский язык документ переведен Татьяной Болдыревой.

Expand Down
2 changes: 1 addition & 1 deletion content/support/ooni-outreach-kit/index.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Con este folleto, proporcionamos algunos conceptos básicos acerca de la censura

Ofrecemos las diapositivas para un taller que puedes descargar y adaptar dependiendo de las necesidades de tu audiencia. Estas diapositivas son una plantilla, por favor no las considere como una presentación final. Los invitamos a adaptarlas según el contexto local del país donde realizará un evento, y las necesidades de la audiencia.

* **[Diapositivas completas del taller]([https://docs.google.com/presentation/d/1_WB2YvIKZJCSwpTN1LKCd0mlFC9srFZLr2Ycdye6hrQ/edit?usp=sharing)**
* **[Diapositivas completas del taller](https://docs.google.com/presentation/d/1_WB2YvIKZJCSwpTN1LKCd0mlFC9srFZLr2Ycdye6hrQ/edit?usp=sharing)**

Gracias a los esfuerzos de Advocacy Assembly podemos proporcionar las diapositivas y también notas útiles para el ponente de la presentación. Esperamos que estas notas le faciliten la preparación del taller, y que las diapositivas sean más accesibles para la audiencia.

Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/css-tailwind.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- $styles := resources.Get "css/tailwind.css" | postCSS -}}
{{- if .Site.IsServer }}
{{- if hugo.IsServer }}
{{ $styles = $styles | resources.ExecuteAsTemplate (printf "css/styles.dev.%v.css" now.UnixNano) .}}
{{ else }}
{{ $styles = $styles | minify | fingerprint | resources.PostProcess }}
Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/css.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
{{ $bootstrapCss := slice $bootstrapReboot $bootstrapGrid | resources.Concat "css/bootstrap.css" | resources.Minify |
resources.Fingerprint }}

<link rel="stylesheet" type="text/css" href="{{ $bootstrapCss.Permalink }}">
<link rel="stylesheet" type="text/css" href="{{ $bootstrapCss.RelPermalink }}">

{{ $fonts := resources.Get "css/fonts.css" }}
{{ $master := resources.Get "css/master.css" }}
{{ $indexCss := slice $fonts $master | resources.Concat "css/index.css" | resources.Minify | resources.Fingerprint }}

<link rel="stylesheet" type="text/css" href="{{ $indexCss.Permalink }}" />
<link rel="stylesheet" type="text/css" href="{{ $indexCss.RelPermalink }}" />

{{ $rtl := resources.Get "css/rtl.css"}}
{{ $rtlCss := $rtl | resources.Minify | resources.Fingerprint }}

{{ if in "ar fa" .Lang }}
<link rel="stylesheet" type="text/css" href="{{ $rtlCss.Permalink }}">
<link rel="stylesheet" type="text/css" href="{{ $rtlCss.RelPermalink }}">
{{ end }}
6 changes: 3 additions & 3 deletions layouts/partials/opengraph.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
{{ end }}{{ end }}

{{- if .IsPage }}
{{- range .Site.Authors }}{{ with .Social.facebook }}
<meta property="article:author" content="https://www.facebook.com/{{ . }}" />{{ end }}{{ with .Site.Social.facebook }}
{{- range .Site.Params.Author }}{{ with .Social.facebook }}
<meta property="article:author" content="https://www.facebook.com/{{ . }}" />{{ end }}{{ with .Site.Params.Social.facebook }}
<meta property="article:publisher" content="https://www.facebook.com/{{ . }}" />{{ end }}
<meta property="article:section" content="{{ .Section }}" />
{{- with .Params.tags }}{{ range first 6 . }}
<meta property="article:tag" content="{{ . }}" />{{ end }}{{ end }}
{{- end }}{{ end }}

{{- /* Facebook Page Admin ID for Domain Insights */}}
{{- with .Site.Social.facebook_admin }}<meta property="fb:admins" content="{{ . }}" />{{ end }}
{{- with .Site.Params.Social.facebook_admin }}<meta property="fb:admins" content="{{ . }}" />{{ end }}
4 changes: 2 additions & 2 deletions layouts/partials/twitter_cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
{{- end }}
<meta name="twitter:title" content="{{ .Title }}"/>
<meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}"/>
{{ with .Site.Social.twitter -}}
{{ with .Site.Params.Social.twitter -}}
<meta name="twitter:site" content="@{{ . }}"/>
{{ end -}}
{{ range .Site.Authors }}
{{ range .Site.Params.Author }}
{{ with .twitter -}}
<meta name="twitter:creator" content="@{{ . }}"/>
{{ end -}}
Expand Down
2 changes: 1 addition & 1 deletion layouts/section/get-involved.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ define "main" }}
{{ $blocks := .Site.GetPage "/get-involved-blocks" }}
{{ $blocks := .Page.GetPage "./get-involved-blocks" }}
<div class="container get-involved">
<main class="col pt-4 pb-5">
<div class="row justify-content-around pb-4">
Expand Down
2 changes: 1 addition & 1 deletion layouts/shortcodes/ooni-desktop-download-btn.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $probeDesktopVersion := slicestr (index (getJSON "https://api.github.com/repos/ooni/probe-desktop/releases/latest") "tag_name") 1 }}
{{ $probeDesktopVersion := slicestr (index (unmarshal (resources.GetRemote "https://api.github.com/repos/ooni/probe-desktop/releases/latest")) "tag_name") 1 }}
{{ if (not (findRE `[0-9]+\.[0-9]+\.[0-9]+` $probeDesktopVersion)) }}
{{ errorf "Invalid version string for probe-desktop: %s" $probeDesktopVersion }}
{{ end }}
Expand Down
4 changes: 3 additions & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
publish = "public"
command = "scripts/deploy_netlify.sh"

[build.environment]
HUGO_VERSION = "0.138.0"

[context.production.environment]
HUGO_VERSION = "0.120.4"
HUGO_ENV = "production"
HUGO_ENABLEGITINFO = "true"

Expand Down
7 changes: 7 additions & 0 deletions vercel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"build": {
"env": {
"HUGO_VERSION": "0.138.0"
}
}
}

0 comments on commit dd928a9

Please sign in to comment.