From c17516637e5fbd93b959f91e488708c697f316d5 Mon Sep 17 00:00:00 2001 From: luna Date: Fri, 7 Apr 2023 18:51:25 -0500 Subject: [PATCH] Changed back edited news articles for everything besides handles. Updated Gitter to Discord. Added rel="me" links to the layout page. --- README.rst | 4 +- assets/README.rst | 93 ------------------- .../making-a-coc-complaint/contents+de.lr | 2 +- .../making-a-coc-complaint/contents+es.lr | 2 +- .../making-a-coc-complaint/contents+pt.lr | 2 +- .../making-a-coc-complaint/contents.lr | 2 +- content/community/getting-help/contents+ar.lr | 2 +- content/community/getting-help/contents+es.lr | 2 +- content/community/getting-help/contents+pt.lr | 2 +- content/contents.lr | 2 +- .../contents+es.lr | 4 +- .../contents.lr | 6 +- .../buzz/money-money-money/contents+es.lr | 2 +- .../news/buzz/money-money-money/contents.lr | 2 +- .../contents.lr | 2 +- templates/layout.html | 7 ++ 16 files changed, 25 insertions(+), 111 deletions(-) delete mode 100644 assets/README.rst diff --git a/README.rst b/README.rst index 5a92691..1032ffc 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,7 @@ You can talk to the community through: * `@beeware@fosstodon.org on Mastodon`_ -* BeeWare Gitter channel: `beeware/general`_ +* BeeWare Discord server: `Discord`_ * `Tickets on the beeware.github.io issue tracker`_ @@ -69,7 +69,7 @@ to date with the original branch. To do this: .. _BeeWare project: http://beeware.org .. _@beeware@fosstodon.org on Mastodon: https://fosstodon.org/@beeware -.. _beeware/general: https://gitter.im/beeware/general +.. _Discord: https://beeware.org/bee/chat/ .. _Tickets on the beeware.github.io issue tracker: https://github.com/beeware/beeware.github.io/issues .. _log them on Github: https://github.com/beeware/beeware.github.io/issues .. _fork the code: https://github.com/beeware/beeware.github.io/tree/lektor diff --git a/assets/README.rst b/assets/README.rst deleted file mode 100644 index 4f55650..0000000 --- a/assets/README.rst +++ /dev/null @@ -1,93 +0,0 @@ -.. image:: http://beeware.org/static/images/brutus-270.png - :width: 72px - :target: https://beeware.org - -beeware.github.io -================= - -This is the homepage for the `BeeWare project`_. - -It is a `Lektor`_-based site. - -If you want to contribute a modification, you can fork this repository and -submit a pull request. However, **do not fork the master branch** - fork the -`lektor branch`_ and make changes there instead. - -.. _lektor branch: https://github.com/beeware/beeware.github.io/tree/lektor - -If you want to test out a change before you submit it, download and install -`Lektor`_ (note: currently it's better to use Lektor with Python 2.7): - - $ pip install lektor - -Then from the root directory of the checkout, run: - - $ lektor server - -.. _Lektor: https://getlektor.com - -This will `start a webserver`_ that will autoreload whenever you make a change -to site content. - -.. _start a webserver: http://127.0.0.1:5000 - -Community ---------- - -You can talk to the community through: - -* `@beeware@fosstodon.org on Mastodon`_ - -* BeeWare Gitter channel: `beeware/general`_ - -* `Tickets on the beeware.github.io issue tracker`_ - -Contributing ------------- - -If you find problems with this website, `log them on GitHub`_. If you -want to contribute, please `fork the code`_ and `submit a pull request`_. - -Before submitting a pull request, please make sure your forked branch is up -to date with the original branch. To do this: - -- set your upstream remote:: - - $ git remote add upstream https://github.com/beeware/beeware.github.io.git - -- make sure you have the latest changes from upstream:: - - $ git fetch upstream - -- rebase your **lektor** branch to **upstream** before pushing to git and - submitting a pull request:: - - $ git rebase upstream/lektor - - -.. _BeeWare project: http://beeware.org -.. _@beeware@fosstodon.org on Mastodon: https://mastodon.social/@beeware@fosstodon.org -.. _beeware/general: https://gitter.im/beeware/general -.. _Tickets on the beeware.github.io issue tracker: https://github.com/beeware/beeware.github.io/issues -.. _log them on Github: https://github.com/beeware/beeware.github.io/issues -.. _fork the code: https://github.com/beeware/beeware.github.io/tree/lektor -.. _submit a pull request: https://github.com/beeware/beeware.github.io/pulls - - -Translating ------------ - -Want to make BeeWare more accessible to non-English-speakers? Help translate the site! Steps are as follows: - -1. Add language specification to `BeeWare.lektorproject `_. - - Fill out the name of the language, its url prefix, and the locale. Make sure you use the correct `ISO 639-1 `_ locale code - for many countries, it's not the same as - the national TLD. For example, the ISO 639-1 Danish locale is 'da', but Denmark uses the '.dk' TLD. - -2. Add an entry for your language to the `Atom configuration `_. - -3. Add your first translation, by translating the names for the menus at the top of each page. Edit `the menus translation file `_, adding a block for your language. - -4. Start adding translations for content pages ont he site. Translated files are at the same directory level as the primary English files, but have a language suffix. For example, Arabic's locale is 'ar', so you would add `contents+ar.lr` wherever the original file name is `contents.lr` - -A great place to start translating is the `contributing section `_. diff --git a/content/community/behavior/making-a-coc-complaint/contents+de.lr b/content/community/behavior/making-a-coc-complaint/contents+de.lr index c6187e5..99759c1 100644 --- a/content/community/behavior/making-a-coc-complaint/contents+de.lr +++ b/content/community/behavior/making-a-coc-complaint/contents+de.lr @@ -45,7 +45,7 @@ Sobald der Arbeitsgruppe ein vollständiger Bericht über die Ereignisse vorlieg * Eine private Abmahnung der Arbeitsgruppe an die betroffene(n) Person(en). * Eine öffentliche Abmahnung. * Ein Zwangsurlaub (d.h. jemanden zu bitten, "eine Woche Urlaub" von einer Mailingliste oder einem IRC zu nehmen). -* Ein dauerhaftes oder vorübergehendes Zugangsverbot für einige oder alle BeeWare-Bereiche (GitHub-Repositories, Gitter-Räume, etc.). +* Ein dauerhaftes oder vorübergehendes Zugangsverbot für einige oder alle BeeWare-Bereiche (GitHub-Repositories, Discord, etc.). * Die Bitte um eine öffentliche oder private Entschuldigung. Wir werden der Person, die die Meldung eingereicht hat, innerhalb einer Woche antworten, entweder mit einer Entschlussfassung oder einer Erklärung, warum die Situation noch nicht geklärt ist. diff --git a/content/community/behavior/making-a-coc-complaint/contents+es.lr b/content/community/behavior/making-a-coc-complaint/contents+es.lr index 4181e4d..8225980 100644 --- a/content/community/behavior/making-a-coc-complaint/contents+es.lr +++ b/content/community/behavior/making-a-coc-complaint/contents+es.lr @@ -45,7 +45,7 @@ Una vez que el grupo de trabajo tenga una cuenta completa de los eventos, tomar * Una reprimenda privada del grupo de trabajo a las personas involucradas. * Una amonestación pública. * Vacaciones impuestas (es decir, pedirle a alguien que tome "una semana libre" de una lista de correo o IRC). -* Una prohibición permanente o temporal de algunos o todos los espacios de BeeWare (repositorios GitHub, salas Gitter, etc.) +* Una prohibición permanente o temporal de algunos o todos los espacios de BeeWare (repositorios GitHub, Discord, etc.) * Una solicitud de una disculpa pública o privada. Responderemos dentro de una semana a la persona que presentó el informe con una resolución o una explicación de por qué la situación aún no se ha resuelto. diff --git a/content/community/behavior/making-a-coc-complaint/contents+pt.lr b/content/community/behavior/making-a-coc-complaint/contents+pt.lr index c149dca..77f60b9 100644 --- a/content/community/behavior/making-a-coc-complaint/contents+pt.lr +++ b/content/community/behavior/making-a-coc-complaint/contents+pt.lr @@ -42,7 +42,7 @@ Ações podem incluir: * Uma notificação privada do grupo de trabalho para o indivíduo(s) envolvidos. * Uma reprimenda pública. * Uma folga forçada (ex. pedindo para alguém "tirar uma semana de folga" de uma lista de e-mail ou do IRC). -* Um banimento temporário/permanente de alguns ou de todos os espaços do BeeWare (repositórios do GitHub, salas do Gitter, etc.) +* Um banimento temporário/permanente de alguns ou de todos os espaços do BeeWare (repositórios do GitHub, Discord, etc.) * Uma requisição para um pedido para desculpas públicas ou privadas. Nós vamos responder dentro de uma semana para a pessoa que fez a denúncia se houve uma resolução ou uma explicação do porque a situação ainda não foi resolvida. diff --git a/content/community/behavior/making-a-coc-complaint/contents.lr b/content/community/behavior/making-a-coc-complaint/contents.lr index a61ecab..afa0ac6 100644 --- a/content/community/behavior/making-a-coc-complaint/contents.lr +++ b/content/community/behavior/making-a-coc-complaint/contents.lr @@ -45,7 +45,7 @@ Once the working group has a complete account of the events they will make a dec * A private reprimand from the working group to the individual(s) involved. * A public reprimand. * An imposed vacation (i.e. asking someone to "take a week off" from a mailing list or IRC). -* A permanent or temporary ban from some or all BeeWare spaces (GitHub repositories, Gitter rooms, etc.) +* A permanent or temporary ban from some or all BeeWare spaces (GitHub repositories, Discord, etc.) * A request for a public or private apology. We'll respond within one week to the person who filed the report with either a resolution or an explanation of why the situation is not yet resolved. diff --git a/content/community/getting-help/contents+ar.lr b/content/community/getting-help/contents+ar.lr index dce22cd..338c7e0 100644 --- a/content/community/getting-help/contents+ar.lr +++ b/content/community/getting-help/contents+ar.lr @@ -24,4 +24,4 @@ body: سؤال مباشر للمساهمين الرئيسيين ----------------------------------------------- -إذا كنت تريد مساعدة مباشرة و ﻻ تشعر بالإرتياح مع استعمال منتديات عامة، تفضل بالإتصال بأي واحد من `المساهمين الرئيسيين `__, عبر تويتر أو الإيميل أو عبر المحادثة الآنية في Gitter +إذا كنت تريد مساعدة مباشرة و ﻻ تشعر بالإرتياح مع استعمال منتديات عامة، تفضل بالإتصال بأي واحد من `المساهمين الرئيسيين `__, عبر تويتر أو الإيميل أو عبر المحادثة الآنية في Discord diff --git a/content/community/getting-help/contents+es.lr b/content/community/getting-help/contents+es.lr index b3cd960..653e40f 100644 --- a/content/community/getting-help/contents+es.lr +++ b/content/community/getting-help/contents+es.lr @@ -25,6 +25,6 @@ También usamos Github Discussions como foro para discutir proyectos. Si tiene a Preguntas directas a los colaboradores principales --------------------------------------------------- -Si necesitas ayuda directa y no te siente cómodo usando un foro público, por favor, no dudes en ponerte en contacto con cualquier `Colaborador Principal `__, ya sea por correo electrónico, Twitter, Mastodon o Gitter. +Si necesitas ayuda directa y no te siente cómodo usando un foro público, por favor, no dudes en ponerte en contacto con cualquier `Colaborador Principal `__, ya sea por correo electrónico, Twitter, Mastodon o Discord. --- _slug: obtener-ayuda diff --git a/content/community/getting-help/contents+pt.lr b/content/community/getting-help/contents+pt.lr index bf60dab..17d8b6a 100644 --- a/content/community/getting-help/contents+pt.lr +++ b/content/community/getting-help/contents+pt.lr @@ -17,7 +17,7 @@ Também usamos o Github Discussions como um fórum para discutir projetos. Se vo Perguntas Diretas para os Principais Contribuidores --------------------------------------------------------------------- -Se você precisa de ajuda e não se sente confortável de usar um fórum publico, por favor sinta-se a vontade de contatar qualquer um dos `Principais Contribuidores `__, por e-mail, Twitter, Mastodon ou Gitter. +Se você precisa de ajuda e não se sente confortável de usar um fórum publico, por favor sinta-se a vontade de contatar qualquer um dos `Principais Contribuidores `__, por e-mail, Twitter, Mastodon ou Discord. --- sort_key: 3 diff --git a/content/contents.lr b/content/contents.lr index fb879fc..5149f5a 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -138,7 +138,7 @@ is_block: yes #### text-block #### title: ### Stay in touch! ---- -text: Follow `@beeware@fosstodon.org `__ on Mastodon, or `join the BeeWare enthusiasts mailing list `__ for updates, hints, tips, and announcements related to the project. +text: Follow `@beeware@fosstodon.org `__ on Mastodon, or `join the BeeWare enthusiasts mailing list `__ for updates, hints, tips, and announcements related to the project. ---- image: ---- diff --git a/content/news/buzz/come-sprint-with-us-at-pycon-us-2017/contents+es.lr b/content/news/buzz/come-sprint-with-us-at-pycon-us-2017/contents+es.lr index 882dd0d..8934d32 100644 --- a/content/news/buzz/come-sprint-with-us-at-pycon-us-2017/contents+es.lr +++ b/content/news/buzz/come-sprint-with-us-at-pycon-us-2017/contents+es.lr @@ -26,7 +26,7 @@ Con este stand, tenemos dos entradas para la conferencia. Esto incluye: - 3 días de conferencias, salón de exposiciones/feria de trabajo - desayunos, pausas, almuerzos y bolsa de *swag* -La cosa es que tanto `Russell `__ como yo, ya nos hemos registrado. +La cosa es que tanto `Russell `__ como yo, ya nos hemos registrado. Por lo tanto, queremos darte un boleto. @@ -50,7 +50,7 @@ Por favor, `envíanos un correo electrónico! `__ Necesitamos asignar nuestras entradas con anticipación, así que envíanos un correo electrónico **antes del 12 deFebrero, 2017** -Si tiene alguna pregunta solo pregunta `a mi `__ o a `Russell `__! +Si tiene alguna pregunta solo pregunta `a mi `__ o a `Russell `__! ¡Nos encantaría verte allí! ✨ diff --git a/content/news/buzz/come-sprint-with-us-at-pycon-us-2017/contents.lr b/content/news/buzz/come-sprint-with-us-at-pycon-us-2017/contents.lr index 3db08f9..4e1fcd3 100644 --- a/content/news/buzz/come-sprint-with-us-at-pycon-us-2017/contents.lr +++ b/content/news/buzz/come-sprint-with-us-at-pycon-us-2017/contents.lr @@ -33,7 +33,7 @@ With this booth, we get two tickets to the conference. This includes: - breakfasts, breaks, lunches, and - swag bag -Thing is, both `Russell `__ and I have +Thing is, both `Russell `__ and I have already registered. So, we want to give you the ticket. @@ -74,8 +74,8 @@ We need to allocate our tickets early, so please email us **by February 12, 2017** If you have any questions, just ask -`myself `__ or -`Russell `__! +`myself `__ or +`Russell `__! We'd love to see you there! ✨ diff --git a/content/news/buzz/money-money-money/contents+es.lr b/content/news/buzz/money-money-money/contents+es.lr index bbd6cff..7aff095 100644 --- a/content/news/buzz/money-money-money/contents+es.lr +++ b/content/news/buzz/money-money-money/contents+es.lr @@ -308,7 +308,7 @@ En realidad voy a tomar otra posición ligeramente controversial, y *no* voy a t Esta es una discusión que necesitamos tener como comunidad - y estoy ansioso por tener esa discusión - no sólo en esta etapa. * `russell@keith-magee.com `_ -* `@freakboy3742@cloudisland.nz `_ +* `@freakboy3742 `_ * `cecinestpasun.com `_ .. _PyPI: https://pypi.python.org/pypi diff --git a/content/news/buzz/money-money-money/contents.lr b/content/news/buzz/money-money-money/contents.lr index 53db6fa..0cd66c6 100644 --- a/content/news/buzz/money-money-money/contents.lr +++ b/content/news/buzz/money-money-money/contents.lr @@ -307,7 +307,7 @@ I'm actually going to take another slightly controversial position, and *not* ta This is a discussion we need to have as a community - and I'm eager to have that discussion - just not on this stage. * `russell@keith-magee.com `_ -* `@freakboy3742@cloudisland.nz `_ +* `@freakboy3742 `_ * `cecinestpasun.com `_ .. _PyPI: https://pypi.python.org/pypi diff --git a/content/news/buzz/we-have-a-contractor-for-our-android-contract/contents.lr b/content/news/buzz/we-have-a-contractor-for-our-android-contract/contents.lr index 410963d..856b415 100644 --- a/content/news/buzz/we-have-a-contractor-for-our-android-contract/contents.lr +++ b/content/news/buzz/we-have-a-contractor-for-our-android-contract/contents.lr @@ -13,7 +13,7 @@ Asheesh is a `regular speaker at Python events `__; we'll also post larger updates on this blog. +Asheesh will be starting work in mid December, and if all goes well, we should start seeing significant results by mid to late February. If you'd like to keep track of progress, you can `follow BeeWare on Twitter `__; we'll also post larger updates on this blog. --- pub_date: 2019-11-26 --- diff --git a/templates/layout.html b/templates/layout.html index e53b340..526da78 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -197,6 +197,13 @@

{{ t_sitemap }}

+ + + + + + +