Merge 17944:17988 from trunk.

[rails.git] / app / views / layouts / site.html.erb
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb

index 53867995b24d2199c3cfffb821da6321edd881cb..1e4e56e6acf9e14de9807ed526bdcd1987fda2c4 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,6 +1,7 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
    <head>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
    <head>
+    <%= javascript_strings %>
      <%= javascript_include_tag 'prototype' %>
      <%= javascript_include_tag 'site' %>
      <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
      <%= javascript_include_tag 'prototype' %>
      <%= javascript_include_tag 'site' %>
      <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
@@ -118,7 +119,7 @@
  
        <center>
          <div class="donate">
  
        <center>
          <div class="donate">
-          <a href="http://donate.openstreetmap.org/" title="<%= h(t 'layouts.make_a_donation.title') %>"><%= h(t 'layouts.make_a_donation.text') %></a>
+          <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
          </div>
  
          <div id="cclogo" class="button" style="width: 88px">
          </div>
  
          <div id="cclogo" class="button" style="width: 88px">