External translations for doorkeeper (and use them)

foodcoops · May 25, 2016 · 48c4b43 · 48c4b43
1 parent 3af331d
commit 48c4b43
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 125 deletions.
diff --git a/Gemfile b/Gemfile
@@ -30,6 +30,7 @@ gem 'inherited_resources'
 gem 'localize_input', git: "git://github.com/bennibu/localize_input.git"
 gem 'daemons'
 gem 'doorkeeper'
+gem 'doorkeeper-i18n'
 gem 'rack-cors', require: 'rack/cors'
 gem 'active_model_serializers', '~> 0.10.0.rc4'
 gem 'twitter-bootstrap-rails', '~> 2.2.8'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -148,6 +148,7 @@ GEM
     docile (1.1.5)
     doorkeeper (3.1.0)
       railties (>= 3.2)
+    doorkeeper-i18n (3.0.0)
     erubis (2.7.0)
     eventmachine (1.0.9.1)
     exception_notification (4.1.4)
@@ -235,7 +236,7 @@ GEM
     method_source (0.8.2)
     mime-types (2.99.1)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     mono_logger (1.1.0)
     multi_json (1.11.2)
     mysql2 (0.4.3)
@@ -309,7 +310,7 @@ GEM
       activesupport (= 4.2.5.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.1.2)
     ransack (1.7.0)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -492,6 +493,7 @@ DEPENDENCIES
   database_cleaner
   date_time_attribute
   doorkeeper
+  doorkeeper-i18n
   exception_notification
   factory_girl_rails
   faker

diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
@@ -107,6 +107,7 @@
 
 # my take on https://github.com/doorkeeper-gem/doorkeeper/issues/465
 ActiveSupport.on_load(:after_initialize) do
+  Doorkeeper::ApplicationController.send :include, Concerns::Locale
   Doorkeeper::ApplicationController.send :include, Concerns::FoodcoopScope
   Doorkeeper::ApplicationController.send :include, Concerns::Auth
 end
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml