Skip to content

Commit

Permalink
chore: merge branch 'master' into update-storybook
Browse files Browse the repository at this point in the history
  • Loading branch information
Mohammer5 committed Jul 30, 2024
2 parents 79053ec + 8a42991 commit 6119271
Show file tree
Hide file tree
Showing 72 changed files with 641 additions and 361 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [9.11.0](https://github.com/dhis2/ui/compare/v9.10.3...v9.11.0) (2024-07-29)


### Features

* implement accessible flyout menu and handle submenus ([#1495](https://github.com/dhis2/ui/issues/1495)) ([73d1f7e](https://github.com/dhis2/ui/commit/73d1f7e062ad393a156b3b439b590c5927f0fc9d))

## [9.10.3](https://github.com/dhis2/ui/compare/v9.10.2...v9.10.3) (2024-07-24)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([b7d3ec6](https://github.com/dhis2/ui/commit/b7d3ec6a91d7fd54c9220364c678f71c9daa14eb))

## [9.10.2](https://github.com/dhis2/ui/compare/v9.10.1...v9.10.2) (2024-07-15)


Expand Down
52 changes: 30 additions & 22 deletions collections/forms/i18n/es_419.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-02-12T14:58:56.792Z\n"
"POT-Creation-Date: 2024-04-18T04:00:14.144Z\n"
"PO-Revision-Date: 2021-06-24 12:50+0000\n"
"Last-Translator: Enzo Nicolas Rossi <[email protected]>, 2024\n"
"Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n"
Expand All @@ -16,86 +16,92 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"

msgid "Upload file"
msgstr ""
msgstr "Cargar archivo"

msgid "Upload files"
msgstr ""
msgstr "Cargar archivos"

msgid "Remove"
msgstr "Eliminar"

msgid "Please provide an alpha-numeric value"
msgstr ""
msgstr "Indique un valor alfanumérico"

msgid "Please provide a boolean value"
msgstr ""
msgstr "Indique un valor booleano"

msgid "Please enter between {{lowerBound}} and {{upperBound}} characters"
msgstr ""
msgstr "Introduzca entre {{lowerBound}} y {{upperBound}} caracteres"

msgid ""
"Please make sure the value of this input matches the value in "
"\"{{otherField}}\"."
msgstr ""
"Asegúrese de que el valor de esta entrada coincide con el de "
"\"{{otherField}}\"."

msgid "Please enter a maximum of {{upperBound}} characters"
msgstr ""
msgstr "Introduzca un máximo de {{upperBound}} caracteres"

msgid "Please enter a number with a maximum of {{upperBound}}"
msgstr ""
msgstr "Introduzca un número con un máximo de {{upperBound}}"

msgid "Please enter at least {{lowerBound}} characters"
msgstr ""
msgstr "Introduzca al menos {{lowerBound}} caracteres"

msgid "Please enter a number of at least {{lowerBound}}"
msgstr ""
msgstr "Introduzca un número de al menos {{lowerBound}}"

msgid "Number cannot be less than {{lowerBound}} or more than {{upperBound}}"
msgstr ""
"El número no puede ser inferior a {{lowerBound}} ni superior a "
"{{upperBound}}"

msgid ""
"Please make sure the value of this input matches the pattern "
"{{patternString}}."
msgstr ""
"Asegúrese de que el valor de esta entrada coincide con el patrón "
"{{patternString}}."

msgid "Password should be a string"
msgstr ""
msgstr "La contraseña debe ser texto"

msgid "Password should be at least 8 characters long"
msgstr ""
msgstr "La contraseña debe tener al menos 8 caracteres"

msgid "Password should be no longer than 34 characters"
msgstr ""
msgstr "La contraseña no debe tener más de 34 caracteres"

msgid "Password should contain at least one lowercase letter"
msgstr ""
msgstr "La contraseña debe contener al menos una letra minúscula"

msgid "Password should contain at least one UPPERCASE letter"
msgstr ""
msgstr "La contraseña debe contener al menos una letra MAYÚSCULA"

msgid "Password should contain at least one number"
msgstr ""
msgstr "La contraseña debe contener al menos un número"

msgid "Password should have at least one special character"
msgstr ""
msgstr "La contraseña debe tener al menos un carácter especial"

msgid "Please provide a valid email address"
msgstr "Por favor ingrese una dirección de correo electrónico válida"

msgid "Please provide a value"
msgstr ""
msgstr "Indique un valor"

msgid "Please provide a round number without decimals"
msgstr ""
msgstr "Indique una cifra redonda sin decimales"

msgid "Please provide a valid international phone number."
msgstr ""
msgstr "Indique un número de teléfono internacional válido."

msgid "Please provide a number"
msgstr ""
msgstr "Indique un número"

msgid "Please provide a string"
msgstr ""
msgstr "Proporcione una texto"

msgid "Please provide a valid url"
msgstr "Proporcione una URL válida"
Expand All @@ -105,3 +111,5 @@ msgid ""
"Please provide a username between 4 and 255 characters long and possibly "
"separated by . "
msgstr ""
"Indique un nombre de usuario de entre 4 y 255 caracteres, posiblemente "
"separados por . o @."
20 changes: 10 additions & 10 deletions collections/forms/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/ui-forms",
"version": "9.10.2",
"version": "9.11.0",
"main": "./build/cjs/index.js",
"module": "./build/es/index.js",
"sideEffects": [
Expand Down Expand Up @@ -35,15 +35,15 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2-ui/button": "9.10.2",
"@dhis2-ui/checkbox": "9.10.2",
"@dhis2-ui/field": "9.10.2",
"@dhis2-ui/file-input": "9.10.2",
"@dhis2-ui/input": "9.10.2",
"@dhis2-ui/radio": "9.10.2",
"@dhis2-ui/select": "9.10.2",
"@dhis2-ui/switch": "9.10.2",
"@dhis2-ui/text-area": "9.10.2",
"@dhis2-ui/button": "9.11.0",
"@dhis2-ui/checkbox": "9.11.0",
"@dhis2-ui/field": "9.11.0",
"@dhis2-ui/file-input": "9.11.0",
"@dhis2-ui/input": "9.11.0",
"@dhis2-ui/radio": "9.11.0",
"@dhis2-ui/select": "9.11.0",
"@dhis2-ui/switch": "9.11.0",
"@dhis2-ui/text-area": "9.11.0",
"classnames": "^2.3.1",
"final-form": "^4.20.2",
"prop-types": "^15.7.2",
Expand Down
1 change: 1 addition & 0 deletions collections/ui/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,7 @@ import { FlyoutMenu } from '@dhis2/ui'
|---|---|---|---|---|
|children|node|||Typically, but not limited to, `MenuItem` components|
|className|string||||
|closeMenu|function|||when Escape key is pressed, this function is called to close the flyout menu|
|dataTest|string|`'dhis2-uicore-menu'`|||
|dense|boolean|||Menu uses smaller dimensions|
|maxHeight|string|`'auto'`|||
Expand Down
98 changes: 49 additions & 49 deletions collections/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/ui",
"version": "9.10.2",
"version": "9.11.0",
"main": "./build/cjs/index.js",
"module": "./build/es/index.js",
"exports": {
Expand All @@ -21,54 +21,54 @@
"build": "d2-app-scripts build"
},
"dependencies": {
"@dhis2-ui/alert": "9.10.2",
"@dhis2-ui/box": "9.10.2",
"@dhis2-ui/button": "9.10.2",
"@dhis2-ui/calendar": "9.10.2",
"@dhis2-ui/card": "9.10.2",
"@dhis2-ui/center": "9.10.2",
"@dhis2-ui/checkbox": "9.10.2",
"@dhis2-ui/chip": "9.10.2",
"@dhis2-ui/cover": "9.10.2",
"@dhis2-ui/css": "9.10.2",
"@dhis2-ui/divider": "9.10.2",
"@dhis2-ui/field": "9.10.2",
"@dhis2-ui/file-input": "9.10.2",
"@dhis2-ui/header-bar": "9.10.2",
"@dhis2-ui/help": "9.10.2",
"@dhis2-ui/input": "9.10.2",
"@dhis2-ui/intersection-detector": "9.10.2",
"@dhis2-ui/label": "9.10.2",
"@dhis2-ui/layer": "9.10.2",
"@dhis2-ui/legend": "9.10.2",
"@dhis2-ui/loader": "9.10.2",
"@dhis2-ui/logo": "9.10.2",
"@dhis2-ui/menu": "9.10.2",
"@dhis2-ui/modal": "9.10.2",
"@dhis2-ui/node": "9.10.2",
"@dhis2-ui/notice-box": "9.10.2",
"@dhis2-ui/organisation-unit-tree": "9.10.2",
"@dhis2-ui/pagination": "9.10.2",
"@dhis2-ui/popover": "9.10.2",
"@dhis2-ui/popper": "9.10.2",
"@dhis2-ui/portal": "9.10.2",
"@dhis2-ui/radio": "9.10.2",
"@dhis2-ui/required": "9.10.2",
"@dhis2-ui/segmented-control": "9.10.2",
"@dhis2-ui/select": "9.10.2",
"@dhis2-ui/selector-bar": "9.10.2",
"@dhis2-ui/sharing-dialog": "9.10.2",
"@dhis2-ui/switch": "9.10.2",
"@dhis2-ui/tab": "9.10.2",
"@dhis2-ui/table": "9.10.2",
"@dhis2-ui/tag": "9.10.2",
"@dhis2-ui/text-area": "9.10.2",
"@dhis2-ui/tooltip": "9.10.2",
"@dhis2-ui/transfer": "9.10.2",
"@dhis2-ui/user-avatar": "9.10.2",
"@dhis2/ui-constants": "9.10.2",
"@dhis2/ui-forms": "9.10.2",
"@dhis2/ui-icons": "9.10.2",
"@dhis2-ui/alert": "9.11.0",
"@dhis2-ui/box": "9.11.0",
"@dhis2-ui/button": "9.11.0",
"@dhis2-ui/calendar": "9.11.0",
"@dhis2-ui/card": "9.11.0",
"@dhis2-ui/center": "9.11.0",
"@dhis2-ui/checkbox": "9.11.0",
"@dhis2-ui/chip": "9.11.0",
"@dhis2-ui/cover": "9.11.0",
"@dhis2-ui/css": "9.11.0",
"@dhis2-ui/divider": "9.11.0",
"@dhis2-ui/field": "9.11.0",
"@dhis2-ui/file-input": "9.11.0",
"@dhis2-ui/header-bar": "9.11.0",
"@dhis2-ui/help": "9.11.0",
"@dhis2-ui/input": "9.11.0",
"@dhis2-ui/intersection-detector": "9.11.0",
"@dhis2-ui/label": "9.11.0",
"@dhis2-ui/layer": "9.11.0",
"@dhis2-ui/legend": "9.11.0",
"@dhis2-ui/loader": "9.11.0",
"@dhis2-ui/logo": "9.11.0",
"@dhis2-ui/menu": "9.11.0",
"@dhis2-ui/modal": "9.11.0",
"@dhis2-ui/node": "9.11.0",
"@dhis2-ui/notice-box": "9.11.0",
"@dhis2-ui/organisation-unit-tree": "9.11.0",
"@dhis2-ui/pagination": "9.11.0",
"@dhis2-ui/popover": "9.11.0",
"@dhis2-ui/popper": "9.11.0",
"@dhis2-ui/portal": "9.11.0",
"@dhis2-ui/radio": "9.11.0",
"@dhis2-ui/required": "9.11.0",
"@dhis2-ui/segmented-control": "9.11.0",
"@dhis2-ui/select": "9.11.0",
"@dhis2-ui/selector-bar": "9.11.0",
"@dhis2-ui/sharing-dialog": "9.11.0",
"@dhis2-ui/switch": "9.11.0",
"@dhis2-ui/tab": "9.11.0",
"@dhis2-ui/table": "9.11.0",
"@dhis2-ui/tag": "9.11.0",
"@dhis2-ui/text-area": "9.11.0",
"@dhis2-ui/tooltip": "9.11.0",
"@dhis2-ui/transfer": "9.11.0",
"@dhis2-ui/user-avatar": "9.11.0",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-forms": "9.11.0",
"@dhis2/ui-icons": "9.11.0",
"prop-types": "^15.7.2"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions components/alert/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/alert",
"version": "9.10.2",
"version": "9.11.0",
"description": "UI Alert",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,9 +33,9 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2-ui/portal": "9.10.2",
"@dhis2/ui-constants": "9.10.2",
"@dhis2/ui-icons": "9.10.2",
"@dhis2-ui/portal": "9.11.0",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-icons": "9.11.0",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
4 changes: 2 additions & 2 deletions components/box/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/box",
"version": "9.10.2",
"version": "9.11.0",
"description": "UI Box",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2/ui-constants": "9.10.2",
"@dhis2/ui-constants": "9.11.0",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
12 changes: 6 additions & 6 deletions components/button/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/button",
"version": "9.10.2",
"version": "9.11.0",
"description": "UI Button",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,11 +33,11 @@
},
"dependencies": {
"@dhis2/prop-types": "^3.1.2",
"@dhis2-ui/layer": "9.10.2",
"@dhis2-ui/loader": "9.10.2",
"@dhis2-ui/popper": "9.10.2",
"@dhis2/ui-constants": "9.10.2",
"@dhis2/ui-icons": "9.10.2",
"@dhis2-ui/layer": "9.11.0",
"@dhis2-ui/loader": "9.11.0",
"@dhis2-ui/popper": "9.11.0",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-icons": "9.11.0",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
16 changes: 8 additions & 8 deletions components/calendar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2-ui/calendar",
"version": "9.10.2",
"version": "9.11.0",
"description": "UI Calendar",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,15 +33,15 @@
"styled-jsx": "^4"
},
"dependencies": {
"@dhis2-ui/button": "9.10.2",
"@dhis2-ui/card": "9.10.2",
"@dhis2-ui/input": "9.10.2",
"@dhis2-ui/layer": "9.10.2",
"@dhis2-ui/popper": "9.10.2",
"@dhis2-ui/button": "9.11.0",
"@dhis2-ui/card": "9.11.0",
"@dhis2-ui/input": "9.11.0",
"@dhis2-ui/layer": "9.11.0",
"@dhis2-ui/popper": "9.11.0",
"@dhis2/multi-calendar-dates": "^1.2.3",
"@dhis2/prop-types": "^3.1.2",
"@dhis2/ui-constants": "9.10.2",
"@dhis2/ui-icons": "9.10.2",
"@dhis2/ui-constants": "9.11.0",
"@dhis2/ui-icons": "9.11.0",
"classnames": "^2.3.1",
"prop-types": "^15.7.2"
},
Expand Down
Loading

0 comments on commit 6119271

Please sign in to comment.