CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 05:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the custom background translation strings

Browse Source
This commit is contained in:
Bryan Housel
2018-08-11 01:31:26 -04:00
parent cde4caf168
commit 40c0c7d2f5
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+5 -2
View File
@@ -434,8 +434,6 @@ en:
best_imagery: Best known imagery source for this location
switch: Switch back to this background
custom: Custom
custom_button: Edit custom background
custom_prompt: "Enter a tile URL template. Valid tokens are:\n - {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n - {-y} or {ty} for flipped TMS-style Y coordinates\n - {u} for quadtile scheme\n - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}"
overlays: Overlays
imagery_source_faq: Imagery Info / Report a Problem
reset: reset
@@ -514,6 +512,11 @@ en:
full:
description: Full Fill
tooltip: "Areas are drawn fully filled."
settings:
custom_background:
tooltip: Edit custom background
heading: Custom Background Settings
instructions: "Enter a tile URL template. Valid tokens are:\n - {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n - {-y} or {ty} for flipped TMS-style Y coordinates\n - {u} for quadtile scheme\n - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}"
restore:
heading: You have unsaved changes
description: "Do you wish to restore unsaved changes from a previous editing session?"
dist/locales/en.json
Vendored
+7 -2
View File
@@ -529,8 +529,6 @@
"best_imagery": "Best known imagery source for this location",
"switch": "Switch back to this background",
"custom": "Custom",
"custom_button": "Edit custom background",
"custom_prompt": "Enter a tile URL template. Valid tokens are:\n - {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n - {-y} or {ty} for flipped TMS-style Y coordinates\n - {u} for quadtile scheme\n - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}",
"overlays": "Overlays",
"imagery_source_faq": "Imagery Info / Report a Problem",
"reset": "reset",
@@ -632,6 +630,13 @@
"tooltip": "Areas are drawn fully filled."
}
},
"settings": {
"custom_background": {
"tooltip": "Edit custom background",
"heading": "Custom Background Settings",
"instructions": "Enter a tile URL template. Valid tokens are:\n - {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n - {-y} or {ty} for flipped TMS-style Y coordinates\n - {u} for quadtile scheme\n - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}"
}
},
"restore": {
"heading": "You have unsaved changes",
"description": "Do you wish to restore unsaved changes from a previous editing session?",
modules/ui/background.js
+1 -1
View File
@@ -148,7 +148,7 @@ export function uiBackground(context) {
.append('button')
.attr('class', 'layer-browse')
.call(tooltip()
.title(t('background.custom_button'))
.title(t('settings.custom_background.tooltip'))
.placement((textDirection === 'rtl') ? 'right' : 'left')
)
.on('click', editCustom)
modules/ui/settings/custom_background.js
+6 -3
View File
@@ -20,12 +20,16 @@ export function uiSettingsCustomBackground(context) {
introModal
.append('div')
.attr('class','modal-section cf')
.append('h3').text(t('background.custom_heading'));
.append('h3')
.text(t('settings.custom_background.heading'));
introModal
.append('div')
.attr('class','modal-section')
.append('p').text(t('background.custom_prompt', { example: example }))
.append('pre')
.text(t('settings.custom_background.instructions', { example: example }));
introModal
.append('textarea');
@@ -40,7 +44,6 @@ export function uiSettingsCustomBackground(context) {
.append('div')
.attr('class', 'modal-section');
var cancelButton = buttonWrap
.append('button')
.attr('class', 'button-cancel')