Merge branch 'inveniosoftware:master' into 321-implement-listidentifiers

inveniosoftware · Jun 25, 2024 · 3b8e69a · 3b8e69a
2 parents 711d79a + b0255d5
commit 3b8e69a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/...s/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/CustomAwardForm.js b/...s/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/CustomAwardForm.js
@@ -88,7 +88,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
       </Overridable>
       <Overridable id="InvenioVocabularies.CustomAwardForm.AwardInformationHeader.Container">
         <Header as="h3" size="small">
-          {i18next.t("Award information")} ({i18next.t("optional")})
+          {i18next.t("Additional information")} ({i18next.t("optional")})
         </Header>
       </Overridable>
       <Form.Group widths="equal">
@@ -98,7 +98,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
         >
           <TextField
             label={i18next.t("Number")}
-            placeholder={i18next.t("Award number")}
+            placeholder={i18next.t("Award/Grant number")}
             fieldPath="selectedFunding.award.number"
           />
         </Overridable>
@@ -108,7 +108,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
         >
           <TextField
             label={i18next.t("Title")}
-            placeholder={i18next.t("Award Title")}
+            placeholder={i18next.t("Award/Grant Title")}
             fieldPath="selectedFunding.award.title"
           />
         </Overridable>
@@ -118,7 +118,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
         >
           <TextField
             label={i18next.t("URL")}
-            placeholder={i18next.t("Award URL")}
+            placeholder={i18next.t("Award/Grant URL")}
             fieldPath="selectedFunding.award.url"
           />
         </Overridable>

diff --git a/...ries/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js b/...ries/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js
@@ -123,7 +123,7 @@ function FundingFieldForm(props) {
                 className="mb-5"
               >
                 <Icon name="add" />
-                {i18next.t("Add award")}
+                {i18next.t("Add")}
               </Button>
             }
             onAwardChange={(selectedFunding) => {

diff --git a/...ries/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingModal.js b/...ries/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingModal.js
@@ -157,8 +157,8 @@ function FundingModal({
         >
           <Modal.Header as="h2" className="pt-10 pb-10">
             {mode === "standard"
-              ? i18next.t("Add standard award")
-              : i18next.t("Add custom award")}
+              ? i18next.t("Add standard award/grant")
+              : i18next.t("Add custom funding")}
           </Modal.Header>
           <Modal.Content>
             {mode === ModalTypes.STANDARD && (
@@ -172,7 +172,7 @@ function FundingModal({
                   <Grid.Row>
                     <Grid.Column width={11} floated="left" verticalAlign="middle">
                       <SearchBar
-                        placeholder={i18next.t("Search for awards")}
+                        placeholder={i18next.t("Search for awards/grants")}
                         autofocus
                         actionProps={{
                           icon: "search",
@@ -234,9 +234,7 @@ function FundingModal({
               primary
               icon="checkmark"
               content={
-                action === ModalActions.ADD
-                  ? i18next.t("Add award")
-                  : i18next.t("Change award")
+                action === ModalActions.ADD ? i18next.t("Add") : i18next.t("Change")
               }
             />
           </Modal.Actions>

diff --git a/...es/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/NoAwardResults.js b/...es/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/NoAwardResults.js
@@ -16,15 +16,15 @@ export function NoAwardResults({ switchToCustom }) {
       basic
       content={
         <p>
-          {i18next.t("Did not find your award? ")}
+          {i18next.t("Did not find your award/grant? ")}
           <a
             href="/"
             onClick={(e) => {
               e.preventDefault();
               switchToCustom();
             }}
           >
-            {i18next.t("Add a custom award.")}
+            {i18next.t("Add a custom award/grant.")}
           </a>
         </p>
       }