Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into refactor/use-platfo…
Browse files Browse the repository at this point in the history
…rm-plugin-components
  • Loading branch information
edoardo committed Dec 4, 2024
2 parents 1b50879 + 2cafda6 commit e266932
Show file tree
Hide file tree
Showing 8 changed files with 233 additions and 503 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/verify-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,6 @@ jobs:

- name: Test
run: yarn d2-app-scripts test
env:
REPORTPORTAL_API_KEY: ${{ secrets.REPORTPORTAL_API_KEY }}
REPORTPORTAL_ENDPOINT: ${{ vars.REPORTPORTAL_ENDPOINT }}
REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }}
CI_BUILD_ID: ${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
PR_TITLE: ${{ github.event_name == 'pull_request' && github.event.pull_request.title || format('Direct push to {0}', github.ref_name) }}

call-workflow-e2e-prod:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
Expand All @@ -98,6 +91,3 @@ jobs:
username: ${{ secrets.CYPRESS_DHIS2_USERNAME }}
password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }}
recordkey: ${{ secrets.CYPRESS_RECORD_KEY }}
reportportal_api_key: ${{ secrets.REPORTPORTAL_API_KEY }}
reportportal_endpoint: ${{ vars.REPORTPORTAL_ENDPOINT }}
reportportal_project: ${{ vars.REPORTPORTAL_PROJECT }}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [101.1.10](https://github.com/dhis2/line-listing-app/compare/v101.1.9...v101.1.10) (2024-12-04)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([0705c70](https://github.com/dhis2/line-listing-app/commit/0705c70d3f60d548c0136164633b92aa0335267b))

## [101.1.9](https://github.com/dhis2/line-listing-app/compare/v101.1.8...v101.1.9) (2024-10-27)


Expand Down
28 changes: 0 additions & 28 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,34 +42,6 @@ async function setupNodeEvents(on, config) {

module.exports = defineConfig({
projectId: 'm5qvjx',
reporter: '@reportportal/agent-js-cypress',
reporterOptions: {
endpoint: process.env.REPORTPORTAL_ENDPOINT,
apiKey: process.env.REPORTPORTAL_API_KEY,
launch: 'line_listing_app',
project: process.env.REPORTPORTAL_PROJECT,
description: '',
autoMerge: true,
parallel: true,
debug: false,
restClientConfig: {
timeout: 660000,
},
attributes: [
{
key: 'dhis2_version',
value: process.env.DHIS2_VERSION,
},
{
key: 'app_name',
value: 'line-listing-app',
},
{
key: 'test_level',
value: 'e2e',
},
],
},
e2e: {
setupNodeEvents,
baseUrl: 'http://localhost:3000',
Expand Down
13 changes: 8 additions & 5 deletions i18n/cs.po
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# Translators:
# Jiří Podhorecký, 2024
# Jiří Podhorecký <[email protected]>, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-02-13T14:56:50.029Z\n"
"POT-Creation-Date: 2024-06-04T11:01:31.012Z\n"
"PO-Revision-Date: 2022-08-23 11:50+0000\n"
"Last-Translator: Jiří Podhorecký, 2024\n"
"Last-Translator: Jiří Podhorecký <[email protected]>, 2024\n"
"Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -396,6 +396,9 @@ msgstr "Zobrazit interpretace a podrobnosti"
msgid "View"
msgstr "Zobrazit"

msgid "Reset sidebar width"
msgstr ""

msgid "Update"
msgstr "Aktualizovat"

Expand Down Expand Up @@ -697,10 +700,10 @@ msgstr "Něco se pokazilo"
msgid ""
"There's a problem with the generated analytics. Contact a system "
"administrator."
msgstr ""
msgstr "S vygenerovanou analýzou je problém. Obraťte se na správce systému."

msgid "There's a syntax problem with the analytics request."
msgstr ""
msgstr "V požadavku na analýzu je problém se syntaxí."

msgid "Registration date"
msgstr "Datum registrace"
Expand Down
Loading

0 comments on commit e266932

Please sign in to comment.