From 9ee67ed2b7e1cc27bbbc85f32d20c25f7280e61c Mon Sep 17 00:00:00 2001 From: Onuralp SEZER Date: Jun 18 2021 06:09:08 +0000 Subject: Merge branch 'master' into py3-fpo --- diff --git a/Makefile.in b/Makefile.in index e60dcb9..fda4a9e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,7 +27,7 @@ sync = \ fi \ fi -all:: $(LANGUAGES) +all:: en $(LANGUAGES) cp static/robots.txt out/ static: @@ -44,12 +44,15 @@ else 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 @@ pushpot: 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) diff --git a/alt.fedoraproject.org/Makefile b/alt.fedoraproject.org/Makefile index 5641b94..ab51707 100644 --- a/alt.fedoraproject.org/Makefile +++ b/alt.fedoraproject.org/Makefile @@ -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) diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index 736d53f..e3c908e 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -431,7 +431,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

@@ -759,7 +759,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

@@ -1051,7 +1051,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

diff --git a/alt.fedoraproject.org/data/content/cloud/index.html b/alt.fedoraproject.org/data/content/cloud/index.html index d600f2d..4d292b5 100644 --- a/alt.fedoraproject.org/data/content/cloud/index.html +++ b/alt.fedoraproject.org/data/content/cloud/index.html @@ -583,7 +583,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html index c0fb164..fc450cb 100644 --- a/alt.fedoraproject.org/data/content/prerelease/index.html +++ b/alt.fedoraproject.org/data/content/prerelease/index.html @@ -991,7 +991,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

diff --git a/arm.fedoraproject.org/Makefile b/arm.fedoraproject.org/Makefile index c3ffe4c..8c374bf 100644 --- a/arm.fedoraproject.org/Makefile +++ b/arm.fedoraproject.org/Makefile @@ -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) diff --git a/arm.fedoraproject.org/data/content/index.html b/arm.fedoraproject.org/data/content/index.html index ed7a6ea..c527679 100644 --- a/arm.fedoraproject.org/data/content/index.html +++ b/arm.fedoraproject.org/data/content/index.html @@ -594,7 +594,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

diff --git a/arm.fedoraproject.org/data/content/prerelease.html b/arm.fedoraproject.org/data/content/prerelease.html index 3c9d0e1..dbbfba9 100644 --- a/arm.fedoraproject.org/data/content/prerelease.html +++ b/arm.fedoraproject.org/data/content/prerelease.html @@ -23,7 +23,7 @@
-

${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'})} +

${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/')} ${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 @@

${_('Chat')}

-

${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'))}

+

${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'))}

diff --git a/boot.fedoraproject.org/Makefile b/boot.fedoraproject.org/Makefile index 5641b94..5ebd707 100644 --- a/boot.fedoraproject.org/Makefile +++ b/boot.fedoraproject.org/Makefile @@ -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) diff --git a/budget.fedoraproject.org/Makefile b/budget.fedoraproject.org/Makefile index c3ffe4c..8dc731d 100644 --- a/budget.fedoraproject.org/Makefile +++ b/budget.fedoraproject.org/Makefile @@ -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) diff --git a/build.d/buildconf.py b/build.d/buildconf.py index ca6f8b7..d523d59 100755 --- a/build.d/buildconf.py +++ b/build.d/buildconf.py @@ -1,6 +1,7 @@ #!/usr/bin/python import sys -languages = [] + +languages = [("en", "en"),] linguasfile = sys.argv[1] linguas = open(linguasfile) diff --git a/build.d/construct-translations.py b/build.d/construct-translations.py index d2ae432..7aaeaec 100755 --- a/build.d/construct-translations.py +++ b/build.d/construct-translations.py @@ -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 @@ with open(sys.argv[2], 'r') as linguas: # Linguas is where available languages a lang = lang.strip() if lang and not lang.startswith('#') and not lang in banned: #output.write(' \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("""} diff --git a/docs/source/index.rst b/docs/source/index.rst index c6da855..be44b45 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -21,7 +21,7 @@ This page contains information about the Fedora Websites team. Contact Information =================== -* IRC: ``#fedora-websites`` on irc.freenode.net +* IRC: ``#fedora-websites`` on irc.libera.chat * Mailing List: `websites@lists.fedoraproject.org `_ * Issue tracker: `Fedora Websites Trac Tickets `_ diff --git a/fedoracommunity.org/Makefile b/fedoracommunity.org/Makefile index 5641b94..ab51707 100644 --- a/fedoracommunity.org/Makefile +++ b/fedoracommunity.org/Makefile @@ -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) diff --git a/fedoracommunity.org/data/content/latam.html b/fedoracommunity.org/data/content/latam.html index 3ba0f1a..d96200b 100644 --- a/fedoracommunity.org/data/content/latam.html +++ b/fedoracommunity.org/data/content/latam.html @@ -37,7 +37,7 @@ index=math.ceil(len(contries)/float(2)) ${_('Chat')} - #fedora-latam ${Markup(_('on <a href="%s">irc.freenode.net</a>' % '#'))} + #fedora-latam ${Markup(_('on <a href="%s">irc.libera.chat</a>' % '#'))} ${_('Events')} ${Markup(_('<a href="%s">LATAM events listing</a> on the Fedora Project wiki.' % '#'))} diff --git a/fedoracommunity.org/data/templates/footer.html b/fedoracommunity.org/data/templates/footer.html index a0dd057..1ba91d3 100644 --- a/fedoracommunity.org/data/templates/footer.html +++ b/fedoracommunity.org/data/templates/footer.html @@ -31,7 +31,7 @@
${_('Support')}
${_('Get Help')}
-
${_('IRC Help')}
+
${_('IRC Help')}
${_('Mailing List Help')}
${_('Ask Fedora')}
${_('Documentation')}
diff --git a/fedoraproject.org/Makefile b/fedoraproject.org/Makefile index c3ffe4c..ffcac3e 100644 --- a/fedoraproject.org/Makefile +++ b/fedoraproject.org/Makefile @@ -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) diff --git a/fedoraproject.org/data/content/get-prerelease.html b/fedoraproject.org/data/content/get-prerelease.html index 3c10bb6..4b1e25a 100644 --- a/fedoraproject.org/data/content/get-prerelease.html +++ b/fedoraproject.org/data/content/get-prerelease.html @@ -98,7 +98,7 @@ l_code = l_map.get(lang, dflt_language)
-

${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'})} +

${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/')} ${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 @@ l_code = l_map.get(lang, dflt_language)

-

${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'})} +

${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/')} ${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 @@ l_code = l_map.get(lang, dflt_language)

-

${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'})} +

${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/')} ${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 @@ l_code = l_map.get(lang, dflt_language)

-

${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'})} +

${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/')} ${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'])})} diff --git a/fedoraproject.org/data/content/get-spin-prerelease.html b/fedoraproject.org/data/content/get-spin-prerelease.html index 3c8fbaa..a9734f6 100644 --- a/fedoraproject.org/data/content/get-spin-prerelease.html +++ b/fedoraproject.org/data/content/get-spin-prerelease.html @@ -98,7 +98,7 @@ l_code = l_map.get(lang, dflt_language)

-

${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'})} +

${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/')} ${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 @@ l_code = l_map.get(lang, dflt_language)

-

${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'})} +

${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/')} ${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 @@ l_code = l_map.get(lang, dflt_language)

-

${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'})} +

${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/')} ${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 @@ l_code = l_map.get(lang, dflt_language)

-

${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'})} +

${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/')} ${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'])})} diff --git a/fedoraproject.org/data/content/sponsors.html b/fedoraproject.org/data/content/sponsors.html index d594ea6..96ec1a5 100644 --- a/fedoraproject.org/data/content/sponsors.html +++ b/fedoraproject.org/data/content/sponsors.html @@ -73,7 +73,7 @@

${_('Interested in sponsoring something for Fedora?')}

-

${_('Interested in sponsoring something for Fedora? Contact ')} admin@fedoraproject.org ${Markup(_('or stop by <strong>#fedora-admin</strong> on <strong>irc.freenode.net</strong>.'))}

+

${_('Interested in sponsoring something for Fedora? Contact ')} admin@fedoraproject.org ${Markup(_('or stop by <strong>#fedora-admin</strong> on <strong>irc.libera.chat</strong>.'))}

< ${_('Return to the main Fedora website.')}

diff --git a/fedoraproject.org/data/content/using/life/chrisbredesen.html b/fedoraproject.org/data/content/using/life/chrisbredesen.html index 298c6f7..e7c87d0 100644 --- a/fedoraproject.org/data/content/using/life/chrisbredesen.html +++ b/fedoraproject.org/data/content/using/life/chrisbredesen.html @@ -34,7 +34,7 @@

${Markup(_('Principal Software Engineer at <a href=\"http://redhat.com\">Red Hat</a>.'))}

${_('What\'s your IRC nick?')}

-

${_('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).')}

+

${_('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).')}

${_('How did you first become a Java developer?')}

${_('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.')}

diff --git a/fedoraproject.org/data/templates/foot.html b/fedoraproject.org/data/templates/foot.html index 5b6f137..85569d2 100644 --- a/fedoraproject.org/data/templates/foot.html +++ b/fedoraproject.org/data/templates/foot.html @@ -26,7 +26,7 @@
${_('Support')}
${_('Get Help')}
-
${_('IRC Help')}
+
${_('IRC Help')}
${_('Mailing List Help')}
${_('Ask Fedora')}
${_('Documentation')}
diff --git a/flocktofedora.org/Makefile b/flocktofedora.org/Makefile index c3ffe4c..53a2790 100644 --- a/flocktofedora.org/Makefile +++ b/flocktofedora.org/Makefile @@ -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) diff --git a/flocktofedora.org/data/content/index.html b/flocktofedora.org/data/content/index.html index 4669e78..3f30bd4 100644 --- a/flocktofedora.org/data/content/index.html +++ b/flocktofedora.org/data/content/index.html @@ -326,7 +326,7 @@

Sponsors


- Sponsorship opportunities are still open. For information, contact flockinfo@fedoraproject.org. + Sponsorship opportunities are still open. For information, see the prospectus or contact flockinfo@fedoraproject.org.


Platinum Level

diff --git a/flocktofedora.org/static/images/sponsor-prospectus-2021.pdf b/flocktofedora.org/static/images/sponsor-prospectus-2021.pdf new file mode 100644 index 0000000..64a0e17 Binary files /dev/null and b/flocktofedora.org/static/images/sponsor-prospectus-2021.pdf differ diff --git a/getfedora.org/Makefile b/getfedora.org/Makefile index e985692..bf621ad 100644 --- a/getfedora.org/Makefile +++ b/getfedora.org/Makefile @@ -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) diff --git a/labs.fedoraproject.org/Makefile b/labs.fedoraproject.org/Makefile index c3ffe4c..8c374bf 100644 --- a/labs.fedoraproject.org/Makefile +++ b/labs.fedoraproject.org/Makefile @@ -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) diff --git a/labs.fedoraproject.org/data/content/astronomy/download/index.html b/labs.fedoraproject.org/data/content/astronomy/download/index.html index e0c4090..0601dd4 100644 --- a/labs.fedoraproject.org/data/content/astronomy/download/index.html +++ b/labs.fedoraproject.org/data/content/astronomy/download/index.html @@ -142,7 +142,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/astronomy/index.html b/labs.fedoraproject.org/data/content/astronomy/index.html index 616a978..a4fe781 100644 --- a/labs.fedoraproject.org/data/content/astronomy/index.html +++ b/labs.fedoraproject.org/data/content/astronomy/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/design-suite/download/index.html b/labs.fedoraproject.org/data/content/design-suite/download/index.html index c962650..2b8b00d 100644 --- a/labs.fedoraproject.org/data/content/design-suite/download/index.html +++ b/labs.fedoraproject.org/data/content/design-suite/download/index.html @@ -142,7 +142,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/design-suite/index.html b/labs.fedoraproject.org/data/content/design-suite/index.html index 3e17226..b96950d 100644 --- a/labs.fedoraproject.org/data/content/design-suite/index.html +++ b/labs.fedoraproject.org/data/content/design-suite/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/games/download/index.html b/labs.fedoraproject.org/data/content/games/download/index.html index 42a64d5..e69bff2 100644 --- a/labs.fedoraproject.org/data/content/games/download/index.html +++ b/labs.fedoraproject.org/data/content/games/download/index.html @@ -138,7 +138,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/games/index.html b/labs.fedoraproject.org/data/content/games/index.html index 3ff5d41..baf3a98 100644 --- a/labs.fedoraproject.org/data/content/games/index.html +++ b/labs.fedoraproject.org/data/content/games/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/jam/download/index.html b/labs.fedoraproject.org/data/content/jam/download/index.html index f50a44c..513cead 100644 --- a/labs.fedoraproject.org/data/content/jam/download/index.html +++ b/labs.fedoraproject.org/data/content/jam/download/index.html @@ -138,7 +138,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/jam/index.html b/labs.fedoraproject.org/data/content/jam/index.html index 6dcbdab..838d794 100644 --- a/labs.fedoraproject.org/data/content/jam/index.html +++ b/labs.fedoraproject.org/data/content/jam/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/prerelease.html b/labs.fedoraproject.org/data/content/prerelease.html index 8b136e8..a4d9795 100644 --- a/labs.fedoraproject.org/data/content/prerelease.html +++ b/labs.fedoraproject.org/data/content/prerelease.html @@ -22,7 +22,7 @@
-

${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'})} +

${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/')} ${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'])})} diff --git a/labs.fedoraproject.org/data/content/robotics/download/index.html b/labs.fedoraproject.org/data/content/robotics/download/index.html index 769133d..acb3597 100644 --- a/labs.fedoraproject.org/data/content/robotics/download/index.html +++ b/labs.fedoraproject.org/data/content/robotics/download/index.html @@ -138,7 +138,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/robotics/index.html b/labs.fedoraproject.org/data/content/robotics/index.html index 61a8ea4..62b498b 100644 --- a/labs.fedoraproject.org/data/content/robotics/index.html +++ b/labs.fedoraproject.org/data/content/robotics/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/scientific/download/index.html b/labs.fedoraproject.org/data/content/scientific/download/index.html index d78d4ef..0bd7414 100644 --- a/labs.fedoraproject.org/data/content/scientific/download/index.html +++ b/labs.fedoraproject.org/data/content/scientific/download/index.html @@ -156,7 +156,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/scientific/index.html b/labs.fedoraproject.org/data/content/scientific/index.html index 2cb9f78..6393363 100644 --- a/labs.fedoraproject.org/data/content/scientific/index.html +++ b/labs.fedoraproject.org/data/content/scientific/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/security/download/index.html b/labs.fedoraproject.org/data/content/security/download/index.html index 8d51216..a302bcc 100644 --- a/labs.fedoraproject.org/data/content/security/download/index.html +++ b/labs.fedoraproject.org/data/content/security/download/index.html @@ -138,7 +138,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/content/security/index.html b/labs.fedoraproject.org/data/content/security/index.html index 73b0003..5c6b23d 100644 --- a/labs.fedoraproject.org/data/content/security/index.html +++ b/labs.fedoraproject.org/data/content/security/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/templates/comp-neuro/supportresources.html b/labs.fedoraproject.org/data/templates/comp-neuro/supportresources.html index 5b46903..9776ba2 100644 --- a/labs.fedoraproject.org/data/templates/comp-neuro/supportresources.html +++ b/labs.fedoraproject.org/data/templates/comp-neuro/supportresources.html @@ -16,7 +16,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/labs.fedoraproject.org/data/templates/python-classroom/supportresources.html b/labs.fedoraproject.org/data/templates/python-classroom/supportresources.html index b9c1c19..b62b12f 100644 --- a/labs.fedoraproject.org/data/templates/python-classroom/supportresources.html +++ b/labs.fedoraproject.org/data/templates/python-classroom/supportresources.html @@ -16,7 +16,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/Makefile b/spins.fedoraproject.org/Makefile index 5641b94..ab51707 100644 --- a/spins.fedoraproject.org/Makefile +++ b/spins.fedoraproject.org/Makefile @@ -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) diff --git a/spins.fedoraproject.org/data/content/cinnamon/download/index.html b/spins.fedoraproject.org/data/content/cinnamon/download/index.html index 18a9c6d..0985379 100644 --- a/spins.fedoraproject.org/data/content/cinnamon/download/index.html +++ b/spins.fedoraproject.org/data/content/cinnamon/download/index.html @@ -142,7 +142,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/cinnamon/index.html b/spins.fedoraproject.org/data/content/cinnamon/index.html index fe3bc45..97dd874 100644 --- a/spins.fedoraproject.org/data/content/cinnamon/index.html +++ b/spins.fedoraproject.org/data/content/cinnamon/index.html @@ -151,7 +151,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/i3/download/index.html b/spins.fedoraproject.org/data/content/i3/download/index.html index 528e337..bdd6a59 100755 --- a/spins.fedoraproject.org/data/content/i3/download/index.html +++ b/spins.fedoraproject.org/data/content/i3/download/index.html @@ -147,7 +147,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/i3/index.html b/spins.fedoraproject.org/data/content/i3/index.html index ccba827..8b12917 100755 --- a/spins.fedoraproject.org/data/content/i3/index.html +++ b/spins.fedoraproject.org/data/content/i3/index.html @@ -191,7 +191,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/kde/download/index.html b/spins.fedoraproject.org/data/content/kde/download/index.html index 910e415..15e5ddc 100644 --- a/spins.fedoraproject.org/data/content/kde/download/index.html +++ b/spins.fedoraproject.org/data/content/kde/download/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/kde/index.html b/spins.fedoraproject.org/data/content/kde/index.html index 5d37d8a..755be52 100644 --- a/spins.fedoraproject.org/data/content/kde/index.html +++ b/spins.fedoraproject.org/data/content/kde/index.html @@ -190,7 +190,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/lxde/download/index.html b/spins.fedoraproject.org/data/content/lxde/download/index.html index 602233c..a8c69e0 100644 --- a/spins.fedoraproject.org/data/content/lxde/download/index.html +++ b/spins.fedoraproject.org/data/content/lxde/download/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/lxde/index.html b/spins.fedoraproject.org/data/content/lxde/index.html index 5a0ef04..349ff20 100644 --- a/spins.fedoraproject.org/data/content/lxde/index.html +++ b/spins.fedoraproject.org/data/content/lxde/index.html @@ -151,7 +151,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/lxqt/download/index.html b/spins.fedoraproject.org/data/content/lxqt/download/index.html index d66397f..6047076 100755 --- a/spins.fedoraproject.org/data/content/lxqt/download/index.html +++ b/spins.fedoraproject.org/data/content/lxqt/download/index.html @@ -147,7 +147,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/lxqt/index.html b/spins.fedoraproject.org/data/content/lxqt/index.html index 51b80a3..39853c7 100755 --- a/spins.fedoraproject.org/data/content/lxqt/index.html +++ b/spins.fedoraproject.org/data/content/lxqt/index.html @@ -150,7 +150,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/mate-compiz/download/index.html b/spins.fedoraproject.org/data/content/mate-compiz/download/index.html index e3f0e97..1b8fb41 100644 --- a/spins.fedoraproject.org/data/content/mate-compiz/download/index.html +++ b/spins.fedoraproject.org/data/content/mate-compiz/download/index.html @@ -143,7 +143,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/mate-compiz/index.html b/spins.fedoraproject.org/data/content/mate-compiz/index.html index 5d03474..61d8557 100644 --- a/spins.fedoraproject.org/data/content/mate-compiz/index.html +++ b/spins.fedoraproject.org/data/content/mate-compiz/index.html @@ -156,7 +156,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/prerelease.html b/spins.fedoraproject.org/data/content/prerelease.html index 2dc7473..0d9bee6 100644 --- a/spins.fedoraproject.org/data/content/prerelease.html +++ b/spins.fedoraproject.org/data/content/prerelease.html @@ -23,7 +23,7 @@
-

${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'})} +

${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/')} ${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'])})} diff --git a/spins.fedoraproject.org/data/content/soas/download/index.html b/spins.fedoraproject.org/data/content/soas/download/index.html index f336d0c..8b1ce5a 100644 --- a/spins.fedoraproject.org/data/content/soas/download/index.html +++ b/spins.fedoraproject.org/data/content/soas/download/index.html @@ -147,7 +147,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/soas/index.html b/spins.fedoraproject.org/data/content/soas/index.html index d16ea5c..74a7f30 100644 --- a/spins.fedoraproject.org/data/content/soas/index.html +++ b/spins.fedoraproject.org/data/content/soas/index.html @@ -190,7 +190,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/xfce/download/index.html b/spins.fedoraproject.org/data/content/xfce/download/index.html index 052e751..f6b5de6 100644 --- a/spins.fedoraproject.org/data/content/xfce/download/index.html +++ b/spins.fedoraproject.org/data/content/xfce/download/index.html @@ -147,7 +147,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/spins.fedoraproject.org/data/content/xfce/index.html b/spins.fedoraproject.org/data/content/xfce/index.html index 8a459d6..46eb912 100644 --- a/spins.fedoraproject.org/data/content/xfce/index.html +++ b/spins.fedoraproject.org/data/content/xfce/index.html @@ -146,7 +146,7 @@

${_('Chat')}

-

${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'))}

+

${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'))}

${_('Email')}

diff --git a/start.fedoraproject.org/Makefile b/start.fedoraproject.org/Makefile index 6ad7d85..7c976ee 100644 --- a/start.fedoraproject.org/Makefile +++ b/start.fedoraproject.org/Makefile @@ -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) +