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

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

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);