aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Andy Heathershaw 2018-07-14 08:22:38 +01:00
commit e2d66fd228
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/lang/en/admin.php
View File

@ -51,6 +51,7 @@ return [
'others' => ' others' 'others' => ' others'
], ],
'analyse_photos_failed' => 'The following items could not be analysed and were removed:', '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)', 'anonymous_users' => 'Anonymous (not logged in)',
'bulk_photos_changed' => ':number photo was updated successfully.|:number photos were updated successfully.', '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.', 'cannot_delete_own_user_account' => 'It is not possible to delete your own user account. Please ask another administrator to delete it for you.',

2
resources/views/themes/base/admin/album_metadata.blade.php
View File

@ -65,7 +65,7 @@
<p>Your analysis has completed.</p> <p>Your analysis has completed.</p>
<div v-if="numberFailed > 0"> <div v-if="numberFailed > 0">
<p class="text-danger">@lang('admin.analyse_photos_failed')</p> <p class="text-danger">@lang('admin.analyse_photos_failed_metadata')</p>
<ul class="text-danger" v-for="image in imagesFailed"> <ul class="text-danger" v-for="image in imagesFailed">
<li><span v-text="image.name"></span>: <span v-text="image.reason"></span></li> <li><span v-text="image.name"></span>: <span v-text="image.reason"></span></li>
</ul> </ul>