From c6eb72251755ef13b573708233cce501e9099940 Mon Sep 17 00:00:00 2001
From: Augier <contact@c-henry.fr>
Date: Sat, 11 Jul 2015 10:51:39 +0200
Subject: [PATCH] Replace ERB by HAML, added locales, corrected Gemfile

---
 .../openid_connect/authorizations/_form.haml      |  7 +++++++
 .../openid_connect/authorizations/_form.html.erb  |  9 ---------
 .../openid_connect/authorizations/new.html.erb    | 15 ---------------
 .../openid_connect/authorizations/new.html.haml   | 14 ++++++++++++++
 config/application.rb                             |  1 -
 config/locales/diaspora/en.yml                    |  9 +++++++++
 6 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 app/views/openid_connect/authorizations/_form.haml
 delete mode 100644 app/views/openid_connect/authorizations/_form.html.erb
 delete mode 100644 app/views/openid_connect/authorizations/new.html.erb
 create mode 100644 app/views/openid_connect/authorizations/new.html.haml

diff --git a/app/views/openid_connect/authorizations/_form.haml b/app/views/openid_connect/authorizations/_form.haml
new file mode 100644
index 000000000..9a72bff90
--- /dev/null
+++ b/app/views/openid_connect/authorizations/_form.haml
@@ -0,0 +1,7 @@
+= form_tag openid_connect_authorizations_path, class: action do
+  - if action == :approve
+    = submit_tag t(".approve")
+    = hidden_field_tag :approve, true
+  - else
+    = submit_tag t(".deny")
+    = hidden_field_tag :approve, false
diff --git a/app/views/openid_connect/authorizations/_form.html.erb b/app/views/openid_connect/authorizations/_form.html.erb
deleted file mode 100644
index cce51e116..000000000
--- a/app/views/openid_connect/authorizations/_form.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= form_tag openid_connect_authorizations_path, class: action do %>
-  <% if action == :approve %>
-    <%= submit_tag "Approve" %>
-    <%= hidden_field_tag :approve, true %>
-  <% else %>
-    <%= submit_tag "Deny" %>
-    <%= hidden_field_tag :approve, false %>
-  <% end %>
-<% end %>
diff --git a/app/views/openid_connect/authorizations/new.html.erb b/app/views/openid_connect/authorizations/new.html.erb
deleted file mode 100644
index ee26ee058..000000000
--- a/app/views/openid_connect/authorizations/new.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<h2><%= @client.name %></h2>
-<p>You will be redirected to <%= @redirect_uri %> with an id token if approved or an error if denied</p>
-<ul>
-  <% @scopes.each do |scope| %>
-    <li><%= scope.name %></li>
-  <% end %>
-  <% if @request_object %>
-    <li>Request Objects (Currently not supported)</li>
-    <ul>
-      <pre><%= JSON.pretty_generate @request_object.as_json %></pre>
-    </ul>
-  <% end %>
-</ul>
-<%= render 'openid_connect/authorizations/form', action: :approve %>
-<%= render 'openid_connect/authorizations/form', action: :deny %>
diff --git a/app/views/openid_connect/authorizations/new.html.haml b/app/views/openid_connect/authorizations/new.html.haml
new file mode 100644
index 000000000..31726c0fd
--- /dev/null
+++ b/app/views/openid_connect/authorizations/new.html.haml
@@ -0,0 +1,14 @@
+%h2= @client.name
+%p= t(".will_be_redirected")
+= @redirect_uri
+= t(".with_id_token")
+%ul
+  - @scopes.each do |scope|
+    %li= scope.name
+  - if @request_object
+    %li= t(".requested_objects")
+    %ul
+      %pre= JSON.pretty_generate @request_object.as_json
+
+= render 'openid_connect/authorizations/form', action: :approve
+= render 'openid_connect/authorizations/form', action: :deny
diff --git a/config/application.rb b/config/application.rb
index acb8eba06..3745fec5c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,7 +31,6 @@ module Diaspora
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths      += %W{#{config.root}/app}
     config.autoload_once_paths += %W{#{config.root}/lib}
-    config.autoload_paths += %W{#{config.root}/lib/openid}
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 8a9440056..113180940 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -881,6 +881,15 @@ en:
         Hoping to see you again,
 
         The diaspora* email robot!
+  openid_connect:
+    authorizations:
+      new:
+        will_be_redirected: "You will be redirected to"
+        with_id_token: "with an id token if approved or an error if denied"
+        requested_objects: "Request Objects (Currently not supported)"
+      form:
+        approve: "Approve"
+        deny: "Deny"
   people:
     zero: "No people"
     one: "1 person"