Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2

[rails.git] / app / views / site / _potlatch2.html.erb

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 240bceaccdf1ca5286cffb37c285ffd8375db267..e648ed37cf7604411caab71680de38a71243c843 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -10,7 +10,7 @@
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 

-<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) %>
+<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) || "en" %>

 
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
 
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;