summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-06-12 13:54:51 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-06-20 23:22:33 +0800
commit8902568a9286241601d4309c30b5d9a50c6eb47f (patch)
tree7c7e62c02a7097cda5e22861bba0812277629c48
parentd5b83afc7b045a4efea14ce5ad95c30bb28639fa (diff)
downloadgitlab-ce-33344-add-rails-i18n.tar.gz
Add rails-i18n for some common translations33344-add-rails-i18n
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock4
2 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 4c4f9cd9b0d..61c70ce6b8a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -260,6 +260,7 @@ gem 'premailer-rails', '~> 1.9.0'
# I18n
gem 'ruby_parser', '~> 3.8', require: false
+gem 'rails-i18n', '~> 4.0.9'
gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.2.0'
gem 'gettext', '~> 3.2.2', require: false, group: :development
diff --git a/Gemfile.lock b/Gemfile.lock
index e38f8b92c8c..7ca330b6a59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -646,6 +646,9 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
+ rails-i18n (4.0.9)
+ i18n (~> 0.7)
+ railties (~> 4.0)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
@@ -1054,6 +1057,7 @@ DEPENDENCIES
rack-proxy (~> 0.6.0)
rails (= 4.2.8)
rails-deprecated_sanitizer (~> 1.0.3)
+ rails-i18n (~> 4.0.9)
rainbow (~> 2.2)
rblineprof (~> 0.3.6)
rdoc (~> 4.2)