comaps/comaps
42
1.9k
Fork
You've already forked comaps
161

[strings] Support Weblate for cuisines search categories #2175

Merged
yannikbloscheck merged 3 commits from x7z4w-cuisine into main 2026年03月01日 10:26:28 +01:00
Owner
Copy link

Same as #760

Same as #760
yannikbloscheck left a comment
Copy link

This will conflict with #2172 and also it probably would be good to have a way to keep the commented out terms

This will conflict with https://codeberg.org/comaps/comaps/pulls/2172 and also it probably would be good to have a way to keep the commented out terms

Also this reminds me that it has become difficult to edit the categories since the change to JSON files (despite the obvious translation benefits). I think we need to find a way to edit them together for all languages easier.
Maybe a solution would be to also have a (manual invoked) script to convert the categories.txt file back to the localize.json files? This way it would be possible to easily do changes in the generated text file and then have them converted back to the JSON files for better translation.

Also this reminds me that it has become difficult to edit the categories since the change to JSON files (despite the obvious translation benefits). I think we need to find a way to edit them together for all languages easier. Maybe a solution would be to also have a (manual invoked) script to convert the `categories.txt` file back to the `localize.json` files? This way it would be possible to easily do changes in the generated text file and then have them converted back to the JSON files for better translation.
Author
Owner
Copy link

@yannikbloscheck wrote in #2175 (comment):

This will conflict with #2172

I'll rebase once it's merged.

have a way to keep the commented out terms

Not sure why do we need them? They don't have translations.

@yannikbloscheck wrote in #2175 (comment):

Also this reminds me that it has become difficult to edit the categories since the change to JSON files (despite the obvious translation benefits). I think we need to find a way to edit them together for all languages easier. Maybe a solution would be to also have a (manual invoked) script to convert the categories.txt file back to the localize.json files? This way it would be possible to easily do changes in the generated text file and then have them converted back to the JSON files for better translation.

You can convert it back, but I don't know if the order of values remains the same in JSON (to prevent huge diffs).

UPD: the order is not the same. Still, I'm not sure why is it difficult for you, unless someone would want to add all languages at the same time, it's easy as it was before.

@yannikbloscheck wrote in https://codeberg.org/comaps/comaps/pulls/2175#issuecomment-7792724: > This will conflict with #2172 I'll rebase once it's merged. > have a way to keep the commented out terms Not sure why do we need them? They don't have translations. @yannikbloscheck wrote in https://codeberg.org/comaps/comaps/pulls/2175#issuecomment-7792829: > Also this reminds me that it has become difficult to edit the categories since the change to JSON files (despite the obvious translation benefits). I think we need to find a way to edit them together for all languages easier. Maybe a solution would be to also have a (manual invoked) script to convert the `categories.txt` file back to the `localize.json` files? This way it would be possible to easily do changes in the generated text file and then have them converted back to the JSON files for better translation. You can convert it [back](https://codeberg.org/comaps/comaps/pulls/760#issuecomment-5743742), but I don't know if the order of values remains the same in JSON (to prevent huge diffs). UPD: the order is not the same. Still, I'm not sure why is it difficult for you, unless someone would want to add all languages at the same time, it's easy as it was before.
x7z4w force-pushed x7z4w-cuisine from 39f2c62375
All checks were successful
DCO / check (pull_request) Successful in 3s
to 3364924816
All checks were successful
DCO / check (pull_request) Successful in 2s
2025年10月18日 21:49:52 +02:00
Compare

@x7z4w wrote in #2175 (comment):

Not sure why do we need them? They don't have translations.

Not the new ones I added in the pull request, but the commented out that already are in there. Also if the commented out ones weren't in there, I wouldn't have known not to include some of them for now.

You can convert it back, but I don't know if the order of values remains the same in JSON (to prevent huge diffs).

I think it would be really good to actually include the script in our repo, because I think we will probably need it again.

@x7z4w wrote in https://codeberg.org/comaps/comaps/pulls/2175#issuecomment-7793114: > Not sure why do we need them? They don't have translations. Not the new ones I added in the pull request, but the commented out that already are in there. Also if the commented out ones weren't in there, I wouldn't have known not to include some of them for now. > You can convert it [back](https://codeberg.org/comaps/comaps/pulls/760#issuecomment-5743742), but I don't know if the order of values remains the same in JSON (to prevent huge diffs). I think it would be really good to actually include the script in our repo, because I think we will probably need it again.
x7z4w force-pushed x7z4w-cuisine from 3364924816
All checks were successful
DCO / check (pull_request) Successful in 2s
to 971a64cbe2
All checks were successful
DCO / check (pull_request) Successful in 2s
2026年01月22日 18:51:18 +01:00
Compare
x7z4w scheduled this pull request to auto merge when all checks succeed 2026年01月23日 19:46:53 +01:00
yannikbloscheck canceled auto merging this pull request when all checks succeed 2026年01月24日 13:24:32 +01:00
yannikbloscheck changed title from (削除) [strings] Support Weblate for cuisines search categories (削除ここまで) to WIP: [strings] Support Weblate for cuisines search categories 2026年01月24日 13:24:48 +01:00

The decision was made to move them to the regular category files instead. So switching this to WIP in the meantime to prevent accidental merges.

The decision was made to move them to the regular category files instead. So switching this to WIP in the meantime to prevent accidental merges.
x7z4w force-pushed x7z4w-cuisine from 971a64cbe2
All checks were successful
DCO / check (pull_request) Successful in 2s
to 964ee0aa3b
All checks were successful
DCO / check (pull_request) Successful in 3s
2026年02月05日 11:36:45 +01:00
Compare
x7z4w changed title from (削除) WIP: [strings] Support Weblate for cuisines search categories (削除ここまで) to [strings] Support Weblate for cuisines search categories 2026年02月05日 11:36:53 +01:00
Author
Owner
Copy link

Tested working.

Tested working.
x7z4w scheduled this pull request to auto merge when all checks succeed 2026年02月05日 11:37:16 +01:00
Author
Owner
Copy link

@comaps/iOS need to delete categories_cuisines.txt from XCode

@comaps/iOS need to delete `categories_cuisines.txt` from XCode
yannikbloscheck force-pushed x7z4w-cuisine from 964ee0aa3b
All checks were successful
DCO / check (pull_request) Successful in 3s
to 5bb90ede66
All checks were successful
DCO / check (pull_request) Successful in 3s
2026年02月05日 17:59:10 +01:00
Compare
yannikbloscheck left a comment
Copy link

Removed the file. This seems to work on the place page and editor, but the search categories like "Where to eat", "Hotel" etc. now seem to be broken.

Removed the file. This seems to work on the place page and editor, but the search categories like "Where to eat", "Hotel" etc. now seem to be broken.
x7z4w canceled auto merging this pull request when all checks succeed 2026年02月05日 18:14:23 +01:00
x7z4w changed title from (削除) [strings] Support Weblate for cuisines search categories (削除ここまで) to WIP: [strings] Support Weblate for cuisines search categories 2026年02月05日 18:14:33 +01:00
yannikbloscheck force-pushed x7z4w-cuisine from 5bb90ede66
All checks were successful
DCO / check (pull_request) Successful in 3s
to 4833433830
Some checks failed
DCO / check (pull_request) Successful in 3s
Linux Check / Linux no unity build (pull_request) Failing after 1m9s
Android Check / Build Android Debug (pull_request) Failing after 1m12s
Android Check / Android Lint (pull_request) Failing after 1m26s
Linux Check / Linux builds and tests (pull_request) Failing after 1m12s
2026年02月27日 02:17:01 +01:00
Compare
yannikbloscheck force-pushed x7z4w-cuisine from 4833433830
Some checks failed
DCO / check (pull_request) Successful in 3s
Linux Check / Linux no unity build (pull_request) Failing after 1m9s
Android Check / Build Android Debug (pull_request) Failing after 1m12s
Android Check / Android Lint (pull_request) Failing after 1m26s
Linux Check / Linux builds and tests (pull_request) Failing after 1m12s
to 7e1ca94163
Some checks failed
DCO / check (pull_request) Successful in 3s
Linux Check / Linux no unity build (pull_request) Failing after 1m1s
Android Check / Android Lint (pull_request) Failing after 1m15s
Linux Check / Linux builds and tests (pull_request) Failing after 1m9s
Android Check / Build Android Debug (pull_request) Failing after 1m1s
2026年02月27日 02:23:37 +01:00
Compare

Making it work by using more of the same logic as the normal parts. Needs a regenerated map though for the cuisines to become searchable again.

Making it work by using more of the same logic as the normal parts. Needs a regenerated map though for the cuisines to become searchable again.
yannikbloscheck force-pushed x7z4w-cuisine from 7e1ca94163
Some checks failed
DCO / check (pull_request) Successful in 3s
Linux Check / Linux no unity build (pull_request) Failing after 1m1s
Android Check / Android Lint (pull_request) Failing after 1m15s
Linux Check / Linux builds and tests (pull_request) Failing after 1m9s
Android Check / Build Android Debug (pull_request) Failing after 1m1s
to 9949992c4b
Some checks failed
DCO / check (pull_request) Successful in 3s
Linux Check / Linux no unity build (pull_request) Failing after 58s
Android Check / Android Lint (pull_request) Failing after 1m9s
Linux Check / Linux builds and tests (pull_request) Failing after 1m6s
Android Check / Build Android Debug (pull_request) Failing after 1m6s
2026年02月27日 02:59:32 +01:00
Compare
yannikbloscheck changed title from (削除) WIP: [strings] Support Weblate for cuisines search categories (削除ここまで) to [strings] Support Weblate for cuisines search categories 2026年02月27日 02:59:39 +01:00
yannikbloscheck approved these changes 2026年02月27日 03:24:22 +01:00
Dismissed
yannikbloscheck left a comment
Copy link

Works now for me (with a newly generated map)

Works now for me (with a newly generated map)

Merge it @x7z4w?
(Can't ask you to review it in the interface, because it is your pull request)

Merge it @x7z4w? (Can't ask you to review it in the interface, because it is your pull request)
x7z4w left a comment
Copy link

Ready to merge except the nit below

Ready to merge except the nit below
@ -311,0 +314,4 @@
"cuisine-pancake|cuisine-crepe": "Бліны|панкейкі",
"cuisine-seafood|cuisine-fish": "Морапрадукты|рыба|рыбны",
"@cuisine_all_vegetarian": "Вегетарыянская кухня",
"cuisine-vegan|@cuisine_all_vegetarian": "Веганская кухня|Вегетарыянская кухня"
Author
Owner
Copy link

It would be great to have this deduplicated (@cuisine_all_vegetarian term is repeated)

It would be great to have this deduplicated (`@cuisine_all_vegetarian` term is repeated)
Contributor
Copy link

Deduplicated it for all languages

Deduplicated it for all languages
x7z4w marked this conversation as resolved
yannikbloscheck force-pushed x7z4w-cuisine from 9949992c4b
Some checks failed
DCO / check (pull_request) Successful in 3s
Linux Check / Linux no unity build (pull_request) Failing after 58s
Android Check / Android Lint (pull_request) Failing after 1m9s
Linux Check / Linux builds and tests (pull_request) Failing after 1m6s
Android Check / Build Android Debug (pull_request) Failing after 1m6s
to bc67f856fd
Some checks failed
DCO / check (pull_request) Successful in 55s
Android Check / Android Lint (pull_request) Failing after 7m36s
Android Check / Build Android Debug (pull_request) Has been cancelled
Linux Check / Linux builds and tests (pull_request) Has been cancelled
Linux Check / Linux no unity build (pull_request) Has been cancelled
2026年02月28日 14:08:56 +01:00
Compare
yannikbloscheck force-pushed x7z4w-cuisine from bc67f856fd
Some checks failed
DCO / check (pull_request) Successful in 55s
Android Check / Android Lint (pull_request) Failing after 7m36s
Android Check / Build Android Debug (pull_request) Has been cancelled
Linux Check / Linux builds and tests (pull_request) Has been cancelled
Linux Check / Linux no unity build (pull_request) Has been cancelled
to d177661c05
Some checks failed
DCO / check (pull_request) Successful in 2m36s
Android Check / Android Lint (pull_request) Failing after 4m56s
Android Check / Build Android Debug (pull_request) Failing after 8m19s
Linux Check / Linux no unity build (pull_request) Failing after 26m56s
Linux Check / Linux builds and tests (pull_request) Failing after 27m10s
2026年02月28日 14:16:39 +01:00
Compare
yannikbloscheck scheduled this pull request to auto merge when all checks succeed 2026年03月01日 10:25:36 +01:00
yannikbloscheck deleted branch x7z4w-cuisine 2026年03月01日 10:26:29 +01:00
Owner
Copy link

A fix for failing Android builds: #3724

A fix for failing Android builds: https://codeberg.org/comaps/comaps/pulls/3724
Sign in to join this conversation.
No reviewers
Labels
Clear labels
accessibility
Visual contrast, screen readers, etc.
addresses
Related to addresses, post codes, city/town/village borders
AI-assisted
AI-assisted PRs or issues
Android
Android app
Android Auto
Android Auto integration
Android Automotive
Android Automotive app
api
Deeplinks and URLs handled by the API
app stores
Google Play, App Store, F-Droid, Obtanium, Huawei Gallery, Acressent, Flathub, IzzyOnDroid, etc.
battery & performance
Performance and battery consumption-related problems and optimisations
borders
Related to borders between countries / regions
bug
Something is not working
build
building of apps
CarPlay
CarPlay integration
community
Community relations
contribution welcome
Contributions are very welcome, get started here
core
C++ core of the app
crash
Crash reporting
cycling
Specific to using a bicycle or similar vehicles
desktop
Qt desktop app incl. designer
devops
directions
Voice and visual turn-by-turn directions
docs
Documentation
downloader
Map downloader
drape
The C++ map rendering engine
driving
Specific to driving a car or similar vehicles
duplicate
This issue or pull request already exists
editor
Built-in OSM editor
elevation
Contour lines, elevation profiles, ...
enhancement
New feature
EPIC
A big idea or a piece of work that requires a lot of effort to implement
F-Droid
F-Droid platform
favorites
Places and GPS tracks
feature parity
A feature is implemented on one platform, but not on another
fonts
Fonts
good first issue
Interested in contributing? Get started here
help wanted
Need some help
icons
Map features icons
invalid
Something is wrong
iOS
iOS app
legal
Legal aspects
linux phone
LibreM, PinePhone and other mobile linuxes
location
Via GPS, network, etc.
macOS
Emulated iOS App or Qt Desktop App specifically related to macOS
map data
Related to OpenStreetMap data
mapgen needed
map generation is needed for PR to take full effect
maps compat
compatibility of newer maps with older apps; issues and PRs breaking or fixing compatibility
maps generator
Maps generator
navigation
The navigation turn-by-turn app mode
need feedback
Further information is requested
needs design
not planned
This is not planned at the moment
OM
Related to or references Organic Maps
opening hours
Related to Business Hours, off time, holidays, seasonal
outdoor
Hiking, backcountry cycling, 4WD, etc.
POI info
Various feature attributes usually displayed on the place page
priority
High
Seriously affects a lot of users or breaks the app severely
priority
Low
Not urgent or only happens in rare cases
priority
Medium
Happens enough to be a concern, but not app-breaking
privacy
Privacy aspects
public feedback needed
Experimental changes which requite explicit public feedback before continuing with them
public transport
Specific to public transport (busses, trams, subways, trains etc.)
question
Questions and Discussions
raw idea
Needs more discussion or to be further elaborated
refactoring
Improving the structure or simplifying the code, improving maintainability
regional
Different depending on the country or region
regression
Regression in the app
releases
Release management
route planning
Preview and plan your route
routing
Routing engine
search
Search inside of the app
security
Security improvements
source data
Related to OSM, SRTM, Tiger etc.
styles
Map styling, incl. mapping OSM tags
subway
The special subway layer
task
Internal things that have a clear way for implementation
tests
Unit tests
track recording
Track recording
traffic
Traffic information (still under development)
translations
Translations and all other kinds of localisation
TTS
Text-to-Speech
UI
User interface
UX
User experience
wait for upstream
Waiting for something to be done upstream
walking
Specific to walking
Wikipedia
Related to the embedded Wikipedia articles
Windows
Windows related
world map
The world overview map
No labels
accessibility
addresses
AI-assisted
Android
Android Auto
Android Automotive
api
app stores
battery & performance
borders
bug
build
CarPlay
community
contribution welcome
core
crash
cycling
desktop
devops
directions
docs
downloader
drape
driving
duplicate
editor
elevation
enhancement
EPIC
F-Droid
favorites
feature parity
fonts
good first issue
help wanted
icons
invalid
iOS
legal
linux phone
location
macOS
map data
mapgen needed
maps compat
maps generator
navigation
need feedback
needs design
not planned
OM
opening hours
outdoor
POI info
priority
High
priority
Low
priority
Medium
privacy
public feedback needed
public transport
question
raw idea
refactoring
regional
regression
releases
route planning
routing
search
security
source data
styles
subway
task
tests
track recording
traffic
translations
TTS
UI
UX
wait for upstream
walking
Wikipedia
Windows
world map
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
comaps/comaps!2175
Reference in a new issue
comaps/comaps
No description provided.
Delete branch "x7z4w-cuisine"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?