cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'osmlab/welcome-2'

Browse source
This commit is contained in:
Tom Hughes 2013-08-18 14:50:36 +01:00
commit 56fd5c4d90
33 changed files with 5400 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/environments/production.rb
View file

@ -56,7 +56,7 @@ OpenStreetMap::Application.configure do
# config.action_controller.asset_host = "http://assets.example.com"
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
config.assets.precompile += %w( index.js edit.js browse.js changeset.js )
config.assets.precompile += %w( index.js edit.js browse.js changeset.js welcome.js )
config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js )
config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )

44
config/locales/da.yml
View file

@ -1090,6 +1090,50 @@ da:
native_link: den danske udgave
text: Du kigger på den engelske udgave af ophavsretsiden. Du kan gå tilbage til %{native_link} af denne side eller du kan holde op med at læse om ophavsret og %{mapping_link}.
title: Om denne side
welcome_page:
title: Welcome!
introduction_html: |
Velkommen til OpenStreetMap, det frie brugerredigerede verdenskort. Nu hvor du er oprettet som
bruger er du klar til tilføje og ændre kortinformationer. Her er en guide med de vigtigste
informationer til at komme hurtigt i gang.
whats_on_the_map:
title: Hvad kortet indholder
on_html: |
OpenStreetMap indeholder elementer, der <em>konkret og aktuelt</em> findes -
f.eks. millioner af bygninger, veje og andre detaljer om steder. Du kan kortlægge
enhver detalje fra den virkelige verden som du interesserer dig for.
off_html: |
Kortet indeholder <em>ikke</em> subjektive informationer (f.eks. anmeldelser), ting
der ikke længere eksisterer, fiktive ting og ophavsretsligt beskyttede data fra andre
kort. Kopier aldrig nogen som helst information fra andre online- eller papirkort
med mindre der forelægger en særlig tilladelse.
basic_terms:
title: Grundlæggende begreber
paragraph_1_html: |
Her er nogen få begreber som er nyttige at forstå for at bidrage til OpenStreetMap.
editor_html: |
En <strong>editor</strong> er et program eller en hjemmeside der kan bruges til at editere kortet.
node_html: |
En <strong>node</strong> er et punkt på kortet, f.eks. en enkelt restaurant eller et træ.
way_html: |
En <strong>way</strong> er en linje eller et areal, f.eks. en vej, en å eller en bygning.
tag_html: |
Et <strong>tag</strong> er en lille bid information om en node eller en way, f.eks. navnet på en restaurant eller
hastighedsbegrænsningen på en vej.
questions:
title: Spørgsmål?
paragraph_1_html: |
Behøver du hjælp til at kortlægge eller er du usikker på hvordan OpenStreetMap bruges? Få svar på dine spørgsmål på
<a href='http://help.openstreetmap.org/'>OpenStreetMaps hjælpeside</a>.
start_mapping: Editér kortet
add_a_note:
title: Har du ikke tid til at kortlægge selv? Tilføj en note!
paragraph_1_html: |
Hvis du bare vil have en lille detalje rettet, men ikke har tid til at gøre det selv, så kan du tilføje en note.
paragraph_2_html: |
Bare gå ind på <a href='%{map_url}'>kortet</a> og klik på note-ikonet:
<span class='icon note'></span>. Dette vil tilføje et symbol som du kan trække rundt på kortet. Tilføj din besked,
klik på gem og lad andre brugere undersøge sagen.
message:
delete:
deleted: Besked slettet

49
config/locales/de.yml
View file

@ -1206,6 +1206,49 @@ de:
opened: neuer Fehler (in der Nähe von %{place})
reopened: reaktivierter Fehler (in der Nähe von %{place})
title: OpenStreetMap-Fehler
welcome_page:
title: Willkommen!
introduction_html: |
Willkommen zu OpenStreetMap, der weltweiten frei und editierbaren Karte. Jetzt wo Du registriert bist, ist alles so weit das Du anfangen kannst zu editieren.
Hier sind noch eine paar zusaetzliche Informationen zu den wichtigsten Dingen um erfolgreich zu editieren.
whats_on_the_map:
title: Was gehoert in die Karte?
on_html: |
OpenStreetMap ist eine Datenbank in der man alles erfassen kann was <em>derzeit real existiert.</em> -
Dies beinhalten sowohl Strassen, Gebaeude und Plaetze mit ihren Informationen als auch z.B. Geschaefte, Briefkaesten oder Hydranten.
Eigentlich eben alles was man so dauerhaft in der Umgebung finden kann und einem interessiert.
off_html: |
Was nicht in die Datenbank gehoert sind subjektive Daten wie Bewertungen, nicht mehr aktuelle
historische Fakten oder nicht real existierende Dinge. Ausserdem ist es wichtig nichts von
anderen Quellen zu kopieren, da OpenStreetMap Copyright sehr ernst nimmt.
basic_terms:
title: Grundbegriffe fuers Mapping
paragraph_1_html: |
OpenStreetMap hat ein paar eigene Begrifflichkeiten. Hier sind ein paar davon die nuetzlich sein duerften.
editor_html: |
Ein <strong>Editor</strong> ist ein Programm oder eine Webseite mit der man die Karte editieren kann.
node_html: |
Ein <strong>Knoten</strong> ist ein Punkt auf der Karte, z.B. ein Restaurant oder ein Baum.
way_html: |
Ein OSM <strong>Weg</strong> ist eine Linie oder Flaeche wie z.B. eine Strasse, Weg, Fluss oder Gebaeude.
tag_html: |
Ein <strong>tag</strong> ist eine Eigenschaft die man einem Objekt zuweist. Z.B. der Name eines Restaurant
oder die maximale Geschwindigkeit einer Strasse.
questions:
title: Fragen?
paragraph_1_html: |
Falls Du zusaetzliche Hilfe beim Mapping brauchst oder etwas nicht klar ist, gibt es zusaetzliche
Hilfe auf <a href='http://help.openstreetmap.org/'>the Hilfe Seite</a>.
start_mapping: Beginne mit dem Mapping
add_a_note:
title: Keine Zeit zum editieren? Dann melde einfach einen Fehler!
paragraph_1_html: |
Es ist sehr einfach eine Notiz fuer andere Mapper zu schreiben die diese dann mit der Zeit abarbeiten koennen,
falls man selbst nicht die Zeit hat sich einzuarbeiten und dies zu erledigen.
paragraph_2_html: |
Gehe einfach auf <a href='%{map_url}'>die Karte</a> und klicke das Sprechblasen Icon:
<span class='icon note'></span>. Dies fuegt einen Marker auf der Karte hinzu welchen man zu der Problemstelle ziehen kann.
Die Notiz sollte so genau wie moeglich sein, damit ein anderer Mapper die Erklaerung dann verwenden kann um den Fehler zu beheben.
notifier:
diary_comment_notification:
footer: Hier gehts zum Eintrag %{readurl}, du kannst ihn kommentieren %{commenturl} oder direkt beantworten %{replyurl}.
@ -1769,6 +1812,12 @@ de:
confirm email address: "Bestätige deine E-Mail-Adresse:"
confirm password: "Passwort bestätigen:"
contact_webmaster: Bitte kontaktiere den <a href="mailto:webmaster@openstreetmap.org">Webmaster</a> um ein Benutzerkonto erstellt zu bekommen - wir werden die Anfrage so schnell wie möglich bearbeiten.
about:
header: Frei und editierbar
html: |
<p>Im Gegensatz zu anderen Karten, OpenStreetMap is vollstaendig von Leuten wie Dir erstellt.
Jeder kann sie verbessern, aktualisieren und erweitern, sowie fuer jeden Zweck verwenden.</p>
<p>Melde Dich an und beginne mitzuwirken. Wir werden Dir eine email schicken um diese zu bestaetigen.</p>
continue: Weiter
display name: "Benutzername:"
display name description: Dein öffentlich angezeigter Benutzername. Er kann später in den Einstellungen geändert werden.

98
config/locales/en.yml
View file

@ -1170,6 +1170,50 @@ en:
to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
procedure</a> or file directly at our
<a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
welcome_page:
title: Welcome!
introduction_html: |
Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
up, you're all set to get started mapping. Here's a quick guide with the most important
things you need to know.
whats_on_the_map:
title: What's on the Map
on_html: |
OpenStreetMap is a place for mapping things that are both <em>real and current</em> -
it includes millions of buildings, roads, and other details about places. You can map
whatever real-world features are interesting to you.
off_html: |
What it <em>doesn't</em> include is opinionated data like ratings, historical or
hypothetical features, and data from copyrighted sources. Unless you have special
permission, don't copy from online or paper maps.
basic_terms:
title: Basic Terms For Mapping
paragraph_1_html: |
OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
editor_html: |
An <strong>editor</strong> is a program or website you can use to edit the map.
node_html: |
A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.
way_html: |
A <strong>way</strong> is a line or area, like a road, stream, lake or building.
tag_html: |
A <strong>tag</strong> is a bit of data about a node or way, like a
restaurant's name or a road's speed limit.
questions:
title: Any questions?
paragraph_1_html: |
Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered
on <a href='http://help.openstreetmap.org/'>the help website</a>.
start_mapping: Start Mapping
add_a_note:
title: No Time To Edit? Add a Note!
paragraph_1_html: |
If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
easy to add a note.
paragraph_2_html: |
Just go to <a href='%{map_url}'>the map</a> and click the note icon:
<span class='icon note'></span>. This will add a marker to the map, which you can move
by dragging. Add your message, then click save, and other mappers will investigate.
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on your diary entry"
@ -1206,28 +1250,7 @@ en:
greeting: "Hi there!"
created: "Someone (hopefully you) just created an account at %{site_url}."
confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:"
welcome: "We would like to welcome you and provide you with some additional information to get you started."
signup_confirm_plain:
introductory_video: "You can watch an introductory video to OpenStreetMap here:"
more_videos: "There are more videos here:"
the_wiki: "Get reading about OpenStreetMap on the wiki:"
the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_guide"
blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]."
current_user: "A list of current users in categories, based on where in the world they are, is available from:"
signup_confirm_html:
introductory_video: "You can watch an %{introductory_video_link}."
video_to_openstreetmap: "introductory video to OpenStreetMap"
more_videos: "There are %{more_videos_link}."
more_videos_here: "more videos here"
get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_guide">on the wiki</a>, and catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>.
ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.
wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
email_confirm:
subject: "[OpenStreetMap] Confirm your email address"
email_confirm_plain:
@ -1697,11 +1720,15 @@ en:
flash changed: "Your password has been changed."
flash token bad: "Did not find that token, check the URL maybe?"
new:
title: "Create account"
heading: "Create a User Account"
title: "Sign Up"
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
fill_form: "Fill in the form and we will send you a quick email to activate your account."
about:
header: Free and editable
html: |
<p>Unlike other maps, OpenStreetMap is completely created by people like you,
and it's free for anyone to fix, update, download and use.</p>
<p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
email address: "Email Address:"
confirm email address: "Confirm Email Address:"
@ -1723,16 +1750,14 @@ en:
with your OpenID in your user settings.
</li>
</ul>
continue: Continue
flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started."
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."
continue: Sign Up
terms accepted: "Thanks for accepting the new contributor terms!"
terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
terms:
title: "Contributor terms"
heading: "Contributor terms"
read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
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://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
@ -1741,7 +1766,7 @@ en:
declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
decline: "Decline"
you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
legale_select: "Please select your country of residence:"
legale_select: "Country of residence:"
legale_names:
france: "France"
italy: "Italy"
@ -1869,14 +1894,16 @@ en:
flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
flash update success: "User information updated successfully."
confirm:
heading: Confirm a user account
heading: Check your email!
introduction_1: |
We sent you a confirmation email.
introduction_2: |
Confirm your account by clicking on the link in the email and you'll be able to start mapping.
press confirm button: "Press the confirm button below to activate your account."
button: Confirm
success: "Confirmed your account, thanks for signing up!"
before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."
already active: "This account has already been confirmed."
unknown token: "That token doesn't seem to exist."
reconfirm: "If it's been a while since you signed up you might need to <a href=\"%{reconfirm}\">send yourself a new confirmation email</a>."
unknown token: "That confirmation code has expired or does not exist."
reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
confirm_resend:
success: "We've sent a new 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."
failure: "User %{name} not found."
@ -2139,6 +2166,7 @@ en:
reactivate: Reactivate
comment_and_resolve: Comment & Resolve
comment: Comment
edit_help: Move the map and zoom in on a location you want to edit, then click here.
redaction:
edit:
description: "Description"

48
config/locales/fr.yml
View file

@ -1207,6 +1207,54 @@ fr:
opened: nouvelle note (près de %{place})
reopened: note réactivée (près de %{place})
title: Notes OpenStreetMap
welcome_page:
title: Bienvenue !
introduction_html: |
Bienvenue à OpenStreetMap, la carte du monde libre et éditable. Maintenant que vous
êtes enregistré, vous avez tout ce qu'il faut pour commencer à cartographier. Ce qui
suit est un petit guide des choses les plus importantes à savoir.
whats_on_the_map:
title: Ce qu'il y a sur la carte
on_html: |
OpenStreetMap sert à cartographier des choses à la fois <em>réelles et actuelles</em>
- il inclut des millions de bâtiments, de routes, et d'autres détails de lieux. Vous
pouvez cartographier n'importe quel élément du monde réel qui vous intéresse.
off_html: |
Ce qui est par contre <em>exclu</em> sont les données subjectives comme les cotes de
popularité, les éléments historiques ou hypothétiques, et les données venant de source
copyrightée. À moins d'avoir une permission spéciale, ne copiez pas à partir d'une
carte papier ou en ligne.
basic_terms:
title: Vocabulaire de base de cartographie
paragraph_1_html: |
OpenStreetMap a son propre jargon. Voici quelques mots clefs qui vous seront utiles.
editor_html: |
Un <strong>éditeur</strong> est un programme ou site web qui vous permet d'éditer la carte.
node_html: |
Un <strong>nœud</strong> est un point sur la carte, comme un restaurant ou un arbre individuel.
way_html: |
Un <strong>chemin</strong est une ligne ou une surface, comme par exemple une rue, un
ruisseau, un lac, ou un bâtiment.
tag_html: |
Un <strong>tag</strong> est une information à propos d'un nœud ou d'un chemin, comme
le nom d'un restaurant ou la vitesse limite d'une rue.
questions:
title: Des questions ?
paragraph_1_html: |
Besoin d'aide pour cartographier, ou pas sûr de comment utilise OpenStreetMap ?
Obtenez les réponses à vos questions sur <a href='http://help.openstreetmap.org/'>
le site d'aide</a>.
start_mapping: Commencer à cartographier
add_a_note:
title: Pas le temps d'éditer ? Ajoutez une note !
paragraph_1_html: |
Si vous voulez juste faire une petite correction et n'avez pas le temps de vous
enregistrer et d'apprendre à éditer, il est facile d'ajouter une note.
paragraph_2_html: |
Allez simplement sur <a href='%{map_url}'>la carte</a> et cliquez sur l'icône note:
<span class='icon note'></span>. Cela ajoutera un marqueur sur la carte, que vous
pouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur
"ajouter une note", et d'autres contributeurs iront regarder.
notifier:
diary_comment_notification:
footer: Vous pouvez également lire le commentaire sur %{readurl}, commenter sur %{commenturl} ou répondre sur %{replyurl}

3
config/routes.rb
View file

@ -122,9 +122,10 @@ OpenStreetMap::Application.routes.draw do
# web site
root :to => 'site#index', :via => [:get, :post]
match '/edit' => 'site#edit', :via => :get
match '/edit' => 'site#edit', :via => :get, :as => :edit
match '/copyright/:copyright_locale' => 'site#copyright', :via => :get
match '/copyright' => 'site#copyright', :via => :get
match '/welcome' => 'site#welcome', :via => :get, :as => :welcome
match '/history' => 'changeset#list', :via => :get
match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom
match '/export' => 'site#index', :export => true, :via => :get