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

Use shared notifications section and clarify the wordings from activi… #644

Merged
merged 1 commit into from
Oct 5, 2021
Merged

Use shared notifications section and clarify the wordings from activi… #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions img/notifications-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/Settings/Personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public function getForm() {
* @return string the section ID, e.g. 'sharing'
*/
public function getSection() {
return 'activity';
return 'notifications';
}

/**
Expand Down
9 changes: 6 additions & 3 deletions lib/Settings/PersonalSection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* @copyright Copyright (c) 2017 Joas Schilling <[email protected]>
*
Expand Down Expand Up @@ -50,7 +53,7 @@ public function __construct(IURLGenerator $url, IL10N $l) {
* @since 12
*/
public function getIcon() {
return $this->url->imagePath('activity', 'activity-dark.svg');
return $this->url->imagePath('activity', 'notifications-dark.svg');
}

/**
Expand All @@ -61,7 +64,7 @@ public function getIcon() {
* @since 9.1
*/
public function getID() {
return 'activity';
return 'notifications';
}

/**
Expand All @@ -72,7 +75,7 @@ public function getID() {
* @since 9.1
*/
public function getName() {
return $this->l->t('Activity');
return $this->l->t('Notifications');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion templates/settings/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<?php endif; ?>

<br />
<label for="notify_setting_batchtime"><?php p($l->t('Send notification emails:')); ?></label>
<label for="notify_setting_batchtime"><?php p($l->t('Send activity emails:')); ?></label>
<select id="notify_setting_batchtime" name="notify_setting_batchtime">
<option value="3"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_ASAP): ?> selected="selected"<?php endif; ?>><?php p($l->t('As soon as possible')); ?></option>
<option value="0"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_HOURLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Hourly')); ?></option>
Expand Down
5 changes: 2 additions & 3 deletions templates/settings/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
?>

<form id="activity_notifications" class="section">

<h2><?php p($l->t('Notifications')); ?></h2>
<h2><?php p($l->t('Activity')); ?></h2>
<p class="settings-hint">
<?php if ($_['email_enabled']) { ?>
<?php p($l->t('Choose for which activities you want to get an email or push notification.')); ?>
Expand All @@ -37,7 +36,7 @@

<?php print_unescaped($this->inc('settings/form')); ?>

<h2><?php p($l->t('Activity')); ?></h2>
<h2><?php p($l->t('Daily activity summary')); ?></h2>

<input id="activity_email_enabled" name="activity_digest" type="checkbox" class="checkbox"
value="1" <?php if ($_['activity_digest_enabled']) {
Expand Down