Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
59ec3f61
Commit
59ec3f61
authored
6 years ago
by
Joe Bordes
Committed by
Tom Robinson
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix syntax errors found while translating
parent
0aec258c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/src/metabase/admin/people/containers/PeopleListingApp.jsx
+1
-1
1 addition, 1 deletion
...src/metabase/admin/people/containers/PeopleListingApp.jsx
src/metabase/util/date.clj
+1
-1
1 addition, 1 deletion
src/metabase/util/date.clj
with
2 additions
and
2 deletions
frontend/src/metabase/admin/people/containers/PeopleListingApp.jsx
+
1
−
1
View file @
59ec3f61
...
...
@@ -336,7 +336,7 @@ export default class PeopleListingApp extends Component {
onClose
=
{
this
.
onCloseModal
}
>
<
div
className
=
"px4 pb4"
>
{
t
`They'll be able to log in again, and they'll be placed back into the group
t
s they were in before their account was deactivated.`
}
{
t
`They'll be able to log in again, and they'll be placed back into the groups they were in before their account was deactivated.`
}
</
div
>
</
Modal
>
);
...
...
This diff is collapsed.
Click to expand it.
src/metabase/util/date.clj
+
1
−
1
View file @
59ec3f61
...
...
@@ -55,7 +55,7 @@
;; match, we should suggest that the user configure a report timezone
(
when
(
and
(
not
report-timezone
)
jvm-data-tz-conflict?
)
(
log/warn
(
str
(
trs
"Possible imezone conflict found on database {0}."
(
:name
db
))
(
log/warn
(
str
(
trs
"Possible
t
imezone conflict found on database {0}."
(
:name
db
))
(
trs
"JVM timezone is {0} and detected database timezone is {1}."
(
.getID
jvm-timezone
)
(
.getID
data-timezone
))
(
trs
"Configure a report timezone to ensure proper date and time conversions."
))))
...
...
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