OpenHistoricalMap / issues

File your issues here, regardless of repo until we get all our repos squared away; we don't want to miss anything.
Creative Commons Zero v1.0 Universal
17 stars 1 forks source link

Conform translation strings in updated overpass-turbo with old version #811

Open erictheise opened 1 month ago

erictheise commented 1 month ago

The upstream-catchup overpass-turbo went out in a bit of a hurry as the map style was disconnected and the build was broken. Translation strings need to be brought over and crowdsourced translation should be set up as per #470.

Hopefully one ticket can handle them both.

1ec5 commented 1 month ago

Does our fork of Overpass turbo contain any localizable messages of its own?

erictheise commented 1 month ago

Our fork doesn't seem to have any modified strings but it probably should.

These would be my candidates with the caveat that I don't know that we have all these functionalities. Some unmodified strings have been kept for context.

Any thoughts @jeffreyameyer, @danrademacher, @1ec5?

"load.saved_queries-osm": "Saved Queries (openhistoricalmap.org)",
"load.saved_queries-osm-loading": "Loading saved queries from openhistoricalmap.org...",
"load.saved_queries-osm-error": "An error occurred while loading saved queries from openhistoricalmap.org :(",

"export.raw_data": "raw OHM data",

"export.format_text_wiki": "<abbr title=\"For usage in the OHM wiki as a OverpassTurboExample-Template\">ohm wiki</abbr>",

"export.editors": "load data into an OHM editor:",

"export.map_view.permalink_osm": "to openhistoricalmap.org",

I'm not certain about these; the basic Overpass docs may be better than ours for general understanding.

"help.intro.0": "This is <i>overpass turbo</i>, a web-based data filtering tool for <a href=\"http://www.openhistoricalmap.org\">OpenHistoricalMap</a>.",
"help.intro.1": "With overpass turbo you can run <a href=\"https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Overpass\">Overpass API</a> queries and analyse the resulting OHM data interactively on a map.",
"help.intro.1b": "There is an integrated <a href=\"http://wiki.openstreetmap.org/wiki/Overpass_turbo/Wizard\">Wizard</a> which makes creating queries super easy.",
"help.intro.2": "More information about <a href=\"http://wiki.openstreetmap.org/wiki/Overpass_turbo\">overpass turbo</a> and how to write <a href=\"http://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL\">Overpass queries</a> can be found in the OSM wiki.",

"help.section.queries" : "Overpass Queries",
"help.queries.expl": "Overpass API allows to query for OHM data by your own search criteria. For this purpose, it has a specifically crafted <a href=\"http://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL\">query language</a>.",
"help.intro.shortcuts": "In addition to regular Overpass API queries one can use the following handy shortcuts in overpass turbo:",
"help.intro.shortcuts.bbox": "bounding box coordinates of the current map view",
"help.intro.shortcuts.center": "map center coordinates",
"help.intro.shortcuts.date": "ISO 8601 date-time-string a certain time interval ago (e.g. “24 hours”)",
"help.intro.shortcuts.style": "defines a <a href=\"http://wiki.openstreetmap.org/wiki/Overpass_turbo/MapCSS\">MapCSS stylesheet</a>",
"help.intro.shortcuts.custom": "Arbitrary shortcuts can be defined by putting <i>{{shortcut=value}}</i> somewhere in the script.",
"help.intro.shortcuts.more": "More overpass-turbo shortcuts, additional information about the above and usage examples can be found in the <a href=\"http://wiki.openstreetmap.org/wiki/Overpass_turbo/Extended_Overpass_Queries\">OSM wiki</a>.",

Our modifications are so slight that the upstream info about maintenance and feedback should take precedence although we could augment the credits.

"help.section.about": "About",
"help.about.maintained": "<i>overpass turbo</i> is maintained by Martin Raifer (tyr.asd at gmail.com).",
"help.about.feedback.title": "Feedback, Bug Reports, Feature Requests",
"help.about.feedback": "If you would like to give feedback, report issues or ask for a particular feature, please use the <a href=\"https://github.com/tyrasd/overpass-turbo/issues\">issue tracker</a> on github or the <a href=\"http://wiki.openstreetmap.org/wiki/Talk:Overpass_turbo\">discussion page</a> on the OSM-wiki.",
"help.about.source.title": "Source Code",
"help.about.source": "The <a href=\"https://github.com/tyrasd/overpass-turbo\">source code</a> of this application is released under the MIT <a href=\"LICENSE\">license</a>.",

I could use help with these:

"help.attr.data": "Data &copy; <a href=\"http://openstreetmap.org/\">OpenStreetMap</a> contributors, <span style=\"font-size:smaller;\"><a href=\"http://opendatacommons.org/licenses/odbl/1-0/\">ODbL</a> (<a href=\"http://www.openstreetmap.org/copyright\">Terms</a>)</span>",
"help.attr.tiles": "Map tiles &copy; <a href=\"http://openstreetmap.org/\">OpenStreetMap</a> contributors",

These seem straightforward.

"dialog.save-osm": "save on openhistoricalmap.org",

"warning.incomplete.expl.1": "This query returned no nodes. In OHM, only nodes contain coordinates. For example, a way cannot be displayed without its nodes.",
"warning.incomplete.remote.expl.1": "It looks like if this query will not return OHM data in XML format with metadata. Editors like JOSM require the data to be in that format, though.",

"data_stats.lag.expl": "behind main OHM db",
erictheise commented 1 month ago

All of these seem to be abbreviations and links so I'd apply what we decide on to all locales, then set this up with the translation services.

danrademacher commented 1 month ago

I am not sure how to assess the text in this comment.

Are those candidate strings to which you already applied blanket find/replace of "OHM" and "OpenHistoricalMap"?

I think so. Any references to http://wiki.openhistoricalmap.org/wiki/Overpass_turbo should not be included and should retain links to the OSM wiki. The URL wiki.openhistoricalmap.org is not a thing.

@jeffreyameyer where do we stand on license language for these?

"help.attr.data": "Data © <a href="http://openstreetmap.org/\">OpenStreetMap contributors, <span style="font-size:smaller;"><a href="http://opendatacommons.org/licenses/odbl/1-0/\">ODbL (<a href="http://www.openstreetmap.org/copyright\">Terms)",
"help.attr.tiles": "Map tiles © <a href="http://openstreetmap.org/\">OpenStreetMap contributors",

I think we still have unresolved issues around the map credit and license language on the main site...

erictheise commented 1 month ago

Apologies for the unclear presentation. Originally I extracted candidate key, object pairs from locales/en.json and used bold text to show what I'd change to, but the html embedded in the strings wasn't displayed, with puzzling results.

There's nothing poetic about the replacements; OSM becomes OHM, osm.org becomes openhistoricalmap.org, very cut and dried.

I've reviewed the wiki links. I meant to use https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Overpass for intentional changes but I was fighting with the comment editor over the Markdown it was adding to anything I cut and pasted.

1ec5 commented 1 month ago

I'm not certain about these; the basic Overpass docs may be better than ours for general understanding.

Some of these links are about specific functionality, such as the wizard. There’s only one version of that documentation, and it’s fairly site-agnostic, so I think it would be perfectly fine to link to them. Probably the only one that I’d link to “OpenHistoricalMap/Overpass” would be help.intro.1. That page is very handy, but mainly for the examples that would be less necessary once we implement #814.

where do we stand on license language for these?

We should definitely update the attribution in Overpass turbo to credit OpenHistoricalMap. Let’s have it match the attribution on the main site. We also have a page describing our preferred attribution, which links to a couple embarrassingly sparse and outdated pages on the wiki. 🙈

558 tracks updating the attribution returned by the Overpass API, which is also important for legal reasons.

erictheise commented 1 month ago

I've updated all the locale files and merged them into gh-pages.

erictheise commented 3 weeks ago

I've filled out an application for Translatewiki.net at https://phabricator.wikimedia.org/T367680.