Merge -r 20198:20540 from trunc into openstreetbugs branch

diff --combined config/environment.rb
index f13b2752b5e2c5fd8bb9bc42f3294739ca9a01ab,539af83b2971842a09296fe6456493c4c79e3571..98fdfaa8c2b3709eb2271a7cc3745a2c3c0665a5
--- 1/config/environment.rb
--- 2/config/environment.rb
+++ b/config/environment.rb
@@@ -53,6 -53,7 +53,7 @@@ Rails::Initializer.run do |config
    config.gem 'oauth', :version => '>= 0.3.6'
    config.gem 'httpclient'
    config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
+   config.gem 'sanitize'
  
    # Only load the plugins named here, in the order given. By default, all plugins
    # in vendor/plugins are loaded in alphabetical order.
@@@ -99,5 -100,4 +100,5 @@@
  
    # Make Active Record use UTC-base instead of local time
    config.active_record.default_timezone = :utc
 +
  end

diff --combined config/locales/en.yml
index 531ceb64e1e3c97e2699b09a4963e6895240f955,8699d600cf0420e5775fe87f17c2d6356b291ed9..9795528192bfb1e7c1a7b714855321c71cdd72bd
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1,6 -1,9 +1,9 @@@
  en:
    html:
      dir: ltr
+   time:
+     formats:
+       friendly: "%e %B %Y at %H:%M"    
    activerecord:
      # Translates all the model names, which is used in error handling on the web site
      models:
@@@ -249,17 -252,6 +252,17 @@@
        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}}"
@@@ -335,7 -327,7 +338,7 @@@
        heading: "The user {{user}} does not exist"
        body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
      diary_entry:
-       posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
+       posted_by: "Posted by {{link_user}} on {{created}} in {{language_link}}"
        comment_link: Comment on this entry
        reply_link: Reply to this entry
        comment_count:
@@@ -345,7 -337,7 +348,7 @@@
        hide_link: Hide this entry
        confirm: Confirm
      diary_comment:
-       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+       comment_from: "Comment from {{link_user}} on {{comment_created_at}}"
        hide_link: Hide this comment
        confirm: Confirm
      location:
@@@ -949,7 -941,8 +952,8 @@@
      friend_notification:
        subject: "[OpenStreetMap] {{user}} added you as a friend"
        had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-       see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+       see_their_profile: "You can see their profile at {{userurl}}."
+       befriend_them: "You can also add them as a friend at {{befriendurl}}."
      gpx_notification:
        greeting: "Hi,"
        your_gpx_file: "It looks like your GPX file"
@@@ -1046,9 -1039,13 +1050,13 @@@
        message_sent: "Message sent"
        limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
      no_such_user:
-       title: "No such user or message"
-       heading: "No such user or message"
-       body: "Sorry there is no user or message with that name or id"
+       title: "No such user"
+       heading: "No such user"
+       body: "Sorry there is no user with that name."
+     no_such_message:
+       title: "No such message"
+       heading: "No such message"
+       body: "Sorry there is no message with that id."
      outbox: 
        title: "Outbox"
        my_inbox: "My {{inbox_link}}"
@@@ -1060,6 -1057,8 +1068,8 @@@
        date: "Date"
        no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
        people_mapping_nearby: "people mapping nearby"
+     reply:
+       wrong_user: "You are logged in as `{{user}}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
      read:
        title: "Read message"
        reading_your_messages: "Reading your messages"
@@@ -1072,6 -1071,7 +1082,7 @@@
        reading_your_sent_messages: "Reading your sent messages"
        to: "To"
        back_to_outbox: "Back to outbox"
+       wrong_user: "You are logged in as `{{user}}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it."
      sent_message_summary:
        delete_button: "Delete"
      mark:
@@@ -1194,7 -1194,7 +1205,7 @@@
        heading: "Editing trace {{name}}"
        filename: "Filename:"
        download: "download"
-       uploaded_at: "Uploaded at:"
+       uploaded_at: "Uploaded:"
        points: "Points:"
        start_coord: "Start coordinate:"
        map: "map"
@@@ -1235,7 -1235,7 +1246,7 @@@
        pending: "PENDING"
        filename: "Filename:"
        download: "download"
-       uploaded: "Uploaded at:"
+       uploaded: "Uploaded:"
        points: "Points:"
        start_coordinates: "Start coordinate:"
        map: "map"
@@@ -1367,6 -1367,10 +1378,10 @@@
        login_button: "Login"
        account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
        auth failure: "Sorry, could not log in with those details."
+     logout:
+       title: "Logout"
+       heading: "Logout from OpenStreetMap"
+       logout_button: "Logout"      
      lost_password:
        title: "Lost password"
        heading: "Forgotten Password?"
@@@ -1450,10 -1454,10 +1465,10 @@@
        unhide_user: "unhide this user"
        delete_user: "delete this user"
        confirm: "Confirm"
-     map:
-       your location: Your location
-       nearby mapper: "Nearby mapper: [[nearby_user]]"
-       friend: "Friend: [[friend_user]]"
+     popup:
+       your location: "Your location"
+       nearby mapper: "Nearby mapper"
+       friend: "Friend"
      account:
        title: "Edit account"
        my settings: My settings
@@@ -1477,6 -1481,7 +1492,7 @@@
        keep image: "Keep the current image"
        delete image: "Remove the current image"
        replace image: "Replace the current image"
+       image size hint: "(square images at least 100x100 work best)"
        home location: "Home Location:"
        no home location: "You have not entered your home location."
        latitude: "Latitude:"
@@@ -1619,19 -1624,6 +1635,19 @@@
        back: "View all blocks"
        revoker: "Revoker:"
        needs_view: "The user needs to log in before this block will be cleared."
 +  bugs:
 +    rss:
 +      description: "A list of bugs, reported, commented on or closed in your area"
 +      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: