Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replacing "IRC" with "Chat" or "ChatBrainz" #485

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Replacing "IRC" with "Chat" or "ChatBrainz" #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
229b713
Update IRC to ChatBrainz, add Social Media section
Aerozol Oct 5, 2024
1674679
Add Chat/ChatBrainz to the footer
Aerozol Oct 5, 2024
078a26a
Replaced "IRC" with "Chat"
Aerozol Oct 5, 2024
898a2e0
Update messages.pot
Aerozol Oct 6, 2024
efab395
Update social-contract.html
Aerozol Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions metabrainz/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ msgid ""
"Found a broken link or something that doesn't work as you expect it to? "
"You can report issues in our\n"
" <a href=\"%(bug_tracker_url)s\">bug tracker</a>, or let us know on "
"IRC or\n"
"Chat or\n"
" by email. Contact details are provided below. Please include details "
"such as what happened, what you expected\n"
" to happen, and the URLs of any pages involved."
Expand Down Expand Up @@ -582,21 +582,17 @@ msgid ""
msgstr ""

#: metabrainz/templates/index/contact.html:75
msgid "IRC"
msgid "Chat"
msgstr ""

#: metabrainz/templates/index/contact.html:77
#, python-format
msgid ""
"The MetaBrainz/MusicBrainz team, as well as MusicBrainz users, hang out "
"in the\n"
" <strong><a href=\"%(irc_url)s\">#metabrainz</a></strong>\n"
" channel on IRC chat at irc.libera.chat. If you don't have an IRC "
"client\n"
" installed, consider using this\n"
" <a href=\"%(irc_webchat_url)s\">webchat client</a>\n"
" instead. Please feel free to browse the\n"
" <a href=\"%(chatlogs_url)s\">IRC log archives</a>."
" in the #metabrainz channel on\n"
" <strong><a href=\"https://musicbrainz.org/doc/Communication/ChatBrainz\"ChatBrainz</a></strong>\n"
" You can also browse the\n"
" <a href=\"%(chatlogs_url)s\">chat log archives</a>."
msgstr ""

#: metabrainz/templates/index/contact.html:89
Expand Down Expand Up @@ -1069,7 +1065,7 @@ msgstr ""
msgid ""
"Hired in the fall of 2015 as the MetaBrainz Community Manager, Freso is "
"in charge of most of the public communication\n"
" channels (IRC, forums, blog, etc.) and various community "
" channels (Chat, forums, blog, etc.) and various community "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you do the messages.pot changes by hand? I assume the .pot file is automatically generated by some script and we should run that instead.

"projects (like the Google Code-in). He has been a\n"
" <a href=\"%(mb_freso_url)s\">MusicBrainz contributor since "
"2006</a> and an open source enthusiast for\n"
Expand Down
1 change: 1 addition & 0 deletions metabrainz/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<div class="title"><a href="{{ url_for('index.contact') }}">{{ _('Contact us') }}</a></div>
<ul>
<li><a href="https://blog.metabrainz.org/category/metabrainz/">{{ _('Blog') }}</a></li>
<li><a href="https://musicbrainz.org/doc/Communication/ChatBrainz">{{ _('Chat') }}</a></li>
<li><a href="https://twitter.com/MetaBrainz">{{ _('Twitter/X') }}</a></li>
<li><a href="https://mastodon.social/@metabrainz">{{ _('Mastodon') }}</a></li>
<li><a href="https://bsky.app/profile/metabrainz.org">{{ _('Bluesky') }}</a></li>
Expand Down
27 changes: 18 additions & 9 deletions metabrainz/templates/index/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,31 @@ <h3>{{ _('Forums') }}</h3>
answer any questions you may have.', forums_url='https://community.metabrainz.org/') }}
</p>

<h3>{{ _('IRC') }}</h3>
<h3>{{ _('Chat') }}</h3>
<p>
{{ _('The MetaBrainz/MusicBrainz team, as well as MusicBrainz supporters, hang out in the
<strong><a href="%(irc_url_mb)s">#musicbrainz</a></strong> and
<strong><a href="%(irc_url_meb)s">#metabrainz</a></strong>
channels on IRC chat at irc.libera.chat. If you don\'t have an IRC client
installed, consider using this
<a href="%(irc_webchat_url)s">webchat client</a>
instead. Please feel free to browse the
<a href="%(chatlogs_url)s">IRC log archives</a>.',
{{ _('The MetaBrainz/MusicBrainz/ListenBrainz team and community hang out
on our Matrix, IRC and Discord channels. Visit the
<a href="https://musicbrainz.org/doc/Communication/ChatBrainz">ChatBrainz</a>
page and join the chat. You can also browse the
<a href="%(chatlogs_url)s">chat log archives</a>.',
irc_url_mb='ircs://irc.libera.chat:6697/musicbrainz',
irc_url_meb='ircs://irc.libera.chat:6697/metabrainz',
irc_webchat_url='https://kiwiirc.com/nextclient/irc.libera.chat/#musicbrainz,#metabrainz',
Comment on lines 97 to 99
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These URLs should probably be removed since they're no longer used. And the ChatBrainz one should probably be used in a similar way as these were rather than just pasting it as-is inside the string.

chatlogs_url='http://chatlogs.metabrainz.org/') }}
</p>

<h3>{{ _('Social Media') }}</h3>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use sentence case for other headers.

<p>
{{ _('Nobody\'s perfect. You can follow us on these social channels:') }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe use a proper apostrophe and then you don't need to escape it ;) Although I'm not sure why the "Nobody's perfect" bit is there anyway? 😅

<ul>
<li>{{ _('<a href="https://blog.metabrainz.org/">Blog</a>') }}</li>
<li>{{ _('<a href="https://x.com/MetaBrainz">Twitter/X</a>') }}</li>
<li>{{ _('<a href="https://mastodon.social/@metabrainz">Mastodon</a>') }}</li>
<li>{{ _('<a href="https://bsky.app/profile/metabrainz.org">Bluesky</a>') }}</li>
<li>{{ _('<a href="https://www.instagram.com/MetaBrainz/">Instagram</a>') }}</li>
Comment on lines +107 to +111
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally these should also be done with variables such as blog_url, mastodon_url, etc - that way if the URL changes later (say, because some idiot buys Bluesky and renames it Y) it won't change the actual string translators will see.

Alternatively (and possibly even better?) you could just take the URL bit out of the translatable bit and leave just the title, since that seems to be what we already do in the footer?

</ul>
</p>

<h3>{{ _('Mailing address') }}</h3>
<p>
MetaBrainz Foundation<br/>
Expand Down
2 changes: 1 addition & 1 deletion metabrainz/templates/index/social-contract.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1 class="page-title">{{ _('Social Contract') }}</h1>
<ol>
<li>
<b>MetaBrainz's projects will remain 100% free</b>: The development process will be open to the public by using our community forum,
meetings open to interested parties, and open IRC channels. The client and server software will remain free and accessible under generally
meetings open to interested parties, and open chat channels. The client and server software will remain free and accessible under generally
accepted open licenses. The factual database content will be in the public domain and the non-factual database content will be released
under Creative Commons licenses.
</li>
Expand Down
28 changes: 14 additions & 14 deletions metabrainz/templates/index/team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h4>{{ _('<span class="name">Robert Kaye</span> &mdash; Executive Director') }}<
{{ _('Originally from Germany, he now lives in Barcelona, Spain.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> mayhem</li>
<li><strong>Chat:</strong> mayhem</li>
<li><strong>GitHub:</strong> <a href="https://github.com/mayhem">mayhem</a></li>
<li><strong>Twitter/X:</strong> <a href="https://twitter.com/mayhembcn">mayhemBCN</a></li>
</ul>
Expand All @@ -44,7 +44,7 @@ <h4>{{ _('<span class="name">Michael Wiencek</span> &mdash; Senior Software Engi
ever hear, binge-watching old TV shows, and being the best drummer in the world on Rock Band 4.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> bitmap</li>
<li><strong>Chat:</strong> bitmap</li>
<li><strong>GitHub:</strong> <a href="https://github.com/mwiencek">mwiencek</a></li>
<li><strong>Last.fm:</strong> <a href="http://www.last.fm/user/fancy_lb_proxy">fancy_lb_proxy</a></li>
</ul>
Expand All @@ -67,7 +67,7 @@ <h4>{{ _('<span class="name">Nicolás Tamargo</span> &mdash; Style Leader/Custom
</p>
<p>{{ _('Originally from Spain, he now lives in Tartu, Estonia.') }}</p>
<ul class="links">
<li><strong>IRC:</strong> reosarevok</li>
<li><strong>Chat:</strong> reosarevok</li>
<li><strong>MusicBrainz:</strong> <a href="https://musicbrainz.org/user/reosarevok">reosarevok</a></li>
<li><strong>GitHub:</strong> <a href="https://github.com/reosarevok">reosarevok</a></li>
<li><strong>iNaturalist:</strong> <a href="https://www.inaturalist.org/people/reosarevok">reosarevok</a></li>
Expand All @@ -94,7 +94,7 @@ <h4>{{ _('<span class="name">Laurent Monin</span> &mdash; System Administrator')
geeqie_url='https://en.wikipedia.org/wiki/Geeqie') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> zas</li>
<li><strong>Chat:</strong> zas</li>
</ul>
</div>
</div>
Expand All @@ -109,7 +109,7 @@ <h4>{{ _('<span class="name">Yvan Rivierre</span> &mdash; Software Engineer') }}
in the end. Besides that, he casually plays music, listens to music, eats music, … music, for an healthy way of life.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> yvanzo</li>
<li><strong>Chat:</strong> yvanzo</li>
</ul>
</div>
</div>
Expand All @@ -130,7 +130,7 @@ <h4>{{ _('<span class="name">Nicolas Pelletier</span> &mdash; BookBrainz Lead,
{{ _('Born in Canada and raised in France, Nicolas now lives in Barcelona, Spain.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> monkey</li>
<li><strong>Chat:</strong> monkey</li>
<li><strong>GitHub:</strong> <a href="https://github.com/monkeydo">MonkeyDo</a></li>
</ul>
</div>
Expand All @@ -150,7 +150,7 @@ <h4>{{ _('<span class="name">Kartik Ohri</span> &mdash; ListenBrainz/CritiqueBra
CritiqueBrainz projects. He also spends a lot of time on the AcousticBrainz and ListenBrainz projects.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> lucifer</li>
<li><strong>Chat:</strong> lucifer</li>
<li><strong>GitHub:</strong> <a href="https://github.com/amCap1712">amCap1712</a></li>
</ul>
</div>
Expand All @@ -172,7 +172,7 @@ <h4>{{ _('<span class="name">Adam James</span> &mdash; System Administrator') }}
where he is a consultant and technical director.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> atj</li>
<li><strong>Chat:</strong> atj</li>
<li><strong>MusicBrainz:</strong> <a href="https://musicbrainz.org/user/atj">atj</a></li>
<li><strong>GitHub:</strong> <a href="https://github.com/atj">atj</a></li>
</ul>
Expand All @@ -193,7 +193,7 @@ <h4>{{ _('<span class="name">Simon Hartman</span> &mdash; Design, UX Consultant
and has 15 years experience across various graphic design/comms/marketing roles.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> aerozol</li>
<li><strong>Chat:</strong> aerozol</li>
<li><strong>MusicBrainz:</strong> <a href="https://musicbrainz.org/user/aerozol">aerozol</a></li>
<li><strong>ListenBrainz:</strong> <a href="https://listenbrainz.org/user/aerozol">aerozol</a></li>
</ul>
Expand All @@ -214,7 +214,7 @@ <h4>{{ _('<span class="name">Ansh Goyal</span> &mdash; Junior Software Engineer'
In his leisure moments, Ansh enjoys binge-watching movies and listening to music.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> ansh</li>
<li><strong>Chat:</strong> ansh</li>
<li><strong>GitHub:</strong> <a href="https://github.com/anshg1214">anshg1214</a></li>
<li><strong>ListenBrainz:</strong> <a href="https://listenbrainz.org/user/anshgoyal31">anshgoyal31</a></li>
</ul>
Expand All @@ -240,7 +240,7 @@ <h4>{{ _('<span class="name">Akshat Tiwari</span> &mdash; Junior Software Engine
Akshat has always been fascinated by the creativity of people. He resides in New Delhi, India.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> akshaaatt</li>
<li><strong>Chat:</strong> akshaaatt</li>
<li><strong>GitHub:</strong> <a href="https://github.com/akshaaatt">akshaaatt</a></li>
<li><strong>Medium:</strong> <a href="https://medium.com/@akshaaatt">akshaaatt</a></li>
</ul>
Expand All @@ -257,7 +257,7 @@ <h4>{{ _('<span class="name">Param Singh</span> &mdash; Former ListenBrainz team
When not staring at a screen, Param plays some chess and tries to listen to new music.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> param</li>
<li><strong>Chat:</strong> param</li>
<li><strong>GitHub:</strong> <a href="https://github.com/paramsingh">paramsingh</a></li>
<li><strong>Last.fm:</strong> <a href="http://www.last.fm/user/singhparam">singhparam</a></li>
<li><strong>ListenBrainz:</strong> <a href="https://listenbrainz.org/user/iliekcomputers">iliekcomputers</a></li>
Expand Down Expand Up @@ -286,7 +286,7 @@ <h4>{{ _('<span class="name">David "drsaunde" Saunders</span> &mdash; MusicBrain
gnt_url='https://en.wikipedia.org/wiki/Gin_and_tonic') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> drsaunders</li>
<li><strong>Chat:</strong> drsaunders</li>
<li><strong>MusicBrainz:</strong> <a href="https://musicbrainz.org/user/drsaunde">drsaunde</a></li>
</ul>
</div>
Expand All @@ -308,7 +308,7 @@ <h4>{{ _('<span class="name">Akira Holm</span> &mdash; MusicBrainz Instruments')
III, colouring, and collecting all sorts of things, from stickers and stamps to bottlecaps.') }}
</p>
<ul class="links">
<li><strong>IRC:</strong> ApeKattQuest</li>
<li><strong>Chat:</strong> ApeKattQuest</li>
<li><strong>MusicBrainz:</strong> <a href="https://musicbrainz.org/user/CatCat">CatCat</a></li>
<li><strong>ListenBrainz:</strong> <a href="https://listenbrainz.org/user/CatCat">CatCat</a></li>
</ul>
Expand Down
Loading