Skip to content

Commit

Permalink
chore: squash merge master into epic branch
Browse files Browse the repository at this point in the history 
commit 7fa8693
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:29 2019 +0100

    chore(translations): sync Arabic translations from transifex (master)

    Automatically merged to resolve the avalance

commit c3c5753
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:27 2019 +0100

    chore(translations): sync Spanish translations from transifex (master)

    Automatically merged to resolve the avalance

commit 84e30cf
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:25 2019 +0100

    chore(translations): sync PersianAfghanistan translations from transifex (master)

    Automatically merged to resolve the avalance

commit 613e818
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:22 2019 +0100

    chore(translations): sync French translations from transifex (master)

    Automatically merged to resolve the avalance

commit f0a73e7
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:19 2019 +0100

    chore(translations): sync Lao translations from transifex (master)

    Automatically merged to resolve the avalance

commit a251cc0
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:16 2019 +0100

    chore(translations): sync Burmese translations from transifex (master)

    Automatically merged to resolve the avalance

commit a9d70dd
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:13 2019 +0100

    chore(translations): sync Pushto translations from transifex (master)

    Automatically merged to resolve the avalance

commit bf94c6d
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:11 2019 +0100

    chore(translations): sync Portuguese translations from transifex (master)

    Automatically merged to resolve the avalance

commit 41c2f38
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:09 2019 +0100

    chore(translations): sync PortugueseBrazil translations from transifex (master)

    Automatically merged to resolve the avalance

commit 782e55a
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:06 2019 +0100

    chore(translations): sync Russian translations from transifex (master)

    Automatically merged to resolve the avalance

commit c6d5f76
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:03 2019 +0100

    chore(translations): sync Swedish translations from transifex (master)

    Automatically merged to resolve the avalance

commit 3ed9dcb
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:31:00 2019 +0100

    chore(translations): sync TetumTetun translations from transifex (master)

    Automatically merged to resolve the avalance

commit 6b76689
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:30:56 2019 +0100

    chore(translations): sync Tajik translations from transifex (master)

    Automatically merged to resolve the avalance

commit f95ef04
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:30:54 2019 +0100

    chore(translations): sync Ukrainian translations from transifex (master)

    Automatically merged to resolve the avalance

commit ecbf268
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:30:51 2019 +0100

    chore(translations): sync Vietnamese translations from transifex (master)

    Automatically merged to resolve the avalance

commit e6c7fa6
Author: @dhis2-bot <[email protected]>
Date:   Tue Nov 19 09:13:48 2019 +0100

    chore(translations): sync Chinese translations from transifex (master)

    Automatically merged to resolve the avalance

commit c96ac09
Author: Martin <[email protected]>
Date:   Fri Nov 15 14:11:55 2019 +0100

    fix: changed incorrect prop types and tests (#372)

    * fix: changed incorrect prop types and tests

    * fix: upgraded to Analytics v2.6.2

commit 22c36e2
Author: Martin <[email protected]>
Date:   Fri Nov 15 13:06:07 2019 +0100

    fix: map is not vis type (#371)

    * fix: extracted map from vis type to a static item

    * fix: renamed chart to vis

    * refactor: removed legacy native type to use only vis type instead

    * fix: issue with 'selected' prop

    * fix: added missing comment from Analytics

    * fix: added prop types

    * fix: added more prop types

    * fix: removed unnecessary prop type

commit 91847d2
Author: Martin <[email protected]>
Date:   Thu Nov 14 15:57:02 2019 +0100

    Fix: Implement disallowed dims from Analytics UI rules (#370)

    * fix: using Analytics to calculate disallowed dimensions
    * fix: Analytics v2.6.0

commit 26d12c6
Author: Martin <[email protected]>
Date:   Thu Nov 14 11:30:20 2019 +0100

    fix: use shared vis types (#368)

    * use vis types from analytics
    * upgrades to and depends on @dhis2/analytics to v2.5.2
    * implemented layout rules for the "add to layout" button

commit a3dbb9f
Author: Jan Henrik Øverland <[email protected]>
Date:   Mon Nov 11 14:46:30 2019 +0100

    feat: use layout rules for add-to-layout ui (#362)

    * feat: generate add to layout button/menu based on rules

    * feat: refactor logic to use rules

    * upgrade @dhis2/analytics dep

    * tmp fix add to button tests

    * TODO fix tests

    * remove comment

    * replace local fn with analytics fn

    * todo: tmp commented out tests

    * remove folder

commit d6ba4a3
Author: Jan Henrik Øverland <[email protected]>
Date:   Mon Nov 11 14:09:50 2019 +0100

    refactor: use dimension menu from @dhis2/analytics (#364)

    * refactor: Use DimensionMenu and rules logic from @dhis2/analytics for all occurrences of such duplicated menus

    * refactor: upgraded @dhis2/analytics to v2.5.1

commit 204fe7a
Author: Jan Henrik Overland <[email protected]>
Date:   Tue Nov 5 14:02:06 2019 +0100

    fix: use axisName instead of axisKey

commit dd8b563
Author: Martin <[email protected]>
Date:   Tue Nov 5 11:22:22 2019 +0100

    updated analytics repo (#363)

commit 8c0ed13
Author: Martin <[email protected]>
Date:   Tue Nov 5 11:20:18 2019 +0100

    fix: changed height to min-height for the axes area (#361)

commit 74edb3c
Author: Viktor Varland <[email protected]>
Date:   Thu Oct 24 19:39:35 2019 +0200

    chore(deps): upgrade d2-i18n(-generate) deps (master) (#359)

    * chore(deps): upgrade d2-i18n(-generate) deps (master)

    * chore(deps): update i18n for packages

commit 4bcb913
Author: @dhis2-bot <[email protected]>
Date:   Thu Oct 24 12:22:35 2019 +0200

    chore(translations): sync Russian translations from transifex (master)

    Automatically merged to resolve the avalance

commit 2941ee9
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:02:24 2019 +0200

    chore(translations): sync Arabic translations from transifex (master)

    Automatically merged to resolve the avalance

commit 6067063
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:02:21 2019 +0200

    chore(translations): sync Danish translations from transifex (master)

    Automatically merged to resolve the avalance

commit 5f8ec50
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:02:19 2019 +0200

    chore(translations): sync Spanish translations from transifex (master)

    Automatically merged to resolve the avalance

commit ee07b7b
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:02:16 2019 +0200

    chore(translations): sync PersianAfghanistan translations from transifex (master)

    Automatically merged to resolve the avalance

commit 3e5ab95
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:02:14 2019 +0200

    chore(translations): sync French translations from transifex (master)

    Automatically merged to resolve the avalance

commit 754984e
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:02:11 2019 +0200

    chore(translations): sync Indonesian translations from transifex (master)

    Automatically merged to resolve the avalance

commit b0c23c8
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:02:07 2019 +0200

    chore(translations): sync Lao translations from transifex (master)

    Automatically merged to resolve the avalance

commit e1531d0
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:02:01 2019 +0200

    chore(translations): sync Burmese translations from transifex (master)

    Automatically merged to resolve the avalance

commit 9af084b
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:58 2019 +0200

    chore(translations): sync Pushto translations from transifex (master)

    Automatically merged to resolve the avalance

commit 21f72cb
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:56 2019 +0200

    chore(translations): sync Portuguese translations from transifex (master)

    Automatically merged to resolve the avalance

commit e0d1207
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:53 2019 +0200

    chore(translations): sync PortugueseBrazil translations from transifex (master)

    Automatically merged to resolve the avalance

commit a9c2ace
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:51 2019 +0200

    chore(translations): sync Swedish translations from transifex (master)

    Automatically merged to resolve the avalance

commit 8e8e467
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:49 2019 +0200

    chore(translations): sync TetumTetun translations from transifex (master)

    Automatically merged to resolve the avalance

commit cdce03b
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:46 2019 +0200

    chore(translations): sync Tajik translations from transifex (master)

    Automatically merged to resolve the avalance

commit a63b9ec
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:44 2019 +0200

    chore(translations): sync Ukrainian translations from transifex (master)

    Automatically merged to resolve the avalance

commit c37f5a2
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:42 2019 +0200

    chore(translations): sync Urdu translations from transifex (master)

    Automatically merged to resolve the avalance

commit bbc8ebf
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:39 2019 +0200

    chore(translations): sync Vietnamese translations from transifex (master)

    Automatically merged to resolve the avalance

commit 8c5b0c7
Author: @dhis2-bot <[email protected]>
Date:   Wed Oct 23 15:01:36 2019 +0200

    chore(translations): sync Chinese translations from transifex (master)

    Automatically merged to resolve the avalance
  • Loading branch information
@edoardo
edoardo committed Nov 21, 2019
1 parent 7ca2022 commit f14aad3
Show file tree
Hide file tree
Showing 42 changed files with 394 additions and 464 deletions.
7 changes: 4 additions & 3 deletions packages/app/i18n/ar.po
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Translators:
# Viktor Varland <[email protected]>, 2019
# phil_dhis2, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2019-08-08T13:09:25.099Z\n"
"PO-Revision-Date: 2019-06-25 18:46+0000\n"
"Last-Translator: Viktor Varland <[email protected]>, 2019\n"
"Last-Translator: phil_dhis2, 2019\n"
"Language-Team: Arabic (https://www.transifex.com/hisp-uio/teams/100509/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -21,7 +22,7 @@ msgid "\"{{what}}\" successfully deleted."
msgstr ""

msgid "Data Visualizer"
msgstr ""
msgstr "البيانات المرئية"

msgid "Axis 1"
msgstr ""
Expand Down Expand Up @@ -256,7 +257,7 @@ msgid "Polynomial"
msgstr "متعدد الحدود"

msgid "Loess"
msgstr "Loess"
msgstr ""

msgid "Show values"
msgstr "إظهار القيم"
Expand Down
46 changes: 5 additions & 41 deletions packages/app/i18n/en.pot
View file
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: 2019-11-11T13:15:11.091Z\n"
"PO-Revision-Date: 2019-11-11T13:15:11.091Z\n"
"POT-Creation-Date: 2019-11-15T12:12:19.215Z\n"
"PO-Revision-Date: 2019-11-15T12:12:19.215Z\n"

msgid "Rename successful"
msgstr ""
Expand Down Expand Up @@ -45,9 +45,6 @@ msgstr ""
msgid "Hide"
msgstr ""

msgid "Remove"
msgstr ""

msgid "Download"
msgstr ""

Expand Down Expand Up @@ -114,6 +111,9 @@ msgstr ""
msgid "Move to"
msgstr ""

msgid "Remove"
msgstr ""

msgid "None selected"
msgstr ""

Expand Down Expand Up @@ -300,42 +300,6 @@ msgstr ""
msgid "Pivot table"
msgstr ""

msgid "Column"
msgstr ""

msgid "Stacked column"
msgstr ""

msgid "Bar"
msgstr ""

msgid "Stacked bar"
msgstr ""

msgid "Line"
msgstr ""

msgid "Area"
msgstr ""

msgid "Pie"
msgstr ""

msgid "Radar"
msgstr ""

msgid "Gauge"
msgstr ""

msgid "Year over year (line)"
msgstr ""

msgid "Year over year (column)"
msgstr ""

msgid "Single value"
msgstr ""

msgid "Open as Map"
msgstr ""

Expand Down
14 changes: 7 additions & 7 deletions packages/app/i18n/es.po
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Translators:
# phil_dhis2, 2019
# Viktor Varland <[email protected]>, 2019
# phil_dhis2, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2019-08-08T13:09:25.099Z\n"
"PO-Revision-Date: 2019-06-25 18:46+0000\n"
"Last-Translator: Viktor Varland <[email protected]>, 2019\n"
"Last-Translator: phil_dhis2, 2019\n"
"Language-Team: Spanish (https://www.transifex.com/hisp-uio/teams/100509/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -22,7 +22,7 @@ msgid "\"{{what}}\" successfully deleted."
msgstr ""

msgid "Data Visualizer"
msgstr ""
msgstr "Visualizador de Datos"

msgid "Axis 1"
msgstr ""
Expand Down Expand Up @@ -80,7 +80,7 @@ msgid "Data value set"
msgstr "Valor de los datos"

msgid "Other formats"
msgstr "Other formats"
msgstr ""

msgid "An error occurred in the DHIS2 Data Visualizer application."
msgstr ""
Expand Down Expand Up @@ -110,10 +110,10 @@ msgid "{{total}} selected"
msgstr ""

msgid "Series"
msgstr "Series"
msgstr ""

msgid "Category"
msgstr "Category"
msgstr "Categoría"

msgid "Filter"
msgstr "filtro"
Expand Down Expand Up @@ -356,7 +356,7 @@ msgid "Expected reports"
msgstr ""

msgid "Program"
msgstr "Program"
msgstr "Programa"

msgid "Select a program"
msgstr ""
Expand Down
10 changes: 5 additions & 5 deletions packages/app/i18n/fr.po
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Translators:
# Austin McGee <[email protected]>, 2019
# mrwine <[email protected]>, 2019
# Viktor Varland <[email protected]>, 2019
# Bram Piot <[email protected]>, 2019
# phil_dhis2, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2019-08-08T13:09:25.099Z\n"
"PO-Revision-Date: 2019-06-25 18:46+0000\n"
"Last-Translator: Bram Piot <[email protected]>, 2019\n"
"Last-Translator: phil_dhis2, 2019\n"
"Language-Team: French (https://www.transifex.com/hisp-uio/teams/100509/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -24,7 +24,7 @@ msgid "\"{{what}}\" successfully deleted."
msgstr ""

msgid "Data Visualizer"
msgstr ""
msgstr "Visualiseur de données"

msgid "Axis 1"
msgstr ""
Expand Down Expand Up @@ -181,7 +181,7 @@ msgid "Standard deviation"
msgstr "Écart type"

msgid "Variance"
msgstr "Variance"
msgstr ""

msgid "Base line"
msgstr ""
Expand Down Expand Up @@ -400,7 +400,7 @@ msgid "Event data items"
msgstr "Eléments de données évènement"

msgid "Program indicators"
msgstr "Program indicators"
msgstr "Indicateurs de programme"

msgid "Add to series"
msgstr ""
Expand Down
46 changes: 23 additions & 23 deletions packages/app/i18n/lo.po
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Translators:
# phil_dhis2, 2019
# Viktor Varland <[email protected]>, 2019
# phil_dhis2, 2019
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2019-08-08T13:09:25.099Z\n"
"PO-Revision-Date: 2019-06-25 18:46+0000\n"
"Last-Translator: Viktor Varland <[email protected]>, 2019\n"
"Last-Translator: phil_dhis2, 2019\n"
"Language-Team: Lao (https://www.transifex.com/hisp-uio/teams/100509/lo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -22,7 +22,7 @@ msgid "\"{{what}}\" successfully deleted."
msgstr ""

msgid "Data Visualizer"
msgstr ""
msgstr "ການສ້າງຮູບພາບຈາກຂໍ້ມູນ"

msgid "Axis 1"
msgstr ""
Expand All @@ -39,10 +39,10 @@ msgid ""
msgstr ""

msgid "Cancel"
msgstr "Cancel"
msgstr "ຍົກເລີກ"

msgid "Update"
msgstr "Update"
msgstr "ປັບປຸງ"

msgid ""
"'Single Value' is intended to show a single data item. Only the first item "
Expand Down Expand Up @@ -113,10 +113,10 @@ msgid "Series"
msgstr "ແທ່ງ"

msgid "Category"
msgstr "Category"
msgstr "ລວງນອນ"

msgid "Filter"
msgstr "Filter"
msgstr "ກັ່ນຕອງ"

msgid "Move to"
msgstr ""
Expand Down Expand Up @@ -176,10 +176,10 @@ msgid "Max"
msgstr "ຄ່າໃຫ່ຍສຸດ"

msgid "Standard deviation"
msgstr "Standard deviation"
msgstr ""

msgid "Variance"
msgstr "Variance"
msgstr "ຄວາມແຕກຕ່າງ"

msgid "Base line"
msgstr ""
Expand Down Expand Up @@ -212,7 +212,7 @@ msgid "Before first and after last"
msgstr "ກ່ອນໜ້າທໍາອິດ ແລະ ຫຼັງຈາກສຸດທ້າຍ"

msgid "All"
msgstr "All"
msgstr "ທັງໝົດ"

msgid "Hide chart legend"
msgstr "ເຊື່ອງຄວາມຫມາຍຂອງເສັ້ນສະແດງ"
Expand All @@ -224,7 +224,7 @@ msgid "Hide title"
msgstr ""

msgid "No space between columns/bars"
msgstr "No space between columns/bars"
msgstr ""

msgid "Use 100% stacked values"
msgstr "ໃຊ້ຄ່າທີ່ຊ້ອນກັນ 100%"
Expand Down Expand Up @@ -356,13 +356,13 @@ msgid "Expected reports"
msgstr ""

msgid "Program"
msgstr "Program"
msgstr "ສາຍງານ"

msgid "Select a program"
msgstr ""

msgid "Indicators"
msgstr "Indicators"
msgstr "ຕົວຊີ້ວັດ"

msgid "Select indicator group"
msgstr "ເລືອກກຸ່ມຕົວຊີ້ວັດ"
Expand Down Expand Up @@ -456,16 +456,16 @@ msgid "Today"
msgstr "ມື້ນີ້"

msgid "Yesterday"
msgstr "Yesterday"
msgstr "ມື້ວານນີ"

msgid "Last 3 days"
msgstr "Last 3 days"
msgstr "3 ມື້ກ່ອນ"

msgid "Last 7 days"
msgstr "Last 7 days"
msgstr "7 ມື້ກ່ອນ"

msgid "Last 14 days"
msgstr "Last 14 days"
msgstr "14 ມື້ກ່ອນ"

msgid "This week"
msgstr "ທິດນີ້"
Expand All @@ -480,22 +480,22 @@ msgid "Last 12 weeks"
msgstr "12 ອາທິດຍ້ອນຫຼັງ"

msgid "Last 52 weeks"
msgstr "Last 52 weeks"
msgstr "52 ອາທິດຜ່ານມາ"

msgid "Weeks this year"
msgstr "Weeks this year"
msgstr "ອາທິດ ຂອງປີນີ້"

msgid "This month"
msgstr "ເດືອນນີ້"

msgid "Last month"
msgstr "Last month"
msgstr "ເດືອນຜ່ານມາ"

msgid "Last 3 months"
msgstr "3 ເດືອນຍ້ອນຫຼັງ"

msgid "Last 6 months"
msgstr "Last 6 months"
msgstr "6 ເດືອນຜ່ານມາ"

msgid "Last 12 months"
msgstr "12 ເດືອນຍ້ອນຫຼັງ"
Expand All @@ -519,7 +519,7 @@ msgid "This quarter"
msgstr "ໄຕມານີ້"

msgid "Last quarter"
msgstr "Last quarter"
msgstr "ໄຕມາດຜ່ານມາ"

msgid "Last 4 quarters"
msgstr "4 ໄຕມາດຍ້ອນຫຼັງ"
Expand All @@ -531,7 +531,7 @@ msgid "This six-month"
msgstr "6 ເດືອນນີ້"

msgid "Last six-month"
msgstr "Last six-month"
msgstr "6 ເດືອນຜ່ານມາ"

msgid "Last 2 six-months"
msgstr "ລວມ 6 ເດືອນ 2 ຄັ້ງທີ່ຜ່ານມາ"
Expand Down
Loading

0 comments on commit f14aad3

Please sign in to comment.