From: Tom Hughes Date: Wed, 28 Jul 2010 20:39:46 +0000 (+0100) Subject: Merge branch 'master' into openid X-Git-Tag: live~6369 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/03fb042591bf60cd74aa277ee3de98f02d8486d3?hp=-c Merge branch 'master' into openid --- 03fb042591bf60cd74aa277ee3de98f02d8486d3 diff --combined app/models/user.rb index f99ad3b40,1a50f7053..d5b75d073 --- a/app/models/user.rb +++ b/app/models/user.rb @@@ -23,12 -23,13 +23,14 @@@ class User < ActiveRecord::Bas validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password' validates_uniqueness_of :display_name, :allow_nil => true validates_uniqueness_of :email + validates_uniqueness_of :openid_url, :allow_nil => true validates_length_of :pass_crypt, :within => 8..255 validates_length_of :display_name, :within => 3..255, :allow_nil => true validates_email_format_of :email validates_email_format_of :new_email, :allow_blank => true validates_format_of :display_name, :with => /^[^\/;.,?]*$/ + validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace" + validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace" validates_numericality_of :home_lat, :allow_nil => true validates_numericality_of :home_lon, :allow_nil => true validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true diff --combined config/locales/en.yml index 2a8479a22,61616c562..972e52708 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -933,7 -933,6 +933,6 @@@ en shop: Shop shop_tooltip: Shop with branded OpenStreetMap merchandise shop_url: http://wiki.openstreetmap.org/wiki/Merchandise - sotm2010: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!' license: alt: CC by-sa 2.0 title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License @@@ -1062,6 -1061,7 +1061,7 @@@ 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_header: "[OpenStreetMap] {{subject}}" 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}}" @@@ -1351,7 -1351,8 +1351,8 @@@ help: "Help" help_url: "http://wiki.openstreetmap.org/wiki/Upload" trace_header: - see_just_your_traces: "See just your traces, or upload a trace" + your_traces: "See just your traces" + upload_trace: "Upload a trace" see_all_traces: "See all traces" see_your_traces: "See all your traces" traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." @@@ -1490,9 -1491,6 +1491,9 @@@ create_account: "create an account" email or username: "Email Address or Username:" password: "Password:" + openid: "{{logo}} OpenID:" + username_heading: "Login with username and password:" + openid_heading: "Login with OpenID:" remember: "Remember me:" lost password link: "Lost your password?" login_button: "Login" @@@ -1500,28 -1498,6 +1501,28 @@@ account suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the {{webmaster}} if you wish to discuss this. webmaster: webmaster 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 to be malformed" + 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" @@@ -1554,21 -1530,8 +1555,21 @@@ not displayed publicly: 'Not displayed publicly (see privacy policy)' 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: | +

Your OpenID is not associated with a OpenStreetMap account yet.

+ continue: Continue flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)

Please note that you will not be able to login until you've received and confirmed your email address.

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: @@@ -1649,10 -1612,6 +1650,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." diff --combined config/locales/is.yml index 9921af72a,6f47e5cc1..6c50d94f2 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@@ -740,7 -740,6 +740,6 @@@ is footer2: og svarað á {{replyurl}} header: "{{from_user}} hefur send þér skilaboð á OpenStreetMap með titlinum „{{subject}}“:" hi: Hæ {{to_user}}, - subject: "[OpenStreetMap] {{user}} sendi þér ný skilaboð" signup_confirm: subject: "[OpenStreetMap] Staðfestu netfangið þitt" signup_confirm_html: @@@ -1020,8 -1019,6 +1019,8 @@@ current email address: "Núverandi netfang:" delete image: Eyða þessari mynd email never displayed publicly: (aldrei sýnt opinberlega) + openid: + link text: "hvað er openID?" flash update success: Stillingarnar þínar voru uppfærðar. flash update success confirm needed: Stillingarnar þínar voru uppfærðar. Póstur var sendur á netfangið þitt sem þú þarft að bregðast við til að netfangið þitt verði staðfest. home location: "Staðsetning:" @@@ -1082,28 -1079,6 +1081,28 @@@ remember: "Muna innskráninguna:" title: Innskrá webmaster: vefstjóra + openid_heading: "Innskráning með OpenID:" + username_heading: "Innskráning með OpenStreetMap aðgang:" + openid_logo_alt: "Innskrá með OpenID" + openid_providers: + openid: + title: Innskrá með OpenID slóð + alt: Innskrá með OpenID slóð + yahoo: + title: Innsrká með Yahoo! OpenID + alt: Innsrká með Yahoo! OpenID + google: + title: Innsrká með Google OpenID + alt: Innsrká með Google OpenID + myopenid: + title: Innsrká með myOpenID OpenID + alt: Innsrká með myOpenID OpenID + wordpress: + title: Innsrká með Wordpress.com OpenID + alt: Innsrká með Wordpress.com OpenID + myspace: + title: Innsrká með MySpace OpenID + alt: Innsrká með MySpace OpenID logout: heading: Útskrá logout_button: Útskrá @@@ -1135,21 -1110,6 +1134,21 @@@ no_auto_account_create: Því miður getum við eki búið til reikning fyrir þig sjálfkrafa. not displayed publicly: Ekki sýnt opinberlega (sjá meðferð persónuupplýsinga) password: "Lykilorð:" + openID associate: "Tengja OpenID við þennan aðgang" + openID: "OpenID:" + openID description: '(Valfrjálst) Ef þú ert með OpenID getur þú tengt það við nýja aðganginn þinn.' + openID nopassword: "Með OpenID þarft þú ekki að gefa upp lykilorð við innskráningu. Í stað þess notar þú OpenID." + openID association: | + Þetta OpenID er ekki tengt við neinn OpenStreetMap aðgang. + + signup: Nýskrá title: Nýskrá no_such_user: body: Það er ekki til notandi með nafninu {{user}}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.