diff options
| -rw-r--r-- | .gitmodules | 8 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| m--------- | vendor/rails-locales | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index 42d5db56b..32b9dc5f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,4 @@ [submodule "commonlib"] - path = commonlib - url = git://git.mysociety.org/commonlib + path = commonlib + url = git://git.mysociety.org/commonlib # config/locales is a symbolic link to vendor/rails-locales/rails/locale -# In Rails 3, this should be removed and the gem rails-i18n installed instead -[submodule "vendor/rails-locales"] - path = vendor/rails-locales - url = git://github.com/svenfuchs/rails-i18n.git @@ -16,6 +16,7 @@ gem 'mahoro' gem 'net-http-local' gem 'net-purge' gem 'rack' +gem 'rails-i18n' gem 'rdoc' gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails' # :require avoids "already initialized constant" warnings diff --git a/Gemfile.lock b/Gemfile.lock index 854b561f4..3dc08590d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -152,6 +152,8 @@ GEM activesupport (= 3.1.12) bundler (~> 1.0) railties (= 3.1.12) + rails-i18n (0.7.3) + i18n (~> 0.5) railties (3.1.12) actionpack (= 3.1.12) activesupport (= 3.1.12) @@ -261,6 +263,7 @@ DEPENDENCIES pg rack rails (= 3.1.12) + rails-i18n rake (= 0.9.2.2) rdoc recaptcha (~> 0.3.1) diff --git a/vendor/rails-locales b/vendor/rails-locales deleted file mode 160000 -Subproject 7b769690775e9705f82da75aee3435e8dadebec |