Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wotwizard-ui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
wotwizard-ui
Commits
3dd357f8
Commit
3dd357f8
authored
3 years ago
by
Pierre-Jean CHANCELLIER
Browse files
Options
Downloads
Plain Diff
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
!4
Fix time format
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
components/navigation/menu/Sidebar.vue
+1
-1
1 addition, 1 deletion
components/navigation/menu/Sidebar.vue
i18n/locales/dateTimeFormats.js
+15
-0
15 additions, 0 deletions
i18n/locales/dateTimeFormats.js
with
16 additions
and
1 deletion
components/navigation/menu/Sidebar.vue
+
1
−
1
View file @
3dd357f8
...
@@ -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"
>
×
</span>
<span
aria-hidden=
"true"
>
×
</span>
...
...
This diff is collapsed.
Click to expand it.
i18n/locales/dateTimeFormats.js
+
15
−
0
View file @
3dd357f8
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment