This commit is contained in:
@@ -163,7 +163,6 @@ export default {
|
||||
if(!this.lightbox) {
|
||||
this.lightbox = new Lightbox({
|
||||
alwaysShowNavOnTouchDevices: true,
|
||||
albumLabel: 'Media %1 / %2',
|
||||
fadeDuration: 300,
|
||||
imageFadeDuration: 400,
|
||||
positionFromTop: 0,
|
||||
|
||||
@@ -70,10 +70,22 @@ export default {
|
||||
<spotIcon icon="post" width="fixed" size="lg" text-classes="comment-text" :text="options.comment" />
|
||||
</span>
|
||||
<span ref="postedon" class="lb-caption-line">
|
||||
<projectRelTime :icon="'upload'" :localTime="options.posted_on_formatted_time_local" :siteTime="options.posted_on_formatted_time" :offset="options.posted_on_day_offset" />
|
||||
<projectRelTime
|
||||
icon="upload"
|
||||
titleWrapperName="media.posted_on"
|
||||
:localTime="options.posted_on_formatted_time_local"
|
||||
:siteTime="options.posted_on_formatted_time"
|
||||
:offset="options.posted_on_day_offset"
|
||||
/>
|
||||
</span>
|
||||
<span ref="takenon" class="lb-caption-line">
|
||||
<projectRelTime :icon="options.subtype+'-shot'" :localTime="options.taken_on_formatted_time_local" :siteTime="options.taken_on_formatted_time" :offset="options.taken_on_day_offset" />
|
||||
<projectRelTime
|
||||
:icon="options.subtype+'-shot'"
|
||||
:titleWrapperName="'media.'+options.subtype+'_taken_on'"
|
||||
:localTime="options.taken_on_formatted_time_local"
|
||||
:siteTime="options.taken_on_formatted_time"
|
||||
:offset="options.taken_on_day_offset"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -11,11 +11,20 @@ export default {
|
||||
offset: String,
|
||||
classes: String,
|
||||
icon: String,
|
||||
titleWrapperName: String
|
||||
},
|
||||
inject: ['lang'],
|
||||
computed: {
|
||||
title() {
|
||||
if(this.localTime != this.siteTime) return this.lang.get('time.user', this.siteTime.slice(-5)) + ((this.offset != '0')?' ('+this.lang.get('unit.day_short')+this.offset+')':'');
|
||||
const bDifferentTimeZone = (this.localTime != this.siteTime);
|
||||
const sTime =
|
||||
this.lang.get('time.user', this.siteTime.slice(-5))
|
||||
+ ((this.offset != '0')?' ('+this.lang.get('unit.day_short')+this.offset+')':'');
|
||||
|
||||
return (this.titleWrapperName)?
|
||||
this.lang.get(this.titleWrapperName, bDifferentTimeZone?sTime:this.siteTime)
|
||||
:
|
||||
(bDifferentTimeZone?sTime:null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ export default {
|
||||
});
|
||||
|
||||
this.uppy.on('upload-error', (file, error, response) => {
|
||||
const message = response?.body?.error || error?.message || this.lang.get('error');
|
||||
const message = response?.body?.error || error?.message || this.lang.get('upload.error');
|
||||
this.logs.push(message);
|
||||
});
|
||||
|
||||
@@ -104,7 +104,7 @@ export default {
|
||||
'longitude': position.coords.longitude,
|
||||
'timestamp': Math.round(position.timestamp / 1000)
|
||||
})
|
||||
.then((asData) => {this.logs.push(this.lang.get('success'));})
|
||||
.then((asData) => {this.logs.push(this.lang.get('upload.success', [this.lang.get('upload.position.new')]));})
|
||||
.catch((sMsgId) => {this.logs.push(this.lang.get(sMsgId));});
|
||||
},
|
||||
(error) => {
|
||||
|
||||
Reference in New Issue
Block a user