Skip to content

Commit

Permalink
Merge pull request #340 from EyeSeeTea/development
Browse files Browse the repository at this point in the history
Release 3.25.0
  • Loading branch information
adrianq authored Dec 18, 2024
2 parents ac1c4af + 6d3b3ba commit 7783e00
Show file tree
Hide file tree
Showing 15 changed files with 706 additions and 184 deletions.
69 changes: 69 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL Advanced"

on:
push:
branches: [ "development", "master" ]
pull_request:
branches: [ "development", "master" ]

jobs:
analyze:
name: Analyze (${{ matrix.language }})
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners (GitHub.com only)
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
runs-on: self-hosted
permissions:
# required for all workflows
security-events: write

# required to fetch internal or private CodeQL packs
packages: read

strategy:
fail-fast: false
matrix:
include:
- language: javascript-typescript
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
# Use `c-cpp` to analyze code written in C, C++ or both
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
47 changes: 39 additions & 8 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2024-09-12T09:58:13.550Z\n"
"PO-Revision-Date: 2024-09-12T09:58:13.550Z\n"
"POT-Creation-Date: 2024-12-17T16:04:30.663Z\n"
"PO-Revision-Date: 2024-12-17T16:04:30.663Z\n"

msgid "Events - Create/update"
msgstr ""
Expand Down Expand Up @@ -150,6 +150,15 @@ msgid ""
"update the app."
msgstr ""

msgid "Cancel"
msgstr ""

msgid "Save"
msgstr ""

msgid "Info"
msgstr ""

msgid "Autogenerated"
msgstr ""

Expand Down Expand Up @@ -197,9 +206,6 @@ msgstr ""
msgid "Accept"
msgstr ""

msgid "Cancel"
msgstr ""

msgid "All users allowed"
msgstr ""

Expand Down Expand Up @@ -1063,16 +1069,38 @@ msgstr ""

msgid ""
"There are {{totalExisting}} data values in the database for this "
"organisation unit and periods. If you proceed, all those data values will "
"be deleted and only the ones in the spreadsheet will be saved. Are you sure?"
"organisation unit and periods. Would you like to import only the new data "
"values, import new values and update existing ones, or completely delete "
"existing values before importing the data?"
msgstr ""

msgid "Proceed"
msgid "Delete and Import"
msgstr ""

msgid "Import only new data values"
msgstr ""

msgid "Import and Update"
msgstr ""

msgid ""
"All data values in the spreadsheet will be imported to the system, but any "
"data that was existing for such organisation unit and periods in the system "
"will be deleted first, so none will be kept before doing the import."
msgstr ""

msgid ""
"Import only new data values, without updating nor deleting any existing "
"one. Only values in the spreadsheet that do not currently exist in the "
"system will be imported"
msgstr ""

msgid ""
"Import new data values and also update existing ones. All data values in "
"the spreadsheet will be imported to the system, but other data values "
"present in the system that are not provided in the spreadsheet will be kept."
msgstr ""

msgid "Warning: Your upload may result in the generation of duplicates"
msgstr ""

Expand Down Expand Up @@ -1100,6 +1128,9 @@ msgid ""
"You can still download them and send them to your administrator."
msgstr ""

msgid "Proceed"
msgstr ""

msgid "Download data values with invalid organisation units"
msgstr ""

Expand Down
49 changes: 41 additions & 8 deletions i18n/es.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Bulk Load\n"
"POT-Creation-Date: 2024-09-12T09:58:13.550Z\n"
"POT-Creation-Date: 2024-12-17T16:04:30.663Z\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -170,6 +170,15 @@ msgstr ""
"de la app ({{appVersion}}), no puede continuar. Póngase en contacto con el "
"administrador para actualizar la app."

msgid "Cancel"
msgstr "Cancelar"

msgid "Save"
msgstr ""

msgid "Info"
msgstr ""

msgid "Autogenerated"
msgstr ""

Expand Down Expand Up @@ -219,9 +228,6 @@ msgstr ""
msgid "Accept"
msgstr "Aceptar"

msgid "Cancel"
msgstr "Cancelar"

msgid "All users allowed"
msgstr "Permitir todos los usuarios"

Expand Down Expand Up @@ -1101,22 +1107,46 @@ msgstr "Importando datos..."
msgid "Existing data values"
msgstr "Existen valores para estos elementos de datos"

#, fuzzy
msgid ""
"There are {{totalExisting}} data values in the database for this "
"organisation unit and periods. If you proceed, all those data values will be "
"deleted and only the ones in the spreadsheet will be saved. Are you sure?"
"organisation unit and periods. Would you like to import only the new data "
"values, import new values and update existing ones, or completely delete "
"existing values before importing the data?"
msgstr ""
"Existen {{totalExisting}} valores en la base de datos para esta unidad "
"organizativa y periodos. Si continua, todos los valores se borrarán y se "
"remplazarán por aquellos presentes en el archivo. ¿Está seguro que desea "
"continuar?"

msgid "Proceed"
msgstr "Continuar"
msgid "Delete and Import"
msgstr ""

msgid "Import only new data values"
msgstr "Importar solo nuevos valores de datos"

#, fuzzy
msgid "Import and Update"
msgstr "Importar datos"

msgid ""
"All data values in the spreadsheet will be imported to the system, but any "
"data that was existing for such organisation unit and periods in the system "
"will be deleted first, so none will be kept before doing the import."
msgstr ""

msgid ""
"Import only new data values, without updating nor deleting any existing one. "
"Only values in the spreadsheet that do not currently exist in the system "
"will be imported"
msgstr ""

msgid ""
"Import new data values and also update existing ones. All data values in the "
"spreadsheet will be imported to the system, but other data values present in "
"the system that are not provided in the spreadsheet will be kept."
msgstr ""

msgid "Warning: Your upload may result in the generation of duplicates"
msgstr "Alerta: Su importación puede generar duplicados"

Expand Down Expand Up @@ -1150,6 +1180,9 @@ msgstr ""
"válida que serán ignorados durante la importación.\n"
"Aun así, puede descargarlos y enviarlos a su administrador."

msgid "Proceed"
msgstr "Continuar"

msgid "Download data values with invalid organisation units"
msgstr "Descargar datos con unidades organizativas no válidas"

Expand Down
49 changes: 41 additions & 8 deletions i18n/fr.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Bulk Load App\n"
"POT-Creation-Date: 2024-09-12T09:58:13.550Z\n"
"POT-Creation-Date: 2024-12-17T16:04:30.663Z\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -155,6 +155,15 @@ msgid ""
"update the app."
msgstr ""

msgid "Cancel"
msgstr "Annuler"

msgid "Save"
msgstr ""

msgid "Info"
msgstr ""

msgid "Autogenerated"
msgstr ""

Expand Down Expand Up @@ -204,9 +213,6 @@ msgstr ""
msgid "Accept"
msgstr ""

msgid "Cancel"
msgstr "Annuler"

msgid "All users allowed"
msgstr ""

Expand Down Expand Up @@ -1124,22 +1130,46 @@ msgstr "Importation de données en cours ..."
msgid "Existing data values"
msgstr "Valeurs de données existantes"

#, fuzzy
msgid ""
"There are {{totalExisting}} data values in the database for this "
"organisation unit and periods. If you proceed, all those data values will be "
"deleted and only the ones in the spreadsheet will be saved. Are you sure?"
"organisation unit and periods. Would you like to import only the new data "
"values, import new values and update existing ones, or completely delete "
"existing values before importing the data?"
msgstr ""
"Il y a {{totalExisting}} valeurs de données dans la base de données pour "
"cette unité d'organisation et ces périodes. Si vous continuez, toutes ces "
"valeurs de données seront supprimées et seules celles de la feuille de "
"calcul seront enregistrées. Êtes-vous sur de vouloir continuer?"

msgid "Proceed"
msgstr "Procéder"
msgid "Delete and Import"
msgstr ""

msgid "Import only new data values"
msgstr "Importer uniquement de nouvelles données"

#, fuzzy
msgid "Import and Update"
msgstr "Importer des données"

msgid ""
"All data values in the spreadsheet will be imported to the system, but any "
"data that was existing for such organisation unit and periods in the system "
"will be deleted first, so none will be kept before doing the import."
msgstr ""

msgid ""
"Import only new data values, without updating nor deleting any existing one. "
"Only values in the spreadsheet that do not currently exist in the system "
"will be imported"
msgstr ""

msgid ""
"Import new data values and also update existing ones. All data values in the "
"spreadsheet will be imported to the system, but other data values present in "
"the system that are not provided in the spreadsheet will be kept."
msgstr ""

msgid "Warning: Your upload may result in the generation of duplicates"
msgstr ""
"Avertissement: votre téléchargement peut provoquer la génération de doublons"
Expand Down Expand Up @@ -1172,6 +1202,9 @@ msgid ""
"You can still download them and send them to your administrator."
msgstr ""

msgid "Proceed"
msgstr "Procéder"

msgid "Download data values with invalid organisation units"
msgstr ""
"Télécharger des valeurs de données avec des unités d'organisation non valides"
Expand Down
Loading

0 comments on commit 7783e00

Please sign in to comment.