cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4311 from tomhughes/query-locales

Browse source 
Improve name selection with the query tool
This commit is contained in:
Andy Allan 2023-11-15 15:34:28 +00:00 • committed by GitHub
commit 6016acb7e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/application.js
View file

@ -124,6 +124,7 @@ $(document).ready(function () {
I18n.fallbacks = true;
OSM.preferred_editor = application_data.preferredEditor;
OSM.preferred_languages = application_data.preferredLanguages;
if (application_data.user) {
OSM.user = application_data.user;

2
app/assets/javascripts/index/query.js
View file

@ -125,7 +125,7 @@ OSM.Query = function (map) {
function featureName(feature) {
var tags = feature.tags,
locales = I18n.locales.get();
locales = OSM.preferred_languages;
for (var i = 0; i < locales.length; i++) {
if (tags["name:" + locales[i]]) {

3
app/helpers/application_helper.rb
View file

@ -48,7 +48,8 @@ module ApplicationHelper
def application_data
data = {
:locale => I18n.locale,
:preferred_editor => preferred_editor
:preferred_editor => preferred_editor,
:preferred_languages => preferred_languages.expand.map(&:to_s)
}
if current_user