Merge branch 'bvl-fix-locale-path' into 'master'10-1-stable-prepare-rc3

Render region codes for locale assets with an `_` instead of a `-`

Closes #39225

See merge request gitlab-org/gitlab-ce!14924

(cherry picked from commit 4733570c3d710f3124718fa1173f3068eb932281)

939469cd Build the locale path with an `_` instead of a `-`

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 87ae1fa5660..66785cf32da 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -309,4 +309,12 @@ describe ApplicationHelper do
       end
     end
   end
+
+  describe '#locale_path' do
+    it 'returns the locale path with an `_`' do
+      Gitlab::I18n.locale = 'pt-BR'
+
+      expect(helper.locale_path).to include('assets/locale/pt_BR/app')
+    end
+  end
 end