Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VIH-11256 fix translations and trim service names #2357

Merged
merged 3 commits into from
Jan 23, 2025
Merged

VIH-11256 fix translations and trim service names #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cee96ef
VIH-11256 fix translations and trim service names
shaed-parkar Jan 22, 2025
c66f73d
remove dupe char
shaed-parkar Jan 22, 2025
19f36f7
Merge branch 'master' into bugfix/VIH-11256_missing_translations
shaed-parkar Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VideoWeb/VideoWeb.Common/Caching/ConferenceCacheMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static Conference MapConferenceToCacheModel(ConferenceDetailsResponse con
conference.IsWaitingRoomOpen = conferenceResponse.IsWaitingRoomOpen;
conference.CaseName = caseInformation.Name;
conference.CaseNumber = caseInformation.Number;
conference.CaseType = hearingDetailsResponse.ServiceName;
conference.CaseType = hearingDetailsResponse.ServiceName.Trim();
conference.ScheduledDateTime = conferenceResponse.ScheduledDateTime;
conference.ScheduledDuration = conferenceResponse.ScheduledDuration;
conference.ClosedDateTime = conferenceResponse.ClosedDateTime;
Expand Down
5 changes: 4 additions & 1 deletion VideoWeb/VideoWeb/ClientApp/src/app/shared/translation-id-converter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@ export function convertStringToTranslationId(str): string {
if (!str) {
return '';
}
return str.replace(/[,\s’'/]/g, '-').toLowerCase();
return str
.trim()
.replace(/[,\s’'/]/g, '-')
.toLowerCase();
}
2 changes: 1 addition & 1 deletion VideoWeb/VideoWeb/ClientApp/src/assets/i18n/cy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@
"upper-tribunals-notice-of-reference-finance-services": "Uwch Dribiwnlys - Hysbysiad Geirda Gwasanaethau Cyllid",
"upper-tribunals-notice-of-reference-energy-market-decisions": "Uwch Dribiwnlys - Hysbysiad Geirda Penderfyniadau'r Farchnad Ynni",
"upper-tribunals-notice-of-reference-trade-remedies": "Uwch Dribiwnlys - Hysbysiad Geirda Rhwymedïau Masnach",
"upper-tribunals-notice-of-appeal-trade-remedies ": "Uwch Dribiwnlys - Hysbysiad o Apêl Rhwymedïau Masnach",
"upper-tribunals-notice-of-appeal-trade-remedies": "Uwch Dribiwnlys - Hysbysiad o Apêl Rhwymedïau Masnach",
"upper-tribunals-notice-of-appeal-financial-sanctions": "Uwch Dribiwnlys - Hysbysiad o Apêl Cosbau Ariannol",
"upper-tribunals-judicial-review-applications-(tax)": "Uwch Dribiwnlys - Ceisiadau am Adolygiad Barnwrol (Treth)",
"upper-tribunals-agricultural-land-and-drainage": "Uwch Dribiwnlys - Tir Amaethyddol a Draenio",
Expand Down
2 changes: 1 addition & 1 deletion VideoWeb/VideoWeb/ClientApp/src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@
"upper-tribunals-notice-of-reference-finance-services": "Upper Tribunals Notice of Reference Finance Services",
"upper-tribunals-notice-of-reference-energy-market-decisions": "Upper Tribunals Notice of Reference Energy Market Decisions",
"upper-tribunals-notice-of-reference-trade-remedies": "Upper Tribunals Notice of Reference Trade Remedies",
"upper-tribunals-notice-of-appeal-trade-remedies ": "Upper Tribunals Notice of Appeal Trade Remedies",
"upper-tribunals-notice-of-appeal-trade-remedies": "Upper Tribunals Notice of Appeal Trade Remedies",
"upper-tribunals-notice-of-appeal-financial-sanctions": "Upper Tribunals Notice of Appeal Financial Sanctions",
"upper-tribunals-judicial-review-applications-(tax)": "Upper Tribunals Judicial Review Applications (Tax)",
"upper-tribunals-agricultural-land-and-drainage": "Upper Tribunals Agricultural Land and Drainage",
Expand Down
Loading