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

Merge branch 'feature/90-photo-date-uploaded' of aheathershaw/blue-twilight into master

This commit is contained in:
Andy Heathershaw 2018-08-06 17:08:25 +01:00 committed by Gitea
parent 07f34aa158 bdfb3067dc
commit 8df9fe7827
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ return [
'camera_software' => 'Camera software:',
'child_albums' => 'more album|more albums',
'date_taken' => 'Date taken:',
'date_uploaded' => 'Date uploaded:',
'file_name' => 'File name:',
'focal_length' => 'Focal length:',
'focal_length_units' => ':valuemm',

5
resources/views/themes/base/gallery/photo.blade.php
View File

@ -81,6 +81,11 @@
</tr>
@endif
<tr>
<td class="metadata_name">@lang('gallery.date_uploaded')</td>
<td class="metadata_value">{{ date(UserConfig::get('date_format'), strtotime($photo->created_at)) }}</td>
</tr>
@if (!empty($photo->camera_make))
<tr>
<td class="metadata_name">@lang('gallery.camera_make')</td>