From d63423bc473aa9e634167b81e9856d32267518c7 Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Fri, 13 Jul 2018 07:51:10 +0100 Subject: [PATCH 1/2] Bumped version number ready for the beta release --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index a24028e..93d4e30 100644 --- a/config/app.php +++ b/config/app.php @@ -2,7 +2,7 @@ return [ // Version number of Blue Twilight - 'version' => '2.1.1-alpha.1', + 'version' => '2.1.1-beta', /* |-------------------------------------------------------------------------- From 9740582b6eb1733c9e36b31c0b2a27d2d43f7128 Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Sat, 14 Jul 2018 08:15:19 +0100 Subject: [PATCH 2/2] #73: Updated the message when a metadata-update fails so it doesn't say it's removing the photo --- resources/lang/en/admin.php | 1 + resources/views/themes/base/admin/album_metadata.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php index d61f597..19bcbd6 100644 --- a/resources/lang/en/admin.php +++ b/resources/lang/en/admin.php @@ -51,6 +51,7 @@ return [ 'others' => ' others' ], 'analyse_photos_failed' => 'The following items could not be analysed and were removed:', + 'analyse_photos_failed_metadata' => 'The following items could not be analysed:', 'anonymous_users' => 'Anonymous (not logged in)', 'bulk_photos_changed' => ':number photo was updated successfully.|:number photos were updated successfully.', 'cannot_delete_own_user_account' => 'It is not possible to delete your own user account. Please ask another administrator to delete it for you.', diff --git a/resources/views/themes/base/admin/album_metadata.blade.php b/resources/views/themes/base/admin/album_metadata.blade.php index 151fbc6..e4ed98a 100644 --- a/resources/views/themes/base/admin/album_metadata.blade.php +++ b/resources/views/themes/base/admin/album_metadata.blade.php @@ -65,7 +65,7 @@

Your analysis has completed.

-

@lang('admin.analyse_photos_failed')

+

@lang('admin.analyse_photos_failed_metadata')

  • :