From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 May 2013 23:53:12 +0000 (+0100)
Subject: Cast the locale to a string
X-Git-Tag: live~4965
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b9f7f39140e942df4dc08d4167d3c07202628840?ds=sidebyside

Cast the locale to a string
---

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 54e02987b..f77f67f52 100644
--- 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 %>
 
-<% locale = select_locale(Potlatch2::LOCALES.keys) %>
+<% locale = select_locale(Potlatch2::LOCALES.keys).to_s %>
 
 <script type="text/javascript" defer="defer">
   var changesaved=true;
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 96262f1e2..aaa3927a9 100644
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -16,7 +16,7 @@
       'Please upgrade your browser or use Potlatch 2 to edit the map.';
     document.getElementById('id-container').className = 'unsupported';
   } else {
-    <% locale = select_locale(ID::LOCALES) %>
+    <% locale = select_locale(ID::LOCALES).to_s %>
 
     var id = iD()
       .embed(true)