Merge branch 'master' into DHIS2-15765/add-scheduler-settings

CHANGELOG.md

@@ -1,3 +1,31 @@
+## [29.15.9](https://github.com/dhis2/settings-app/compare/v29.15.8...v29.15.9) (2023-12-14)
+
+
+### Bug Fixes
+
+* update info icons ([#1290](https://github.com/dhis2/settings-app/issues/1290)) ([6448044](https://github.com/dhis2/settings-app/commit/644804410da37e6d6f3ee577e3a7ca83c5a5f959))
+
+## [29.15.8](https://github.com/dhis2/settings-app/compare/v29.15.7...v29.15.8) (2023-11-19)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([1e5fe5f](https://github.com/dhis2/settings-app/commit/1e5fe5f1b14a2f6b8eef3c5c579c28c683f98409))
+
+## [29.15.7](https://github.com/dhis2/settings-app/compare/v29.15.6...v29.15.7) (2023-10-05)
+
+
+### Bug Fixes
+
+* extend container height [DHIS2-15875] ([#1271](https://github.com/dhis2/settings-app/issues/1271)) ([1aad046](https://github.com/dhis2/settings-app/commit/1aad046156424d286c97c58f5cef9a462d0bf3d5))
+
+## [29.15.6](https://github.com/dhis2/settings-app/compare/v29.15.5...v29.15.6) (2023-09-30)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([8a4339a](https://github.com/dhis2/settings-app/commit/8a4339ae6127154453967f3b2f1af4efe3e45cdf))
+
 ## [29.15.5](https://github.com/dhis2/settings-app/compare/v29.15.4...v29.15.5) (2023-09-28)
 
 

i18n/uz_UZ_Cyrl.po

@@ -1,13 +1,13 @@
 # 
 # Translators:
-# Ibatov <[email protected]>, 2021
+# Ibatov <[email protected]>, 2023
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
 "POT-Creation-Date: 2023-08-24T10:48:48.806Z\n"
 "PO-Revision-Date: 2021-03-18 19:32+0000\n"
-"Last-Translator: Ibatov <[email protected]>, 2021\n"
+"Last-Translator: Ibatov <[email protected]>, 2023\n"
 "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "Failed to load: {{error}}"
-msgstr "Бклаб бўлмади: {{error}}"
+msgstr "Юклаб бўлмади: {{error}}"
 
 msgid "No flag"
 msgstr "Байроқ йўқ"
@@ -43,7 +43,7 @@ msgid "Cancel upload"
 msgstr "Юкланишни бекор қилиш"
 
 msgid "System default ({{language}})"
-msgstr ""
+msgstr "Стандарт тизим ({{language}})"
 
 msgid "Set the main field value before adding a translation"
 msgstr "Таржимани қўшишдан олдин асосий майдон қийматини ўрнатинг"
@@ -327,10 +327,10 @@ msgid "No message recipients"
 msgstr "Хабарларни қабул қилувчилар йўқ"
 
 msgid "System update notification recipients"
-msgstr ""
+msgstr "Тизим янгиланиши ҳақида билдиришнома олувчилар"
 
 msgid "No update notification recipients"
-msgstr ""
+msgstr "Тизим янгиланиши ҳақида билдиришнома олмайдиганлар"
 
 msgid "Max offline organisation unit levels"
 msgstr "Автоном ташкилий бўлимлар максимал поғоналари сони"
@@ -457,7 +457,7 @@ msgid "Hide weekly periods"
 msgstr "Ҳафталик даврларни беркитиш"
 
 msgid "Hide biweekly periods"
-msgstr ""
+msgstr "Икки ҳафталик даврни беркитиш"
 
 msgid "Hide monthly periods"
 msgstr "Ойлик даврларни беркитиш"
@@ -558,22 +558,22 @@ msgid "Put analytics in maintenance mode"
 msgstr "Аналитикани техник режимга ўтказинг"
 
 msgid "Include zero data values in analytics tables"
-msgstr ""
+msgstr "Аналитик жадвалга 0 қийматларни ҳам киритиш"
 
 msgid "Caching factor"
 msgstr "Кешлаш омили"
 
 msgid "Org unit group set in facility map layers"
-msgstr ""
+msgstr "Ташкилот харитаси қатламларида ташкилий бирлик гуруҳи бириктирилади"
 
 msgid "Org unit level in facility map layers"
-msgstr ""
+msgstr "Ташкилот харитаси қатламида ташкилий бирлик даражаси"
 
 msgid "Default basemap"
-msgstr ""
+msgstr "Стандарт базавий харита"
 
 msgid "OSM Light (default)"
-msgstr ""
+msgstr "OSM ёритувчи (стандарт)"
 
 msgid "OSM Detailed"
 msgstr "OSM Батафсил"
@@ -630,7 +630,7 @@ msgid "Start page"
 msgstr "Бош саҳифа"
 
 msgid "Enable light-weight start page"
-msgstr ""
+msgstr "Дастлабки саҳифани ёқинг"
 
 msgid "Help page link"
 msgstr "Ёрдамчи саҳифага ҳавола"
@@ -704,7 +704,7 @@ msgid "Email sender"
 msgstr "Электрон хабар жўнатувчиси"
 
 msgid "The address that outgoing messages are sent from."
-msgstr ""
+msgstr "Чиқувчи хабарлар юборадиган манзиллар."
 
 msgid "Send me a test email"
 msgstr "Менга электрон почта хабарини тест сифатида юборинг"
@@ -753,10 +753,11 @@ msgid "12 months"
 msgstr "12 ой"
 
 msgid "Send reminders to users before their password expires"
-msgstr ""
+msgstr "Пароль муддати тугашидан олдин эслатмаларини юборинг"
 
 msgid "Number of days before password expiry to send reminder (1–28)"
 msgstr ""
+"эслатма юбориш учун пароль муддати тугашидан олдинги кунлар сони  (1–28)"
 
 msgid "Minimum characters in password"
 msgstr "Паролда минимал талаблар"
@@ -798,16 +799,19 @@ msgid "Persian"
 msgstr "Форс тили"
 
 msgid "Change calendar setting"
-msgstr ""
+msgstr "Календарни созламаларини танланг"
 
 msgid ""
 "Changing your calendar setting after you have entered data can make your "
 "system unusable. If you have entered data, it is strongly recommended that "
 "you do not change your calendar setting."
 msgstr ""
+"Маълумотларни киритганингиздан сўнг календар созламаларини ўзгартириш "
+"тизимни яроқсиз ҳолга олиб келиши мумкин. Агар сиз маълумотларни киритган "
+"бўлсангиз, календар созламаларини ўзгартирмаслик тавсия этилади."
 
 msgid "Yes, change calendar"
-msgstr ""
+msgstr "Ҳа, календарни танланг"
 
 msgid "Date format"
 msgstr "Сана формати"

i18n/zh.po

@@ -46,7 +46,7 @@ msgid "Cancel upload"
 msgstr "取消上传"
 
 msgid "System default ({{language}})"
-msgstr ""
+msgstr "系统默认值 ({{language}})"
 
 msgid "Set the main field value before adding a translation"
 msgstr "添加翻译前设置主要字段值"
@@ -692,7 +692,7 @@ msgid "Email sender"
 msgstr "邮件发送者"
 
 msgid "The address that outgoing messages are sent from."
-msgstr ""
+msgstr "发送外发消息的地址。"
 
 msgid "Send me a test email"
 msgstr "发送测试邮件"
@@ -740,7 +740,7 @@ msgid "Send reminders to users before their password expires"
 msgstr "在密码过期之前向用户发送提醒"
 
 msgid "Number of days before password expiry to send reminder (1–28)"
-msgstr ""
+msgstr "密码到期前发送提醒的天数 (1–28)"
 
 msgid "Minimum characters in password"
 msgstr "口令最小字符数"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "settings-app",
-    "version": "29.15.5",
+    "version": "29.15.9",
     "description": "",
     "license": "BSD-3-Clause",
     "private": true,

src/App.module.css

@@ -1,7 +1,7 @@
 .contentWrap {
     display: flex;
     background: var(--colors-grey100);
-    min-height:100vh;
+    min-height: calc(100vh - 48px); /* subtract header bar height */
 }
 
 .contentArea {

src/settingsFields.component.js

@@ -1,8 +1,14 @@
 import i18n from '@dhis2/d2-i18n'
-import { Button, Card, CenteredContent, CircularLoader } from '@dhis2/ui'
+import {
+    Button,
+    Card,
+    CenteredContent,
+    CircularLoader,
+    IconInfo24,
+    Tooltip,
+} from '@dhis2/ui'
 import FormBuilder from 'd2-ui/lib/forms/FormBuilder.component.js'
 import { wordToValidatorMap } from 'd2-ui/lib/forms/Validators.js'
-import IconButton from 'material-ui/IconButton'
 import PropTypes from 'prop-types'
 import React from 'react'
 import configOptionStore from './configOptionStore.js'
@@ -35,7 +41,7 @@ const styles = {
         color: AppTheme.rawTheme.palette.primary1Color,
         position: 'absolute',
         right: 0,
-        top: 24,
+        top: 36,
     },
     menuIcon: {
         color: '#757575',
@@ -84,24 +90,12 @@ function wrapUserSettingsOverride({ component, valueLabel }) {
                 : i18n.t('This setting can be overridden by user settings')
 
             return (
-                <div style={{ marginRight: 48 }}>
+                <div style={{ marginRight: 36 }}>
                     {super.render()}
                     <div style={labelStyle}>
-                        <IconButton
-                            iconClassName="material-icons"
-                            tooltip={labelText}
-                            tooltipPosition="bottom-left"
-                            iconStyle={{
-                                color: AppTheme.rawTheme.palette.primary1Color,
-                            }}
-                            tooltipStyles={{
-                                fontSize: '.75rem',
-                                marginRight: 32,
-                                marginTop: -32,
-                            }}
-                        >
-                            info_outline
-                        </IconButton>
+                        <Tooltip content={labelText}>
+                            <IconInfo24 />
+                        </Tooltip>
                     </div>
                 </div>
             )