]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'jfirebaugh/legacy-params'
authorTom Hughes <tom@compton.nu>
Mon, 2 Dec 2013 20:29:34 +0000 (20:29 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 2 Dec 2013 20:29:34 +0000 (20:29 +0000)
INSTALL.md
app/views/changeset/list.html.erb
config/locales/en.yml

index 744f9a1555c9cd3ca84b1b0ed91c44f210af0f71..2f954d1060fc86a241945769a89d8222154b4632 100644 (file)
@@ -22,12 +22,13 @@ of packages required before you can get the various gems installed.
 * Postgres 8.3+
 * ImageMagick
 * Bundler
+* Javascript Runtime
 
 These can be installed on Ubuntu 10.10 or later with:
 
 ```
 sudo apt-get install ruby1.9.1 libruby1.9.1 ruby1.9.1-dev ri1.9.1 \
-                     libmagickwand-dev libxml2-dev libxslt1-dev \
+                     libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
                      apache2 apache2-threaded-dev build-essential git-core \
                      postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \
                      libsasl2-dev
@@ -44,7 +45,7 @@ For Fedora, you can install the minimum requirements with:
 
 ```
 sudo yum install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \
-                 libxml2-devel \
+                 libxml2-devel js \
                  gcc gcc-c++ git \
                  postgresql postgresql-server postgresql-contrib postgresql-devel \
                  perl-podlators
index 68bdf1e23fcc7a3cc2f08d0027c8d6c556ebf54d..36ec593793f85f0327edd7d2133748e36f2bcbbc 100644 (file)
@@ -2,10 +2,12 @@
   <ol class="changesets">
     <%= render :partial => 'changeset', :collection => @edits %>
   </ol>
+<% if @edits.size == 20 -%>
   <div class="changeset_more">
     <%= link_to t('changeset.list.load_more'), url_for(params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>
     <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
   </div>
+<% end -%>
 <% elsif params[:bbox] %>
   <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more_area' : 'changeset.list.empty_area') %></div>
 <% elsif params[:display_name] %>
index a1c4e503baaec942630dd924617eeead8424bc56..56679232099ebfd1c5ab1e5aecd2352537cdd50b 100644 (file)
@@ -2074,16 +2074,7 @@ en:
         intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
         add: Add Note
       show:
-        permalink: Permalink
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
-        opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
-        opened_by_anonymous: "created by anonymous at %{time}"
-        commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
-        commented_by_anonymous: "comment from anonymous at %{time}"
-        closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
-        closed_by_anonymous: "resolved by anonymous at %{time}"
-        reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
-        reopened_by_anonymous: "reactivated by anonymous at %{time}"
         hide: Hide
         resolve: Resolve
         reactivate: Reactivate