Merge remote-tracking branch 'upstream/pull/4451'

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 5bfe86b8607b58a9458e03db6b17306ca1b88b1e..0bfff869ebcc87186c1aec12c4a0ff75949a923f 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -103,6 +103,8 @@ $(document).ready(function () {
 
     $("body").removeClass("compact-nav");
 
 
     $("body").removeClass("compact-nav");
 

+    $("header").removeClass("text-nowrap");
+

     updateHeader();
 
     $(window).resize(updateHeader);
     updateHeader();
 
     $(window).resize(updateHeader);


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

+  OSM.preferred_languages = application_data.preferredLanguages;

 
   if (application_data.user) {
     OSM.user = application_data.user;
 
   if (application_data.user) {
     OSM.user = application_data.user;