-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Merge branch 'master' into LIBS-440-support-min-and-max-date-and…
…-required-validation
- Loading branch information
Showing
127 changed files
with
2,063 additions
and
765 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,35 @@ | ||
| name: 'dhis2: verify (lib)' | ||
|
|
||
| on: push | ||
| on: | ||
| push: | ||
| pull_request: | ||
| types: [labeled] | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow}}-${{ github.ref }} | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
|
|
||
| env: | ||
| GIT_AUTHOR_NAME: '@dhis2-bot' | ||
| GIT_AUTHOR_EMAIL: '[email protected]' | ||
| GIT_COMMITTER_NAME: '@dhis2-bot' | ||
| GIT_COMMITTER_EMAIL: '[email protected]' | ||
| NPM_TOKEN: ${{secrets.DHIS2_BOT_NPM_TOKEN}} | ||
| GH_TOKEN: ${{secrets.DHIS2_BOT_GITHUB_TOKEN}} | ||
| NPM_TOKEN: ${{ secrets.DHIS2_BOT_NPM_TOKEN }} | ||
| GH_TOKEN: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }} | ||
| D2_VERBOSE: true | ||
|
|
||
| jobs: | ||
| setup-matrix: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| matrix: ${{ steps.set-matrix.outputs.specs }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Generate test matrix | ||
| id: set-matrix | ||
| run: | | ||
| node cypress/support/generateTestMatrix.js > matrix.json | ||
| echo "::set-output name=specs::$(cat matrix.json)" | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
|
|
@@ -84,12 +99,14 @@ jobs: | |
| e2e: | ||
| runs-on: ubuntu-latest | ||
| if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'" | ||
| needs: [build] | ||
| needs: [build, setup-matrix] | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| containers: [1, 2, 3, 4] | ||
| spec-group: ${{ fromJson(needs.setup-matrix.outputs.matrix) }} | ||
| env: | ||
| SHOULD_RECORD: ${{ contains(github.event.head_commit.message, '[e2e record]') || contains(join(github.event.pull_request.labels.*.name), 'e2e record') }} | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
|
|
@@ -108,17 +125,37 @@ jobs: | |
| - name: Increase FS watchers | ||
| run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p | ||
|
|
||
| - name: Set Cypress Record Environment Variables | ||
| if: env.SHOULD_RECORD == 'true' | ||
| run: | | ||
| echo "CYPRESS_GROUP=e2e-${{ matrix.spec-group.id }}" >> $GITHUB_ENV | ||
| echo "CYPRESS_TAG=${{ github.event_name }}" >> $GITHUB_ENV | ||
| echo "CYPRESS_CI_BUILD_ID=${{ github.run_id }}" >> $GITHUB_ENV | ||
| - name: Debug Environment Variables | ||
| run: | | ||
| echo "SHOULD_RECORD=${{ env.SHOULD_RECORD }}" | ||
| echo "CI Build ID=${{ github.run_id }}" | ||
| echo "Group ID=e2e-${{ matrix.spec-group.id }}" | ||
| echo "Spec=${{ join(matrix.spec-group.tests, ',') }}" | ||
| echo "Record=${{ env.SHOULD_RECORD }}" | ||
| echo "Parallel=${{ env.SHOULD_RECORD }}" | ||
| echo "Computed Group=${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_GROUP || '' }}" | ||
| echo "Computed Tag=${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_TAG || '' }}" | ||
| echo "Computed CI Build ID=${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_CI_BUILD_ID || '' }}" | ||
| - name: End-to-End tests | ||
| uses: cypress-io/github-action@v6 | ||
| with: | ||
| # This should be a command that starts the server to test against. | ||
| start: 'yarn cy:start:legacy' | ||
| wait-on: 'http://localhost:5000' | ||
| wait-on-timeout: 300 | ||
| record: true | ||
| parallel: true | ||
| group: 'e2e' | ||
| tag: ${{ github.event_name }} | ||
| record: ${{ env.SHOULD_RECORD }} | ||
| parallel: ${{ env.SHOULD_RECORD }} | ||
| group: ${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_GROUP || '' }} | ||
| tag: ${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_TAG || '' }} | ||
| ci-build-id: ${{ env.SHOULD_RECORD == 'true' && env.CYPRESS_CI_BUILD_ID || '' }} | ||
| spec: ${{ join(matrix.spec-group.tests, ',') }} | ||
| env: | ||
| BROWSER: none | ||
| COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }} | ||
|
|
@@ -133,7 +170,7 @@ jobs: | |
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| token: ${{env.GH_TOKEN}} | ||
| token: ${{ env.GH_TOKEN }} | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 20.x | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,105 +1,111 @@ | ||
| # | ||
| # Translators: | ||
| # phil_dhis2, 2021 | ||
| # Viktor Varland <[email protected]>, 2021 | ||
| # Philip Larsen Donnelly, 2021 | ||
| # Namwan Chanthavisouk, 2024 | ||
| # | ||
| msgid "" | ||
| msgstr "" | ||
| "Project-Id-Version: i18next-conv\n" | ||
| "POT-Creation-Date: 2022-02-11T13:37:19.312Z\n" | ||
| "POT-Creation-Date: 2024-04-18T04:00:14.144Z\n" | ||
| "PO-Revision-Date: 2021-06-24 12:50+0000\n" | ||
| "Last-Translator: Viktor Varland <[email protected]>, 2021\n" | ||
| "Language-Team: Lao (https://www.transifex.com/hisp-uio/teams/100509/lo/)\n" | ||
| "Last-Translator: Namwan Chanthavisouk, 2024\n" | ||
| "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n" | ||
| "MIME-Version: 1.0\n" | ||
| "Content-Type: text/plain; charset=UTF-8\n" | ||
| "Content-Transfer-Encoding: 8bit\n" | ||
| "Language: lo\n" | ||
| "Plural-Forms: nplurals=1; plural=0;\n" | ||
|
|
||
| msgid "Upload file" | ||
| msgstr "ໂຫຼດເອກະສານ" | ||
| msgstr "ອັບໂຫຼດເອກະສານ" | ||
|
|
||
| msgid "Upload files" | ||
| msgstr "" | ||
| msgstr "ອັບໂຫຼດເອກະສານ" | ||
|
|
||
| msgid "Remove" | ||
| msgstr "ລົບອອກ" | ||
|
|
||
| msgid "Please provide an alpha-numeric value" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາລະບຸຄ່າທີ່ເປັນຕົວອັກສອນ ແລະ ຕົວເລກ" | ||
|
|
||
| msgid "Please provide a boolean value" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາລະບຸຄ່າທີ່ເປັນສູນ" | ||
|
|
||
| msgid "Please enter between {{lowerBound}} and {{upperBound}} characters" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາຕື່ມລະຫວ່າງຕົວອັກສອນ {{lowerBound}} ແລະ {{upperBound}} " | ||
|
|
||
| msgid "" | ||
| "Please make sure the value of this input matches the value in " | ||
| "\"{{otherField}}\"." | ||
| msgstr "" | ||
| msgstr "ກະລຸນາກວດສອບໃຫ້ແນ່ໃຈວ່າຄ່າຂອງຂໍ້ມູນນີ້ກົງກັບຄ່າໃນ \" {{otherField}} \"" | ||
|
|
||
| msgid "Please enter a maximum of {{upperBound}} characters" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາຕື່ມຕົວອັກສອນສູງສຸດ {{upperBound}}" | ||
|
|
||
| msgid "Please enter a number with a maximum of {{upperBound}}" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາຕື່ມຕົວເລກທີ່ມີຈຳນວນສູງສຸດ {{upperBound}}" | ||
|
|
||
| msgid "Please enter at least {{lowerBound}} characters" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາຕື່ມຕົວອັກສອນຢ່າງໜ້ອຍ {{lowerBound}} " | ||
|
|
||
| msgid "Please enter a number of at least {{lowerBound}}" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາຕື່ມຈຳນວນຢ່າງໜ້ອຍ {{lowerBound}}" | ||
|
|
||
| msgid "Number cannot be less than {{lowerBound}} or more than {{upperBound}}" | ||
| msgstr "" | ||
| msgstr "ຕົວເລກບໍ່ສາມາດໜ້ອຍກວ່າ {{lowerBound}} ຫຼືຫຼາຍກວ່າ {{upperBound}}" | ||
|
|
||
| msgid "" | ||
| "Please make sure the value of this input matches the pattern " | ||
| "{{patternString}}." | ||
| msgstr "" | ||
| "ກະລຸນາກວດສອບໃຫ້ແນ່ໃຈວ່າຄ່າຂອງຂໍ້ມູນນີ້ກົງກັບຮູບແບບ {{patternString}} ." | ||
|
|
||
| msgid "Password should be a string" | ||
| msgstr "" | ||
| msgstr "ລະຫັດຜ່ານຄວນເປັນຕົວອັກສອນ" | ||
|
|
||
| msgid "Password should be at least 8 characters long" | ||
| msgstr "" | ||
| msgstr "ລະຫັດຜ່ານຄວນມີຢ່າງໜ້ອຍ 8 ຕົວອັກສອນ" | ||
|
|
||
| msgid "Password should be no longer than 34 characters" | ||
| msgstr "" | ||
| msgstr "ລະຫັດຜ່ານຄວນຈະບໍ່ເກີນ 34 ຕົວອັກສອນ" | ||
|
|
||
| msgid "Password should contain at least one lowercase letter" | ||
| msgstr "" | ||
| msgstr "ລະຫັດຜ່ານຄວນມີຕົວພິມນ້ອຍຢ່າງໜ້ອຍໜຶ່ງຕົວ" | ||
|
|
||
| msgid "Password should contain at least one UPPERCASE letter" | ||
| msgstr "" | ||
| msgstr "ລະຫັດຜ່ານຄວນມີຕົວພິມໃຫຍ່ຢ່າງໜ້ອຍໜຶ່ງຕົວ" | ||
|
|
||
| msgid "Password should contain at least one number" | ||
| msgstr "" | ||
| msgstr "ລະຫັດຜ່ານຄວນມີຢ່າງໜ້ອຍໜຶ່ງຕົວເລກ" | ||
|
|
||
| msgid "Password should have at least one special character" | ||
| msgstr "" | ||
|
|
||
| msgid "Please provide a username between 4 and 255 characters" | ||
| msgstr "" | ||
| msgstr "ລະຫັດຜ່ານຄວນມີຢ່າງໜ້ອຍໜຶ່ງຕົວອັກສອນພິເສດ" | ||
|
|
||
| msgid "Please provide a valid email address" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາລະບຸທີ່ຢູ່ອີເມວທີ່ຖືກຕ້ອງ" | ||
|
|
||
| msgid "Please provide a value" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາລະບຸຄ່າ" | ||
|
|
||
| msgid "Please provide a round number without decimals" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາປ້ອນຈໍານວນມົນໂດຍບໍ່ມີຈຸດ" | ||
|
|
||
| msgid "Please provide a valid international phone number." | ||
| msgstr "" | ||
| msgstr "ກະລຸນາປ້ອນເບີໂທລະສັບທີ່ຖືກຕ້ອງ" | ||
|
|
||
| msgid "Please provide a number" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາປ້ອນຕົວເລກ" | ||
|
|
||
| msgid "Please provide a string" | ||
| msgstr "" | ||
| msgstr "ກະລຸນາປ້ອນຕົວອັກສອນ" | ||
|
|
||
| msgid "Please provide a valid url" | ||
| msgstr "ກະລຸນາປ້ອນ URL ທີ່ຖືກຕ້ອງ" | ||
|
|
||
| msgctxt " - or @" | ||
| msgid "" | ||
| "Please provide a username between 4 and 255 characters long and possibly " | ||
| "separated by . " | ||
| msgstr "" | ||
| "ກະລຸນາປ້ອນຊື່ຜູ້ໃຊ້ລະຫວ່າງ 4 ແລະ 255 ຕົວອັກສອນ ແລະ ແຍກອອກ . _" | ||
| " - ຫຼື @" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.