@@ -1,10 +1,17 @@
 import AppointmenCalendarRoute from 'hospitalrun/appointments/calendar/route';
 import { translationMacro as t } from 'ember-i18n';
+import Ember from 'ember';
+
+const { computed } = Ember;
 
 export default AppointmenCalendarRoute.extend({
   editReturn: 'appointments.theater',
-  newButtonText: t('appointments.buttons.scheduleSurgery'),
-  pageTitle: t('appointments.titles.theaterSchedule'),
+  newButtonText: computed('i18n', () => {
+    return t('appointments.buttons.scheduleSurgery');
+  }),
+  pageTitle: computed('i18n', () => {
+    return t('appointments.titles.theaterSchedule');
+  }),
 
   _modelQueryParams(params) {
     let queryParams = this._super(params);
import AppointmenCalendarRoute from 'hospitalrun/appointments/calendar/route';
import { translationMacro as t } from 'ember-i18n';

export default AppointmenCalendarRoute.extend({
  editReturn: 'appointments.theater',
  newButtonText: t('appointments.buttons.scheduleSurgery'),
  pageTitle: t('appointments.titles.theaterSchedule'),

  _modelQueryParams(params) {
    let queryParams = this._super(params);
    queryParams.mapReduce = 'surgical_appointments_by_date';
    return queryParams;
  },

  actions: {
    newItem() {
      this.transitionTo('appointments.edit', 'newsurgery');
    }
  }
});

These should be computed('i18n.locale'....