diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-27 18:21:39 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-27 18:21:39 +0000 |
| commit | 36cd266a149b5047a609afa4224f728239cdb759 (patch) | |
| tree | aaeb5d9aab7fb98b8e5374b8f8502f32786a7733 | |
| parent | e9f7d26f077c8582b006145938bbd168a9841089 (diff) | |
| parent | 0612ee64bc4b0baebf8f47c1eda77823403d7473 (diff) | |
| download | gitlab-ce-36cd266a149b5047a609afa4224f728239cdb759.tar.gz | |
Merge branch 'winh-linting-locale' into 'master'
Fix linting errors in locale/index.js
See merge request gitlab-org/gitlab-ce!14521
| -rw-r--r-- | .eslintignore | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/locale/index.js | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.eslintignore b/.eslintignore index d6ce39636bd..1623b996213 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,4 +8,4 @@ karma.config.js webpack.config.js svg.config.js -/app/assets/javascripts/locale/**/*.js +/app/assets/javascripts/locale/**/app.js diff --git a/app/assets/javascripts/locale/index.js b/app/assets/javascripts/locale/index.js index 7ba676d6d20..6a5084efeb8 100644 --- a/app/assets/javascripts/locale/index.js +++ b/app/assets/javascripts/locale/index.js @@ -16,9 +16,8 @@ const locales = allLocales.reduce((d, obj) => { return data; }, {}); -let lang = document.querySelector('html').getAttribute('lang') || 'en'; -lang = lang.replace(/-/g, '_'); - +const langAttribute = document.querySelector('html').getAttribute('lang'); +const lang = (langAttribute || 'en').replace(/-/g, '_'); const locale = new Jed(locales[lang]); /** |