From d2b749462338ef10955480fa7e715919005997f6 Mon Sep 17 00:00:00 2001 From: James Baker Date: Mon, 9 Sep 2019 14:47:33 +0100 Subject: [PATCH 1/4] Update snippets.yml Per https://github.com/programminghistorian/jekyll/issues/1442 add text to describe relationship between the Programming Historian and ProgHist Ltd. Requires hacking `license` category, so may require refactoring. Also requires translation @programminghistorian/french-team @programminghistorian/spanish-team. Note, ProgHist Ltd will be operational from 1 October, so ideally this will be done before then. --- _data/snippets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/snippets.yml b/_data/snippets.yml index c63c70030c..48a421c751 100644 --- a/_data/snippets.yml +++ b/_data/snippets.yml @@ -200,7 +200,7 @@ issn: footer: license: en: | - _The Programming Historian_ (ISSN: 2397-2068) is released under a [CC-BY](https://creativecommons.org/licenses/by/4.0/deed.en) license. + _The Programming Historian_ (ISSN: 2397-2068) is released under a [CC-BY](https://creativecommons.org/licenses/by/4.0/deed.en) license. _The Programming Historian_ is an international volunteer-driven project whose financial activities are administered by _[ProgHist Limited](https://beta.companieshouse.gov.uk/company/12192946)_, a Not for Profit Company Limited by Guarantee that is registered in England, Company Number 12192946. es: | _The Programming Historian en español_ (ISSN: 2517-5769) se publica con una licencia [CC-BY](https://creativecommons.org/licenses/by/4.0/deed.es). fr: | From 2b381dd8b4de74f57ffc2c1496a8b1c0d96db35f Mon Sep 17 00:00:00 2001 From: walshbr Date: Tue, 10 Sep 2019 09:02:26 -0400 Subject: [PATCH 2/4] Update footer and about page --- _data/snippets.yml | 7 ++++++- _includes/footer.html | 2 +- en/about.md | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/_data/snippets.yml b/_data/snippets.yml index 48a421c751..454c953a02 100644 --- a/_data/snippets.yml +++ b/_data/snippets.yml @@ -200,11 +200,16 @@ issn: footer: license: en: | - _The Programming Historian_ (ISSN: 2397-2068) is released under a [CC-BY](https://creativecommons.org/licenses/by/4.0/deed.en) license. _The Programming Historian_ is an international volunteer-driven project whose financial activities are administered by _[ProgHist Limited](https://beta.companieshouse.gov.uk/company/12192946)_, a Not for Profit Company Limited by Guarantee that is registered in England, Company Number 12192946. + _The Programming Historian_ (ISSN: 2397-2068) is released under a [CC-BY](https://creativecommons.org/licenses/by/4.0/deed.en) license. es: | _The Programming Historian en español_ (ISSN: 2517-5769) se publica con una licencia [CC-BY](https://creativecommons.org/licenses/by/4.0/deed.es). fr: | _The Programming Historian en français_ (ISSN: 2631-9462) est publié sous licence [CC-BY](https://creativecommons.org/licenses/by/4.0/deed.fr). + financial: + en: | + This project is administered by ProgHist Limited, Company Number 12192946. + es: | + fr: | gh-hosted: en: Hosted on GitHub diff --git a/_includes/footer.html b/_includes/footer.html index 71068cd9b5..31398b3b0a 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -6,7 +6,7 @@
- {{ site.data.snippets.footer.license[page.lang] | markdownify }} + {{ site.data.snippets.footer.license[page.lang] | markdownify }}{{ site.data.snippets.footer.financial[page.lang] | markdownify }}
diff --git a/en/about.md b/en/about.md index 4fc992939a..0e6df93b6d 100755 --- a/en/about.md +++ b/en/about.md @@ -30,9 +30,9 @@ The _Programming Historian_ team is committed to diversity, and we insist on a h ## Funding & Ownership -For a list of our funders and supports, see the ['Support Us']({{site.baseurl}}/support-us) page +The Programming Historian is an international volunteer-driven project whose financial activities are administered by ProgHist Limited, a Not for Profit Company Limited by Guarantee that is registered in England, Company Number 12192946. It is published by the _Editorial Board of the Programming Historian_. -The _Programming Historian_ is a volunteer-driven project. It is published by the _Editorial Board of the Programming Historian_. +For a list of our funders and supports, see the ['Support Us']({{site.baseurl}}/support-us) page ## History of the Project From 71b810fa7d4c2590ec9afb56329c09987c3438a4 Mon Sep 17 00:00:00 2001 From: spapastamkou Date: Wed, 11 Sep 2019 12:47:22 +0200 Subject: [PATCH 3/4] adds fr translations --- _data/snippets.yml | 1 + fr/apropos.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/_data/snippets.yml b/_data/snippets.yml index 454c953a02..e7f333323a 100644 --- a/_data/snippets.yml +++ b/_data/snippets.yml @@ -210,6 +210,7 @@ footer: This project is administered by ProgHist Limited, Company Number 12192946. es: | fr: | + Ce projet est administré par ProgHist Limited, no d'immatriculation 12192946. gh-hosted: en: Hosted on GitHub diff --git a/fr/apropos.md b/fr/apropos.md index 2531e1c076..f0dcebc3fd 100644 --- a/fr/apropos.md +++ b/fr/apropos.md @@ -30,8 +30,8 @@ Le _Programming Historian en français_ s'attache au principe de la diversité. ## Financement & proprieté +Le _Programming Historian_ est un projet international mené par des volontaires. Ses activités financières sont administrées par ProgHist Limited, une société à but non lucratif immatriculée en Angleterre sous le numéro 12192946. Le projet est publié par le conseil éditorial du _Programming Historian_. Une liste de nos donateurs et des soutiens reçus est consultable sur la page qui expose comment vous pouvez ['nous soutenir']({{site.baseurl}}/fr/nous-soutenir). -Le _Programming Historian_ est un projet mené par des volontaires et publié par le conseil éditorial du _Programming Historian_. ## Histoire du projet From 8942879529fce7c19436659ca5fd0e3c3c24a514 Mon Sep 17 00:00:00 2001 From: Jennifer Isasi Date: Mon, 23 Sep 2019 09:59:10 -0500 Subject: [PATCH 4/4] Translated #1444 into Spanish Added company note in footer and description in out about page. --- _data/snippets.yml | 1 + es/acerca-de.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_data/snippets.yml b/_data/snippets.yml index e7f333323a..ac941bea48 100644 --- a/_data/snippets.yml +++ b/_data/snippets.yml @@ -209,6 +209,7 @@ footer: en: | This project is administered by ProgHist Limited, Company Number 12192946. es: | + Este proyecto es administrado por ProgHist Limited, con número de compañía 12192946. fr: | Ce projet est administré par ProgHist Limited, no d'immatriculation 12192946. diff --git a/es/acerca-de.md b/es/acerca-de.md index 93fb927d29..1d90e8f158 100644 --- a/es/acerca-de.md +++ b/es/acerca-de.md @@ -29,9 +29,9 @@ _The Programming Historian en español_ (ISSN {{ site.data.snippets.issn[page.la En The Programming Historian estamos comprometidos con la diversidad y defendemos la necesidad de mantener un espacio de trabajo sin ningún tipo de acoso u hostigamiento basado en el género, identidad, orientación sexual, capacidades, físico, peso, etnia, edad, religión o nivel de conocimiento técnico de los participantes y colaboradores. Asimismo, nuestro compromiso con la diversidad se extiende a la composición del Consejo Editorial garantizando que los miembros de un mismo género o nacionalidad no alcanzan una ratio superior al 50% +1 del total. Con esto pretendemos que el proyecto se siga beneficiando de puntos de vista distintos. La medida está sujeta a revisiones futuras, por lo que aceptamos el envío de sugerencias de los miembros de la comunidad. ## Financiamiento y propiedad -Para ver un listado de patrocinadores y ayudas, visita nuestra página '[Apóyanos](/es/apoyanos)'. +Programming Historian es un proyecto internacional impulsado por voluntarios. Sus actividades financieras son administradas por ProgHist Limited, una organización sin fines de lucro limitada por garantía que está registrada en Inglaterra, con número de compañía 12192946. El proyecto es publicado por el consejo editorial de *Programming Historian*. -*The Programming Historian* es un proyecto impulsado por voluntarios y publicado por su Consejo Editorial. +Para ver un listado de patrocinadores y ayudas, visita nuestra página '[Apóyanos](/es/apoyanos)'. ## Historia del proyecto