Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
language_suggestion
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review 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
project
language_suggestion
Merge requests
!7
Resolve
#3386957
"Move language suggestion rebase"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Open
Resolve
#3386957
"Move language suggestion rebase"
issue/language_suggestion-3386957:3386957-move-language-suggestion-rebase
into
8.x-1.x
Overview
0
Commits
4
Pipelines
3
Changes
5
Open
Chris Wu
requested to merge
issue/language_suggestion-3386957:3386957-move-language-suggestion-rebase
into
8.x-1.x
8 months ago
Overview
0
Commits
4
Pipelines
3
Changes
5
Expand
Closes
#3386957
0
0
Merge request reports
Compare
8.x-1.x
version 2
c1530fa3
8 months ago
version 1
6d5d99e4
8 months ago
8.x-1.x (HEAD)
and
latest version
latest version
44789650
4 commits,
8 months ago
version 2
c1530fa3
3 commits,
8 months ago
version 1
6d5d99e4
2 commits,
8 months ago
5 files
+
102
−
37
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
assets/language_suggestion.js
+
24
−
37
Options
@@ -122,45 +122,32 @@
}
// Show the language suggestion box. Make sure user hasn't dismissed in the past or dismiss hasn't expired yet.
if
(
show_suggestion
&&
message
&&
(
dismissed
<=
timestamp
||
dismissed
===
undefined
)
)
{
layoutContainer
.
append
(
`<div id="language-suggestion" class="ls-wrapper"><div class="ls-message">
${
message
}
</div><div class="ls-goto"><a href="#" id="ls-continue">
${
continue_link
!==
undefined
?
continue_link
:
Drupal
.
t
(
'
Continue
'
)
}
</a></div><div class="ls-dismiss"><a href="#" id="ls-dismiss">
${
Drupal
.
t
(
'
Dismiss
'
,
)}
</a></div></div></div>`
,
);
layoutContainer
.
find
(
'
#language-suggestion
'
)
.
delay
(
settings
.
show_delay
*
1000
)
.
show
(
'
slow
'
);
}
if
(
show_suggestion
&&
message
&&
(
dismissed
<=
timestamp
||
dismissed
===
undefined
))
{
// Call the function to get the rendered HTML
$
.
get
(
'
/language-suggestion/get-suggestion-box
'
,
{
message
:
message
,
continue_link
:
continue_link
,
dismiss_link
:
Drupal
.
t
(
'
Dismiss
'
)
},
function
(
html
)
{
layoutContainer
.
prepend
(
html
);
layoutContainer
.
find
(
'
.js-language-suggestion
'
).
delay
(
settings
.
show_delay
*
1000
).
show
(
'
slow
'
);
// Continue to the language suggested and make sure we add to auto
redirect cookie if such option is enabled in the module settings.
layoutContainer
.
find
(
'
#
ls-continue
'
).
on
(
'
click
'
,
function
(
e
)
{
const
redirect
=
getRedirectUrl
(
url
,
custom_url
,
default_url
);
if
(
settings
.
always_redirect
)
{
cookies
.
set
(
`
${
settings
.
cookie_prefix
}
.always_redirect`
,
redirect
);
cookies
.
set
(
`
${
settings
.
cookie_prefix
}
.redirect_lang`
,
lang_code
);
}
window
.
location
.
href
=
redirect
;
e
.
disableDefault
();
});
// Continue to the language suggested and make sure we add to autoredirect cookie if such option is enabled in the module settings.
layoutContainer
.
find
(
'
.js-
ls-continue
'
).
on
(
'
click
'
,
function
(
e
)
{
const
redirect
=
getRedirectUrl
(
url
,
custom_url
,
default_url
);
if
(
settings
.
always_redirect
)
{
cookies
.
set
(
`
${
settings
.
cookie_prefix
}
.always_redirect`
,
redirect
);
cookies
.
set
(
`
${
settings
.
cookie_prefix
}
.redirect_lang`
,
lang_code
);
}
window
.
location
.
href
=
redirect
;
e
.
disableDefault
();
});
// Dismiss language suggestion box and make sure we keep it dismissed for some time. Time can be configured in the module settings.
layoutContainer
.
find
(
'
#ls-dismiss
'
).
on
(
'
click
'
,
function
(
e
)
{
layoutContainer
.
find
(
'
#language-suggestion
'
).
hide
(
'
slow
'
);
const
milliseconds
=
settings
.
cookie_dismiss_time
*
60
*
60
*
1000
;
cookies
.
set
(
`
${
settings
.
cookie_prefix
}
.dismiss`
,
timestamp
+
milliseconds
,
);
e
.
disableDefault
();
});
// Dismiss language suggestion box and make sure we keep it dismissed for some time. Time can be configured in the module settings.
layoutContainer
.
find
(
'
.js-ls-dismiss
'
).
on
(
'
click
'
,
function
(
e
)
{
layoutContainer
.
find
(
'
.js-language-suggestion
'
).
hide
(
'
slow
'
);
var
milliseconds
=
settings
.
cookie_dismiss_time
*
60
*
60
*
1000
;
cookies
.
set
(
settings
.
cookie_prefix
+
'
.dismiss
'
,
timestamp
+
milliseconds
);
e
.
disableDefault
();
});
});
}
}
function
getRedirectUrl
(
type
,
custom_url
,
default_url
)
{
Loading