Merge pull request #1341 from ishgroup/SST-82_OnCourse_localization_and_custom_logo

SST-82_OnCourse_localization_and_custom_logo

Author: yuryyas

.idea/codeStyles/Project.xml

@@ -8,6 +8,7 @@
 
 import ErrorOutline from '@mui/icons-material/ErrorOutline';
 import Button from '@mui/material/Button';
+import $t from '@t';
 import { ShowConfirmCaller } from 'ish-ui';
 import * as React from 'react';
 import { useEffect, useRef } from 'react';
@@ -72,7 +73,7 @@ const RouteChangeConfirm = (
             closeConfirm();
           }}
         >
-          SAVE
+          {$t('save')}
         </Button>
       );
 

.idea/inspectionProfiles/Project_Default.xml

@@ -28,6 +28,7 @@ import IconButton from '@mui/material/IconButton';
 import Menu from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
 import Tooltip from '@mui/material/Tooltip';
+import $t from '@t';
 import clsx from 'clsx';
 import { AppTheme, DocumentIconsChooser, formatRelativeDate, III_DD_MMM_YYYY_HH_MM_SPECIAL } from 'ish-ui';
 import React, { MouseEvent } from 'react';
@@ -166,7 +167,7 @@ class DocumentHeader extends React.PureComponent<Props, any> {
     return (
       <Grid container columnSpacing={3} className="mb-1">
         <div className="d-flex overflow-hidden">
-          <Tooltip title="Open Document URL" disableHoverListener={!validUrl}>
+          <Tooltip title={$t('open_document_url')} disableHoverListener={!validUrl}>
             <ButtonBase
               disabled={!validUrl}
               onClick={(e: any) => this.openDocumentURL(e, validUrl)}
@@ -233,13 +234,13 @@ class DocumentHeader extends React.PureComponent<Props, any> {
             disableRestoreFocus
           >
             <Alert severity="info">
-              <AlertTitle>Who can view this document</AlertTitle>
+              <AlertTitle>{$t('who_can_view_this_document')}</AlertTitle>
               {getDocumentShareSummary(item.access, item.attachmentRelations)}
             </Alert>
           </Popover>
 
           <IconButton
-            aria-label="more"
+            aria-label={$t('more')}
             aria-controls="document-more-menu"
             aria-haspopup="true"
             onClick={this.onOpenMoreMenu}
@@ -254,13 +255,13 @@ class DocumentHeader extends React.PureComponent<Props, any> {
             onClose={this.onCloseMoreMenu}
           >
             <MenuItem onClick={this.openDocumentView}>
-              Document info
+              {$t('document_info')}
             </MenuItem>
             <MenuItem onClick={this.openDocumentView}>
-              Permissions
+              {$t('permissions')}
             </MenuItem>
             <MenuItem onClick={this.unlinkItem} className="errorColor">
-              Unlink
+              {$t('unlink')}
             </MenuItem>
           </Menu>
         </div>

client-html/src/js/common/components/dialog/RouteChangeConfirm.tsx

@@ -1,8 +1,8 @@
-import { Grid } from "@mui/material";
-import Typography from "@mui/material/Typography";
-import React from "react";
+import { Grid, Typography } from '@mui/material';
+import $t from '@t';
+import React from 'react';
 
-const DocumentTags: React.FC<any> = ({tags, bold, classes}) => (
+const DocumentTags: React.FC<any> = ({ tags, bold, classes }) => (
   <Grid container columnSpacing={3}>
     {tags.length ? (
       tags.map(t => (
@@ -13,7 +13,7 @@ const DocumentTags: React.FC<any> = ({tags, bold, classes}) => (
       ))
     ) : (
       <Typography variant="body2" className={`placeholderContent ${classes && classes.documentNoTags}`}>
-        No Tags
+        {$t('no_tags')}
       </Typography>
     )}
   </Grid>

client-html/src/js/common/components/documents/DocumentHeader.tsx

@@ -6,6 +6,7 @@
 import { AvetmissExportSettings, FundingStatus, FundingUpload } from '@api/model';
 import { KeyboardArrowDown, OpenInNew } from '@mui/icons-material';
 import { Button, ButtonBase, FormControl, MenuItem, Select, Typography } from '@mui/material';
+import $t from '@t';
 import clsx from 'clsx';
 import { format } from 'date-fns';
 import { AnyArgFunction, AppTheme, III_DD_MMM_YYYY_HH_MM_AAAA_SPECIAL, openInternalLink, stubComponent } from 'ish-ui';
@@ -60,7 +61,7 @@ const styles = (theme: AppTheme) => ({
     borderRadius: `${theme.shape.borderRadius}px`,
     margin: theme.spacing(0, 0, 0.25, 0.25)
   },
-  linkButtonIcon: {fontSize: "1.2em"},
+  linkButtonIcon: { fontSize: "1.2em" },
   rootSelect: {
     fontWeight: 700,
     paddingRight: `${theme.spacing(2.5)}`
@@ -69,9 +70,9 @@ const styles = (theme: AppTheme) => ({
 });
 
 const fundingStatuses: any[] = [
-  {value: FundingStatus.success, label: "Success"},
-  {value: FundingStatus.fail, label: "Failed"},
-  {value: FundingStatus.unknown, label: "Unknown"}
+  { value: FundingStatus.success, label: "Success" },
+  { value: FundingStatus.fail, label: "Failed" },
+  { value: FundingStatus.unknown, label: "Unknown" }
 ];
 
 interface Props {
@@ -90,7 +91,7 @@ class FundingUploadComponent extends Component<Props, any> {
   };
 
   handleChange = event => {
-    const {onStatusChange, fundingUpload} = this.props;
+    const { onStatusChange, fundingUpload } = this.props;
 
     onStatusChange(fundingUpload.id, event.target.value);
   };
@@ -110,8 +111,7 @@ class FundingUploadComponent extends Component<Props, any> {
             <span>{fundingUpload.systemUser}</span>
             <span>
               {fundingUpload.outcomesCount}
-              {' '}
-              outcomes
+              {$t('outcomes2')}
               <ButtonBase
                 onClick={() => this.handleOutcomeLink(fundingUpload.id)}
                 classes={{
@@ -172,7 +172,7 @@ class FundingUploadComponent extends Component<Props, any> {
                 contained: classes.buttonContained
               }}
             >
-              Run again
+              {$t('run_again')}
             </Button>
           )}
         </div>

client-html/src/js/common/components/documents/DocumentTags.tsx

@@ -7,6 +7,7 @@ import { Holiday, RepeatEndEnum, RepeatEnum } from '@api/model';
 import { FormControlLabel, Grid } from '@mui/material';
 import Button from '@mui/material/Button';
 import Card from '@mui/material/Card';
+import $t from '@t';
 import clsx from 'clsx';
 import { format } from 'date-fns';
 import { normalizeNumberToPositive, StyledCheckbox, validateMinMaxDate, YYYY_MM_DD_MINUSED } from 'ish-ui';
@@ -106,12 +107,12 @@ const AvailabilityItem: React.FC<Props> = ({
                 "d-flex-start justify-content-space-between": threeColumn
               })}
             >
-              <FormField type="text" name={`${item}.description`} label="Description"/>
+              <FormField type="text" name={`${item}.description`} label={$t('description')}/>
               {threeColumn && (
                 <div className="d-flex errorColor">
                   <div className="flex-fill"/>
                   <Button size="small" color="inherit" onClick={onDelete.bind(null, field, index)}>
-                    Delete
+                    {$t('delete2')}
                   </Button>
                 </div>
               )}
@@ -120,7 +121,7 @@ const AvailabilityItem: React.FC<Props> = ({
             <Grid item xs={availabilityLayout[3].xs}>
               <FormControlLabel
                 control={<StyledCheckbox checked={allDay} onChange={onAllDayChange}/>}
-                label="All day"
+                label={$t('all_day')}
               />
             </Grid>
 
@@ -129,7 +130,7 @@ const AvailabilityItem: React.FC<Props> = ({
                 type={allDay ? "date" : "dateTime"}
                 timezone={timezone}
                 name={allDay ? `${item}.startDate` : `${item}.startDateTime`}
-                label="Start"
+                label={$t('start')}
                 validate={validateMaxDate}
                 required
               />
@@ -140,7 +141,7 @@ const AvailabilityItem: React.FC<Props> = ({
                 type={allDay ? "date" : "dateTime"}
                 timezone={timezone}
                 name={allDay ? `${item}.endDate` : `${item}.endDateTime`}
-                label="End"
+                label={$t('end')}
                 validate={validateMinDate}
                 required
               />
@@ -150,7 +151,7 @@ const AvailabilityItem: React.FC<Props> = ({
               <FormField
                 type="select"
                 name={`${item}.repeat`}
-                label="Repeat every"
+                label={$t('repeat_every')}
                 items={repeatListItems}
               />
             </Grid>
@@ -160,7 +161,7 @@ const AvailabilityItem: React.FC<Props> = ({
                 <FormField
                   type="select"
                   name={`${item}.repeatEnd`}
-                  label="End repeat"
+                  label={$t('end_repeat')}
                   items={repeatEndListItems}
                   className="pr-2"
                 />
@@ -173,7 +174,7 @@ const AvailabilityItem: React.FC<Props> = ({
                   type="date"
                   timezone={timezone}
                   name={`${item}.repeatOn`}
-                  label="On date"
+                  label={$t('on_date')}
                   validate={validateMinDate}
                   className="pr-2"
                   required
@@ -186,7 +187,7 @@ const AvailabilityItem: React.FC<Props> = ({
                 <FormField
                   name={`${item}.repeatEndAfter`}
                   normalize={normalizeNumberToPositive}
-                  label="Times"
+                  label={$t('times')}
                   type="number"
                   min="0"
                   required
@@ -200,7 +201,7 @@ const AvailabilityItem: React.FC<Props> = ({
             <div className="d-flex errorColor">
               <div className="flex-fill"/>
               <Button size="small" color="inherit" onClick={onDelete.bind(null, field, index)}>
-                Delete
+                {$t('delete2')}
               </Button>
             </div>
           )}

client-html/src/js/common/components/form/FundingUploadComponent.tsx

@@ -3,11 +3,12 @@
  * No copying or use of this code is allowed without permission in writing from ish.
  */
 
-import { Holiday, RepeatEndEnum, RepeatEnum } from "@api/model";
-import Typography from "@mui/material/Typography";
-import { format as formatDate } from "date-fns";
-import { appendTimezone, III_DD_MMM_YYYY } from "ish-ui";
-import * as React from "react";
+import { Holiday, RepeatEndEnum, RepeatEnum } from '@api/model';
+import Typography from '@mui/material/Typography';
+import $t from '@t';
+import { format as formatDate } from 'date-fns';
+import { appendTimezone, III_DD_MMM_YYYY } from 'ish-ui';
+import * as React from 'react';
 
 function encreaseDate(date, step) {
   switch (step) {
@@ -143,7 +144,7 @@ const AvailabilityNextHint = (props: HintProps) => {
     startDate, startDateTime, endDate, endDateTime, ...rest
   } = props.item;
 
-  const computed: Holiday = {...rest};
+  const computed: Holiday = { ...rest };
 
   const allDay = Boolean(startDate && endDate);
 
@@ -154,7 +155,7 @@ const AvailabilityNextHint = (props: HintProps) => {
 
   return (
     <div className={props.className}>
-      <Typography variant="caption">Next</Typography>
+      <Typography variant="caption">{$t('next')}</Typography>
       {dates}
     </div>
   );