From: Dan Brown <redacted>
Date: Wed, 23 Oct 2019 18:53:51 +0000 (+0100)
Subject: Merge branch 'feature-send-test-email' of git://github.com/timoschwarzer/BookStack... 
X-Git-Tag: v0.28.0~1^2~56
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a2370f7c9d2051055c40f061db438500b640d072?ds=inline;hp=-c

Merge branch 'feature-send-test-email' of git://github.com/timoschwarzer/BookStack into timoschwarzer-feature-send-test-email
---

a2370f7c9d2051055c40f061db438500b640d072
diff --combined resources/lang/en/settings.php
index 63b6f6d43,3bcd517ca..ac3be1f3f
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@@ -63,6 -63,13 +63,13 @@@ return 
      'maint_image_cleanup_warning' => ':count potentially unused images were found. Are you sure you want to delete these images?',
      'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
      'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!',
+     'maint_send_test_email' => 'Send a Test E-Mail',
+     'maint_send_test_email_desc' => 'This sends a test e-mail to your e-mail address specified in your profile.',
+     'maint_send_test_email_run' => 'Send test e-mail',
+     'maint_send_test_email_success' => 'E-Mail sent to :address',
+     'maint_send_test_email_mail_subject' => 'Test E-Mail',
+     'maint_send_test_email_mail_greeting' => 'E-Mail delivery seems to work!',
+     'maint_send_test_email_mail_text' => 'Congratulations! As you received this e-mail notification, your e-mail settings seem to be configured properly.',
  
      // Role Settings
      'roles' => 'Roles',
@@@ -135,8 -142,9 +142,8 @@@
      'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
      'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
  
 -    //! Since these labels are already localized this array does not need to be
 -    //! translated in the language-specific files.
 -    //! DELETE BELOW IF COPIED FROM EN
 +    //! If editing translations files directly please ignore this in all
 +    //! languages apart from en. Content will be auto-copied from en.
      //!////////////////////////////////
      'language_select' => [
          'en' => 'English',
@@@ -151,16 -159,15 +158,16 @@@
          'sk' => 'Slovensky',
          'cs' => 'Česky',
          'sv' => 'Svenska',
 -        'kr' => '한국어',
 +        'ko' => '한국어',
          'ja' => '日本語',
          'pl' => 'Polski',
          'it' => 'Italian',
          'ru' => 'Русский',
          'uk' => 'Українська',
          'zh_CN' => '简体中文',
 -	'zh_TW' => '繁體中文',
 -	'hu' => 'Magyar'
 +        'zh_TW' => '繁體中文',
 +        'hu' => 'Magyar',
 +        'tr' => 'Türkçe',
      ]
      //!////////////////////////////////
  ];
diff --combined resources/views/settings/maintenance.blade.php
index 2522599cf,ecd4702a6..7311bbbe2
--- a/resources/views/settings/maintenance.blade.php
+++ b/resources/views/settings/maintenance.blade.php
@@@ -7,14 -7,12 +7,13 @@@
          <div class="py-m">
              @include('settings.navbar', ['selected' => 'maintenance'])
          </div>
 -        <div class="text-right mb-l px-m">
 -            <br>
 +        <div class="text-right p-m">
 +            <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
              BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
 +            </a>
          </div>
      </div>
  
- 
      <div id="image-cleanup" class="card content-wrap auto-height">
          <h2 class="list-heading">{{ trans('settings.maint_image_cleanup') }}</h2>
          <div class="grid half gap-xl">
@@@ -45,5 -43,20 +44,20 @@@
          </div>
      </div>
  
+     <div id="send-test-email" class="card content-wrap auto-height">
+         <h2 class="list-heading">{{ trans('settings.maint_send_test_email') }}</h2>
+         <div class="grid half gap-xl">
+             <div>
+                 <p class="small text-muted">{{ trans('settings.maint_send_test_email_desc') }}</p>
+             </div>
+             <div>
+                 <form method="POST" action="{{ url('/http/source.bookstackapp.com/settings/maintenance/send-test-email') }}">
+                     {!! csrf_field()  !!}
+                     <button class="button outline">{{ trans('settings.maint_send_test_email_run') }}</button>
+                 </form>
+             </div>
+         </div>
+     </div>
+ 
  </div>
  @stop