Merge remote-tracking branch 'upstream/pull/5408'

[rails.git] / app / views / preferences / show.html.erb

diff --git a/app/views/preferences/show.html.erb b/app/views/preferences/show.html.erb
index 7a63d0be8dadeb57514fba42b8b139b7335cce62..9bf83cbf1f0f72b846e3c43bbac278703fcef61a 100644 (file)
--- a/app/views/preferences/show.html.erb
+++ b/app/views/preferences/show.html.erb
@@ -19,7 +19,16 @@
         <li><%= locale %></li>
       <% end %>
     </ul>
+  </dd>
 
+  <dt class="col-sm-4"><%= t ".preferred_site_color_scheme" %></dt>
+  <dd class="col-sm-8">
+    <%= t ".site_color_schemes.#{preferred_color_scheme(:site)}" %>
+  </dd>
+
+  <dt class="col-sm-4"><%= t ".preferred_map_color_scheme" %></dt>
+  <dd class="col-sm-8">
+    <%= t ".map_color_schemes.#{preferred_color_scheme(:map)}" %>
   </dd>
 </dl>