Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/admin/angular-bba7…
Browse files Browse the repository at this point in the history
…056b19
  • Loading branch information
dianabarsan authored Apr 25, 2024
2 parents f6151f6 + 57c311e commit 59d69c1
Show file tree
Hide file tree
Showing 18 changed files with 1,038 additions and 486 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ jobs:
runs-on: ubuntu-22.04
env:
CHROME_VERSION: ${{ matrix.chrome-version }}
JOB_NAME: ${{ matrix.cmd }}-${{ matrix.suite || '' }}${{ matrix.chrome-version == '90' && '-minimum-browser' || '' }}


strategy:
fail-fast: false
Expand Down Expand Up @@ -198,9 +200,6 @@ jobs:
working-directory: images/
if: ${{ !env.INTERNAL_CONTRIBUTOR }}

- name: Set ENV
run: |
echo "HORTI_BUILDS_SERVER=$MARKET_URL_READ/$BUILDS_SERVER" >> $GITHUB_ENV
- name: Create logs directory
run: mkdir tests/logs
- name: Install pyxform
Expand All @@ -217,7 +216,7 @@ jobs:
- name: Copy allure history
run: |
mkdir -p allure-results/history
cp -r build-history-data/cht-core/allure/${{ matrix.cmd }}-${{ matrix.suite }}/allure-report/history allure-results | true
cp -r build-history-data/cht-core/allure/${{ env.JOB_NAME }}/allure-report/history allure-results | true
- name: Install Chrome 90
if: ${{matrix.chrome-version=='90'}}
run: |
Expand All @@ -237,8 +236,8 @@ jobs:
- name: Copy new allure history
if: always()
run: |
mkdir -p build-history-data-new/cht-core/allure/${{ matrix.cmd }}-${{ matrix.suite }}/history
cp -r allure-report/history build-history-data-new/cht-core/allure/${{ matrix.cmd }}-${{ matrix.suite }}/allure-report | true
mkdir -p build-history-data-new/cht-core/allure/${{ env.JOB_NAME }}/history
cp -r allure-report/history build-history-data-new/cht-core/allure/${{ env.JOB_NAME }}/allure-report | true
- name: Upload allure report history
if: always() && github.ref == 'refs/heads/master' # whether pass or fail, but only on master
continue-on-error: true # don't fail the build if git push fails
Expand All @@ -258,8 +257,8 @@ jobs:
- name: Copy new report
if: always()
run: |
mkdir -p build-history/cht-core/allure/${{ matrix.cmd }}-${{ matrix.suite }}
cp -r allure-report build-history/cht-core/allure/${{ matrix.cmd }}-${{ matrix.suite }} | true
mkdir -p build-history/cht-core/allure/${{ env.JOB_NAME }}
cp -r allure-report build-history/cht-core/allure/${{ env.JOB_NAME }} | true
- name: Upload allure report
if: always() && github.ref == 'refs/heads/master' # whether pass or fail, but only on master
continue-on-error: true # don't fail the build if git push fails
Expand All @@ -272,7 +271,7 @@ jobs:
- name: Archive Results
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.cmd }}-${{ matrix.suite || ''}}
name: ${{ env.JOB_NAME }}
path: |
allure-results
allure-report
Expand Down
5 changes: 4 additions & 1 deletion api/resources/translations/messages-fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -588,9 +588,9 @@ date.incorrect.reported = Date de rapport
date.incorrect.title = Mauvaise date dans les réglages
date.time.title = Date et heure
date.to = À
days = jours
date_filter.error.from_date = La date "De" ne peut pas être postérieure à la date "À".
date_filter.error.to_date = La date "À" ne peut pas être antérieure à la date "De".
days = jours
daysoverdue = Jours depuis visite du patient
ddoc.version = Version DDoc
debug.db_info.docs = Nombre de documents
Expand Down Expand Up @@ -673,6 +673,7 @@ error.loading.form.no_authorized = Erreur de chargement du formulaire. Votre uti
error.report.save = Erreur dans la sauvegarde du rapport
error.settings.loading = Erreur dans le chargement des paramètres
expected_date = Date prévue
export.button.download = Télécharger
export.dhis.dataset.description = Sélectionnez parmi les intégrations DHIS2 disponibles.
export.dhis.dataset.label = Ensemble de données DHIS2
export.dhis.description = Téléchargez un fichier contenant un dataValueSet DHIS2 pour l'intégration avec DHIS2.
Expand All @@ -686,6 +687,8 @@ export.feedback.description = Téléchargez un journal des erreurs détectées e
export.messages.description = Téléchargez tous les messages qui ont déjà été envoyés ou reçus au format CSV.
export.people.description = Téléchargez tous les contacts enregistrés dans le système au format JSON.
export.reports.description = Téléchargez un résumé de tous les rapports qui ont déjà été soumis au format CSV.
export.tabs.user_devices = Appareils utilisateur
export.user-devices.description = Téléchargez un résumé des versions des logiciels liés au CHT (navigateur, instance CHT et système d'exploitation) exécutés sur les appareils de l'utilisateur. Le résumé est exporté au format JSON.
extra_fields = Champs additionnels.
android_app_launcher.button.launch = Démarrer l'application
android_app_launcher.message.disable = Le lancement d'applications Android n'est pas disponible sur cet appareil.
Expand Down
30 changes: 6 additions & 24 deletions api/resources/translations/messages-sw.properties
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,10 @@ android_app.data_usage.rx = Imepokewa
android_app.data_usage.system.title = Kwenye mitambo
android_app.data_usage.title = Matumizi ya data ya programu ii
android_app.data_usage.tx = Iliyotumwa
android_app.os_android_version.title = Android OS
android_app.package_name.title = Jina la furushi la programu ya Android
android_app.version.title = Programu ya android
android_app.version_code.title = Nambari ya toleo la programu ya Android
android_app_launcher.button.launch = Anzisha programu
android_app_launcher.message.disable = Uzinduzi wa programu za Android hauwezekani kwenye kifaa hiki.
app.name = Programu
Expand Down Expand Up @@ -813,6 +816,7 @@ login = Ingia
login.error = Hitilafu isiyotarajiwa wakati wa kuingia. Tafadhali jaribu tena.
login.hide_password = Ficha nenosiri
login.incorrect = Jina la mtumiaji au jibu la siri sio sahihi. Jaribu tena.
login.show_password = Onyesha nenosiri
login.token.expired = Muda wa kiungo chako umeisha. Wasiliana na msimamizi ili kupokea kiungo kipya.
login.token.general.error = Hitilafu fulani imetokea wakati wa kuchakata ombi lako. Tafadhali jaribu tena. Hili likitokea tena, wasiliana na msimamizi ili kupokea kiungo kipya.
login.token.invalid = Kiungo chako ni batili. Wasiliana na msimamizi ili kupokea kiungo kipya.
Expand Down Expand Up @@ -1096,6 +1100,7 @@ report.delivery.pregnancy_outcome_label = Mahali pa kujifungua
report.delivery.title.sms = Ripoti ya kujifungua (ujumbe mfupi)
report.edit = Rekebisha ripoti
report.flag.title.sms = Onyesho la hatari (ujumbe mfupi)
report.new_report.button = Ripoti Mpya
report.immunization_visit.chw_name = Jina la mfanyikazi wa afya
report.immunization_visit.chw_phone = Namba ya mfanyikazi wa afya
report.immunization_visit.chw_sms = Maelezo kwa mfanyikazi wa afya wa Jamii
Expand Down Expand Up @@ -1255,27 +1260,8 @@ settings.backuprestore.description = Hapa unaweza kupakua au kupakia mipangilio
settings.restore.action = Pakia msimbo wa programu
settings.restore.description = Ingiza faili mpya ya JSON na ubadilishe mipangilio ya sasa.
settings.restore.title = Pakia msimbo wa programu
session.expired.description =
session.expired.title = Cheleza msimbo wa programu
setup.contact.description = Chagua atakaye sajili na kufuatilia wajawazito kwenye jamii yako. Watahitaji simu ya rununu iliyo na mfumo wa kutuma ujumbe.
setup.contact.help = Usipoweza kuchagua, tafadhali tumia maelezo ya ANC kujisaidia.
setup.contact.title = Bainisha watu wa kuratibisha huduma
setup.language.description = Usipo ona lugha inayokufaa, unaweza ongeza lugha yako kwenye sehemu ya kuongeza lugha ya programu hii.
setup.language.outgoing.subtitle = Chagua lugha itakayotumika kupokea jumbe za moja kwa moja na waratibisha huduma kutoka CHT.
setup.language.subtitle = Chagua lugha msingi itakayo tumika kataika tuvuti ya CHT. Mtumizi anaweza badili lugha baada ya kujisajili na kuingia kwenye programu.
setup.language.title = Lugha uipendeleayo
setup.modem.description = Utahitaji modemu ya USB GSM, iliyo na kadi ya SIM inayotumika na iliyo na uwezo wa kutuma na kupokea jumbe fupi. Kama hauja shikisha modemu kwenye tarakirishi, unaweza fanya hivyo sasa. Hauwezi tuma au kupokea jumbe fupi hadi modemu yako iwake. Kwenye sehemu ya chini ya chandulua utaona kama modemu yako inafanya kazi ipasavyo.
setup.modem.title = Anzisha modemu
setup.registration.description = Watakao ratibisha huduma za afya watawasilisha ripoti kuhusu mwezi wa mwisho wa hedhi. Wanawake katika jamii zingine watapata ugumu wa kuwasilisha ujumbe huu.
setup.registration.help = Kama hauelewi jinsi ya kuchagua ANC, tafadhali rejelea kwenye mwongozo wa ANC ili kupata mawaidha.
setup.registration.title = Fomu ya usajili
setup.skip = Usitumie kielelezo kuiandaa programu yako
setup.start = Malizia
setup.statistics.description =
setup.statistics.title =
simprints.disabled =
simprints.register =
simprints.search =
sms_message.message = Ujumbe unaoingia
sms_received = Ujumbe umepokewa; utasomwa hivi punde. Kama ulikuwa unajaribu kuwasilisha ujumbe wa muundo maalum, tafadhali weka kodi sahihi ya fomu na ujaribu tena.
state.cleared = yaliyotolewa
Expand Down Expand Up @@ -1342,6 +1328,7 @@ task.days.left =
task.immunization_missing_visit.title = Ziara ya chanjo inakosekana
task.list.complete = Hakuna jambo ingine
task.overdue = Imepita siku ya kuwasilishwa
task.overdue.days = {DAYS, plural, =0{Inatarajiwa leo} =1{Ilitarajiwa jana} other{Ilitarajiwa siku \# zilizopita}}
task.postnatal_danger_sign.title = Ziara ya huduma za baada ya kujifungua inahitajika
task.postnatal_home_birth.title = Ziara ya huduma za baada ya kujifungua inahitajika
task.postnatal_missing_visit.title = Ziara ya huduma za baada ya kujifungua inakosekana
Expand Down Expand Up @@ -1450,11 +1437,6 @@ view.all = Tazama zote
week = Wiki
week.plural = Wiki
weeks = Wiki
welcome = Karibu Medic Mobile
welcome.setup.description = Tumia kielelezo ili kuifanya programu hii ya Medic ikufae jinsi utakavyo kwenye miradi yako. Bonyeza "Anza" ili upate kuitumia kielelezo sasa, au unaweza kuipata kwenye menu wakati mwingine wowote.
welcome.setup.title = Tunataka kukusaidia kuandaa programu yako ya matumizi
welcome.tour.description = Pata ziara ya programu ya Medic ili upate kujielimisha. Ziara itaanza moja kwa moja baada ya kumaliza kuandaa programu kwa kutumia kielelezo. Unaweza pata ziara hii wakate wowote kwa kutumia menu.
welcome.tour.title = Pata ziara ya programu ya Medic
wipe.device.description = ONYO\! Hii itafuta data yote kutoka kwa kifaa chako na kukuondoa. Data yoyote ambayo haijasawazishwa itapotea\!
wipe.device.title = Futa kifaa
with = Na
Expand Down
Loading

0 comments on commit 59d69c1

Please sign in to comment.