Update doubletap icon

Use consistent close button
Update a few strings
This commit is contained in:
Quincy Morgan
2020-07-13 14:33:49 -04:00
parent 85e02dea87
commit 99383355b2
8 changed files with 16 additions and 18 deletions
+4 -4
View File
@@ -1315,7 +1315,7 @@ en:
select_h: "Select"
select_left_click: "{leftclick} Left-click or {tap_icon} tap a feature to select it. This will highlight it with a pulsing glow and display further details about it in the sidebar."
select_right_click: "{rightclick} Right-click or {longpress_icon} long-press a feature to display the edit menu, which provides commands such as copy, rotate, and delete."
select_space: "The `{space}` key can also be used in place of left-click when selecting and drawing."
select_space: "The `{space}` key can also be used instead of left-click when selecting and drawing."
multiselect_h: "Multiselect"
multiselect: "Selecting multiple features together lets you quickly edit them all at once."
multiselect_shift_click: "With a mouse and keyboard, hold `{shift}` and {leftclick} left-click features to add them to the selection. On a touchscreen, {longpress_icon} tap-and-hold one feature while {tap_icon} tapping additional features with another finger."
@@ -1352,7 +1352,7 @@ en:
add_point: "To add a point, press the {point_icon} **{point}** button on the toolbar above the map, or press the shortcut key `1`."
add_point_finish: "Next, place the new point on the map. With a mouse, position the cursor where the point should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location."
move_point_h: "Moving Points"
move_point: "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen."
move_point: "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen."
delete_point_h: "Deleting Points"
delete_point: "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it."
delete_point_command: "To delete a point, {rightclick} right-click or {longpress_icon} long-press the point to show the edit menu, then use the {delete_icon} **{delete}** command."
@@ -1428,7 +1428,7 @@ en:
add_note_h: "Adding Notes"
add_note: "To add a new note, press the {note_icon} **{note}** button on the toolbar above the map, or press the shortcut key `{add_note_key}`."
place_note: "Next, place the new note on the map. With a mouse, position the cursor where the note should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location."
move_note: "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen. Only new notes can be moved."
move_note: "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen. Only new notes can be moved."
update_note_h: "Closing, Reopening, and Commenting"
update_note: "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved."
save_note_h: "Saving Notes"
@@ -2051,7 +2051,7 @@ en:
retry_building: "It looks like you had some trouble placing the nodes at the building corners. Try again!"
choose_category_building: "**Choose {category} from the list.**"
choose_preset_house: "There are many different types of buildings, but this one is clearly a house.{br}If you're not sure of the type, it's OK to just choose the generic Building type. **Choose the {preset} type.**"
close: "**Press `{esc}` or the {apply} button to close the feature editor.**"
close: "**Press the {button} button or `{esc}` to close the feature editor.**"
rightclick_building: "**{rightclick} Right-click to select the building you created and show the edit menu.**"
edit_menu_building_touch: "**{longpress_icon} Long-press the building you created to show the edit menu.**"
square_building: "The house that you just added will look even better with perfectly square corners. **Press the {orthogonalize_icon} {orthogonalize} button to tidy up the building's shape.**"
+4 -4
View File
@@ -1651,7 +1651,7 @@
"select_h": "Select",
"select_left_click": "{leftclick} Left-click or {tap_icon} tap a feature to select it. This will highlight it with a pulsing glow and display further details about it in the sidebar.",
"select_right_click": "{rightclick} Right-click or {longpress_icon} long-press a feature to display the edit menu, which provides commands such as copy, rotate, and delete.",
"select_space": "The `{space}` key can also be used in place of left-click when selecting and drawing.",
"select_space": "The `{space}` key can also be used instead of left-click when selecting and drawing.",
"multiselect_h": "Multiselect",
"multiselect": "Selecting multiple features together lets you quickly edit them all at once.",
"multiselect_shift_click": "With a mouse and keyboard, hold `{shift}` and {leftclick} left-click features to add them to the selection. On a touchscreen, {longpress_icon} tap-and-hold one feature while {tap_icon} tapping additional features with another finger.",
@@ -1690,7 +1690,7 @@
"add_point": "To add a point, press the {point_icon} **{point}** button on the toolbar above the map, or press the shortcut key `1`.",
"add_point_finish": "Next, place the new point on the map. With a mouse, position the cursor where the point should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location.",
"move_point_h": "Moving Points",
"move_point": "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen.",
"move_point": "To move a point, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen.",
"delete_point_h": "Deleting Points",
"delete_point": "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it.",
"delete_point_command": "To delete a point, {rightclick} right-click or {longpress_icon} long-press the point to show the edit menu, then use the {delete_icon} **{delete}** command."
@@ -1770,7 +1770,7 @@
"add_note_h": "Adding Notes",
"add_note": "To add a new note, press the {note_icon} **{note}** button on the toolbar above the map, or press the shortcut key `{add_note_key}`.",
"place_note": "Next, place the new note on the map. With a mouse, position the cursor where the note should go and {leftclick} left-click. On a touchscreen, {tap_icon} tap the location.",
"move_note": "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap and drag it on a touchscreen. Only new notes can be moved.",
"move_note": "To move a note, {leftclick} left-click and drag it with a mouse or {touchdrag_icon} tap-and-drag it on a touchscreen. Only new notes can be moved.",
"update_note_h": "Closing, Reopening, and Commenting",
"update_note": "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved.",
"save_note_h": "Saving Notes",
@@ -2530,7 +2530,7 @@
"retry_building": "It looks like you had some trouble placing the nodes at the building corners. Try again!",
"choose_category_building": "**Choose {category} from the list.**",
"choose_preset_house": "There are many different types of buildings, but this one is clearly a house.{br}If you're not sure of the type, it's OK to just choose the generic Building type. **Choose the {preset} type.**",
"close": "**Press `{esc}` or the {apply} button to close the feature editor.**",
"close": "**Press the {button} button or `{esc}` to close the feature editor.**",
"rightclick_building": "**{rightclick} Right-click to select the building you created and show the edit menu.**",
"edit_menu_building_touch": "**{longpress_icon} Long-press the building you created to show the edit menu.**",
"square_building": "The house that you just added will look even better with perfectly square corners. **Press the {orthogonalize_icon} {orthogonalize} button to tidy up the building's shape.**",
+1 -1
View File
@@ -436,7 +436,7 @@ export function uiIntroArea(context, reveal) {
});
reveal('.entity-editor-pane',
helpString('intro.areas.describe_playground', { button: icon('#iD-icon-apply', 'pre-text') }),
helpString('intro.areas.describe_playground', { button: icon('#iD-icon-close', 'pre-text') }),
{ duration: 300 }
);
+3 -3
View File
@@ -9,7 +9,7 @@ import { t } from '../../core/localizer';
import { modeBrowse } from '../../modes/browse';
import { modeSelect } from '../../modes/select';
import { utilArrayUniq, utilRebind } from '../../util';
import { helpString, pad, isMostlySquare, selectMenuItem, transitionTime } from './helper';
import { helpString, icon, pad, isMostlySquare, selectMenuItem, transitionTime } from './helper';
export function uiIntroBuilding(context, reveal) {
@@ -300,7 +300,7 @@ export function uiIntroBuilding(context, reveal) {
timeout(function() {
reveal('.entity-editor-pane',
helpString('intro.buildings.close')
helpString('intro.buildings.close', { button: icon('#iD-icon-close', 'pre-text') })
);
}, 500);
@@ -628,7 +628,7 @@ export function uiIntroBuilding(context, reveal) {
timeout(function() {
reveal('.entity-editor-pane',
helpString('intro.buildings.close')
helpString('intro.buildings.close', { button: icon('#iD-icon-close', 'pre-text') })
);
}, 500);
-2
View File
@@ -67,8 +67,6 @@ export function helpString(id, replacements) {
layers_icon: icon('#iD-icon-layers', 'pre-text'),
data_icon: icon('#iD-icon-data', 'pre-text'),
inspect: icon('#iD-icon-inspect', 'pre-text'),
close: icon('#iD-icon-close', 'pre-text'),
apply: icon('#iD-icon-apply', 'pre-text'),
help_icon: icon('#iD-icon-help', 'pre-text'),
undo_icon: icon(localizer.textDirection() === 'rtl' ? '#iD-icon-redo' : '#iD-icon-undo', 'pre-text'),
redo_icon: icon(localizer.textDirection() === 'rtl' ? '#iD-icon-undo' : '#iD-icon-redo', 'pre-text'),
+1 -1
View File
@@ -338,7 +338,7 @@ export function uiIntroLine(context, reveal) {
timeout(function() {
reveal('.entity-editor-pane',
helpString('intro.lines.name_road', { button: icon('#iD-icon-apply', 'pre-text') }),
helpString('intro.lines.name_road', { button: icon('#iD-icon-close', 'pre-text') }),
{ tooltipClass: 'intro-lines-name_road' }
);
}, 500);
+1 -1
View File
@@ -351,7 +351,7 @@ export function uiIntroPoint(context, reveal) {
timeout(function() {
reveal('.entity-editor-pane',
helpString('intro.points.update_close', { button: icon('#iD-icon-apply', 'pre-text') })
helpString('intro.points.update_close', { button: icon('#iD-icon-close', 'pre-text') })
);
}, 500);
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<path d="M8.65123202,9.98761443 C5.89664863,9.7949952 3.81976633,7.40581541 4.01238557,4.65123202 C4.2050048,1.89664863 6.59418459,-0.180233669 9.34876798,0.0123855661 C12.1033514,0.205004801 14.1802337,2.59418459 13.9876144,5.34876798 C13.7949952,8.10335137 11.4058154,10.1802337 8.65123202,9.98761443 Z M8.72098562,8.99009155 C10.9246523,9.14418693 12.8359962,7.48268109 12.9900915,5.27901438 C13.1441869,3.07534767 11.4826811,1.16400384 9.27901438,1.00990845 C7.07534767,0.855813065 5.16400384,2.51731891 5.00990845,4.72098562 C4.85581307,6.92465233 6.51731891,8.83599616 8.72098562,8.99009155 Z M8.79073921,7.99256866 C7.13798918,7.87699712 5.8918598,6.44348925 6.00743134,4.79073921 C6.12300288,3.13798918 7.55651075,1.8918598 9.20926079,2.00743134 C10.8620108,2.12300288 12.1081402,3.55651075 11.9925687,5.20926079 C11.8769971,6.86201082 10.4434892,8.1081402 8.79073921,7.99256866 Z M8.86049281,6.99504577 C9.96232617,7.07209347 10.9179981,6.24134055 10.9950458,5.13950719 C11.0720935,4.03767383 10.2413405,3.08200192 9.13950719,3.00495423 C8.03767383,2.92790653 7.08200192,3.75865945 7.00495423,4.86049281 C6.92790653,5.96232617 7.75865945,6.91799808 8.86049281,6.99504577 Z" fill="currentColor"/>
<path d="M8,5 C8,4.44771525 8.44771525,4 9,4 C9.55228475,4 10,4.44771525 10,5 L10,9 C10,8.44771525 10.4477153,8 11,8 C11.5522847,8 12,8.44771525 12,9 L12,10 C12,9.44771525 12.4477153,9 13,9 C13.5522847,9 14,9.44771525 14,10 L14,11 C14,10.4477153 14.4477153,10 15,10 C15.5522847,10 16,10.4477153 16,11 L16,15 C16,17.209134 14.209143,18.999991 12.000009,18.999991 C11.2659918,19 10.5993221,19 10,19 C8.25562789,19 6.75375111,17.7687556 6.41165159,16.058258 L5.19611614,10.9805807 C5.10732158,10.5366079 5.39525043,10.1047146 5.83922323,10.01592 C5.89216058,10.0053326 5.94601429,10 6,10 C6.59719029,10 7.12737961,10.3821388 7.31622777,10.9486833 L8,13 L8,5 Z" fill="inherit"/>
<path d="M8.58147843,11.9851373 C5.27597836,11.7539942 2.7837196,8.8869785 3.01486268,5.58147843 C3.24600576,2.27597836 6.1130215,-0.216280402 9.41852157,0.0148626794 C12.7240216,0.246005761 15.2162804,3.1130215 14.9851373,6.41852157 C14.7539942,9.72402164 11.8869785,12.2162804 8.58147843,11.9851373 Z M8.65123202,10.9876144 C11.4058154,11.1802337 13.7949952,9.10335137 13.9876144,6.34876798 C14.1802337,3.59418459 12.1033514,1.2050048 9.34876798,1.01238557 C6.59418459,0.819766331 4.2050048,2.89664863 4.01238557,5.65123202 C3.81976633,8.40581541 5.89664863,10.7949952 8.65123202,10.9876144 Z M8.72098562,9.99009155 C6.51731891,9.83599616 4.85581307,7.92465233 5.00990845,5.72098562 C5.16400384,3.51731891 7.07534767,1.85581307 9.27901438,2.00990845 C11.4826811,2.16400384 13.1441869,4.07534767 12.9900915,6.27901438 C12.8359962,8.48268109 10.9246523,10.1441869 8.72098562,9.99009155 Z M8.86049281,7.99504577 C9.96232617,8.07209347 10.9179981,7.24134055 10.9950458,6.13950719 C11.0720935,5.03767383 10.2413405,4.08200192 9.13950719,4.00495423 C8.03767383,3.92790653 7.08200192,4.75865945 7.00495423,5.86049281 C6.92790653,6.96232617 7.75865945,7.91799808 8.86049281,7.99504577 Z" fill="currentColor"/>
<path d="M8,6 C8,5.44771525 8.44771525,5 9,5 C9.55228475,5 10,5.44771525 10,6 L10,10 C10,9.44771525 10.4477153,9 11,9 C11.5522847,9 12,9.44771525 12,10 L12,11 C12,10.4477153 12.4477153,10 13,10 C13.5522847,10 14,10.4477153 14,11 L14,12 C14,11.4477153 14.4477153,11 15,11 C15.5522847,11 16,11.4477153 16,12 L16,16 C16,18.209134 14.209143,19.999991 12.000009,19.999991 C11.2659918,20 10.5993221,20 10,20 C8.25562789,20 6.75375111,18.7687556 6.41165159,17.058258 L5.19611614,11.9805807 C5.10732158,11.5366079 5.39525043,11.1047146 5.83922323,11.01592 C5.89216058,11.0053326 5.94601429,11 6,11 C6.59719029,11 7.12737961,11.3821388 7.31622777,11.9486833 L8,14 L8,6 Z" fill="inherit"/>
</svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB