Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor 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
RocketChat
Rocket.Chat
Commits
e63cf28f
Unverified
Commit
e63cf28f
authored
5 months ago
by
Tasso Evangelista
Committed by
GitHub
5 months ago
Browse files
Options
Downloads
Patches
Plain Diff
regression: Broken translation in `UrlChangeModal` at setup wizard (#33415)
parent
7cddedea
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/meteor/client/components/UrlChangeModal.tsx
+10
-2
10 additions, 2 deletions
apps/meteor/client/components/UrlChangeModal.tsx
apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
+1
-0
1 addition, 0 deletions
apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
with
11 additions
and
2 deletions
apps/meteor/client/components/UrlChangeModal.tsx
+
10
−
2
View file @
e63cf28f
...
...
@@ -13,7 +13,8 @@ type UrlChangeModalProps = {
};
const
UrlChangeModal
=
({
onConfirm
,
siteUrl
,
currentUrl
,
onClose
}:
UrlChangeModalProps
):
ReactElement
=>
{
const
{
t
}
=
useTranslation
();
const
{
t
}
=
useTranslation
(
'
core
'
);
return
(
<
GenericModal
variant
=
'warning'
title
=
{
t
(
'
Warning
'
)
}
onConfirm
=
{
onConfirm
}
onClose
=
{
onClose
}
onCancel
=
{
onClose
}
confirmText
=
{
t
(
'
Yes
'
)
}
>
<
Box
...
...
@@ -26,7 +27,14 @@ const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeMo
}),
}
}
/>
<
p
dangerouslySetInnerHTML
=
{
{
__html
:
t
(
'
Do_you_want_to_change_to_s_question
'
,
currentUrl
)
}
}
/>
<
p
dangerouslySetInnerHTML
=
{
{
__html
:
t
(
'
Do_you_want_to_change_to_s_question
'
,
{
postProcess
:
'
sprintf
'
,
sprintf
:
[
currentUrl
],
}),
}
}
/>
</
GenericModal
>
);
};
...
...
This diff is collapsed.
Click to expand it.
apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
+
1
−
0
View file @
e63cf28f
...
...
@@ -23,6 +23,7 @@ export const SetupWizardRoute = (): ReactElement | null => {
}
return
(
// FIXME: setting the defaultNS here is problematic for components/hooks expecting it to be 'core'
<
I18nextProvider
i18n
=
{
i18n
}
defaultNS
=
'onboarding'
>
<
SetupWizardProvider
>
<
DarkModeProvider
.
default
>
...
...
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