From b537acab49cfeef1fb8eb6554eeb50ec5b7a96f8 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 1 Dec 2022 08:27:52 -0800
Subject: [PATCH] FeatureFlags: enable i18n flag in the registry (#59662)

---
 conf/defaults.ini                                            | 5 ++++-
 .../setup-grafana/configure-grafana/feature-toggles/index.md | 2 +-
 pkg/services/featuremgmt/registry.go                         | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index c5977c38db9..651a287dfb4 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -1281,7 +1281,10 @@ license_path =
 # enable = feature1,feature2
 enable =
 
-internationalization = true
+# Some features are enabled by default, see:
+# https://grafana.com/docs/grafana/next/setup-grafana/configure-grafana/feature-toggles/
+# To enable features by default, set `Expression:  "true"` in:
+# https://github.com/grafana/grafana/blob/main/pkg/services/featuremgmt/registry.go
 
 # feature1 = true
 # feature2 = false
diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index e0bc2792205..bd44bd27723 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -29,7 +29,7 @@ Some stable features are enabled by default. You can disable a stable feature by
 | `commandPalette`             | Enable command palette                                                                                          | Yes                |
 | `cloudWatchDynamicLabels`    | Use dynamic labels instead of alias patterns in CloudWatch datasource                                           | Yes                |
 | `prometheusBufferedClient`   | Enable buffered (old) client for Prometheus datasource as default instead of streaming JSON parser client (new) |                    |
-| `internationalization`       | Enables internationalization                                                                                    |                    |
+| `internationalization`       | Enables internationalization                                                                                    | Yes                |
 | `accessTokenExpirationCheck` | Enable OAuth access_token expiration check and token refresh using the refresh_token                            |                    |
 
 ## Beta feature toggles
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 3a18cf85606..10035d8db75 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -268,6 +268,7 @@ var (
 			Name:        "internationalization",
 			Description: "Enables internationalization",
 			State:       FeatureStateStable,
+			Expression:  "true", // enabled by default
 		},
 		{
 			Name:        "topnav",