Merge pull request #36 from rappasoft/develop

v1.3.0
rappasoft · Jan 18, 2022 · 616bf9f · 616bf9f
2 parents b8a5d24 + 44202a8
commit 616bf9f
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,38 +2,45 @@
 
 All notable changes to `Laravel Authentication Log` will be documented in this file.
 
+### 1.3.0 - 2022-01-17
+
+### Changed
+
+-   Added missing `hasTranslations()` - https://github.com/rappasoft/laravel-authentication-log/pull/30
+-   Improve translation strings - https://github.com/rappasoft/laravel-authentication-log/pull/31
+
 ### 1.2.1 - 2021-12-02
 
 ### Added
 
-- Added latestAuthentication relationship - https://github.com/rappasoft/laravel-authentication-log/pull/24
+-   Added latestAuthentication relationship - https://github.com/rappasoft/laravel-authentication-log/pull/24
 
 ### Changed
 
-- Fixed issue with PHP 7.4 - https://github.com/rappasoft/laravel-authentication-log/pull/22
+-   Fixed issue with PHP 7.4 - https://github.com/rappasoft/laravel-authentication-log/pull/22
 
 ### 1.2.0 - 2021-11-21
 
 ### Added
 
-- Fire a successful login after a failed login on an unknown (new) device. - https://github.com/rappasoft/laravel-authentication-log/pull/15
-- Make the events the package is listening for configurable in the config file
-- Added French translation and missing location translations - https://github.com/rappasoft/laravel-authentication-log/pull/18
-- PHP 7.4 Support
+-   Fire a successful login after a failed login on an unknown (new) device. - https://github.com/rappasoft/laravel-authentication-log/pull/15
+-   Make the events the package is listening for configurable in the config file
+-   Added French translation and missing location translations - https://github.com/rappasoft/laravel-authentication-log/pull/18
+-   PHP 7.4 Support
 
 ### 1.1.1 - 2021-10-20
 
 ### Changed
 
-- Logout listener bug fix - https://github.com/rappasoft/laravel-authentication-log/pull/10
+-   Logout listener bug fix - https://github.com/rappasoft/laravel-authentication-log/pull/10
 
 ### 1.1.0 - 2021-10-11
 
 ### Added
 
-- Known issues section to readme
-- Ability to set DB connection type - https://github.com/rappasoft/laravel-authentication-log/pull/4
+-   Known issues section to readme
+-   Ability to set DB connection type - https://github.com/rappasoft/laravel-authentication-log/pull/4
 
 ## 1.0.0 - 2021-09-30
 
-- Initial Release
+-   Initial Release
diff --git a/docs/start/configuration.md b/docs/start/configuration.md
@@ -32,7 +32,7 @@ return [
 
     // The database connection where the authentication_log table resides. Leave empty to use the default
     'db_connection' => null,
-    
+
     // The events the package listens for to log (as of v1.3)
     'events' => [
         'login' => \Illuminate\Auth\Events\Login::class,
@@ -95,7 +95,7 @@ The package will listen for Laravel's Login, Logout, Failed, and OtherDeviceLogo
 
 ## Overriding default Laravel events
 
-If you would like to listen to your own events you may override them in the package config (as of v1.3).
+If you would like to listen to your own events you may override them in the package config (as of v1.2).
 
 ### Example event override
 

diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -1,14 +1,14 @@
 {
     "A failed login to your account": "A failed login to your account",
-    "Account": "Account",
-    "Browser": "Browser",
-    "Hello": "Hello",
+    "Account:": "Account:",
+    "Browser:": "Browser:",
+    "Hello!": "Hello!",
     "If this was you, you can ignore this alert. If you suspect any suspicious activity on your account, please change your password.": "If this was you, you can ignore this alert. If you suspect any suspicious activity on your account, please change your password.",
-    "IP Address": "IP Address",
-    "Location": "Location",
-    "Regards": "Regards",
+    "IP Address:": "IP Address:",
+    "Location:": "Location:",
+    "Regards,": "Regards,",
     "There has been a failed login attempt to your :app account.": "There has been a failed login attempt to your :app account.",
-    "Time": "Time",
+    "Time:": "Time:",
     "Unknown City": "Unknown City",
     "Unknown State": "Unknown State",
     "Your :app account logged in from a new device.": "Your :app account logged in from a new device."

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
@@ -1,14 +1,14 @@
 {
     "A failed login to your account": "Échec de la connexion à votre compte",
-    "Account": "Compte",
-    "Browser": "Navigateur",
-    "Hello": "Bonjour",
+    "Account:": "Compte :",
+    "Browser:": "Navigateur :",
+    "Hello!": "Bonjour,",
     "If this was you, you can ignore this alert. If you suspect any suspicious activity on your account, please change your password.": "Si c’était vous, vous pouvez ignorer cette alerte. Si vous soupçonnez une activité suspecte sur votre compte, veuillez modifier votre mot de passe.",
-    "IP Address": "Adresse IP",
-    "Location": "Emplacement",
-    "Regards": "Cordialement",
+    "IP Address:": "Adresse IP :",
+    "Location:": "Emplacement :",
+    "Regards,": "Cordialement,",
     "There has been a failed login attempt to your :app account.": "Une tentative de connexion à votre compte sur :app a échoué.",
-    "Time": "Heure",
+    "Time:": "Heure :",
     "Unknown City": "Ville inconnue",
     "Unknown State": "État inconnu",
     "Your :app account logged in from a new device.": "Connexion à votre compte sur :app depuis un nouvel appareil."

diff --git a/resources/views/emails/failed.blade.php b/resources/views/emails/failed.blade.php
@@ -1,18 +1,18 @@
 @component('mail::message')
-# @lang('Hello')!
+# @lang('Hello!')
 
 @lang('There has been a failed login attempt to your :app account.', ['app' => config('app.name')])
 
-> **@lang('Account'):** {{ $account->email }}<br/>
-> **@lang('Time'):** {{ $time->toCookieString() }}<br/>
-> **@lang('IP Address'):** {{ $ipAddress }}<br/>
-> **@lang('Browser'):** {{ $browser }}<br/>
+> **@lang('Account:')** {{ $account->email }}<br/>
+> **@lang('Time:')** {{ $time->toCookieString() }}<br/>
+> **@lang('IP Address:')** {{ $ipAddress }}<br/>
+> **@lang('Browser:')** {{ $browser }}<br/>
 @if ($location && $location['default'] === false)
-> **@lang('Location'):** {{ $location['city'] ?? __('Unknown City') }}, {{ $location['state'], __('Unknown State') }}
+> **@lang('Location:')** {{ $location['city'] ?? __('Unknown City') }}, {{ $location['state'], __('Unknown State') }}
 @endif
 
 @lang('If this was you, you can ignore this alert. If you suspect any suspicious activity on your account, please change your password.')
 
-@lang('Regards'),<br/>
+@lang('Regards,')<br/>
 {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/emails/new.blade.php b/resources/views/emails/new.blade.php
@@ -1,18 +1,18 @@
 @component('mail::message')
-# @lang('Hello')!
+# @lang('Hello!')
 
 @lang('Your :app account logged in from a new device.', ['app' => config('app.name')])
 
-> **@lang('Account'):** {{ $account->email }}<br/>
-> **@lang('Time'):** {{ $time->toCookieString() }}<br/>
-> **@lang('IP Address'):** {{ $ipAddress }}<br/>
-> **@lang('Browser'):** {{ $browser }}<br/>
+> **@lang('Account:')** {{ $account->email }}<br/>
+> **@lang('Time:')** {{ $time->toCookieString() }}<br/>
+> **@lang('IP Address:')** {{ $ipAddress }}<br/>
+> **@lang('Browser:')** {{ $browser }}<br/>
 @if ($location && $location['default'] === false)
-> **@lang('Location'):** {{ $location['city'] ?? __('Unknown City') }}, {{ $location['state'], __('Unknown State') }}
+> **@lang('Location:')** {{ $location['city'] ?? __('Unknown City') }}, {{ $location['state'], __('Unknown State') }}
 @endif
 
 @lang('If this was you, you can ignore this alert. If you suspect any suspicious activity on your account, please change your password.')
 
-@lang('Regards'),<br/>
+@lang('Regards,')<br/>
 {{ config('app.name') }}
 @endcomponent
diff --git a/src/LaravelAuthenticationLogServiceProvider.php b/src/LaravelAuthenticationLogServiceProvider.php
@@ -22,6 +22,7 @@ public function configurePackage(Package $package): void
         $package
             ->name('laravel-authentication-log')
             ->hasConfigFile()
+            ->hasTranslations()
             ->hasViews()
             ->hasMigration('create_authentication_log_table')
             ->hasCommand(PurgeAuthenticationLogCommand::class);