From: Tom Hughes Date: Mon, 13 Jul 2009 23:28:02 +0000 (+0000) Subject: Merge 16355:16480 from trunk. X-Git-Tag: live~7883^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/942ca1ff2332252ee8db34a436c0b0c1983145b1?ds=inline;hp=-c Merge 16355:16480 from trunk. --- 942ca1ff2332252ee8db34a436c0b0c1983145b1 diff --combined app/views/layouts/site.html.erb index 320161fa0,138b69b1c..59b7c304b --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@@ -47,14 -47,14 +47,14 @@@ traceclass = '' viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' - historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list_bbox' + historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list' exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export' traceclass = 'active' if params['controller'] == 'trace' diaryclass = 'active' if params['controller'] == 'diary_entry' %>
  • <%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
  • <%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('layouts.edit_tooltip'), :class => editclass} %>
    • -
  • <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => t('layouts.history_tooltip'), :class => historyclass} %>
    • +
  • <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('layouts.history_tooltip'), :class => historyclass} %>
    • <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
  • <%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
    • <% else %> @@@ -114,10 -114,6 +114,6 @@@ <%= yield :left_menu %> -
    - <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm'), :title => t('layouts.sotm'), :border => "0"), "http://www.stateofthemap.org/register" %> -
    - <%= yield :optionals %>
    diff --combined config/locales/en.yml index e11cda46a,114c06ac0..59e723cd1 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -83,18 -83,10 +83,18 @@@ en browse: changeset: title: "Changeset" - changeset: "Changeset:" + changeset: "Changeset: {{id}}" download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" + changeset_navigation: + user: + name_tooltip: "View edits by {{user}}" + prev_tooltip: "Previous edit by {{user}}" + next_tooltip: "Next edit by {{user}}" + all: + prev_tooltip: "Previous changeset" + next_tooltip: "Next changeset" changeset_details: created_at: "Created at:" closed_at: "Closed at:" @@@ -153,6 -145,9 +153,9 @@@ relation_history: relation_history: "Relation History" relation_history_title: "Relation History: {{relation_name}}" + download: "{{download_xml_link}} or {{view_details_link}}" + download_xml: "Download XML" + view_details: "view details" relation_member: entry: "{{type}} {{name}}" entry_role: "{{type}} {{name}} as {{role}}" @@@ -244,12 -239,27 +247,12 @@@ user: "User" comment: "Comment" area: "Area" - list_bbox: - history: "History" - changesets_within_the_area: "Changesets within the area:" - show_area_box: "show area box" - no_changesets: "No changesets" - all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}" - recent_changes: "Recent Changes" - no_area_specified: "No area specified" - first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab." - view_the_map: "view the map" - view_tab: "view tab" - alternatively_view: "Alternatively, view all {{recent_changes_link}}" list: - recent_changes: "Recent Changes" - recently_edited_changesets: "Recently edited changesets:" - for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area." - list_user: - edits_by_username: "Edits by {{username_link}}" - no_visible_edits_by: "No visible edits by {{name}}." - for_all_changes: "For changes by all users see {{recent_changes_link}}" - recent_changes: "Recent Changes" + title: "Changesets" + description: "Recent edits" + description_user: "Recent edits by {{user}}" + description_bbox: "Recent edits within {{bbox}}" + description_user_bbox: "Recent edits by {{user}} within {{bbox}}" diary_entry: new: title: New Diary Entry @@@ -597,7 -607,7 +600,7 @@@ anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits" anon_edits_link_text: "Find out why this is the case." flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.' - potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)" + potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)" sidebar: search_results: Search Results close: Close @@@ -691,6 -701,7 +694,7 @@@ owner: "Owner:" description: "Description:" tags: "Tags:" + tags_help: "comma delimited" save_button: "Save Changes" no_such_user: title: "No such user" @@@ -700,6 -711,7 +704,7 @@@ upload_gpx: "Upload GPX File" description: "Description" tags: "Tags" + tags_help: "use commas" public: "Public?" public_help: "what does this mean?" public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" diff --combined config/locales/sl.yml index a2c5608f2,7c2d84ec2..b05af69b6 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@@ -15,7 -15,7 +15,7 @@@ sl message: "Sporočilo" node: "Vozlišče" node_tag: "Oznaka vozlišča" - notifier: "Notifier" + notifier: "Obveščevalec" old_node: "Old Node" old_node_tag: "Old Node Tag" old_relation: "Old Relation" @@@ -79,13 -79,13 +79,13 @@@ browse: changeset: title: "Paket sprememb" - changeset: "Paket sprememb:" + changeset: "Paket sprememb: {{id}}" download: "Prenesi {{changeset_xml_link}} ali {{osmchange_xml_link}}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" changeset_details: - created_at: "Ustvarjen ob:" - closed_at: "Zaključen ob:" + created_at: "Ustvarjen:" + closed_at: "Zaključen:" belongs_to: "Pripada:" bounding_box: "Pravokotno področje:" no_bounding_box: "Ta paket nima določenega pravokotnega področja." @@@ -184,7 -184,7 +184,7 @@@ history_for_feature: "Zgodovina [[feature]]" details: "Podrobnosti" private_user: "anonimni uporabnik" - edited_by_user_at_timestamp: "Uredil [[user]] ob [[timestamp]]" + edited_by_user_at_timestamp: "Uredil [[user]] v [[timestamp]]" object_list: heading: "Seznam predmetov" back: "Prikaži seznam predmetov" @@@ -240,7 -240,7 +240,7 @@@ more: "več" changesets: id: "ID" - saved_at: "Shranjeno ob" + saved_at: "Shranjen" user: "Uporabnik" comment: "Komentar" area: "Področje" @@@ -305,15 -305,18 +305,18 @@@ heading: "Uporabnik {{user}} ne obstaja" body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili." diary_entry: - posted_by: "Objavil {{link_user}} ob {{created}} v jeziku {{language_link}}" + posted_by: "Objavil {{link_user}} v {{created}} v jeziku {{language_link}}" comment_link: Komentiraj ta vnos reply_link: Odgovori na ta vnos comment_count: - one: 1 komentar + zero: "brez komentarjev" + one: "{{count}} komentar" + two: "{{count}} komentarja" + few: "{{count}} komentarji" other: "{{count}} komentarjev" edit_link: Uredi ta vnos diary_comment: - comment_from: "Komentar uporabnika {{link_user}} ob {{comment_created_at}}" + comment_from: "Komentar uporabnika {{link_user}} v {{comment_created_at}}" export: start: area_to_export: "Področje za izvoz" @@@ -374,6 -377,8 +377,8 @@@ distance: zero: "manj kot 1 km" one: "približno {{count}} km" + two: "približno {{count}} km" + few: "približno {{count}} km" other: "približno {{count}} km" direction: south_west: "jugozahodno" @@@ -396,7 -401,12 +401,12 @@@ welcome_user_link_tooltip: Vaša uporabniška stran home: "domov" home_tooltip: Prikaži domači kraj - inbox: "prejeta pošta ({{count}})" + inbox: + zero: "Ni sporočil" + one: "{{count}} sporočilo" + two: "{{count}} sporočili" + few: "{{count}} sporočila" + other: "{{count}} sporočil" inbox_tooltip: zero: Niste prejeli novih spročil one: Prejeli ste {{count}} novo sporočilo @@@ -694,6 -704,7 +704,7 @@@ owner: "Lastnik:" description: "Opis:" tags: "Oznake:" + tags_help: "ločene z vejicami" save_button: "Shrani spremembe" no_such_user: title: "Ni tega uporabnika" @@@ -703,6 -714,7 +714,7 @@@ upload_gpx: "Pošljite datoteko GPX" description: "Opis" tags: "Oznake" + tags_help: "uporabite vejice" public: "Javna?" public_help: "Kaj to pomeni?" public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" @@@ -713,7 -725,11 +725,11 @@@ see_just_your_traces: "Seznam le mojih in pošiljanje novih sledi" see_all_traces: "Seznam vseh sledi" see_your_traces: "Seznam vseh mojih sledi" - traces_waiting: "V čakalni vrsti na uvoz čaka {{count}} sledi. Prosim, razmislite o tem, da bi počakali, da se te sledi uvozijo preden pošljete nove in s tem ne podaljšujete vrste drugim uporabnikom." + traces_waiting: + one: "V čakalni vrsti na uvoz čaka {{count}} sled. Prosim, razmislite o tem, da bi počakali, da se te sledi uvozijo preden pošljete nove in s tem ne podaljšujete vrste drugim uporabnikom." + two: "V čakalni vrsti na uvoz čakata {{count}} sledi. Prosim, razmislite o tem, da bi počakali, da se te sledi uvozijo preden pošljete nove in s tem ne podaljšujete vrste drugim uporabnikom." + few: "V čakalni vrsti na uvoz čakajo {{count}} sledi. Prosim, razmislite o tem, da bi počakali, da se te sledi uvozijo preden pošljete nove in s tem ne podaljšujete vrste drugim uporabnikom." + other: "V čakalni vrsti na uvoz čaka {{count}} sledi. Prosim, razmislite o tem, da bi počakali, da se te sledi uvozijo preden pošljete nove in s tem ne podaljšujete vrste drugim uporabnikom." trace_optionals: tags: "Oznake" view: @@@ -722,7 -738,7 +738,7 @@@ pending: "ČAKAJOČA" filename: "Datoteka:" download: "prenos" - uploaded: "Poslano ob:" + uploaded: "Poslano:" points: "Točk:" start_coordinates: "Začetna koordinata:" map: "zemljevid" @@@ -740,7 -756,11 +756,11 @@@ of: "od" trace: pending: "ČAKAJOČA" - count_points: "{{count}} točk" + count_points: + one: "{{count}} točka" + two: "{{count}} toči" + few: "{{count}} točke" + other: "{{count}} točk" ago: "{{time_in_words_ago}} nazaj" more: "več" trace_details: "Ogled podrobnnosti zemljevida" @@@ -828,7 -848,16 +848,16 @@@ settings_link_text: vaših nastavitvah your friends: Vaši prijatelji no friends: Niste še dodali nobenih prijateljev. - km away: "Oddaljen {{count}} km" + km away: + one: "Oddaljen {{count}} kilometer" + two: "Oddaljen {{count}} kilometra" + few: "Oddaljen {{count}} kilometre" + other: "Oddaljen {{count}} kilometrov" + m away: + one: "Oddaljen {{count}} meter" + two: "Oddaljen {{count}} metra" + few: "Oddaljen {{count}} metre" + other: "Oddaljen {{count}} metrov" nearby users: "Bližnji uporabniki: " no nearby users: "Ni uporabnikov, ki bi priznali, da kartirajo v vaši bližini." change your settings: uredite vaše nastavitve diff --combined config/locales/vi.yml index a0e25e1ab,48ba76166..41f84b66e --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@@ -83,7 -83,7 +83,7 @@@ vi browse: changeset: title: "Bộ thay đổi" - changeset: "Bộ thay đổi:" + changeset: "Bộ thay đổi: {{id}}" download: "Tải xuống {{changeset_xml_link}} hoặc {{osmchange_xml_link}}" changesetxml: "Bộ thay đổi XML" osmchangexml: "osmChange XML" @@@ -138,7 -138,7 +138,7 @@@ relation: "quan hệ" paging_nav: showing_page: "Đang hiện trang" - of: "của" + of: "trong" relation_details: members: "Thành viên:" part_of: "Trực thuộc:" @@@ -220,7 -220,7 +220,7 @@@ changeset: changeset_paging_nav: showing_page: "Đang hiện trang" - of: "của" + of: "trong" changeset: still_editing: "(đang mở)" anonymous: "Vô danh" @@@ -297,7 -297,7 +297,7 @@@ heading: "Người dùng {{user}} không tồn tại" body: "Rất tiếc, không có người dùng với tên {{user}}. Xin hãy kiểm tra chính tả, hoặc có lẽ bạn đã theo một liên kết sai." diary_entry: - posted_by: "Được đăng bởi {{link_user}} lúc {{created}} bằng {{language}}" + posted_by: "Được đăng bởi {{link_user}} lúc {{created}} bằng {{language_link}}" comment_link: "Bình luận về mục này" reply_link: "Trả lời mục này" comment_count: @@@ -588,8 -588,8 +588,8 @@@ js_1: "Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript." js_2: "OpenStreetMap sử dụng JavaScript cho chức năng bản đồ trơn." js_3: 'Bạn vẫn có thể sử dụng bản đồ tĩnh Tiles@Home nếu không bật lên JavaScript được.' - permalink: "Liên kết thường trực" - shortlink: "Liên kết ngắn gọn" + permalink: "Liên kết Thường trực" + shortlink: "Liên kết Ngắn gọn" license: notice: "{{project_name}} và những người đóng góp cho phép sử dụng theo giấy phép {{license_name}}." license_name: "Creative Commons Attribution-Share Alike 2.0" diff --combined config/routes.rb index 845c1277c,681149c2a..f26a15032 --- a/config/routes.rb +++ b/config/routes.rb @@@ -6,9 -6,9 +6,9 @@@ ActionController::Routing::Routes.draw map.connect "api/#{API_VERSION}/changeset/create", :controller => 'changeset', :action => 'create' map.connect "api/#{API_VERSION}/changeset/:id/upload", :controller => 'changeset', :action => 'upload', :id => /\d+/ - map.connect "api/#{API_VERSION}/changeset/:id/download", :controller => 'changeset', :action => 'download', :id => /\d+/ + map.changeset_download "api/#{API_VERSION}/changeset/:id/download", :controller => 'changeset', :action => 'download', :id => /\d+/ map.connect "api/#{API_VERSION}/changeset/:id/expand_bbox", :controller => 'changeset', :action => 'expand_bbox', :id => /\d+/ - map.connect "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'read', :id => /\d+/, :conditions => { :method => :get } + map.changeset_read "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'read', :id => /\d+/, :conditions => { :method => :get } map.connect "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'update', :id => /\d+/, :conditions => { :method => :put } map.connect "api/#{API_VERSION}/changeset/:id/close", :controller => 'changeset', :action => 'close', :id =>/\d+/ map.connect "api/#{API_VERSION}/changesets", :controller => 'changeset', :action => 'query' @@@ -81,16 -81,14 +81,16 @@@ map.connect '/browse/node/:id/history', :controller => 'browse', :action => 'node_history', :id => /\d+/ map.connect '/browse/relation/:id', :controller => 'browse', :action => 'relation', :id => /\d+/ map.connect '/browse/relation/:id/history', :controller => 'browse', :action => 'relation_history', :id => /\d+/ - map.connect '/browse/changeset/:id', :controller => 'browse', :action => 'changeset', :id => /\d+/ + map.changeset '/browse/changeset/:id', :controller => 'browse', :action => 'changeset', :id => /\d+/ map.connect '/browse/changesets', :controller => 'changeset', :action => 'list' + map.connect '/browse/changesets/feed', :controller => 'changeset', :action => 'list', :format => :atom # web site map.root :controller => 'site', :action => 'index' map.connect '/', :controller => 'site', :action => 'index' map.connect '/edit', :controller => 'site', :action => 'edit' - map.connect '/history', :controller => 'changeset', :action => 'list_bbox' + map.connect '/history', :controller => 'changeset', :action => 'list' + map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom map.connect '/export', :controller => 'site', :action => 'export' map.connect '/login', :controller => 'user', :action => 'login' map.connect '/logout', :controller => 'user', :action => 'logout' @@@ -148,8 -146,7 +148,8 @@@ # user pages map.connect '/user/:display_name', :controller => 'user', :action => 'view' - map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list_user' + map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list' + map.connect '/user/:display_name/edits/feed', :controller => 'changeset', :action => 'list', :format =>:atom map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend' map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend' map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list' @@@ -173,8 -170,8 +173,8 @@@ # geocoder map.connect '/geocoder/search', :controller => 'geocoder', :action => 'search' map.connect '/geocoder/search_latlon', :controller => 'geocoder', :action => 'search_latlon' - map.connect '/geocoder/search_us_postcode', :controller => 'geocoder', :action => 'search_uk_postcode' - map.connect '/geocoder/search_uk_postcode', :controller => 'geocoder', :action => 'search_us_postcode' + map.connect '/geocoder/search_us_postcode', :controller => 'geocoder', :action => 'search_us_postcode' + map.connect '/geocoder/search_uk_postcode', :controller => 'geocoder', :action => 'search_uk_postcode' map.connect '/geocoder/search_ca_postcode', :controller => 'geocoder', :action => 'search_ca_postcode' map.connect '/geocoder/search_osm_namefinder', :controller => 'geocoder', :action => 'search_osm_namefinder' map.connect '/geocoder/search_geonames', :controller => 'geocoder', :action => 'search_geonames'