PR#1086: Python2 to Python3 convert process - fedora-websites

fedora-websites

#1086 Python2 to Python3 convert process

Closed 2 years ago by thunderbirdtr. Opened 2 years ago by thunderbirdtr.

Unknown source py3-fpo into main

Merge branch 'master' into py3-fpo

Onuralp SEZER • 2 years ago

9ee67ed

Makefile.in

file modified

+6 -3

		`@@ -27,7 +27,7 @@`
		`fi \`
		`fi`

		`- all:: $(LANGUAGES)`
		`+ all:: en $(LANGUAGES)`
		`cp static/robots.txt out/`

		`static:`
		`@@ -44,12 +44,15 @@`
		`for me to get its name.. Please use a wise name."`
		`endif`

		`+ po/en.po: pot`
		`+ msginit -i $(POT_FILE) --no-translator -l en -o po/en.po`
		`+`
		`data/templates/translations.html: po/LINGUAS`
		`$(PYTHON) $(BUILDDIR)/construct-translations.py $(BUILDDIR)/translations.ini $^ $@`

		`msgmerge: $(wildcard po/*.po)`

		`- pushpot:`
		`+ pushpot: pot`
		`git clone ssh://git@pagure.io/fedora-web/translations.git $(TRANS_TMP)`
		`cp $(POT_FILE) $(TRANS_TMP)/$(TRANS_FOLDER)/`
		`touch $(TRANS_TMP)/$(TRANS_FOLDER)/LINGUAS`
		`@@ -59,7 +62,7 @@`
		`rm -rf $(TRANS_TMP)`

		`pullpos:`
		`- git clone ssh://git@pagure.io/fedora-web/translations.git $(TRANS_TMP)`
		`+ git clone https://pagure.io/fedora-web/translations.git $(TRANS_TMP)`
		`cp -R $(TRANS_TMP)/$(TRANS_FOLDER)/*.po ./po/`
		`cp -R $(TRANS_TMP)/$(TRANS_FOLDER)/LINGUAS ./po/`
		`rm -rf $(TRANS_TMP)`

alt.fedoraproject.org/Makefile

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`include ../Makefile.in`

		`- $(LANGUAGES): % : \| static po/%.mo data/templates/translations.html`
		`+ en $(LANGUAGES): % : \| static po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

alt.fedoraproject.org/data/content/alt/index.html

file modified

+3 -3

		`@@ -431,7 +431,7 @@`
		`<div class="col-md-4 col-xs-12">`
		`<div class="col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-arm</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-arm'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-arm</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-arm'))}</p>`
		`</div>`
		`</div>`
		`</div>`
		`@@ -759,7 +759,7 @@`
		`<div class="col-md-4 col-xs-12">`
		`<div class="col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-ppc</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-ppc'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-ppc</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-ppc'))}</p>`
		`</div>`
		`</div>`
		`</div>`
		`@@ -1051,7 +1051,7 @@`
		`<div class="col-md-4 col-xs-12">`
		`<div class="col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-s390x</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-s390x'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-s390x</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-s390x'))}</p>`
		`</div>`
		`</div>`
		`</div>`

alt.fedoraproject.org/data/content/cloud/index.html

file modified

+1 -1

		`@@ -583,7 +583,7 @@`
		`<div class="col-md-4 col-xs-12">`
		`<div class="col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-cloud</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-cloud'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-cloud</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-cloud'))}</p>`
		`</div>`
		`</div>`
		`</div>`

alt.fedoraproject.org/data/content/prerelease/index.html

file modified

+1 -1

		`@@ -991,7 +991,7 @@`
		`<div class="col-md-4 col-xs-12">`
		`<div class="col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Discussion of Fedora testing takes place in the <a href="%s">#fedora-qa</a> IRC channel on <strong>irc.freenode.org.</strong>') % ('http://webchat.freenode.net/?channels=fedora-qa'))}</p>`
		`+ <p>${Markup(_('Discussion of Fedora testing takes place in the <a href="%s">#fedora-qa</a> IRC channel on <strong>irc.libera.chat.</strong>') % ('https://web.libera.chat/?channels=#fedora-qa'))}</p>`
		`</div>`
		`</div>`
		`</div>`

arm.fedoraproject.org/Makefile

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`include ../Makefile.in`

		`- $(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`+ en $(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

arm.fedoraproject.org/data/content/index.html

file modified

+1 -1

		`@@ -594,7 +594,7 @@`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-arm</a> irc channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-arm'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-arm</a> irc channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-arm'))}</p>`
		`</div>`
		`</div>`
		`<div class="row top-margin">`

arm.fedoraproject.org/data/content/prerelease.html

file modified

+2 -2

		`@@ -23,7 +23,7 @@`
		`</div>`
		`<div class="row">`
		`<div class="col-md-12 text-center">`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">ARM Team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'https://fedoraproject.org/wiki/Architectures/ARM', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/arm', 'team_irc':'#fedora-arm'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">ARM Team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'https://fedoraproject.org/wiki/Architectures/ARM', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/arm', 'team_irc':'#fedora-arm'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
		`@@ -261,7 +261,7 @@`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-arm</a> irc channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-arm'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-arm</a> irc channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-arm'))}</p>`
		`</div>`
		`</div>`
		`<div class="row top-margin">`

boot.fedoraproject.org/Makefile

file modified

		`@@ -1,5 +1,8 @@`
		`include ../Makefile.in`

		`+ # retired`
		`+ pullpos: ;`
		`+`
		`$(LANGUAGES): % : \| static po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

budget.fedoraproject.org/Makefile

file modified

		`@@ -1,5 +1,8 @@`
		`include ../Makefile.in`

		`+ # no translation`
		`+ pullpos: ;`
		`+`
		`$(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

build.d/buildconf.py

file modified

+2 -1

		`@@ -1,6 +1,7 @@`
		`#!/usr/bin/python`
		`import sys`
		`- languages = []`
		`+`
		`+ languages = [("en", "en"),]`

		`linguasfile = sys.argv[1]`
		`linguas = open(linguasfile)`

build.d/construct-translations.py

file modified

+3 -1

		`@@ -1,6 +1,7 @@`
		`#!/bin/env python`

		`import configparser, sys, os`
		`+ import langtable`

		`'''`
		`This script takes the contents of the website-specific LINGUAS file, constructs an options menu for the languages contained therein.`
		`@@ -40,7 +41,8 @@`
		`lang = lang.strip()`
		`if lang and not lang.startswith('#') and not lang in banned:`
		`#output.write(' <option value="' + lang + '" py:attrs="{\'selected\': lang == \'' + lang + '\' and \'selected\' or None}">' + language_map.get('Languages',lang) + '</option>\n')`
		`- output.write(", '"+lang+"': '"+language_map.get('Languages',lang)+"'")`
		`+ #output.write(", '"+lang+"': '"+language_map.get('Languages',lang)+"'")`
		`+ output.write(", '"+lang+"': '"+langtable.language_name(languageId=lang).encode('utf-8')+"'")`
		`finally:`
		`linguas.close()`
		`output.write("""}`

docs/source/index.rst

file modified

+1 -1

		`@@ -21,7 +21,7 @@`
		`Contact Information`
		`===================`

		- * IRC: ``#fedora-websites`` on irc.freenode.net
		+ * IRC: ``#fedora-websites`` on irc.libera.chat
		* Mailing List: `websites@lists.fedoraproject.org <https://lists.fedoraproject.org/archives/list/websites@lists.fedoraproject.org/>`_
		* Issue tracker: `Fedora Websites Trac Tickets <https://fedorahosted.org/fedora-websites/newticket>`_

fedoracommunity.org/Makefile

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`include ../Makefile.in`

		`- $(LANGUAGES): % : \| static po/%.mo data/templates/translations.html`
		`+ en $(LANGUAGES): % : \| static po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

fedoracommunity.org/data/content/latam.html

file modified

+1 -1

		`@@ -37,7 +37,7 @@`
		`</tr><tr>`

		`<th>${_('Chat')}</th>`
		`- <td><a href="#">#fedora-latam</a> ${Markup(_('on <a href="%s">irc.freenode.net</a>' % '#'))}</td>`
		`+ <td><a href="#">#fedora-latam</a> ${Markup(_('on <a href="%s">irc.libera.chat</a>' % '#'))}</td>`
		`</tr><tr>`
		`<th>${_('Events')}</th>`
		`<td>${Markup(_('<a href="%s">LATAM events listing</a> on the Fedora Project wiki.' % '#'))}</td>`

fedoracommunity.org/data/templates/footer.html

file modified

+1 -1

		`@@ -31,7 +31,7 @@`
		`<dl>`
		`<dt>${_('Support')}</dt>`
		`<dd><a href="https://fedoraproject.org/wiki/Communicating_and_getting_help">${_('Get Help')}</a></dd>`
		`- <dd><a href="irc://irc.freenode.org/#fedora">${_('IRC Help')}</a></dd>`
		`+ <dd><a href="irc://irc.libera.chat/#fedora">${_('IRC Help')}</a></dd>`
		`<dd><a href="https://admin.fedoraproject.org/mailman/listinfo/users">${_('Mailing List Help')}</a></dd>`
		`<dd><a href="http://ask.fedoraproject.org/">${_('Ask Fedora')}</a></dd>`
		`<dd><a href="https://docs.fedoraproject.org/">${_('Documentation')}</a></dd>`

fedoraproject.org/Makefile

file modified

		`@@ -1,5 +1,8 @@`
		`include ../Makefile.in`

		`+ # retired?`
		`+ pullpos: ;`
		`+`
		`$(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

fedoraproject.org/data/content/get-prerelease.html

file modified

+4 -4

		`@@ -98,7 +98,7 @@`
		`<!-- tab "panes" -->`
		`<div id="desktop-versions">`
		`<noscript><a name="overview"><hr /></a></noscript>`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
		`@@ -140,7 +140,7 @@`

		`<div id="desktop-versions">`
		`<noscript><a name="server"><hr /></a></noscript>`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Server Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Server', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/server', 'team_irc':'#fedora-server'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Server Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/Server', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/server', 'team_irc':'#fedora-server'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
		`@@ -232,7 +232,7 @@`

		`<div id="desktop-versions">`
		`<noscript> <a name="workstation"><hr /></a> </noscript>`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Workstation Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Workstation', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/desktop', 'team_irc':'#fedora-workstation'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Workstation Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/Workstation', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/desktop', 'team_irc':'#fedora-workstation'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
		`@@ -327,7 +327,7 @@`

		`<div id="desktop-versions">`
		`<noscript><a name="cloud"><hr /></a></noscript>`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Cloud Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Cloud Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}

fedoraproject.org/data/content/get-spin-prerelease.html

file modified

+4 -4

		`@@ -98,7 +98,7 @@`
		`<!-- tab "panes" -->`
		`<div id="desktop-versions">`
		`<noscript><a name="desk-spins"><hr /></a></noscript>`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
		`@@ -226,7 +226,7 @@`

		`<div id="desktop-versions">`
		`<noscript><a name="more-spins"><hr /></a></noscript>`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
		`@@ -391,7 +391,7 @@`

		`<div id="desktop-versions">`
		`<noscript><a name="arm"><hr /></a></noscript>`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">ARM team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Architectures/ARM', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/arm', 'team_irc':'#fedora-arm'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">ARM team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/Architectures/ARM', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/arm', 'team_irc':'#fedora-arm'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
		`@@ -478,7 +478,7 @@`

		`<div id="desktop-versions">`
		`<noscript><a name="docker"><hr /></a></noscript>`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Cloud Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Cloud Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}

fedoraproject.org/data/content/sponsors.html

file modified

+1 -1

		`@@ -73,7 +73,7 @@`
		`</div>`
		`<div class="grid_16">`
		`<h4>${_('Interested in sponsoring something for Fedora?')}</h4>`
		- <p>${_('Interested in sponsoring something for Fedora? Contact ')} <a href="mailto:admin@fedoraproject.org">admin@fedoraproject.org</a> ${Markup(_('or stop by <strong>#fedora-admin</strong> on <strong>irc.freenode.net</strong>.'))}</p>
		+ <p>${_('Interested in sponsoring something for Fedora? Contact ')} <a href="mailto:admin@fedoraproject.org">admin@fedoraproject.org</a> ${Markup(_('or stop by <strong>#fedora-admin</strong> on <strong>irc.libera.chat</strong>.'))}</p>

		`<p id="section-nav-bottom"><a href="/">< ${_('Return to the main Fedora website.')}</a></p>`
		`</div>`

fedoraproject.org/data/content/using/life/chrisbredesen.html

file modified

+1 -1

		`@@ -34,7 +34,7 @@`
		`<p>${Markup(_('Principal Software Engineer at <a href=\"http://redhat.com\">Red Hat</a>.'))}</p>`

		`<h4>${_('What\'s your IRC nick?')}</h4>`
		`- <p>${_('When I\'m on Freenode/Codehaus, etc, I use \'cbredesen\' so as to be transparent about my identity. Here at Red Hat, I go by \'breddy\' which is a casual shortening of my last name given to me by a college buddy. I decided to keep it as a nick because it is vaguely similar to the first name of one of my Norwegian ancestors, Brede, (from whom my last name is derived).')}</p>`
		`+ <p>${_('When I\'m on Libera.Chat/Codehaus, etc, I use \'cbredesen\' so as to be transparent about my identity. Here at Red Hat, I go by \'breddy\' which is a casual shortening of my last name given to me by a college buddy. I decided to keep it as a nick because it is vaguely similar to the first name of one of my Norwegian ancestors, Brede, (from whom my last name is derived).')}</p>`

		`<h4>${_('How did you first become a Java developer?')}</h4>`
		<p>${_('My degree is in Computer Science but I\'d not been interested in a career in software development for whatever reason so I went down the sysadmin path. I had been doing server administration for many years, building mainly departmental and corporate Windows networks. I decided to get back into programming around 2001 and, due to circumstances, moved into a role doing Visual Basic development. Not long after I joined, we changed platforms from VB/C++/Windows to Java/*NIX/Linux. The rest is history.')}</p>

fedoraproject.org/data/templates/foot.html

file modified

+1 -1

		`@@ -26,7 +26,7 @@`
		`<dl>`
		`<dt>${_('Support')}</dt>`
		`<dd><a href="http://fedoraproject.org/${lang}/get-help">${_('Get Help')}</a></dd>`
		`- <dd><a href="irc://irc.freenode.org/#fedora">${_('IRC Help')}</a></dd>`
		`+ <dd><a href="irc://irc.libera.chat/#fedora">${_('IRC Help')}</a></dd>`
		`<dd><a href="https://admin.fedoraproject.org/mailman/listinfo/users">${_('Mailing List Help')}</a></dd>`
		`<dd><a href="http://ask.fedoraproject.org/">${_('Ask Fedora')}</a></dd>`
		`<dd><a href="http://docs.fedoraproject.org/">${_('Documentation')}</a></dd>`

flocktofedora.org/Makefile

file modified

		`@@ -1,5 +1,8 @@`
		`include ../Makefile.in`

		`+ # Not translated, yet`
		`+ pullpos: ;`
		`+`
		`$(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

flocktofedora.org/data/content/index.html

file modified

+1 -1

		`@@ -326,7 +326,7 @@`
		`<div class="large-icon"><i class="fa fa-credit-card"></i></div>`
		`<h2>Sponsors</h2><br/>`
		`<p>`
		`- Sponsorship opportunities are still open. For information, contact <a href="mailto:flockinfo@fedoraproject.org">flockinfo@fedoraproject.org</a>.`
		`+ Sponsorship opportunities are still open. For information, see the <a href="../../static/images/sponsor-prospectus-2021.pdf">prospectus</a> or contact <a href="mailto:flockinfo@fedoraproject.org">flockinfo@fedoraproject.org</a>.`
		`</p>`
		`<br/>`
		`<h3>Platinum Level</h3>`

flocktofedora.org/static/images/sponsor-prospectus-2021.pdf

file added

empty or binary file added

getfedora.org/Makefile

file modified

		`@@ -1,5 +1,8 @@`
		`include ../Makefile.in`

		`+ # moved (see fedora-web/websites)`
		`+ pullpos: ;`
		`+`
		`$(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

labs.fedoraproject.org/Makefile

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`include ../Makefile.in`

		`- $(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`+ en $(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

labs.fedoraproject.org/data/content/astronomy/download/index.html

file modified

+1 -1

		`@@ -142,7 +142,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-astronomy</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-astronomy'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-astronomy</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-astronomy'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/astronomy/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-astronomy</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-astronomy'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-astronomy</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-astronomy'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/design-suite/download/index.html

file modified

+1 -1

		`@@ -142,7 +142,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-design</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-design'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-design</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-design'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/design-suite/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-design</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-design'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-design</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-design'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/games/download/index.html

file modified

+1 -1

		`@@ -138,7 +138,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/games/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/jam/download/index.html

file modified

+1 -1

		`@@ -138,7 +138,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-audio</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-audio'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-audio</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-audio'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/jam/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-audio</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-audio'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-audio</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-audio'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/prerelease.html

file modified

+1 -1

		`@@ -22,7 +22,7 @@`
		`</div>`
		`<div class="row">`
		`<div class="col-md-12 text-center">`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA Team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA Team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}

labs.fedoraproject.org/data/content/robotics/download/index.html

file modified

+1 -1

		`@@ -138,7 +138,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-robotics</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-robotics'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-robotics</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-robotics'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/robotics/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-robotics</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-robotics'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-robotics</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-robotics'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/scientific/download/index.html

file modified

+1 -1

		`@@ -156,7 +156,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-science</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-science'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-science</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-science'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/scientific/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-science</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-science'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-science</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-science'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/security/download/index.html

file modified

+1 -1

		`@@ -138,7 +138,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/content/security/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/templates/comp-neuro/supportresources.html

file modified

+1 -1

		`@@ -16,7 +16,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-neuro</a> IRC channel on <strong>irc.freenode.org</strong> and the <a href="%s">NeuroFedora</a> supergroup on Telegram for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-neuro', 'https://t.me/NeuroFedora'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-neuro</a> IRC channel on <strong>irc.libera.chat</strong> and the <a href="%s">NeuroFedora</a> supergroup on Telegram for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-neuro', 'https://t.me/NeuroFedora'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

labs.fedoraproject.org/data/templates/python-classroom/supportresources.html

file modified

+1 -1

		`@@ -16,7 +16,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-python</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-python'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-python</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-python'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/Makefile

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`include ../Makefile.in`

		`- $(LANGUAGES): % : \| static po/%.mo data/templates/translations.html`
		`+ en $(LANGUAGES): % : \| static po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

spins.fedoraproject.org/data/content/cinnamon/download/index.html

file modified

+1 -1

		`@@ -142,7 +142,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-cinnamon</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-cinnamon'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-cinnamon</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-cinnamon'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/cinnamon/index.html

file modified

+1 -1

		`@@ -151,7 +151,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-cinnamon</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-cinnamon'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-cinnamon</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-cinnamon'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/i3/download/index.html

file modified

+1 -1

		`@@ -147,7 +147,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('General help is available in <a href="%s">#fedora-i3</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-i3'))}</p>`
		`+ <p>${Markup(_('General help is available in <a href="%s">#fedora-i3</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-i3'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/i3/index.html

file modified

+1 -1

		`@@ -191,7 +191,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('General help is available in <a href="%s">#fedora-i3</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-i3'))}</p>`
		`+ <p>${Markup(_('General help is available in <a href="%s">#fedora-i3</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-i3'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/kde/download/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-kde</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-kde'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-kde</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-kde'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/kde/index.html

file modified

+1 -1

		`@@ -190,7 +190,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-kde</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-kde'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-kde</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-kde'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/lxde/download/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#lxde</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=lxde'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#lxde</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#lxde'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/lxde/index.html

file modified

+1 -1

		`@@ -151,7 +151,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#lxde</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=lxde'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#lxde</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#lxde'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/lxqt/download/index.html

file modified

+1 -1

		`@@ -147,7 +147,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('General help is available in <a href="%s">#fedora-lxqt</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-lxqt'))}</p>`
		`+ <p>${Markup(_('General help is available in <a href="%s">#fedora-lxqt</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-lxqt'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/lxqt/index.html

file modified

+1 -1

		`@@ -150,7 +150,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('General help is available in <a href="%s">#fedora-lxqt</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-lxqt'))}</p>`
		`+ <p>${Markup(_('General help is available in <a href="%s">#fedora-lxqt</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-lxqt'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/mate-compiz/download/index.html

file modified

+1 -1

		`@@ -143,7 +143,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-mate</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-mate'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-mate</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-mate'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/mate-compiz/index.html

file modified

+1 -1

		`@@ -156,7 +156,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-mate</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-mate'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#fedora-mate</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#fedora-mate'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/prerelease.html

file modified

+1 -1

		`@@ -23,7 +23,7 @@`
		`</div>`
		`<div class="row">`
		`<div class="col-md-12 text-center">`
		`- <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA Team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`+ <p class="warning">${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">QA Team</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on Libera.Chat.') % {'team_url':'http://fedoraproject.org/wiki/QA', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/test', 'team_irc':'#fedora-qa'})}`
		`${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}`
		`<py:choose>`
		<py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}

spins.fedoraproject.org/data/content/soas/download/index.html

file modified

+1 -1

		`@@ -147,7 +147,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#sugar</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=sugar'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#sugar</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#sugar'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/soas/index.html

file modified

+1 -1

		`@@ -190,7 +190,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#sugar</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=sugar'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#sugar</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#sugar'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/xfce/download/index.html

file modified

+1 -1

		`@@ -147,7 +147,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#xfce</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=xfce'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#xfce</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#xfce'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

spins.fedoraproject.org/data/content/xfce/index.html

file modified

+1 -1

		`@@ -146,7 +146,7 @@`
		`<div class="row top-margin">`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>`
		`- <p>${Markup(_('Users and developers are available in the <a href="%s">#xfce</a> IRC channel on <strong>irc.freenode.org</strong> for real-time chat.') % ('http://webchat.freenode.net/?channels=xfce'))}</p>`
		`+ <p>${Markup(_('Users and developers are available in the <a href="%s">#xfce</a> IRC channel on <strong>irc.libera.chat</strong> for real-time chat.') % ('https://web.libera.chat/?channels=#xfce'))}</p>`
		`</div>`
		`<div class="col-md-4 col-xs-12 text-center">`
		`<h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>`

start.fedoraproject.org/Makefile

file modified

+3 -2

		`@@ -1,8 +1,9 @@`
		`include ../Makefile.in`

		`- $(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`+ en $(LANGUAGES): % : \| static rss-cache po/%.mo data/templates/translations.html`
		`$(PYTHON) $(BUILDDIR)/build.py -o out -i data/content -l $@ -p po -b $(BASEPATH)`

		`rss-cache:`
		`@echo Caching Magazine Feed...`
		`- $(PYTHON) $(PWD)/build/magfeed.py -o out -s static -b $(BASEPATH)`
		`\ No newline at end of file`
		`+ $(PYTHON) $(PWD)/build/magfeed.py -o out -s static -b $(BASEPATH)`
		`+`

thunderbirdtr commented 2 years ago

build.py

python syntax errors fixed (such as print)
line 150 : translation part opened with "rb"
line 243 : template.generate "encoding removed"

buildconf.py

python syntax errors fixed (such as print)
lang_regex list(zip()) fixed

construct-translatins.py

rename ConfigParser to configparser
readfp to "read_file" (new way)

rss.py

python syntax errors fixed

Tested websites;

labs.fedoraproject.org
arm.fedoraproject.org
boot.fedoraproject.org
mirrors.fedoraproject.org (always working)
flock.fedoraproject.org
fedorapeople.org (not python releated because it just a shell script file)
fedoracommunity.org
budget.fedoraproject.org
spins.fedoraproject.org

1 new commit added

time library removed

2 years ago

thunderbirdtr commented 2 years ago

This merge require : https://pagure.io/fedora-websites/pull-request/1084 for new py3 package dependencies.

thunderbirdtr commented 2 years ago

CC @t0xic0der @codeblock @asamalik

t0xic0der commented 2 years ago

LGTM.

I have been there with @thunderbirdtr with his screen shared when the changes were made and tested, so I am certain that these do work.

Metadata Update from @t0xic0der:
- Request assigned

2 years ago

rebased onto 9ee67ed

2 years ago

thunderbirdtr commented 2 years ago

@t0xic0der merge conflict solved. Please re-check.

t0xic0der commented 2 years ago

Hi Onuralp,

I am doing some checks again from my end and I have also asked @lilyx to
one test run as well. :)

On Fri, Jun 18, 2021 at 11:40 AM Onuralp SEZER pagure@pagure.io wrote:

thunderbirdtr commented on the pull-request: Python2 to Python3 convert process that you are following:
@t0xic0der merge conflict solved. Please re-check.

To reply, visit the link below or just reply to this email
https://pagure.io/fedora-websites/pull-request/1086

--
Thanks and regards,
Akashdeep Dhar
t0xic0der@fedoraproject.org

t0xic0der commented 2 years ago

Hi @thunderbirdtr,

Could you please amend your recent commit https://pagure.io/fork/thunderbirdtr/fedora-websites/c/9ee67ed2b7e1cc27bbbc85f32d20c25f7280e61c to have a more correct message and then make a force-push?

Thanks, @sayanchowdhury for marking this out.

t0xic0der commented 2 years ago

Hi @thunderbirdtr,

The fedoraproject.org directory would take some looking into.

Here's an error log.

[root@7a69537ccc22 fedoraproject.org]# make es testfg
python3 /data/fedora-websites/fedoraproject.org/../build.d/build.py -o out -s static -b /
Traceback (most recent call last):
  File "/data/fedora-websites/fedoraproject.org/../build.d/build.py", line 49, in <module>
    from rss import *
  File "build/rss.py", line 35
    print 'ERROR: ' + str(main_feed['bozo_exception'])
          ^
SyntaxError: invalid syntax
make: *** [../Makefile.in:34: static] Error 1

darknao commented 2 years ago

I think the last merge in this PR goes sideways, and I don't see anything related to the py3 migration anymore.

I went ahead and rebase everything in a new branch to make it simpler.
https://pagure.io/fork/darknao/fedora-websites/commits/rebase_py3

The last 5 commits in my fork are the relevant ones.
Additionally, I've included a fix for my last merge (#1081) to be py3 compatible, and fixed the fedoraproject.org build.
Note about that last one: fedoraproject.org doesn't really need to be built anymore, as it is now a simple redirect to getfedora.org. It can be probably be removed from this repo.

Finally, you'll find an update of the Dockerfile (same as #1084) with an additional package (python3-langtable) which is a requirements from #1081.

Build have been tested on following websites:
labs.fedoraproject.org
arm.fedoraproject.org
alt.fedoraproject.org
flocktofedora.org
spins.fedoraproject.org
fedoracommunity.org
start.fedoraproject.org
fedoraproject.org

You probably already know this, but you should be very careful about merging this PR on master.
The production build system is using an old RHEL7 vm that doesn't meet any of your python3 requirements. This means the build will break as soon as this PR is merged, unless you are already in sync with someone from infra for that. In that case, please disregard my comment.
(I can also help on this topic, if needed ;) )

Metadata Update from @jflory7:
- Pull-request tagged with: tools

2 years ago

t0xic0der commented 2 years ago

As @jflory7 suggested here https://pagure.io/fedora-websites/pull-request/1084#comment-160625, would we want to include the updated Dockerfile in this same PR so as to simplify two related changes into one PR?

CC @thunderbirdtr @darknao

darknao commented 2 years ago

The websites build pipeline is now hosted on Openshift, and can be safely upgraded to fedora:36 / python3.

Pull-Request has been closed by thunderbirdtr

2 years ago

thunderbirdtr commented 2 years ago

This change won't be require since new website is coming.