akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' into chore-replace-availability-mixin-with-composable-CW-3472

Browse Source
This commit is contained in:
Fayaz Ahmed
2024-08-27 12:29:45 +05:30
committed by GitHub
parent 0aa5237bbf f82ec3b885
commit d297987bc5
1151 changed files with 11214 additions and 6383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/widget/components/AgentMessageBubble.vue
+12 -2
View File
@@ -1,5 +1,5 @@
<script>
import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
import ChatCard from 'shared/components/ChatCard.vue';
import ChatForm from 'shared/components/ChatForm.vue';
import ChatOptions from 'shared/components/ChatOptions.vue';
@@ -20,7 +20,7 @@ export default {
CustomerSatisfaction,
IntegrationCard,
},
mixins: [messageFormatterMixin, darkModeMixin],
mixins: [darkModeMixin],
props: {
message: { type: String, default: null },
contentType: { type: String, default: null },
@@ -31,6 +31,16 @@ export default {
default: () => {},
},
},
setup() {
const { formatMessage, getPlainText, truncateMessage, highlightContent } =
useMessageFormatter();
return {
formatMessage,
getPlainText,
truncateMessage,
highlightContent,
};
},
computed: {
isTemplate() {
return this.messageType === 3;
app/javascript/widget/components/PreChat/Form.vue
+8 -2
View File
@@ -5,7 +5,7 @@ import { mapGetters } from 'vuex';
import { getContrastingTextColor } from '@chatwoot/utils';
import { isEmptyObject } from 'widget/helpers/utils';
import { getRegexp } from 'shared/helpers/Validators';
import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
import routerMixin from 'widget/mixins/routerMixin';
import darkModeMixin from 'widget/mixins/darkModeMixin';
import configMixin from 'widget/mixins/configMixin';
@@ -15,13 +15,19 @@ export default {
CustomButton,
Spinner,
},
mixins: [routerMixin, darkModeMixin, messageFormatterMixin, configMixin],
mixins: [routerMixin, darkModeMixin, configMixin],
props: {
options: {
type: Object,
default: () => {},
},
},
setup() {
const { formatMessage } = useMessageFormatter();
return {
formatMessage,
};
},
data() {
return {
locale: this.$root.$i18n.locale,
app/javascript/widget/components/UnreadMessage.vue
+8 -2
View File
@@ -1,5 +1,5 @@
<script>
import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
import configMixin from '../mixins/configMixin';
import { isEmptyObject } from 'widget/helpers/utils';
@@ -11,7 +11,7 @@ import darkModeMixin from 'widget/mixins/darkModeMixin';
export default {
name: 'UnreadMessage',
components: { Thumbnail },
mixins: [messageFormatterMixin, configMixin, darkModeMixin],
mixins: [configMixin, darkModeMixin],
props: {
message: {
type: String,
@@ -30,6 +30,12 @@ export default {
default: null,
},
},
setup() {
const { formatMessage } = useMessageFormatter();
return {
formatMessage,
};
},
computed: {
companyName() {
return `${this.$t('UNREAD_VIEW.COMPANY_FROM')} ${
app/javascript/widget/components/UserMessageBubble.vue
+7 -2
View File
@@ -1,10 +1,9 @@
<script>
import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
import { getContrastingTextColor } from '@chatwoot/utils';
export default {
name: 'UserMessageBubble',
mixins: [messageFormatterMixin],
props: {
message: {
type: String,
@@ -15,6 +14,12 @@ export default {
default: '',
},
},
setup() {
const { formatMessage } = useMessageFormatter();
return {
formatMessage,
};
},
computed: {
textColor() {
return getContrastingTextColor(this.widgetColor);
app/javascript/widget/components/template/Article.vue
+8 -2
View File
@@ -1,5 +1,5 @@
<script>
import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
import { useMessageFormatter } from 'shared/composables/useMessageFormatter';
import FluentIcon from 'shared/components/FluentIcon/Index.vue';
import darkModeMixin from 'widget/mixins/darkModeMixin.js';
@@ -7,13 +7,19 @@ export default {
components: {
FluentIcon,
},
mixins: [messageFormatterMixin, darkModeMixin],
mixins: [darkModeMixin],
props: {
items: {
type: Array,
default: () => [],
},
},
setup() {
const { truncateMessage } = useMessageFormatter();
return {
truncateMessage,
};
},
};
</script>
app/javascript/widget/i18n/locale/hi.json
+7 -2
View File
@@ -70,7 +70,8 @@
"REQUIRED_ERROR": "Phone Number is required",
"DIAL_CODE_VALID_ERROR": "Please select a country code",
"VALID_ERROR": "Please enter a valid phone number",
"DROPDOWN_EMPTY": "No results found"
"DROPDOWN_EMPTY": "No results found",
"DROPDOWN_SEARCH": "Search country"
},
"MESSAGE": {
"LABEL": "Message",
@@ -91,7 +92,8 @@
},
"EMOJI": {
"PLACEHOLDER": "Search emojis",
"NOT_FOUND": "No emoji match your search"
"NOT_FOUND": "No emoji match your search",
"ARIA_LABEL": "Emoji picker"
},
"CSAT": {
"TITLE": "Rate your conversation",
@@ -133,5 +135,8 @@
"fallback": {
"CONTENT": "has shared a url"
}
},
"FOOTER_REPLY_TO": {
"REPLY_TO": "Replying to:"
}
}
app/javascript/widget/i18n/locale/hr.json
+49 -49
View File
@@ -17,38 +17,38 @@
"OFFLINE": "Trenutačno nismo online"
},
"REPLY_TIME": {
"IN_A_FEW_MINUTES": "Typically replies in a few minutes",
"IN_A_FEW_HOURS": "Typically replies in a few hours",
"IN_A_DAY": "Typically replies in a day",
"BACK_IN": "We will be back online"
"IN_A_FEW_MINUTES": "Obično odgovara za nekoliko minuta",
"IN_A_FEW_HOURS": "Obično odgovara za nekoliko sati",
"IN_A_DAY": "Obično odgovara u roku jednog dana",
"BACK_IN": "Bit ćemo ponovno online"
},
"DAY_NAMES": [
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday"
"Nedjelja",
"Ponedjeljak",
"Utorak",
"Srijeda",
"Četvrtak",
"Petak",
"Subota"
],
"START_CONVERSATION": "Start Conversation",
"END_CONVERSATION": "End Conversation",
"CONTINUE_CONVERSATION": "Continue conversation",
"YOU": "You",
"START_NEW_CONVERSATION": "Start a new conversation",
"VIEW_UNREAD_MESSAGES": "You have unread messages",
"START_CONVERSATION": "Započnite razgovor",
"END_CONVERSATION": "Završite razgovor",
"CONTINUE_CONVERSATION": "Nastavite razgovor",
"YOU": "Vi",
"START_NEW_CONVERSATION": "Započnite novi razgovor",
"VIEW_UNREAD_MESSAGES": "Imate nepročitane poruke",
"UNREAD_VIEW": {
"VIEW_MESSAGES_BUTTON": "See new messages",
"CLOSE_MESSAGES_BUTTON": "Close",
"COMPANY_FROM": "from",
"VIEW_MESSAGES_BUTTON": "Pogledajte nove poruke",
"CLOSE_MESSAGES_BUTTON": "Zatvori",
"COMPANY_FROM": "od",
"BOT": "Bot"
},
"BUBBLE": {
"LABEL": "Chat with us"
"LABEL": "Čavrljajte s nama"
},
"POWERED_BY": "Powered by Chatwoot",
"EMAIL_PLACEHOLDER": "Please enter your email",
"CHAT_PLACEHOLDER": "Type your message",
"POWERED_BY": "Pokreće Chatwoot",
"EMAIL_PLACEHOLDER": "Unesite svoju e-mail adresu",
"CHAT_PLACEHOLDER": "Unesite svoju poruku",
"TODAY": "Danas",
"YESTERDAY": "Jučer",
"PRE_CHAT_FORM": {
@@ -78,60 +78,60 @@
"ERROR": "Poruka je prekratka"
}
},
"CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
"IS_REQUIRED": "is required",
"REQUIRED": "Required",
"REGEX_ERROR": "Please provide a valid input"
"CAMPAIGN_HEADER": "Molimo unesite svoje ime i e-mail prije početka razgovora",
"IS_REQUIRED": "je obavezno",
"REQUIRED": "Obavezno",
"REGEX_ERROR": "Molimo unesite važeći unos"
},
"FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
"FILE_SIZE_LIMIT": "Datoteka prelazi ograničenje priloga za {MAXIMUM_FILE_UPLOAD_SIZE}",
"CHAT_FORM": {
"INVALID": {
"FIELD": "Invalid field"
"FIELD": "Nevažeće polje"
}
},
"EMOJI": {
"PLACEHOLDER": "Search emojis",
"NOT_FOUND": "No emoji match your search"
"PLACEHOLDER": "Pretraži emojije",
"NOT_FOUND": "Nema emojija koji odgovaraju vašoj pretrazi"
},
"CSAT": {
"TITLE": "Rate your conversation",
"SUBMITTED_TITLE": "Thank you for submitting the rating",
"PLACEHOLDER": "Tell us more..."
"TITLE": "Ocijenite vaš razgovor",
"SUBMITTED_TITLE": "Hvala vam na ocjeni",
"PLACEHOLDER": "Recite nam više..."
},
"EMAIL_TRANSCRIPT": {
"BUTTON_TEXT": "Request a conversation transcript",
"SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
"SEND_EMAIL_ERROR": "There was an error, please try again"
"BUTTON_TEXT": "Zatražite transkript razgovora",
"SEND_EMAIL_SUCCESS": "Transkript razgovora je uspješno poslan",
"SEND_EMAIL_ERROR": "Došlo je do pogreške, molimo pokušajte ponovo"
},
"INTEGRATIONS": {
"DYTE": {
"CLICK_HERE_TO_JOIN": "Click here to join",
"LEAVE_THE_ROOM": "Leave the call"
"CLICK_HERE_TO_JOIN": "Kliknite ovdje za pridruživanje",
"LEAVE_THE_ROOM": "Napustite poziv"
}
},
"PORTAL": {
"POPULAR_ARTICLES": "Popular Articles",
"VIEW_ALL_ARTICLES": "View all articles",
"IFRAME_LOAD_ERROR": "There was an error loading the article, please refresh the page and try again."
"POPULAR_ARTICLES": "Popularni članci",
"VIEW_ALL_ARTICLES": "Pogledajte sve članke",
"IFRAME_LOAD_ERROR": "Došlo je do pogreške pri učitavanju članka, molimo osvježite stranicu i pokušajte ponovo"
},
"ATTACHMENTS": {
"image": {
"CONTENT": "Picture message"
"CONTENT": "Poruka sa slikom"
},
"audio": {
"CONTENT": "Audio message"
"CONTENT": "Poruka sa zvukom"
},
"video": {
"CONTENT": "Video message"
"CONTENT": "Video poruka"
},
"file": {
"CONTENT": "File Attachment"
"CONTENT": "Privitak datoteke"
},
"location": {
"CONTENT": "Location"
"CONTENT": "Lokacija"
},
"fallback": {
"CONTENT": "has shared a url"
"CONTENT": "je podijelio/la url"
}
}
}
app/javascript/widget/i18n/locale/ms.json
+7 -2
View File
@@ -70,7 +70,8 @@
"REQUIRED_ERROR": "Phone Number is required",
"DIAL_CODE_VALID_ERROR": "Please select a country code",
"VALID_ERROR": "Please enter a valid phone number",
"DROPDOWN_EMPTY": "Tiada dijumpa"
"DROPDOWN_EMPTY": "Tiada dijumpa",
"DROPDOWN_SEARCH": "Search country"
},
"MESSAGE": {
"LABEL": "Message",
@@ -91,7 +92,8 @@
},
"EMOJI": {
"PLACEHOLDER": "Search emojis",
"NOT_FOUND": "No emoji match your search"
"NOT_FOUND": "No emoji match your search",
"ARIA_LABEL": "Emoji picker"
},
"CSAT": {
"TITLE": "Rate your conversation",
@@ -133,5 +135,8 @@
"fallback": {
"CONTENT": "has shared a url"
}
},
"FOOTER_REPLY_TO": {
"REPLY_TO": "Replying to:"
}
}