Merge branch 'develop' into foss-gh-action-arm64

2022-10-10 17:28:06 +05:30 · 2022-10-10 17:28:06 +05:30 · 6f5fe2b7c0
commit 6f5fe2b7c0
parent 109c71dc7d 779f815f8e
45 changed files with 94 additions and 51 deletions
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "نسخ",
-      "DELETE": "حذف"
+      "DELETE": "حذف",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Изтрий"
+      "DELETE": "Изтрий",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copia",
-      "DELETE": "Esborrar"
+      "DELETE": "Esborrar",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopírovat",
-      "DELETE": "Vymazat"
+      "DELETE": "Vymazat",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopiér",
-      "DELETE": "Slet"
+      "DELETE": "Slet",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopieren",
-      "DELETE": "Löschen"
+      "DELETE": "Löschen",
+      "CREATE_A_CANNED_RESPONSE": "Zu vorgefertigten Antworten hinzufügen"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Αντιγραφή",
-      "DELETE": "Διαγραφή"
+      "DELETE": "Διαγραφή",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copiar",
-      "DELETE": "Eliminar"
+      "DELETE": "Eliminar",
+      "CREATE_A_CANNED_RESPONSE": "Añadir a respuestas predefinidas"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "کپی",
-      "DELETE": "حذف"
+      "DELETE": "حذف",
+      "CREATE_A_CANNED_RESPONSE": "اضافه کردن به پاسخ‌های آماده"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopioi",
-      "DELETE": "Poista"
+      "DELETE": "Poista",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copier",
-      "DELETE": "Supprimer"
+      "DELETE": "Supprimer",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "העתק",
-      "DELETE": "מחק"
+      "DELETE": "מחק",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Delete"
+      "DELETE": "Delete",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Másolás",
-      "DELETE": "Törlés"
+      "DELETE": "Törlés",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Salin",
-      "DELETE": "Hapus"
+      "DELETE": "Hapus",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copia",
-      "DELETE": "Elimina"
+      "DELETE": "Elimina",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "コピー",
-      "DELETE": "削除"
+      "DELETE": "削除",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ka/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ka/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Delete"
+      "DELETE": "Delete",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "복사",
-      "DELETE": "삭제"
+      "DELETE": "삭제",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/lt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Delete"
+      "DELETE": "Delete",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopēt",
-      "DELETE": "Dzēst"
+      "DELETE": "Dzēst",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "പകർത്തുക",
-      "DELETE": "ഇല്ലാതാക്കുക"
+      "DELETE": "ഇല്ലാതാക്കുക",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ms/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ms/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Padamkan"
+      "DELETE": "Padamkan",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Delete"
+      "DELETE": "Delete",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopiëren",
-      "DELETE": "Verwijderen"
+      "DELETE": "Verwijderen",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopier",
-      "DELETE": "Slett"
+      "DELETE": "Slett",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Usuń"
+      "DELETE": "Usuń",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copiar",
-      "DELETE": "excluir"
+      "DELETE": "excluir",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copiar",
-      "DELETE": "Excluir"
+      "DELETE": "Excluir",
+      "CREATE_A_CANNED_RESPONSE": "Adicionar às respostas prontas"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copiază",
-      "DELETE": "Şterge"
+      "DELETE": "Şterge",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Копировать",
-      "DELETE": "Удалить"
+      "DELETE": "Удалить",
+      "CREATE_A_CANNED_RESPONSE": "Добавить в шаблонные ответы"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Vymazať"
+      "DELETE": "Vymazať",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/sr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopiraj",
-      "DELETE": "Izbriši"
+      "DELETE": "Izbriši",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopiera",
-      "DELETE": "Radera"
+      "DELETE": "Radera",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "நகல்",
-      "DELETE": "Delete"
+      "DELETE": "Delete",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "คัดลอก",
-      "DELETE": "ลบ"
+      "DELETE": "ลบ",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Kopyala",
-      "DELETE": "Sil"
+      "DELETE": "Sil",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Копіювати",
-      "DELETE": "Видалити"
+      "DELETE": "Видалити",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "حذف کریں۔"
+      "DELETE": "حذف کریں۔",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Copy",
-      "DELETE": "Delete"
+      "DELETE": "Delete",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "Sao Chép",
-      "DELETE": "Xoá"
+      "DELETE": "Xoá",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "复制",
-      "DELETE": "删除"
+      "DELETE": "删除",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@ -150,7 +150,8 @@
    },
    "CONTEXT_MENU": {
      "COPY": "複製",
-      "DELETE": "刪除"
+      "DELETE": "刪除",
+      "CREATE_A_CANNED_RESPONSE": "Add to canned responses"
    }
  },
  "EMAIL_TRANSCRIPT": {
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@ -55,12 +55,12 @@
      "PHONE_NUMBER": {
        "LABEL": "شماره تلفن",
        "PLACEHOLDER": "لطفا شماره تلفن خود را وارد کنید",
-        "REQUIRED_ERROR": "شماره تلفن الزامی است",
+        "REQUIRED_ERROR": "شماره تلفن مورد نیاز است",
        "VALID_ERROR": "شماره تلفن باید با فرمت E.164 باشد، به عنوان مثال: +1415555555"
      },
      "MESSAGE": {
        "LABEL": "پیام",
-        "PLACEHOLDER": "لطفا ایمیل خود را وارد کنید",
+        "PLACEHOLDER": "لطفا پیام خود را وارد کنید",
        "ERROR": "پیام بسیار کوتاه است"
      }
    },
@ -74,12 +74,12 @@
    }
  },
  "CSAT": {
-    "TITLE": "به مکالمه خود امتیاز دهید",
-    "SUBMITTED_TITLE": "با تشکر از شما برای ثبت رتبه",
-    "PLACEHOLDER": "توضیحات بیشتر بدهید..."
+    "TITLE": "به گفتگوی خود امتیاز دهید",
+    "SUBMITTED_TITLE": "با تشکر از شما برای ثبت امتیاز",
+    "PLACEHOLDER": "بیشتر به ما بگویید..."
  },
  "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "درخواست رونوشت مکالمه",
+    "BUTTON_TEXT": "درخواست رونوشت گفتگو",
    "SEND_EMAIL_SUCCESS": "رونوشت گفتگو با موفقیت ارسال شد",
    "SEND_EMAIL_ERROR": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
  }
--- a/app/models/channel/twilio_sms.rb
+++ b/app/models/channel/twilio_sms.rb
@ -28,8 +28,8 @@ class Channel::TwilioSms < ApplicationRecord
  validates :auth_token, presence: true

  # Must have _one_ of messaging_service_sid _or_ phone_number, and messaging_service_sid is preferred
-  validates :messaging_service_sid, uniqueness: true, presence: true, unless: :phone_number.presence
-  validates :phone_number, absence: true, if: :messaging_service_sid.presence
+  validates :messaging_service_sid, uniqueness: true, presence: true, unless: :phone_number?
+  validates :phone_number, absence: true, if: :messaging_service_sid?
  validates :phone_number, uniqueness: true, allow_nil: true

  enum medium: { sms: 0, whatsapp: 1 }