[fix bug 777076] Change wording in time tooltip.

mozilla · Jul 25, 2012 · f06f1fa · f06f1fa
1 parent 5a623ee
commit f06f1fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/media/js/remo/events_view_event.js b/media/js/remo/events_view_event.js
@@ -35,25 +35,16 @@ function set_time_tooltip() {
     user_end_date.setHours(end_date.getHours(),
                            end_date.getMinutes() - end_date.getTimezoneOffset());
 
-    if (item.data('is-multidate')) {
-        var local_start_date = new Date(item.data('date-local-start'));
-        var local_end_date = new Date(item.data('date-local-end'));
+    var local_start_date = new Date(item.data('date-local-start'));
+    var local_end_date = new Date(item.data('date-local-end'));
 
-        title = ('Event starts daily at ' +
-                 format_hour(local_start_date) +
-                 ' and ends ' +
-                 format_hour(local_end_date) +
-                 ' local time. ' +
-                 'That\'s ' + format_hour(user_start_date) + ' - ' +
-                 format_hour(user_end_date) + ' yours.');
-    }
-    else {
-        title = ('That\'s local times.<br/>Your time:<br/>' +
-                 format_hour(user_start_date) +
-                 ' - ' +
-                 format_hour(user_end_date) +
-                 '<br/>on ' + user_start_date.toDateString());
-    }
+    title = ('Event starts from ' +
+             format_hour(local_start_date) +
+             ' to ' +
+             format_hour(local_end_date) +
+             ' (local time) or ' +
+             'from ' + format_hour(user_start_date) + ' to ' +
+             format_hour(user_end_date) + ' (your time).');
 
     // We need to add title, add class and call tooltips() after we
     // have initialized the tooltip.

diff --git a/remo/events/templates/view_event.html b/remo/events/templates/view_event.html
@@ -48,6 +48,8 @@ <h4 class="event-single-title">{{ event.name }}</h4>
                          data-width="140"
                          data-date-start="{{ event.start|format_datetime_iso }}"
                          data-date-end="{{ event.end|format_datetime_iso }}"
+                         data-date-local-start="{{ event.local_start|format_datetime_iso }}"
+                         data-date-local-end="{{ event.local_end|format_datetime_iso }}"
                          data-is-multidate="false"
                          id="datetime-tip">
                       <div class="event-single-date-time-start">