Merge locale definitions to config/locales/en.yml

diff --git a/config/locales/doorkeeper_openid_connect.en.yml b/config/locales/doorkeeper_openid_connect.en.yml
deleted file mode 100644 (file)
index 1bed506..0000000
--- a/config/locales/doorkeeper_openid_connect.en.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-en:
-  doorkeeper:
-    scopes:
-      openid: 'Authenticate your account'
-      profile: 'View your profile information'
-      email: 'View your email address'
-      address: 'View your physical address'
-      phone: 'View your phone number'
-    errors:
-      messages:
-        login_required: 'The authorization server requires end-user authentication'
-        consent_required: 'The authorization server requires end-user consent'
-        interaction_required: 'The authorization server requires end-user interaction'
-        account_selection_required: 'The authorization server requires end-user account selection'
-    openid_connect:
-      errors:
-        messages:
-          # Configuration error messages
-          resource_owner_from_access_token_not_configured: 'Failure due to Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token missing configuration.'
-          auth_time_from_resource_owner_not_configured: 'Failure due to Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner missing configuration.'
-          reauthenticate_resource_owner_not_configured: 'Failure due to Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner missing configuration.'
-          select_account_for_resource_owner_not_configured: 'Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration.'
-          subject_not_configured: 'ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration.'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ec845dc7c412426cae4875c7ee7d56fe84f30619..c9583abce02841b2572dfc382f97c3e91ff1ac38 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -557,10 +557,31 @@ en:
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   doorkeeper:
+    errors:
+      messages:
+        account_selection_required: "The authorization server requires end-user account selection"
+        consent_required: "The authorization server requires end-user consent"
+        interaction_required: "The authorization server requires end-user interaction"
+        login_required: "The authorization server requires end-user authentication"
     flash:
       applications:
         create:
           notice: Application Registered.
+    openid_connect:
+      errors:
+        messages:
+          # Configuration error messages
+          auth_time_from_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner missing configuration."
+          reauthenticate_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner missing configuration."
+          resource_owner_from_access_token_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token missing configuration."
+          select_account_for_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration."
+          subject_not_configured: "ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration."
+    scopes:
+      address: "View your physical address"
+      email: "View your email address"
+      openid: "Authenticate your account"
+      phone: "View your phone number"
+      profile: "View your profile information"
   errors:
     contact:
       contact_url: https://wiki.openstreetmap.org/wiki/Contact