Merge remote-tracking branch 'upstream/development'

EyeSeeTea · Sep 14, 2023 · bb33046 · bb33046
2 parents f83db92 + 9c1f009
commit bb33046
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/i18n/en.pot b/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: 2023-06-12T19:57:22.426Z\n"
-"PO-Revision-Date: 2023-06-12T19:57:22.426Z\n"
+"POT-Creation-Date: 2023-07-24T14:23:56.803Z\n"
+"PO-Revision-Date: 2023-07-24T14:23:56.803Z\n"
 
 msgid "Enable users"
 msgstr ""
@@ -328,11 +328,11 @@ msgstr ""
 
 msgid ""
 "This application has been funded by the the Norwegian Refugee Council "
-"(NRC), the WHO Global Malaria Programme and Samaritan’s Purse to support "
-"countries in strengthening the collection and use of health data by using "
-"DHIS2. The application has been developed by [EyeSeeTea "
-"SL](http://eyeseetea.com). Source code, documentation and release notes can "
-"be found at the [EyeSeetea GitHub Project "
+"(NRC), the WHO Global Malaria Programme, Samaritan’s Purse and Medecins "
+"Sans Frontières (MSF) to support countries in strengthening the collection "
+"and use of health data by using DHIS2. The application has been developed "
+"by [EyeSeeTea SL](http://eyeseetea.com). Source code, documentation and "
+"release notes can be found at the [EyeSeetea GitHub Project "
 "Page](https://eyeseetea.github.io/user-extended-app-blessed/)"
 msgstr ""
 
@@ -356,6 +356,9 @@ msgstr ""
 msgid "Norwegian Refugee Council"
 msgstr ""
 
+msgid "MSF"
+msgstr ""
+
 msgid "Edit users"
 msgstr ""
 

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-12T19:57:22.426Z\n"
+"POT-Creation-Date: 2023-07-24T14:23:56.803Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -328,11 +328,12 @@ msgstr ""
 
 msgid ""
 "This application has been funded by the the Norwegian Refugee Council (NRC), "
-"the WHO Global Malaria Programme and Samaritan’s Purse to support countries "
-"in strengthening the collection and use of health data by using DHIS2. The "
-"application has been developed by [EyeSeeTea SL](http://eyeseetea.com). "
-"Source code, documentation and release notes can be found at the [EyeSeetea "
-"GitHub Project Page](https://eyeseetea.github.io/user-extended-app-blessed/)"
+"the WHO Global Malaria Programme, Samaritan’s Purse and Medecins Sans "
+"Frontières (MSF) to support countries in strengthening the collection and "
+"use of health data by using DHIS2. The application has been developed by "
+"[EyeSeeTea SL](http://eyeseetea.com). Source code, documentation and release "
+"notes can be found at the [EyeSeetea GitHub Project Page](https://eyeseetea."
+"github.io/user-extended-app-blessed/)"
 msgstr ""
 
 msgid ""
@@ -355,6 +356,9 @@ msgstr ""
 msgid "Norwegian Refugee Council"
 msgstr ""
 
+msgid "MSF"
+msgstr ""
+
 msgid "Edit users"
 msgstr ""
 

diff --git a/public/img/logo-msf.svg b/public/img/logo-msf.svg
diff --git a/src/webapp/pages/about/AboutPage.tsx b/src/webapp/pages/about/AboutPage.tsx
@@ -14,7 +14,7 @@ export const AboutPage: React.FC = React.memo(() => {
             "User-Extended App is a DHIS2 Web Application that provides an easy and integrated way to perform common operations to DHIS2 users which would be burdensome to perform using the in-built DHIS2 User management application."
         ),
         i18n.t(
-            "This application has been funded by the the Norwegian Refugee Council (NRC), the WHO Global Malaria Programme and Samaritan’s Purse to support countries in strengthening the collection and use of health data by using DHIS2. The application has been developed by [EyeSeeTea SL](http://eyeseetea.com). Source code, documentation and release notes can be found at the [EyeSeetea GitHub Project Page](https://eyeseetea.github.io/user-extended-app-blessed/)",
+            "This application has been funded by the the Norwegian Refugee Council (NRC), the WHO Global Malaria Programme, Samaritan’s Purse and Medecins Sans Frontières (MSF) to support countries in strengthening the collection and use of health data by using DHIS2. The application has been developed by [EyeSeeTea SL](http://eyeseetea.com). Source code, documentation and release notes can be found at the [EyeSeetea GitHub Project Page](https://eyeseetea.github.io/user-extended-app-blessed/)",
             { nsSeparator: false }
         ),
         i18n.t(
@@ -45,6 +45,9 @@ export const AboutPage: React.FC = React.memo(() => {
                     <div>
                         <Logo alt={i18n.t("Norwegian Refugee Council")} src="img/logo-nrc.svg" />
                     </div>
+                    <div>
+                        <Logo alt={i18n.t("MSF")} src="img/logo-msf.svg" />
+                    </div>
                 </LogoWrapper>
             </div>
         </StyledLanding>