Merge branch 'stage' into production

common-voice · Jan 10, 2024 · 9419c11 · 9419c11
2 parents 07f9401 + 5cf7dac
commit 9419c11
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 15 deletions.
diff --git a/docs/Sample Bulk Submission - Sheet1.tsv b/docs/Sample Bulk Submission - Sheet1.tsv
@@ -1,7 +1,7 @@
-Sentence	Source
-Six years have passed since I resolved on my present undertaking.	Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm 
-During her illness, many arguments had been urged to persuade my mother to refrain from attending upon her.	Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm 
-She died calmly; and her countenance expressed affection even in death.	Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm 
-My cat is a strange little dude.	Jessica Rose (self)
-I should have brought sunscreen.	Jessica Rose (self)
-Have you read the Doraemon comics yet?	Jessica Rose (self)
+Sentence	Source 	Additional rationale for open license
+Six years have passed since I resolved on my present undertaking.	Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm	My own submission, copyright waived
+During her illness, many arguments had been urged to persuade my mother to refrain from attending upon her.	Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm	My own submission, copyright waived
+She died calmly; and her countenance expressed affection even in death.	Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm	MCV CC0 waiver process - see legal form
+My cat is a strange little dude.	Jessica Rose (self)	MCV CC0 waiver process - see legal form
+I should have brought sunscreen.	Jessica Rose (self)	More than 100 years since publication
+Have you read the Doraemon comics yet?	Jessica Rose (self)	More than 100 years since publication
diff --git a/docs/submitting-bulk-sentences.md b/docs/submitting-bulk-sentences.md
@@ -11,14 +11,14 @@ Please format your bulk sentences into a TSV file with two columns, one containi
 
 The more information you are able to provide in the Source column, the easier it will be to get your bulk sentence submission validated.
 
-| Sentence  |  Source |
-|---|---|
-| Six years have passed since I resolved on my present undertaking. | Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm |
-| During her illness, many arguments had been urged to persuade my mother to refrain from attending upon her. | Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm |
-| She died calmly; and her countenance expressed affection even in death. | Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm |
-| My cat is a strange little dude. | Jessica Rose (self)  |
-| I should have brought sunscreen. | Jessica Rose (self)  |
-| Have you read the Doraemon comics yet? | Jessica Rose (self) |
+| Sentence  |  Source |  Additional rationale for open license
+|---|---|---|
+| Six years have passed since I resolved on my present undertaking. | Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm | My own submission, copyright waived |
+| During her illness, many arguments had been urged to persuade my mother to refrain from attending upon her. | Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm | My own submission, copyright waived |
+| She died calmly; and her countenance expressed affection even in death. | Frankenstien, Mary Shelly, 1818, https://www.gutenberg.org/files/42324/42324-h/42324-h.htm | MCV CC0 waiver process - see legal form |
+| My cat is a strange little dude. | Jessica Rose (self)  | MCV CC0 waiver process - see legal form |
+| I should have brought sunscreen. | Jessica Rose (self)  | More than 100 years since publication |
+| Have you read the Doraemon comics yet? | Jessica Rose (self) | More than 100 years since publication |
 
 You will need a Github account to submit bulk sentences to Common Voice. If you don’t currently have an account, you can [sign up for one here](https://github.com/signup).
 

diff --git a/web/locales/en/messages.ftl b/web/locales/en/messages.ftl
@@ -1751,6 +1751,8 @@ sc-redirect-page-subtitle-2 = Ask us questions on <matrixLink>Matrix</matrixLink
 sc-bulk-upload-header = Upload <icon></icon> public domain sentences
 sc-bulk-upload-instruction = Drag your file here or <uploadButton>click to upload</uploadButton>
 sc-bulk-upload-instruction-drop = Drop file here to upload
+bulk-upload-additional-information = If there is additional information you want to provide about this file, please contact <emailFragment>commonvoice@mozilla.com</emailFragment>
+template-file-additional-information = If there is additional information you want to provide about this file that is not included in the template, please contact <emailFragment>commonvoice@mozilla.com</emailFragment>
 try-upload-again = Try again by dragging your file here
 try-upload-again-md = Try uploading again
 select-file = Select File

diff --git a/...ges/contribution/sentence-collector/write/bulk-submission-write/bulk-submission-write.css b/...ges/contribution/sentence-collector/write/bulk-submission-write/bulk-submission-write.css
@@ -70,6 +70,22 @@
                     }
                 }
 
+                & .upload-additional-information {
+                    width: 500px;
+                    text-align: center;
+                    margin-block-start: 16px;
+                    font-size: var(--font-size-sm);
+
+                    a {
+                        color: var(--anchor-text-blue);
+                    }
+
+                    @media (--xs-down) {
+                        width: 300px;
+                        font-size: var(--font-size-xs);
+                    }
+                }
+
                 & .or-conjunction {
                     color: var(--warm-grey);
                 }
@@ -216,6 +232,10 @@
                         margin-inline-end: 8px;
                     }
                 }
+
+                p.template-additional-information {
+                    margin-block-start: 8px;
+                }
             }
         }
     }

diff --git a/...ges/contribution/sentence-collector/write/bulk-submission-write/bulk-submission-write.tsx b/...ges/contribution/sentence-collector/write/bulk-submission-write/bulk-submission-write.tsx
@@ -113,6 +113,19 @@ const BulkSubmissionWrite = () => {
                   }}>
                   <p />
                 </Localized>
+                <Localized
+                  id="template-file-additional-information"
+                  elems={{
+                    emailFragment: (
+                      <a
+                        href="mailto:commonvoice@mozilla.com"
+                        target="_blank"
+                        rel="noreferrer"
+                      />
+                    ),
+                  }}>
+                  <p className="template-additional-information" />
+                </Localized>
               </ExpandableInformation>
             </div>
           </div>

diff --git a/...pages/contribution/sentence-collector/write/bulk-submission-write/upload-zone-content.tsx b/...pages/contribution/sentence-collector/write/bulk-submission-write/upload-zone-content.tsx
@@ -80,6 +80,19 @@ const UploadZoneContent: React.FC<Props> = ({
             data-testid="submit-button"
           />
         </Localized>
+        <Localized
+          id="bulk-upload-additional-information"
+          elems={{
+            emailFragment: (
+              <a
+                href="mailto:commonvoice@mozilla.com"
+                target="_blank"
+                rel="noreferrer"
+              />
+            ),
+          }}>
+          <p className="upload-additional-information" />
+        </Localized>
       </div>
     )
   }