Update wording

assets/CalendarAsset.php

@@ -39,11 +39,11 @@ public static function register($view)
     {
         $view->registerJsConfig('calendar.Calendar', [
             'text' => [
-                'button.today' => Yii::t('CalendarModule.calendar', 'today'),
-                'button.month' => Yii::t('CalendarModule.calendar', 'month'),
-                'button.week' => Yii::t('CalendarModule.calendar', 'week'),
-                'button.day' => Yii::t('CalendarModule.calendar', 'day'),
-                'button.list' => Yii::t('CalendarModule.calendar', 'list'),
+                'button.today' => Yii::t('CalendarModule.calendar', 'Today'),
+                'button.month' => Yii::t('CalendarModule.calendar', 'Month'),
+                'button.week' => Yii::t('CalendarModule.calendar', 'Week'),
+                'button.day' => Yii::t('CalendarModule.calendar', 'Day'),
+                'button.list' => Yii::t('CalendarModule.calendar', 'List'),
             ]
         ]);
         return parent::register($view);

models/CalendarEntry.php

@@ -317,9 +317,9 @@ public function attributeLabels()
             'all_day' => Yii::t('CalendarModule.base', 'All Day'),
             'recurring' => Yii::t('CalendarModule.base', 'Recurring'),
             'reminder' => Yii::t('CalendarModule.base', 'Enable Reminder'),
-            'allow_decline' => Yii::t('CalendarModule.base', 'Allow participation state \'decline\''),
-            'allow_maybe' => Yii::t('CalendarModule.base', 'Allow participation state \'maybe\''),
-            'participation_mode' => Yii::t('CalendarModule.base', 'Participation Mode'),
+            'allow_decline' => Yii::t('CalendarModule.base', 'Allow option \'Decline\''),
+            'allow_maybe' => Yii::t('CalendarModule.base', 'Allow option \'Undecided\''),
+            'participation_mode' => Yii::t('CalendarModule.base', 'Mode'),
             'max_participants' => Yii::t('CalendarModule.base', 'Maximum number of participants'),
             'location' => Yii::t('CalendarModule.base', 'Location'),
         ];

models/forms/CalendarEntryForm.php

@@ -76,6 +76,11 @@ class CalendarEntryForm extends Model
      */
     public $topics = [];
 
+    /**
+     * @var bool
+     */
+    public $sendUpdateNotification = 0;
+
     /**
      * @var CalendarEntry
      */
@@ -218,7 +223,7 @@ public function rules()
         return [
             ['timeZone', 'in', 'range' => DateTimeZone::listIdentifiers()],
             ['topics', 'safe'],
-            [['is_public', 'type_id'], 'integer'],
+            [['is_public', 'type_id', 'sendUpdateNotification'], 'integer'],
             [['start_date', 'end_date'], 'required'],
             [['start_time', 'end_time'], 'date', 'type' => 'time', 'format' => CalendarUtils::getTimeFormat()],
             ['start_date', CalendarDateFormatValidator::class, 'timeField' => 'start_time'],
@@ -240,6 +245,7 @@ public function attributeLabels()
             'location' => Yii::t('CalendarModule.base', 'Location'),
             'is_public' => Yii::t('CalendarModule.base', 'Public'),
             'topics' => Yii::t('TopicModule.base', 'Topics'),
+            'sendUpdateNotification' => Yii::t('CalendarModule.base', 'Notify participants about changes'),
         ];
     }
 
@@ -440,6 +446,10 @@ public function save()
 
             Topic::attach($this->entry->content, $this->topics);
 
+            if ($this->sendUpdateNotification && !$this->entry->isNewRecord) {
+                $this->entry->participation->sendUpdateNotification();
+            }
+
             $result = true;
 
             if ($this->showReminderTab()) {

models/forms/CalendarEntryParticipationForm.php

@@ -88,10 +88,10 @@ public function rules()
     public function attributeLabels()
     {
         return [
-            'sendUpdateNotification' => Yii::t('CalendarModule.base', 'Send update notification'),
+            'sendUpdateNotification' => Yii::t('CalendarModule.base', 'Notify participants about changes'),
             'forceJoin' => ($this->entry->isNewRecord)
                 ? Yii::t('CalendarModule.base', 'Add all space members to this event')
-                : Yii::t('CalendarModule.base', 'Invite all participants from the space'),
+                : Yii::t('CalendarModule.base', 'Invite all Space members'),
         ];
     }
 

tests/codeception/_support/AcceptanceTester.php

@@ -27,7 +27,7 @@ public function createEventToday($title = 'My Test Entry', $description = 'My Te
    {
        $this->waitForElementVisible('.fc-today');
        $this->click('.fc-today');
-       $this->waitForText('Create event');
+       $this->waitForText('Create Event');
 
        $this->fillField('CalendarEntry[title]', $title);
        $this->fillField('#calendarentry-description .humhub-ui-richtext'  , $description);

tests/codeception/acceptance/CreateSpaceEntryCest.php

@@ -14,7 +14,7 @@
 
 class CreateSpaceEntryCest
 {
-    
+
     public function testInstallAndCreatEntry(AcceptanceTester $I)
     {
         $I->amAdmin();
@@ -30,7 +30,7 @@ public function testInstallAndCreatEntry(AcceptanceTester $I)
         $I->click('Calendar', '.layout-nav-container');
         $I->waitForElementVisible('.fc-today');
         $I->click('.fc-today');
-        $I->waitForText('Create event', null, '#globalModal');
+        $I->waitForText('Create Event', null, '#globalModal');
 
         $I->fillField('CalendarEntry[title]', 'My Test Entry');
         $I->fillField('#calendarentry-description .humhub-ui-richtext', 'My Test Entry Description');
@@ -90,7 +90,7 @@ public function testAddAll(AcceptanceTester $I)
 
         $I->waitForElementVisible('.fc-today');
         $I->click('.fc-today');
-        $I->waitForText('Create event');
+        $I->waitForText('Create Event');
 
         $I->fillField('CalendarEntry[title]', 'New Test Event');
 
@@ -104,7 +104,7 @@ public function testAddAll(AcceptanceTester $I)
 
         $I->expect('All space members to be attending');
         $I->click('New Test Event');
-        $I->waitForText('2 attending', null,'#globalModal');
+        $I->waitForText('2 Attending', null,'#globalModal');
         $I->amOnSpace(1, '/calendar/view/index');
 
         $I->wantToTest('Adding a new space member and using then using the add all members again');
@@ -126,7 +126,7 @@ public function testAddAll(AcceptanceTester $I)
         $I->waitForText('New Test Event',null, '#globalModal');
         $I->click('Invite', '#globalModal .modal-footer');
 
-        $I->waitForText('Event Participants', null, '#globalModal');
+        $I->waitForText('Participants', null, '#globalModal');
         $I->waitForElementVisible('[for="calendarentryparticipationform-forcejoin"]', null, '#globalModal');
         $I->click('[for="calendarentryparticipationform-forcejoin"]');
         $I->click('Save', '#globalModal');
@@ -135,7 +135,7 @@ public function testAddAll(AcceptanceTester $I)
 
         $memberCount = Membership::getSpaceMembersQuery(Space::findOne(['id' => 1]))->count();
 
-        $I->waitForText($memberCount.' attending', null,'#globalModal');
+        $I->waitForText($memberCount.' Attending', null,'#globalModal');
 
         $I->wantToTest('closing the event');
 
@@ -161,7 +161,7 @@ public function testAddAll(AcceptanceTester $I)
         $I->waitForElementVisible('.fc-today');
         $I->click('.fc-today');
 
-        $I->waitForText('Create event', null, '#globalModal');
+        $I->waitForText('Create Event', null, '#globalModal');
         $I->fillField('CalendarEntry[title]', 'User Test Event 2');
         $I->click('Next', '#globalModal');
         $I->waitForText('Participants', null, '#globalModal');

tests/codeception/acceptance/GlobalCalendarCest.php

@@ -58,7 +58,7 @@ public function testGlobalCalendarCreateEntry(AcceptanceTester $I)
         $I->waitForText('Next', null, '#globalModal');
         $I->click('Next', '#globalModal');
 
-        $I->waitForText('Create event', null, '#globalModal');
+        $I->waitForText('Create Event', null, '#globalModal');
         $I->fillField('CalendarEntry[title]', 'My Test Profile Entry');
         $I->fillField('#calendarentry-description .humhub-ui-richtext',  'My Test Profile Entry Description');
         $I->click('Next', '#globalModal');

tests/codeception/acceptance/ParticipationCest.php

@@ -30,14 +30,14 @@ public function testInstallAndCreatEntry(AcceptanceTester $I)
         $I->selectOption('#calendarentry-participation_mode', 2);
 
         $I->canSee('Maximum number of participants', '#globalModal');
-        $I->canSee('Allow participation state', '#globalModal');
+        $I->canSee('Allow option', '#globalModal');
 
         $I->selectOption('#calendarentry-participation_mode', 0);
 
         $I->wait(1);
 
         $I->cantSee('Maximum number of participants', '#globalModal');
-        $I->cantSee('Allow participation state', '#globalModal');
+        $I->cantSee('Allow option', '#globalModal');
 
         $I->click('[type="submit"]');
         $I->wait(1);
@@ -48,7 +48,7 @@ public function testInstallAndCreatEntry(AcceptanceTester $I)
         $I->dontSee('Decline', '#globalModal button');
 
         $I->click('Invite', '#globalModal');
-        $I->waitForText('Event Participants',null, '#globalModal');
+        $I->waitForText('Participants',null, '#globalModal');
 
         $I->selectOption('#calendarentry-participation_mode', 2);
 
@@ -64,7 +64,7 @@ public function testInstallAndCreatEntry(AcceptanceTester $I)
         $I->see('Decline', '#globalModal button');
 
         $I->click('Invite', '#globalModal');
-        $I->waitForText('Event Participants',null, '#globalModal');
+        $I->waitForText('Participants',null, '#globalModal h4');
         $I->click('.tab-participation');
         $I->click('[for="calendarentry-allow_decline"]', '#globalModal');
         $I->click('[for="calendarentry-allow_maybe"]', '#globalModal');
@@ -78,9 +78,9 @@ public function testInstallAndCreatEntry(AcceptanceTester $I)
         $I->dontSee('Decline', '#globalModal button');
 
         $I->click('Attend', '#globalModal');
-        $I->waitForText('1 attending', null, '#globalModal');
-        $I->click('1 attending', '#globalModal');
-        $I->waitForText('Event Participants', null, '#globalModal');
+        $I->waitForText('1 Attending', null, '#globalModal');
+        $I->click('1 Attending', '#globalModal');
+        $I->waitForText('Participants', null, '#globalModal');
         $I->see('Admin Tester', '#globalModal');
     }
 }

tests/codeception/acceptance/SettingsCest.php

@@ -35,7 +35,7 @@ public function testInstallAndCreatEntry(AcceptanceTester $I)
         $I->createEventToday('Setting Event','Setting Description',null,null,false);
         $I->click('Next', '#globalModal');
 
-        $I->waitForText('Event Participants',null, '#globalModal');
+        $I->waitForText('Participants',null, '#globalModal');
         $I->seeInField('#calendarentry-participation_mode', 0);
         $I->dontSeeElement('.participationOnly');
 
@@ -52,7 +52,7 @@ public function testInstallAndCreatEntry(AcceptanceTester $I)
         $I->amOnSpace1('/calendar/view');
         $I->createEventToday('Setting Event','Setting Description',null,null,false);
         $I->click('Next', '#globalModal');
-        $I->waitForText('Event Participants',null, '#globalModal');
+        $I->waitForText('Participants',null, '#globalModal h4');
         $I->seeInField('#calendarentry-participation_mode', 2);
         $I->seeElement('.participationOnly');
         $I->dontSeeCheckboxIsChecked('#calendarentry-allow_decline');

views/entry/edit-basic.php

@@ -99,4 +99,8 @@
     ])->label(false) ?>
 
     <?= $form->field($calendarEntryForm, 'topics')->widget(TopicPicker::class, ['contentContainer' => $contentContainer]); ?>
+
+    <?php if (!$calendarEntryForm->entry->isNewRecord) : ?>
+        <?= $form->field($calendarEntryForm, 'sendUpdateNotification')->checkbox() ?>
+    <?php endif; ?>
 </div>

views/entry/edit-participation.php

@@ -16,13 +16,13 @@
 ?>
 <div class="modal-body">
     <?= $form->field($entry, 'participation_mode')
-        ->dropDownList(CalendarEntryParticipationForm::getModeItems(), ['data-action-change' => 'changeParticipationMode'])->label(false) ?>
+        ->dropDownList(CalendarEntryParticipationForm::getModeItems(), ['data-action-change' => 'changeParticipationMode']) ?>
 
     <div class="participationOnly" style="<?= $entry->participation->isEnabled() ? '' : 'display:none' ?>">
         <?= $form->field($entry, 'max_participants')->textInput() ?>
         <?= $form->field($entry, 'allow_decline')->checkbox() ?>
         <?= $form->field($entry, 'allow_maybe')->checkbox() ?>
-        <?= $form->field($entry, 'participant_info')->widget(RichTextField::class, ['placeholder' => Yii::t('CalendarModule.base', 'Participation Info'), 'pluginOptions' => ['maxHeight' => '300px']])->label(false) ?>
+        <?= $form->field($entry, 'participant_info')->widget(RichTextField::class, ['placeholder' => Yii::t('CalendarModule.base', 'Additional Information for participants'), 'pluginOptions' => ['maxHeight' => '300px']])->label(false) ?>
 
         <?php if (!$entry->isNewRecord) : ?>
             <?= $form->field($calendarEntryParticipationForm, 'sendUpdateNotification')->checkbox() ?>

views/entry/edit.php

@@ -15,10 +15,10 @@
 CalendarBaseAssets::register($this);
 
 if ($calendarEntryForm->entry->isNewRecord) {
-    $header = Yii::t('CalendarModule.views_entry_edit', '<strong>Create</strong> event');
+    $header = Yii::t('CalendarModule.views_entry_edit', '<strong>Create</strong> Event');
     $saveButtonText = Yii::t('CalendarModule.views_entry_edit', 'Next');
 } else {
-    $header = Yii::t('CalendarModule.views_entry_edit', '<strong>Edit</strong> event');
+    $header = Yii::t('CalendarModule.views_entry_edit', '<strong>Edit</strong> Event');
     $saveButtonText = null;
 }
 
@@ -44,7 +44,7 @@
                     'params' => ['form' => $form, 'calendarEntryForm' => $calendarEntryForm, 'contentContainer' => $contentContainer],
                     'items' => [
                         [
-                            'label' => Yii::t('CalendarModule.views_entry_edit', 'Basic'),
+                            'label' => Yii::t('CalendarModule.views_entry_edit', 'General'),
                             'view' => 'edit-basic',
                             'linkOptions' => ['class' => 'tab-basic'],
                         ],

views/entry/modal-participants.php

@@ -30,7 +30,7 @@
 $visibleStyle = [];
 ?>
 <?php ModalDialog::begin([
-    'header' =>'<strong>' . Yii::t('CalendarModule.views_entry_view', 'Event Participants') . '</strong>',
+    'header' =>'<strong>' . Yii::t('CalendarModule.views_entry_view', 'Participants') . '</strong>',
     'size' => 'large',
 ]) ?>
     <?php $form = ActiveForm::begin(['enableClientValidation' => false]) ?>

widgets/DownloadIcsLink.php

@@ -33,6 +33,6 @@ public function run()
             return;
         }
 
-        return Html::a(Yii::t('CalendarModule.base', 'Download as ICS file'), Url::toEntryDownloadICS($this->calendarEntry), ['target' => '_blank']);
+        return Html::a(Yii::t('CalendarModule.base', 'Donwload ICS'), Url::toEntryDownloadICS($this->calendarEntry), ['target' => '_blank']);
     }
 }

widgets/EditLink.php

@@ -29,7 +29,7 @@ class EditLink extends WallEntryControlLink
 
     public function init()
     {
-        $this->label = Yii::t('ContentModule.widgets_views_editLink', 'Edit');
+        $this->label = Yii::t('CalendarModule.base', 'Edit Event');
         $this->icon = 'fa-pencil';
         $this->options = [
             'data-action-click' => 'calendar.editModal',

widgets/ParticipantItem.php

@@ -53,8 +53,8 @@ public static function getStatuses(?CalendarEntry $entry = null): array
             $statuses = [];
         } else {
             $statuses = [
-                CalendarEntryParticipant::PARTICIPATION_STATE_ACCEPTED => Yii::t('CalendarModule.views_entry_edit', 'Attend'),
-                CalendarEntryParticipant::PARTICIPATION_STATE_MAYBE => Yii::t('CalendarModule.views_entry_edit', 'Maybe'),
+                CalendarEntryParticipant::PARTICIPATION_STATE_ACCEPTED => Yii::t('CalendarModule.views_entry_edit', 'Attending'),
+                CalendarEntryParticipant::PARTICIPATION_STATE_MAYBE => Yii::t('CalendarModule.views_entry_edit', 'Undecided'),
                 CalendarEntryParticipant::PARTICIPATION_STATE_DECLINED => Yii::t('CalendarModule.views_entry_edit', 'Declined'),
             ];
         }

widgets/ParticipantsLink.php

@@ -21,7 +21,7 @@ class ParticipantsLink extends WallEntryControlLink
 
     public function init()
     {
-        $this->label = Yii::t('CalendarModule.base', 'Edit Participants');
+        $this->label = Yii::t('CalendarModule.base', 'Participants');
         $this->icon = 'fa-users';
         $this->options = [
             'data-action-click' => 'ui.modal.load',

widgets/views/participantAddForm.php

@@ -23,7 +23,7 @@
             <?= UserPickerField::widget([
                 'model' => $model,
                 'attribute' => 'newParticipants',
-                'placeholder' => Yii::t('AdminModule.user', 'Add new participants...'),
+                'placeholder' => Yii::t('AdminModule.user', 'Add participants...'),
                 'options' => ['label' => false],
                 'url' => $searchUsersUrl,
             ]) ?>

widgets/views/participantList.php

@@ -29,7 +29,7 @@
     <?= ParticipantFilter::widget() ?>
 
     <p class="calendar-entry-participants-count"><?= $pagination->totalCount
-        ? Yii::t('CalendarModule.views_entry_edit', '{count} participants', ['count' => '<span>' . $pagination->totalCount . '</span>'])
+        ? Yii::t('CalendarModule.views_entry_edit', '{count} Participants', ['count' => '<span>' . $pagination->totalCount . '</span>'])
         : Yii::t('CalendarModule.views_entry_edit', 'No participants')
     ?></p>
 <?php endif; ?>

widgets/views/participants.php

@@ -15,7 +15,7 @@
 <?php if ($calendarEntry->participation->isEnabled()) : ?>
     <h5 style="margin:0 0 5px;font-weight:600"><?= Yii::t('CalendarModule.widgets_views_participants', 'Participants') ?></h5>
 
-    <?php $title = Yii::t('CalendarModule.widgets_views_participants', ":count attending", [':count' => $countAttending]); ?>
+    <?php $title = Yii::t('CalendarModule.widgets_views_participants', ':count Attending', [':count' => $countAttending]); ?>
     <?php if ($countAttending > 0) : ?>
         <?= ModalButton::instance($title)
             ->load(Url::toParticipationUserList($calendarEntry, CalendarEntryParticipant::PARTICIPATION_STATE_ACCEPTED))
@@ -26,7 +26,7 @@
 
     <?php if($calendarEntry->allow_maybe) : ?>
          &middot;
-        <?php $title = Yii::t('CalendarModule.widgets_views_participants', ":count maybe", [':count' => $countMaybe]); ?>
+        <?php $title = Yii::t('CalendarModule.widgets_views_participants', ':count Undecided', [':count' => $countMaybe]); ?>
         <?php if ($countMaybe > 0) : ?>
             <?= ModalButton::instance($title)
                 ->load(Url::toParticipationUserList($calendarEntry, CalendarEntryParticipant::PARTICIPATION_STATE_MAYBE))
@@ -38,7 +38,7 @@
 
     <?php if($calendarEntry->allow_decline) : ?>
          &middot;
-        <?php $title = Yii::t('CalendarModule.widgets_views_participants', ":count declined", [':count' => $countDeclined]); ?>
+        <?php $title = Yii::t('CalendarModule.widgets_views_participants', ':count Declined', [':count' => $countDeclined]); ?>
         <?php if ($countDeclined > 0) : ?>
             <?= ModalButton::instance($title)
                 ->load(Url::toParticipationUserList($calendarEntry, CalendarEntryParticipant::PARTICIPATION_STATE_DECLINED))
@@ -48,7 +48,7 @@
         <?php endif ?>
     <?php endif ?>
 
-    &middot; <?php $title = Yii::t('CalendarModule.widgets_views_participants', ":count invited", [':count' => $countInvited]); ?>
+    &middot; <?php $title = Yii::t('CalendarModule.widgets_views_participants', ':count Invited', [':count' => $countInvited]); ?>
     <?php if ($countInvited > 0) : ?>
         <?= ModalButton::instance($title)
             ->load(Url::toParticipationUserList($calendarEntry, CalendarEntryParticipant::PARTICIPATION_STATE_INVITED))