Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: Add browser language to Site Traffic Explorer (#43161)

Alan Guo Xiang Tanec2755cedc5f
diff --git a/app/models/browser_pageview_event.rb b/app/models/browser_pageview_event.rb
index 75c474b8122..a9f32592848 100644
--- a/app/models/browser_pageview_event.rb
+++ b/app/models/browser_pageview_event.rb
@@ -5,6 +5,7 @@ class BrowserPageviewEvent < ActiveRecord::Base
MAX_URL_LENGTH = 2000
MAX_REFERRER_LENGTH = 2000
MAX_USER_AGENT_LENGTH = 1000
+ MAX_LANGUAGE_LENGTH = 255
MAX_NORMALIZED_REFERRER_LENGTH = 2000
MAX_NORMALIZED_URL_LENGTH = 2000
RETENTION_PERIOD = 3.months
@@ -174,6 +175,7 @@ class BrowserPageviewEvent < ActiveRecord::Base
asn: payload[:asn],
referrer: payload[:referrer]&.slice(0, MAX_REFERRER_LENGTH),
user_agent: payload[:user_agent]&.slice(0, MAX_USER_AGENT_LENGTH),
+ language: payload[:language]&.slice(0, MAX_LANGUAGE_LENGTH),
session_id: payload[:session_id]&.slice(0, MAX_SESSION_ID_LENGTH),
topic_id: payload[:topic_id],
source: payload[:source],
@@ -201,6 +203,7 @@ class BrowserPageviewEvent < ActiveRecord::Base
normalized_referrer: normalized_referrer&.slice(0, MAX_NORMALIZED_REFERRER_LENGTH),
normalized_referrer_version: BrowserPageviewEventUrlNormalizer::REFERRER_VERSION,
user_agent: user_agent,
+ language: payload[:language]&.slice(0, MAX_LANGUAGE_LENGTH),
browser: BROWSERS.fetch(BrowserDetection.browser(user_agent), BROWSER_UNKNOWN),
session_id: payload[:session_id]&.slice(0, MAX_SESSION_ID_LENGTH),
user_id: payload[:user_id],
@@ -269,6 +272,7 @@ class BrowserPageviewEvent < ActiveRecord::Base
self.url = url.slice(0, MAX_URL_LENGTH) if url.present?
self.referrer = referrer.slice(0, MAX_REFERRER_LENGTH) if referrer.present?
self.user_agent = user_agent.slice(0, MAX_USER_AGENT_LENGTH) if user_agent.present?
+ self.language = language.slice(0, MAX_LANGUAGE_LENGTH) if language.present?
self.session_id = session_id.slice(0, MAX_SESSION_ID_LENGTH) if session_id.present?
if normalized_referrer.present?
self.normalized_referrer = normalized_referrer.slice(0, MAX_NORMALIZED_REFERRER_LENGTH)
@@ -288,6 +292,7 @@ end
# browser :integer
# country_code :string(2)
# ip_address :inet not null
+# language :string(255)
# normalized_referrer :string(2000)
# normalized_referrer_version :integer
# normalized_url :string(2000)
diff --git a/app/services/admin_dashboard_site_traffic_explorer.rb b/app/services/admin_dashboard_site_traffic_explorer.rb
index 7184c91fb64..5c63d5c95cb 100644
--- a/app/services/admin_dashboard_site_traffic_explorer.rb
+++ b/app/services/admin_dashboard_site_traffic_explorer.rb
@@ -9,7 +9,17 @@ class AdminDashboardSiteTrafficExplorer
STATEMENT_TIMEOUT_MS = 10_000
private_constant :STATEMENT_TIMEOUT_MS
- FILTER_KEYS = %i[traffic_type top_url entry_url referrer country network browser ip].freeze
+ FILTER_KEYS = %i[
+ traffic_type
+ top_url
+ entry_url
+ referrer
+ country
+ network
+ browser
+ language
+ ip
+ ].freeze
FILTER_DIMENSIONS = {
top_url: "top_urls",
@@ -18,6 +28,7 @@ class AdminDashboardSiteTrafficExplorer
country: "countries",
network: "networks",
browser: "browsers",
+ language: "languages",
ip: "ip_addresses",
}.freeze
private_constant :FILTER_DIMENSIONS
@@ -38,6 +49,7 @@ class AdminDashboardSiteTrafficExplorer
attribute :country, :array
attribute :network, :array
attribute :browser, :array
+ attribute :language, :array
attribute :ip, :array
validates :start_date, :end_date, presence: true
@@ -64,7 +76,7 @@ class AdminDashboardSiteTrafficExplorer
end
def normalize_filter_value(key, value)
- return "" if key == :referrer && value == ""
+ return "" if %i[referrer language].include?(key) && value == ""
raise Discourse::InvalidParameters.new(key) if value.blank?
case key
@@ -87,6 +99,12 @@ class AdminDashboardSiteTrafficExplorer
browser = value.to_s
raise Discourse::InvalidParameters.new(key) if !BROWSER_VALUES.include?(browser)
browser
+ when :language
+ language = value.to_s
+ if language.length > BrowserPageviewEvent::MAX_LANGUAGE_LENGTH
+ raise Discourse::InvalidParameters.new(key)
+ end
+ language
when :ip
IPAddr.new(value.to_s).to_s
when :referrer
@@ -161,6 +179,8 @@ class AdminDashboardSiteTrafficExplorer
browser_filtered: filters[:browser].present?,
browsers:
filters[:browser]&.map { |browser| BrowserPageviewEvent.browsers.fetch(browser) } || [nil],
+ language_filtered: filters[:language].present?,
+ languages: filters[:language].presence || [nil],
ip_filtered: filters[:ip].present?,
ip_addresses: filters[:ip].presence || [nil],
traffic_type_filtered: filters[:traffic_type].present?,
@@ -183,6 +203,7 @@ class AdminDashboardSiteTrafficExplorer
country: "(NOT :country_filtered OR country_code IN (:countries))",
network: "(NOT :network_filtered OR asn IN (:network_asns))",
browser: "(NOT :browser_filtered OR browser IN (:browsers))",
+ language: "(NOT :language_filtered OR language IN (:languages))",
ip: "(NOT :ip_filtered OR host(ip_address) IN (:ip_addresses))",
traffic_type: <<~SQL.squish,
(
@@ -214,6 +235,7 @@ class AdminDashboardSiteTrafficExplorer
bpe.asn,
bpe.ip_address,
COALESCE(bpe.browser, #{BrowserPageviewEvent::BROWSER_UNKNOWN}) AS browser,
+ COALESCE(bpe.language, '') AS language,
bpe.score
FROM browser_pageview_events bpe
WHERE bpe.created_at >= :start_date
@@ -251,6 +273,7 @@ class AdminDashboardSiteTrafficExplorer
population.asn,
population.ip_address,
population.browser,
+ population.language,
(
population.normalized_referrer IS NULL
OR split_part(
@@ -275,6 +298,7 @@ class AdminDashboardSiteTrafficExplorer
classified.asn,
classified.ip_address,
classified.browser,
+ classified.language,
classified.likely_crawler,
CASE
WHEN classified.acquisition_entry THEN classified.normalized_url
@@ -540,6 +564,25 @@ class AdminDashboardSiteTrafficExplorer
LIMIT :dimension_limit
) rows
),
+ 'languages', (
+ SELECT COALESCE(
+ jsonb_agg(
+ jsonb_build_object('value', value, 'pageviews', pageviews)
+ ORDER BY pageviews DESC, value
+ ),
+ '[]'::jsonb
+ )
+ FROM (
+ SELECT
+ language AS value,
+ COUNT(*)::integer AS pageviews
+ FROM dimensioned
+ WHERE #{filter_predicate}
+ GROUP BY language
+ ORDER BY pageviews DESC, value
+ LIMIT :dimension_limit
+ ) rows
+ ),
'ip_addresses', (
SELECT COALESCE(
jsonb_agg(
@@ -661,6 +704,8 @@ class AdminDashboardSiteTrafficExplorer
network_label(value, representative_ip)
when "browsers"
I18n.t("browsers.#{value}", default: value)
+ when "languages"
+ value.presence || I18n.t("admin_site_traffic_explorer.unknown")
else
value
end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ea5e5934b0e..d2959a31b47 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -7371,6 +7371,9 @@ en:
browser:
one: "Filtering to %{count} browser"
other: "Filtering to %{count} browsers"
+ language:
+ one: "Filtering to %{count} language"
+ other: "Filtering to %{count} languages"
ip:
one: "Filtering to %{count} IP address"
other: "Filtering to %{count} IP addresses"
@@ -7397,6 +7400,7 @@ en:
top_urls: "Top URLs"
entry_urls: "Entry URLs"
browsers: "Browsers"
+ languages: "Languages"
ip_addresses: "IP addresses"
filters:
traffic_type: "Traffic type"
@@ -7406,6 +7410,7 @@ en:
country: "Country"
network: "Network"
browser: "Browser"
+ language: "Language"
ip: "IP address"
headline:
one: "%{formatted_count} pageview"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 2b862cc35aa..e7311b6afe1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1179,6 +1179,7 @@ en:
admin_site_traffic_explorer:
direct_or_unknown: "Direct / unknown"
+ unknown: "Unknown"
traffic_types:
logged_in: "Logged in"
anonymous: "Anonymous"
diff --git a/db/migrate/20260903065141_add_language_to_browser_pageview_events.rb b/db/migrate/20260903065141_add_language_to_browser_pageview_events.rb
new file mode 100644
index 00000000000..72f7acecef4
--- /dev/null
+++ b/db/migrate/20260903065141_add_language_to_browser_pageview_events.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class AddLanguageToBrowserPageviewEvents < ActiveRecord::Migration[8.0]
+ def change
+ add_column :browser_pageview_events, :language, :string, limit: 255
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 0fb7b805fc0..cbcc0b67800 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2111,7 +2111,8 @@ CREATE TABLE public.browser_pageview_events (
source smallint DEFAULT 1 NOT NULL,
normalized_url character varying(2000),
normalized_url_version integer,
- browser smallint
+ browser smallint,
+ language character varying(255)
);
@@ -24406,6 +24407,7 @@ ALTER TABLE ONLY public.ad_plugin_house_ads_groups
SET search_path TO "$user", public;
INSERT INTO "schema_migrations" (version) VALUES
+('20260903065141'),
('20260902150024'),
('20260901020329'),
('20260831162602'),
diff --git a/frontend/discourse/admin/components/site-traffic-explorer.gjs b/frontend/discourse/admin/components/site-traffic-explorer.gjs
index f1be6b352b5..cae3a2e597e 100644
--- a/frontend/discourse/admin/components/site-traffic-explorer.gjs
+++ b/frontend/discourse/admin/components/site-traffic-explorer.gjs
@@ -161,6 +161,7 @@ export default class SiteTrafficExplorer extends Component {
get visitorsTabs() {
return [
this.#tab({ dimension: "browsers", filter: "browser" }),
+ this.#tab({ dimension: "languages", filter: "language" }),
this.#tab({ dimension: "ip_addresses", filter: "ip" }),
];
}
diff --git a/frontend/discourse/admin/controllers/admin-site-traffic.js b/frontend/discourse/admin/controllers/admin-site-traffic.js
index 278dab205aa..24b18726e96 100644
--- a/frontend/discourse/admin/controllers/admin-site-traffic.js
+++ b/frontend/discourse/admin/controllers/admin-site-traffic.js
@@ -8,6 +8,7 @@ import {
VALID_PERIODS,
} from "discourse/admin/lib/dashboard-date-range";
import { countryName } from "discourse/admin/lib/format-country";
+import { languageName } from "discourse/admin/lib/format-language";
import { i18n } from "discourse-i18n";
const FILTER_KEYS = [
@@ -18,6 +19,7 @@ const FILTER_KEYS = [
"country",
"network",
"browser",
+ "language",
"ip",
];
@@ -36,6 +38,7 @@ const DIMENSION_KEYS = {
country: "countries",
network: "networks",
browser: "browsers",
+ language: "languages",
ip: "ip_addresses",
};
@@ -50,6 +53,7 @@ export default class AdminSiteTrafficController extends Controller {
@tracked country = null;
@tracked network = null;
@tracked browser = null;
+ @tracked language = null;
@tracked ip = null;
@tracked traffic = null;
@tracked fetchError = null;
@@ -138,17 +142,29 @@ export default class AdminSiteTrafficController extends Controller {
#decorateTraffic(traffic) {
const countries = traffic.dimensions?.countries ?? [];
- const activeFilters = (traffic.active_filters ?? []).map((filter) =>
- filter.key === "country"
- ? { ...filter, label: countryName(filter.value) }
- : filter
- );
+ const languages = traffic.dimensions?.languages ?? [];
+ const activeFilters = (traffic.active_filters ?? []).map((filter) => {
+ if (filter.key === "country") {
+ return { ...filter, label: countryName(filter.value) };
+ }
+ if (filter.key === "language") {
+ return {
+ ...filter,
+ label: languageName(filter.value) || filter.label,
+ };
+ }
+ return filter;
+ });
const dimensions = {
...traffic.dimensions,
countries: countries.map((row) => ({
...row,
label: countryName(row.value),
})),
+ languages: languages.map((row) => ({
+ ...row,
+ label: languageName(row.value) || row.label,
+ })),
};
for (const [filterKey, dimensionKey] of Object.entries(DIMENSION_KEYS)) {
diff --git a/frontend/discourse/admin/lib/format-language.js b/frontend/discourse/admin/lib/format-language.js
new file mode 100644
index 00000000000..e6af3dc41ac
--- /dev/null
+++ b/frontend/discourse/admin/lib/format-language.js
@@ -0,0 +1,19 @@
+import I18n from "discourse-i18n";
+
+export function languageName(language) {
+ if (!language) {
+ return "";
+ }
+
+ try {
+ const locale = I18n.currentBcp47Locale || "en";
+ return (
+ new Intl.DisplayNames([locale], {
+ type: "language",
+ languageDisplay: "standard",
+ }).of(language) || language
+ );
+ } catch {
+ return language;
+ }
+}
diff --git a/frontend/discourse/admin/routes/admin-site-traffic.js b/frontend/discourse/admin/routes/admin-site-traffic.js
index ca7cdd9fd43..48cb9fbc455 100644
--- a/frontend/discourse/admin/routes/admin-site-traffic.js
+++ b/frontend/discourse/admin/routes/admin-site-traffic.js
@@ -18,6 +18,7 @@ const FILTER_KEYS = [
"country",
"network",
"browser",
+ "language",
"ip",
];
@@ -35,6 +36,7 @@ export default class AdminSiteTrafficRoute extends DiscourseRoute {
country: { refreshModel: true },
network: { refreshModel: true },
browser: { refreshModel: true },
+ language: { refreshModel: true },
ip: { refreshModel: true },
};
#refreshTransition = null;
@@ -149,7 +151,7 @@ export default class AdminSiteTrafficRoute extends DiscourseRoute {
}
if (value === "") {
- return key === "referrer" ? [value] : [];
+ return ["referrer", "language"].includes(key) ? [value] : [];
}
if (value.startsWith("[")) {
diff --git a/frontend/discourse/app/lib/beacon-pageview.js b/frontend/discourse/app/lib/beacon-pageview.js
index 99f44d16c14..cecdfbaedf5 100644
--- a/frontend/discourse/app/lib/beacon-pageview.js
+++ b/frontend/discourse/app/lib/beacon-pageview.js
@@ -12,6 +12,7 @@ export function sendBeaconPageview({ sessionId, url, referrer, topicId }) {
session_id: sessionId,
url,
referrer,
+ language: navigator.language,
};
if (topicId) {
body.topic_id = topicId;
diff --git a/frontend/discourse/scripts/js/pageview.js b/frontend/discourse/scripts/js/pageview.js
index 5b7550f046c..1899bd6b62d 100644
--- a/frontend/discourse/scripts/js/pageview.js
+++ b/frontend/discourse/scripts/js/pageview.js
@@ -39,6 +39,7 @@ document.addEventListener("DOMContentLoaded", function () {
session_id: trackViewSessionId,
url: window.location.href,
referrer: document.referrer.length ? document.referrer : null,
+ language: navigator.language,
};
fetch(`${root}/srv/pv`, {
method: "POST",
diff --git a/frontend/discourse/tests/unit/admin/lib/format-language-test.js b/frontend/discourse/tests/unit/admin/lib/format-language-test.js
new file mode 100644
index 00000000000..eb1cf9126d1
--- /dev/null
+++ b/frontend/discourse/tests/unit/admin/lib/format-language-test.js
@@ -0,0 +1,33 @@
+import { module, test } from "qunit";
+import { languageName } from "discourse/admin/lib/format-language";
+import I18n from "discourse-i18n";
+
+module("Unit | Admin | Lib | format-language", function (hooks) {
+ let originalLocale;
+
+ hooks.beforeEach(function () {
+ originalLocale = I18n.locale;
+ I18n.locale = "en";
+ });
+
+ hooks.afterEach(function () {
+ I18n.locale = originalLocale;
+ });
+
+ test("formats browser language values", function (assert) {
+ const cases = [
+ [null, "", "missing language"],
+ ["en", "English", "base language"],
+ ["en-US", "English (United States)", "language with region"],
+ ["en-GB", "English (United Kingdom)", "regional dialect"],
+ ["zh-Hant-TW", "Chinese (Traditional, Taiwan)", "script and region"],
+ ["sr-Latn-RS", "Serbian (Latin, Serbia)", "non-default script"],
+ ["iw-IL", "Hebrew (Israel)", "legacy language code"],
+ ["not_a_locale", "not_a_locale", "malformed language"],
+ ];
+
+ for (const [language, expected, description] of cases) {
+ assert.strictEqual(languageName(language), expected, description);
+ }
+ });
+});
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 7d758a50614..ea372e35d89 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -743,6 +743,12 @@ class Middleware::RequestTracker
tracking_url = data["url"]&.slice(0, MAX_URL_LENGTH)
tracking_referrer = data["referrer"]&.slice(0, MAX_URL_LENGTH)
tracking_session_id = data["session_id"]&.slice(0, MAX_SESSION_ID_LENGTH)
+ tracking_language = data["language"]
+ if tracking_language.is_a?(String)
+ tracking_language = tracking_language.slice(0, BrowserPageviewEvent::MAX_LANGUAGE_LENGTH)
+ else
+ tracking_language = nil
+ end
user_agent = env["HTTP_USER_AGENT"]&.slice(0, MAX_USER_AGENT_LENGTH)
is_embed = data["embed"] == true
@@ -758,6 +764,7 @@ class Middleware::RequestTracker
tracking_url: tracking_url,
tracking_referrer: tracking_referrer,
tracking_session_id: tracking_session_id,
+ tracking_language: tracking_language,
user_agent: user_agent,
}
end
@@ -846,6 +853,7 @@ class Middleware::RequestTracker
asn: ip_info[:asn],
user_agent: data[:user_agent],
referrer: data[:tracking_referrer],
+ language: data[:tracking_language],
session_id: data[:tracking_session_id],
topic_id: data[:topic_id],
occurred_at: data[:occurred_at],
diff --git a/spec/lib/middleware/request_tracker_spec.rb b/spec/lib/middleware/request_tracker_spec.rb
index f0ec6206c44..773c6274f8f 100644
--- a/spec/lib/middleware/request_tracker_spec.rb
+++ b/spec/lib/middleware/request_tracker_spec.rb
@@ -1134,6 +1134,7 @@ RSpec.describe Middleware::RequestTracker do
SiteSetting.trigger_browser_pageview_events = true
DiscourseIpInfo.stubs(:get).returns(country_code: "US")
middleware = Middleware::RequestTracker.new(lambda { |env| [200, {}, ["OK"]] })
+ language = "en-US"
events =
DiscourseEvent.track_events(:beacon_browser_pageview) do
@@ -1142,6 +1143,7 @@ RSpec.describe Middleware::RequestTracker do
{
url: "https://test.com/t/topic/123",
referrer: "https://test.com/",
+ language:,
session_id: "abc123",
topic_id: 123,
},
@@ -1159,6 +1161,7 @@ RSpec.describe Middleware::RequestTracker do
event = events[0][:params].last
expect(event[:url]).to eq("https://test.com/t/topic/123")
expect(event[:referrer]).to eq("https://test.com/")
+ expect(event[:language]).to eq(language)
expect(event[:session_id]).to eq("abc123")
expect(event[:topic_id]).to eq(123)
expect(event[:country_code]).to eq("US")
@@ -1178,6 +1181,7 @@ RSpec.describe Middleware::RequestTracker do
{
url: "https://test.com/t/topic/123",
referrer: "https://test.com/",
+ language: "en-US",
session_id: "abc123",
topic_id: 123,
},
@@ -1189,6 +1193,7 @@ RSpec.describe Middleware::RequestTracker do
event = BrowserPageviewEvent.last
expect(event.url).to eq("https://test.com/t/topic/123")
expect(event.referrer).to eq("https://test.com/")
+ expect(event.language).to eq("en-US")
expect(event.session_id).to eq("abc123")
expect(event.topic_id).to eq(123)
expect(event.country_code).to eq("US")
diff --git a/spec/models/browser_pageview_event_spec.rb b/spec/models/browser_pageview_event_spec.rb
index ae4494c25be..ac03373b6bc 100644
--- a/spec/models/browser_pageview_event_spec.rb
+++ b/spec/models/browser_pageview_event_spec.rb
@@ -188,6 +188,7 @@ RSpec.describe BrowserPageviewEvent do
url: "a" * (described_class::MAX_URL_LENGTH + 1),
referrer: "a" * (described_class::MAX_REFERRER_LENGTH + 1),
user_agent: "a" * (described_class::MAX_USER_AGENT_LENGTH + 1),
+ language: "a" * (described_class::MAX_LANGUAGE_LENGTH + 1),
ip_address: "1.2.3.4",
session_id: "a" * (described_class::MAX_SESSION_ID_LENGTH + 1),
normalized_referrer: "a" * (described_class::MAX_NORMALIZED_REFERRER_LENGTH + 1),
@@ -196,6 +197,7 @@ RSpec.describe BrowserPageviewEvent do
expect(event.url.length).to eq(described_class::MAX_URL_LENGTH)
expect(event.referrer.length).to eq(described_class::MAX_REFERRER_LENGTH)
expect(event.user_agent.length).to eq(described_class::MAX_USER_AGENT_LENGTH)
+ expect(event.language.length).to eq(described_class::MAX_LANGUAGE_LENGTH)
expect(event.session_id.length).to eq(described_class::MAX_SESSION_ID_LENGTH)
expect(event.normalized_referrer.length).to eq(described_class::MAX_NORMALIZED_REFERRER_LENGTH)
end
@@ -211,6 +213,7 @@ RSpec.describe BrowserPageviewEvent do
asn: 12_345,
referrer: "https://www.example.com/path?utm_source=x",
user_agent: "Mozilla/5.0 Chrome/124.0 Safari/537.36 Edg/124.0",
+ language: "en-AU",
session_id: "xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx",
topic_id: 123,
source: described_class::SOURCE_BEACON,
@@ -245,6 +248,7 @@ RSpec.describe BrowserPageviewEvent do
expect(event.created_at).to eq_time(occurred_at)
expect(event.source).to eq("beacon")
expect(event.browser).to eq("edge")
+ expect(event.language).to eq("en-AU")
expect(described_class.queued_count).to eq(0)
end
diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
index c5d691c6602..9b9802a7ab9 100644
--- a/spec/requests/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -1571,6 +1571,7 @@ RSpec.describe Admin::DashboardController do
{ "value" => "chrome", "label" => "Google Chrome", "pageviews" => 2 },
{ "value" => "firefox", "label" => "Firefox", "pageviews" => 1 },
],
+ "languages" => [{ "value" => "", "label" => "Unknown", "pageviews" => 3 }],
"ip_addresses" => [
{ "value" => "192.0.2.1", "label" => "192.0.2.1", "pageviews" => 2 },
{ "value" => "198.51.100.2", "label" => "198.51.100.2", "pageviews" => 1 },
@@ -1775,6 +1776,7 @@ RSpec.describe Admin::DashboardController do
{ "value" => "chrome", "label" => "Google Chrome", "pageviews" => 1 },
{ "value" => "firefox", "label" => "Firefox", "pageviews" => 1 },
],
+ "languages" => [{ "value" => "", "label" => "Unknown", "pageviews" => 2 }],
"ip_addresses" => [
{ "value" => "192.0.2.1", "label" => "192.0.2.1", "pageviews" => 1 },
{ "value" => "198.51.100.2", "label" => "198.51.100.2", "pageviews" => 1 },
@@ -1871,6 +1873,7 @@ RSpec.describe Admin::DashboardController do
{ "value" => "AS64496", "label" => "Example Network (AS64496)", "pageviews" => 2 },
],
"browsers" => [{ "value" => "chrome", "label" => "Google Chrome", "pageviews" => 2 }],
+ "languages" => [{ "value" => "", "label" => "Unknown", "pageviews" => 2 }],
"ip_addresses" => [
{ "value" => "192.0.2.1", "label" => "192.0.2.1", "pageviews" => 2 },
],
@@ -1996,6 +1999,7 @@ RSpec.describe Admin::DashboardController do
{ "value" => "chrome", "label" => "Google Chrome", "pageviews" => 1 },
{ "value" => "firefox", "label" => "Firefox", "pageviews" => 1 },
],
+ "languages" => [{ "value" => "", "label" => "Unknown", "pageviews" => 2 }],
"ip_addresses" => [
{ "value" => "192.0.2.1", "label" => "192.0.2.1", "pageviews" => 1 },
{ "value" => "198.51.100.2", "label" => "198.51.100.2", "pageviews" => 1 },
diff --git a/spec/services/admin_dashboard_site_traffic_explorer_spec.rb b/spec/services/admin_dashboard_site_traffic_explorer_spec.rb
index 04849684153..a361b25df17 100644
--- a/spec/services/admin_dashboard_site_traffic_explorer_spec.rb
+++ b/spec/services/admin_dashboard_site_traffic_explorer_spec.rb
@@ -35,6 +35,10 @@ RSpec.describe AdminDashboardSiteTrafficExplorer do
]
end
+ let(:languages) do
+ [nil, "", nil, "fr", "en-US", "en-US", "en-US", "fr", "de", "zh-CN", "en-US"]
+ end
+
let!(:pageviews) do
browsers.each_with_index do |browser, index|
Fabricate(
@@ -46,6 +50,7 @@ RSpec.describe AdminDashboardSiteTrafficExplorer do
session_id: "browser-#{index}",
source: BrowserPageviewEvent::SOURCE_BEACON,
browser:,
+ language: languages[index],
created_at: Time.zone.local(2026, 5, 10, 10, index),
)
end
@@ -99,17 +104,24 @@ RSpec.describe AdminDashboardSiteTrafficExplorer do
expect(average_session_duration).to eq(1.0 / browsers.size)
end
- it "orders browser dimensions by pageviews" do
- browser_dimensions = result.traffic.dig(:dimensions, "browsers")
+ it "returns ordered browser and language dimensions with labels" do
+ dimensions = result.traffic.fetch(:dimensions)
- expect(browser_dimensions).to eq(
- [
+ expect(dimensions.slice("browsers", "languages")).to eq(
+ "browsers" => [
{ value: "unknown", label: "Unknown browser", pageviews: 4 },
{ value: "chrome", label: "Google Chrome", pageviews: 3 },
{ value: "safari", label: "Safari", pageviews: 2 },
{ value: "edge", label: "Microsoft Edge", pageviews: 1 },
{ value: "firefox", label: "Firefox", pageviews: 1 },
],
+ "languages" => [
+ { value: "en-US", label: "en-US", pageviews: 4 },
+ { value: "", label: "Unknown", pageviews: 3 },
+ { value: "fr", label: "fr", pageviews: 2 },
+ { value: "de", label: "de", pageviews: 1 },
+ { value: "zh-CN", label: "zh-CN", pageviews: 1 },
+ ],
)
end
@@ -141,7 +153,9 @@ RSpec.describe AdminDashboardSiteTrafficExplorer do
)
dimensions =
- described_class.call(params: params.merge(country: "US", browser: "chrome")).traffic[
+ described_class.call(
+ params: params.merge(country: "US", browser: "chrome", language: "en-US"),
+ ).traffic[
:dimensions
]
@@ -160,6 +174,7 @@ RSpec.describe AdminDashboardSiteTrafficExplorer do
"countries" => [{ value: "US", label: "United States", pageviews: 3 }],
"networks" => [{ value: "AS64496", label: "Example Network (AS64496)", pageviews: 3 }],
"browsers" => [{ value: "chrome", label: "Google Chrome", pageviews: 3 }],
+ "languages" => [{ value: "en-US", label: "en-US", pageviews: 3 }],
"ip_addresses" => [
{ value: "192.0.2.5", label: "192.0.2.5", pageviews: 1 },
{ value: "192.0.2.6", label: "192.0.2.6", pageviews: 1 },
diff --git a/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb b/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb
index 99899404ea7..99894b1a360 100644
--- a/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb
+++ b/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb
@@ -158,6 +158,7 @@ RSpec.describe "Admin Dashboard Redesign | Site Traffic Explorer" do
asn: 64_496,
ip_address: "192.0.2.1",
user_agent: chrome,
+ language: "en-US",
user_id: admin.id,
session_id: "logged-in-session",
normalized_referrer: "search.example/results?q=discourse",
@@ -170,6 +171,7 @@ RSpec.describe "Admin Dashboard Redesign | Site Traffic Explorer" do
asn: 64_496,
ip_address: "192.0.2.1",
user_agent: chrome,
+ language: "en-US",
user_id: admin.id,
session_id: "logged-in-session",
normalized_referrer: "test.localhost/latest",
@@ -182,6 +184,7 @@ RSpec.describe "Admin Dashboard Redesign | Site Traffic Explorer" do
asn: 64_497,
ip_address: "198.51.100.2",
user_agent: firefox,
+ language: "en-GB",
session_id: "anonymous-session",
created_at: "2026-05-11 10:00:00",
},
@@ -273,7 +276,10 @@ RSpec.describe "Admin Dashboard Redesign | Site Traffic Explorer" do
expect(traffic).to have_card_tabs(card: "acquisition", tabs: %w[Referrers Countries Networks])
expect(traffic).to have_card_tabs(card: "pages", tabs: ["Top URLs", "Entry URLs"])
- expect(traffic).to have_card_tabs(card: "visitors", tabs: ["Browsers", "IP addresses"])
+ expect(traffic).to have_card_tabs(
+ card: "visitors",
+ tabs: ["Browsers", "Languages", "IP addresses"],
+ )
expect(traffic).to have_row(card: "acquisition", label: "Direct / unknown", count: "2")
expect(traffic).to have_row(
card: "acquisition",
@@ -326,6 +332,24 @@ RSpec.describe "Admin Dashboard Redesign | Site Traffic Explorer" do
)
traffic.remove_filter("browser")
+ traffic.select_tab(card: "visitors", tab: "Languages")
+ expect(traffic).to have_row(card: "visitors", label: "English (United States)", count: "2")
+ expect(traffic).to have_row(card: "visitors", label: "English (United Kingdom)", count: "1")
+ traffic.filter_row(card: "visitors", label: "English (United States)")
+ expect(traffic).to have_filter_pill(dimension: "language", label: "English (United States)")
+ expect(page).to have_current_path(
+ "/admin/dashboard/site-traffic-explorer?end_date=2026-05-12&language=en-US&range=custom&start_date=2026-05-01",
+ )
+ traffic.remove_filter("language")
+
+ traffic.select_tab(card: "visitors", tab: "Languages")
+ traffic.filter_row(card: "visitors", label: "Unknown")
+ expect(traffic).to have_filter_pill(dimension: "language", label: "Unknown")
+ expect(page).to have_current_path(
+ "/admin/dashboard/site-traffic-explorer?end_date=2026-05-12&language=&range=custom&start_date=2026-05-01",
+ )
+ traffic.remove_filter("language")
+
traffic.select_tab(card: "acquisition", tab: "Countries")
traffic.filter_row(card: "acquisition", label: "United States")
expect(traffic).to have_filter_pill(dimension: "country", label: "United States")
diff --git a/spec/system/page_objects/pages/admin_site_traffic_explorer.rb b/spec/system/page_objects/pages/admin_site_traffic_explorer.rb
index 87733f81a19..4bc32fa40c9 100644
--- a/spec/system/page_objects/pages/admin_site_traffic_explorer.rb
+++ b/spec/system/page_objects/pages/admin_site_traffic_explorer.rb
@@ -18,6 +18,7 @@ module PageObjects
"country" => "Country",
"network" => "Network",
"browser" => "Browser",
+ "language" => "Language",
"ip" => "IP address",
}.freeze
diff --git a/spec/system/request_tracker_spec.rb b/spec/system/request_tracker_spec.rb
index 31237c1772c..566ffb48382 100644
--- a/spec/system/request_tracker_spec.rb
+++ b/spec/system/request_tracker_spec.rb
@@ -479,6 +479,7 @@ describe "Request tracking" do
end
expect(beacon_event[:session_id]).to eq(non_beacon_event[:session_id])
+ expect(beacon_event[:language]).to eq(page.evaluate_script("navigator.language"))
all_events =
DiscourseEvent.track_events do
@@ -752,6 +753,8 @@ describe "Request tracking" do
expect(event[:session_id]).to be_present
expect(event[:topic_id]).to eq(topic.id)
end
+
+ expect(beacon_event[:language]).to eq(page.evaluate_script("navigator.language"))
end
end