From 208d38727acc91d80e17582d256583c0ece66d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Thu, 28 Nov 2024 14:41:14 +0100 Subject: [PATCH 1/6] make community more markdown-based --- content/community/_index.md | 14 ++++++-------- themes/ropensci/layouts/community/list.html | 5 ++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/content/community/_index.md b/content/community/_index.md index fd91166c6..e6f99dfc8 100644 --- a/content/community/_index.md +++ b/content/community/_index.md @@ -1,12 +1,10 @@ +++ -title="Our community is our best asset" +title="Our community is
our best asset" partials=["community.html","mailkimp.html"] +++ -We are building a welcoming and diverse global community of software users and developers from a range of research domains. We aim to build capacity of novices, experts, and the “nexperts” in between. We welcome participation and civil conversations that adhere to our [code of conduct](/code-of-conduct). There are many ways to get involved. - -**Follow** us on [Twitter](https://twitter.com/ropensci). **Read** [our blog](/blog/) to learn about our software packages, best practices, events and the people who make up our community, or read our [Contributing Guide](https://devguide.ropensci.org/contributingguide.html) to learn how you can contribute to rOpenSci as a user or developer. **Subscribe** to [rOpenSci News](/#subscribe) to get [semi-monthly updates](https://news.ropensci.org/) on our activities sent to your inbox. - -**Ask and answer** #rstats questions on our [discussion forum](https://discuss.ropensci.org/), on [Stackoverflow](https://stackoverflow.com/questions/tagged/ropensci), or [Twitter](https://twitter.com/rOpenSci). **Attend** our [Community Calls](/commcalls/) to hear about best practices, Q \& As with well known developers, and to learn more about rOpenSci developments. These are free and open for anyone to attend and provide an opportunity to connect with rOpenSci community members around the world. - -**Use** [our software](/packages/). **Improve** package [documentation or code](https://github.com/ropensci). **Review** [a package](https://devguide.ropensci.org/softwarereviewintro.html#whyreview). **Submit** your package for [open software peer review](/software-review/). +We are building a welcoming and diverse global community of R software users, developers, and research software engineers who want to make their research more open and reproducible. +We aim to build capacity of novices, experts, and those in between. +Participants come from across academia, government, industry, and non-profits. +We welcome participation that adheres to our [code of conduct](/code-of-conduct). +The [rOpenSci Community Contributing Guide](https://contributing.ropensci.org/) outlines many ways to get involved. \ No newline at end of file diff --git a/themes/ropensci/layouts/community/list.html b/themes/ropensci/layouts/community/list.html index 12228c7bf..005c66600 100644 --- a/themes/ropensci/layouts/community/list.html +++ b/themes/ropensci/layouts/community/list.html @@ -11,15 +11,14 @@
Fictional avatars of rOpenSci community members. Lydia Hill Illustration, all rights reserved.

- Our community is
- our best asset + {{ .Title | markdownify }}

Fictional avatars of rOpenSci community members. Lydia Hill Illustration, all rights reserved.

-We are building a welcoming and diverse global community of R software users, developers, and research software engineers who want to make their research more open and reproducible. We aim to build capacity of novices, experts, and those in between. Participants come from across academia, government, industry, and non-profits. We welcome participation that adheres to our code of conduct. The rOpenSci Community Contributing Guide outlines many ways to get involved. + {{ .Content | markdownify }}

From 5f56ce2bd1979d185a37e89734d8537b0d05754b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Thu, 28 Nov 2024 15:57:46 +0100 Subject: [PATCH 2/6] try --- content/community/_index.es.md | 6 ++++++ themes/ropensci/assets/_snippets/commcalls.en.md | 4 ++++ themes/ropensci/assets/_snippets/commcalls.es.md | 5 +++++ themes/ropensci/i18n/en.toml | 8 +++++++- themes/ropensci/i18n/es.toml | 8 +++++++- themes/ropensci/i18n/fr.toml | 6 ++++++ themes/ropensci/layouts/community/list.html | 12 +++++++++--- 7 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 content/community/_index.es.md create mode 100644 themes/ropensci/assets/_snippets/commcalls.en.md create mode 100644 themes/ropensci/assets/_snippets/commcalls.es.md diff --git a/content/community/_index.es.md b/content/community/_index.es.md new file mode 100644 index 000000000..bfacdbf8d --- /dev/null +++ b/content/community/_index.es.md @@ -0,0 +1,6 @@ ++++ +title="Blablala" +partials=["community.html","mailkimp.html"] ++++ + +Construyendo trabajo \ No newline at end of file diff --git a/themes/ropensci/assets/_snippets/commcalls.en.md b/themes/ropensci/assets/_snippets/commcalls.en.md new file mode 100644 index 000000000..fcce55d55 --- /dev/null +++ b/themes/ropensci/assets/_snippets/commcalls.en.md @@ -0,0 +1,4 @@ +Our quarterly community calls are open to everyone. +They're an opportunity to connect with rOpenSci community members around the world. +Join us for lively discussions with experts on both technical and social topics, like development, review, security and maintenance of R packages, applications of our packages in open science, or developing a code of conduct. +Every Community Call becomes a rich resource with video and collaborative notes. \ No newline at end of file diff --git a/themes/ropensci/assets/_snippets/commcalls.es.md b/themes/ropensci/assets/_snippets/commcalls.es.md new file mode 100644 index 000000000..cb2b5024b --- /dev/null +++ b/themes/ropensci/assets/_snippets/commcalls.es.md @@ -0,0 +1,5 @@ +Escucha lalala. +Our quarterly community calls are open to everyone. +They're an opportunity to connect with rOpenSci community members around the world. +Join us for lively discussions with experts on both technical and social topics, like development, review, security and maintenance of R packages, applications of our packages in open science, or developing a code of conduct. +Every Community Call becomes a rich resource with video and collaborative notes. \ No newline at end of file diff --git a/themes/ropensci/i18n/en.toml b/themes/ropensci/i18n/en.toml index 91d5aed3a..7ba7d7737 100644 --- a/themes/ropensci/i18n/en.toml +++ b/themes/ropensci/i18n/en.toml @@ -41,4 +41,10 @@ other = 'Browse By Author' [Read-more] - other = 'Read more' \ No newline at end of file + other = 'Read more' + +[Catch-up-with-past-calls] + other = 'Catch up with past calls' + +[Community-calls] + other = 'Community calls' \ No newline at end of file diff --git a/themes/ropensci/i18n/es.toml b/themes/ropensci/i18n/es.toml index eda353969..2fa333c0b 100644 --- a/themes/ropensci/i18n/es.toml +++ b/themes/ropensci/i18n/es.toml @@ -44,4 +44,10 @@ other = 'Explora por autores' [Read-more] - other = 'Lee más' \ No newline at end of file + other = 'Lee más' + +[Catch-up-with-past-calls] + other = 'Seminarios anteriores' + +[Community-calls] + other = 'Llamadas comunitarias' \ No newline at end of file diff --git a/themes/ropensci/i18n/fr.toml b/themes/ropensci/i18n/fr.toml index 178c357b3..406b6aa23 100644 --- a/themes/ropensci/i18n/fr.toml +++ b/themes/ropensci/i18n/fr.toml @@ -45,4 +45,10 @@ [Read-more] other = 'Lire plus' + +[Catch-up-with-past-calls] + other = 'Appels précédents' + +[Community-calls] + other = 'Appels avec la communauté' \ No newline at end of file diff --git a/themes/ropensci/layouts/community/list.html b/themes/ropensci/layouts/community/list.html index 005c66600..564a2df0e 100644 --- a/themes/ropensci/layouts/community/list.html +++ b/themes/ropensci/layouts/community/list.html @@ -30,11 +30,17 @@

-

Community Calls

+

{{ i18n "Community-calls" }}

- Our quarterly community calls are open to everyone. They're an opportunity to connect with rOpenSci community members around the world. Join us for lively discussions with experts on both technical and social topics, like development, review, security and maintenance of R packages, applications of our packages in open science, or developing a code of conduct. Every Community Call becomes a rich resource with video and collaborative notes. + {{ $path := (printf "_snippets/commcalls.%s.md" .Language.Lang) }} + {{ with resources.Get $path }} + {{ .Content | markdownify }} + {{ else }} + {{ errorf "Unable to get page Resources" }} + {{ end }} +

- Catch up with past calls + {{ i18n "Catch-up-with-past-calls" }}
From 90851a69d4f240b577cc769b57f1cee1281b96f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Fri, 7 Feb 2025 12:08:19 +0100 Subject: [PATCH 3/6] Apply suggestions from code review Co-authored-by: Yanina Bellini Saibene --- content/community/_index.es.md | 4 ++-- themes/ropensci/assets/_snippets/commcalls.es.md | 7 +++++-- themes/ropensci/i18n/es.toml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/content/community/_index.es.md b/content/community/_index.es.md index bfacdbf8d..d4b0d11b8 100644 --- a/content/community/_index.es.md +++ b/content/community/_index.es.md @@ -1,6 +1,6 @@ +++ -title="Blablala" +title="Nuestra comunidad es nuestro mejor activo" partials=["community.html","mailkimp.html"] +++ -Construyendo trabajo \ No newline at end of file +Estamos construyendo una comunidad global amigable y diversa de personas que usan y desarrollan software de diversos ámbitos de investigación. Nuestro objetivo es desarrollar la capacidad de personas novatas, expertas y todas las personas en el medio. Nuestros participantes proceden del mundo académico, la administración pública, la industria y las organizaciones sin ánimo de lucro. Nos complace contar con particpaciones que respeten nuestro [código de conducta](/code-of-conduct). La [Guía de contribución a la comunidad rOpenSci](https://contributing.ropensci.org/) describe muchas formas de participar. \ No newline at end of file diff --git a/themes/ropensci/assets/_snippets/commcalls.es.md b/themes/ropensci/assets/_snippets/commcalls.es.md index cb2b5024b..989bb35b4 100644 --- a/themes/ropensci/assets/_snippets/commcalls.es.md +++ b/themes/ropensci/assets/_snippets/commcalls.es.md @@ -1,5 +1,8 @@ -Escucha lalala. -Our quarterly community calls are open to everyone. +Nuestras llamadas con la comunidad están abiertas a todo el mundo. +Son una oportunidad para conectar con otras personas de rOpenSci de todo el mundo. +Sumate a animados debates con personas expertas sobre temas tanto técnicos como sociales, como el desarrollo, la revisión, la seguridad y el mantenimiento de los paquetes de R, las aplicaciones de paquetes en la ciencia abierta o el desarrollo de un código de conducta. +Cada llamada se convierte en un rico recurso con vídeo y notas de colaboración. +Our community calls are open to everyone. They're an opportunity to connect with rOpenSci community members around the world. Join us for lively discussions with experts on both technical and social topics, like development, review, security and maintenance of R packages, applications of our packages in open science, or developing a code of conduct. Every Community Call becomes a rich resource with video and collaborative notes. \ No newline at end of file diff --git a/themes/ropensci/i18n/es.toml b/themes/ropensci/i18n/es.toml index f80594156..2af2e1f3d 100644 --- a/themes/ropensci/i18n/es.toml +++ b/themes/ropensci/i18n/es.toml @@ -53,7 +53,7 @@ other = 'Seminarios anteriores' [Community-calls] - other = 'Llamadas comunitarias' + other = 'Llamadas con la comunidad' [Projects] other = 'Proyectos' From d2151448b14343f9e9f71cf9c6195028fa803107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Fri, 7 Feb 2025 12:09:47 +0100 Subject: [PATCH 4/6] rm duplicate --- themes/ropensci/i18n/en.toml | 2 -- themes/ropensci/i18n/es.toml | 2 -- 2 files changed, 4 deletions(-) diff --git a/themes/ropensci/i18n/en.toml b/themes/ropensci/i18n/en.toml index 31ebeb6cc..bc13ed8c9 100644 --- a/themes/ropensci/i18n/en.toml +++ b/themes/ropensci/i18n/en.toml @@ -49,8 +49,6 @@ [Catch-up-with-past-calls] other = 'Catch up with past calls' -[Community-calls] - other = 'Community calls' [Projects] other = 'Projects' diff --git a/themes/ropensci/i18n/es.toml b/themes/ropensci/i18n/es.toml index 2af2e1f3d..5d56a373f 100644 --- a/themes/ropensci/i18n/es.toml +++ b/themes/ropensci/i18n/es.toml @@ -52,8 +52,6 @@ [Catch-up-with-past-calls] other = 'Seminarios anteriores' -[Community-calls] - other = 'Llamadas con la comunidad' [Projects] other = 'Proyectos' From df11da581ec822741e735136afaa79938c9df789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Fri, 7 Feb 2025 12:13:24 +0100 Subject: [PATCH 5/6] fix line --- content/community/_index.es.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/content/community/_index.es.md b/content/community/_index.es.md index d4b0d11b8..052b9267a 100644 --- a/content/community/_index.es.md +++ b/content/community/_index.es.md @@ -1,6 +1,11 @@ -+++ -title="Nuestra comunidad es nuestro mejor activo" -partials=["community.html","mailkimp.html"] -+++ +--- +title: | + Nuestra comunidad + + es nuestro mejor activo +partials: + - community.html + - mailkimp.html +--- Estamos construyendo una comunidad global amigable y diversa de personas que usan y desarrollan software de diversos ámbitos de investigación. Nuestro objetivo es desarrollar la capacidad de personas novatas, expertas y todas las personas en el medio. Nuestros participantes proceden del mundo académico, la administración pública, la industria y las organizaciones sin ánimo de lucro. Nos complace contar con particpaciones que respeten nuestro [código de conducta](/code-of-conduct). La [Guía de contribución a la comunidad rOpenSci](https://contributing.ropensci.org/) describe muchas formas de participar. \ No newline at end of file From fbea74b3258525137b71c168e8f09fe833fe5ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Fri, 7 Feb 2025 14:00:32 +0100 Subject: [PATCH 6/6] fix link --- themes/ropensci/layouts/community/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/ropensci/layouts/community/list.html b/themes/ropensci/layouts/community/list.html index 564a2df0e..59e48031e 100644 --- a/themes/ropensci/layouts/community/list.html +++ b/themes/ropensci/layouts/community/list.html @@ -40,7 +40,7 @@

{{ i18n "Community-calls" }}

{{ end }}

- {{ i18n "Catch-up-with-past-calls" }} + {{ partial "translate-url" (dict "name" "commcalls" "Site" .Site "class" "link-arrow" )}}{{ i18n "Catch-up-with-past-calls" }}