Page MenuHomePhabricator

Add OpenHistoricalMap's Overpass Turbo instance to translatewiki.net
Closed, ResolvedPublic4 Estimated Story Points

Description

Project information

Name: OpenHistoricalMap's Overpass Turbo instance
Homepage: https://overpass-turbo.openhistoricalmap.org/
Project link: https://openhistoricalmap.org/
Code repository: https://github.com/OpenHistoricalMap/overpass-turbo/

  • Source branch: main
  • Target branch: main

OS License: MIT
Issue Tracker: https://github.com/OpenHistoricalMap/issues
Project contact: ohm-admins@googlegroups.com

Logo:

  • Without text:
  • With text:

Project description:
This is a fork of https://github.com/tyrasd/overpass-turbo containing modifications that allow interaction with the time dimension, OpenHistoricalMap's reason for being. Translatewiki.net already translates our fork of the OpenStreetMap website so this seems a natural match, although the upstream overpass-turbo code base uses Transifex.

We need help with two classes of strings. The first is where we swap "OSM", "openstreetmap.org" and other references to the upstream project with "OHM", "openhistoricalmap.org" and so on. The second may just be limited to two strings, help.attr.data and help.attr.tiles, which deal with licensing (ours is more permissive than OSM). Discussion is contained in the issue https://github.com/OpenHistoricalMap/issues/issues/811 and the relevant files can be found in https://github.com/OpenHistoricalMap/overpass-turbo/tree/main/locales

NOTE: Section below will be filled by twn staff

Project setup checklist

Project configuration (for translation admins)

Label: OpenHistoricalMap's Overpass Turbo instance
Namespace: NS_PROJECTS
Prefix: ohm-opt-
Validators:

  • BraceBalance (not enforced)

Insertables:

  • HtmlTagInsertablesSuggester

Support: https://github.com/OpenHistoricalMap/issues

Changes can be made in OpenHistoricalMap.yaml. Use WikimediaMobile-ios.yaml as an example

List of ignored keys, should be added with prefix (ohm-opt-):

load.title
load.delete_query
load.saved_queries-local
load.examples
load.no_saved_query
export.section.data
export.generic_download_copy
export.raw_interpreter
export.save_geoJSON_gist
export.section.query
export.format_text
export.format_text_raw
export.format_text_umap
export.to_xml
export.to_ql
export.geoJSON.title
export.geoJSON.expl
export.map_view.title
export.map_view.permalink
export.map_view.center
export.map_view.center_expl
export.map_view.bounds
help.title
help.section.introduction
help.section.queries
help.intro.shortcuts
help.intro.shortcuts.bbox
help.intro.shortcuts.center
help.intro.shortcuts.date
help.intro.shortcuts.custom
help.section.ide
help.ide.share.title
help.section.about
help.about.maintained
help.about.feedback.title
help.about.source.title
help.about.source
help.section.attribution
help.attr.data_sources
help.attr.mining
help.attr.search
help.attr.software
help.attr.leaflet
dialog.cancel
dialog.save
dialog.save-local
dialog.delete
dialog.close
dialog.done
error.nominatim.expl
warning.browser.title
warning.browser.expl.2
warning.incomplete.title
warning.incomplete.expl.2
warning.incomplete.not_again
warning.incomplete.remote.expl.2
warning.share.long
data_stats.request_duration
data_stats.lag
data_stats.lag_areas
popup.tags
popup.metadata

Concerns

Event Timeline

Hi @EricTheise

We need help with two classes of strings. The first is where we swap "OSM", "openstreetmap.org" and other references to the upstream project with "OHM", "openhistoricalmap.org" and so on. The second may just be limited to two strings, help.attr.data and help.attr.tiles, which deal with licensing (ours is more permissive than OSM). Discussion is contained in the issue https://github.com/OpenHistoricalMap/issues/issues/811 and the relevant files can be found in https://github.com/OpenHistoricalMap/overpass-turbo/tree/main/locales

So only the following strings should be made available for translation?

  • Strings that have references to "OSM", "openstreetmap.org" in them
  • help.attr.dat, help.attr.tiles, and other OHM specific strings

Would it be possible to list out the keys from the JSON file that should not be made available for translation?

@EricTheise When creating issues regarding localization, which issue template should we use? Should there be a specific issue template for localization issues.

Thanks for following up, @abi_. These keys should not be translated as part of this project (if they need translation they should be translated upstream at https://github.com/tyrasd/overpass-turbo).

load.title
load.delete_query
load.saved_queries-local
load.examples
load.no_saved_query
export.section.data
export.generic_download_copy
export.raw_interpreter
export.save_geoJSON_gist
export.section.query
export.format_text
export.format_text_raw
export.format_text_umap
export.to_xml
export.to_ql
export.geoJSON.title
export.geoJSON.expl
export.map_view.title
export.map_view.permalink
export.map_view.center
export.map_view.center_expl
export.map_view.bounds
help.title
help.section.introduction
help.section.queries
help.intro.shortcuts
help.intro.shortcuts.bbox
help.intro.shortcuts.center
help.intro.shortcuts.date
help.intro.shortcuts.custom
help.section.ide
help.ide.share.title
help.section.about
help.about.maintained
help.about.feedback.title
help.about.source.title
help.about.source
help.section.attribution
help.attr.data_sources
help.attr.mining
help.attr.search
help.attr.software
help.attr.leaflet
dialog.cancel
dialog.save
dialog.save-local
dialog.delete
dialog.close
dialog.done
error.nominatim.expl
warning.browser.title
warning.browser.expl.2
warning.incomplete.title
warning.incomplete.expl.2
warning.incomplete.not_again
warning.incomplete.remote.expl.2
warning.share.long
data_stats.request_duration
data_stats.lag
data_stats.lag_areas
popup.tags
popup.metadata

These are the keys that should be translated:

load.saved_queries-osm
load.saved_queries-osm-loading
load.saved_queries-osm-error
export.raw_data
export.format_text_wiki
export.editors
export.map_view.permalink_osm
help.intro.0
help.intro.1
help.intro.1b
help.intro.2
help.queries.expl
help.intro.shortcuts.style
help.intro.shortcuts.more
help.about.feedback
help.attr.data
help.attr.tiles
dialog.save-osm
warning.browser.expl.1
warning.browser.expl.3
warning.incomplete.expl.1 
warning.incomplete.remote.expl.1
data_stats.lag.expl

We don't have an issue template for translation but we should. I'd be happy to install a template that your project likes and is comfortable using.

Change #1048535 had a related patch set uploaded (by Wangombe; author: Wangombe):

[translatewiki@master] Add OpenHistoricalMap's Overpass Turbo instance to translatewiki.net

https://gerrit.wikimedia.org/r/1048535

Change #1048535 merged by jenkins-bot:

[translatewiki@master] Add OpenHistoricalMap's Overpass Turbo instance

https://gerrit.wikimedia.org/r/1048535

The project is now available for translation on translatewiki.net: https://translatewiki.net/wiki/Special:Translate/ohm-overpass-turbo

@EricTheise, can you confirm that the translatewiki.net bot has access to commit translations to the main branch?

Exports failed due to lack of permission:

Error Output:                                                                
================                                                             
ERROR: Permission to OpenHistoricalMap/overpass-turbo.git denied to transla  
tewiki.                                                                      
fatal: Could not read from remote repository.                                
                                                                             
Please make sure you have the correct access rights

@EricTheise, can you please give the translatewiki.net bot access to commit translations to the main branch?

Should be set now, @abi_, apologies for my delay here.

Also, I'd be happy to install a issue template for translation you provide me with one that meets your needs.

Thanks for all your work!

Should be set now, @abi_, apologies for my delay here.

Thanks, I've accepted the invite. Exports should happen today.

Also, I'd be happy to install a issue template for translation you provide me with one that meets your needs.

For now, we've used the default blank issue template. We can revisit this discussion later.

@abi_, a lot has been lost with this commit. Locale files (e.g. locales/ast.json) were typically 249 lines long but are now down to 191 lines when they should be 252 with the addition of the @metadata object.

What happened? Are you able to back out this change? Can we move to a pull request model?

EricTheise raised the priority of this task from Medium to Unbreak Now!.Jul 8 2024, 6:49 PM

I reverted that commit and set translatewiki's Role to Read until we straighten this out.

abi_ changed the task status from Open to In Progress.Jul 9 2024, 3:30 AM
abi_ moved this task from Done to In Progress on the LPL Essential (LPL Essential 2024 Jul-Oct) board.

Change #1053310 had a related patch set uploaded (by Abijeet Patro; author: Abijeet Patro):

[translatewiki@master] OpenHistoricalMap: Mark ignored messages as optional

https://gerrit.wikimedia.org/r/1053310

Change #1053312 had a related patch set uploaded (by Abijeet Patro; author: Abijeet Patro):

[translatewiki@master] OHM Overpass Turbo: Push to twn branch and create a PR

https://gerrit.wikimedia.org/r/1053312

abi_ lowered the priority of this task from Unbreak Now! to High.Jul 10 2024, 1:25 PM

@abi_, a lot has been lost with this commit. Locale files (e.g. locales/ast.json) were typically 249 lines long but are now down to 191 lines when they should be 252 with the addition of the @metadata object.

What happened? Are you able to back out this change? Can we move to a pull request model?

Sorry for not getting back to you earlier. The ignored messages were removed from the translation files. This is the default behavior. For now I've marked the messages as optional instead.

And yes, we can move to a pull request format. I've configured the bot to push changes to twn branch and create a PR to the main branch.

Change #1053310 merged by jenkins-bot:

[translatewiki@master] OHM Overpass Turbo: Mark ignored messages as optional

https://gerrit.wikimedia.org/r/1053310

Change #1053312 merged by jenkins-bot:

[translatewiki@master] OHM Overpass Turbo: Push to twn branch and create a PR

https://gerrit.wikimedia.org/r/1053312

I reverted that commit and set translatewiki's Role to Read until we straighten this out.

Exports failed today due to lack of permissions:

The command "cd 'ohm-overpass-turbo'; git add .; if ! git diff --cached --q  
uiet; then git commit -m 'Localisation updates from https://translatewiki.n  
et.'; git rebase 'origin/main' && git push --force origin HEAD:'twn'; fi" f  
ailed.                                                                       
                                                                             
Exit Code: 128(Invalid exit argument)                                        
                                                                             
Working directory: /scratch/exports                                          
                                                                             
Output:                                                                      
================                                                             
[main 09c0890] Localisation updates from https://translatewiki.net.          
 34 files changed, 8544 insertions(+), 8432 deletions(-)                     
Current branch main is up to date.                                           
                                                                             
                                                                             
Error Output:                                                                
================                                                             
ERROR: Permission to OpenHistoricalMap/overpass-turbo.git denied to transla  
tewiki.                                                                      
fatal: Could not read from remote repository.                                
                                                                             
Please make sure you have the correct access rights                          
and the repository exists.

Exports are failing. I'm planning to remove the project from transatewiki.net until we hear back

I've been preoccupied with conference preparation and travel. Our ohm-website project is configured to receive pull requests rather than direct commits. Isn't it possible to set this up the same way so that there's an opportunity to review changes?

I've been preoccupied with conference preparation and travel. Our ohm-website project is configured to receive pull requests rather than direct commits. Isn't it possible to set this up the same way so that there's an opportunity to review changes?

Thanks for your response. I've migrated to a PR format but the bot still needs elevated permission to read and push due to some existing issues which we haven't had time to debug yet.

This format of exports is in use on other repositories such as Kiwix Android: https://github.com/kiwix/kiwix-android/pulls?q=is%3Apr+author%3Atranslatewiki+is%3Aclosed

I've restored your Write access to our repo, @abi_.

I've restored your Write access to our repo, @abi_.

Thanks. Exports should happen later today.

PR has been merged. Thanks @EricTheise for your cooperation.

@abi_, we need to fine tune some things in this project and/or I need help understanding how things work.

For example, I discovered that an overeager search and replace prior to using translatewiki resulted in a change of "JOSM" to "JOHM" in all our locale files. I changed them back in our repo but translation PRs continue trying to put the incorrect string back in addition to potentially valid updates in https://github.com/OpenHistoricalMap/overpass-turbo/pull/25/files I would expect twn to be branching off of our default branch.

There is also a repeating PR that attempts to remove a key from the pt-PT.json locale which is wrong but I don't know how to permanently reject such a thing when it happens.

And there are white space issues that are causing problems.

Do I just post these issues here or do I create a ticket somewhere else? Thanks.

We would prefer a separate task. Please provide more info too. For example I was trying to find which key is being removed, but could not find any.