From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Jun 2011 21:36:43 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5905^2~144
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7c98b41cc89068d049a18f8738276f19cd47095e?hp=-c

Merge branch 'master' into openstreetbugs
---

7c98b41cc89068d049a18f8738276f19cd47095e
diff --combined config/example.application.yml
index dea87c247,a8ebb4d8f..eef48a7bb
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@@ -24,8 -24,6 +24,8 @@@ standard_settings: &standard_setting
    max_number_of_nodes: 50000
    # Maximum number of nodes that can be in a way (checked on save)
    max_number_of_way_nodes: 2000
 +  # The maximum area you're allowed to request notes from, in square degrees
 +  max_note_request_area: 25
    # Zoom level to use for postcode results from the geocoder
    postcode_zoom: 15
    # Zoom level to use for geonames results from the geocoder
@@@ -71,6 -69,8 +71,8 @@@
    #potlatch2_key: ""
    # Whether to require users to view the CTs before continuing to edit...
    require_terms_seen: false
+   # Whether to require users to agree to the CTs before editing
+   require_terms_agreed: false
  
  development:
    <<: *standard_settings
diff --combined config/locales/en.yml
index c619d449d,e41048d0f..5b6d575d3
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -277,17 -277,6 +277,17 @@@ en
        download_xml: "Download XML"
        view_history: "view history"
        edit: "edit"
 +    note:
 +      open_title: "Unresolved issue: %{note_name}"
 +      closed_title: "Resolved issue: %{note_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}"
@@@ -1067,6 -1056,9 +1067,9 @@@
        <ul id="contributors">
            <li><strong>Australia</strong>: Contains suburb data based
            on Australian Bureau of Statistics data.</li>
+           <li><strong>Austria</strong>: Contains data from
+           <a href="http://data.wien.gv.at/">Stadt Wien</a> under
+           <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC-BY</a>.</li>
            <li><strong>Canada</strong>: Contains data from
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
            Resources Canada), CanVec (&copy; Department of Natural
@@@ -1178,13 -1170,6 +1181,13 @@@
        greeting: "Hi,"
        hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
        click_the_link: "If this is you, please click the link below to reset your password."
 +    note_plain:
 +      subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
 +      subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
 +      greeting: "Hi,"
 +      your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
 +      commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
 +      details: "More details about the note can be found at %{URL}."
    message:
      inbox:
        title: "Inbox"
@@@ -1534,15 -1519,15 +1537,15 @@@
      login:
        title: "Login"
        heading: "Login"
-       please login: "Please login or %{create_user_link}."
-       create_account: "create an account"
        email or username: "Email Address or Username:"
        password: "Password:"
+       openid: "%{logo} OpenID:"
        remember: "Remember me:"
        lost password link: "Lost your password?"
        login_button: "Login"
        register now: Register now
-       already have: Already have an OpenStreetMap account? Please login.
+       with username: "Already have an OpenStreetMap account? Please login with your username and password:"
+       with openid: "Alternatively please use your OpenID to login:"
        new to osm: New to OpenStreetMap?
        to make changes: To make changes to the OpenStreetMap data, you must have an account.
        create account minute: Create an account. It only takes a minute.
@@@ -1551,6 -1536,28 +1554,28 @@@
        webmaster: webmaster
        auth failure: "Sorry, could not log in with those details."
        notice: "<a href=\"http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License\">Find out more about OpenStreetMap's upcoming license change</a> (<a href=\"http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License\">translations</a>) (<a href=\"http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming\">discussion</a>)"
+       openid missing provider: "Sorry, could not contact your OpenID provider"
+       openid invalid: "Sorry, your OpenID seems to be malformed"
+       openid_logo_alt: "Log in with an OpenID"
+       openid_providers:
+         openid:
+           title: Login with OpenID
+           alt: Login with an OpenID URL
+         google:
+           title: Login with Google
+           alt: Login with a Google OpenID
+         yahoo:
+           title: Login with Yahoo
+           alt: Login with a Yahoo OpenID
+         myopenid:
+           title: Login with myOpenID
+           alt: Login with a myOpenID OpenID
+         wordpress:
+           title: Login with Wordpress
+           alt: Login with a Wordpress OpenID
+         aol:
+           title: Login with AOL
+           alt: Login with an AOL OpenID
      logout:
        title: "Logout"
        heading: "Logout from OpenStreetMap"
@@@ -1583,8 -1590,21 +1608,21 @@@
        not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
        display name: "Display Name:"
        display name description: "Your publicly displayed username. You can change this later in the preferences."
+       openid: "%{logo} OpenID:"
        password: "Password:"
        confirm password: "Confirm Password:"
+       use openid: "Alternatively, use %{logo} OpenID to login"
+       openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
+       openid association: |
+         <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
+         <ul>
+           <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
+           <li>
+             If you already have an account, you can login to your account
+             using your username and password and then associate the account
+             with your OpenID in your user settings.
+           </li>
+         </ul> 
        continue: Continue
        flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
        terms accepted: "Thanks for accepting the new contributor terms!"
@@@ -1616,7 -1636,6 +1654,7 @@@
        new diary entry: new diary entry
        my edits: my edits
        my traces: my traces
 +      my notes: my map notes
        my settings: my settings
        oauth settings: oauth settings
        blocks on me: blocks on me
@@@ -1625,7 -1644,6 +1663,7 @@@
        diary: diary
        edits: edits
        traces: traces
 +      notes: map notes
        remove as friend: remove as friend
        add as friend: add as friend
        mapper since: "Mapper since:"
@@@ -1674,6 -1692,10 +1712,10 @@@
        current email address: "Current Email Address:"
        new email address: "New Email Address:"
        email never displayed publicly: "(never displayed publicly)"
+       openid:
+         openid: "OpenID:"
+         link: "http://wiki.openstreetmap.org/wiki/OpenID"
+         link text: "what is this?"
        public editing:
          heading: "Public editing:"
          enabled: "Enabled. Not anonymous and can edit data."
@@@ -1873,21 -1895,6 +1915,21 @@@
        back: "View all blocks"
        revoker: "Revoker:"
        needs_view: "The user needs to log in before this block will be cleared."
 +  note:
 +    rss:
 +      title: "OpenStreetMap Notes"
 +      description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
 +      description_item: "An rss feed for note %{id}"
 +      closed: "closed note (near %{place})"
 +      new: "new note (near %{place})"
 +      comment: "new comment (near %{place})"
 +    mine:
 +      title: "Notes submitted or commented on by %{user}"
 +      heading: "%{user}'s notes"
 +      description: "Notes submitted or commented on by %{user}"
 +      id: "Id"
 +      last_changed: "Last changed"
 +
    javascripts:
      map:
        base:
@@@ -1904,25 -1911,3 +1946,25 @@@
        history_tooltip: View edits for this area
        history_disabled_tooltip: Zoom in to view edits for this area
        history_zoom_alert: You must zoom in to view edits for this area
 +    osb:
 +      Fixed Error: Fixed Error
 +      Unresolved Error: Unresolved Error
 +      Description: Description
 +      Comment: Comment
 +      Has been fixed: This error has been fixed already. However, it might take a couple of days before the map image is updated.
 +      Comment/Close: Comment/Close
 +      Nickname: Nickname
 +      Add comment: Add comment
 +      Mark as fixed: Mark as fixed
 +      Cancel: Cancel
 +      Create OpenStreetBug: Create OpenStreetBug
 +      Create bug: Report a problem with the map
 +      Bug description: Problem description
 +      Create: Report problem
 +      Permalink: Permalink
 +      Login: Login
 +      Details: Details
 +      edityourself: You can also edit the map directly your self
 +      draghelp1: Please drag the marker to the location of the problem
 +      draghelp2: and descripe it as accurate as possible
 +