fix build on wily; fix some moderation branch language constants

This commit is contained in:
Frederik Ramm 2016-02-28 11:19:44 +01:00 committed by Matt Amos
parent 49050467cc
commit f3519e9781
4 changed files with 17 additions and 10 deletions

7
Vagrantfile vendored
View file

@ -1,6 +1,13 @@
# -*- 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|

View file

@ -4,10 +4,10 @@
<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>
@ -41,4 +41,4 @@
</div>
</fieldset>
<% end %>
<% end %>

View file

@ -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:
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

View file

@ -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"
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