Merge remote-tracking branch 'k-yle/3595-localised-auth-popup' into d…

…evelop

CHANGELOG.md

@@ -40,6 +40,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 
 #### :tada: New Features
 #### :sparkles: Usability & Accessibility
+* Login/logout pages are now using the user's locale ([#3595], thanks [@k-yle])
 #### :scissors: Operations
 #### :camera: Street-Level
 #### :white_check_mark: Validation
@@ -51,6 +52,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 #### :rocket: Presets
 #### :hammer: Development
 
+[#3595]: https://github.com/openstreetmap/iD/issues/3595
 [#8994]: https://github.com/openstreetmap/iD/issues/8994
 
 

modules/services/osm.js

@@ -9,6 +9,7 @@ import { JXON } from '../util/jxon';
 import { geoExtent, geoRawMercator, geoVecAdd, geoZoomToScale } from '../geo';
 import { osmEntity, osmNode, osmNote, osmRelation, osmWay } from '../osm';
 import { utilArrayChunk, utilArrayGroupBy, utilArrayUniq, utilObjectOmit, utilRebind, utilTiler, utilQsString } from '../util';
+import { localizer } from '../core/localizer.js';
 
 import { osmApiConnections } from '../../config/id.js';
 
@@ -1438,6 +1439,12 @@ export default {
             that.userChangesets(function() {});  // eagerly load user details/changesets
         }
 
+        // ensure the locale is correctly set before opening the popup
+        oauth.options({
+            ...oauth.options(),
+            locale: localizer.localeCode(),
+        });
+
         oauth.authenticate(done);
     },