From 4845308b14963f85b874b598d0581e6f891f9ae9 Mon Sep 17 00:00:00 2001 From: nertc Date: Wed, 11 Jun 2025 13:46:21 +0400 Subject: [PATCH] Add locale selector --- app/assets/javascripts/application.js | 12 +++++++++--- app/assets/javascripts/language_selector.js | 4 ++++ app/assets/stylesheets/common.scss | 7 +++++++ app/controllers/application_controller.rb | 2 ++ app/controllers/users_controller.rb | 6 +++++- app/views/layouts/_header.html.erb | 9 +++++++++ app/views/shared/_language_selector.html.erb | 11 +++++++++++ test/system/site_test.rb | 15 +++++++++++++++ 8 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 app/assets/javascripts/language_selector.js create mode 100644 app/views/shared/_language_selector.html.erb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 54a2cb3f6..ad9dea84d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,6 +14,7 @@ //= require make-plural/cardinals //= require matomo //= require richtext +//= require language_selector { const application_data = $("head").data(); @@ -100,7 +101,8 @@ $(function () { $collapsedSecondaryMenu = $("#compact-secondary-nav > ul"), secondaryMenuItems = [], breakpointWidth = 768; - let moreItemWidth = 0; + let moreItemWidth = 0, + notCollapsibleItemsWidth = 0; OSM.csrf = {}; OSM.csrf[($("meta[name=csrf-param]").attr("content"))] = $("meta[name=csrf-token]").attr("content"); @@ -117,7 +119,7 @@ $(function () { secondaryMenuItems.forEach(function (item) { $(item[0]).remove(); }); - let runningWidth = 0, + let runningWidth = notCollapsibleItemsWidth, i = 0, requiredWidth; for (; i < secondaryMenuItems.length; i++) { @@ -176,10 +178,14 @@ $(function () { * to defer the measurement slightly as a workaround. */ setTimeout(function () { - $expandedSecondaryMenu.find("li:not(#compact-secondary-nav)").each(function () { + $expandedSecondaryMenu.find("li:not(#compact-secondary-nav):not(.not-collapsible)").each(function () { secondaryMenuItems.push([this, $(this).width()]); }); moreItemWidth = $("#compact-secondary-nav").width(); + notCollapsibleItemsWidth = $expandedSecondaryMenu + .find("li.not-collapsible") + .toArray() + .reduce((accWidth, item) => accWidth + $(item).outerWidth(), 0); updateHeader(); diff --git a/app/assets/javascripts/language_selector.js b/app/assets/javascripts/language_selector.js new file mode 100644 index 000000000..eac58e403 --- /dev/null +++ b/app/assets/javascripts/language_selector.js @@ -0,0 +1,4 @@ +$(document).on("change", ".language-change-trigger", function () { + Cookies.set("_osm_locale", this.value, { secure: true, path: "/", samesite: "lax" }); + document.location.reload(); +}); diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index e972c4a07..af179be6b 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -22,6 +22,13 @@ time[title] { color: $blue; } +/* Utility for transparent color */ + +.text-transparent { + color: transparent !important; + user-select: none; +} + /* Bootstrap contextual table classes overrides in dark mode */ @include color-mode(dark) { diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8e2754836..03ea6bedb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -185,6 +185,8 @@ class ApplicationController < ActionController::Base Locale.list(params[:locale]) elsif current_user current_user.preferred_languages + elsif request.cookies["_osm_locale"] + Locale.list(request.cookies["_osm_locale"]) else Locale.list(http_accept_language.user_preferred_languages) end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d643d4c6c..9ccf6fe51 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -184,7 +184,11 @@ class UsersController < ApplicationController current_user.data_public = true current_user.description = "" if current_user.description.nil? current_user.creation_address = request.remote_ip - current_user.languages = http_accept_language.user_preferred_languages + current_user.languages = if request.cookies["_osm_locale"] + Locale.list(request.cookies["_osm_locale"]) + else + http_accept_language.user_preferred_languages + end current_user.terms_agreed = Time.now.utc current_user.tou_agreed = Time.now.utc current_user.terms_seen = true diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index d140f22d1..2713ebd25 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -66,6 +66,15 @@ +
  • + <% if current_user && current_user.id %> + <%= link_to(basic_preferences_path, :class => "nav-link text-secondary") do %> + <%= render "shared/language_selector", :classes => "", :disabled => true %> + <% end %> + <% else %> + <%= render "shared/language_selector", :classes => "nav-link text-secondary", :disabled => false %> + <% end %> +
    • <% if current_user && current_user.id %>
    diff --git a/app/views/shared/_language_selector.html.erb b/app/views/shared/_language_selector.html.erb new file mode 100644 index 000000000..9b64c7598 --- /dev/null +++ b/app/views/shared/_language_selector.html.erb @@ -0,0 +1,11 @@ + diff --git a/test/system/site_test.rb b/test/system/site_test.rb index a01408397..e32c48a5c 100644 --- a/test/system/site_test.rb +++ b/test/system/site_test.rb @@ -91,6 +91,21 @@ class SiteTest < ApplicationSystemTestCase assert_selector ".tooltip", :text => "Zoom in to see" end + test "language selector should exist when logged out" do + visit "/" + assert_selector ".language-change-trigger", :visible => "all" + AVAILABLE_LANGUAGES.each do |locale| + assert_selector "option[value='#{locale[:code]}']", :visible => "all" + end + end + + test "language selector should not exist when logged in" do + sign_in_as(create(:user)) + + visit "/" + assert_no_selector ".language-change-trigger", :visible => "all" + end + private def check_control_tooltips_on_low_zoom(locator) -- 2.39.5