From: Andy Allan Date: Sun, 21 Jan 2018 11:20:19 +0000 (+0000) Subject: Merge branch 'master' into moderation X-Git-Tag: live~3975^2~60 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ae4487921350e141efed42fdf7cd3fd70d72bc97?hp=3a386f185c954d71a9b5d0747d017f99c8ccb6ff Merge branch 'master' into moderation --- diff --git a/CONFIGURE.md b/CONFIGURE.md index 9b7bb90e8..3cbe31cb9 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -6,7 +6,7 @@ After [installing](INSTALL.md) this software, you may need to carry out some of Your installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract. -After installing but before creating any users or data, import an extract with [Osmosis](http://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task. +After installing but before creating any users or data, import an extract with [Osmosis](https://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task. ``` osmosis --read-pbf greater-london-latest.osm.pbf \ @@ -14,7 +14,7 @@ osmosis --read-pbf greater-london-latest.osm.pbf \ user="openstreetmap" password="" validateSchemaVersion="no" ``` -Loading an apidb database with Osmosis is about **twenty** times slower than loading the equivalent data with osm2pgsql into a rendering database. [``--log-progress``](http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--log-progress_.28--lp.29) may be desirable for status updates. +Loading an apidb database with Osmosis is about **twenty** times slower than loading the equivalent data with osm2pgsql into a rendering database. [``--log-progress``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--log-progress_.28--lp.29) may be desirable for status updates. To be able to edit the data you have loaded, you will need to use this [yet-to-be-written script](https://github.com/openstreetmap/openstreetmap-website/issues/282). @@ -94,7 +94,7 @@ Rails has its own log. To inspect the log, do this: tail -f log/development.log ``` -If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](http://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](http://wiki.openstreetmap.org/wiki/IRC) +If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](https://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](https://wiki.openstreetmap.org/wiki/IRC) ## Maintaining your installation @@ -110,7 +110,7 @@ bundle exec rake db:migrate ## Testing on the osm dev server -For example, after developing a patch for the rails_port, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of the rails_port on the dev server in ones user directory](http://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications). +For example, after developing a patch for the rails_port, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of the rails_port on the dev server in ones user directory](https://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications). # Contributing @@ -124,6 +124,6 @@ If you want to deploy The Rails Port for production use, you'll need to make a f * Passenger will, by design, use the Production environment and therefore the production database - make sure it contains the appropriate data and user accounts. * Your production database will also need the extensions and functions installed - see [INSTALL.md](INSTALL.md) * The included version of the map call is quite slow and eats a lot of memory. You should consider using [CGIMap](https://github.com/zerebubuth/openstreetmap-cgimap) instead. -* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](http://git.openstreetmap.org/gpx-import.git/). +* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](https://git.openstreetmap.org/gpx-import.git/). * Make sure you precompile the production assets: `RAILS_ENV=production rake assets:precompile` * Make sure the web server user as well as the rails user can read, write and create directories in `tmp/`. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 961377ec8..acb780746 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -* http://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials. +* https://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials. * http://rubyonrails.org/ - The homepage of Rails, also has links and tutorials ## Coding style @@ -94,6 +94,6 @@ If you have forked on GitHub then the best way to submit your patches is to push your changes back to GitHub and then send a "pull request" on GitHub. Otherwise you should either push your changes to a publicly visible git repository -and send the details to the [rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) +and send the details to the [rails-dev](https://lists.openstreetmap.org/listinfo/rails-dev) list or generate patches with `git format-patch` and send them to the -[rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) list. +[rails-dev](https://lists.openstreetmap.org/listinfo/rails-dev) list. diff --git a/Gemfile.lock b/Gemfile.lock index 50833ef44..9164f63d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM builder (3.2.3) canonical-rails (0.2.1) rails (>= 4.1, < 5.2) - capybara (2.15.4) + capybara (2.16.1) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) @@ -84,7 +84,7 @@ GEM tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.2) + crass (1.0.3) dalli (2.7.6) docile (1.1.5) dynamic_form (1.1.4) @@ -107,11 +107,11 @@ GEM hashie (3.5.6) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.9.0) + i18n (0.9.1) concurrent-ruby (~> 1.0) i18n-js (3.0.2) i18n (~> 0.6, >= 0.6.6) - image_optim (0.25.0) + image_optim (0.26.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) @@ -122,7 +122,7 @@ GEM rails sprockets image_size (1.5.0) - in_threads (1.4.0) + in_threads (1.5.0) jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -153,14 +153,14 @@ GEM loofah (2.1.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.0) - mini_mime (0.1.4) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.10.3) multi_json (1.12.2) @@ -219,8 +219,8 @@ GEM mime-types mimemagic (= 0.3.0) parallel (1.12.0) - parser (2.4.0.0) - ast (~> 2.2) + parser (2.4.0.2) + ast (~> 2.3) pg (0.21.0) poltergeist (1.16.0) capybara (~> 2.1) @@ -229,15 +229,15 @@ GEM powerpack (0.1.1) progress (3.4.0) psych (2.2.4) - public_suffix (3.0.0) - puma (3.10.0) + public_suffix (3.0.1) + puma (3.11.0) r2 (0.2.7) rack (2.0.3) rack-cors (1.0.2) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.7.0) + rack-test (0.8.2) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) rails (5.1.4) @@ -272,7 +272,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.2.1) + rake (12.3.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -303,13 +303,13 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - secure_headers (5.0.1) + secure_headers (5.0.3) useragent (>= 0.15.0) simplecov (0.14.1) docile (~> 1.1.0) @@ -331,7 +331,7 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) - tins (1.15.0) + tins (1.16.0) tzinfo (1.2.4) thread_safe (~> 0.1) uglifier (3.2.0) @@ -341,13 +341,13 @@ GEM validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - webmock (3.1.0) + webmock (3.1.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) xpath (2.1.0) nokogiri (~> 1.3) diff --git a/INSTALL.md b/INSTALL.md index d036673b1..7571cff50 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -69,7 +69,7 @@ For MacOSX, you will need XCode installed from the Mac App Store; OS X 10.7 (Lio Installing PostgreSQL: -* Install Postgres.app from http://postgresapp.com/ +* Install Postgres.app from https://postgresapp.com/ * Add PostgreSQL to your path, by editing your profile: `nano ~/.profile` @@ -80,9 +80,11 @@ and adding: Installing other dependencies: -* Install Homebrew from http://mxcl.github.io/homebrew/ +* Install Homebrew from https://brew.sh/ * Install the latest version of Ruby: `brew install ruby` * Install ImageMagick: `brew install imagemagick` +* Install libxml2: `brew install libxml2 --with-xml2-config` +* If you want to run the tests, you need `phantomjs` as well: `brew install phantomjs` * Install Bundler: `gem install bundler` Note that OS X does not have a /home directory by default, so if you are using the GPX functions, you will need to change the directories specified in config/application.yml. diff --git a/README.md b/README.md index 6b929fef9..9162a38de 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ [![Coverage Status](https://coveralls.io/repos/openstreetmap/openstreetmap-website/badge.svg?branch=master)](https://coveralls.io/r/openstreetmap/openstreetmap-website?branch=master) This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/) -application that powers the [OpenStreetMap](http://www.openstreetmap.org) website and API. +application that powers the [OpenStreetMap](https://www.openstreetmap.org) website and API. The software is also known as "openstreetmap-website". This repository consists of: * The web site, including user accounts, diary entries, user-to-user messaging -* The XML-based editing [API](http://wiki.openstreetmap.org/wiki/API_v0.6) -* The integrated versions of the [Potlatch](http://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](http://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](http://wiki.openstreetmap.org/wiki/ID) editors +* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6) +* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors * The Browse pages - a web front-end to the OpenStreetMap data * The GPX uploads, browsing and API. @@ -21,7 +21,7 @@ uses publicly-available services to help with development and testing. # License -This software is licensed under the [GNU General Public License 2.0](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt), +This software is licensed under the [GNU General Public License 2.0](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt), a copy of which can be found in the [LICENSE](LICENSE) file. # Installation @@ -36,7 +36,7 @@ We're always keen to have more developers! Pull requests are very welcome. * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues). * Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components * Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap) -* There is a [rails-dev@openstreetmap.org](http://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. +* There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. * IRC - there is the #osm-dev channel on irc.oftc.net. More details on contributing to the code are in the [CONTRIBUTING.md](CONTRIBUTING.md) file. diff --git a/VAGRANT.md b/VAGRANT.md index 3825ad988..9dea61861 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -8,7 +8,7 @@ sudo apt-get install vagrant Other Linux distributions should have similar installation instructions using `dnf`, `pacman`, or similar. -Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](http://www.vagrantup.com/downloads.html) for more information. +Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](https://www.vagrantup.com/downloads.html) for more information. Note than until there are suitable _xenial64_ [vagrant boxes](https://atlas.hashicorp.com/boxes/search?utf8=%E2%9C%93&sort=&provider=&q=xenial64) for other providers, the only virtualization provider supported is virtualbox. You might need to install it and specify `--provider virtualbox` when setting up your environment. diff --git a/Vendorfile b/Vendorfile index d66dd80d8..e57ab21fe 100644 --- a/Vendorfile +++ b/Vendorfile @@ -11,16 +11,16 @@ folder 'vendor/assets' do end folder 'leaflet' do - file 'leaflet.js', 'https://unpkg.com/leaflet@1.2.0/dist/leaflet-src.js' - file 'leaflet.css', 'https://unpkg.com/leaflet@1.2.0/dist/leaflet.css' + file 'leaflet.js', 'https://unpkg.com/leaflet@1.3.1/dist/leaflet-src.js' + file 'leaflet.css', 'https://unpkg.com/leaflet@1.3.1/dist/leaflet.css' [ 'layers.png', 'layers-2x.png', 'marker-icon.png', 'marker-icon-2x.png', 'marker-shadow.png' ].each do |image| - file "images/#{image}", "https://unpkg.com/leaflet@1.2.0/dist/images/#{image}" + file "images/#{image}", "https://unpkg.com/leaflet@1.3.1/dist/images/#{image}" end - from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.2.1' do + from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.0' do file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js' file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css' end diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 00e6a9d32..4ea643b26 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -241,9 +241,7 @@ $(document).ready(function () { function remoteEditHandler(bbox, object) { var loaded = false, - url = document.location.protocol === "https:" ? - "https://127.0.0.1:8112/load_and_zoom?" : - "http://127.0.0.1:8111/load_and_zoom?", + url = "http://127.0.0.1:8111/load_and_zoom?", query = { left: bbox.getWest() - 0.0001, top: bbox.getNorth() + 0.0001, diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index bb835f2fb..94f9bb1f0 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -76,7 +76,7 @@ OSM.Directions = function (map) { endpoint.awaitingGeocode = true; - $.getJSON(document.location.protocol + OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) { + $.getJSON(OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) { endpoint.awaitingGeocode = false; endpoint.hasGeocode = true; if (json.length === 0) { diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js index 2058a4daf..f05f1ab3d 100644 --- a/app/assets/javascripts/index/directions/graphhopper.js +++ b/app/assets/javascripts/index/directions/graphhopper.js @@ -21,7 +21,7 @@ function GraphHopperEngine(id, vehicleType) { // GraphHopper Directions API documentation // https://graphhopper.com/api/1/docs/routing/ return $.ajax({ - url: document.location.protocol + OSM.GRAPHHOPPER_URL, + url: OSM.GRAPHHOPPER_URL, data: { vehicle: vehicleType, locale: I18n.currentLocale(), diff --git a/app/assets/javascripts/index/directions/mapquest.js b/app/assets/javascripts/index/directions/mapquest.js index fcc47f103..739ce6539 100644 --- a/app/assets/javascripts/index/directions/mapquest.js +++ b/app/assets/javascripts/index/directions/mapquest.js @@ -1,6 +1,6 @@ // For docs, see: -// http://developer.mapquest.com/web/products/open/directions-service -// http://open.mapquestapi.com/directions/ +// https://developer.mapquest.com/web/products/open/directions-service +// https://open.mapquestapi.com/directions/ // https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153 function MapQuestEngine(id, routeType) { @@ -28,7 +28,7 @@ function MapQuestEngine(id, routeType) { return { id: id, - creditline: 'MapQuest ', + creditline: 'MapQuest ', draggable: false, getRoute: function (points, callback) { @@ -36,7 +36,7 @@ function MapQuestEngine(id, routeType) { var to = points[points.length - 1]; return $.ajax({ - url: document.location.protocol + OSM.MAPQUEST_DIRECTIONS_URL, + url: OSM.MAPQUEST_DIRECTIONS_URL, data: { key: OSM.MAPQUEST_KEY, from: from.lat + "," + from.lng, diff --git a/app/assets/javascripts/index/directions/mapzen.js b/app/assets/javascripts/index/directions/mapzen.js deleted file mode 100644 index 981fc3807..000000000 --- a/app/assets/javascripts/index/directions/mapzen.js +++ /dev/null @@ -1,109 +0,0 @@ -function MapzenEngine(id, costing) { - var MZ_INSTR_MAP = [ - 0, // kNone = 0; - 8, // kStart = 1; - 8, // kStartRight = 2; - 8, // kStartLeft = 3; - 14, // kDestination = 4; - 14, // kDestinationRight = 5; - 14, // kDestinationLeft = 6; - 0, // kBecomes = 7; - 0, // kContinue = 8; - 1, // kSlightRight = 9; - 2, // kRight = 10; - 3, // kSharpRight = 11; - 4, // kUturnRight = 12; - 4, // kUturnLeft = 13; - 7, // kSharpLeft = 14; - 6, // kLeft = 15; - 5, // kSlightLeft = 16; - 0, // kRampStraight = 17; - 24, // kRampRight = 18; - 25, // kRampLeft = 19; - 24, // kExitRight = 20; - 25, // kExitLeft = 21; - 0, // kStayStraight = 22; - 1, // kStayRight = 23; - 5, // kStayLeft = 24; - 20, // kMerge = 25; - 10, // kRoundaboutEnter = 26; - 11, // kRoundaboutExit = 27; - 17, // kFerryEnter = 28; - 0 // kFerryExit = 29; - ]; - - return { - id: id, - creditline: "Mapzen", - draggable: false, - - getRoute: function (points, callback) { - return $.ajax({ - url: document.location.protocol + OSM.MAPZEN_VALHALLA_URL, - data: { - api_key: OSM.MAPZEN_VALHALLA_KEY, - json: JSON.stringify({ - locations: points.map(function (p) { return { lat: p.lat, lon: p.lng }; }), - costing: costing, - directions_options: { - units: "km", - language: I18n.currentLocale() - } - }) - }, - dataType: "json", - success: function (data) { - var trip = data.trip; - - if (trip.status === 0) { - var line = []; - var steps = []; - var distance = 0; - var time = 0; - - trip.legs.forEach(function (leg) { - var legLine = L.PolylineUtil.decode(leg.shape, { - precision: 6 - }); - - line = line.concat(legLine); - - leg.maneuvers.forEach(function (manoeuvre) { - var point = legLine[manoeuvre.begin_shape_index]; - - steps.push([ - { lat: point[0], lng: point[1] }, - MZ_INSTR_MAP[manoeuvre.type], - manoeuvre.instruction, - manoeuvre.length * 1000, - [] - ]); - }); - - distance = distance + leg.summary.length; - time = time + leg.summary.time; - }); - - callback(false, { - line: line, - steps: steps, - distance: distance * 1000, - time: time - }); - } else { - callback(true); - } - }, - error: function () { - callback(true); - } - }); - } - }; -} - -if (OSM.MAPZEN_VALHALLA_KEY) { - OSM.Directions.addEngine(new MapzenEngine("mapzen_car", "auto"), true); - OSM.Directions.addEngine(new MapzenEngine("mapzen_bicycle", "bicycle"), true); - OSM.Directions.addEngine(new MapzenEngine("mapzen_foot", "pedestrian"), true); -} diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js index 69191e65a..e7c91e9dc 100644 --- a/app/assets/javascripts/index/directions/osrm.js +++ b/app/assets/javascripts/index/directions/osrm.js @@ -127,7 +127,7 @@ function OSRMEngine() { return p.lng + ',' + p.lat; }).join(';'); - var req_url = document.location.protocol + OSM.OSRM_URL + encoded_coords; + var req_url = OSM.OSRM_URL + encoded_coords; var onResponse = function (data) { if (data.code !== 'Ok') diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js index 1efac1b31..48e950b21 100644 --- a/app/assets/javascripts/index/export.js +++ b/app/assets/javascripts/index/export.js @@ -43,7 +43,7 @@ OSM.Export = function(map) { $("#maxlat").val(bounds.getNorth().toFixed(precision)); $("#export_overpass").attr("href", - "http://overpass-api.de/api/map?bbox=" + + "https://overpass-api.de/api/map?bbox=" + $("#minlon").val() + "," + $("#minlat").val() + "," + $("#maxlon").val() + "," + $("#maxlat").val()); } diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 7ac613d71..c01caba70 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,8 +1,7 @@ //= require jquery.simulate OSM.Query = function(map) { - var protocol = document.location.protocol === "https:" ? "https:" : "http:", - url = protocol + OSM.OVERPASS_URL, + var url = OSM.OVERPASS_URL, queryButton = $(".control-query .control-button"), uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid', 'KSJ2:curve_id', 'KSJ2:lat', 'KSJ2:lon', 'KSJ2:coordinate', 'KSJ2:filename', 'note:ja'], marker; diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index e8df0bd61..d952a7376 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -14,7 +14,7 @@ L.OSM.Map = L.Map.extend({ L.Map.prototype.initialize.call(this, id, options); var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'}); - var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'}); + var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'https://donate.openstreetmap.org'}); this.baseLayers = []; @@ -27,7 +27,7 @@ L.OSM.Map = L.Map.extend({ if (OSM.THUNDERFOREST_KEY) { this.baseLayers.push(new L.OSM.CycleMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", apikey: OSM.THUNDERFOREST_KEY, code: "C", keyid: "cyclemap", @@ -35,7 +35,7 @@ L.OSM.Map = L.Map.extend({ })); this.baseLayers.push(new L.OSM.TransportMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", apikey: OSM.THUNDERFOREST_KEY, code: "T", keyid: "transportmap", @@ -44,7 +44,7 @@ L.OSM.Map = L.Map.extend({ } this.baseLayers.push(new L.OSM.HOT({ - attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", + attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", code: "H", keyid: "hot", name: I18n.t("javascripts.map.base.hot") diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index ee1c6a115..971f80be3 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -14,16 +14,12 @@ OSM = { NOMINATIM_URL: <%= NOMINATIM_URL.to_json %>, GRAPHHOPPER_URL: <%= GRAPHHOPPER_URL.to_json %>, MAPQUEST_DIRECTIONS_URL: <%= MAPQUEST_DIRECTIONS_URL.to_json %>, - MAPZEN_VALHALLA_URL: <%= MAPZEN_VALHALLA_URL.to_json %>, OSRM_URL: <%= OSRM_URL.to_json %>, DEFAULT_LOCALE: <%= I18n.default_locale.to_json %>, <% if defined?(MAPQUEST_KEY) %> MAPQUEST_KEY: <%= MAPQUEST_KEY.to_json %>, <% end %> -<% if defined?(MAPZEN_VALHALLA_KEY) %> - MAPZEN_VALHALLA_KEY: <%= MAPZEN_VALHALLA_KEY.to_json %>, -<% end %> <% if defined?(THUNDERFOREST_KEY) %> THUNDERFOREST_KEY: <%= THUNDERFOREST_KEY.to_json %>, <% end %> diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index ec5b0b710..cb55f1ae0 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -163,24 +163,24 @@ small, aside { overflow: hidden; } -.icon.search { background-position: 0 0; } -.icon.donate { background-position: -20px 0; } -.icon.zoomin { background-position: -40px 0; } -.icon.zoomout { background-position: -60px 0; } -.icon.geolocate { background-position: -80px 0; } -.active .icon.geolocate { background-position: -80px -20px; } -.icon.layers { background-position: -100px 0; } -.icon.key { background-position: -120px 0; } -.icon.share { background-position: -140px 0; } -.icon.clipboard { background-position: -160px 0; } -.icon.link { background-position: -180px 0; } -.icon.close { background-position: -200px 0; } +.icon.search { /* no-r2 */ background-position: 0 0; } +.icon.donate { /* no-r2 */ background-position: -20px 0; } +.icon.zoomin { /* no-r2 */ background-position: -40px 0; } +.icon.zoomout { /* no-r2 */ background-position: -60px 0; } +.icon.geolocate { /* no-r2 */ background-position: -80px 0; } +.active .icon.geolocate { /* no-r2 */ background-position: -80px -20px; } +.icon.layers { /* no-r2 */ background-position: -100px 0; } +.icon.key { /* no-r2 */ background-position: -120px 0; } +.icon.share { /* no-r2 */ background-position: -140px 0; } +.icon.clipboard { /* no-r2 */ background-position: -160px 0; } +.icon.link { /* no-r2 */ background-position: -180px 0; } +.icon.close { /* no-r2 */ background-position: -200px 0; } .close-wrap:hover .icon.close, -.icon.close:hover { background-position: -200px -20px; } -.icon.check { background-position: -220px 0; } -.icon.note { background-position: -240px 0; } -.icon.note.grey { background-position: -240px -20px; } -.icon.query { background-position: -260px 0; } +.icon.close:hover { /* no-r2 */ background-position: -200px -20px; } +.icon.check { /* no-r2 */ background-position: -220px 0; } +.icon.note { /* no-r2 */ background-position: -240px 0; } +.icon.note.grey { /* no-r2 */ background-position: -240px -20px; } +.icon.query { /* no-r2 */ background-position: -260px 0; } /* Rules for links */ @@ -1209,9 +1209,8 @@ tr.turn:hover { } .warning { - margin: $lineheight/2 0; - padding: $lineheight/2; - font-size: 90%; + margin: 0 0 $lineheight/2 0; + padding: 0 $lineheight/2; } .note-comments li, .changeset-comments li { diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 5181280d9..4c24a1cec 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -375,7 +375,7 @@ class AmfController < ApplicationController else begin # revert - timestamp = Time.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") + timestamp = Time.zone.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless old_way.nil? if old_way.visible diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index db5d086ec..a51dad875 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -413,8 +413,8 @@ class ApplicationController < ActionController::Base def map_layout append_content_security_policy_directives( - :child_src => %w[127.0.0.1:8111 127.0.0.1:8112], - :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com], + :child_src => %w[127.0.0.1:8111], + :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org], :form_action => %w[render.openstreetmap.org], :script_src => %w[graphhopper.com open.mapquestapi.com], :img_src => %w[developer.mapquest.com] diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 898afae4a..8fbbe1362 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -216,6 +216,12 @@ class ChangesetController < ApplicationController changesets = conditions_closed(changesets, params["closed"]) changesets = conditions_ids(changesets, params["changesets"]) + # sort and limit the changesets + changesets = changesets.order("created_at DESC").limit(100) + + # preload users, tags and comments + changesets = changesets.preload(:user, :changeset_tags, :comments) + # create the results document results = OSM::API.new.get_xml_doc diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 6110baead..b9bde31ab 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -87,12 +87,12 @@ class GeocoderController < ApplicationController @results = [] # ask geocoder.ca (note - they have a per-day limit) - response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}") + response = fetch_xml("https://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}") # parse the response if response.get_elements("geodata/error").empty? - @results.push(:lat => response.get_text("geodata/latt").to_s, - :lon => response.get_text("geodata/longt").to_s, + @results.push(:lat => response.text("geodata/latt"), + :lon => response.text("geodata/longt"), :zoom => POSTCODE_ZOOM, :name => query.upcase) end @@ -120,7 +120,7 @@ class GeocoderController < ApplicationController exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude] # ask nominatim - response = fetch_xml("http:#{NOMINATIM_URL}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") + response = fetch_xml("#{NOMINATIM_URL}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") # extract the results from the response results = response.elements["searchresults"] @@ -138,12 +138,12 @@ class GeocoderController < ApplicationController # parse the response results.elements.each("place") do |place| - lat = place.attributes["lat"].to_s - lon = place.attributes["lon"].to_s - klass = place.attributes["class"].to_s - type = place.attributes["type"].to_s - name = place.attributes["display_name"].to_s - min_lat, max_lat, min_lon, max_lon = place.attributes["boundingbox"].to_s.split(",") + lat = place.attributes["lat"] + lon = place.attributes["lon"] + klass = place.attributes["class"] + type = place.attributes["type"] + name = place.attributes["display_name"] + min_lat, max_lat, min_lon, max_lon = place.attributes["boundingbox"].split(",") prefix_name = if type.empty? "" else @@ -190,10 +190,11 @@ class GeocoderController < ApplicationController # parse the response response.elements.each("geonames/geoname") do |geoname| - lat = geoname.get_text("lat").to_s - lon = geoname.get_text("lng").to_s - name = geoname.get_text("name").to_s - country = geoname.get_text("countryName").to_s + lat = geoname.text("lat") + lon = geoname.text("lng") + name = geoname.text("name") + country = geoname.text("countryName") + @results.push(:lat => lat, :lon => lon, :zoom => GEONAMES_ZOOM, :name => name, @@ -216,15 +217,15 @@ class GeocoderController < ApplicationController @results = [] # ask nominatim - response = fetch_xml("http:#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") + response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") # parse the response response.elements.each("reversegeocode/result") do |result| - lat = result.attributes["lat"].to_s - lon = result.attributes["lon"].to_s + lat = result.attributes["lat"] + lon = result.attributes["lon"] object_type = result.attributes["osm_type"] object_id = result.attributes["osm_id"] - description = result.get_text.to_s + description = result.text @results.push(:lat => lat, :lon => lon, :zoom => zoom, @@ -254,8 +255,9 @@ class GeocoderController < ApplicationController # parse the response response.elements.each("geonames/countrySubdivision") do |geoname| - name = geoname.get_text("adminName1").to_s - country = geoname.get_text("countryName").to_s + name = geoname.text("adminName1") + country = geoname.text("countryName") + @results.push(:lat => lat, :lon => lon, :zoom => GEONAMES_ZOOM, :name => name, diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index 536790dc5..5ef68216b 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -15,7 +15,12 @@ class UserRolesController < ApplicationController end def revoke - UserRole.where(:user_id => @this_user.id, :role => @role).delete_all + # checks that administrator role is not revoked from current user + if current_user == @this_user && @role == "administrator" + flash[:error] = t("user_role.filter.not_revoke_admin_current_user") + else + UserRole.where(:user_id => @this_user.id, :role => @role).delete_all + end redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name end diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index c4ce41b06..c2e974e93 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -115,9 +115,9 @@ module BrowseHelper lookup_us = lookup.tr(" ", "_") if page = WIKI_PAGES.dig(locale, type, lookup_us) - url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" + url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" elsif page = WIKI_PAGES.dig("en", type, lookup_us) - url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" + url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" end url @@ -158,7 +158,7 @@ module BrowseHelper end { - :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}", + :url => "https://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}", :title => value + section } end diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 37d26e0a7..2ec26ecee 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -238,7 +238,7 @@ class Changeset < ActiveRecord::Base bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete? - el1["comments_count"] = comments.count.to_s + el1["comments_count"] = comments.length.to_s if include_discussion el2 = XML::Node.new("discussion") diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 67b86417a..c95ffc322 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -68,7 +68,7 @@ class ClientApplication < ActiveRecord::Base end def oauth_server - @oauth_server ||= OAuth::Server.new("http://" + SERVER_URL) + @oauth_server ||= OAuth::Server.new("https://" + SERVER_URL) end def credentials diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index f35c3924a..afc3fc16c 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -77,6 +77,10 @@ + <% else %> +
+ <%= t('browse.changeset.still_open') %> +
<% end %> <% unless @ways.empty? %> diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb index 49922494e..f6518daf2 100644 --- a/app/views/browse/new_note.html.erb +++ b/app/views/browse/new_note.html.erb @@ -10,7 +10,7 @@
- +
diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder index a3b7a2240..86dd966cc 100644 --- a/app/views/changeset/list.atom.builder +++ b/app/views/changeset/list.atom.builder @@ -9,7 +9,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009, feed.logo image_url("mag_map-rss2.0.png") feed.rights :type => "xhtml" do |xhtml| - xhtml.a :href => "http://creativecommons.org/licenses/by-sa/2.0/" do |a| + xhtml.a :href => "https://creativecommons.org/licenses/by-sa/2.0/" do |a| a.img :src => image_url("cc_button.png"), :alt => "CC by-sa 2.0" end end diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 9bed9d274..534ff13c0 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -44,9 +44,9 @@

<%= t 'layouts.intro_text' %>

<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.ucl.ac.uk"), - :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), + :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"), :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>

<%= t('layouts.learn_more') %> diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb index 80dbc6079..f88d9316c 100644 --- a/app/views/oauth_clients/index.html.erb +++ b/app/views/oauth_clients/index.html.erb @@ -24,7 +24,7 @@ <% end %>

<%= t'oauth_clients.index.my_apps' %>

<% if @client_applications.empty? %> -

<%= raw(t('oauth_clients.index.no_apps', :oauth => "OAuth")) %>

+

<%= raw(t('oauth_clients.index.no_apps', :oauth => "OAuth")) %>

<% else %>

<%= t'oauth_clients.index.registered_apps' %>

<% @client_applications.each do |client|%> @@ -33,4 +33,4 @@ <% end %> <% end %> <% end %> -

<%= link_to t('oauth_clients.index.register_new'), :action => :new %>

\ No newline at end of file +

<%= link_to t('oauth_clients.index.register_new'), :action => :new %>

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index ebc1877f3..0c8075c6e 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -33,9 +33,9 @@

<%= t "about_page.partners_title" %>

<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.ucl.ac.uk"), - :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), - :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), + :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"), :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index 128db5992..bf5376fb5 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -38,19 +38,16 @@
-
<%= t'export.start.too_large.overpass.title' %>
+
<%= t'export.start.too_large.overpass.title' %>
<%= t'export.start.too_large.overpass.description' %>
-
<%= t'export.start.too_large.planet.title' %>
+
<%= t'export.start.too_large.planet.title' %>
<%= t'export.start.too_large.planet.description' %>
-
<%= t'export.start.too_large.geofabrik.title' %>
+
<%= t'export.start.too_large.geofabrik.title' %>
<%= t'export.start.too_large.geofabrik.description' %>
-
<%= t'export.start.too_large.metro.title' %>
-
<%= t'export.start.too_large.metro.description' %>
- -
<%= t'export.start.too_large.other.title' %>
+
<%= t'export.start.too_large.other.title' %>
<%= t'export.start.too_large.other.description' %>
<% end %> diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 3d8cb22f7..13fad8840 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -46,8 +46,8 @@

<%= raw t 'user.terms.guidance', - :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', - :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %> + :summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', + :translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>

diff --git a/config/example.application.yml b/config/example.application.yml index 5c60ccd16..1e78084cc 100644 --- a/config/example.application.yml +++ b/config/example.application.yml @@ -74,7 +74,7 @@ defaults: &defaults # Enable legacy OAuth 1.0 support oauth_10_support: true # URL of Nominatim instance to use for geocoding - nominatim_url: "//nominatim.openstreetmap.org/" + nominatim_url: "https://nominatim.openstreetmap.org/" # Default editor default_editor: "id" # OAuth consumer key for Potlatch 2 @@ -97,12 +97,11 @@ defaults: &defaults # Blacklist here - ".*\\.here\\.com[/:].*" # URL of Overpass instance to use for feature queries - overpass_url: "//overpass-api.de/api/interpreter" + overpass_url: "https://overpass-api.de/api/interpreter" # Routing endpoints - graphhopper_url: "//graphhopper.com/api/1/route" - mapquest_directions_url: "//open.mapquestapi.com/directions/v2/route" - mapzen_valhalla_url: "//valhalla.mapzen.com/route" - osrm_url: "//router.project-osrm.org/route/v1/driving/" + graphhopper_url: "https://graphhopper.com/api/1/route" + mapquest_directions_url: "https://open.mapquestapi.com/directions/v2/route" + osrm_url: "https://router.project-osrm.org/route/v1/driving/" # External authentication credentials #google_auth_id: "" #google_auth_secret: "" @@ -117,8 +116,6 @@ defaults: &defaults #wikipedia_auth_secret: "" # MapQuest authentication details #mapquest_key: "" - # Mapzen authentication details - #mapzen_valhalla_key: "" # Thunderforest authentication details #thunderforest_key: "" # Key for generating TOTP tokens diff --git a/config/image_optim.yml b/config/image_optim.yml index 29ee6d838..9100cd7f5 100644 --- a/config/image_optim.yml +++ b/config/image_optim.yml @@ -1,12 +1,4 @@ skip_missing_workers: true pngout: false -pngcrush: false -advpng: false -optipng: false -pngquant: false -jhead: false -jpegoptim: false -gifsicle: false -jpegtran: false svgo: disable_plugins: ["cleanupIDs", "removeUnknownsAndDefaults"] diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index 320c1db2c..ee0b0d98f 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -25,5 +25,8 @@ Rails.configuration.middleware.use OpenStreetMap::Cors do origins "*" resource "/oauth/*", :headers => :any, :methods => [:get, :post] resource "/api/*", :headers => :any, :methods => [:get, :post, :put, :delete] + resource "/diary/rss", :headers => :any, :methods => [:get] + resource "/diary/*/rss", :headers => :any, :methods => [:get] + resource "/user/*/diary/rss", :headers => :any, :methods => [:get] end end diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index 3b4f06a2e..421ca2bf9 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -47,6 +47,25 @@ module OpenStreetMap end end end + + module OAuthFilter + def oauth1_verify(request, options = {}, &block) + signature = OAuth::Signature.build(request, options, &block) + return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp) + value = signature.verify + if request.ssl? && !value + http_request = request.dup + http_request.define_singleton_method(:scheme) { "http" } + http_request.define_singleton_method(:port) { 80 } + signature = OAuth::Signature.build(http_request, options, &block) + value = signature.verify + end + value + rescue OAuth::Signature::UnknownSignatureMethod + false + end + end end OAuth::Controllers::ProviderController.prepend(OpenStreetMap::ProviderController) +OAuth::Rack::OAuthFilter.prepend(OpenStreetMap::OAuthFilter) diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb index f30a4b86c..b0b45aa13 100644 --- a/config/initializers/secure_headers.rb +++ b/config/initializers/secure_headers.rb @@ -27,7 +27,7 @@ cookie_policy = { } SecureHeaders::Configuration.default do |config| - config.hsts = "max-age=0" + config.hsts = SecureHeaders::OPT_OUT config.csp = SecureHeaders::OPT_OUT config.csp_report_only = csp_policy config.cookies = cookie_policy diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 8a0fd8f03..a9c735d62 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -2,8 +2,6 @@ if defined?(MEMCACHE_SERVERS) Rails.application.config.session_store :mem_cache_store, :memcache_server => MEMCACHE_SERVERS, :namespace => "rails:session", :key => "_osm_session" -elsif Rails.application.config.cache_store != :null_store - Rails.application.config.session_store :cache_store, :key => "_osm_session" else - Rails.application.config.session_store :cookie_store, :key => "_osm_session" + Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new end diff --git a/config/locales/af.yml b/config/locales/af.yml index c0989fcfc..c5ab546a3 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -1599,8 +1599,6 @@ af: mapquest_bicycle: Fiets (MapQuest) mapquest_car: Kar (MapQuest) osrm_car: Kar (OSRM) - mapzen_bicycle: Fiets (Mapzen) - mapzen_car: Motor (Mapzen) time: Tyd query: node: Knooppunt diff --git a/config/locales/ar.yml b/config/locales/ar.yml index a0dfc880c..0a01084cc 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1057,6 +1057,7 @@ ar: beginners_guide: url: http://wiki.openstreetmap.org/wiki/Ar:Beginners%27_guide title: دليل المبتدئين + description: دليل من المجتمع للمبتدئين. help: url: https://help.openstreetmap.org/ title: help.openstreetmap.org @@ -1623,6 +1624,9 @@ ar: github: title: تسجيل الدخول بجيثب alt: تسجيل الدخول باستخدام حساب جيثب + wikipedia: + title: تسجيل الدخول عبر ويكيبيديا + alt: سجل الدخول باستخدام حساب ويكيبيديا yahoo: title: تسجيل الدخول بياهو alt: تسجيل الدخول ب Yahoo OpenID @@ -2130,9 +2134,6 @@ ar: mapquest_car: سيارة (MapQuest) mapquest_foot: قدم (MapQuest) osrm_car: سيارة (OSRM) - mapzen_bicycle: دراجة (Mapzen) - mapzen_car: سيارة (Mapzen) - mapzen_foot: قدم (Mapzen) directions: الاتجاهات distance: المسافات errors: diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 24e334d08..e6fdc0037 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -129,6 +129,8 @@ ast: title_comment: Conxuntu de cambeos %{id} - %{comment} join_discussion: Anicia sesión pa xunite al alderique discussion: Alderique + still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en + zarrando'l conxuntu de cambios. node: title: 'Nuedu: %{name}' history_title: 'Historial del nuedu: %{name}' @@ -1008,9 +1010,8 @@ ast: title: Exemplu de reconocimientu more_title_html: Pa saber más more_1_html: |- - Llei más tocante a cómo utilizar los nuesos datos, y cómo acreditanos, na páxina de la Llicencia OSMF y nes Entrugues y rempuestes llegales (n'inglés) de la comunidá. + Llei más tocante a cómo utilizar los nuesos datos, y cómo danos créditu, na páxina de Llicencia de la OSMF. more_2_html: |- Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros. Llei la nuesa Política d'usu de la API (n'inglés), @@ -1197,11 +1198,12 @@ ast: qu'OSM ye precisu y ta anováu. community_driven_title: Dirixíu pola comunidá community_driven_html: |- - La comunidá d'OpenStreetMap ye diversa, apasionada, y medra caldía. + La comunidá d'OpenStreetMap ye variada, apasionada, y medra caldía. Ente los collaboradores hai cartógrafos entusiastes, profesionales de GIS, inxenieros que xestionen los sirvidores d'OSM, voluntarios que faen mapes de les zones afeutaes por desastres, y muncho más. - Pa saber más tocante a la comunidá, ver los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM. + Pa saber más tocante a la comunidá, ver el + Blog d'OpenStreetMap, los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM. open_data_title: Datos abiertos open_data_html: |- OpenStreetMap son datos abiertos: tienes la llibertá d'usalos pa cualquier @@ -1441,7 +1443,7 @@ ast: get_directions_title: Alcuentra indicaciones ente dos puntos from: Dende to: A - where_am_i: ¿Ú toi? + where_am_i: ¿Ú esto? where_am_i_title: Describi el to allugamientu actual usando el motor de gueta submit_text: Dir key: @@ -2109,6 +2111,8 @@ ast: not_a_role: La cadena «%{role}» nun ye un rol válidu. already_has_role: L'usuariu yá tien el rol %{role}. doesnt_have_role: L'usuariu nun tien el rol %{role}. + not_revoke_admin_current_user: Nun pudo quitase'l rol d'alministrador al usuariu + actual. grant: title: Confirmar dar rol heading: Confirmar dar rol @@ -2329,8 +2333,10 @@ ast: new: intro: ¿Alcontrasti un error o falta daqué? Informa a otros mapeadores pa que podamos igualo. Mueve'l marcador a la posición correuta y escribi una - nota pa esplicar el problema. (Por favor, nun escribas información personal - o información de mapes con drechos d'autor o de llistes de teléfonos). + nota pa esplicar el problema. + advice: La nota ye pública y puede usase p'anovar el mapa, de mou que nun + escribas información personal, o información de mapes con drechos d'autor + o llistes de teléfonos). add: Amestar nota show: anonymous_warning: Esta nota incluye comentarios d'usuarios anónimos que tendríen @@ -2351,9 +2357,6 @@ ast: mapquest_car: Coche (MapQuest) mapquest_foot: A pie (MapQuest) osrm_car: En coche (OSRM) - mapzen_bicycle: En bicicleta (Mapzen) - mapzen_car: En coche (Mapzen) - mapzen_foot: A pie (Mapzen) descend: Descender directions: Indicaciones distance: Distancia diff --git a/config/locales/ba.yml b/config/locales/ba.yml new file mode 100644 index 000000000..562dbf745 --- /dev/null +++ b/config/locales/ba.yml @@ -0,0 +1,689 @@ +# Messages for Bashkir (башҡортса) +# Exported from translatewiki.net +# Export driver: phpyaml +# Author: AiseluRB +# Author: Lizalizaufa +# Author: Roustammr +# Author: Sagan +# Author: Visem +# Author: Азат Хәлилов +# Author: Айсар +# Author: З. ӘЙЛЕ +# Author: Ләйсән +# Author: Рустам Нурыев +# Author: Янмурза Баки +--- +ba: + time: + formats: + friendly: '%e %B %Y cәғәт %H:%M' + activerecord: + models: + acl: Инеүҙе сикләү исемлеге + changeset: Төҙәтеүҙәр пакеты + changeset_tag: Төҙәтеүҙәр пакетының тегы + country: Ил + diary_comment: Көндәлеккә комментарий + diary_entry: Көндәлектәге яҙыу + friend: Рәхим итегеҙ! + language: Тел + message: Хәбәр + node: Төйөн + node_tag: Төйөн тегы + notifier: Белдереүсе + old_node: Иҫке нөктә + old_node_tag: Нөктәнең иҫке тегы + old_relation: Иҫке сағыштырма + old_relation_member: Мөнәсәбәттәрҙең элекке ҡатнашыусыһы + old_relation_tag: Иҫкергән Эске Тег + old_way: Иҫке юл + old_way_node: Юлдың иҫке нөктәһе + old_way_tag: Һыҙаттың элекке тегы + relation: Мөнәсәбәт + relation_member: Мөнәсәбәттәрҙә ҡатнашыусы + relation_tag: Мөнәсәбәт тегы + session: Сессия + trace: Маршрут + tracepoint: Маршрут нөктәһе + tracetag: Маршрут тегы + user: Ҡулланыусы + user_preference: Ҡулланыусы көйләүҙәре + user_token: Ҡулланыусы маркеры + way: Юл + way_node: Һыҙат нөктәһе + way_tag: Һыҙат тегы + attributes: + diary_comment: + body: Текст + diary_entry: + user: Ҡулланыусы + title: Тема + latitude: Киңлек + longitude: Оҙонлоҡ + language: Тел + friend: + user: Ҡулланыусы + friend: Дуҫ + trace: + user: Ҡатнашыусы + visible: Күренеш + name: Атама + size: Күләм + latitude: Киңлек + longitude: Оҙонлоҡ + public: Дөйөм + description: Тасуирлау + message: + sender: Ебәреүсе + title: Тема + body: Текст + recipient: Алыусы + user: + email: Электрон почта адресы + active: Әүҙем + display_name: Сағылдырылған исем + description: Тасуирлау + languages: Телдәр + pass_crypt: Серһүҙ + editor: + default: Һайланмаған (ҡуйылған %{name}) + potlatch: + name: Potlatch 1 + description: Potlatch 1 (браузерҙағы мөхәррир) + id: + name: iD + description: iD (браузерҙағы мөхәррир) + potlatch2: + name: Potlatch 2 + description: Potlatch 2 (браузерҙағы мөхәррир) + remote: + name: Ситтән тороп идара итеү + description: Ситтән тороп идара итеү (JOSM йәки Merkaartor) + browse: + created: Булдырылған + closed: Ябыҡ + created_html: Булдырылған %{time} кирегә + closed_html: Ябылған %{time} кирегә + created_by_html: Төҙәтелгән %{time} кирегә ҡулланыусы + тарафынан %{user} + deleted_by_html: Ябылған %{time} кирегәҡулланыусы + тарафынан%{user} + edited_by_html: Төҙәтелгән %{time} кирегә ҡулланыусы + тарафынан %{user} + closed_by_html: Ябылған %{time} кирегәҡулланыусы + тарафынан%{user} + version: Версия + in_changeset: Төҙәтеүҙәр пакеты + anonymous: Аноним + no_comment: (комментарий юҡ) + part_of: Ҡатнаша + download_xml: ' XML-ды күсереү' + view_history: Тарихты ҡарау + view_details: Ентекләберәк + location: 'Географик урын:' + changeset: + title: 'Төҙәтеүҙәр пакеты: %{id}' + belongs_to: Автор + node: Нөктәләр (%{count}) + node_paginated: Нөктәләр (%{x}-%{y} из %{count}) + way: Һыҙыҡтар (%{count}) + way_paginated: Юлдар (%{x}-%{y} %{графа}һынан) + relation: Мөнәсәбәттәр (%{count}) + relation_paginated: Бәйләнештәр (%{x}-%{y} %{графа}нан) + comment: Комментарийҙар (%{count}) + hidden_commented_by: ' %{user} %{when}тан йәшерен + комментарий, кирегә' + commented_by: Ҡулланыусы комментарийы %{user} %{when} + кирегә + changesetxml: Төҙәтеүҙәр пакетының XML-ы + osmchangexml: osmChange XML + feed: + title: 'Төҙәтеүҙәр пакеты: %{id}' + title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment} + join_discussion: Фекер алышыуға ҡушылыу өсөн системаға инегеҙ + discussion: Фекер алышыу + node: + title: 'Нөктә: %{name}' + history_title: 'Нөктә тарихы: %{name}' + way: + title: 'Һыҙат: %{name}' + history_title: 'Һыҙат тарихы: %{name}' + nodes: Нөктәләр + also_part_of: + one: һыҙатта бар %{related_ways} + other: һыҙаттарҙа бар %{related_ways} + relation: + title: 'Мөнәсәбәт: %{name}' + history_title: 'Мөнәсәбәт тарихы: %{name}' + members: Ҡатнашыусылар + relation_member: + entry_role: '%{type} %{name} ролендә %{role}' + type: + node: Нөктә + way: Һыҙат + relation: Мөнәсәбәт + containing_relation: + entry: Мөнәсәбәт %{relation_name} + entry_role: Мөнәсәбәт %{relation_name} (ролендә %{relation_role}) + not_found: + sorry: 'Үкенескә ҡаршы, %{type} #%{id} табылманы.' + type: + node: Нөктә + way: Һыҙат + relation: Мөнәсәбәт + changeset: Төҙәтеүҙәр пакеты + note: Иҫкәрмә + timeout: + sorry: Ғәфү итегеҙ, %{id}-тағы %{type} өсөн мәғлүмәттәр күсереү өсөн бик оҙон. + type: + node: Нөктә + way: Һыҙат + relation: Мөнәсәбәт + changeset: Төҙәтеүҙәр пакеты + note: Иҫкәрмә + redacted: + redaction: ' %{id} редакцияһы' + message_html: Был объекттың версияһы %{version} %{type}-нан алынған һәм күрһәтелә + алмай. Өҫтәмә мәғлүмәт өсөн %{redaction_link} ҡарағыҙ. + type: + node: Нөктә + way: Һыҙат + relation: Мөнәсәбәт + start_rjs: + feature_warning: Объекттарҙың %{num_features}-ын күсереп алыу мотлаҡ, был брауҙерығыҙҙы + яйлатыуы мөмкин. Ошо мәғлүмәттәрҙе ысынлап та ҡарарға теләйһегеҙме? + load_data: Мәғлүмәттәрҙе күсерергә + tag_details: + tags: Тегтар + wiki_link: + key: ' %{key} тегы битен һүрәтләүсе вики бите' + tag: ' %{key}=%{value} тегы битен һүрәтләүсе вики бите' + wikidata_link: Викимәғлүмәттәрҙәге %{page} элементы + wikipedia_link: ' Википедиялағы %{page} мәҡәләһе' + telephone_link: Шылтыратырға %{phone_number} + note: + title: ' %{id} искәрмәһе' + new_note: Яңы мәҡәлә + description: Тасуирлама + open_title: 'Эшкәртелмәгән мәҡәлә #%{note_name}' + closed_title: 'Эшкәртелгән мәҡәләа #%{note_name}' + hidden_title: 'Йәшерелгән яҙма #%{note_name}' + open_by: Ҡулланыусы тарафынан булдырылған %{user} %{when} + кирегә + open_by_anonymous: Аноним тарафынан булдырылған %{when} + кирегә + commented_by: Ҡулланыусы комментарийы %{user} %{when} + кирегә + commented_by_anonymous: Аноним комментарийы %{when} + кирегә + closed_by: Ҡулланыусы тарафынан эшкәртелгән %{user} %{when} + кирегә + closed_by_anonymous: Аноним тарафынан рөхсәт ителгән %{when} + кирегә + reopened_by: Ҡулланыусы тарафынан ҡабаттан асылған %{user} %{when} + кирегә + reopened_by_anonymous: Аноним тарафынан ҡабаттан асылған %{when} + кирегә + hidden_by: Йәшерелгән %{user} %{when} кирегә + query: + title: Объекттар тураһында мәғлүмәт + introduction: Яҡындағы объекттарҙы табыу өсөн картаға баҫығыҙ + nearby: Яҡындағы объекттар + enclosing: Урыны + changeset: + changeset_paging_nav: + showing_page: ' %{page} бите' + next: Киләһе » + previous: Алдағы + changeset: + anonymous: Аноним + no_edits: (төҙәтеүҙәр юҡ) + view_changeset_details: Төҙәтеүҙәр пакетының тәфсирен ҡарап сығырға + changesets: + id: ID + saved_at: Тамамланған + user: Ҡулланыусы + comment: Комментарий + area: Өлкә + list: + title: Төҙәтеүҙәр пакеты + title_user: ' %{user} ҡулланыусыһының төҙәтеүҙәр пакеты' + title_friend: Дуҫтарығыҙҙың төҙәтеүҙәре пакеты + title_nearby: Эргәләге ҡатнашыусыларҙың төҙәтеүҙәре пакеты + empty: Төҙәтеүҙәр пакеты табылманы + empty_area: Был өлкәлә төҙәтеүҙәр пакеты юҡ + empty_user: Был ҡулланыусының төҙәтеүҙәре пакеы юҡ + no_more: Башҡаса бер ниндәй ҙә төҙәтеүҙәр пакеты табылманы + no_more_area: Был өлкәлә башҡа төҙәтеүҙәр пакеты юҡ + no_more_user: Был ҡулланыусының башҡа төҙәтеүҙәре пакеы юҡ + load_more: Тағы ла күсерергә + timeout: + sorry: Үкенескә күрә, һеҙ һораған төҙәтеүҙәр пакеты исемлеге күсереү өсөн бик + оҙон + rss: + title_all: OpenStreetMap төҙәтеүҙәр пакеты буйынса фекерләшеү + title_particular: ' OpenStreetMap #%{changeset_id} төҙәтеүҙәр пакеты буйынса + фекерләшеү' + commented_at_html: Яңыртылған%{}элек + commented_at_by_html: Яңыртылған%{}элек %{ҡулланыусы}тарафынан + full: Бөтөн фекерләшеү + diary_entry: + new: + title: Яңы көндәлеккә инеү + publish_button: Баҫтырырға + list: + title: Көндәлектәр + title_friends: Дуҫтарың көндәлектәре + title_nearby: Йәнәш ҡатнашыусылар көндәлеге + user_title: '%{ҡулланыусы} көндәлеге' + in_language_title: Көндәлектәге яҙмалар %{телдә} + new_title: Көндәлегеңә яңы яҙма яҙ + no_entries: Көндәлектә яңы яҙма юҡ + recent_entries: Һуңғы яҙмалар + older_entries: Иҫкерәк яҙмалар + newer_entries: Яңыраҡ яҙмалар + edit: + title: Яҙманы мөхәррирләү + body: Нигеҙ текст + language: 'Тел:' + latitude: Географик киңлек + longitude: Географик оҙонлоҡ + use_map_link: картаны ҡуллан + save_button: Һаҡларға + marker_text: Көндәлек яҙыу урыны + view: + title: '%{ҡулланыусы}ның көндәлеге|%{титул}' + user_title: '%{ҡулланыусы}ның көндәлеге' + leave_a_comment: Фекер ҡалдыр + login_to_leave_a_comment: Фекер яҙыу өсөн %{login_link} + no_such_entry: + title: Бындай көндәлек яҙыуы юҡ + heading: '%{id} шәхси яҙыуына инеп булмай' + body: Ҡыҙғанысҡа ҡаршы, %{id}шәхси яҙыуы йәки фекере табылманы. Дөрөҫ яҙылышын + тикшер. Яңылыш ссылкаға күскәнһең, ахыры. + diary_entry: + posted_by: Ебәрҙем%{link_user}%{created}, тел:%{language_link} + comment_link: Фекереңде яҙ + reply_link: Инеүеңде раҫла + comment_count: + other: нуль=фекерҙәр юҡ + edit_link: Был яҙманы үҙгәрт + hide_link: Был яҙманы йәшер + diary_comment: + comment_from: '%{link_user}тарафынан%{comment_created_at}көндө ҡаралған' + hide_link: Был фекерҙе йәшереү + feed: + user: + title: '%{user}өсөн OpenStreetMap көндәлеге яҙмаһы' + description: '%{user}өсөн OpenStreetMap көндәлек яҙмаһының һуңғыһы' + language: + title: '%{language_name} OpenStreetMap көндәлек яҙмаһы' + description: OpenStreetMap ҡулланыусыларының %{language_name}тағы һуңғы яҙмалары + all: + title: OpenStreetMap көндәлек яҙмаһы + description: OpenStreetMap ҡулланысыларының һуңғы көндәлек яҙмалары + comments: + has_commented_on: '%{display_name} әле генә көндәлектең ошо яҙмаһына фекер + яҙҙы' + post: Йәшереү + when: ҡасан + ago: '%{ago}элек' + newer_comments: Яңыраҡ фекерҙәр + older_comments: Иҫкерәк фекерҙәр + export: + title: Сығарырға + start: + area_to_export: Сығарыу яланы + manually_select: Башҡа өлкәне ҡулдан һайларға + format_to_export: Сығарыу форматы + osm_xml_data: Биремдең OpenStreetMap XML форматы + map_image: Карта һүрәте (стандарт ҡатламды күрһәтә) + embeddable_html: Ҡуйылған HTML + licence: Лицензия + too_large: + planet: + title: OSM планетаһы + max: макс. + image_size: Һүрәт ҙурлығы + add_marker: Картаға билдә ҡуйыу + latitude: 'Киңлек:' + longitude: 'Оҙонлоҡ:' + paste_html: Сайтҡа индереп ҡуйыу өсөн HTML-код + geocoder: + search: + title: + latlon: |2- + + эсендәге һөҙөмтәләр + uk_postcode: NPEMap / FreeThe Postcodeһөҙөмтәләре + ca_postcode: NPEMap / FreeThe Postcodeалынған + һөҙөмтәләр + osm_nominatim: OpenStreetMap + Nominatimнан сыҡҡан һөҙөмтәләр + geonames: GeoNamesнан сыҡҡан һөҙөмтәләр + osm_nominatim_reverse: OpenStreetMap + Nominatimнан һөҙөмтәләр + geonames_reverse: GeoNamesнан сыҡҡан + һөҙөмтәләр + search_osm_nominatim: + prefix: + aerialway: + cable_car: Канат юлы + chair_lift: Креслолы канат күтәргесе + drag_lift: Якорлы (бугеллы) күтәргес + gondola: Канат юлы + station: Канат күтәргесе станцияһы + aeroway: + aerodrome: Аэродром + apron: Перрон + gate: Ҡапҡа (аэропорт) + helipad: Вертолет майҙансығы + runway: Осоу-ултырыу юлы + taxiway: Рулләү юлы + terminal: Терминал + amenity: + animal_shelter: Хайуандар приюты + arts_centre: Сәнғәт йорто + atm: Банкомат + bank: Банк + bar: Бар + bbq: Барбекю + bench: Эскәмйә + bicycle_parking: Велопарковка + bicycle_rental: Велосипед прокаты + biergarten: Асыҡ һауалағы һырахана + boat_rental: Прокатҡа кәмәләр + brothel: Фәхешхана + bureau_de_change: Валюта алмаштырыу + bus_station: Автобус станцияһы + cafe: Кафе + car_rental: Автомобиль арендалау + car_sharing: Автомобилдәрҙе аралаш ҡулланыу + car_wash: Авто-йыуыу + casino: Казино + charging_station: Автомобилдәрҙе зарядлау станцияһы + childcare: Бала ҡарау хеҙмәте + cinema: Кинотеатр + clinic: Поликлиника + clock: Сәғәт + college: Колледж + community_centre: Йәмәғәти үҙәк + courthouse: Суд бинаһы + crematorium: Крематорий + dentist: Стоматология + doctors: Табибтар + dormitory: Дөйөм ятаҡ + drinking_water: Эсәр һыу + driving_school: Автошкола + embassy: Илселек + emergency_phone: Ашығыс хеҙмәт телефоны + fast_food: Фаст-фуд + ferry_terminal: Паром станцияһы + fire_hydrant: Янғын һүндереү гидранты + fire_station: Янғын һүндереү һағы + food_court: Ресторан ихатаһы + fountain: Фонтан + fuel: Заправка + gambling: Уйын йорто + grave_yard: Зыярат + gym: Фитнес-үҙәк/Тренажер залы + health_centre: Һауыҡтырыу үҙәге + hospital: Госпиталь + hunting_stand: Һунарсы вышкаһы + ice_cream: Туңдырма + kindergarten: Балалар баҡсаһы + market: Магазин + marketplace: Баҙар + motorcycle_parking: Мотоцикл парковкаһы + nightclub: Төнгө клуб + nursery: Пансионат + nursing_home: Ҡарттар йорто + parking: Туҡталҡа + parking_entrance: Туҡталҡаға инеү + pharmacy: Дарыухана + place_of_worship: Ғибәҙәт ҡылыу урыны + police: Полиция + post_box: Почта йәшниге + post_office: Почта бүлексәһе + preschool: Мәктәпкәсә уҡытыу учреждениеһы + prison: Төрмә + pub: Һырахана + public_building: Йәмғиәти бина + reception_area: Ҡабул итеү бүлмәһе + recycling: Киренән эшкәртеү урыны + restaurant: Ресторан + retirement_home: Ҡарттар йорто + sauna: Сауна + school: Мәктәп + shelter: Йәшенеү урыны + shower: Душ + social_centre: Йәмғиәти үҙәк + social_club: Берләшмә + social_facility: Йәмәғәт ойошмаһы + studio: Студия + swimming_pool: Бассейн + taxi: Такси + telephone: Телефон + theatre: Театр + toilets: Бәҙрәф + townhall: Ҡала администрацияһы + university: Университет + vending_machine: Сауҙа автоматы + veterinary: Ветеринар клиника + village_hall: Утар + waste_basket: Сүп һауыты + waste_disposal: ҡалдыҡтарҙы юҡ итеү + youth_centre: Йәштәр үҙәге + boundary: + administrative: административ сик + census: иҫәп алыу участогының сиге + national_park: Милли парк + protected_area: Һаҡлы район + bridge: + aqueduct: Һыу каналы + suspension: Аҫылма күпер + swing: Айырсалы күпер + viaduct: Юл һуҙымы + "yes": Күпер + building: + "yes": Бина + craft: + brewery: Һыра заводы + carpenter: Балта оҫтаһы + electrician: Электрик + gardener: Баҡсасы + painter: Рәссам + plumber: Сантехник + shoemaker: Итексе + tailor: Тегенсе + "yes": Ҡул эштәре магазины + emergency: + ambulance_station: Тиҙ ярҙам станцияһы + defibrillator: Дефибриллятор + landing_site: Авария мәлендә ултырыу урыны + phone: Тиҙ бәйләнеш телефоны + highway: + abandoned: Ташландыҡ юл + bridleway: Атта йөрөү юлы + bus_guideway: Автобус рельс-юлы + bus_stop: Автобус туҡталышы + construction: Ремонт барған юл + cycleway: Велосипед юлы + elevator: Лифт + emergency_access_point: Ашығыс ярҙам пункты + footway: Тротуар + ford: Йөҙөп сығыу урыны + living_street: Кеше йәшәгән урам + milestone: Километр бағанаһы + motorway: Автомагистраль + motorway_junction: Автомагистраль киҫелеше + motorway_link: Автомагистраль айырсаһы + path: Һуҡмаҡ + pedestrian: Йәйәүле юлы + platform: Платформа + primary: Төп юл + primary_link: Төп юл + proposed: Тәҡдим ителгән юл + raceway: Уҙышыу юлы + residential: Урам юлы + rest_area: Ял итеү зонаһы + road: Юл + secondary: Ярҙамсы юл + secondary_link: Ҡушылған юл + service: Килеп туҡтау юлы + services: Юл яны хеҙмәттәре + speed_camera: Радар + steps: Баҫҡыстар + street_lamp: Урам фонары + tertiary: Ауыл араһы юлы + tertiary_link: Сиҙәм юлы + track: Ауыл юлы + traffic_signals: Светофор + trail: Һуҡмаҡ + trunk: Төп юл + trunk_link: Магистраль + unclassified: Урындағы юл + unsurfaced: Шоссе юлы + historic: + archaeological_site: Археологик ҡаҙыныуҙар + battlefield: Һуғыш яланы + boundary_stone: Сик буйы ташы + building: Тарихи бина + bunker: Бункер + castle: Ҡәлғә + church: Сиркәү + city_gate: Ҡала ҡапҡаһы + citywalls: Тарихи нығытма + fort: Ҡойма + heritage: Мәҙәни мираҫ + house: Йорт + icon: Тәре + manor: Поместье + memorial: Һәйкәл + mine: Карьер + monument: Монумент + roman_road: Рим юлы + ruins: Емереклектәр + stone: Таш + tomb: Ҡәбер + tower: Башня + wayside_cross: Юл яны тәреһе + wayside_shrine: Юл яны ғибәҙәтханаһы + wreck: Батҡан кәмә остоғо + junction: + "yes": Юл киҫелеше + landuse: + allotments: Баҡсалар + basin: Бассейн + brownfield: Төҙөлөш өсөн таҙартыу + cemetery: Ҡәберлек + commercial: Һатыу итеү яланы + conservation: Заповедник + construction: Төҙөлөш + farm: Ферма + farmland: Ауыл хужалығы ерҙәре + farmyard: Ауыл хужалығы ихаталары + forest: Урман хужалығы + garages: Гараждар + grass: Үлән + greenfield: Үҙләштерелмәгән урын + industrial: Промзона + landfill: Сүплек + meadow: Туғай + military: Хәрби биләмә + orchard: Емеш баҡсаһы + quarry: Карьер + railway: Тимер юл + recreation_ground: Ял итеү урыны + reservoir: Һыу һаҡлағыс + reservoir_watershed: Һыу һаҡлағыстың һыу айырсаһы + residential: Йәшәү районы + retail: Һатыу итеү биләмәһе + road: Юл селтәре зонаһы + village_green: Йәшел ауыл + vineyard: Йөҙөм баҡсаһы + "yes": Ерҙе ҡулланыу + leisure: + beach_resort: Үҫентеле пляж + bird_hide: Йәшерен ултырғыс (ҡоштарҙы күҙәтеү өсөн) + club: Клуб + common: Альменда + dog_park: Эт өсөн майҙансыҡ + fishing: Балыҡ тотоу + fitness_centre: Фитнес-үҙәк + fitness_station: Фитнес-станция + garden: Баҡса + golf_course: Гольф яланы + horse_riding: Ат базаһы + ice_rink: Һырғалаҡ + marina: Яхталар пристане + miniature_golf: Минигольф + nature_reserve: Заповедник + park: Парк + pitch: Спорт майҙансығы + playground: Балаларҙың уйын майҙансығы + resort: Ҡотҡарыу ҡоралы + sauna: Сауна + slipway: Эллинг + sports_centre: Спорт үҙәге + stadium: Стадион + swimming_pool: Бассейн + track: Спорт юлы + water_park: Аквапарк + "yes": Буш ваҡыт + man_made: + lighthouse: Маяҡ + pipeline: Торба юлы + works: Фабрика + "yes": Кеше ҡулы менән яһалған + military: + airfield: Хәрби аэродром + barracks: Казармалар + mountain_pass: + "yes": Үткәүел + natural: + bay: Ҡултыҡ + beach: Пляж + cape: Морон + cave_entrance: Мәмерйәгә инеү + cliff: Ҡая упҡыны + crater: Кратер + dune: Дюна + fell: Ҡаҡ тау түбәһе + fjord: Ҡултыҡ + forest: Урман + geyser: Гейзер + glacier: Боҙлоҡ + grassland: Туғай + heath: Вереск үҫкән ялан + hill: Тау түбәһе + island: Утрау + land: Ер + marsh: Үләнле һаҙлыҡ + moor: Тау һаҙлығы + mud: Батҡаҡ + peak: Тау түбәһе + point: Морон + reef: Риф + ridge: Һырт + rock: Ҡая + saddle: Артылыш + sand: Ҡом + scree: Таш ҡойолоуы + scrub: Ҡыуаҡлыҡ + spring: Шишмә + strait: Боғаҙ + tree: Ағас + valley: Үҙән + volcano: Вулкан + water: Һыу + wetland: Һаҙлыҡлы урын + wood: Урман + office: + accountant: Бухгалтер + javascripts: + share: + only_standard_layer: Бары стандарт ҡатлам ғына һүрәт кеүек экспортлана ала + embed: + report_problem: Проблема хаҡында хәбәр итергә +... diff --git a/config/locales/be.yml b/config/locales/be.yml index a60883a64..e78338ad0 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -2363,9 +2363,6 @@ be: mapquest_car: Аўтамабіль (MapQuest) mapquest_foot: Пешшу (MapQuest) osrm_car: Аўтамабіль (OSRM) - mapzen_bicycle: Веласіпед (Mapzen) - mapzen_car: Аўтамабіль (Mapzen) - mapzen_foot: Пешшу (Mapzen) descend: Уніз directions: Маршрут distance: Адлегласць diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 56547d363..1b29d774c 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -904,7 +904,7 @@ bg: get_directions_title: Намерете маршрут между две точки from: От to: До - where_am_i: Къде съм аз? + where_am_i: Къде е това? submit_text: Напред key: table: @@ -1294,9 +1294,6 @@ bg: mapquest_car: Кола (MapQuest) mapquest_foot: Пеша (MapQuest) osrm_car: Кола (OSRM) - mapzen_bicycle: Велосипед (Mapzen) - mapzen_car: Кола (Mapzen) - mapzen_foot: Пеша (Mapzen) directions: Насоки distance: Разстояние instructions: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 0598c5157..6d6a4fcc4 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -8,6 +8,8 @@ # Author: Elias Ahmmad # Author: Kayser Ahmad # Author: Nasir8891 +# Author: R4bb1 +# Author: Rasal Lia # Author: Sayma Jahan # Author: Tauhid16 # Author: Wikisagnik @@ -385,8 +387,8 @@ bn: osm_nominatim: ওপেনস্ট্রীটম্যাপ নমিনাতিম থেকে ফলাফল geonames: জিওনেমস থেকে ফলাফল - osm_nominatim_reverse: ওপেনস্ট্রীটম্যাপ - নমিনাতিম থেকে ফলাফল + osm_nominatim_reverse: ওপেনস্ট্রীটম্যাপ + Nominatim থেকে ফলাফল geonames_reverse: জিওনেমস থেকে ফলাফল search_osm_nominatim: prefix: @@ -519,6 +521,7 @@ bn: plumber: নল মিস্তিরি shoemaker: মুচি tailor: দর্জি + "yes": কারুকাজ দোকান emergency: ambulance_station: রুগ্নবাহিকা স্টেশন landing_site: জরুরি অবতরণ ক্ষেত্র @@ -552,6 +555,7 @@ bn: street_lamp: রাস্তার বাতি tertiary: প্রশাখা সড়ক tertiary_link: প্রশাখা সড়ক + track: নির্ধারিত পথ traffic_signals: ট্রাফিক সংকেত trunk: মূল সড়ক trunk_link: মূল সড়ক @@ -741,8 +745,9 @@ bn: bicycle: বাইসাইকেল দোকান books: বইয়ের দোকান butcher: মাংসবিক্রেতা + car_parts: গাড়ির যন্ত্রাংশ carpet: কার্পেটের দোকান - chemist: রাসায়নবিৎ + chemist: রাসায়নবিদ clothes: কাপড়ের দোকান computer: কম্পিউটারের দোকান confectionery: মিষ্টান্নের দোকান @@ -941,7 +946,7 @@ bn: url: /স্বাগতম title: ওএসএম-এ স্বাগতম beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Bn:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: আরম্ভকারী সহায়িকা help: url: https://help.openstreetmap.org/ @@ -953,7 +958,7 @@ bn: irc: title: আইআরসি wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org about_page: next: পরবর্তী @@ -1289,6 +1294,8 @@ bn: account: current email address: 'বর্তমান ই-মেইল ঠিকানা:' new email address: 'নতুন ই-মেইল ঠিকানা:' + openid: + link: https://wiki.openstreetmap.org/wiki/OpenID public editing: enabled link text: এটি কী? contributor terms: diff --git a/config/locales/br.yml b/config/locales/br.yml index d1218b530..ff8c3b1a8 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -1,6 +1,7 @@ # Messages for Breton (brezhoneg) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Dishual # Author: Fohanno # Author: Fulup # Author: Gwenn-Ael @@ -393,7 +394,7 @@ br: osm_nominatim: Disoc'hoù diwar OpenStreetMap Nominatim geonames: Disoc'hoù diwar GeoNames - osm_nominatim_reverse: Disoc'hoù diwar OpenStreetMap + osm_nominatim_reverse: Disoc'hoù diwar OpenStreetMap Nominatim geonames_reverse: Disoc'hoù diwar GeoNames search_osm_nominatim: @@ -1887,6 +1888,7 @@ br: terms declined: Un druez eo deomp gwelet hoc'h eus nac'het degemer Termenoù ar berzhidi nevez. Evit muioc'h a ditouroù, sellit ouzh ar bajenn wiki-mañ. + terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: Diferadennoù ar c'henlabourer heading: Diferadennoù ar c'henlabourer @@ -2385,9 +2387,6 @@ br: mapquest_car: Karr (MapQuest) mapquest_foot: Troad (MapQuest) osrm_car: Karr(OSRM) - mapzen_bicycle: Marc'h-houarn (Mapzen) - mapzen_car: Karr (Mapzen) - mapzen_foot: War droad (Mapzen) descend: Diskenn directions: Tuioù distance: Hed diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 106f2c060..59c0105bf 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -958,7 +958,7 @@ ca: logo: alt_text: logotip de l'OpenStreetMap home: Vés a la ubicació d'inici - logout: Tancar sessió + logout: Finalitza la sessió log_in: Inicia sessió log_in_tooltip: Inicia una sessió amb un compte existent sign_up: Registre @@ -1277,6 +1277,7 @@ ca: footer_html: També podeu llegir el missatge a %{readurl} i podeu respondre'l a %{replyurl} friend_notification: + hi: Hola %{to_user}, subject: '[OpenStreetMap] %{user} us ha afegit a la llista d''amics' had_added_you: '%{user} us ha afegit com a amic a l''OpenStreetMap.' see_their_profile: Podeu veure el seu perfil a %{userurl}. @@ -1494,7 +1495,7 @@ ca: get_directions_title: Trobeu indicacions entre dos punts from: De to: A - where_am_i: On sóc? + where_am_i: On és això? where_am_i_title: Descriu la localització actual fent servir el motor de cerca submit_text: Vés-hi key: @@ -2382,9 +2383,10 @@ ca: new: intro: Heu trobat un error o bé hi falta res? Informeu-ne a d'altres col·laboradors per tal que puguin solucionar-ho. Moveu el marcador a la posició correcta - i escriviu-hi una anotació per tal de descriure el problema. (No introduïu - cap mena d'informació personal o informació d'altres mapes o llistats de - directoris que es trobin sota copyright.) + i escriviu-hi una anotació per tal de descriure el problema. + advice: La vostra nota és pública i pot utilitzar-se per actualitzar el mapa, + per tant, no hi introduïu cap informació personal, o informació de mapes + amb copyright o bé llistats de directori. add: Afegeix una nota show: anonymous_warning: Aquesta nota inclou comentaris d'usuaris anònims que haurien @@ -2404,9 +2406,6 @@ ca: mapquest_car: Cotxe (MapQuest) mapquest_foot: A peu (MapQuest) osrm_car: Cotxe (OSRM) - mapzen_bicycle: Bicicleta (Mapzen) - mapzen_car: Cotxe (Mapzen) - mapzen_foot: A peu (Mapzen) directions: Indicacions distance: Distància errors: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f5da185a8..f090caac3 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -159,6 +159,8 @@ cs: title_comment: Sada změn %{id} - %{comment} join_discussion: Chcete-li diskutovat, přihlaste se discussion: Diskuse + still_open: Sada změn je stále otevřená – diskuse se zpřístupní, jakmile bude + sada změn uzavřena. node: title: 'Uzel: %{name}' history_title: 'Historie uzlu: %{name}' @@ -370,7 +372,7 @@ cs: map_image: Obrázek mapy (zobrazuje standardní vrstvu) embeddable_html: Vkládatelné HTML licence: Licence - export_details: Data OpenStreetMap jsou k dispozici pod licencí Open + export_details: Data OpenStreetMap jsou k dispozici pod licencí Open Data Commons Open Database License (ODbL). too_large: advice: 'Pokud se tento export nezdaří, zvažte použití jednoho z následujících @@ -409,14 +411,14 @@ cs: geocoder: search: title: - latlon: Výsledky z interní databáze + latlon: Výsledky z interní databáze uk_postcode: Výsledky z NPEMap / FreeThe Postcode - ca_postcode: Výsledky z Geocoder.CA - osm_nominatim: Výsledky z OpenStreetMap + ca_postcode: Výsledky z Geocoder.CA + osm_nominatim: Výsledky z OpenStreetMap Nominatim geonames: Výsledky z GeoNames - osm_nominatim_reverse: Výsledky z OpenStreetMap + osm_nominatim_reverse: Výsledky z OpenStreetMap Nominatim geonames_reverse: Výsledky z GeoNames search_osm_nominatim: @@ -939,7 +941,7 @@ cs: level10: Hranice městské části description: title: - osm_nominatim: Poloha podle OpenStreetMap + osm_nominatim: Poloha podle OpenStreetMap Nominatim geonames: Poloha podle GeoNames types: @@ -1013,21 +1015,21 @@ cs: legal_babble: title_html: Autorská práva a licence intro_1_html: OpenStreetMap® jsou svobodná - data, která za podmínek Open - Data Commons Open Database License (ODbL) nabízí nadace OpenStreetMap + data, která za podmínek Open + Data Commons Open Database License (ODbL) nabízí nadace OpenStreetMap Foundation (OSMF). intro_2_html: Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat naÅ¡e data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud naÅ¡e data budete upravovat nebo je použijete ve svém díle, musíte výsledek šířit pod stejnou licencí. VaÅ¡e práva a povinnosti jsou vysvětleny v plném - licenčním ujednání. + licenčním ujednání. intro_3_html: Kartografická díla v naÅ¡ich mapových dlaždicích a naÅ¡e dokumentace - jsou k dispozici pod licencí Creative + jsou k dispozici pod licencí Creative Commons Uveďte autora-Zachovejte licenci 2.0 (CC-BY-SA). credit_title_html: Jak uvádět OpenStreetMap credit_1_html: Vyžadujeme uvádění autorství „© Přispěvatelé OpenStreetMap“. credit_2_html: |- - Také musíte jasně uvést, že data jsou dostupná za podmínek Open Database License, a pokud používáte naÅ¡e mapové dlaždice, že jejich kartografický obsah je licencován pod CC-BY-SA. To můžete splnit odkázáním na tuto stránku. + Také musíte jasně uvést, že data jsou dostupná za podmínek Open Database License, a pokud používáte naÅ¡e mapové dlaždice, že jejich kartografický obsah je licencován pod CC-BY-SA. To můžete splnit odkázáním na tuto stránku. Nebo můžete (a pokud šíříte OSM jako data, tak musíte) uvést název licence a odkaz na ni přímo. Pokud používáte médium, které odkazy neumožňuje (např. v tiÅ¡těném díle), navrhujeme, abyste své čtenáře nasměrovali na openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy), na opendatacommons.org a, pokud se vás to týká, na creativecommons.org. credit_3_html: |- @@ -1038,7 +1040,7 @@ cs: title: Příklad uvedení autorství more_title_html: Další informace more_1_html: O používání naÅ¡ich dat a způsobu uvádění autorství se můžete dočíst - více na licenční stránce OSMF. + více na licenční stránce OSMF. more_2_html: |- Přestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API. Vizte naÅ¡e Pravidla použití API, Pravidla použití dlaždic a Pravidla použití Nominatimu. @@ -1046,10 +1048,10 @@ cs: contributors_intro_html: 'NaÅ¡imi přispěvateli jsou tisíce jednotlivců. Také zahrnujeme svobodně licencovaná data z národních zeměměřických úřadů a dalších zdrojů, mimo jiné:' - contributors_at_html: 'Rakousko: Obsahuje data od města - Vídně pod CC - BY), země - Vorarlbersko a země Tyrolsko (pod CC + contributors_at_html: 'Rakousko: Obsahuje data od města + Vídně pod CC + BY), země + Vorarlbersko a země Tyrolsko (pod CC BY AT s dodatky).' contributors_ca_html: 'Kanada: Obsahuje data z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© @@ -1057,12 +1059,12 @@ cs: Canada).' contributors_fi_html: 'Finsko: Obsahuje data z topografické databáze a dalších zdrojů finského národního zeměměřického úřadu (Maanmittauslaitos) - dostupná pod licencí + dostupná pod licencí NLSFI.' contributors_fr_html: 'Francie: Obsahuje data pocházející z Direction Générale des Impôts.' contributors_nl_html: 'Nizozemsko: Obsahuje © AND data, - 2007 (www.and.com)' + 2007 (www.and.com)' contributors_nz_html: 'Nový Zéland: Obsahuje data pocházející z Land Information New Zealand. Crown Copyright reserved.' contributors_si_html: 'Slovinsko: Obsahuje data Zeměměřického @@ -1075,7 +1077,7 @@ cs: Survey © Crown copyright a právo k databázi 2010–12.' contributors_footer_1_html: |- Další podrobnosti o těchto a dalších zdrojích, které se používaly pro vylepÅ¡ení OpenStreetMap, najdete na stránce Contributors na wiki OpenStreetMap. + href="https://wiki.openstreetmap.org/wiki/Contributors">stránce Contributors na wiki OpenStreetMap. contributors_footer_2_html: Zahrnutí dat do OpenStreetMap neznamená, že původní poskytovatel dat podporuje OpenStreetMap, nabízí jakoukoli záruku nebo přijímá jakoukoli zodpovědnost. @@ -1085,13 +1087,13 @@ cs: bez výslovného svolení držitelů práv. infringement_2_html: Pokud si myslíte, že byl do databáze OpenStreetMap nebo na tento server neoprávněně vložen autorskoprávně chráněný obsah, postupujte - podle naÅ¡eho postupu + podle naÅ¡eho postupu pro odstranění nebo přímo podejte výzvu pomocí on-line formuláře. trademarks_title_html: Ochranné známky trademarks_1_html: OpenStreetMap, logo s lupou a State of the Map jsou zapsané ochranné známky OpenStreetMap Foundation. Pokud máte dotazy ohledně vaÅ¡eho - používání těchto známek, zaÅ¡lete své dotazy pracovní + používání těchto známek, zaÅ¡lete své dotazy pracovní skupině pro licencování. welcome_page: title: Vítejte! @@ -1123,8 +1125,8 @@ cs: paragraph_1_html: OpenStreetMap má jen málo formálních pravidel, ale od vÅ¡ech účastníků očekáváme, že budou spolupracovat a komunikovat s komunitou. Pokud zvažujete jakoukoli jinou činnost než ruční editování, přečtěte si prosím - a dodržujte pokyny na stránkách Importy - a Automatizované + a dodržujte pokyny na stránkách Importy + a Automatizované editace. questions: title: Nějaké dotazy? @@ -1158,7 +1160,7 @@ cs: explanation_html: |- Pokud máte pochyby o používání naÅ¡ich dat nebo jejich obsahu, na naší stránce o autorských právech naleznete více právních informací, případně kontaktujte - přísluÅ¡nou pracovní skupinu OSMF. + přísluÅ¡nou pracovní skupinu OSMF. help_page: title: Nápověda introduction: OpenStreetMap nabízí několik zdrojů pro informace o projektu, otázky @@ -1168,7 +1170,7 @@ cs: title: Vítejte v OSM description: Začněte tímto rychlým průvodcem zahrnujícím základy OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Cs:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Cs:Pr%C5%AFvodce_za%C4%8D%C3%A1te%C4%8Dn%C3%ADka title: Průvodce začátečníka description: Komunitou spravovaná příručka pro začátečníky. help: @@ -1192,7 +1194,7 @@ cs: description: Pomoc společnostem a organizacím s přechodem na mapy a další služby založené na OpenStreetMap. wiki: - url: http://wiki.openstreetmap.org/wiki/Cs:Main_Page?uselang=cs + url: https://wiki.openstreetmap.org/wiki/Cs:Main_Page?uselang=cs title: wiki.openstreetmap.org description: Podrobnou dokumentaci OSM najdete na wiki. about_page: @@ -1210,7 +1212,7 @@ cs: community_driven_title: Řízeno komunitou community_driven_html: |- Komunita OpenStreetMap je různorodá, vášnivá a každý den se rozrůstá. Mezi naÅ¡imi přispěvateli najdete amatérské kreslíře map, profesionály z oblasti GIS, techniky spravující servery OSM, humanitární pracovníky mapující oblasti zasažené neÅ¡těstím a mnohé další. - Pokud se chcete o komunitě dozvědět více, prohlédněte si uživatelské deníčky, komunitní blogy a webovou stránku nadace OSM Foundation. + Pokud se chcete o komunitě dozvědět více, prohlédněte si blog OpenStreetMap, uživatelské deníčky, komunitní blogy a webovou stránku nadace OSM Foundation. open_data_title: Otevřená data open_data_html: 'OpenStreetMap tvoří otevřená data: smíte je užívat pro libovolný účel, pokud uvádíte autorství OpenStreetMap a jeho přispěvatelů. Pokud @@ -1219,9 +1221,9 @@ cs: práva a licence.' legal_title: Právní informace legal_html: |- - Tento web a mnoho dalších souvisejících služeb za komunitu oficiálně provozuje OpenStreetMap Foundation (OSMF). Použití vÅ¡ech služeb provozovaných OSMF podléhá naÅ¡im Pravidlům přijatelného užití a naÅ¡im Pravidlům ochrany osobních údajů. + Tento web a mnoho dalších souvisejících služeb za komunitu oficiálně provozuje OpenStreetMap Foundation (OSMF). Použití vÅ¡ech služeb provozovaných OSMF podléhá naÅ¡im Pravidlům přijatelného užití a naÅ¡im Pravidlům ochrany osobních údajů.
- Pokud máte problémy či dotazy týkající se licencování, autorských práv či jiných právních záležitostí, kontaktujte prosím OSMF. + Pokud máte problémy či dotazy týkající se licencování, autorských práv či jiných právních záležitostí, kontaktujte prosím OSMF. partners_title: Partneři notifier: diary_comment_notification: @@ -1436,14 +1438,14 @@ cs: user_page_link: uživatelské stránce anon_edits_link_text: Proč to tak je? flash_player_required: Pokud chcete používat Potlatch, flashový editor OpenStreetMap, - potřebujete přehrávač Flashe. Můžete si stáhnout - Flash Player z Adobe.com. Pro editaci OpenStreetMap existuje mnoho + potřebujete přehrávač Flashe. Můžete si stáhnout + Flash Player z Adobe.com. Pro editaci OpenStreetMap existuje mnoho dalších možností. potlatch_unsaved_changes: Máte neuložené změny. (V Potlatchi odznačte aktuální cestu nebo bod, pokud editujete v živém režimu, nebo klikněte na tlačítko uložit, pokud tam je.) potlatch2_not_configured: Potlatch 2 není nakonfigurován – podrobnější informace - najdete na http://wiki.openstreetmap.org/wiki/The_Rails_Port + najdete na https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 potlatch2_unsaved_changes: Máte neuložené změny. (V Potlatch 2 se ukládá kliknutím na tlačítko.) id_not_configured: iD nebyl nakonfigurován @@ -1458,7 +1460,7 @@ cs: get_directions_title: Najít trasu mezi dvěma body from: Odkud to: Kam - where_am_i: Kde se nacházím? + where_am_i: Kde je toto? where_am_i_title: Popsat právě zobrazované místo pomocí vyhledávače submit_text: Hledat key: @@ -1535,7 +1537,7 @@ cs: edit: Upravit preview: Náhled markdown_help: - title_html: Zpracovává se Markdownem + title_html: Zpracovává se Markdownem headings: Nadpisy heading: Nadpis subheading: Podnadpis @@ -1651,7 +1653,7 @@ cs: description: Procházení nedávno nahraných GPS stop tagged_with: se štítky %{tags} empty_html: Nic tu ještě není. Nahrajte novou stopu - nebo si něco o GPS stopách přečtěte na wiki. + nebo si něco o GPS stopách přečtěte na wiki. delete: scheduled_for_deletion: Stopa označena ke smazání make_public: @@ -1857,12 +1859,12 @@ cs: html: |-

Na rozdíl od ostatních map je OpenStreetMap vytvořena lidmi jako vy a kdokoli ji může volně opravovat, aktualizovat, stáhnout a používat.

Zaregistrujte se, abyste mohli začít přispívat. K potvrzení vašeho účtu vám pošleme e-mail.

- license_agreement: Při potvrzení účtu budete muset souhlasit s podmínkami + license_agreement: Při potvrzení účtu budete muset souhlasit s podmínkami pro přispěvatele. email address: 'E-mailová adresa:' confirm email address: 'Potvrdit e-mailovou adresu:' not displayed publicly: Vaše adresa se nezobrazuje veřejně, více informací získáte - v našich pravidlech ochrany osobních údajů display name: 'Zobrazované jméno:' @@ -1984,12 +1986,12 @@ cs: email never displayed publicly: (nikde se veřejně nezobrazuje) external auth: 'Externí autentizace:' openid: - link: http://wiki.openstreetmap.org/wiki/CS:OpenID + link: https://wiki.openstreetmap.org/wiki/Cs:OpenID link text: co to znamená? public editing: heading: 'Veřejné editace:' enabled: Aktivní. Není anonym, smí editovat data. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: co to znamená? disabled: Deaktivováno, nemůže editovat data, všechny předchozí editace jsou anonymní. @@ -2000,8 +2002,8 @@ cs: ani vidět vaši polohu. Pokud chcete ukázat, co jste editovali, a dovolit lidem vás kontaktovat prostřednictvím webu, klikněte na níže zobrazené tlačítko. Od přechodu na API 0.6 mohou mapová data editovat jen veřejní uživatelé. - (Přečtěte si - důvody.)