From: Tom Hughes Date: Sun, 27 Jun 2010 15:29:52 +0000 (+0100) Subject: Merge branch 'master' into openstreetbugs X-Git-Tag: live~6077^2~205 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/02ad2f5a5192404185d00ec1b53ae2982760c0ea?hp=-c Merge branch 'master' into openstreetbugs --- 02ad2f5a5192404185d00ec1b53ae2982760c0ea diff --combined config/locales/en.yml index 9c8e2233f,f79a3d9e5..98a50ffd2 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -262,17 -262,6 +262,17 @@@ en download_xml: "Download XML" view_history: "view history" edit: "edit" + bug: + open_title: "Unresolved issue: {{bug_name}}" + closed_title: "Resolved issue: {{bug_name}}" + created_at: "Created at:" + edited_at: "Edited at:" + closed_at: "Closed at:" + opened_by: "Opened by:" + description: "Description:" + comment_by: "Comment by: " + comment: "Comment:" + date: "Date:" changeset: changeset_paging_nav: showing_page: "Showing page {{page}}" @@@ -1073,7 -1062,6 +1073,6 @@@ header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:" footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}" message_notification: - subject: "[OpenStreetMap] {{user}} sent you a new message" hi: "Hi {{to_user}}," header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:" footer1: "You can also read the message at {{readurl}}" @@@ -1548,7 -1536,7 +1547,7 @@@ terms: heading: "Contributor terms" press accept button: "Please read the agreement below and press the agree button to create your account." - consider_pd: "I consider my contributions to be in the Public Domain" + consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain agree: Agree @@@ -1807,20 -1795,6 +1806,20 @@@ back: "View all blocks" revoker: "Revoker:" needs_view: "The user needs to log in before this block will be cleared." + bugs: + rss: + description_area: "A list of bugs, reported, commented on or closed in your area [({{min_lat}}|{{min_lon}}) -- ({{max_lat}}|{{max_lon}})]" + description_item: "An rss feed for bug {{id}}" + closed: "closed bug (near {{place}})" + new: "new bug (near {{place}})" + comment: "new comment (near {{place}})" + user: + title_user: "Bugs submitted or commented on by {{user}}" + heading_user: "{{user}}'s bugs" + description_user: "Bugs submitted or commented on by {{user}}" + id: "Id" + last_changed: "Last changed" + javascripts: map: base: diff --combined config/routes.rb index 6f574f659,c5a26fdf0..49b58c844 --- a/config/routes.rb +++ b/config/routes.rb @@@ -70,27 -70,6 +70,27 @@@ ActionController::Routing::Routes.draw map.connect "api/#{API_VERSION}/amf/read", :controller =>'amf', :action =>'amf_read' map.connect "api/#{API_VERSION}/amf/write", :controller =>'amf', :action =>'amf_write' map.connect "api/#{API_VERSION}/swf/trackpoints", :controller =>'swf', :action =>'trackpoints' + + # Map Bugs API + map.connect "api/#{API_VERSION}/bugs/getBugs", :controller =>'map_bugs', :action =>'get_bugs' + map.connect "api/#{API_VERSION}/bugs/addPOIexec", :controller =>'map_bugs', :action =>'add_bug' + map.connect "api/#{API_VERSION}/bugs/closePOIexec", :controller =>'map_bugs', :action =>'close_bug' + map.connect "api/#{API_VERSION}/bugs/editPOIexec", :controller =>'map_bugs', :action =>'edit_bug' + map.connect "api/#{API_VERSION}/bugs/getGPX", :controller =>'map_bugs', :action =>'gpx_bugs' + map.connect "api/#{API_VERSION}/bugs/getRSSfeed", :controller =>'map_bugs', :action =>'rss' + + map.connect "api/#{API_VERSION}/bugs", :controller => 'map_bugs', :action => 'get_bugs' + map.connect "api/#{API_VERSION}/bugs/search", :controller => 'map_bugs', :action => 'search' + map.connect "api/#{API_VERSION}/bugs/rss", :controller =>'map_bugs', :action =>'rss' + map.connect "api/#{API_VERSION}/bug/create", :controller => 'map_bugs', :action => 'add_bug' + map.connect "api/#{API_VERSION}/bug/:id/comment", :controller => 'map_bugs', :action => 'edit_bug', :id => /\d+/ + map.connect "api/#{API_VERSION}/bug/:id/close", :controller => 'map_bugs', :action => 'close_bug', :id => /\d+/ + map.connect "api/#{API_VERSION}/bug/:id", :controller => 'map_bugs', :action => 'read', :id => /\d+/, :conditions => { :method => :get } + map.connect "api/#{API_VERSION}/bug/:id", :controller => 'map_bugs', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete } + + map.connect '/user/:display_name/bugs', :controller => 'map_bugs', :action => 'my_bugs' + + # Data browsing map.connect '/browse', :controller => 'changeset', :action => 'list' @@@ -104,7 -83,6 +104,7 @@@ map.changeset '/browse/changeset/:id', :controller => 'browse', :action => 'changeset', :id => /\d+/ map.connect '/browse/changesets', :controller => 'changeset', :action => 'list' map.connect '/browse/changesets/feed', :controller => 'changeset', :action => 'list', :format => :atom + map.connect '/browse/bug/:id', :controller => 'browse', :action => 'bug', :id => /\d+/ # web site map.root :controller => 'site', :action => 'index' @@@ -131,7 -109,6 +131,6 @@@ map.connect '/index.html', :controller => 'site', :action => 'index' map.connect '/edit.html', :controller => 'site', :action => 'edit' - map.connect '/history.html', :controller => 'changeset', :action => 'list_bbox' map.connect '/export.html', :controller => 'site', :action => 'export' map.connect '/search.html', :controller => 'way_tag', :action => 'search' map.connect '/login.html', :controller => 'user', :action => 'login'