Merge pull request #24052 from nextcloud/backport/23915/stable19

[stable19] Use png icons in caldav reminder emails
This commit is contained in:
Roeland Jago Douma 2020-11-11 21:27:45 +01:00 committed by GitHub
commit e6dbc714de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions

View File

@ -155,18 +155,18 @@ class EmailProvider extends AbstractProvider {
string $calendarDisplayName, string $calendarDisplayName,
VEvent $vevent):void { VEvent $vevent):void {
$template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'), $template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
$this->getAbsoluteImagePath('actions/info.svg')); $this->getAbsoluteImagePath('actions/info.png'));
$template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'), $template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
$this->getAbsoluteImagePath('places/calendar.svg')); $this->getAbsoluteImagePath('places/calendar.png'));
if (isset($vevent->LOCATION)) { if (isset($vevent->LOCATION)) {
$template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'), $template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'),
$this->getAbsoluteImagePath('actions/address.svg')); $this->getAbsoluteImagePath('actions/address.png'));
} }
if (isset($vevent->DESCRIPTION)) { if (isset($vevent->DESCRIPTION)) {
$template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'), $template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'),
$this->getAbsoluteImagePath('actions/more.svg')); $this->getAbsoluteImagePath('actions/more.png'));
} }
} }

View File

@ -500,7 +500,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
$this->urlGenerator $this->urlGenerator
->expects($this->at(8 * $i)) ->expects($this->at(8 * $i))
->method('imagePath') ->method('imagePath')
->with('core', 'actions/info.svg') ->with('core', 'actions/info.png')
->willReturn('imagePath1'); ->willReturn('imagePath1');
$this->urlGenerator $this->urlGenerator
@ -512,7 +512,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
$this->urlGenerator $this->urlGenerator
->expects($this->at(8 * $i + 2)) ->expects($this->at(8 * $i + 2))
->method('imagePath') ->method('imagePath')
->with('core', 'places/calendar.svg') ->with('core', 'places/calendar.png')
->willReturn('imagePath2'); ->willReturn('imagePath2');
$this->urlGenerator $this->urlGenerator
@ -524,7 +524,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
$this->urlGenerator $this->urlGenerator
->expects($this->at(8 * $i + 4)) ->expects($this->at(8 * $i + 4))
->method('imagePath') ->method('imagePath')
->with('core', 'actions/address.svg') ->with('core', 'actions/address.png')
->willReturn('imagePath3'); ->willReturn('imagePath3');
$this->urlGenerator $this->urlGenerator
@ -536,7 +536,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
$this->urlGenerator $this->urlGenerator
->expects($this->at(8 * $i + 6)) ->expects($this->at(8 * $i + 6))
->method('imagePath') ->method('imagePath')
->with('core', 'actions/more.svg') ->with('core', 'actions/more.png')
->willReturn('imagePath4'); ->willReturn('imagePath4');
$this->urlGenerator $this->urlGenerator

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 B

BIN
core/img/actions/info.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

BIN
core/img/actions/more.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B