undo fancy stuff - does not work

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>

components/metrics/MetricsBar.js

@@ -59,25 +59,13 @@ export default function MetricsBar({ websiteId, className }) {
       {data && !error && (
         <>
           <MetricCard
-            label={
+            label={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
-              <FormattedMessage
-                id="metrics.views"
-                defaultMessage="Views"
-                values={{ x: pageviews.value }}
-              />
-            }
             value={pageviews.value}
             change={pageviews.change}
             format={formatFunc}
           />
           <MetricCard
-            label={
+            label={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
-              <FormattedMessage
-                id="metrics.visitors"
-                defaultMessage="Visitors"
-                values={{ x: uniques.value }}
-              />
-            }
             value={uniques.value}
             change={uniques.change}
             format={formatFunc}

components/metrics/RealtimeHeader.js

@@ -32,46 +32,22 @@ export default function RealtimeHeader({ websites, data, websiteId, onSelect })
       </PageHeader>
       <div className={styles.metrics}>
         <MetricCard
-          label={
+          label={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
-            <FormattedMessage
-              id="metrics.views"
-              defaultMessage="Views"
-              values={{ x: pageviews.length }}
-            />
-          }
           value={pageviews.length}
           hideComparison
         />
         <MetricCard
-          label={
+          label={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
-            <FormattedMessage
-              id="metrics.visitors"
-              defaultMessage="Visitors"
-              values={{ x: sessions.length }}
-            />
-          }
           value={sessions.length}
           hideComparison
         />
         <MetricCard
-          label={
+          label={<FormattedMessage id="metrics.events" defaultMessage="Events" />}
-            <FormattedMessage
-              id="metrics.events"
-              defaultMessage="Events"
-              values={{ x: events.length }}
-            />
-          }
           value={events.length}
           hideComparison
         />
         <MetricCard
-          label={
+          label={<FormattedMessage id="metrics.countries" defaultMessage="Countries" />}
-            <FormattedMessage
-              id="metrics.countries"
-              defaultMessage="Countries"
-              values={{ x: countries.length }}
-            />
-          }
           value={countries.length}
           hideComparison
         />

lang/lt-LT.json

@@ -87,13 +87,13 @@
   "metrics.average-visit-time": "Vidutinė vizito trukmė",
   "metrics.bounce-rate": "Atmetimo rodiklis",
   "metrics.browsers": "Naršyklės",
-  "metrics.countries": "{x, plural, =0 {Šalių} zero {Šalių} one {Šalis} other {Šalys}}",
+  "metrics.countries": "Šalys",
   "metrics.device.desktop": "Desktop",
   "metrics.device.laptop": "Laptop",
   "metrics.device.mobile": "Mobilusis",
   "metrics.device.tablet": "Planšetė",
   "metrics.devices": "Įrenginiai",
-  "metrics.events": "{x, plural, =0 {Įvykių} zero {Įvykių} one {Įvykis} other {Įvykiai}}",
+  "metrics.events": "Įvykiai",
   "metrics.filter.combined": "Kombinuoti",
   "metrics.filter.domain-only": "Tik domenas",
   "metrics.filter.raw": "Neapdoroti",
@@ -103,6 +103,6 @@
   "metrics.pages": "Puslapiai",
   "metrics.referrers": "Referrers",
   "metrics.unique-visitors": "Unikalūs lankytojai",
-  "metrics.views": "{x, plural, =0 {Peržiūrų} zero {Peržiūrų} one {Peržiūra} other {Peržiūros}}",
+  "metrics.views": "Peržiūros",
-  "metrics.visitors": "{x, plural, =0 {Lankytojų} zero {Lankytojų} one {Lankytojas} other {Lankytojai}}"
+  "metrics.visitors": "Lankytojai"
 }