summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2017-09-05 14:09:59 +0000
committerMarin Jankovski <marin@gitlab.com>2017-09-05 14:09:59 +0000
commit4d23da68b2bc8b13026e663e607d6c25afd51aeb (patch)
treea231733b3daf5e3415005a19eef76282c9e63666
parentd316a8c0b39652d6053238d6a14983c51714faa0 (diff)
parentf9dd41a775912a7daa8b5929a0100ae5b3c67ca2 (diff)
downloadgitlab-ce-4d23da68b2bc8b13026e663e607d6c25afd51aeb.tar.gz
Merge branch 'po-lint-require' into 'master'
Do not require the simple_po_parser in the gettext rake task when in a Closes #37379 See merge request !14044
-rw-r--r--lib/tasks/gettext.rake3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake
index f7f2fa2f14c..35ba729c156 100644
--- a/lib/tasks/gettext.rake
+++ b/lib/tasks/gettext.rake
@@ -1,5 +1,4 @@
require "gettext_i18n_rails/tasks"
-require 'simple_po_parser'
namespace :gettext do
# Customize list of translatable files
@@ -23,6 +22,8 @@ namespace :gettext do
desc 'Lint all po files in `locale/'
task lint: :environment do
+ require 'simple_po_parser'
+
FastGettext.silence_errors
files = Dir.glob(Rails.root.join('locale/*/gitlab.po'))