fix build on wily; fix some moderation branch language constants

diff --git a/Vagrantfile b/Vagrantfile
index 0cd5ac72aa760553b8fdbada019af56c46cd19b4..7b033146c2420a3f01a50c4754fb54caea4a35ab 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,13 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 

+
+Vagrant.configure("2") do |config|
+  config.vm.provider "virtualbox" do |vb|
+    vb.customize ["modifyvm", :id, "--memory", "8192"]
+  end
+end
+

 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
   config.vm.provider "virtualbox" do |vb, override|
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
   config.vm.provider "virtualbox" do |vb, override|

diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index a2f43e9553f3a01c07b90a2c5d0138f3b0026c35..010394c293c0db91903f71282392d57cc623bfb7 100644 (file)
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -4,10 +4,10 @@
 
 <div class="disclaimer">
     <ul>
 
 <div class="disclaimer">
     <ul>

-    <%= t('issues.new.disclaimer.placeholder') %>:
-        <li> --> <%= t('issues.new.disclaimer.placeholder1') %> </li>   
-        <li> --> <%= t('issues.new.disclaimer.placeholder2') %> </li>   
-        <li> --> <%= t('issues.new.disclaimer.placeholder3') %> </li>   
+    <%= t('issues.new.disclaimer.intro') %>:
+        <li> <%= t('issues.new.disclaimer.not_just_mistake') %> </li>   
+        <li> <%= t('issues.new.disclaimer.unable_to_fix') %> </li>   
+        <li> <%= t('issues.new.disclaimer.resolve_with_user') %> </li>   

     </ul>
 </div>
 
     </ul>
 </div>
 


@@ -41,4 +41,4 @@
             </div>
         
         </fieldset>
             </div>
         
         </fieldset>

-<% end %>
\ No newline at end of file
+<% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a273903eb113d981c5c689ba54039175be9ba5be..5e7f2527761baed391922b0e127b60b4f2a30e28 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -929,10 +929,10 @@ en:
       details: Please provide some more details into the problem. (This field cannot be left blank!)
       select: Select a reason for your report
       disclaimer:
       details: Please provide some more details into the problem. (This field cannot be left blank!)
       select: Select a reason for your report
       disclaimer:

-        placeholder: Before sending in a report for official action, be sure that
-        placeholder1: You are sure that the problem is not just a mistake
-        placeholder2: You are unable to fix the problem yourself
-        placeholder3: You have tried to resolve the problem with the user
+        intro: Before sending in a report for official action, be sure that
+        not_just_mistake: You are sure that the problem is not just a mistake
+        unable_to_fix: You are unable to fix the problem yourself
+        resolve_with_user: You have tried to resolve the problem with the user

     show: 
       comments:
         reassign: The Issue was reassigned
     show: 
       comments:
         reassign: The Issue was reassigned

diff --git a/db/migrate/028_add_more_changeset_indexes.rb b/db/migrate/028_add_more_changeset_indexes.rb
index b64c9caf0b5f63968fa2840ada70f5201ad791da..976aeb19e69d388f17b3aaf6e0ad182611f5e27d 100644 (file)
--- a/db/migrate/028_add_more_changeset_indexes.rb
+++ b/db/migrate/028_add_more_changeset_indexes.rb
@@ -4,7 +4,7 @@ class AddMoreChangesetIndexes < ActiveRecord::Migration
   def self.up
     add_index "changesets", ["created_at"], :name => "changesets_created_at_idx"
     add_index "changesets", ["closed_at"], :name => "changesets_closed_at_idx"
   def self.up
     add_index "changesets", ["created_at"], :name => "changesets_created_at_idx"
     add_index "changesets", ["closed_at"], :name => "changesets_closed_at_idx"

-    add_index "changesets", %w(min_lat max_lat min_lon max_lon), :name => "changesets_bbox_idx", :using => "GIST"
+    add_index "changesets", %w(min_lat max_lat min_lon max_lon), :name => "changesets_bbox_idx"

   end
 
   def self.down
   end
 
   def self.down