From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 2 May 2010 08:57:50 +0000 (+0000)
Subject: Merge branch 'master' into openID
X-Git-Tag: live~6319
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/441b92c3c33cf79c2bac977cf0b3cf2c3e7e010e?hp=-c

Merge branch 'master' into openID
---

441b92c3c33cf79c2bac977cf0b3cf2c3e7e010e
diff --combined config/environment.rb
index 01115ba97,018e97451..7f9343ce0
--- a/config/environment.rb
+++ b/config/environment.rb
@@@ -13,6 -13,10 +13,10 @@@ SERVER_URL = ENV['OSM_SERVER_URL'] || '
  # Set the generator
  GENERATOR = ENV['OSM_SERVER_GENERATOR'] || 'OpenStreetMap server'
  
+ # Settings for generated emails (e.g. signup confirmation
+ EMAIL_FROM = ENV['OSM_EMAIL_FROM'] || 'OpenStreetMap <webmaster@openstreetmap.org>'
+ EMAIL_RETURN_PATH = ENV['OSM_EMAIL_RETURN_PATH'] || 'bounces@openstreetmap.org'
+ 
  # Application constants needed for routes.rb - must go before Initializer call
  API_VERSION = ENV['OSM_API_VERSION'] || '0.6'
  
@@@ -52,7 -56,6 +56,7 @@@ Rails::Initializer.run do |config
    config.gem 'rmagick', :lib => 'RMagick'
    config.gem 'oauth', :version => '>= 0.3.6'
    config.gem 'httpclient'
 +  config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4'
    config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
    config.gem 'sanitize'
  
diff --combined config/locales/en.yml
index bb01b4df2,ba76a9b4a..4b9591868
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -3,7 -3,7 +3,7 @@@ en
      dir: ltr
    time:
      formats:
-       friendly: "%e %B %Y at %H:%M"    
+       friendly: "%e %B %Y at %H:%M"
    activerecord:
      # Translates all the model names, which is used in error handling on the web site
      models:
@@@ -127,7 -127,7 +127,7 @@@
        has_relations:
          one:  "Has the following {{count}} relation:"
          other: "Has the following {{count}} relations:"
-     common_details: 
+     common_details:
        edited_at: "Edited at:"
        edited_by: "Edited by:"
        version: "Version:"
@@@ -263,7 -263,7 +263,7 @@@
        view_history: "view history"
        edit: "edit"
    changeset:
-     changeset_paging_nav: 
+     changeset_paging_nav:
        showing_page: "Showing page {{page}}"
        next: "Next &raquo;"
        previous: "&laquo; Previous"
@@@ -941,30 -941,20 +941,20 @@@
    license_page:
      foreign:
        title: About this translation
-       text: |
-         In the event of a conflict between this translated page and
-         {{english_original_link}}, the English page shall take
-         precedence
+       text: In the event of a conflict between this translated page and {{english_original_link}}, the English page shall take precedence
        english_link: the English original
      native:
        title: About this page
-       text: |
- 
-         You are viewing the English version of the copyright page. You
-         can go back to the {{native_link}} of this page; Or you can
-         stop reading about copyright and {{mapping_link}}.
- 
+       text: You are viewing the English version of the copyright page. You can go back to the {{native_link}} of this pag or you can stop reading about copyright and {{mapping_link}}.
        native_link: THIS_LANGUAGE_NAME_HERE version
        mapping_link: start mapping
      legal_babble: |
        <h2>Copyright and License</h2>
-       
        <p>
           OpenStreetMap is <i>open data</i>, licensed under the <a
           href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).
        </p>
-       
        <p>
          You are free to copy, distribute, transmit and adapt our maps
          and data, as long as you credit OpenStreetMap and its
@@@ -974,9 -964,8 +964,8 @@@
          href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
          code</a> explains your rights and responsibilities.
        </p>
-       
+ 
        <h3>How to credit OpenStreetMap</h3>
-       
        <p>
          If you are using OpenStreetMap map images, we request that
          your credit reads at least &ldquo;&copy; OpenStreetMap
@@@ -984,7 -973,6 +973,6 @@@
          we request &ldquo;Map data &copy; OpenStreetMap contributors,
          CC-BY-SA&rdquo;.
        </p>
-       
        <p>
          Where possible, OpenStreetMap should be hyperlinked to <a
          href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
@@@ -996,32 -984,28 +984,28 @@@
          &lsquo;OpenStreetMap&rsquo; to this full address) and to
          www.creativecommons.org.
        </p>
-       
+ 
        <h3>Finding out more</h3>
-       
        <p>
          Read more about using our data at the <a
          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
          FAQ</a>.
        </p>
-       	
        <p>
          OSM contributors are reminded never to add data from any
          copyrighted sources (e.g. Google Maps or printed maps) without
          explicit permission from the copyright holders.
        </p>
-       
        <p>
          Although OpenStreetMap is open data, we cannot provide a
          free-of-charge map API for third-party developers.
-       
+ 
          See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
          <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
          and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
        </p>
-       
+ 
        <h3>Our contributors</h3>
-       
        <p>
          Our CC-BY-SA licence requires you to &ldquo;give the Original
          Author credit reasonable to the medium or means You are
@@@ -1032,41 -1016,34 +1016,34 @@@
          OpenStreetMap, it may be reasonable to credit them by directly
          reproducing their credit or by linking to it on this page.
        </p>
-       
+ 
        <!--
-       
        Information for page editors
-       
+ 
        The following lists only those organisations who require attribution
        as a condition of their data being used in OpenStreetMap. It is not a
        general catalogue of imports, and must not be used except when
        attribution is required to comply with the licence of the imported
        data.
-       
+ 
        Any additions here must be discussed with OSM sysadmins first.
-       
        -->
-       
+ 
        <ul id="contributors">
-       
            <li><strong>Australia</strong>: Contains suburb data based
            on Australian Bureau of Statistics data.</li>
-       
            <li><strong>Canada</strong>: Contains data from
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
            Resources Canada), CanVec (&copy; Department of Natural
            Resources Canada), and StatCan (Geography Division,
            Statistics Canada).</li>
-       
            <li><strong>New Zealand</strong>: Contains data sourced from
            Land Information New Zealand. Crown Copyright reserved.</li>
-       
            <li><strong>United Kingdom</strong>: Contains Ordnance
            Survey data &copy; Crown copyright and database right
            2010.</li>
- 
        </ul>
-       
+ 
        <p>
          Inclusion of data in OpenStreetMap does not imply that the original
          data provider endorses OpenStreetMap, provides any warranty, or
@@@ -1169,7 -1146,7 +1146,7 @@@
        subject: "Subject"
        date: "Date"
        no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-       people_mapping_nearby: "people mapping nearby" 
+       people_mapping_nearby: "people mapping nearby"
      message_summary:
        unread_button: "Mark as unread"
        read_button: "Mark as read"
@@@ -1192,7 -1169,7 +1169,7 @@@
        title: "No such message"
        heading: "No such message"
        body: "Sorry there is no message with that id."
-     outbox: 
+     outbox:
        title: "Outbox"
        my_inbox: "My {{inbox_link}}"
        inbox: "inbox"
@@@ -1492,7 -1469,7 +1469,7 @@@
        allow_write_api:   "modify the map."
        allow_read_gpx:    "read their private GPS traces."
        allow_write_gpx:   "upload GPS traces."
-     not_found: 
+     not_found:
        sorry: "Sorry, that {{type}} could not be found."
      create:
        flash: "Registered the information successfully"
@@@ -1508,41 -1485,15 +1485,41 @@@
        create_account: "create an account"
        email or username: "Email Address or Username:"
        password: "Password:"
 +      openid: "OpenID:"
 +      openid description: "Use your OpenID to login"
 +      username_heading: "Login with username and password:"
 +      openid_heading: "Login with an OpenID:"
        remember: "Remember me:"
        lost password link: "Lost your password?"
        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."
 +      openid missing provider: "Sorry, could not contact your OpenID provider"
 +      openid invalid: "Sorry, your OpenID seems misformed"
 +      openid_logo_alt: "Log in with an OpenID"
 +      openid_providers:
 +        openid:
 +          title: Login with an OpenID URL
 +          alt: Login with an OpenID URL
 +        yahoo:
 +          title: Login with a Yahoo! OpenID
 +          alt: Login with a Yahoo! OpenID
 +        google:
 +          title: Login with a Google OpenID
 +          alt: Login with a Google OpenID
 +        myopenid:
 +          title: Login with a myOpenID OpenID
 +          alt: Login with a myOpenID OpenID
 +        wordpress:
 +          title: Login with a Wordpress.com OpenID
 +          alt: Login with a Wordpress.com OpenID
 +        myspace:
 +          title: Login with a MySpace OpenID
 +          alt: Login with a MySpace OpenID
      logout:
        title: "Logout"
        heading: "Logout from OpenStreetMap"
-       logout_button: "Logout"      
+       logout_button: "Logout"
      lost_password:
        title: "Lost password"
        heading: "Forgotten Password?"
@@@ -1573,11 -1524,6 +1550,11 @@@
        display name description: "Your publicly displayed username. You can change this later in the preferences."
        password: "Password:"
        confirm password: "Confirm Password:"
 +      openID associate: "Associate an OpenID with your account"
 +      openID: "OpenID:"
 +      openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'
 +      openID nopassword: "With OpenID, you don't need to specify a password during signup, but some extra OpenStreetMap services or tools may still need one"
 +      openID association: 'Your OpenID is not associated with a OpenStreetMap account yet.<br><ul><li>If you are new to OpenStreetMap, please create a new account.<li>If you already have an account, you can normally login to your account and then associate the account with your openID in your user settings</ul> '
        signup: Signup
        flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<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."
      no_such_user:
@@@ -1641,10 -1587,6 +1618,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."