From 39ac1b61e51e8de904b8565c4563f3e06ae861ef Mon Sep 17 00:00:00 2001 From: Tim Bryan Date: Wed, 22 Oct 2025 15:02:19 +0100 Subject: [PATCH 1/2] added enhanced file upload to all examples --- .../additional-row-welsh/index.njk | 3 ++- .../file-upload/additional-row/index.njk | 3 ++- .../file-upload/errors-welsh/index.njk | 21 ++++++++++++------- src/examples/file-upload/errors/index.njk | 21 ++++++++++++------- .../file-upload/fixed-welsh/index.njk | 6 ++++-- src/examples/file-upload/fixed/index.njk | 6 ++++-- .../file-upload/question-welsh/index.njk | 3 ++- src/examples/file-upload/question/index.njk | 3 ++- .../upload-a-single-file-welsh/index.njk | 3 ++- .../upload-a-single-file/index.njk | 3 ++- 10 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/examples/file-upload/additional-row-welsh/index.njk b/src/examples/file-upload/additional-row-welsh/index.njk index 6aa995d4b..d0bf16e44 100644 --- a/src/examples/file-upload/additional-row-welsh/index.njk +++ b/src/examples/file-upload/additional-row-welsh/index.njk @@ -23,7 +23,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Uwchlwytho derbynebau", classes: "govuk-visually-hidden" - } + }, + javascript: true }) }}

Refresh page to update file upload progress

diff --git a/src/examples/file-upload/additional-row/index.njk b/src/examples/file-upload/additional-row/index.njk index bc1e28542..dd29ca917 100644 --- a/src/examples/file-upload/additional-row/index.njk +++ b/src/examples/file-upload/additional-row/index.njk @@ -22,7 +22,8 @@ layout: layout-example.njk label: { text: "Upload receipts", classes: "govuk-visually-hidden" - } + }, + javascript: true }) }}

Refresh page to update file upload progress

diff --git a/src/examples/file-upload/errors-welsh/index.njk b/src/examples/file-upload/errors-welsh/index.njk index 2a3cddabf..9620be42d 100644 --- a/src/examples/file-upload/errors-welsh/index.njk +++ b/src/examples/file-upload/errors-welsh/index.njk @@ -117,7 +117,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Derbynneb3.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -144,7 +145,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Derbynneb4.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -171,7 +173,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Derbynneb5.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -198,7 +201,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Derbynneb6.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -225,7 +229,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Derbynneb7.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -252,7 +257,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Derbynneb8.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -279,7 +285,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Derbynneb9.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { diff --git a/src/examples/file-upload/errors/index.njk b/src/examples/file-upload/errors/index.njk index dfbe26d9a..ad30b0adc 100644 --- a/src/examples/file-upload/errors/index.njk +++ b/src/examples/file-upload/errors/index.njk @@ -116,7 +116,8 @@ layout: layout-example.njk label: { text: "receipt3.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -143,7 +144,8 @@ layout: layout-example.njk label: { text: "receipt4.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -170,7 +172,8 @@ layout: layout-example.njk label: { text: "receipt5.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -197,7 +200,8 @@ layout: layout-example.njk label: { text: "receipt6.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -224,7 +228,8 @@ layout: layout-example.njk label: { text: "receipt7.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -251,7 +256,8 @@ layout: layout-example.njk label: { text: "receipt8.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { @@ -278,7 +284,8 @@ layout: layout-example.njk label: { text: "receipt9.jpg", classes: "govuk-!-font-weight-bold" - } + }, + javascript: true }) }, value: { diff --git a/src/examples/file-upload/fixed-welsh/index.njk b/src/examples/file-upload/fixed-welsh/index.njk index 354680757..c22b8a542 100644 --- a/src/examples/file-upload/fixed-welsh/index.njk +++ b/src/examples/file-upload/fixed-welsh/index.njk @@ -48,7 +48,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. name: "file-upload-1", label: { text: "Derbynneb" - } + }, + javascript: true }) }}
@@ -58,7 +59,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. name: "file-upload-2", label: { text: "Taflen waith cyfrifo" - } + }, + javascript: true }) }} {{ govukButton({ diff --git a/src/examples/file-upload/fixed/index.njk b/src/examples/file-upload/fixed/index.njk index 90b2b1fc7..bdb8225df 100644 --- a/src/examples/file-upload/fixed/index.njk +++ b/src/examples/file-upload/fixed/index.njk @@ -47,7 +47,8 @@ layout: layout-example.njk name: "file-upload-1", label: { text: "Receipt" - } + }, + javascript: true }) }}
@@ -57,7 +58,8 @@ layout: layout-example.njk name: "file-upload-2", label: { text: "Calculation worksheet" - } + }, + javascript: true }) }} {{ govukButton({ diff --git a/src/examples/file-upload/question-welsh/index.njk b/src/examples/file-upload/question-welsh/index.njk index caf543861..136be3101 100644 --- a/src/examples/file-upload/question-welsh/index.njk +++ b/src/examples/file-upload/question-welsh/index.njk @@ -20,7 +20,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB." text: "Uwchlwytho anfoneb", classes: "govuk-label--l", isPageHeading: true - } + }, + javascript: true }) }}
diff --git a/src/examples/file-upload/question/index.njk b/src/examples/file-upload/question/index.njk index 29b238d52..c1f38bc23 100644 --- a/src/examples/file-upload/question/index.njk +++ b/src/examples/file-upload/question/index.njk @@ -19,7 +19,8 @@ layout: layout-example.njk text: "Upload invoice", classes: "govuk-label--l", isPageHeading: true - } + }, + javascript: true }) }}
diff --git a/src/examples/file-upload/upload-a-single-file-welsh/index.njk b/src/examples/file-upload/upload-a-single-file-welsh/index.njk index 4635a9c3e..fa6d4d793 100644 --- a/src/examples/file-upload/upload-a-single-file-welsh/index.njk +++ b/src/examples/file-upload/upload-a-single-file-welsh/index.njk @@ -16,7 +16,8 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB." text: "Uwchlwytho derbynneb", classes: "govuk-label--l", isPageHeading: true - } + }, + javascript: true }) }} diff --git a/src/examples/file-upload/upload-a-single-file/index.njk b/src/examples/file-upload/upload-a-single-file/index.njk index 722565312..3320bed16 100644 --- a/src/examples/file-upload/upload-a-single-file/index.njk +++ b/src/examples/file-upload/upload-a-single-file/index.njk @@ -15,7 +15,8 @@ layout: layout-example.njk text: "Upload receipt", classes: "govuk-label--l", isPageHeading: true - } + }, + javascript: true }) }} From 855c265ba41008982bae3fbba2050ea1d1b62aa9 Mon Sep 17 00:00:00 2001 From: Tim Bryan Date: Wed, 5 Nov 2025 11:42:36 +0000 Subject: [PATCH 2/2] adding Welsh translations to enhanced file upload --- .../additional-row-welsh/index.njk | 9 +++ .../file-upload/errors-welsh/index.njk | 63 +++++++++++++++++++ .../file-upload/fixed-welsh/index.njk | 18 ++++++ .../file-upload/question-welsh/index.njk | 9 +++ .../upload-a-single-file-welsh/index.njk | 9 +++ 5 files changed, 108 insertions(+) diff --git a/src/examples/file-upload/additional-row-welsh/index.njk b/src/examples/file-upload/additional-row-welsh/index.njk index d0bf16e44..dfc4fb26a 100644 --- a/src/examples/file-upload/additional-row-welsh/index.njk +++ b/src/examples/file-upload/additional-row-welsh/index.njk @@ -24,6 +24,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. text: "Uwchlwytho derbynebau", classes: "govuk-visually-hidden" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }} diff --git a/src/examples/file-upload/errors-welsh/index.njk b/src/examples/file-upload/errors-welsh/index.njk index 9620be42d..06df8e91e 100644 --- a/src/examples/file-upload/errors-welsh/index.njk +++ b/src/examples/file-upload/errors-welsh/index.njk @@ -118,6 +118,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. text: "Derbynneb3.jpg", classes: "govuk-!-font-weight-bold" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }, @@ -146,6 +155,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. text: "Derbynneb4.jpg", classes: "govuk-!-font-weight-bold" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }, @@ -174,6 +192,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. text: "Derbynneb5.jpg", classes: "govuk-!-font-weight-bold" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }, @@ -202,6 +229,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. text: "Derbynneb6.jpg", classes: "govuk-!-font-weight-bold" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }, @@ -230,6 +266,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. text: "Derbynneb7.jpg", classes: "govuk-!-font-weight-bold" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }, @@ -258,6 +303,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. text: "Derbynneb8.jpg", classes: "govuk-!-font-weight-bold" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }, @@ -286,6 +340,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. text: "Derbynneb9.jpg", classes: "govuk-!-font-weight-bold" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }, diff --git a/src/examples/file-upload/fixed-welsh/index.njk b/src/examples/file-upload/fixed-welsh/index.njk index c22b8a542..aeadec720 100644 --- a/src/examples/file-upload/fixed-welsh/index.njk +++ b/src/examples/file-upload/fixed-welsh/index.njk @@ -49,6 +49,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Derbynneb" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }} @@ -60,6 +69,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB. label: { text: "Taflen waith cyfrifo" }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }} diff --git a/src/examples/file-upload/question-welsh/index.njk b/src/examples/file-upload/question-welsh/index.njk index 136be3101..09caf28e1 100644 --- a/src/examples/file-upload/question-welsh/index.njk +++ b/src/examples/file-upload/question-welsh/index.njk @@ -21,6 +21,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB." classes: "govuk-label--l", isPageHeading: true }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }} diff --git a/src/examples/file-upload/upload-a-single-file-welsh/index.njk b/src/examples/file-upload/upload-a-single-file-welsh/index.njk index fa6d4d793..885d9efab 100644 --- a/src/examples/file-upload/upload-a-single-file-welsh/index.njk +++ b/src/examples/file-upload/upload-a-single-file-welsh/index.njk @@ -17,6 +17,15 @@ rhaid i’r ffeil dan sylw fod yn llai na 100 MB." classes: "govuk-label--l", isPageHeading: true }, + chooseFilesButtonText: "Dewis ffeil", + dropInstructionText: "neu ollwng ffeil", + noFileChosenText: "Dim ffeil wedi’i dewis", + multipleFilesChosenText: { + one: "%{count} ffeil wedi’i dewis", + other: "%{count} o ffeiliau wedi’u dewis" + }, + enteredDropZoneText: "Yn y man gollwng", + leftDropZoneText: "Wedi gadael y man gollwng", javascript: true }) }}