" + - "This is development version 0.0.0-alpha1. " + - "For more information see ideditor.com" + - " and report bugs at github.com.systemed/iD.
"); + var introModal = modal.select('.content') + .append('div') + .attr('class', 'modal-section fillL'); - return modal; + introModal.append('div') + .attr('class', 'logo'); + + var div = introModal.append('div'); + + div.append("h2") + .text(t('splash.welcome')); + + div.append("p") + .html(t('splash.text', { + version: iD.version, + website: 'ideditor.com', + github: 'github.com' + })); + } }; diff --git a/js/id/ui/success.js b/js/id/ui/success.js index fffa7b6ab..17a577fb3 100644 --- a/js/id/ui/success.js +++ b/js/id/ui/success.js @@ -1,4 +1,4 @@ -iD.ui.success = function(connection) { +iD.ui.Success = function(connection) { var event = d3.dispatch('cancel', 'save'); function success(selection) { diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js index cdb22b505..8a8ea2041 100644 --- a/js/id/ui/tag_reference.js +++ b/js/id/ui/tag_reference.js @@ -11,7 +11,7 @@ iD.ui.tagReference = function(selection) { .enter() .append('span') .attr('title', function(d) { - return 'used with ' + d; + return t('tag_reference.used_with', {type: d}); }) .attr('class', function(d) { return 'icon big icon-pre-text big-' + d; @@ -19,12 +19,12 @@ iD.ui.tagReference = function(selection) { header.append('span') .text(g('title')); - referenceBody = selection.append('div') + var referenceBody = selection.append('div') .attr('class','modal-section fillL2'); referenceBody .append('h5') - .text(t('description')); + .text(t('tag_reference.description')); if (selection.datum().image) { referenceBody @@ -36,6 +36,7 @@ iD.ui.tagReference = function(selection) { referenceBody .append('p') .text(g('description')); + referenceBody .append('a') .attr('target', '_blank') @@ -43,7 +44,7 @@ iD.ui.tagReference = function(selection) { return 'http://wiki.openstreetmap.org/wiki/' + d.title; }) .text(function(d) { - return d.title + ' on wiki.osm.org'; + return t('tag_reference.on_wiki', {tag: d.title}); }); }); }; diff --git a/js/id/ui/toggle.js b/js/id/ui/toggle.js index 3a7500023..c3c299905 100644 --- a/js/id/ui/toggle.js +++ b/js/id/ui/toggle.js @@ -2,7 +2,7 @@ // hide class, which sets display=none, and a d3 transition for opacity. // this will cause blinking when called repeatedly, so check that the // value actually changes between calls. -iD.ui.toggle = function(show, callback) { +iD.ui.Toggle = function(show, callback) { return function(selection) { selection.style('opacity', show ? 0 : 1) .classed('hide', false) diff --git a/js/id/ui/userpanel.js b/js/id/ui/userpanel.js deleted file mode 100644 index fda2fc463..000000000 --- a/js/id/ui/userpanel.js +++ /dev/null @@ -1,54 +0,0 @@ -iD.ui.userpanel = function(connection) { - var event = d3.dispatch('logout', 'login'); - - function user(selection) { - function update() { - if (connection.authenticated()) { - selection.style('display', 'block'); - connection.userDetails(function(err, user_details) { - - selection.html(''); - - if (err) return; - - // Link - var userLink = selection.append('a') - .attr('href', connection.url() + '/user/' + - user_details.display_name) - .attr('target', '_blank'); - - // Add thumbnail or dont - if (user_details.image_url) { - userLink.append('img') - .attr('class', 'icon icon-pre-text user-icon') - .attr('src', user_details.image_url); - } else { - userLink.append('span') - .attr('class','icon avatar icon-pre-text'); - } - - // Add user name - userLink.append('span') - .attr('class','label') - .text(user_details.display_name); - - selection - .append('a') - .attr('class', 'logout') - .attr('href', '#') - .text(t('logout')) - .on('click.logout', function() { - d3.event.preventDefault(); - event.logout(); - }); - }); - } else { - selection.html('').style('display', 'none'); - } - } - connection.on('auth', update); - update(); - } - - return d3.rebind(user, event, 'on'); -}; diff --git a/js/id/ui/zoom.js b/js/id/ui/zoom.js new file mode 100644 index 000000000..823bc120f --- /dev/null +++ b/js/id/ui/zoom.js @@ -0,0 +1,40 @@ +iD.ui.Zoom = function(context) { + var zooms = [{ + id: 'zoom-in', + title: t('zoom.in'), + action: context.zoomIn, + key: '+' + }, { + id: 'zoom-out', + title: t('zoom.out'), + action: context.zoomOut, + key: '-' + }]; + + return function(selection) { + var button = selection.selectAll('button') + .data(zooms) + .enter().append('button') + .attr('tabindex', -1) + .attr('class', function(d) { return d.id; }) + .on('click.editor', function(d) { d.action(); }) + .call(bootstrap.tooltip() + .placement('right') + .html(true) + .title(function(d) { + return iD.ui.tooltipHtml(d.title, d.key); + })); + + button.append('span') + .attr('class', function(d) { return d.id + ' icon'; }); + + var keybinding = d3.keybinding('zoom') + .on('+', function() { context.zoomIn(); }) + .on('-', function() { context.zoomOut(); }) + .on('⇧=', function() { context.zoomIn(); }) + .on('dash', function() { context.zoomOut(); }); + + d3.select(document) + .call(keybinding); + } +}; diff --git a/locale/locale.js b/js/lib/locale.js similarity index 100% rename from locale/locale.js rename to js/lib/locale.js diff --git a/locale/README.md b/locale/README.md index b1610b311..0feb1f631 100644 --- a/locale/README.md +++ b/locale/README.md @@ -22,6 +22,10 @@ Let's look at an example line from `en.js`: no_results: "Couldn't locate a place named '{name}'" ``` +`no_results` is the translation _key_, and should not be translated. +The text to the right of the colon, `"Couldn't locate a place named '{name}'"`, +is the string to be translated. + The word in brackets, `{name}`, should **not** be translated into a new language: it's replaced with a place name when iD presents the text. So a French translation would look like @@ -30,6 +34,15 @@ a French translation would look like no_results: "Impossible de localiser l'endroit nommé '{name}'" ``` +For technical reasons, a few translation keys are quoted. For example: + +``` +'delete': "Delete" +``` + +Only translate the value to the right of the colon, not the quoted key on +the left. + ## License Contributions to translations are under the same liberal diff --git a/locale/da.js b/locale/da.js index 217f597f6..d42f95c61 100644 --- a/locale/da.js +++ b/locale/da.js @@ -3,25 +3,21 @@ locale.da = { add_area: { title: "Område", description: "Tilføj parker, bygninger, søer, eller andre områder til kortet.", - tail: "Klik på kortet for at indtegne et område fx en park, sø eller bygning.", - key: "A" + tail: "Klik på kortet for at indtegne et område fx en park, sø eller bygning." }, add_line: { title: "Linje", description: "Linjer kan være veje, gader eller stier selv kanaler kan være linjer.", - tail: "Klik på koret for at indtegne en vej, sti eller rute.", - key: "L" + tail: "Klik på koret for at indtegne en vej, sti eller rute." }, add_point: { title: "Punkt", description: "Restauranter, mindesmærker og postkasser er punkter.", - tail: "Klik på kortet for at tilføje et punkt.", - key: "P" + tail: "Klik på kortet for at tilføje et punkt." }, browse: { title: "Browse", - description: "Træk rundt og zoom på kortet.", - key: "B" + description: "Træk rundt og zoom på kortet." }, draw_area: { tail: "Klik her for at tilføje punkter til dit område. Click the first point to finish the area." @@ -34,27 +30,27 @@ locale.da = { operations: { add: { annotation: { - point: "Added a point.", - vertex: "Added a node to a way." + point: "Tilføjede et punkt.", + vertex: "Tilføjede en node til en vej." } }, start: { annotation: { - line: "Started a line.", - area: "Started an area." + line: "Startede en linje.", + area: "Startede et område." } }, 'continue': { annotation: { - line: "Continued a line.", - area: "Continued an area." + line: "Forsatte en linje.", + area: "Forsatte et område." } }, cancel_draw: { - annotation: "Cancelled drawing." + annotation: "Annulleret indtegning." }, change_tags: { - annotation: "Changed tags." + annotation: "Ændret tags." }, circularize: { title: "Circularize", @@ -75,16 +71,16 @@ locale.da = { } }, 'delete': { - title: "Delete", - description: "Remove this from the map.", + title: "Slet", + description: "Fjern dette fra kortet.", key: "⌫", annotation: { - point: "Deleted a point.", - vertex: "Deleted a node from a way.", - line: "Deleted a line.", - area: "Deleted an area.", - relation: "Deleted a relation.", - multiple: "Deleted {n} objects." + point: "Slettede et punkt.", + vertex: "Slettede en node fra en vej.", + line: "Slettede en linje.", + area: "Slettede et område.", + relation: "Sletede en relation.", + multiple: "Slettede {n} objekter." } }, connect: { @@ -108,14 +104,14 @@ locale.da = { annotation: "Merged {n} lines." }, move: { - title: "Move", - description: "Move this to a different location.", + title: "Flyt", + description: "Flyt dette til anden lokation.", key: "M", annotation: { - point: "Moved a point.", - vertex: "Moved a node in a way.", - line: "Moved a line.", - area: "Moved an area." + point: "Flyttede et punktMoved.", + vertex: "Flyttede en node i en vej.", + line: "Flyttede en linje.", + area: "Flyttede et område." } }, reverse: { @@ -125,60 +121,21 @@ locale.da = { annotation: "Reversed a line." }, split: { - title: "Split", - description: "Split this into two ways at this point.", + title: "Del op", + description: "Del op i to vej ved dette punkt.", key: "X", - annotation: "Split a way." + annotation: "Del op en vej." } }, - validations: { - untagged_point: "Untagged point which is not part of a line or area", - untagged_line: "Untagged line", - untagged_area: "Untagged area", - tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area", - deprecated_tags: "Deprecated tags: {tags}" - }, - - save: "Save", - unsaved_changes: "You have unsaved changes", - save_help: "Save changes to OpenStreetMap, making them visible to other users", - no_changes: "You don't have any changes to save.", - save_error: "An error occurred while trying to save", - uploading_changes: "Uploading changes to OpenStreetMap.", - just_edited: "You Just Edited OpenStreetMap!", - okay: "Okay", - - "zoom-in": "Zoom ind", - "zoom-out": "Zoom ud", - nothing_to_undo: "Nothing to undo.", nothing_to_redo: "Nothing to redo.", + just_edited: "Du har lige rettede i OpenStreetMap!", browser_notice: "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.", - - inspector: { - no_documentation_combination: "This is no documentation available for this tag combination", - no_documentation_key: "This is no documentation available for this key", - new_tag: "Nyt Tag" - }, - view_on_osm: "Vis på OSM", - zoom_in_edit: "zoom ind for at rette kortet", - - edit_tags: "Ret tags", - - geocoder: { - title: "Find et sted", - placeholder: "find et sted", - no_results: "Kunne ikke finde '{name}'" - }, - - description: "Description", - logout: "log ud", - report_a_bug: "report a bug", layerswitcher: { @@ -189,13 +146,82 @@ locale.da = { reset: "nulstill" }, + commit: { + title: "Save Changes", + description_placeholder: "Brief description of your contributions", + upload_explanation: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.", + save: "Save", + cancel: "Cancel", + warnings: "Warnings", + modified: "Modified", + deleted: "Deleted", + created: "Created" + }, + contributors: { list: "Vis bidrag fra {users}", truncated_list: "Vis bidrag fra {users} og {count} andre" }, + geocoder: { + title: "Find et sted", + placeholder: "find et sted", + no_results: "Kunne ikke finde '{name}'" + }, + + geolocate: { + title: "Show My Location" + }, + + inspector: { + no_documentation_combination: "Der er ingen dokumentation for denne tag kombination", + no_documentation_key: "Der er ingen dokumenation tilgængelig for denne nøgle", + new_tag: "Nyt Tag", + edit_tags: "Ret tags", + okay: "Ok", + view_on_osm: "View on OSM" + }, + + restore: { + description: "You have unsaved changes from a previous editing session. Do you wish to restore these changes?", + restore: "Restore", + reset: "Reset" + }, + + save: { + title: "Gem", + help: "Gem ændringer til OpenStreetMap gør dem synlige for andre brugere", + error: "Der skete en fejl da du prøvede at gemme", + uploading: "Gemmer nu ændringer til OpenStreetMap.", + unsaved_changes: "Du har ændringer der ikke er gemt endnu", + }, + + splash: { + welcome: "Welcome to the iD OpenStreetMap editor", + text: "This is development version {version}. For more information see {website} and report bugs at {github}." + }, + source_switch: { live: "live", dev: "dev" + }, + + tag_reference: { + description: "Description", + on_wiki: "{tag} on wiki.osm.org", + used_with: "used with {type}" + }, + + zoom: { + in: "Zoom ind", + out: "Zoom ud" + }, + + validations: { + untagged_point: "Untagged point which is not part of a line or area", + untagged_line: "Untagged line", + untagged_area: "Untagged area", + tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area", + deprecated_tags: "Deprecated tags: {tags}" } }; diff --git a/locale/de.js b/locale/de.js index 543eaab2d..7145dfe2b 100644 --- a/locale/de.js +++ b/locale/de.js @@ -128,42 +128,32 @@ locale.de = { } }, - validations: { - untagged_point: "Punkt ohne Attribute, der kein Teil einer Linie oder Fläche ist", - untagged_line: "Linie ohne Attribute", - untagged_area: "Fläche ohne Attribute", - tag_suggests_area: "Das Attribut {tag} suggeriert eine Fläche, ist aber keine Fläche", - deprecated_tags: "Veralterte Attribute: {tags}" - }, - - save: "Speichern", - unsaved_changes: "Ungespeicherte Änderugen vorhanden", - save_help: "Speichere Änderungen auf OpenStreetMap, um diese für andere Nutzer sichtbar zu machen", - no_changes: "Keine Änderungen zum Speichern vorhanden.", - save_error: "Beim Speichern ist ein Fehler aufgetreten", - uploading_changes: "Änderungen werden zu OpenStreetMap hochgeladen.", - just_edited: "Sie haben gerade OpenStreetMap editiert!", - okay: "OK", - - "zoom-in": "Hineinzoomen", - "zoom-out": "Herauszoomen", - nothing_to_undo: "Nichts zum Rückgängigmachen.", nothing_to_redo: "Nichts zum Wiederherstellen.", + just_edited: "Sie haben gerade OpenStreetMap editiert!", browser_notice: "Dieser Editor wird von Firefox, Chrome, Safari, Opera, und Internet Explorer (Version 9 und höher) unterstzützt. Bitte aktualisieren Sie Ihren Browser oder nutzen Sie Potlatch 2, um die Karte zu modifizieren.", + view_on_osm: "Auf OSM anschauen", + zoom_in_edit: "Hineinzoomen, um die Karte zu bearbeiten", + logout: "Abmelden", + report_a_bug: "Programmfehler melden", - inspector: { - no_documentation_combination: "Für dieses Attribut ist keine Dokumentation verfügbar.", - no_documentation_key: "Für dises Schlüsselwort ist keine Dokumentation verfügbar", - new_tag: "Neues Attribut" + commit: { + title: "Änderungen speichern", + description_placeholder: "Eine kurze Beschreibung deiner Beiträge", + upload_explanation: "Änderungen, die du als {user} hochlädst werden sichtbar auf allen Karte, die OpenStreetMap nutzen.", + save: "Speichern", + cancel: "Abbrechen", + warnings: "Warnungen", + modified: "Verändert", + deleted: "Gelöscht", + created: "Erstellt" }, - view_on_osm: "Auf OSM anschauen", - - zoom_in_edit: "Hineinzoomen, um die Karte zu bearbeiten", - - edit_tags: "Attribute bearbeiten", + contributors: { + list: "Diese Kartenansicht enthält Beiträge von:", + truncated_list: "Diese Kartenansicht enthält Beiträge von: {users} und {count} Anderen" + }, geocoder: { title: "Suche einen Ort", @@ -171,15 +161,17 @@ locale.de = { no_results: "Der Ort '{name}' konnte nicht gefunden werden" }, - description: "Beschreibung", + geolocate: { + title: "Zeige meine Position" + }, - report_a_bug: "Programmfehler melden", - - logout: "Abmelden", - - contributors: { - list: "Diese Kartenansicht enthält Beiträge von:", - truncated_list: "Diese Kartenansicht enthält Beiträge von: {users} und {count} Anderen" + inspector: { + no_documentation_combination: "Für dieses Attribut ist keine Dokumentation verfügbar.", + no_documentation_key: "Für dises Schlüsselwort ist keine Dokumentation verfügbar", + new_tag: "Neues Attribut", + edit_tags: "Attribute bearbeiten", + okay: "OK", + view_on_osm: "auf OSM ansehen" }, layerswitcher: { @@ -190,8 +182,46 @@ locale.de = { reset: "Zurücksetzen" }, + restore: { + description: "Es gibt ungespeicherte Änderungen aus einer vorherigen Sitzung. Möchtest du diese Änderungen wiederherstellen?", + restore: "Wiederherstellen", + reset: "Zurücksetzen" + }, + + save: { + title: "Speichern", + help: "Speichere Änderungen auf OpenStreetMap, um diese für andere Nutzer sichtbar zu machen", + error: "Beim Speichern ist ein Fehler aufgetreten", + uploading: "Änderungen werden zu OpenStreetMap hochgeladen.", + unsaved_changes: "Ungespeicherte Änderugen vorhanden", + }, + + splash: { + welcome: "Willkommen beim iD OpenStreetMap editor", + text: "Dies ist eine Entwicklungsversion {version}. Für weitere Informationen besuche {website} und melde Fehler unter {github}." + }, + source_switch: { live: "live", dev: "dev" + }, + + tag_reference: { + description: "Beschreibung", + on_wiki: "{tag} auf wiki.osm.org", + used_with: "benutzt mit {type}" + }, + + validations: { + untagged_point: "Punkt ohne Attribute, der kein Teil einer Linie oder Fläche ist", + untagged_line: "Linie ohne Attribute", + untagged_area: "Fläche ohne Attribute", + tag_suggests_area: "Das Attribut {tag} suggeriert eine Fläche, ist aber keine Fläche", + deprecated_tags: "Veralterte Attribute: {tags}" + }, + + zoom: { + in: "Hineinzoomen", + out: "Herauszoomen" } }; diff --git a/locale/en.js b/locale/en.js index 007c8e5be..bd26f932b 100644 --- a/locale/en.js +++ b/locale/en.js @@ -128,42 +128,32 @@ locale.en = { } }, - validations: { - untagged_point: "Untagged point which is not part of a line or area", - untagged_line: "Untagged line", - untagged_area: "Untagged area", - tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area", - deprecated_tags: "Deprecated tags: {tags}" - }, - - save: "Save", - unsaved_changes: "You have unsaved changes", - save_help: "Save changes to OpenStreetMap, making them visible to other users", - no_changes: "You don't have any changes to save.", - save_error: "An error occurred while trying to save", - uploading_changes: "Uploading changes to OpenStreetMap.", - just_edited: "You Just Edited OpenStreetMap!", - okay: "Okay", - - "zoom-in": "Zoom In", - "zoom-out": "Zoom Out", - nothing_to_undo: "Nothing to undo.", nothing_to_redo: "Nothing to redo.", + just_edited: "You Just Edited OpenStreetMap!", browser_notice: "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.", + view_on_osm: "View on OSM", + zoom_in_edit: "zoom in to edit the map", + logout: "logout", + report_a_bug: "report a bug", - inspector: { - no_documentation_combination: "There is no documentation available for this tag combination", - no_documentation_key: "There is no documentation available for this key", - new_tag: "New Tag" + commit: { + title: "Save Changes", + description_placeholder: "Brief description of your contributions", + upload_explanation: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.", + save: "Save", + cancel: "Cancel", + warnings: "Warnings", + modified: "Modified", + deleted: "Deleted", + created: "Created" }, - view_on_osm: "View on OSM", - - zoom_in_edit: "zoom in to edit the map", - - edit_tags: "Edit tags", + contributors: { + list: "Viewing contributions by {users}", + truncated_list: "Viewing contributions by {users} and {count} others" + }, geocoder: { title: "Find A Place", @@ -171,11 +161,18 @@ locale.en = { no_results: "Couldn't locate a place named '{name}'" }, - description: "Description", + geolocate: { + title: "Show My Location" + }, - logout: "logout", - - report_a_bug: "report a bug", + inspector: { + no_documentation_combination: "There is no documentation available for this tag combination", + no_documentation_key: "There is no documentation available for this key", + new_tag: "New Tag", + edit_tags: "Edit tags", + okay: "Okay", + view_on_osm: "View on OSM" + }, layerswitcher: { title: "Background", @@ -185,13 +182,46 @@ locale.en = { reset: "reset" }, - contributors: { - list: "Viewing contributions by {users}", - truncated_list: "Viewing contributions by {users} and {count} others" + restore: { + description: "You have unsaved changes from a previous editing session. Do you wish to restore these changes?", + restore: "Restore", + reset: "Reset" + }, + + save: { + title: "Save", + help: "Save changes to OpenStreetMap, making them visible to other users", + error: "An error occurred while trying to save", + uploading: "Uploading changes to OpenStreetMap.", + unsaved_changes: "You have unsaved changes" + }, + + splash: { + welcome: "Welcome to the iD OpenStreetMap editor", + text: "This is development version {version}. For more information see {website} and report bugs at {github}." }, source_switch: { live: "live", dev: "dev" + }, + + tag_reference: { + description: "Description", + on_wiki: "{tag} on wiki.osm.org", + used_with: "used with {type}" + }, + + validations: { + untagged_point: "Untagged point which is not part of a line or area", + untagged_line: "Untagged line", + untagged_area: "Untagged area", + tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area", + deprecated_tags: "Deprecated tags: {tags}" + }, + + zoom: { + in: "Zoom In", + out: "Zoom Out" } }; diff --git a/locale/es.js b/locale/es.js index 4bb5f3959..2d47ecfe6 100644 --- a/locale/es.js +++ b/locale/es.js @@ -128,42 +128,32 @@ locale.es = { } }, - validations: { - untagged_point: "Punto sin etiquetar que no es parte de una línea ni zona.", //"Untagged point which is not part of a line or area", - untagged_line: "Línea sin etiquetar", //"Untagged line", - untagged_area: "Zona sin etiquetar", //"Untagged area", - tag_suggests_area: "La etiqueta {tag} sugiere que esta línea debería ser una zona, pero no lo es.", //"The tag {tag} suggests line should be area, but it is not an area", - deprecated_tags: "Etiquetas obsoletas: {tags}" //"Deprecated tags: {tags}" - }, - - save: "Guardar", //"Save", - unsaved_changes: "Tienes cambios sin guardar", //"You have unsaved changes", - save_help: "Guardar los cambios en OpenStreetMap haciéndolos visibles a otros usuarios", //"Save changes to OpenStreetMap, making them visible to other users", - no_changes: "No tienes cambios sin guardar", //"You don't have any changes to save.", - save_error: "Ha ocurrido un error tratando de guardar", //"An error occurred while trying to save", - uploading_changes: "Subiendo cambios a OpenStreetMap", //"Uploading changes to OpenStreetMap.", - just_edited: "Acabas de editar OpenStreetMap!", //"You Just Edited OpenStreetMap!", - okay: "OK", //"Okay", - - "zoom-in": "Aumentar", // "Zoom In", - "zoom-out": "Alejar", //"Zoom Out", - nothing_to_undo: "Nada para deshacer", //"Nothing to undo.", nothing_to_redo: "Nada para rehacer", //"Nothing to redo.", + just_edited: "Acabas de editar OpenStreetMap!", //"You Just Edited OpenStreetMap!", browser_notice: "Este editor soporta Firefox, Chrome, Safari, Opera e Internet Explorer 9 o superior. Por favor actualiza tu navegador o utiliza Potlatch 2 para editar el mapa.", //"This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.", + view_on_osm: "Ver en OSM", //"View on OSM", + zoom_in_edit: "acercar para editar el mapa", //"zoom in to edit the map", + logout: "cerrar sesión", //"logout", + report_a_bug: "reportar un error", //"report a bug", - inspector: { - no_documentation_combination: "No hay documentación disponible para esta combinación de etiquetas", //"This is no documentation available for this tag combination", - no_documentation_key: "No hay documentación disponible para esta tecla", //"This is no documentation available for this key", - new_tag: "Nueve etiqueta" //"New Tag" + commit: { + title: "Save Changes", + description_placeholder: "Brief description of your contributions", + upload_explanation: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.", + save: "Save", + cancel: "Cancel", + warnings: "Warnings", + modified: "Modified", + deleted: "Deleted", + created: "Created" }, - view_on_osm: "Ver en OSM", //"View on OSM", - - zoom_in_edit: "acercar para editar el mapa", //"zoom in to edit the map", - - edit_tags: "Editar etiquetas", //"Edit tags", + contributors: { + list: "Viendo las contribuciones de usuarios {users}", //"Viewing contributions by {users}", + truncated_list: "Viendo las contribuciones de {users} y {count} más" //"Viewing contributions by {users} and {count} others" + }, geocoder: { title: "Encontrar un lugar", //"Find A Place", @@ -171,11 +161,18 @@ locale.es = { no_results: "No se pudo encontrar el lugar llamado '{name}'" //"Couldn't locate a place named '{name}'" }, - description: "Descripción", //"Description", + geolocate: { + title: "Show My Location" + }, - logout: "cerrar sesión", //"logout", - - report_a_bug: "reportar un error", //"report a bug", + inspector: { + no_documentation_combination: "No hay documentación disponible para esta combinación de etiquetas", //"This is no documentation available for this tag combination", + no_documentation_key: "No hay documentación disponible para esta tecla", //"This is no documentation available for this key", + new_tag: "Nueve etiqueta", //"New Tag" + edit_tags: "Editar etiquetas", //"Edit tags", + okay: "OK", + view_on_osm: "View on OSM" + }, layerswitcher: { title: "Fondo", //"Background", @@ -185,13 +182,46 @@ locale.es = { reset: "reiniciar" //"reset" }, - contributors: { - list: "Viendo las contribuciones de usuarios {users}", //"Viewing contributions by {users}", - truncated_list: "Viendo las contribuciones de {users} y {count} más" //"Viewing contributions by {users} and {count} others" + restore: { + description: "You have unsaved changes from a previous editing session. Do you wish to restore these changes?", + restore: "Restore", + reset: "Reset" + }, + + save: { + title: "Guardar", //"Save", + help: "Guardar los cambios en OpenStreetMap haciéndolos visibles a otros usuarios", //"Save changes to OpenStreetMap, making them visible to other users", + error: "Ha ocurrido un error tratando de guardar", //"An error occurred while trying to save", + uploading: "Subiendo cambios a OpenStreetMap", //"Uploading changes to OpenStreetMap.", + unsaved_changes: "Tienes cambios sin guardar" //"You have unsaved changes", + }, + + splash: { + welcome: "Welcome to the iD OpenStreetMap editor", + text: "This is development version {version}. For more information see {website} and report bugs at {github}." }, source_switch: { live: "en vivo", //"live", dev: "dev" + }, + + tag_reference: { + description: "Descripción", + on_wiki: "{tag} on wiki.osm.org", + used_with: "used with {type}" + }, + + validations: { + untagged_point: "Punto sin etiquetar que no es parte de una línea ni zona.", //"Untagged point which is not part of a line or area", + untagged_line: "Línea sin etiquetar", //"Untagged line", + untagged_area: "Zona sin etiquetar", //"Untagged area", + tag_suggests_area: "La etiqueta {tag} sugiere que esta línea debería ser una zona, pero no lo es.", //"The tag {tag} suggests line should be area, but it is not an area", + deprecated_tags: "Etiquetas obsoletas: {tags}" //"Deprecated tags: {tags}" + }, + + zoom: { + in: "Aumentar", // "Zoom In", + out: "Alejar" //"Zoom Out", } }; diff --git a/locale/fr.js b/locale/fr.js index adf4a2d26..4716080cc 100644 --- a/locale/fr.js +++ b/locale/fr.js @@ -128,60 +128,52 @@ locale.fr = { } }, - validations: { - untagged_point: "Point sans aucun tag ne faisant partie ni d'une ligne, ni d'un polygone", - untagged_line: "Ligne sans aucun tag", - untagged_area: "Polygone sans aucun tag", - tag_suggests_area: "Ce tag {tag} suppose que cette ligne devrait être un polygone, or ce n'est pas le cas", - deprecated_tags: "Tags obsolètes : {tags}" - }, - - save: "Sauvegarder", - unsaved_changes: "Vous avez des modifications non enregistrées", - save_help: "Envoie des modifications au serveyr OpenStreetMap afin qu'elles soient visibles par les autres contributeurs.", - no_changes: "Vous n'avez aucune modification à enregistrer.", - save_error: "Une erreur est survenue lors de l'enregistrement des données", - uploading_changes: "Envoie des modifications vers OpenStreetMap.", - just_edited: "Vous venez de participer à OpenStreetMap!", - okay: "Okay", - - "zoom-in": "Zoomer", - "zoom-out": "Dézoomer", - nothing_to_undo: "Rien à annuler.", nothing_to_redo: "Rien à refaire.", + just_edited: "Vous venez de participer à OpenStreetMap!", browser_notice: "Les navigateurs supportés par cet éditeur sont : Firefox, Chrome, Safari, Opera et Internet Explorer (version 9 et supérieures). Pour éditer la carte, veuillez mettre à jour votre navigateur ou utiliser Potlatch 2.", - - inspector: { - no_documentation_combination: "Aucune documentation n'est disponible pour cette combinaison de tag", - no_documentation_key: "Aucune documentation n'est disponible pour cette clé", - new_tag: "Nouveau tag" - }, - view_on_osm: "Consulter dans OSM", - zoom_in_edit: "Zoomer pour modifier la carte", - - edit_tags: "Editer les tags", - - geocoder: { - title: "Trouver un emplacement", - placeholder: "Trouver un endroit", - no_results: "Impossible de localiser l'endroit nommé '{name}'" - }, - - description: "Déscription", - logout: "Déconnexion", - report_a_bug: "Signaler un bug", + commit: { + title: "Save Changes", + description_placeholder: "Brief description of your contributions", + upload_explanation: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.", + save: "Save", + cancel: "Cancel", + warnings: "Warnings", + modified: "Modified", + deleted: "Deleted", + created: "Created" + }, + contributors: { list: "Consulter les contributions de {users}", truncated_list: "Consulter les contributions de {users} et {count} les autres" }, + geocoder: { + title: "Trouver un emplacement", + placeholder: "Trouver un endroit", + no_results: "Impossible de localiser l'endroit nommé '{name}'" + }, + + geolocate: { + title: "Show My Location" + }, + + inspector: { + no_documentation_combination: "Aucune documentation n'est disponible pour cette combinaison de tag", + no_documentation_key: "Aucune documentation n'est disponible pour cette clé", + new_tag: "Nouveau tag", + edit_tags: "Editer les tags", + okay: "Okay", + view_on_osm: "View on OSM" + }, + layerswitcher: { title: "Fond de carte", description: "Paramètres du fond de carte", @@ -190,8 +182,46 @@ locale.fr = { reset: "reset" }, + restore: { + description: "You have unsaved changes from a previous editing session. Do you wish to restore these changes?", + restore: "Restore", + reset: "Reset" + }, + + save: { + title: "Sauvegarder", + help: "Envoie des modifications au serveyr OpenStreetMap afin qu'elles soient visibles par les autres contributeurs.", + error: "Une erreur est survenue lors de l'enregistrement des données", + uploading: "Envoie des modifications vers OpenStreetMap.", + unsaved_changes: "Vous avez des modifications non enregistrées" + }, + + splash: { + welcome: "Welcome to the iD OpenStreetMap editor", + text: "This is development version {version}. For more information see {website} and report bugs at {github}." + }, + source_switch: { live: "live", dev: "dev" + }, + + tag_reference: { + description: "Déscription", + on_wiki: "{tag} on wiki.osm.org", + used_with: "used with {type}" + }, + + validations: { + untagged_point: "Point sans aucun tag ne faisant partie ni d'une ligne, ni d'un polygone", + untagged_line: "Ligne sans aucun tag", + untagged_area: "Polygone sans aucun tag", + tag_suggests_area: "Ce tag {tag} suppose que cette ligne devrait être un polygone, or ce n'est pas le cas", + deprecated_tags: "Tags obsolètes : {tags}" + }, + + zoom: { + in: "Zoomer", + out: "Dézoomer" } }; diff --git a/locale/ja.js b/locale/ja.js index b002f54bf..3d4abec79 100644 --- a/locale/ja.js +++ b/locale/ja.js @@ -128,42 +128,32 @@ locale.ja = { } }, - validations: { - untagged_point: "ポイントにタグが付与されておらず、ラインやエリアの一部でもありません", - untagged_line: "ラインにタグが付与されていません", - untagged_area: "エリアにタグが付与されていません", - tag_suggests_area: "ラインに {tag} タグが付与されています。エリアで描かれるべきです", - deprecated_tags: "タグの重複: {tags}" - }, - - save: "Save", - unsaved_changes: "変更が保存されていません", - save_help: "変更点をOpenStreetMapに保存し、他ユーザが確認できるようにします", - no_changes: "変更点がありません", - save_error: "データ保存中にエラーが発生しました", - uploading_changes: "変更点をOpenStreetMapへアップロードしています", - just_edited: "OpenStreetMap編集完了！", - okay: "OK", - - "zoom-in": "ズームイン", - "zoom-out": "ズームアウト", - nothing_to_undo: "やり直す変更点がありません", nothing_to_redo: "やり直した変更点がありません", + just_edited: "OpenStreetMap編集完了！", browser_notice: "このエディタは Firefox, Chrome, Safari, Opera, および Internet Explorer 9 以上をサポートしています。ブラウザのバージョンを更新するか、Potlatch 2を使用して編集してください", + view_on_osm: "OSMで確認", + zoom_in_edit: "編集するにはさらに地図を拡大してください", + logout: "ログアウト", + report_a_bug: "バグを報告", - inspector: { - no_documentation_combination: "このタグの組み合わせに関する説明文はありません", - no_documentation_key: "このキーに対する説明文はありません", - new_tag: "新規タグ" + commit: { + title: "Save Changes", + description_placeholder: "Brief description of your contributions", + upload_explanation: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.", + save: "Save", + cancel: "Cancel", + warnings: "Warnings", + modified: "Modified", + deleted: "Deleted", + created: "Created" }, - view_on_osm: "OSMで確認", - - zoom_in_edit: "編集するにはさらに地図を拡大してください", - - edit_tags: "タグを編集", + contributors: { + list: "{users} による編集履歴を確認", + truncated_list: "{users} とその他 {count} 人による編集履歴を表示" + }, geocoder: { title: "特定地点を検索", @@ -171,11 +161,18 @@ locale.ja = { no_results: "'{name}' という名称の地点が見つかりません" }, - description: "説明", + geolocate: { + title: "Show My Location" + }, - logout: "ログアウト", - - report_a_bug: "バグを報告", + inspector: { + no_documentation_combination: "このタグの組み合わせに関する説明文はありません", + no_documentation_key: "このキーに対する説明文はありません", + new_tag: "新規タグ", + edit_tags: "タグを編集", + okay: "OK", + view_on_osm: "View on OSM" + }, layerswitcher: { title: "背景画像", @@ -185,13 +182,46 @@ locale.ja = { reset: "設定リセット" }, - contributors: { - list: "{users} による編集履歴を確認", - truncated_list: "{users} とその他 {count} 人による編集履歴を表示" + restore: { + description: "You have unsaved changes from a previous editing session. Do you wish to restore these changes?", + restore: "Restore", + reset: "Reset" + }, + + save: { + title: "Save", + help: "変更点をOpenStreetMapに保存し、他ユーザが確認できるようにします", + error: "データ保存中にエラーが発生しました", + uploading: "変更点をOpenStreetMapへアップロードしています", + unsaved_changes: "変更が保存されていません" + }, + + splash: { + welcome: "Welcome to the iD OpenStreetMap editor", + text: "This is development version {version}. For more information see {website} and report bugs at {github}." }, source_switch: { live: "本番サーバ", dev: "開発サーバ" + }, + + tag_reference: { + description: "説明", + on_wiki: "{tag} on wiki.osm.org", + used_with: "used with {type}" + }, + + validations: { + untagged_point: "ポイントにタグが付与されておらず、ラインやエリアの一部でもありません", + untagged_line: "ラインにタグが付与されていません", + untagged_area: "エリアにタグが付与されていません", + tag_suggests_area: "ラインに {tag} タグが付与されています。エリアで描かれるべきです", + deprecated_tags: "タグの重複: {tags}" + }, + + zoom: { + in: "ズームイン", + out: "ズームアウト" } }; diff --git a/locale/lv.js b/locale/lv.js index 1d55450f8..9eb93f387 100644 --- a/locale/lv.js +++ b/locale/lv.js @@ -128,42 +128,32 @@ locale.lv = { } }, - validations: { - untagged_point: "Neapzīmēts punkts", - untagged_line: "Neapzīmēta līnija", - untagged_area: "Neapzīmēts apgabals", - tag_suggests_area: "Apzīmējums {tag} parasti tiek lietots apgabaliem, bet objekts nav apgabals", - deprecated_tags: "Novecojuši apzīmējumi: {tags}" - }, - - save: "Saglabāt", - unsaved_changes: "Jums ir nesaglabātas izmaiņas", - save_help: "Saglabā izmaiņas, padarot tās redzamas citiem", - no_changes: "Jums nav izmaiņu, ko saglabāt", - save_error: "Kļūda. Nevarēja saglabāt maiņas", - uploading_changes: "Augšupielādē", - just_edited: "Jūs nupat rediģējāt OpenStreetMap", - okay: "Labi", - - "zoom-in": "Pietuvināt", - "zoom-out": "Attālināt", - nothing_to_undo: "Nav nekā, ko atcelt", nothing_to_redo: "Nav nekā, ko atsaukt", + just_edited: "Jūs nupat rediģējāt OpenStreetMap", browser_notice: "Šis redaktors tiek atbalstīts ar Firefox, Chrome, Safari, Opera, un Internet Explorer 9 un jaunāku. Lūdzu, atjauniniet savu pārlūkprogrammu vai izmantojiet Potlatch 2 to kartes rediģēšanai", + view_on_osm: "Apskatīt OSM lapu", + zoom_in_edit: "pietuviniet, lai rediģētu karti", + logout: "atslēgties", + report_a_bug: "ziņot par kļūdu", - inspector: { - no_documentation_combination: "Šai apzīmējumu kombinācijai nav piejama dokumetācija", - no_documentation_key: "There is no documentation available for this key", - new_tag: "Jauns apzīmējums" + commit: { + title: "Save Changes", + description_placeholder: "Brief description of your contributions", + upload_explanation: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.", + save: "Save", + cancel: "Cancel", + warnings: "Warnings", + modified: "Modified", + deleted: "Deleted", + created: "Created" }, - view_on_osm: "Apskatīt OSM lapu", - - zoom_in_edit: "pietuviniet, lai rediģētu karti", - - edit_tags: "Rediģēt apzīmējumus", + contributors: { + list: "{users} papildinājumi redzami", + truncated_list: "{users} un {count} citu papildinājumi redzami" + }, geocoder: { title: "Atrast vietu", @@ -171,11 +161,18 @@ locale.lv = { no_results: "Nevar atrast vietu '{name}'" }, - description: "Apraksts", + geolocate: { + title: "Show My Location" + }, - logout: "atslēgties", - - report_a_bug: "ziņot par kļūdu", + inspector: { + no_documentation_combination: "Šai apzīmējumu kombinācijai nav piejama dokumetācija", + no_documentation_key: "There is no documentation available for this key", + new_tag: "Jauns apzīmējums", + edit_tags: "Rediģēt apzīmējumus", + okay: "Labi", + view_on_osm: "View on OSM" + }, layerswitcher: { title: "Fons", @@ -185,13 +182,46 @@ locale.lv = { reset: "Pārstatīt" }, - contributors: { - list: "{users} papildinājumi redzami", - truncated_list: "{users} un {count} citu papildinājumi redzami" + restore: { + description: "You have unsaved changes from a previous editing session. Do you wish to restore these changes?", + restore: "Restore", + reset: "Reset" + }, + + save: { + title: "Saglabāt", + help: "Saglabā izmaiņas, padarot tās redzamas citiem", + error: "Kļūda. Nevarēja saglabāt maiņas", + uploading: "Augšupielādē", + unsaved_changes: "Jums ir nesaglabātas izmaiņas" + }, + + splash: { + welcome: "Welcome to the iD OpenStreetMap editor", + text: "This is development version {version}. For more information see {website} and report bugs at {github}." }, source_switch: { live: "live", dev: "dev" + }, + + tag_reference: { + description: "Apraksts", + on_wiki: "{tag} on wiki.osm.org", + used_with: "used with {type}" + }, + + validations: { + untagged_point: "Neapzīmēts punkts", + untagged_line: "Neapzīmēta līnija", + untagged_area: "Neapzīmēts apgabals", + tag_suggests_area: "Apzīmējums {tag} parasti tiek lietots apgabaliem, bet objekts nav apgabals", + deprecated_tags: "Novecojuši apzīmējumi: {tags}" + }, + + zoom: { + in: "Pietuvināt", + out: "Attālināt" } }; diff --git a/locale/tr.js b/locale/tr.js index d14f08ecb..402d822f1 100644 --- a/locale/tr.js +++ b/locale/tr.js @@ -128,42 +128,32 @@ locale.tr = { } }, - validations: { - untagged_point: "Herhangi bir çizgi ya da alana bağlantısı olmayan ve etiketlenmemiş bir nokta.", - untagged_line: "Etiketlenmemiş çizgi", - untagged_area: "Etiketlenmemiş alan", - tag_suggests_area: "{tag} etiketi buranın alan olmasını tavsiye ediyor ama alan değil.", - deprecated_tags: "Kullanımdan kaldırılmış etiket : {tags}" - }, - - save: "Kaydet", - unsaved_changes: "Kaydedilmemiş değişiklikleriniz var", - save_help: "Diğer kullanıcıların yaptığınız değişiklikleri görmesi için OpenStreetMap'e kaydediniz", - no_changes: "Kaydedecek hiçbir değişikliğiniz yok", - save_error: "Kaydederken bir hata oluştu", - uploading_changes: "Değişiklikleriniz OpenStreetMap'e gönderiliyor.", - just_edited: "Şu an OpenStreetMap'de bir değişiklik yaptınız!", - okay: "Tamam", - - "zoom-in": "Yaklaş", - "zoom-out": "Uzaklaş", - nothing_to_undo: "Geri alınacak birşey yok.", nothing_to_redo: "Tekrar yapılacak birşey yok.", + just_edited: "Şu an OpenStreetMap'de bir değişiklik yaptınız!", browser_notice: "Bu editör sadece Firefox, Chrome, Safari, Opera ile Internet Explorer 9 ve üstü tarayıcılarda çalışmaktadır. Lütfen tarayınıcı güncelleyin ya da Potlatch 2'yi kullanarak haritada güncelleme yapınız.", + view_on_osm: "OSM üstünde Gör", + zoom_in_edit: "Güncelleme yapmak için haritada yakınlaşmalısınız", + logout: "Çıkış", + report_a_bug: "Hata rapor et", - inspector: { - no_documentation_combination: "Bu etiket kombinasyonu için dökümantasyon bulunmamaktadır.", - no_documentation_key: "Bu anahtar için dökümantasyon bulunmamaktadır.", - new_tag: "Yeni Etiket" + commit: { + title: "Save Changes", + description_placeholder: "Brief description of your contributions", + upload_explanation: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.", + save: "Save", + cancel: "Cancel", + warnings: "Warnings", + modified: "Modified", + deleted: "Deleted", + created: "Created" }, - view_on_osm: "OSM üstünde Gör", - - zoom_in_edit: "Güncelleme yapmak için haritada yakınlaşmalısınız", - - edit_tags: "Etiketleri güncelle", + contributors: { + list: "{users} tarafından yapılan katkılar görünmektedir", + truncated_list: "{users} ve diğer {count} tarafından yapılan katkılar görünmektedir" + }, geocoder: { title: "Bir Yer Bul", @@ -171,11 +161,18 @@ locale.tr = { no_results: "'{name}' ismindeki yer bulunamadı" }, - description: "Açıklama", + geolocate: { + title: "Show My Location" + }, - logout: "Çıkış", - - report_a_bug: "Hata rapor et", + inspector: { + no_documentation_combination: "Bu etiket kombinasyonu için dökümantasyon bulunmamaktadır.", + no_documentation_key: "Bu anahtar için dökümantasyon bulunmamaktadır.", + new_tag: "Yeni Etiket", + edit_tags: "Etiketleri güncelle", + okay: "Tamam", + view_on_osm: "View on OSM" + }, layerswitcher: { title: "Arkaplan", @@ -185,13 +182,46 @@ locale.tr = { reset: "Sıfırla" }, - contributors: { - list: "{users} tarafından yapılan katkılar görünmektedir", - truncated_list: "{users} ve diğer {count} tarafından yapılan katkılar görünmektedir" + restore: { + description: "You have unsaved changes from a previous editing session. Do you wish to restore these changes?", + restore: "Restore", + reset: "Reset" + }, + + save: { + title: "Kaydet", + help: "Diğer kullanıcıların yaptığınız değişiklikleri görmesi için OpenStreetMap'e kaydediniz", + error: "Kaydederken bir hata oluştu", + uploading: "Değişiklikleriniz OpenStreetMap'e gönderiliyor.", + unsaved_changes: "Kaydedilmemiş değişiklikleriniz var" + }, + + splash: { + welcome: "Welcome to the iD OpenStreetMap editor", + text: "This is development version {version}. For more information see {website} and report bugs at {github}." }, source_switch: { live: "canlı", dev: "geliştirme" + }, + + tag_reference: { + description: "Açıklama", + on_wiki: "{tag} on wiki.osm.org", + used_with: "used with {type}" + }, + + validations: { + untagged_point: "Herhangi bir çizgi ya da alana bağlantısı olmayan ve etiketlenmemiş bir nokta.", + untagged_line: "Etiketlenmemiş çizgi", + untagged_area: "Etiketlenmemiş alan", + tag_suggests_area: "{tag} etiketi buranın alan olmasını tavsiye ediyor ama alan değil.", + deprecated_tags: "Kullanımdan kaldırılmış etiket : {tags}" + }, + + zoom: { + in: "Yaklaş", + out: "Uzaklaş" } }; diff --git a/test/index.html b/test/index.html index d9640c687..05482ab1f 100644 --- a/test/index.html +++ b/test/index.html @@ -63,7 +63,7 @@ - + @@ -136,14 +136,15 @@ - - - - + + + + + + - diff --git a/test/spec/behavior/select.js b/test/spec/behavior/select.js index 5e9bf9ea3..ecbb7e7b4 100644 --- a/test/spec/behavior/select.js +++ b/test/spec/behavior/select.js @@ -20,6 +20,8 @@ describe("iD.behavior.Select", function() { .enter().append('circle') .attr('class', function(d) { return d.id; }); + context.enter(iD.modes.Browse(context)); + behavior = iD.behavior.Select(context); context.install(behavior); }); @@ -30,32 +32,33 @@ describe("iD.behavior.Select", function() { container.remove(); }); - specify("click on entity selects the entity", function(done) { - happen.mousedown(context.surface().select('.' + a.id).node()); - window.setTimeout(function() { - expect(context.selection()).to.eql([a.id]); - done(); - }, 600); + specify("click on entity selects the entity", function() { + happen.click(context.surface().select('.' + a.id).node()); + expect(context.selection()).to.eql([a.id]); }); - specify("click on empty space clears the selection", function(done) { + specify("click on empty space clears the selection", function() { context.enter(iD.modes.Select(context, [a.id])); happen.click(context.surface().node()); - happen.mousedown(context.surface().node()); - happen.mouseup(context.surface().node()); - window.setTimeout(function() { - expect(context.selection()).to.eql([]); - done(); - }, 600); + expect(context.mode().id).to.eql('browse'); }); - specify("shift-click on entity adds the entity to the selection", function(done) { + specify("shift-click on unselected entity adds it to the selection", function() { context.enter(iD.modes.Select(context, [a.id])); - happen.mousedown(context.surface().select('.' + b.id).node(), {shiftKey: true}); - window.setTimeout(function() { - expect(context.selection()).to.eql([a.id, b.id]); - done(); - }, 600); + happen.click(context.surface().select('.' + b.id).node(), {shiftKey: true}); + expect(context.selection()).to.eql([a.id, b.id]); + }); + + specify("shift-click on selected entity removes it from the selection", function() { + context.enter(iD.modes.Select(context, [a.id, b.id])); + happen.click(context.surface().select('.' + b.id).node(), {shiftKey: true}); + expect(context.selection()).to.eql([a.id]); + }); + + specify("shift-click on last selected entity clears the selection", function() { + context.enter(iD.modes.Select(context, [a.id])); + happen.click(context.surface().select('.' + a.id).node(), {shiftKey: true}); + expect(context.mode().id).to.eql('browse'); }); specify("shift-click on empty space leaves the selection unchanged", function() { diff --git a/test/spec/translation.js b/test/spec/translation.js index 963f59fe0..41f2e07df 100644 --- a/test/spec/translation.js +++ b/test/spec/translation.js @@ -27,7 +27,8 @@ describe('translations', function() { var allkeys = _.flatten(_.values(languageKeys)); _.forEach(languageKeys, function(l, k) { - expect(_.difference(allkeys, l)).to.eql([]); + var diff = _.difference(allkeys, l).join(", "); + expect(diff).to.equal(""); }); }); diff --git a/test/spec/ui/geocoder.js b/test/spec/ui/geocoder.js index 54a7e571c..91e107ee2 100644 --- a/test/spec/ui/geocoder.js +++ b/test/spec/ui/geocoder.js @@ -1,6 +1,6 @@ -describe("iD.ui.geocoder", function () { +describe("iD.ui.Geocoder", function () { it('can be instantiated', function () { - var geocoder = iD.ui.geocoder(); + var geocoder = iD.ui.Geocoder(); expect(geocoder).to.be.ok; }); }); diff --git a/test/spec/ui/inspector.js b/test/spec/ui/inspector.js index e92604a7a..17160ddb4 100644 --- a/test/spec/ui/inspector.js +++ b/test/spec/ui/inspector.js @@ -1,10 +1,10 @@ -describe("iD.ui.inspector", function () { +describe("iD.ui.Inspector", function () { var inspector, element, tags = {highway: 'residential'}, entity, graph, context; function render() { - inspector = iD.ui.inspector().context(context); + inspector = iD.ui.Inspector().context(context); element = d3.select('body') .append('div') .attr('id', 'inspector-wrap')