Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit c4307db1b8, reversing
changes made to 5472f952d4.

lib/lang.js

@@ -6,7 +6,6 @@ import {
   de,
   el,
   enUS,
-  enGB,
   es,
   fi,
   fr,
@@ -45,8 +44,7 @@ export const languages = {
   'cs-CZ': { label: 'Čeština', display: 'cs' },
   'da-DK': { label: 'Dansk', display: 'da' },
   'de-DE': { label: 'Deutsch', display: 'de' },
-  'en-US': { label: 'English (US)', display: 'en' },
-  'en-GB': { label: 'English (UK)', display: 'en-GB'},
+  'en-US': { label: 'English', display: 'en' },
   'es-MX': { label: 'Español', display: 'es' },
   'fa-IR': { label: 'فارسی', display: 'fa' },
   'fo-FO': { label: 'Føroyskt', display: 'fo' },
@@ -69,7 +67,7 @@ export const languages = {
   'ru-RU': { label: 'Русский', display: 'ru' },
   'ro-RO': { label: 'Română', display: 'ro' },
   'sk-SK': { label: 'Slovenčina', display: 'sk' },
-  'sl-SI': { label: 'Slovenščina', display: 'sl' },
+  'sl-SI': { label: 'Slovene', display: 'sl' },
   'fi-FI': { label: 'Suomi', display: 'fi' },
   'sv-SE': { label: 'Svenska', display: 'sv' },
   'ta-IN': { label: 'தமிழ்', display: 'ta' },
@@ -82,7 +80,6 @@ export const rtlLocales = ['ar-SA', 'fa-IR'];
 export const dateLocales = {
   'ar-SA': arSA,
   'en-US': enUS,
-  'en-GB': enGB,
   'nl-NL': nl,
   'zh-CN': zhCN,
   'zh-TW': zhTW,

lib/queries.js

@@ -465,21 +465,15 @@ export function getEventMetrics(
   filters = {},
 ) {
   const params = [website_id, start_at, end_at];
-  const { url, event_type } = filters;
+  const { url } = filters;
 
   let urlFilter = '';
-  let eventTypeFilter = '';
 
   if (url) {
     urlFilter = `and url=$${params.length + 1}`;
     params.push(decodeURIComponent(url));
   }
 
-  if (event_type) {
-    eventTypeFilter = `and event_type=$${params.length + 1}`;
-    params.push(event_type);
-  }
-
   return rawQuery(
     `
     select
@@ -490,7 +484,6 @@ export function getEventMetrics(
     where website_id=$1
     and created_at between $2 and $3
     ${urlFilter}
-    ${eventTypeFilter}
     group by 1, 2
     order by 2
     `,