Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-10-18 15:37:11 +0300
committerWinnie Hellmann <winnie@gitlab.com>2017-10-18 16:07:27 +0300
commit888b43affc3d5c287b409294b6ec95b5d56d617a (patch)
treeb773145b849f329f2d5c8486b69ac2d2c81c69cf /spec
parent0f4141f79058a3265f65ad1420fedc060000723c (diff)
Merge branch 'bvl-fix-locale-path' into 'master'
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 `-`
Diffstat (limited to 'spec')
-rw-r--r--spec/helpers/application_helper_spec.rb8
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