diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json index 555b46acd05..12976fc0173 100644 --- a/packages/rocketchat-i18n/i18n/ca.i18n.json +++ b/packages/rocketchat-i18n/i18n/ca.i18n.json @@ -1067,7 +1067,7 @@ "Off_the_record_conversation": "Conversa sense registre (off-the-record)", "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "La conversa sense registre no està disponible per al teu navegador o dispositiu.", "Office_Hours": "Horari d'obertura", - "Office_Hours_Enabled": "Horari d'obertura actiu", + "Office_hours_enabled": "Horari d'obertura actiu", "Offline": "Fora de línia", "Offline_DM_Email": "__user__ us ha enviat un missatge directe", "Offline_form": "formulari en línia", @@ -1668,4 +1668,4 @@ "your_message_optional": "el teu missatge (opcional)", "Your_password_is_wrong": "La contrasenya és incorrecta!", "Your_push_was_sent_to_s_devices": "La notificació push s'ha enviat a %s dispositius" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json index a32a3eb7d23..4c574ab23c0 100644 --- a/packages/rocketchat-i18n/i18n/cs.i18n.json +++ b/packages/rocketchat-i18n/i18n/cs.i18n.json @@ -1067,7 +1067,7 @@ "Off_the_record_conversation": "Konverzace mimo záznam", "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Konverzace mimo záznam není k dispozici pro Váš prohlížeč nebo zařízení.", "Office_Hours": "Otevírací doba", - "Office_Hours_Enabled": "Otevírací doba povolená", + "Office_hours_enabled": "Otevírací doba povolená", "Offline": "Offline", "Offline_DM_Email": "Přímá zpráva od __user__", "Offline_form": "Offline formulář", diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json index 249cdaa8ea4..7558b68fa45 100644 --- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json +++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json @@ -797,7 +797,7 @@ "Off": "Aus", "Off_the_record_conversation": "Off-the-record-Gespräche", "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record-Gespräche sind für Ihren Browser oder Ihr Gerät nicht verfügbar.", - "Office_Hours_Enabled": "Bürozeiten aktiviert", + "Office_hours_enabled": "Bürozeiten aktiviert", "Offline": "Offline", "Offline_DM_Email": "Private Nachricht von __user__ erhalten.", "Offline_form": "Offline-Formular", @@ -1268,4 +1268,4 @@ "your_message_optional": "ihre optionale Nachricht", "Your_password_is_wrong": "Falsches Passwort", "Your_push_was_sent_to_s_devices": "Die Push-Nachricht wurde an %s Geräte gesendet." -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index 91c86bb08ed..cbb96dcd573 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/packages/rocketchat-i18n/i18n/de.i18n.json @@ -854,7 +854,7 @@ "Off_the_record_conversation": "Off-the-record-Gespräche", "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record-Gespräche sind für Ihren Browser oder Ihr Gerät nicht verfügbar.", "Office_Hours": "Bürozeiten", - "Office_Hours_Enabled": "Bürozeiten aktiviert", + "Office_hours_enabled": "Bürozeiten aktiviert", "Offline": "Offline", "Offline_DM_Email": "Sie haben eine private Nachricht von __user__ erhalten.", "Offline_form": "Offline-Formular", @@ -1345,4 +1345,4 @@ "your_message_optional": "ihre optionale Nachricht", "Your_password_is_wrong": "Falsches Passwort", "Your_push_was_sent_to_s_devices": "Die Push-Nachricht wurde an %s Geräte gesendet." -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 3bd7044d7a7..9516e972284 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1067,7 +1067,8 @@ "Off_the_record_conversation": "Off-the-record Conversation", "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-the-record conversation is not available for your browser or device.", "Office_Hours": "Office Hours", - "Office_Hours_Enabled": "Office Hours Enabled", + "Office_hours_enabled": "Office hours enabled", + "Office_hours_updated": "Office hours updated", "Offline": "Offline", "Offline_DM_Email": "You have been direct messaged by __user__", "Offline_form": "Offline form", @@ -1670,4 +1671,4 @@ "your_message_optional": "your message (optional)", "Your_password_is_wrong": "Your password is wrong!", "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json index 216738319d3..427fc4d4312 100644 --- a/packages/rocketchat-i18n/i18n/fr.i18n.json +++ b/packages/rocketchat-i18n/i18n/fr.i18n.json @@ -919,7 +919,7 @@ "Off_the_record_conversation": "Conversation chiffrée et non enregistrée (Off-the-record)", "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "La conversation chiffrée et non enregistrée (Off-the-record) n'est pas disponible pour votre navigateur ou appareil.", "Office_Hours": "Heures de bureau", - "Office_Hours_Enabled": "Heures de bureau activées", + "Office_hours_enabled": "Heures de bureau activées", "Offline": "Hors ligne", "Offline_DM_Email": "|__site__] Vous avez reçu des messages privés de __user__", "Offline_form": "forme Hors ligne", diff --git a/packages/rocketchat-i18n/i18n/hr.i18n.json b/packages/rocketchat-i18n/i18n/hr.i18n.json index b1b887089de..3373a00520b 100644 --- a/packages/rocketchat-i18n/i18n/hr.i18n.json +++ b/packages/rocketchat-i18n/i18n/hr.i18n.json @@ -900,7 +900,7 @@ "Off_the_record_conversation": "Sigurnosno-nezabilježenih razgovora", "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Sigurnosno-nezabilježen razgovor nije dostupan za vaš preglednik ili uređaj.", "Office_Hours": "Uredovni Sati", - "Office_Hours_Enabled": "Uredovni Sati omogućeno", + "Office_hours_enabled": "Uredovni Sati omogućeno", "Offline": "Offline", "Offline_DM_Email": "__user__ vas je izravno kontaktirao", "Offline_form": "Izvanmrežni obrazac", @@ -1452,4 +1452,4 @@ "your_message_optional": "tvoja poruka (opcionalno)", "Your_password_is_wrong": "Vaša lozinka je pogrešna!", "Your_push_was_sent_to_s_devices": "Push obavijest je poslana %s uređaje" -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/it.i18n.json b/packages/rocketchat-i18n/i18n/it.i18n.json index 3e7badef78b..2e3916d49d1 100644 --- a/packages/rocketchat-i18n/i18n/it.i18n.json +++ b/packages/rocketchat-i18n/i18n/it.i18n.json @@ -1045,7 +1045,7 @@ "Off_the_record_conversation": "Conversazione Off-the-record", "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Conversazione Off-the-record non è disponibile per il browser o dispositivo.", "Office_Hours": "Ore d'ufficio", - "Office_Hours_Enabled": "Ore d'ufficio attive", + "Office_hours_enabled": "Ore d'ufficio attive", "Offline": "Offline", "Offline_DM_Email": "Hai ricevuto un messaggio diretto da __user__", "Offline_form": "Modulo offline", @@ -1643,4 +1643,4 @@ "your_message_optional": "il tuo messaggio (opzionale)", "Your_password_is_wrong": "La password è sbagliata!", "Your_push_was_sent_to_s_devices": "La tua richiesta è stata inviata ai %s dispositivi." -} \ No newline at end of file +} diff --git a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js index 2d294b5aff6..b815639fc7d 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js +++ b/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.js @@ -4,7 +4,7 @@ import moment from 'moment'; Template.livechatOfficeHours.helpers({ days() { - return LivechatOfficeHour.find(); + return LivechatOfficeHour.find({}, { sort: { code: 1 } }); }, startName(day) { return day.day + '_start'; @@ -94,7 +94,7 @@ Template.livechatOfficeHours.events({ if (err) { return handleError(err); } - toastr.success(t('Office_Hours_updated')); + toastr.success(t('Office_hours_updated')); }); } }); diff --git a/packages/rocketchat-livechat/server/models/LivechatOfficeHour.js b/packages/rocketchat-livechat/server/models/LivechatOfficeHour.js index 7d908971014..c930b721c88 100644 --- a/packages/rocketchat-livechat/server/models/LivechatOfficeHour.js +++ b/packages/rocketchat-livechat/server/models/LivechatOfficeHour.js @@ -18,7 +18,6 @@ class LivechatOfficeHour extends RocketChat.models._Base { this.insert({'day' : 'Friday', 'start' : '08:00', 'finish' : '20:00', 'code' : 5, 'open' : true }); this.insert({'day' : 'Saturday', 'start' : '08:00', 'finish' : '20:00', 'code' : 6, 'open' : false }); this.insert({'day' : 'Sunday', 'start' : '08:00', 'finish' : '20:00', 'code' : 0, 'open' : false }); - } }