Skip to content

Commit 5b2437f

Browse files
authored
Merge pull request #3763 from ita-social-projects/3762-hotfix-routes-to-the-json-file
Adjusted paths to the json files
2 parents 21af35a + ad01cc9 commit 5b2437f

5 files changed

Lines changed: 54 additions & 5 deletions

File tree

src/app/chat/component/chat-page/chat-page.component.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@
4848
</div>
4949

5050
<div class="message-input-container">
51-
<input type="text" [placeholder]="'chat.chat-placeholder' | translate" [(ngModel)]="newMessage" (keyup.enter)="sendMessage()" />
51+
<input
52+
type="text"
53+
[placeholder]="'chat.active-chat-placeholder' | translate"
54+
[(ngModel)]="newMessage"
55+
(keyup.enter)="sendMessage()"
56+
/>
5257
<button class="send-message-button" (click)="sendMessage()" aria-label="Send message">
5358
<svg width="30" height="30" viewBox="0 0 24 24">
5459
<path d="M4 12L20 4L16 12L20 20L4 12Z" fill="currentColor" />

src/app/chat/component/chat-page/chat-page.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Store } from '@ngrx/store';
99
import { take } from 'rxjs';
1010
import { userRoleSelector } from 'src/app/store/selectors/auth.selectors';
1111
import { environment } from '@environment/environment';
12-
//mock change for the commit
12+
1313
@Component({
1414
selector: 'app-chat',
1515
templateUrl: './chat-page.component.html',

src/app/ubs/ubs/models/ubs-sidebar-links.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const listElementsAdmin: listElements[] = [
3737
routerLink: 'user-agreement'
3838
},
3939
{
40-
link: 'assets/img/sidebarIcons/user_icon.svg',
40+
link: 'assets/img/chat/chats.svg',
4141
name: 'ubs-sidebar.chat',
4242
routerLink: 'chat-page'
4343
}

src/assets/i18n/ubs-admin/en.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,8 @@
635635
"support-chat": "Support-chat",
636636
"delete-message-question": "Do you want to remove the message?",
637637
"delete-message-confirm": "Yes",
638-
"delete-message-cancel": "No"
638+
"delete-message-cancel": "No",
639+
"active-chat-placeholder": "Enter your message"
639640
},
640641
"ubs-employee": {
641642
"add-employee": "Add employee",
@@ -1319,5 +1320,26 @@
13191320
"other": "Other"
13201321
},
13211322
"specify-reason": "Specify the reason"
1323+
},
1324+
"client-panel": {
1325+
"order-id": "ID",
1326+
"date-form": "Date created",
1327+
"date-paid": "Date paid",
1328+
"order-status-uk": "Status (UA)",
1329+
"order-status-en": "Status (EN)",
1330+
"payment-status-uk": "Payment (UA)",
1331+
"payment-status-en": "Payment (EN)",
1332+
"amount-before-payment": "Amount due",
1333+
"paid-amount": "Amount paid",
1334+
"order-full-price": "Total amount",
1335+
"bags-title": "Bags",
1336+
"service": "Service",
1337+
"capacity": "Capacity",
1338+
"unit-price": "Unit price",
1339+
"count": "Quantity",
1340+
"total-price": "Total",
1341+
"loading": "Loading information...",
1342+
"error": "Failed to load information.",
1343+
"order-info-title": "Order Information"
13221344
}
13231345
}

src/assets/i18n/ubs-admin/ua.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,8 @@
633633
"support-chat": "Чат підтримки",
634634
"delete-message-question": "Ви дійсно бажаєте видалити повідомлення?",
635635
"delete-message-confirm": "Так",
636-
"delete-message-cancel": "Ні"
636+
"delete-message-cancel": "Ні",
637+
"active-chat-placeholder": "Введіть ваше повідомлення"
637638
},
638639
"ubs-employee": {
639640
"add-employee": "Додати працівника",
@@ -1317,5 +1318,26 @@
13171318
"other": "Інше"
13181319
},
13191320
"specify-reason": "Вкажіть причину"
1321+
},
1322+
"client-panel": {
1323+
"order-id": "ID",
1324+
"date-form": "Дата створення",
1325+
"date-paid": "Дата оплати",
1326+
"order-status-uk": "Статус (Укр)",
1327+
"order-status-en": "Статус (En)",
1328+
"payment-status-uk": "Оплата (Укр)",
1329+
"payment-status-en": "Оплата (En)",
1330+
"amount-before-payment": "Сума до сплати",
1331+
"paid-amount": "Сума оплачено",
1332+
"order-full-price": "Загальна сума",
1333+
"bags-title": "Пакети",
1334+
"service": "Послуга",
1335+
"capacity": "Обʼєм",
1336+
"unit-price": "Ціна за од.",
1337+
"count": "Кількість",
1338+
"total-price": "Сума",
1339+
"loading": "Завантаження інформації...",
1340+
"error": "Не вдалося завантажити інформацію.",
1341+
"order-info-title": "Інформація про замовлення"
13201342
}
13211343
}

0 commit comments

Comments
 (0)