fix(about-page): render undefined date strings as "N/A" (v34)

dhis2 · Feb 24, 2020 · 132483c · 132483c
2 parents 98358cc + ace8cb5
commit 132483c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/i18n/module/i18n_module_en.properties b/i18n/module/i18n_module_en.properties
@@ -151,4 +151,6 @@ no=No
 
 password_changed_successfully=Password changed successfully
 login_again=You need to login again to continue using the application.
-login=Login
+login=Login
+never=Never
+invalid_date=Invalid date
diff --git a/src/aboutPage/AboutPage.component.js b/src/aboutPage/AboutPage.component.js
@@ -4,17 +4,25 @@ import PropTypes from 'prop-types';
 import AboutSection from './AboutSection.component';
 
 const parseDateFromUTCString = (utcString, d2) => {
-    const locale = d2.currentUser.userSettings.settings.keyUiLocale;
-    const date = new Date(utcString);
-    const options = {
-        day: 'numeric',
-        month: 'long',
-        year: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-        hour12: false,
-    };
-    return new Intl.DateTimeFormat(locale, options).format(date);
+    try {
+        if (!utcString) {
+            return d2.i18n.getTranslation('never')
+        }
+
+        const locale = d2.currentUser.userSettings.settings.keyUiLocale;
+        const date = new Date(utcString);
+        const options = {
+            day: 'numeric',
+            month: 'long',
+            year: 'numeric',
+            hour: '2-digit',
+            minute: '2-digit',
+            hour12: false,
+        };
+        return new Intl.DateTimeFormat(locale, options).format(date);    
+    } catch (error) {
+        return d2.i18n.getTranslation('invalid_date')
+    }
 };
 
 const attributes = {