From e0eb1d7e5197d755e19a819443aa6b5f826e69c2 Mon Sep 17 00:00:00 2001
From: Barry Chen <chenba@gmail.com>
Date: Fri, 6 Apr 2018 13:18:53 -0500
Subject: [PATCH] Render shot capture time only when in browser. (#4288)

---
 .env.dev                           | 1 -
 Dockerfile                         | 1 -
 package.json                       | 1 -
 server/src/pages/shot/time-diff.js | 9 ++++-----
 server/src/pages/shot/view.js      | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.env.dev b/.env.dev
index 9640b5ea36..1c54025957 100644
--- a/.env.dev
+++ b/.env.dev
@@ -14,7 +14,6 @@ USER_SETTINGS=true
 ENABLE_ANNOTATIONS=true
 SCREENSHOTS_UPLOAD_BINARY=true
 
-export NODE_ICU_DATA="$(pwd)/node_modules/full-icu"
 # For false, unset or set to empty string
 export NO_UGLIFY=true
 export NODE_ENV=dev
diff --git a/Dockerfile b/Dockerfile
index 9737a3ced4..e7068c61ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,6 @@ COPY build/shared /app/build/shared
 COPY node_modules /app/node_modules
 COPY bin/_run-docker /app/bin/
 COPY build/screenshots.xpi /app/build/xpi/screenshots.xpi
-ENV NODE_ICU_DATA="/app/node_modules/full-icu"
 RUN cd app && npm install
 
 CMD /app/bin/_run-docker
diff --git a/package.json b/package.json
index 38c6bdfce8..688387f8c6 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "fluent-intl-polyfill": "0.1.0",
     "fluent-langneg": "0.1.0",
     "fluent-react": "0.4.1",
-    "full-icu": "1.2.1",
     "jpm": "1.3.1",
     "keygrip": "1.0.2",
     "mobile-detect": "1.3.7",
diff --git a/server/src/pages/shot/time-diff.js b/server/src/pages/shot/time-diff.js
index b594b37e05..f51aa57af0 100644
--- a/server/src/pages/shot/time-diff.js
+++ b/server/src/pages/shot/time-diff.js
@@ -61,17 +61,16 @@ exports.TimeDiff = class TimeDiff extends React.Component {
   }
 
   dateString(d) {
+    if (!this.state.useLocalTime) {
+      return "";
+    }
     if (!(d instanceof Date)) {
       d = new Date(d);
     }
-    if (this.props.userLocales && this.props.userLocales.length) {
-      return d.toLocaleString(this.props.userLocales[0]);
-    }
     return d.toLocaleString();
   }
 };
 
 exports.TimeDiff.propTypes = {
-  date: PropTypes.number,
-  userLocales: PropTypes.array
+  date: PropTypes.number
 }
diff --git a/server/src/pages/shot/view.js b/server/src/pages/shot/view.js
index bae2a1668c..2da716be11 100644
--- a/server/src/pages/shot/view.js
+++ b/server/src/pages/shot/view.js
@@ -331,7 +331,7 @@ class Body extends React.Component {
 
     const linkTextShort = shot.urlDisplay;
 
-    const timeDiff = <TimeDiff date={shot.createdDate} userLocales={this.props.userLocales} />;
+    const timeDiff = <TimeDiff date={shot.createdDate} />;
     let expiresDiff = null;
     if (this.props.isOwner) {
       expiresDiff = <span className="expire-widget">