Fix: client translations file will not load even when exists

Fix the issue that when the translation file exists (English) will not load on client side

Fix: client translations file will not load even when exists
Fix the issue that when the translation file exists (English) will not load on client side
64673e92 · Jeremy Wu · Phil Hughes · 5606ac4c · 64673e92 · 64673e92
Commit 64673e92 authored Mar 15, 2022 by Jeremy Wu Committed by Phil Hughes Mar 15, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

app/views/layouts/_head.html.haml app/views/layouts/_head.html.haml +1 -1

app/views/layouts/header/_translations.html.haml app/views/layouts/header/_translations.html.haml +1 -0

No files found.
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -57,7 +57,7 @@

  = Gon::Base.render_data(nonce: content_security_policy_nonce)

-  = javascript_include_tag locale_path unless I18n.locale == :en
+  = render_if_exists 'layouts/header/translations'
  = webpack_bundle_tag "sentry" if Gitlab.config.sentry.enabled
  = webpack_bundle_tag 'performance_bar' if performance_bar_enabled?


--- a/app/views/layouts/header/_translations.html.haml
+++ b/app/views/layouts/header/_translations.html.haml
+= javascript_include_tag locale_path unless I18n.locale == :en