Use built-in translation lookups for form helps

diff --git a/app/views/oauth2_applications/_form.html.erb b/app/views/oauth2_applications/_form.html.erb
index c61d351b7012c3264156796f0d0cd535a84458e4..d69536c6b3ca38ee3e78b1d2bccda01cfd493dfb 100644 (file)
--- a/app/views/oauth2_applications/_form.html.erb
+++ b/app/views/oauth2_applications/_form.html.erb
@@ -1,6 +1,6 @@
 <%= f.text_field :name %>
 <%= f.text_field :name %>

-<%= f.text_area :redirect_uri, :help => t(".redirect_uri_help") %>
-<%= f.form_group :confidential, :help => t(".confidential_help") do %>
+<%= f.text_area :redirect_uri %>
+<%= f.form_group :confidential do %>

   <%= f.check_box :confidential %>
 <% end %>
 <%= f.collection_check_boxes :scopes, Oauth.scopes, :name, :description %>
   <%= f.check_box :confidential %>
 <% end %>
 <%= f.collection_check_boxes :scopes, Oauth.scopes, :name, :description %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f909adefc639fe2357cb1ef835135f6d13358270..387a0fa6470c9aef39d0e2b676bfcb0abef95a8a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -146,6 +146,9 @@ en:
         pass_crypt: "Password"
         pass_crypt_confirmation: "Confirm Password"
     help:
         pass_crypt: "Password"
         pass_crypt_confirmation: "Confirm Password"
     help:

+      doorkeeper/application:
+        confidential: "Application will be used where the client secret can be kept confidential, eg mobile apps and single page apps"
+        redirect_uri: "Use one line per URI"

       trace:
         tagstring: comma delimited
       user_block:
       trace:
         tagstring: comma delimited
       user_block:


@@ -2359,9 +2362,6 @@ en:
       client_secret_warning: "Make sure to save this secret - it will not be accessible again"
       permissions: "Permissions"
       redirect_uris: "Redirect URIs"
       client_secret_warning: "Make sure to save this secret - it will not be accessible again"
       permissions: "Permissions"
       redirect_uris: "Redirect URIs"

-    form:
-      redirect_uri_help: "Use one line per URI"
-      confidential_help: "Application will be used where the client secret can be kept confidential (native mobile apps and single page apps are not confidential)"

     not_found:
       sorry: "Sorry, that application could not be found."
   oauth2_authorizations:
     not_found:
       sorry: "Sorry, that application could not be found."
   oauth2_authorizations: