Merge pull request #230 from EyeSeeTea/development

Release 1.1.0

i18n/en.pot

@@ -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: 2021-12-07T09:36:35.426Z\n"
-"PO-Revision-Date: 2021-12-07T09:36:35.426Z\n"
+"POT-Creation-Date: 2022-02-17T08:02:57.121Z\n"
+"PO-Revision-Date: 2022-02-17T08:02:57.121Z\n"
 
 msgid "Enable users"
 msgstr ""
@@ -98,24 +98,87 @@ msgstr ""
 msgid "JSON Response"
 msgstr ""
 
+msgid "Saving users"
+msgstr ""
+
+msgid "Update strategy: "
+msgstr ""
+
+msgid "Merge"
+msgstr ""
+
+msgid "Replace"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Assign roles to {{usernames}}"
+msgstr ""
+
+msgid "Assign groups to {{usernames}}"
+msgstr ""
+
 msgid "Back"
 msgstr ""
 
 msgid "Help"
 msgstr ""
 
+msgid "General info"
+msgstr ""
+
+msgid "Assignment"
+msgstr ""
+
+msgid "Other information"
+msgstr ""
+
+msgid "Error saving user"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
 msgid "Please provide a valid identifier"
 msgstr ""
 
 msgid "Please provide a valid email"
 msgstr ""
 
+msgid "Password should contain at least one lowercase letter"
+msgstr ""
+
+msgid "Password should contain at least one UPPERCASE letter"
+msgstr ""
+
+msgid "Password should contain at least one number"
+msgstr ""
+
+msgid "Password should have at least one special character"
+msgstr ""
+
+msgid "Please provide a valid phone number"
+msgstr ""
+
+msgid "Please provide a valid international phone number (+0123456789)"
+msgstr ""
+
 msgid "First Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 
+msgid "Password"
+msgstr ""
+
+msgid "Account expiration date"
+msgstr ""
+
 msgid "Surname"
 msgstr ""
 
@@ -125,9 +188,30 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
+msgid "Phone Number"
+msgstr ""
+
+msgid "WhatsApp"
+msgstr ""
+
+msgid "Facebook Messenger"
+msgstr ""
+
+msgid "Skype"
+msgstr ""
+
+msgid "Telegram"
+msgstr ""
+
+msgid "Twitter"
+msgstr ""
+
 msgid "Disabled"
 msgstr ""
 
+msgid "External authentication only (OpenID or LDAP)"
+msgstr ""
+
 msgid "User Roles"
 msgstr ""
 
@@ -143,6 +227,15 @@ msgstr ""
 msgid "Open ID"
 msgstr ""
 
+msgid "LDAP identifier"
+msgstr ""
+
+msgid "Interface language"
+msgstr ""
+
+msgid "Database language"
+msgstr ""
+
 msgid "Api URL"
 msgstr ""
 
@@ -221,9 +314,6 @@ msgstr ""
 msgid "And {{overflow}} more..."
 msgstr ""
 
-msgid "Saving users"
-msgstr ""
-
 msgid "Edit users"
 msgstr ""
 
@@ -236,8 +326,23 @@ msgstr ""
 msgid "Add user"
 msgstr ""
 
-msgid "Save"
+msgid "Delete"
 msgstr ""
 
-msgid "Delete"
+msgid "Edit user"
+msgstr ""
+
+msgid "New user"
+msgstr ""
+
+msgid "Network error"
+msgstr ""
+
+msgid "Unable to load user {{id}}"
+msgstr ""
+
+msgid "Open in user management"
+msgstr ""
+
+msgid " and {{overflow}} more..."
 msgstr ""

i18n/es.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2021-12-07T09:36:35.426Z\n"
+"POT-Creation-Date: 2022-02-17T08:02:57.121Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,24 +98,87 @@ msgstr ""
 msgid "JSON Response"
 msgstr ""
 
+msgid "Saving users"
+msgstr ""
+
+msgid "Update strategy: "
+msgstr ""
+
+msgid "Merge"
+msgstr ""
+
+msgid "Replace"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "Assign roles to {{usernames}}"
+msgstr ""
+
+msgid "Assign groups to {{usernames}}"
+msgstr ""
+
 msgid "Back"
 msgstr "Volver"
 
 msgid "Help"
 msgstr "Ayuda"
 
+msgid "General info"
+msgstr ""
+
+msgid "Assignment"
+msgstr ""
+
+msgid "Other information"
+msgstr ""
+
+msgid "Error saving user"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
 msgid "Please provide a valid identifier"
 msgstr ""
 
 msgid "Please provide a valid email"
 msgstr ""
 
+msgid "Password should contain at least one lowercase letter"
+msgstr ""
+
+msgid "Password should contain at least one UPPERCASE letter"
+msgstr ""
+
+msgid "Password should contain at least one number"
+msgstr ""
+
+msgid "Password should have at least one special character"
+msgstr ""
+
+msgid "Please provide a valid phone number"
+msgstr ""
+
+msgid "Please provide a valid international phone number (+0123456789)"
+msgstr ""
+
 msgid "First Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 
+msgid "Password"
+msgstr ""
+
+msgid "Account expiration date"
+msgstr ""
+
 msgid "Surname"
 msgstr ""
 
@@ -125,9 +188,30 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
+msgid "Phone Number"
+msgstr ""
+
+msgid "WhatsApp"
+msgstr ""
+
+msgid "Facebook Messenger"
+msgstr ""
+
+msgid "Skype"
+msgstr ""
+
+msgid "Telegram"
+msgstr ""
+
+msgid "Twitter"
+msgstr ""
+
 msgid "Disabled"
 msgstr ""
 
+msgid "External authentication only (OpenID or LDAP)"
+msgstr ""
+
 msgid "User Roles"
 msgstr ""
 
@@ -143,6 +227,15 @@ msgstr ""
 msgid "Open ID"
 msgstr ""
 
+msgid "LDAP identifier"
+msgstr ""
+
+msgid "Interface language"
+msgstr ""
+
+msgid "Database language"
+msgstr ""
+
 msgid "Api URL"
 msgstr ""
 
@@ -221,9 +314,6 @@ msgstr ""
 msgid "And {{overflow}} more..."
 msgstr ""
 
-msgid "Saving users"
-msgstr ""
-
 msgid "Edit users"
 msgstr ""
 
@@ -236,8 +326,24 @@ msgstr ""
 msgid "Add user"
 msgstr ""
 
-msgid "Save"
+msgid "Delete"
 msgstr ""
 
-msgid "Delete"
+msgid "Edit user"
+msgstr ""
+
+#, fuzzy
+msgid "New user"
+msgstr "Eliminar usuarios"
+
+msgid "Network error"
+msgstr ""
+
+msgid "Unable to load user {{id}}"
+msgstr ""
+
+msgid "Open in user management"
+msgstr ""
+
+msgid " and {{overflow}} more..."
 msgstr ""

package.json

@@ -1,7 +1,7 @@
 {
     "name": "user-extended-app",
     "description": "DHIS2 Extended User app",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -15,8 +15,8 @@
         "@dhis2/d2-i18n-extract": "1.0.8",
         "@dhis2/d2-i18n-generate": "1.2.0",
         "@dhis2/ui": "7.8.1",
-        "@eyeseetea/d2-api": "1.9.3",
-        "@eyeseetea/d2-ui-components": "2.6.9",
+        "@eyeseetea/d2-api": "1.11.0",
+        "@eyeseetea/d2-ui-components": "2.6.12-beta.4",
         "@material-ui/core": "4.12.3",
         "@material-ui/icons": "4.11.2",
         "@types/react-virtualized-auto-sizer": "1.0.1",

public/old-i18n/i18n_module_ar.properties

@@ -1,5 +1,7 @@
 actions=Actions
+selected=selected
 assign_all=Assign all
+remove_all=Remove all
 assign_groups=Assign to groups
 assign_roles=Assign roles
 assign_to_org_units_capture=Assign to organisation units capture
@@ -132,3 +134,8 @@ config_import_export=Import/export
 setting_organisation_units_capture_field=Organisation Units Capture field used for users import/export
 select_one_toggle=You must select a toggle option
 select_at_least_one_user=Select at least one destination user
+AND=AND
+OR=OR
+Filtering_behavior=Filtering behavior
+Active_in_advanced_only=(Only for advanced filters)
+open_id=Open ID