Skip to content

Update messages.en.yaml #1431

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

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

Update messages.en.yaml #1431

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
df02197
Update messages.en.yaml
TheVillageGuy Feb 6, 2025
7bc597d
Merge branch 'main' into Shorten-subscribe/unsubscribe-to-prevent-but…
blued-gear Jan 30, 2026
96d989b
use long text for button titles
blued-gear Jan 30, 2026
5feaff2
add icon to domain sub button
blued-gear Jan 30, 2026
0ddd308
fix tests
blued-gear Jan 30, 2026
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
7 changes: 6 additions & 1 deletion templates/components/domain_sub.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@
method="post">
<button type="submit"
class="{{ html_classes('btn btn__secondary', {'active': is_domain_subscribed(domain)}) }}"
title="{{ is_domain_subscribed(domain) ? 'unsubscribe'|trans : 'subscribe'|trans }}"
data-action="subs#send">
{{ is_domain_subscribed(domain) ? 'unsubscribe'|trans : 'subscribe'|trans }}
{% if is_domain_subscribed(domain) %}
<i class="fa-sharp fa-solid fa-folder-minus" aria-hidden="true"></i><span>{{ 'unsubscribe_short'|trans }}</span>
{% else %}
<i class="fa-sharp fa-solid fa-folder-plus" aria-hidden="true"></i><span>{{ 'subscribe_short'|trans }}</span>
{% endif %}
</button>
</form>
<form action="{{ path('domain_' ~ (is_domain_blocked(domain) ? 'unblock' : 'block'), {name: domain.name}) }}"
Expand Down
5 changes: 3 additions & 2 deletions templates/components/magazine_sub.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
method="post">
<button type="submit"
class="{{ html_classes('btn btn__secondary action', {'active': is_magazine_subscribed(magazine)}) }}"
title="{% if is_magazine_subscribed(magazine) %}{{ 'unsubscribe'|trans }}{% else %}{{ 'subscribe'|trans }}{% endif %}"
data-action="subs#send">
{% if is_magazine_subscribed(magazine) %}
<i class="fa-sharp fa-solid fa-folder-minus" aria-hidden="true"></i><span>{{ 'unsubscribe'|trans }}</span>
<i class="fa-sharp fa-solid fa-folder-minus" aria-hidden="true"></i><span>{{ 'unsubscribe_short'|trans }}</span>
{% else %}
<i class="fa-sharp fa-solid fa-folder-plus" aria-hidden="true"></i><span>{{ 'subscribe'|trans }}</span>
<i class="fa-sharp fa-solid fa-folder-plus" aria-hidden="true"></i><span>{{ 'subscribe_short'|trans }}</span>
{% endif %}
</button>
</form>
Expand Down
18 changes: 9 additions & 9 deletions tests/Functional/Controller/Domain/DomainSubControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ public function testUserCanSubAndUnsubDomain(): void
$crawler = $this->client->request('GET', '/d/kbin.pub');

// Subscribe
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Subscribe')->form());
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Sub')->form());
$crawler = $this->client->followRedirect();

$this->assertSelectorExists('#sidebar form[name=domain_subscribe] .active');
$this->assertSelectorTextContains('#sidebar .domain', 'Unsubscribe');
$this->assertSelectorTextContains('#sidebar .domain', 'Unsub');
$this->assertSelectorTextContains('#sidebar .domain', '1');

// Unsubscribe
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Unsubscribe')->form());
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Unsub')->form());
$this->client->followRedirect();

$this->assertSelectorNotExists('#sidebar form[name=domain_subscribe] .active');
$this->assertSelectorTextContains('#sidebar .domain', 'Subscribe');
$this->assertSelectorTextContains('#sidebar .domain', 'Sub');
$this->assertSelectorTextContains('#sidebar .domain', '0');
}

Expand All @@ -53,10 +53,10 @@ public function testXmlUserCanSubDomain(): void

// Subscribe
$this->client->setServerParameter('HTTP_X-Requested-With', 'XMLHttpRequest');
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Subscribe')->form());
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Sub')->form());

$this->assertStringContainsString('{"html":', $this->client->getResponse()->getContent());
$this->assertStringContainsString('Unsubscribe', $this->client->getResponse()->getContent());
$this->assertStringContainsString('Unsub', $this->client->getResponse()->getContent());
}

public function testXmlUserCanUnsubDomain(): void
Expand All @@ -73,14 +73,14 @@ public function testXmlUserCanUnsubDomain(): void
$crawler = $this->client->request('GET', '/d/kbin.pub');

// Subscribe
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Subscribe')->form());
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Sub')->form());
$crawler = $this->client->followRedirect();

// Unsubscribe
$this->client->setServerParameter('HTTP_X-Requested-With', 'XMLHttpRequest');
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Unsubscribe')->form());
$this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Unsub')->form());

$this->assertStringContainsString('{"html":', $this->client->getResponse()->getContent());
$this->assertStringContainsString('Subscribe', $this->client->getResponse()->getContent());
$this->assertStringContainsString('Sub', $this->client->getResponse()->getContent());
}
}
16 changes: 8 additions & 8 deletions tests/Functional/Controller/Magazine/MagazineSubControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ public function testUserCanSubAndUnsubMagazine(): void
$crawler = $this->client->request('GET', '/m/acme');

// Sub magazine
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Subscribe')->form());
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Sub')->form());
$crawler = $this->client->followRedirect();

$this->assertSelectorExists('#sidebar form[name=magazine_subscribe] .active');
$this->assertSelectorTextContains('#sidebar .magazine', 'Unsubscribe');
$this->assertSelectorTextContains('#sidebar .magazine', 'Unsub');
$this->assertSelectorTextContains('#sidebar .magazine', '2');

// Unsub magazine
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Unsubscribe')->form());
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Unsub')->form());
$this->client->followRedirect();
$this->assertSelectorTextContains('#sidebar .magazine', '1');
}
Expand All @@ -39,10 +39,10 @@ public function testXmlUserCanSubMagazine(): void
$crawler = $this->client->request('GET', '/m/acme');

$this->client->setServerParameter('HTTP_X-Requested-With', 'XMLHttpRequest');
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Subscribe')->form());
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Sub')->form());

$this->assertStringContainsString('{"html":', $this->client->getResponse()->getContent());
$this->assertStringContainsString('Unsubscribe', $this->client->getResponse()->getContent());
$this->assertStringContainsString('Unsub', $this->client->getResponse()->getContent());
}

public function testXmlUserCanUnsubMagazine(): void
Expand All @@ -54,14 +54,14 @@ public function testXmlUserCanUnsubMagazine(): void
$crawler = $this->client->request('GET', '/m/acme');

// Sub magazine
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Subscribe')->form());
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Sub')->form());
$crawler = $this->client->followRedirect();

// Unsub magazine
$this->client->setServerParameter('HTTP_X-Requested-With', 'XMLHttpRequest');
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Unsubscribe')->form());
$this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Unsub')->form());

$this->assertStringContainsString('{"html":', $this->client->getResponse()->getContent());
$this->assertStringContainsString('Subscribe', $this->client->getResponse()->getContent());
$this->assertStringContainsString('Sub', $this->client->getResponse()->getContent());
}
}
Loading
Loading