From 85802048a734948aacbfa1d5ae50426addcf4ddc Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 17 Nov 2018 17:47:51 +0000
Subject: [PATCH] Fix issues with renaming of diary entry controller

---
 app/assets/javascripts/diary_entry.js | 4 ++--
 app/assets/stylesheets/common.scss    | 4 ++--
 config/i18n-js.yml                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index b513057c1..f13706971 100644
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -10,7 +10,7 @@ $(document).ready(function () {
     }
 
     marker = L.marker(e.latlng, {icon: OSM.getUserIcon()}).addTo(map)
-      .bindPopup(I18n.t('diary_entry.edit.marker_text'));
+      .bindPopup(I18n.t('diary_entries.edit.marker_text'));
   }
 
   $("#usemap").click(function (e) {
@@ -35,7 +35,7 @@ $(document).ready(function () {
 
     if ($("#latitude").val() && $("#longitude").val()) {
       marker = L.marker(centre, {icon: OSM.getUserIcon()}).addTo(map)
-        .bindPopup(I18n.t('diary_entry.edit.marker_text'));
+        .bindPopup(I18n.t('diary_entries.edit.marker_text'));
     }
 
     map.on("click", setLocation);
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a16f7d85a..d36e77285 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1686,7 +1686,7 @@ tr.turn:hover {
 
 /* Rules for the diary entry page */
 
-.diary_entry {
+.diary_entries {
   #map {
     position: relative;
     width: 90%;
@@ -1722,7 +1722,7 @@ tr.turn:hover {
   }
 }
 
-.diary_entry-show img.user_thumbnail {
+.diary_entries-show img.user_thumbnail {
   float: left;
 }
 
diff --git a/config/i18n-js.yml b/config/i18n-js.yml
index fa970345f..b7f3b4dbc 100644
--- a/config/i18n-js.yml
+++ b/config/i18n-js.yml
@@ -11,7 +11,7 @@ translations:
     - "*.site.edit.*"
     - "*.site.index.remote_failed"
     - "*.site.sidebar.search_results"
-    - "*.diary_entry.edit.marker_text"
+    - "*.diary_entries.edit.marker_text"
     - "*.layouts.project_name.title"
     - "*.geocoder.search_osm_nominatim.*"
   - file: "app/assets/javascripts/i18n/embed.js"
-- 
2.43.2