Merge branch 'feat/support-variables-in-message' of https://github.com/chatwoot/chatwoot into feat/support-variables-in-message

app/javascript/dashboard/assets/scss/widgets/_sidemenu.scss

@@ -59,12 +59,8 @@
 
 .hamburger--menu {
   cursor: pointer;
-  display: none;
-  margin-right: $space-normal;
-
-  @media screen and (max-width: 1200px) {
   display: block;
-  }
+  margin-right: $space-normal;
 }
 
 .header--icon {

app/javascript/dashboard/components/SidemenuIcon.vue

@@ -1,7 +1,12 @@
 <template>
-  <button @click="onMenuItemClick">
+  <woot-button
-    <fluent-icon class="hamburger--menu" icon="list" />
+    size="small"
-  </button>
+    variant="clear"
+    color-scheme="secondary"
+    icon="list"
+    class="toggle-sidebar"
+    @click="onMenuItemClick"
+  />
 </template>
 
 <script>
@@ -16,13 +21,8 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.hamburger--menu {
+.toggle-sidebar {
-  cursor: pointer;
+  margin-right: var(--space-small);
-  display: none;
+  margin-left: var(--space-minus-small);
-  margin-right: var(--space-normal);
-
-  @media screen and (max-width: 1200px) {
-    display: block;
-  }
 }
 </style>

app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue

@@ -261,14 +261,7 @@ export default {
   width: 20rem;
   flex-shrink: 0;
   overflow-y: hidden;
-
-  @include breakpoint(xlarge down) {
-    position: absolute;
-  }
-
-  @include breakpoint(xlarge up) {
   position: unset;
-  }
 
   &:hover {
     overflow-y: hidden;

app/javascript/dashboard/components/specs/__snapshots__/SidemenuIcon.spec.js.snap

@@ -1,10 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SidemenuIcon matches snapshot 1`] = `
-<button>
+<woot-button
-  <fluent-icon
+  class="toggle-sidebar"
-    class="hamburger--menu"
+  color-scheme="secondary"
   icon="list"
+  size="small"
+  variant="clear"
 />
-</button>
 `;

app/javascript/dashboard/i18n/locale/ar/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "اختر حساباً من القائمة التالية",
     "PROFILE_SETTINGS": "إعدادات الملف الشخصي",
     "KEYBOARD_SHORTCUTS": "اختصارات لوحة المفاتيح",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "تسجيل الخروج"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/bg/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ca/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Selecciona un compte de la llista següent",
     "PROFILE_SETTINGS": "Configuració del Perfil",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Sortir"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/cs/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Vyberte účet z následujícího seznamu",
     "PROFILE_SETTINGS": "Nastavení profilu",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Odhlásit se"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/da/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Vælg en konto fra følgende liste",
     "PROFILE_SETTINGS": "Profilindstillinger",
     "KEYBOARD_SHORTCUTS": "Tastaturgenveje",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Log Ud"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/de/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Wählen Sie ein Benutzerkonto aus der folgenden Liste",
     "PROFILE_SETTINGS": "Profileinstellungen",
     "KEYBOARD_SHORTCUTS": "Tastenkombinationen",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Ausloggen"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/el/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Επιλέξτε ένα λογαριασμό από την Λίστα",
     "PROFILE_SETTINGS": "Ρυθμίσεις Προφίλ",
     "KEYBOARD_SHORTCUTS": "Συντομεύσεις Πληκτρολογίου",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Κονσόλα",
     "LOGOUT": "Έξοδος (Logout)"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/es/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Seleccione una cuenta de la siguiente lista",
     "PROFILE_SETTINGS": "Ajustes del perfil",
     "KEYBOARD_SHORTCUTS": "Atajos de teclado",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Cerrar sesión"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/fa/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "از لیست یکی از حساب‌ها را انتخاب کنید",
     "PROFILE_SETTINGS": "تنظیمات پروفایل",
     "KEYBOARD_SHORTCUTS": "میانبرهای صفحه‌کلید",
+    "SUPER_ADMIN_CONSOLE": "کنسول سوپر مدیر",
     "LOGOUT": "خروج از حساب‌کاربری"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/fi/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Valitse tili tästä luettelosta",
     "PROFILE_SETTINGS": "Profiilin asetukset",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Kirjaudu ulos"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/fr/advancedFilters.json

@@ -1,28 +1,28 @@
 {
   "FILTER": {
     "TITLE": "Filtrer les conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
+    "SUBTITLE": "Ajoutez des filtres ci-dessous et appuyez sur 'Appliquer des filtres' pour filtrer les conversations.",
     "ADD_NEW_FILTER": "Ajouter un filtre",
     "FILTER_DELETE_ERROR": "Vous devriez avoir au moins un filtre afin d'enregistrer",
     "SUBMIT_BUTTON_LABEL": "Appliquer les filtres",
     "CANCEL_BUTTON_LABEL": "Annuler",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
+    "CLEAR_BUTTON_LABEL": "Effacer les filtres",
     "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "TOOLTIP_LABEL": "Filtrer les conversations",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "ET",
       "OR": "OU"
     },
     "OPERATOR_LABELS": {
-      "equal_to": "Equal to",
+      "equal_to": "Égal à",
-      "not_equal_to": "Not equal to",
+      "not_equal_to": "Pas égal à",
-      "contains": "Contains",
+      "contains": "Contient",
-      "does_not_contain": "Does not contain",
+      "does_not_contain": "Ne contient pas",
-      "is_present": "Is present",
+      "is_present": "Est présent",
-      "is_not_present": "Is not present",
+      "is_not_present": "N'est pas présent",
-      "is_greater_than": "Is greater than",
+      "is_greater_than": "Est plus grand que",
-      "is_less_than": "Is lesser than",
+      "is_less_than": "Est inférieur à",
-      "days_before": "Is x days before"
+      "days_before": "Est x jours avant"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "Vrai",
@@ -32,19 +32,19 @@
       "STATUS": "État",
       "ASSIGNEE_NAME": "Assignee Name",
       "INBOX_NAME": "Nom de la boîte de réception",
-      "TEAM_NAME": "Team Name",
+      "TEAM_NAME": "Nom de l'équipe",
       "CONVERSATION_IDENTIFIER": "Conversation Identifier",
       "CAMPAIGN_NAME": "Campaign Name",
       "LABELS": "Étiquettes",
-      "BROWSER_LANGUAGE": "Browser Language",
+      "BROWSER_LANGUAGE": "Langue du navigateur",
-      "COUNTRY_NAME": "Country Name",
+      "COUNTRY_NAME": "Nom du pays",
       "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "CUSTOM_ATTRIBUTE_LIST": "Liste",
-      "CUSTOM_ATTRIBUTE_TEXT": "Text",
+      "CUSTOM_ATTRIBUTE_TEXT": "Texte",
-      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Nombre",
-      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "CUSTOM_ATTRIBUTE_LINK": "Lien",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Case à cocher",
-      "CREATED_AT": "Created At",
+      "CREATED_AT": "Créé le",
       "LAST_ACTIVITY": "Dernière activité"
     },
     "GROUPS": {
@@ -70,7 +70,7 @@
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Supprimer le filtre",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "Confirmer la suppression",

app/javascript/dashboard/i18n/locale/fr/chatlist.json

@@ -8,7 +8,7 @@
     },
     "TAB_HEADING": "Conversations",
     "MENTION_HEADING": "Mentions",
-    "UNATTENDED_HEADING": "Unattended",
+    "UNATTENDED_HEADING": "Sans suivi",
     "SEARCH": {
       "INPUT": "Rechercher des personnes, des conversations, des réponses standardisées ..."
     },
@@ -57,12 +57,12 @@
     "REPLY_TO_TWEET": "Répondre à ce tweet",
     "LINK_TO_STORY": "Aller à l'histoire instagram",
     "SENT": "Envoyé avec succès",
-    "READ": "Read successfully",
+    "READ": "Lu",
-    "DELIVERED": "Delivered successfully",
+    "DELIVERED": "Reçu",
     "NO_MESSAGES": "Pas de messages",
     "NO_CONTENT": "Aucun contenu disponible",
     "HIDE_QUOTED_TEXT": "Masquer le texte cité",
     "SHOW_QUOTED_TEXT": "Afficher le texte cité",
-    "MESSAGE_READ": "Read"
+    "MESSAGE_READ": "Lu"
   }
 }

app/javascript/dashboard/i18n/locale/fr/contact.json

@@ -7,7 +7,7 @@
     "COPY_SUCCESSFUL": "Copié dans le presse-papiers avec succès",
     "COMPANY": "Société",
     "LOCATION": "Localisation",
-    "BROWSER_LANGUAGE": "Browser Language",
+    "BROWSER_LANGUAGE": "Langue du navigateur",
     "CONVERSATION_TITLE": "Détails de la conversation",
     "VIEW_PROFILE": "Voir le profil",
     "BROWSER": "Navigateur",

app/javascript/dashboard/i18n/locale/fr/contactFilters.json

@@ -7,7 +7,7 @@
         "FILTER_DELETE_ERROR": "Vous devriez avoir au moins un filtre afin d'enregistrer",
         "SUBMIT_BUTTON_LABEL": "Envoyer",
         "CANCEL_BUTTON_LABEL": "Annuler",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
+        "CLEAR_BUTTON_LABEL": "Effacer les filtres",
         "EMPTY_VALUE_ERROR": "Value is required",
         "TOOLTIP_LABEL": "Filter contacts",
         "QUERY_DROPDOWN_LABELS": {
@@ -15,15 +15,15 @@
             "OR": "OU"
         },
         "OPERATOR_LABELS": {
-            "equal_to": "Equal to",
+            "equal_to": "Égal à",
-            "not_equal_to": "Not equal to",
+            "not_equal_to": "Pas égal à",
-            "contains": "Contains",
+            "contains": "Contient",
-            "does_not_contain": "Does not contain",
+            "does_not_contain": "Ne contient pas",
-            "is_present": "Is present",
+            "is_present": "Est présent",
-            "is_not_present": "Is not present",
+            "is_not_present": "N'est pas présent",
-            "is_greater_than": "Is greater than",
+            "is_greater_than": "Est plus grand que",
             "is_lesser_than": "Is lesser than",
-            "days_before": "Is x days before"
+            "days_before": "Est x jours avant"
         },
         "ATTRIBUTES": {
             "NAME": "Nom",
@@ -32,12 +32,12 @@
             "IDENTIFIER": "Identifier",
             "CITY": "Ville",
             "COUNTRY": "Pays",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_LIST": "Liste",
-            "CUSTOM_ATTRIBUTE_TEXT": "Text",
+            "CUSTOM_ATTRIBUTE_TEXT": "Texte",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Nombre",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_LINK": "Lien",
-            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Case à cocher",
-            "CREATED_AT": "Created At",
+            "CREATED_AT": "Créé le",
             "LAST_ACTIVITY": "Dernière activité",
             "REFERER_LINK": "Referrer link"
         },

app/javascript/dashboard/i18n/locale/fr/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Sélectionnez un compte dans la liste suivante",
     "PROFILE_SETTINGS": "Paramètres de profil",
     "KEYBOARD_SHORTCUTS": "Raccourcis clavier",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Se déconnecter"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/fr/signup.json

@@ -2,13 +2,13 @@
   "REGISTER": {
     "TRY_WOOT": "Créer un compte",
     "TITLE": "Inscription",
-    "TESTIMONIAL_HEADER": "All it takes is one step to move forward",
+    "TESTIMONIAL_HEADER": "Il suffit d'une étape pour avancer",
-    "TESTIMONIAL_CONTENT": "You're one step away from engaging your customers, retaining them and finding new ones.",
+    "TESTIMONIAL_CONTENT": "Vous n'êtes plus qu'à un pas d'engager vos clients, de les fidéliser et d'en trouver de nouveaux.",
     "TERMS_ACCEPT": "En vous inscrivant, vous acceptez nos <a href=\"https://www.chatwoot.com/terms\">CGU</a> et notre <a href=\"https://www.chatwoot.com/privacy-policy\">politique de confidentialité</a>",
     "COMPANY_NAME": {
-      "LABEL": "Company name",
+      "LABEL": "Nom de la société",
-      "PLACEHOLDER": "Enter your company name. eg: Wayne Enterprises",
+      "PLACEHOLDER": "Entrez le nom de votre entreprise. Ex : Wayne Enterprises",
-      "ERROR": "Company name is too short"
+      "ERROR": "Le nom de la société est trop court"
     },
     "FULL_NAME": {
       "LABEL": "Nom complet",
@@ -18,13 +18,13 @@
     "EMAIL": {
       "LABEL": "E-mail professionnel",
       "PLACEHOLDER": "Entrez votre adresse e-mail professionnelle. Ex. : bruce@wayne.enterprises",
-      "ERROR": "Please enter a valid work email address"
+      "ERROR": "Veuillez entrer une adresse e-mail professionnelle valide"
     },
     "PASSWORD": {
       "LABEL": "Mot de passe",
       "PLACEHOLDER": "Mot de passe",
       "ERROR": "Le mot de passe est trop court",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "IS_INVALID_PASSWORD": "Le mot de passe doit contenir au moins 1 lettre majuscule, 1 lettre minuscule, 1 chiffre et 1 caractère spécial"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmer le mot de passe",

app/javascript/dashboard/i18n/locale/he/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "התנתק"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/hi/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/hu/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Fiók kiválasztása az alábbi listából",
     "PROFILE_SETTINGS": "Profilbeállítások",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Kilépés"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/id/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Pilih akun dari daftar berikut",
     "PROFILE_SETTINGS": "Pengaturan Profil",
     "KEYBOARD_SHORTCUTS": "Shortcut Keyboard",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Keluar"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/is/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Veldu reikning úr eftirfarandi lista",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/it/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Seleziona un account dal seguente elenco",
     "PROFILE_SETTINGS": "Impostazioni profilo",
     "KEYBOARD_SHORTCUTS": "Scorciatoie da tastiera",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Disconnettiti"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ja/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "次のリストからアカウントを選択してください",
     "PROFILE_SETTINGS": "プロフィール設定",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "ログアウト"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ka/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ko/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "다음 목록에서 계정 선택",
     "PROFILE_SETTINGS": "프로필 설정",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "로그아웃"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/lt/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/lv/conversation.json

@@ -42,8 +42,8 @@
     "RATING_TITLE": "Vērtējums",
     "FEEDBACK_TITLE": "Atsauksmes",
     "CARD": {
-      "SHOW_LABELS": "Show labels",
+      "SHOW_LABELS": "Rādīt etiķetes",
-      "HIDE_LABELS": "Hide labels"
+      "HIDE_LABELS": "Slēpt etiķetes"
     },
     "HEADER": {
       "RESOLVE_ACTION": "Atrisināt",

app/javascript/dashboard/i18n/locale/lv/settings.json

@@ -104,8 +104,8 @@
           "Aizņemts",
           "Bezsaistē"
         ],
-        "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
+        "SET_AVAILABILITY_SUCCESS": "Pieejamība ir veiksmīgi iestatīta",
-        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
+        "SET_AVAILABILITY_ERROR": "Nevarēja iestatīt pieejamību. Lūdzu, mēģiniet vēlreiz"
       },
       "EMAIL": {
         "LABEL": "Jūsu e-pasta adrese",
@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Izvēlieties kontu no šī saraksta",
     "PROFILE_SETTINGS": "Profila Iestatījumi",
     "KEYBOARD_SHORTCUTS": "Tastatūras Īsinājumtaustiņi",
+    "SUPER_ADMIN_CONSOLE": "Superadministratora Konsole",
     "LOGOUT": "Izrakstīties"
   },
   "APP_GLOBAL": {
@@ -229,8 +230,8 @@
       "CATEGORY_EMPTY_MESSAGE": "Kategorijas nav atrastas"
     },
     "SET_AUTO_OFFLINE": {
-      "TEXT": "Mark offline automatically",
+      "TEXT": "Automātiski atzīmēt bezsaistē",
-      "INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard."
+      "INFO_TEXT": "Ļaut sistēmai, kad neizmantojat lietotni vai informācijas paneli, automātiski atzīmēt Jūs bezsaistē."
     },
     "DOCS": "Lasīt dokumentus"
   },

app/javascript/dashboard/i18n/locale/ml/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "ഇനിപ്പറയുന്ന ലിസ്റ്റിൽ നിന്ന് ഒരു അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക",
     "PROFILE_SETTINGS": "പ്രൊഫൈൽ ക്രമീകരണങ്ങൾ",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "ലോഗൗട്ട്"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ms/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ne/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/nl/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profiel instellingen",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Afmelden"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/no/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Velg en konto fra følgende liste",
     "PROFILE_SETTINGS": "Brukerinnstillinger",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logg ut"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/pl/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Ustawienia profilu",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Wyloguj się"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/pt/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Escolha uma conta da lista a seguir",
     "PROFILE_SETTINGS": "Configurações do perfil",
     "KEYBOARD_SHORTCUTS": "Atalhos do teclado",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Desconectar"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/pt_BR/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Selecione uma conta da lista a seguir",
     "PROFILE_SETTINGS": "Configurações do Perfil",
     "KEYBOARD_SHORTCUTS": "Atalhos do teclado",
+    "SUPER_ADMIN_CONSOLE": "Console de Super Admin",
     "LOGOUT": "Sair"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ro/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Selectaţi un cont din următoarea listă",
     "PROFILE_SETTINGS": "Setări profil",
     "KEYBOARD_SHORTCUTS": "Scurtături Tastatură",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Deconectare"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ru/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Выберите аккаунт из списка",
     "PROFILE_SETTINGS": "Настройки профиля",
     "KEYBOARD_SHORTCUTS": "Клавиши быстрого доступа",
+    "SUPER_ADMIN_CONSOLE": "Консоль супер администратора",
     "LOGOUT": "Выйти"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/sk/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Vyberte účet z nasledujúceho zoznamu",
     "PROFILE_SETTINGS": "Nastavenia profilu",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/sr/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Izaberite nalog iz sledećeg spiska",
     "PROFILE_SETTINGS": "Podešavanja profila",
     "KEYBOARD_SHORTCUTS": "Prečice tastature",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Odjavi se"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/sv/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Välj ett konto från följande lista",
     "PROFILE_SETTINGS": "Profilinställningar",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logga ut"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ta/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "பின்வரும் பட்டியலிலிருந்து ஒரு கணக்கைத் தேர்ந்தெடுக்கவும்",
     "PROFILE_SETTINGS": "சுயவிவர அமைப்புகள்",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "வெளியேறு"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/th/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "เลือกบัญชีจากรายชื่อต่อไปนี้",
     "PROFILE_SETTINGS": "ตั้งค่าข้อมูลส่วนตัว",
     "KEYBOARD_SHORTCUTS": "คีย์ลัด",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "ออกจากระบบ"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/tr/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Aşağıdaki listeden bir hesap seçin",
     "PROFILE_SETTINGS": "Profil ayarları",
     "KEYBOARD_SHORTCUTS": "Klavye Kısayolları",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Çıkış Yap"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/uk/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Виберіть обліковий запис із наступного списку",
     "PROFILE_SETTINGS": "Налаштування облікового запису",
     "KEYBOARD_SHORTCUTS": "Комбінації клавіш",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Вийти"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ur/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/ur_IN/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profile Settings",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Logout"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/vi/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "Chọn một tài khoản từ danh sách sau",
     "PROFILE_SETTINGS": "Cài Đặt Hồ Sơ Cá Nhân",
     "KEYBOARD_SHORTCUTS": "Phím tắt",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "Đăng xuất"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/zh_CN/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "从以下列表中选择一个账户",
     "PROFILE_SETTINGS": "个人资料设置",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "退出登录"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/i18n/locale/zh_TW/settings.json

@@ -136,6 +136,7 @@
     "SELECTOR_SUBTITLE": "從以下列表中選擇一個帳戶",
     "PROFILE_SETTINGS": "個人資料設定",
     "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "SUPER_ADMIN_CONSOLE": "Super Admin Console",
     "LOGOUT": "退出登入"
   },
   "APP_GLOBAL": {

app/javascript/dashboard/routes/dashboard/Dashboard.vue

@@ -2,14 +2,14 @@
   <div class="row app-wrapper">
     <sidebar
       :route="currentRoute"
-      :sidebar-class-name="sidebarClassName"
+      :show-secondary-sidebar="isSidebarOpen"
       @open-notification-panel="openNotificationPanel"
       @toggle-account-modal="toggleAccountModal"
       @open-key-shortcut-modal="toggleKeyShortcutModal"
       @close-key-shortcut-modal="closeKeyShortcutModal"
       @show-add-label-popup="showAddLabelPopup"
     />
-    <section class="app-content columns" :class="contentClassName">
+    <section class="app-content columns">
       <router-view />
       <command-bar />
       <account-selector
@@ -46,6 +46,7 @@ import AddAccountModal from 'dashboard/components/layout/sidebarComponents/AddAc
 import AccountSelector from 'dashboard/components/layout/sidebarComponents/AccountSelector';
 import AddLabelModal from 'dashboard/routes/dashboard/settings/labels/AddLabel';
 import NotificationPanel from 'dashboard/routes/dashboard/notifications/components/NotificationPanel';
+import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 
 export default {
   components: {
@@ -57,9 +58,9 @@ export default {
     AddLabelModal,
     NotificationPanel,
   },
+  mixins: [uiSettingsMixin],
   data() {
     return {
-      isSidebarOpen: false,
       isOnDesktop: true,
       showAccountModal: false,
       showCreateAccountModal: false,
@@ -72,44 +73,22 @@ export default {
     currentRoute() {
       return ' ';
     },
-    sidebarClassName() {
+    isSidebarOpen() {
-      if (this.isOnDesktop) {
+      const { show_secondary_sidebar: showSecondarySidebar } = this.uiSettings;
-        return '';
+      return showSecondarySidebar;
-      }
-      if (this.isSidebarOpen) {
-        return 'off-canvas is-open';
-      }
-      return 'off-canvas is-transition-push is-closed';
-    },
-    contentClassName() {
-      if (this.isOnDesktop) {
-        return '';
-      }
-      if (this.isSidebarOpen) {
-        return 'off-canvas-content is-open-left has-transition-push';
-      }
-      return 'off-canvas-content has-transition-push';
     },
   },
   mounted() {
-    window.addEventListener('resize', this.handleResize);
-    this.handleResize();
     bus.$on(BUS_EVENTS.TOGGLE_SIDEMENU, this.toggleSidebar);
   },
   beforeDestroy() {
     bus.$off(BUS_EVENTS.TOGGLE_SIDEMENU, this.toggleSidebar);
-    window.removeEventListener('resize', this.handleResize);
   },
   methods: {
-    handleResize() {
-      if (window.innerWidth >= 1200) {
-        this.isOnDesktop = true;
-      } else {
-        this.isOnDesktop = false;
-      }
-    },
     toggleSidebar() {
-      this.isSidebarOpen = !this.isSidebarOpen;
+      this.updateUISettings({
+        show_secondary_sidebar: !this.isSidebarOpen,
+      });
     },
     openCreateAccountModal() {
       this.showAccountModal = false;
@@ -142,8 +121,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.off-canvas-content.is-open-left {
-  transform: translateX(20rem);
-}
-</style>

app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue

@@ -1,7 +1,8 @@
 <template>
   <div v-on-clickaway="closeSearch" class="search-wrap">
+    <div class="search-header--wrap">
+      <woot-sidemenu-icon v-if="!showSearchBox" />
       <div class="search" :class="{ 'is-active': showSearchBox }">
-      <woot-sidemenu-icon />
         <div class="icon">
           <fluent-icon icon="search" class="search--icon" size="28" />
         </div>
@@ -16,6 +17,7 @@
           @toggle="$emit('toggle-conversation-layout')"
         />
       </div>
+    </div>
     <div v-if="showSearchBox" class="results-wrap">
       <div class="show-results">
         <div>
@@ -153,14 +155,21 @@ export default {
 <style lang="scss" scoped>
 .search-wrap {
   position: relative;
+  padding: var(--space-one) var(--space-normal) var(--space-smaller)
+    var(--space-normal);
+}
+
+.search-header--wrap {
+  display: flex;
+  justify-content: space-between;
+  min-height: var(--space-large);
 }
 
 .search {
   display: flex;
+  flex: 1;
   padding: 0;
   border-bottom: 1px solid transparent;
-  padding: var(--space-one) var(--space-normal) var(--space-smaller)
-    var(--space-normal);
 
   &:hover {
     .search--icon {
@@ -205,6 +214,7 @@ input::placeholder {
   width: 100%;
   max-height: 70vh;
   overflow: auto;
+  left: 0;
 }
 
 .show-results {

app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue

@@ -8,8 +8,7 @@
       @close-key-shortcut-modal="closeKeyShortcutModal"
     />
     <help-center-sidebar
-      v-if="portals.length"
+      v-if="showHelpCenterSidebar"
-      :class="sidebarClassName"
       :header-title="headerTitle"
       :portal-slug="selectedPortalSlug"
       :locale-slug="selectedLocaleInPortal"
@@ -19,7 +18,7 @@
       @open-popover="openPortalPopover"
       @open-modal="onClickOpenAddCategoryModal"
     />
-    <section class="app-content columns" :class="contentClassName">
+    <section class="app-content columns">
       <router-view />
       <command-bar />
       <account-selector
@@ -84,7 +83,6 @@ export default {
   mixins: [portalMixin, uiSettingsMixin],
   data() {
     return {
-      isSidebarOpen: false,
       isOnDesktop: true,
       showShortcutModal: false,
       showNotificationPanel: false,
@@ -103,6 +101,15 @@ export default {
       meta: 'portals/getMeta',
       isFetching: 'portals/isFetchingPortals',
     }),
+    isSidebarOpen() {
+      const {
+        show_help_center_secondary_sidebar: showSecondarySidebar,
+      } = this.uiSettings;
+      return showSecondarySidebar;
+    },
+    showHelpCenterSidebar() {
+      return this.portals.length === 0 ? false : this.isSidebarOpen;
+    },
     selectedPortal() {
       const slug = this.$route.params.portalSlug || this.lastActivePortalSlug;
       if (slug) return this.$store.getters['portals/portalBySlug'](slug);
@@ -112,24 +119,6 @@ export default {
     selectedLocaleInPortal() {
       return this.$route.params.locale || this.defaultPortalLocale;
     },
-    sidebarClassName() {
-      if (this.isOnDesktop) {
-        return '';
-      }
-      if (this.isSidebarOpen) {
-        return 'off-canvas is-open';
-      }
-      return 'off-canvas is-transition-push is-closed';
-    },
-    contentClassName() {
-      if (this.isOnDesktop) {
-        return '';
-      }
-      if (this.isSidebarOpen) {
-        return 'off-canvas-content is-open-left has-transition-push';
-      }
-      return 'off-canvas-content has-transition-push';
-    },
     selectedPortalName() {
       return this.selectedPortal ? this.selectedPortal.name : '';
     },
@@ -248,8 +237,6 @@ export default {
   },
 
   mounted() {
-    window.addEventListener('resize', this.handleResize);
-    this.handleResize();
     bus.$on(BUS_EVENTS.TOGGLE_SIDEMENU, this.toggleSidebar);
 
     const slug = this.$route.params.portalSlug;
@@ -259,7 +246,6 @@ export default {
   },
   beforeDestroy() {
     bus.$off(BUS_EVENTS.TOGGLE_SIDEMENU, this.toggleSidebar);
-    window.removeEventListener('resize', this.handleResize);
   },
   updated() {
     const slug = this.$route.params.portalSlug;
@@ -272,15 +258,12 @@ export default {
     }
   },
   methods: {
-    handleResize() {
-      if (window.innerWidth > 1200) {
-        this.isOnDesktop = true;
-      } else {
-        this.isOnDesktop = false;
-      }
-    },
     toggleSidebar() {
-      this.isSidebarOpen = !this.isSidebarOpen;
+      if (this.portals.length > 0) {
+        this.updateUISettings({
+          show_help_center_secondary_sidebar: !this.isSidebarOpen,
+        });
+      }
     },
     async fetchPortalAndItsCategories() {
       await this.$store.dispatch('portals/index');
@@ -322,8 +305,3 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.off-canvas-content.is-open-left.has-transition-push {
-  transform: translateX(var(--space-giga));
-}
-</style>

app/javascript/shared/components/ResizableTextArea.vue

@@ -37,6 +37,13 @@ export default {
       this.resizeTextarea();
     },
   },
+  mounted() {
+    this.$nextTick(() => {
+      if (this.value) {
+        this.resizeTextarea();
+      }
+    });
+  },
   methods: {
     resizeTextarea() {
       if (!this.value) {

config/locales/fr.yml

@@ -48,11 +48,11 @@ fr:
       imap:
         socket_error: Veuillez vérifier la connexion, l'adresse IMAP et réessayez.
         no_response_error: Veuillez vérifier les identifiants IMAP et réessayez.
-        host_unreachable_error: Host unreachable, Please check the IMAP address, IMAP port and try again.
+        host_unreachable_error: Hôte injoignable, veuillez vérifier l'adresse IMAP, le port IMAP et réessayer.
-        connection_timed_out_error: Connection timed out for %{address}:%{port}
+        connection_timed_out_error: La connexion a expiré pour %{address}:%{port}
-        connection_closed_error: Connection closed.
+        connection_closed_error: Connexion fermée.
       validations:
-        name: should not start or end with symbols, and it should not have < > / \ @ characters.
+        name: 'ne doit pas commencer ou se terminer par des symboles, et ne doit pas comporter les caractères suivants : "< > / \ @".'
   reports:
     period: Période de rapport %{since} à %{until}
     agent_csv:
@@ -61,14 +61,14 @@ fr:
       avg_first_response_time: Temps de réponse moyen (Minutes)
       avg_resolution_time: Temps moyen de résolution (Minutes)
     inbox_csv:
-      inbox_name: Inbox name
+      inbox_name: Nom de la boîte de réception
-      inbox_type: Inbox type
+      inbox_type: Type de boîte de réception
-      conversations_count: No. of conversations
+      conversations_count: Nbre de conversations
       avg_first_response_time: Temps de réponse moyen (Minutes)
       avg_resolution_time: Temps moyen de résolution (Minutes)
     label_csv:
-      label_title: Label
+      label_title: Libellé
-      conversations_count: No. of conversations
+      conversations_count: Nbre de conversations
       avg_first_response_time: Temps de réponse moyen (Minutes)
       avg_resolution_time: Temps moyen de résolution (Minutes)
     team_csv:
@@ -79,13 +79,13 @@ fr:
     default_group_by: jour
     csat:
       headers:
-        contact_name: Contact Name
+        contact_name: Nom du contact
-        contact_email_address: Contact Email Address
+        contact_email_address: Adresse e-mail du contact
-        contact_phone_number: Contact Phone Number
+        contact_phone_number: Numéro de téléphone du contact
-        link_to_the_conversation: Link to the conversation
+        link_to_the_conversation: Lier à la conversation
         agent_name: Nom de l'agent
         rating: Note
-        feedback: Feedback Comment
+        feedback: Commentaire
         recorded_at: Recorded date
   notifications:
     notification_title:
@@ -96,7 +96,7 @@ fr:
   conversations:
     messages:
       instagram_story_content: "%{story_sender} vous a mentionné dans l'histoire: "
-      instagram_deleted_story_content: This story is no longer available.
+      instagram_deleted_story_content: Cette Story n'est plus disponible.
       deleted: Ce message a été supprimé
     activity:
       status:
@@ -151,9 +151,9 @@ fr:
       description: "L'intégration FullContact permet d'enrichir les profils de visiteurs. Identifiez les utilisateurs dès qu'ils partagent leur adresse de courriel et offrez-leur un service client sur mesure. Connectez FullContact à votre compte en partageant la clé API FullContact."
   public_portal:
     search:
-      search_placeholder: Search for article by title or body...
+      search_placeholder: Rechercher un article par titre ou contenu...
       empty_placeholder: Aucun résultat trouvé.
-      loading_placeholder: Searching...
+      loading_placeholder: Recherche en cours...
-      results_title: Search results
+      results_title: Résultats de recherche
     hero:
-      sub_title: Search for the articles here or browse the categories below.
+      sub_title: Recherchez les articles ici ou parcourez les catégories ci-dessous.