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

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index ea2efcfadc33b74e5b7f11a4988ed47ada2e0f68..3036f169b07ed34c6ec3d45b9176c21e01dcc23a 100644 (file)
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -41,7 +41,6 @@ $(document).ready(function () {
   $(".richtext_dopreview").click(function (event) {
     var editor = $(this).parents(".richtext_container").find("textarea");
     var preview = $(this).parents(".richtext_container").find(".richtext_preview");
-    var width = editor.outerWidth() - preview.outerWidth() + preview.width();
     var minHeight = editor.outerHeight() - preview.outerHeight() + preview.height();
 
     if (preview.contents().length === 0) {
@@ -56,7 +55,6 @@ $(document).ready(function () {
     }
 
     editor.hide();
-    preview.width(width);
     preview.css("min-height", minHeight + "px");
     preview.show();
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1da263d77337e4ee8bef5d3748f3f60daffa6634..32ecbf7cd0c4522e91e6ecf8da2f0ade52587b78 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2173,9 +2173,6 @@ en:
     index:
       js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Add a note
       license:
         copyright: "Copyright OpenStreetMap and contributors, under an open license"
         license_url: "https://openstreetmap.org/copyright"