Skip to content
Snippets Groups Projects
Commit 3dd357f8 authored by Pierre-Jean CHANCELLIER's avatar Pierre-Jean CHANCELLIER
Browse files

Merge branch 'dateformat' into 'master'

Fix time format

See merge request !4
parents 115db004 2427ec27
No related branches found
No related tags found
1 merge request!4Fix time format
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</nuxt-link> </nuxt-link>
<div class="d-flex text-info justify-content-between align-items-baseline mt-3 mx-2"> <div class="d-flex text-info justify-content-between align-items-baseline mt-3 mx-2">
<div class="">v0.02</div> <div class="">v0.02</div>
<div class="small" v-if="countMax">Bloc n°<span class="font-weight-bold">{{ countMax.number }}</span> ({{ $d(new Date(countMax.utc0*1000), 'short') }} {{ $t('time.a') }} {{ $d(new Date(countMax.utc0*1000), 'hour') }}{{ $d(new Date(countMax.utc0*1000), 'min') }})</div> <div class="small" v-if="countMax">Bloc n°<span class="font-weight-bold">{{ countMax.number }}</span> ({{ $d(new Date(countMax.utc0*1000), 'short') }} {{ $t('time.a') }} {{ $d(new Date(countMax.utc0*1000), 'time') }})</div>
</div> </div>
<button type="button" class="close position-absolute d-xl-none" aria-label="Close" @click="toggleMenu"> <button type="button" class="close position-absolute d-xl-none" aria-label="Close" @click="toggleMenu">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
......
...@@ -15,6 +15,11 @@ export const dateTimeFormats = { ...@@ -15,6 +15,11 @@ export const dateTimeFormats = {
}, },
min: { min: {
minute: '2-digit' minute: '2-digit'
},
time: {
hour: 'numeric',
minute: '2-digit',
hour12: false,
} }
}, },
'en': { 'en': {
...@@ -33,6 +38,11 @@ export const dateTimeFormats = { ...@@ -33,6 +38,11 @@ export const dateTimeFormats = {
}, },
min: { min: {
minute: '2-digit' minute: '2-digit'
},
time: {
hour: 'numeric',
minute: '2-digit',
hour12: true,
} }
}, },
'es': { 'es': {
...@@ -51,6 +61,11 @@ export const dateTimeFormats = { ...@@ -51,6 +61,11 @@ export const dateTimeFormats = {
}, },
min: { min: {
minute: '2-digit' minute: '2-digit'
},
time: {
hour: 'numeric',
minute: '2-digit',
hour12: false,
} }
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment