Fix issues with renaming of diary entry controller

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index b513057c148d8908fc167b05b271034c7c8a7c54..f13706971a43264139ff4c27871973ed59c60c9e 100644 (file)
--- 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)
     }
 
     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) {
   }
 
   $("#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)
 
     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);
     }
 
     map.on("click", setLocation);

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a16f7d85a56d4c13b8422c05034745753ab42f5c..d36e77285252cdcf77e05ffc6c7ada777d244786 100644 (file)
--- 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 */
 
 
 /* Rules for the diary entry page */
 

-.diary_entry {
+.diary_entries {

   #map {
     position: relative;
     width: 90%;
   #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;
 }
 
   float: left;
 }
 

diff --git a/config/i18n-js.yml b/config/i18n-js.yml
index fa970345f8992064002b761b6e2cfadf5d7e0912..b7f3b4dbcbae8c6b03e211c0827daceb05fbe163 100644 (file)
--- 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"
     - "*.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"
     - "*.layouts.project_name.title"
     - "*.geocoder.search_osm_nominatim.*"
   - file: "app/assets/javascripts/i18n/embed.js"