Commit f14ad63f authored by Navneet Singh's avatar Navneet Singh Committed by Navneet Singh
Browse files

Merge pull request #2880 from goalgorilla/issue/3201416-american-english 

Issue #3201416 by hotwebmatter, DamienMcKenna, Ressinel: Spelling for "Notification Centre" should be American English
parent 871434e0

modules/custom/activity_creator/js/notifications.js

+1 −1
Changes for modules/custom/activity_creator/js/notifications.js: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


(function ($, Drupal) {

  /**

   * Notification centre bell update behavior.

   * Notification Center bell update behavior.

   */

  Drupal.behaviors.notificationUpdate = {

    attach: function (context) {

modules/social_features/social_activity/social_activity.module

+4 −4
Changes for modules/social_features/social_activity/social_activity.module: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ function social_activity_social_user_account_header_items(array $context) { 
      '#wrapper_attributes' => [

        'class' => ['desktop', 'notification-bell'],

      ],

      '#title' => new TranslatableMarkup('Notification Centre'),

      '#title' => new TranslatableMarkup('Notification Center'),

      '#icon' => $num_notifications > 0 ? 'notifications' : 'notifications_none',

      '#label' => new TranslatableMarkup('Notifications'),

      '#url' => Url::fromRoute('view.activity_stream_notifications.page_1'),
@@ -47,7 +47,7 @@ function social_activity_social_user_account_header_items(array $context) { 
      '#weight' => 800,

      'header' => [

        '#wrapper_attributes' => ['class' => 'dropdown-header'],

        '#markup' => new TranslatableMarkup('Notification Centre'),

        '#markup' => new TranslatableMarkup('Notification Center'),

      ],

      'header-divider' => [

        '#wrapper_attributes' => ['class' => 'divider'],
@@ -138,11 +138,11 @@ function social_activity_social_user_account_header_account_links(array $context 
      '#weight' => 300,

      '#type' => 'link',

      '#attributes' => [

        'title' => new TranslatableMarkup('Notification Centre'),

        'title' => new TranslatableMarkup('Notification Center'),

      ],

      '#title' => [

        '#type' => 'inline_template',

        '#template' => '<span>{% trans %}Notification Centre{% endtrans %}</span><span{{ attributes }}>{{ icon }}</span>',

        '#template' => '<span>{% trans %}Notification Center{% endtrans %}</span><span{{ attributes }}>{{ icon }}</span>',

        '#context' => [

          'attributes' => new Attribute(['class' => $label_classes]),

          'icon' => (string) $num_notifications,

modules/social_features/social_swiftmail/src/Form/SocialSwiftmailSettingsForm.php

+1 −1
Changes for modules/social_features/social_swiftmail/src/Form/SocialSwiftmailSettingsForm.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ class SocialSwiftmailSettingsForm extends ConfigFormBase { 
    $form['do_not_send_emails_new_users'] = [

      '#type' => 'checkbox',

      '#title' => $this->t("Don't send email notifications to users who have never logged in"),

      '#description' => $this->t('When this setting is enabled, users who have never logged in will not receive email notifications, they still receive notifications via the notification centre within the community.'),

      '#description' => $this->t('When this setting is enabled, users who have never logged in will not receive email notifications, they still receive notifications via the notification center within the community.'),

      '#default_value' => $config->get('do_not_send_emails_new_users'),

    ];

tests/behat/features/capabilities/like/like-create-event.feature

+1 −1
Changes for tests/behat/features/capabilities/like/like-create-event.feature: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -35,5 +35,5 @@ Feature: Create event like 
    Given I am logged in as "user_1"

      And I wait for the queue to be empty

      And I click the xth "0" element with the css ".notification-bell a"

     Then I should see "Notification centre"

     Then I should see "Notification center"

      And I should see "Isaac Newton likes your event"

tests/behat/features/capabilities/like/like-create-topic.feature

+1 −1
Changes for tests/behat/features/capabilities/like/like-create-topic.feature: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ Feature: Create topic like 
    Given I am logged in as "user_1"

      And I wait for the queue to be empty

      And I click the xth "0" element with the css ".notification-bell a"

     Then I should see "Notification centre"

     Then I should see "Notification center"

      And I should see "Charles Darwin likes your topic"