ReCodEx · krulis-martin · Mar 20, 2018 · Mar 17, 2018 · Mar 17, 2018 · Mar 20, 2018
diff --git a/src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js b/src/components/Assignments/Assignment/AssignmentTableRow/AssignmentTableRow.js
@@ -99,10 +99,7 @@ const AssignmentTableRow = ({
           <LinkContainer to={ASSIGNMENT_EDIT_URI_FACTORY(id)}>
             <Button bsSize="xs" bsStyle="warning">
               <EditIcon />{' '}
-              <FormattedMessage
-                id="app.adminAssignmentsTableRow.edit"
-                defaultMessage="Edit"
-              />
+              <FormattedMessage id="generic.edit" defaultMessage="Edit" />
             </Button>
           </LinkContainer>
           <DeleteAssignmentButtonContainer id={id} bsSize="xs" />

diff --git a/src/components/Exercises/ExerciseDetail/LoadingExerciseDetail.js b/src/components/Exercises/ExerciseDetail/LoadingExerciseDetail.js
@@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl';
 import { LoadingIcon } from '../../icons';
 import Box from '../../widgets/Box';
 
-const LoadingExerciseDetail = () => (
+const LoadingExerciseDetail = () =>
   <Box
     title={
       <FormattedMessage
@@ -12,13 +12,11 @@ const LoadingExerciseDetail = () => (
       />
     }
   >
-    <LoadingIcon />
-    {' '}
+    <LoadingIcon />{' '}
     <FormattedMessage
       id="app.exercises.loadingDetail"
-      defaultMessage="Loading exercise's detail"
+      defaultMessage="Loading the detail of the exercise"
     />
-  </Box>
-);
+  </Box>;
 
 export default LoadingExerciseDetail;
diff --git a/src/components/Exercises/ExercisesList/ExercisesList.js b/src/components/Exercises/ExercisesList/ExercisesList.js
@@ -17,13 +17,10 @@ const ExercisesList = ({
       <tr>
         <th />
         <th>
-          <FormattedMessage id="app.exercisesList.name" defaultMessage="Name" />
+          <FormattedMessage id="generic.name" defaultMessage="Name" />
         </th>
         <th>
-          <FormattedMessage
-            id="app.exercisesList.author"
-            defaultMessage="Author"
-          />
+          <FormattedMessage id="generic.author" defaultMessage="Author" />
         </th>
         <th>
           <FormattedMessage

diff --git a/src/components/Exercises/ExercisesSimpleList/ExercisesSimpleList.js b/src/components/Exercises/ExercisesSimpleList/ExercisesSimpleList.js
@@ -16,16 +16,10 @@ const ExercisesSimpleList = ({
     <thead>
       <tr>
         <th>
-          <FormattedMessage
-            id="app.exercisesSimpleList.name"
-            defaultMessage="Name"
-          />
+          <FormattedMessage id="generic.name" defaultMessage="Name" />
         </th>
         <th>
-          <FormattedMessage
-            id="app.exercisesSimpleListt.author"
-            defaultMessage="Author"
-          />
+          <FormattedMessage id="generic.author" defaultMessage="Author" />
         </th>
         <th>
           <FormattedMessage

diff --git a/src/components/Exercises/FilesTable/AttachmentFilesTableHeaderRow.js b/src/components/Exercises/FilesTable/AttachmentFilesTableHeaderRow.js
@@ -5,8 +5,8 @@ const AttachmentFilesTableHeaderRow = () =>
   <tr>
     <th>
       <FormattedMessage
-        id="app.attachmentFilesTable.fileName"
-        defaultMessage="Original filename"
+        id="app.filesTable.originalFileName"
+        defaultMessage="Original File Name"
       />
     </th>
     <th>
@@ -17,15 +17,12 @@ const AttachmentFilesTableHeaderRow = () =>
     </th>
     <th>
       <FormattedMessage
-        id="app.attachmentFilesTable.fileSize"
-        defaultMessage="Filesize"
+        id="app.filesTable.fileSize"
+        defaultMessage="File Size"
       />
     </th>
     <th>
-      <FormattedMessage
-        id="app.attachmentFilesTable.fileUploadedAt"
-        defaultMessage="Uploaded at"
-      />
+      <FormattedMessage id="generic.uploadedAt" defaultMessage="Uploaded at" />
     </th>
     <th />
   </tr>;

diff --git a/src/components/Exercises/FilesTable/SupplementaryFilesTableHeaderRow.js b/src/components/Exercises/FilesTable/SupplementaryFilesTableHeaderRow.js
@@ -6,21 +6,18 @@ const SupplementaryFilesTableHeaderRow = ({ viewOnly }) =>
   <tr>
     <th>
       <FormattedMessage
-        id="app.supplementaryFilesTable.fileName"
-        defaultMessage="Original filename"
+        id="app.filesTable.originalFileName"
+        defaultMessage="Original File Name"
       />
     </th>
     <th>
       <FormattedMessage
-        id="app.supplementaryFilesTable.fileSize"
-        defaultMessage="Filesize"
+        id="app.filesTable.fileSize"
+        defaultMessage="File Size"
       />
     </th>
     <th>
-      <FormattedMessage
-        id="app.supplementaryFilesTable.fileUploadedAt"
-        defaultMessage="Uploaded at"
-      />
+      <FormattedMessage id="generic.uploadedAt" defaultMessage="Uploaded at" />
     </th>
     {!viewOnly && <th />}
   </tr>;

diff --git a/src/components/Groups/GroupDetail/LoadingGroupDetail.js b/src/components/Groups/GroupDetail/LoadingGroupDetail.js
@@ -3,25 +3,23 @@ import { FormattedMessage } from 'react-intl';
 import { LoadingIcon } from '../../icons';
 import Box from '../../widgets/Box';
 
-const LoadingGroupDetail = () => (
+const LoadingGroupDetail = () =>
   <Box
     noPadding={false}
     title={
       <span>
-        <LoadingIcon />
-        {' '}
+        <LoadingIcon />{' '}
         <FormattedMessage
           id="app.groupDetail.loading"
-          defaultMessage="Loading group's description ..."
+          defaultMessage="Loading description of the group ..."
         />
       </span>
     }
   >
     <FormattedMessage
       id="app.groupDetail.loading"
-      defaultMessage="Loading group's description ..."
+      defaultMessage="Loading description of the group ..."
     />
-  </Box>
-);
+  </Box>;
 
 export default LoadingGroupDetail;
diff --git a/src/components/Groups/GroupTopButtons/GroupTopButtons.js b/src/components/Groups/GroupTopButtons/GroupTopButtons.js
@@ -24,23 +24,23 @@ const GroupTopButtons = ({
         <Button bsStyle="warning">
           <EditIcon />{' '}
           <FormattedMessage
-            id="app.group.edit"
-            defaultMessage="Edit group settings"
+            id="app.editGroup.title"
+            defaultMessage="Edit Group"
           />
         </Button>
       </LinkContainer>}
     <LinkContainer to={GROUP_INFO_URI_FACTORY(group.id)}>
       <Button bsStyle="primary">
         <InfoIcon />{' '}
-        <FormattedMessage id="app.group.seeInfo" defaultMessage="Group Info" />
+        <FormattedMessage id="app.group.info" defaultMessage="Group Info" />
       </Button>
     </LinkContainer>
     {!group.organizational &&
       <LinkContainer to={GROUP_DETAIL_URI_FACTORY(group.id)}>
         <Button bsStyle="primary">
           <GroupIcon />{' '}
           <FormattedMessage
-            id="app.group.seeDetail"
+            id="app.group.detailButton"
             defaultMessage="Group Detail"
           />
         </Button>

diff --git a/src/components/Instances/InstanceDetail/LoadingInstanceDetail.js b/src/components/Instances/InstanceDetail/LoadingInstanceDetail.js
@@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl';
 import { LoadingIcon } from '../../icons';
 import Box from '../../widgets/Box';
 
-const LoadingInstanceDetail = () => (
+const LoadingInstanceDetail = () =>
   <Box
     title={
       <FormattedMessage
@@ -12,13 +12,11 @@ const LoadingInstanceDetail = () => (
       />
     }
   >
-    <LoadingIcon />
-    {' '}
+    <LoadingIcon />{' '}
     <FormattedMessage
       id="app.instances.loadingDetail"
-      defaultMessage="Loading instance's detail"
+      defaultMessage="Loading detail of the instance"
     />
-  </Box>
-);
+  </Box>;
 
 export default LoadingInstanceDetail;
diff --git a/src/components/Instances/InstancesTable/InstancesTable.js b/src/components/Instances/InstancesTable/InstancesTable.js
@@ -13,10 +13,7 @@ const InstancesTable = ({ instances, links: { INSTANCE_URI_FACTORY }, intl }) =>
     <thead>
       <tr>
         <th>
-          <FormattedMessage
-            id="app.instancesTable.name"
-            defaultMessage="Name"
-          />
+          <FormattedMessage id="generic.name" defaultMessage="Name" />
         </th>
         <th>
           <FormattedMessage

diff --git a/src/components/Pipelines/BoxForm/BoxForm.js b/src/components/Pipelines/BoxForm/BoxForm.js
@@ -66,10 +66,9 @@ class BoxForm extends Component {
             component={TextField}
             required
             label={
-              <FormattedMessage
-                id="app.pipelineEditor.BoxForm.name"
-                defaultMessage="Name:"
-              />
+              <span>
+                <FormattedMessage id="generic.name" defaultMessage="Name" />:
+              </span>
             }
           />
 
@@ -135,31 +134,22 @@ class BoxForm extends Component {
               reset={reset}
               messages={{
                 success: (
-                  <FormattedMessage
-                    id="app.pipelineEditor.BoxForm.success"
-                    defaultMessage="Saved"
-                  />
+                  <FormattedMessage id="generic.saved" defaultMessage="Saved" />
                 ),
                 submit: (
-                  <FormattedMessage
-                    id="app.pipelineEditor.BoxForm.createGroup"
-                    defaultMessage="Save"
-                  />
+                  <FormattedMessage id="generic.save" defaultMessage="Save" />
                 ),
                 submitting: (
                   <FormattedMessage
-                    id="app.pipelineEditor.BoxForm.processing"
+                    id="generic.saving"
                     defaultMessage="Saving ..."
                   />
                 )
               }}
             />
             <Button onClick={onHide}>
               <CloseIcon />&nbsp;
-              <FormattedMessage
-                id="app.pipelineEditor.BoxForm.close"
-                defaultMessage="Close"
-              />
+              <FormattedMessage id="generic.close" defaultMessage="Close" />
             </Button>
             <span style={{ display: 'inline-block', width: '5px' }} />
             <ConfirmDeleteButton

diff --git a/src/components/Pipelines/PipelineDetail/PipelineDetail.js b/src/components/Pipelines/PipelineDetail/PipelineDetail.js
@@ -28,10 +28,7 @@ const PipelineDetail = ({
       <tbody>
         <tr>
           <th>
-            <FormattedMessage
-              id="app.pipeline.author"
-              defaultMessage="Author:"
-            />
+            <FormattedMessage id="generic.author" defaultMessage="Author" />:
           </th>
           <td>
             <UsersNameContainer userId={author} />

diff --git a/src/components/Pipelines/PipelinesList/PipelinesList.js b/src/components/Pipelines/PipelinesList/PipelinesList.js
@@ -11,13 +11,10 @@ const PipelinesList = ({ pipelines = [], createActions, intl }) =>
       <tr>
         <th />
         <th>
-          <FormattedMessage id="app.pipelinesList.name" defaultMessage="Name" />
+          <FormattedMessage id="generic.name" defaultMessage="Name" />
         </th>
         <th>
-          <FormattedMessage
-            id="app.pipelinesList.author"
-            defaultMessage="Author"
-          />
+          <FormattedMessage id="generic.author" defaultMessage="Author" />
         </th>
         <th>
           <FormattedMessage

diff --git a/src/components/Pipelines/PipelinesSimpleList/PipelinesSimpleList.js b/src/components/Pipelines/PipelinesSimpleList/PipelinesSimpleList.js
@@ -10,16 +10,10 @@ const PipelinesSimpleList = ({ pipelines, createActions, intl, ...rest }) =>
     <thead>
       <tr>
         <th>
-          <FormattedMessage
-            id="app.pipelinesSimpleList.name"
-            defaultMessage="Name"
-          />
+          <FormattedMessage id="generic.name" defaultMessage="Name" />
         </th>
         <th>
-          <FormattedMessage
-            id="app.pipelinesSimpleList.author"
-            defaultMessage="Author"
-          />
+          <FormattedMessage id="generic.author" defaultMessage="Author" />
         </th>
         {createActions &&
           <th>

diff --git a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js b/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
@@ -46,9 +46,9 @@ const ReferenceSolutionDetail = ({
           </td>
           <th>
             <FormattedMessage
-              id="app.referenceSolutionDetail.description"
+              id="generic.description"
               defaultMessage="Description"
-            />
+            />:
           </th>
           <td>
             {description}
@@ -60,9 +60,9 @@ const ReferenceSolutionDetail = ({
           </td>
           <th>
             <FormattedMessage
-              id="app.referenceSolutionDetail.uploadedAt"
-              defaultMessage="Uploaded at:"
-            />
+              id="generic.uploadedAt"
+              defaultMessage="Uploaded at"
+            />:
           </th>
           <td>
             <FormattedDate value={createdAt * 1000} />
@@ -75,10 +75,7 @@ const ReferenceSolutionDetail = ({
             <Icon name="user" />
           </td>
           <th>
-            <FormattedMessage
-              id="app.referenceSolution.author"
-              defaultMessage="Author:"
-            />
+            <FormattedMessage id="generic.author" defaultMessage="Author" />:
           </th>
           <td>
             <UsersNameContainer userId={userId} />

diff --git a/src/components/SisIntegration/EditTerm/EditTerm.js b/src/components/SisIntegration/EditTerm/EditTerm.js
@@ -69,27 +69,19 @@ const EditTerm = ({
         hasFailed={submitFailed}
         invalid={invalid}
         messages={{
-          submit: (
-            <FormattedMessage id="app.editSisTerm.save" defaultMessage="Save" />
-          ),
+          submit: <FormattedMessage id="generic.save" defaultMessage="Save" />,
           submitting: (
-            <FormattedMessage
-              id="app.editSisTerm.saving"
-              defaultMessage="Saving ..."
-            />
+            <FormattedMessage id="generic.saving" defaultMessage="Saving ..." />
           ),
           success: (
-            <FormattedMessage
-              id="app.editSisTerm.successs"
-              defaultMessage="Saved"
-            />
+            <FormattedMessage id="generic.saved" defaultMessage="Saved" />
           )
         }}
       />
 
       <Button bsStyle="default" className="btn-flat" onClick={onClose}>
         <CloseIcon />{' '}
-        <FormattedMessage id="app.editSisTerm.close" defaultMessage="Close" />
+        <FormattedMessage id="generic.close" defaultMessage="Close" />
       </Button>
     </Modal.Footer>
   </Modal>;