Skip to content

Adding committees and making them more consistent #41

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

Merged
SwedishSubmarine merged 5 commits into from
Feb 24, 2025
Merged

Adding committees and making them more consistent #41

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55fd77e
Added BakaD and DSL to committee list
SwedishSubmarine Feb 15, 2025
ce7b554
Made the committee list more consistent
SwedishSubmarine Feb 15, 2025
14d4960
Merge branch 'main' into committees
SwedishSubmarine Feb 17, 2025
a680d52
Fixed localization
SwedishSubmarine Feb 19, 2025
23c49fe
Fixed bad
SwedishSubmarine Feb 19, 2025
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
22 changes: 19 additions & 3 deletions dtekportal/templates/footer/footer-right-col.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</div>
<div class="row">
<div class="column small-6 large-8 text-right">
<dt>{% trans "DATA-driftsförening" %}</dt>
<dt>{% trans "Serverdriftskommitté" %}</dt>
</div>
<div class="column small-6 large-4">
<dd><a href="https://wiki.dtek.se/wiki/DHack">dHack</a></dd>
Expand All @@ -77,15 +77,15 @@
</div>
<div class="row">
<div class="column small-6 large-8 text-right">
<dt>{% trans "Idrottsförening" %}</dt>
<dt>{% trans "Idrottskommitté" %}</dt>
</div>
<div class="column small-6 large-4">
<dd><a href="https://wiki.dtek.se/wiki/IDrott">iDrott</a></dd>
</div>
</div>
<div class="row">
<div class="column small-6 large-8 text-right">
<dt>{% trans "Spelförening" %}</dt>
<dt>{% trans "Spelkommitté" %}</dt>
</div>
<div class="column small-6 large-4">
<dd><a href="https://wiki.dtek.se/wiki/DLude">DLude</a></dd>
Expand Down Expand Up @@ -155,4 +155,20 @@
<dd><a href="https://date-it.se">DatE-IT</a></dd>
</div>
</div>
<div class="row">
<div class="column small-6 large-8 text-right">
<dt>{% trans "Bakkommitté" %}</dt>
</div>
<div class="column small-6 large-4">
<dd><a href="https://wiki.dtek.se/wiki/BakaD">BakaD</a></dd>
</div>
</div>
<div class="row">
<div class="column small-6 large-8 text-right">
<dt>{% trans "Finsmakarkommitté" %}</dt>
</div>
<div class="column small-6 large-4">
<dd><a href="https://wiki.dtek.se/wiki/DSL">DSL</a></dd>
</div>
</div>
</section>
40 changes: 34 additions & 6 deletions locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-14 14:35+0100\n"
"POT-Creation-Date: 2025-02-19 22:00+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -220,19 +220,21 @@ msgid "Arbetsmarknadsgrupp"
msgstr "Career and Business Relations"

#: templates/footer/footer-right-col.html:64
msgid "DATA-driftsförening"
msgstr "System Administrators"
#, fuzzy
#| msgid "Bilkommitté"
msgid "Serverdriftskommitté"
msgstr "Division Car Maintainers"

#: templates/footer/footer-right-col.html:72
msgid "Fanbärare"
msgstr "Flag-Bearers"

#: templates/footer/footer-right-col.html:80
msgid "Idrottsförening"
msgstr "Sports Committee"
msgid "Idrottskommitté"
msgstr "Sports committee"

#: templates/footer/footer-right-col.html:88
msgid "Spelförening"
msgid "Spelkommitté"
msgstr "Gaming Committee"
Copy link

@sora-jp sora-jp Feb 19, 2025

Choose a reason for hiding this comment

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

Varför stor bokstav här men inte på andra ställen?


#: templates/footer/footer-right-col.html:96
Expand Down Expand Up @@ -267,6 +269,14 @@ msgstr "Equality Committee"
msgid "Arbetsmarknadsmässa"
msgstr "Career Fair"

#: templates/footer/footer-right-col.html:160
msgid "Bakkommitté"
msgstr "Baking Committee"

#: templates/footer/footer-right-col.html:168
msgid "Finsmakarkommitté"
msgstr "Connosieur Committee"

#: templates/head.html:14
msgid "Datateknologsektionen på Chalmers"
msgstr "Division of Computer Science and Engineering at Chalmers"
Expand Down Expand Up @@ -371,3 +381,21 @@ msgstr "Studies"
#: templates/top-nav-banner.html:23
msgid "Foton"
msgstr "Photos"

#~ msgid "DATA-driftsförening"
#~ msgstr "System Administrators"

#~ msgid "Idrottsförening"
#~ msgstr "Sports Committee"

#~ msgid "Spelförening"
#~ msgstr "Gaming Committee"

#~ msgid "Kårkort"
#~ msgstr "Student Union Card"

#~ msgid "Genväg för att ladda ditt kårkort"
#~ msgstr "Shortcut to charge your student union card"

#~ msgid "Sektionen på Facebook"
#~ msgstr "The divison on Facebook"
46 changes: 38 additions & 8 deletions locale/sv/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-14 14:35+0100\n"
"POT-Creation-Date: 2025-02-19 22:00+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -216,20 +216,20 @@ msgid "Arbetsmarknadsgrupp"
msgstr "Arbetsmarknadsgrupp"

#: templates/footer/footer-right-col.html:64
msgid "DATA-driftsförening"
msgstr "DATA-driftsförening"
msgid "Serverdriftskommitté"
msgstr "Serverdriftskommitté"

#: templates/footer/footer-right-col.html:72
msgid "Fanbärare"
msgstr "Fanbärare"

#: templates/footer/footer-right-col.html:80
msgid "Idrottsförening"
msgstr "Idrottsförening"
msgid "Idrottskommitté"
msgstr "Idrottskommitté"

#: templates/footer/footer-right-col.html:88
msgid "Spelförening"
msgstr "Spelförening"
msgid "Spelkommitté"
msgstr "Spelkommitté"

#: templates/footer/footer-right-col.html:96
msgid "Fotokommitté"
Expand All @@ -249,7 +249,7 @@ msgstr "Sektionens podcast"

#: templates/footer/footer-right-col.html:128
msgid "Master Reception Committee"
msgstr "Master Reception Committee"
msgstr "Mastermottagningskommitté"

#: templates/footer/footer-right-col.html:136
msgid "Matlagningskommitté"
Expand All @@ -263,6 +263,18 @@ msgstr "Jämlikhetskommitté"
msgid "Arbetsmarknadsmässa"
msgstr "Arbetsmarknadsmässa"

#: templates/footer/footer-right-col.html:160
#, fuzzy
#| msgid "Bilkommitté"
msgid "Bakkommitté"
msgstr "Bilkommitté"

#: templates/footer/footer-right-col.html:168
#, fuzzy
#| msgid "Bilkommitté"
msgid "Finsmakarkommitté"
msgstr "Bilkommitté"

#: templates/head.html:14
msgid "Datateknologsektionen på Chalmers"
msgstr "Datateknologsektionen på Chalmers"
Expand Down Expand Up @@ -369,3 +381,21 @@ msgstr "Studier"
#: templates/top-nav-banner.html:23
msgid "Foton"
msgstr "Foton"

#~ msgid "DATA-driftsförening"
#~ msgstr "DATA-driftsförening"

#~ msgid "Idrottsförening"
#~ msgstr "Idrottsförening"

#~ msgid "Spelförening"
#~ msgstr "Spelförening"

#~ msgid "Kårkort"
#~ msgstr "Kårkort"

#~ msgid "Genväg för att ladda ditt kårkort"
#~ msgstr "Genväg för att ladda ditt kårkort"

#~ msgid "Sektionen på Facebook"
#~ msgstr "Sektionen på Facebook"