From c17c55ec6292b24cbd9951b2bef7cefdea8dacbc Mon Sep 17 00:00:00 2001 From: James Mills Date: Wed, 28 Apr 2021 15:15:49 +0400 Subject: [PATCH 01/12] Adding treeware/plant --- composer.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fe5e326..de79df2 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ "php": ">=7.4", "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8", "torann/geoip": "^3.0", - "nesbot/carbon": "^1.0 || ^2.0" + "nesbot/carbon": "^1.0 || ^2.0", + "treeware/plant": "dev-main" }, "autoload": { "psr-4": { @@ -30,6 +31,17 @@ "providers": [ "JamesMills\\LaravelTimezone\\LaravelTimezoneServiceProvider" ] + }, + "treeware": { + "teaser": [ + "Your message to the consumers of your package to convince them.", + "Multiple lines are possible, but not more than 3 lines and 200 characters." + ], + "priceGroups": { + "useful": 100, + "important": 250, + "critical": 500 + } } }, "require-dev": { From 7d330a47f3551a957fa9bfc6a62e66b59cb67aa7 Mon Sep 17 00:00:00 2001 From: Maher Senoussi Date: Thu, 11 Nov 2021 04:16:01 -0600 Subject: [PATCH 02/12] Fix #52 (#76) --- src/Listeners/Auth/UpdateUsersTimezone.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Listeners/Auth/UpdateUsersTimezone.php b/src/Listeners/Auth/UpdateUsersTimezone.php index 7e3eac1..77550e1 100644 --- a/src/Listeners/Auth/UpdateUsersTimezone.php +++ b/src/Listeners/Auth/UpdateUsersTimezone.php @@ -52,7 +52,7 @@ public function handle($event) if ($user->timezone != $geoip_info['timezone']) { if (config('timezone.overwrite') == true || $user->timezone == null) { - $user->timezone = $geoip_info['timezone']; + $user->timezone = $geoip_info['timezone'] ?? $geoip_info->time_zone['name']; $user->save(); $this->notify($geoip_info); @@ -103,8 +103,8 @@ private function notify(Location $geoip_info) } /** - * @return mixed - */ + * @return mixed + */ private function getFromLookup() { $result = null; From b03f493f1f344ddcb1c04ed0f82745df746d07bd Mon Sep 17 00:00:00 2001 From: John F <15612814+usernotnull@users.noreply.github.com> Date: Thu, 11 Nov 2021 12:16:32 +0200 Subject: [PATCH 03/12] Update UpdateUsersTimezone.php (#75) - Added the `tall-toasts` library - Updated README.md & timezone.php to reflect the changes --- README.md | 2 ++ src/Listeners/Auth/UpdateUsersTimezone.php | 6 ++++++ src/config/timezone.php | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 77c62b7..3631478 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,8 @@ When the timezone has been set, we display a flash message, By default, is confi [mckenziearts/laravel-notify](https://github.com/mckenziearts/laravel-notify) - `'flash' => 'mckenziearts'` +[usernotnull/tall-toasts](https://github.com/usernotnull/tall-toasts) - `'flash' => 'tall-toasts'` + To override this configuration, you just need to change the `flash` property inside the configuration file `config/timezone.php` for the desired package. You can disable flash messages by setting `'flash' => 'off'`. ### Overwrite existing timezones in the database diff --git a/src/Listeners/Auth/UpdateUsersTimezone.php b/src/Listeners/Auth/UpdateUsersTimezone.php index 77550e1..23a43c5 100644 --- a/src/Listeners/Auth/UpdateUsersTimezone.php +++ b/src/Listeners/Auth/UpdateUsersTimezone.php @@ -100,6 +100,12 @@ private function notify(Location $geoip_info) return; } + + if (config('timezone.flash') == 'tall-toasts') { + toast()->success($message)->pushOnNextPage(); + + return; + } } /** diff --git a/src/config/timezone.php b/src/config/timezone.php index 7b992b0..0b92690 100644 --- a/src/config/timezone.php +++ b/src/config/timezone.php @@ -9,7 +9,7 @@ | | Here you may configure if to use the laracasts/flash package for flash | notifications when a users timezone is set. - | options [off, laravel, laracasts, mercuryseries, spatie, mckenziearts] + | options [off, laravel, laracasts, mercuryseries, spatie, mckenziearts, tall-toasts] | */ From cc171e98abf3b261bc7574823804117611534ec0 Mon Sep 17 00:00:00 2001 From: oddvalue Date: Thu, 11 Nov 2021 10:17:49 +0000 Subject: [PATCH 04/12] Check for session before notifying in `UpdateUsersTimezone` (#74) --- src/Listeners/Auth/UpdateUsersTimezone.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Listeners/Auth/UpdateUsersTimezone.php b/src/Listeners/Auth/UpdateUsersTimezone.php index 23a43c5..dc20bec 100644 --- a/src/Listeners/Auth/UpdateUsersTimezone.php +++ b/src/Listeners/Auth/UpdateUsersTimezone.php @@ -65,7 +65,7 @@ public function handle($event) */ private function notify(Location $geoip_info) { - if (config('timezone.flash') == 'off') { + if (request()->hasSession() && config('timezone.flash') == 'off') { return; } From c10c5567f0c2f17715dd08fa5b159032a10fcd88 Mon Sep 17 00:00:00 2001 From: bastinald <82109804+bastinald@users.noreply.github.com> Date: Thu, 11 Nov 2021 05:18:12 -0500 Subject: [PATCH 05/12] add translatable "Empty" string (#70) --- src/Timezone.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Timezone.php b/src/Timezone.php index bc2b6d1..886a988 100644 --- a/src/Timezone.php +++ b/src/Timezone.php @@ -15,7 +15,7 @@ class Timezone public function convertToLocal(?Carbon $date, $format = null, $format_timezone = false) : string { if (is_null($date)) { - return 'Empty'; + return __('Empty'); } $timezone = (auth()->user()->timezone) ?? config('app.timezone'); From 9494aaca91f2058ab9001b90597c476eb4ad6bab Mon Sep 17 00:00:00 2001 From: Grant Date: Wed, 16 Feb 2022 12:38:09 +0800 Subject: [PATCH 06/12] Add laravel 9 support (#80) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index de79df2..46a1dd2 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "require": { "php": ">=7.4", - "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8", + "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8 || ^9", "torann/geoip": "^3.0", "nesbot/carbon": "^1.0 || ^2.0", "treeware/plant": "dev-main" From ea5a5ca8969a32f76dee8c75b1a748058eaa61d1 Mon Sep 17 00:00:00 2001 From: Sam Lewis Date: Tue, 15 Feb 2022 23:42:04 -0500 Subject: [PATCH 07/12] Make the message shown to users when timezone is set configurable. (#66) --- README.md | 4 ++++ src/Listeners/Auth/UpdateUsersTimezone.php | 5 ++--- src/config/timezone.php | 12 ++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3631478..e2910b9 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,10 @@ By default, the date format will be `jS F Y g:i:a`. To override this configurati This lookup array configuration makes it possible to find the remote address of the user in any attribute inside the Laravel `request` helper, by any key. Having in mind when the key is found inside the attribute, that key will be used. By default, we use the `server` attribute with the key `REMOTE_ADDR`. To override this configuration, you just need to change the `lookup` property inside the configuration file `config/timezone.php` for the desired lookup. +### User Message + +You may configure the message shown to the user when the timezone is set by changing the `message` property inside the configuration file `config/timezone.php` + ### Underlying GeoIp Package If you wish to customise the underlying `torann/geoip` package you can publish the config file by using the command below. diff --git a/src/Listeners/Auth/UpdateUsersTimezone.php b/src/Listeners/Auth/UpdateUsersTimezone.php index dc20bec..f403c6b 100644 --- a/src/Listeners/Auth/UpdateUsersTimezone.php +++ b/src/Listeners/Auth/UpdateUsersTimezone.php @@ -9,7 +9,6 @@ class UpdateUsersTimezone { - /** * Handle the event. * @@ -69,7 +68,7 @@ private function notify(Location $geoip_info) return; } - $message = 'We have set your timezone to ' . $geoip_info['timezone']; + $message = sprintf(config('timezone.message', 'We have set your timezone to %s'), $geoip_info['timezone']); if (config('timezone.flash') == 'laravel') { request()->session()->flash('success', $message); @@ -140,7 +139,7 @@ private function lookup($type, $keys) $value = null; foreach ($keys as $key) { - if (!request()->$type->has($key)) { + if (! request()->$type->has($key)) { continue; } $value = request()->$type->get($key); diff --git a/src/config/timezone.php b/src/config/timezone.php index 0b92690..b1d9ebf 100644 --- a/src/config/timezone.php +++ b/src/config/timezone.php @@ -59,4 +59,16 @@ ], ], + /* + |-------------------------------------------------------------------------- + | User Message + |-------------------------------------------------------------------------- + | + | Here you may configure the message shown to the user when the timezone is set. + | Be sure to include the %s which will be replaced by the detected timezone. + | e.g. We have set your timezone to America/New_York + | + */ + + 'message' => 'We have set your timezone to %s', ]; From df199f7e75a42f8f5392aac67cc05b95e2379d98 Mon Sep 17 00:00:00 2001 From: Al Desrahim <37100012+aldesrahim@users.noreply.github.com> Date: Wed, 16 Feb 2022 11:45:03 +0700 Subject: [PATCH 08/12] Added option to enable Carbon's translatedFormat (#69) --- src/LaravelTimezoneServiceProvider.php | 2 ++ src/Timezone.php | 10 ++++++---- src/config/timezone.php | 11 +++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/LaravelTimezoneServiceProvider.php b/src/LaravelTimezoneServiceProvider.php index e20f239..4ba0c55 100644 --- a/src/LaravelTimezoneServiceProvider.php +++ b/src/LaravelTimezoneServiceProvider.php @@ -55,6 +55,8 @@ function ($expression) { return ""; } elseif (count($options) == 3) { return ""; + } elseif (count($options) == 4) { + return ""; } else { return 'error'; } diff --git a/src/Timezone.php b/src/Timezone.php index 886a988..6d9d6b4 100644 --- a/src/Timezone.php +++ b/src/Timezone.php @@ -12,21 +12,23 @@ class Timezone * @param bool $format_timezone * @return string */ - public function convertToLocal(?Carbon $date, $format = null, $format_timezone = false) : string + public function convertToLocal(?Carbon $date, $format = null, $format_timezone = false, $enableTranslation = null) : string { if (is_null($date)) { return __('Empty'); } $timezone = (auth()->user()->timezone) ?? config('app.timezone'); - + + $enableTranslation = $enableTranslation !== null ? $enableTranslation : config('timezone.enableTranslation'); + $date->setTimezone($timezone); if (is_null($format)) { - return $date->format(config('timezone.format')); + return $enableTranslation ? $date->translatedFormat(config('timezone.format')) : $date->format(config('timezone.format')); } - $formatted_date_time = $date->format($format); + $formatted_date_time = $enableTranslation ? $date->translatedFormat($format) : $date->format($format); if ($format_timezone) { return $formatted_date_time . ' ' . $this->formatTimezone($date); diff --git a/src/config/timezone.php b/src/config/timezone.php index b1d9ebf..3bede06 100644 --- a/src/config/timezone.php +++ b/src/config/timezone.php @@ -39,6 +39,17 @@ */ 'format' => 'jS F Y g:i:a', + + /* + |-------------------------------------------------------------------------- + | Enable translated output + |-------------------------------------------------------------------------- + | + | Here you may configure if you would like to use translated output. + | + */ + + 'enableTranslation' => false, /* |-------------------------------------------------------------------------- From 40df97b57e546200ded36020bfe6ad88528aaa4a Mon Sep 17 00:00:00 2001 From: James Mills Date: Wed, 16 Feb 2022 08:54:03 +0400 Subject: [PATCH 09/12] Updated changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45a196b..cc67441 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.11.0] - 2022-02-16 +### Added +- Added Laravel 9 support. (Thank you [grantholle](https://github.com/grantholle)) ([PR#80](https://github.com/jamesmills/laravel-timezone/pull/80)) +- Make the message shown to users when timezone is set configurable. (Thank you [samtlewis](https://github.com/samtlewis)) ([PR#66](https://github.com/jamesmills/laravel-timezone/pull/66)) +- Added option to enable Carbon's translatedFormat. (Thank you [aldesrahim](https://github.com/aldesrahim)) ([PR#69](https://github.com/jamesmills/laravel-timezone/pull/69)) + + ## [1.8.0] - 2020-01-22 ### Added - Added the ability to turn off flash messages and use others packages. (Thank you [amandiobm](https://github.com/amandiobm)) ([PR#15](https://github.com/jamesmills/laravel-timezone/pull/15)) From 688bcd458b68cc8643051ed271147ad8d9feb94f Mon Sep 17 00:00:00 2001 From: Laravel Shift Date: Tue, 14 Feb 2023 05:27:12 -0500 Subject: [PATCH 10/12] Bump dependencies for Laravel 10 (#87) --- composer.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 46a1dd2..78a0f6a 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "require": { "php": ">=7.4", - "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8 || ^9", + "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8 || ^9|^10.0", "torann/geoip": "^3.0", "nesbot/carbon": "^1.0 || ^2.0", "treeware/plant": "dev-main" @@ -23,7 +23,6 @@ "psr-4": { "JamesMills\\LaravelTimezone\\": "src/", "JamesMills\\LaravelTimezone\\Database\\Seeds\\": "database/seeds/" - } }, "extra": { @@ -45,7 +44,7 @@ } }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.12" + "friendsofphp/php-cs-fixer": "^2.12|^3.14" }, "scripts": { "pre-package-install": [ From c4c64e0e13558b5b6bcad84eb482902460c57ae4 Mon Sep 17 00:00:00 2001 From: James Mills Date: Wed, 15 Feb 2023 11:52:19 +0400 Subject: [PATCH 11/12] Updating changelog for Laravel 10 support. --- CHANGELOG.md | 6 +++++- composer.json | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc67441..fc6bab6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.12.0] - 2023-02-15 + +### Added +- Support for Laravel 10 (Thank you [laravelshift](https://github.com/laravel-shift) ([PR#87](https://github.com/jamesmills/laravel-timezone/pull/87)) + ## [1.11.0] - 2022-02-16 ### Added - Added Laravel 9 support. (Thank you [grantholle](https://github.com/grantholle)) ([PR#80](https://github.com/jamesmills/laravel-timezone/pull/80)) - Make the message shown to users when timezone is set configurable. (Thank you [samtlewis](https://github.com/samtlewis)) ([PR#66](https://github.com/jamesmills/laravel-timezone/pull/66)) - Added option to enable Carbon's translatedFormat. (Thank you [aldesrahim](https://github.com/aldesrahim)) ([PR#69](https://github.com/jamesmills/laravel-timezone/pull/69)) - ## [1.8.0] - 2020-01-22 ### Added - Added the ability to turn off flash messages and use others packages. (Thank you [amandiobm](https://github.com/amandiobm)) ([PR#15](https://github.com/jamesmills/laravel-timezone/pull/15)) diff --git a/composer.json b/composer.json index 78a0f6a..7c7adb1 100644 --- a/composer.json +++ b/composer.json @@ -9,14 +9,14 @@ "authors": [ { "name": "James Mills", - "email": "james@clicksco.com" + "email": "james@jamesmills.co.uk" } ], "require": { "php": ">=7.4", - "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8 || ^9|^10.0", + "laravel/framework": "5.6.*|5.7.*|5.8.*|^6|^7|^8|^9|^10.0", "torann/geoip": "^3.0", - "nesbot/carbon": "^1.0 || ^2.0", + "nesbot/carbon": "^1.0|^2.0", "treeware/plant": "dev-main" }, "autoload": { From 014f51cfff5985424dfd791d0dffe438dc28b29b Mon Sep 17 00:00:00 2001 From: James Mills Date: Fri, 17 Feb 2023 15:07:53 +0400 Subject: [PATCH 12/12] Removed requirement for `treeware/plant` package. --- CHANGELOG.md | 5 +++++ composer.json | 14 +------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc6bab6..54ee57c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.13.0] - 2023-02-17 + +### Removed +- Removed requirement for `treeware/plant` package. + ## [1.12.0] - 2023-02-15 ### Added diff --git a/composer.json b/composer.json index 7c7adb1..3bf0964 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,7 @@ "php": ">=7.4", "laravel/framework": "5.6.*|5.7.*|5.8.*|^6|^7|^8|^9|^10.0", "torann/geoip": "^3.0", - "nesbot/carbon": "^1.0|^2.0", - "treeware/plant": "dev-main" + "nesbot/carbon": "^1.0|^2.0" }, "autoload": { "psr-4": { @@ -30,17 +29,6 @@ "providers": [ "JamesMills\\LaravelTimezone\\LaravelTimezoneServiceProvider" ] - }, - "treeware": { - "teaser": [ - "Your message to the consumers of your package to convince them.", - "Multiple lines are possible, but not more than 3 lines and 200 characters." - ], - "priceGroups": { - "useful": 100, - "important": 250, - "critical": 500 - } } }, "require-dev": {