diff --git a/.drone.yml b/.drone.yml index bdfd25592eb..51f57ce2213 100644 --- a/.drone.yml +++ b/.drone.yml @@ -241,7 +241,6 @@ steps: image: node:20.9.0-alpine name: lint-frontend - commands: - - apk add --update git - |- make i18n-extract || (echo " Extraction failed. Make sure that you have no dynamic translation phrases, such as 't(\`preferences.theme.\$${themeID}\`, themeName)' and that no translation key is used twice. Search the output for '[warning]' to find the offending file." && false) @@ -252,8 +251,7 @@ steps: \ " depends_on: - yarn-install - failure: ignore - image: node:20.9.0-alpine + image: node:20-bookworm name: verify-i18n trigger: event: @@ -1625,7 +1623,6 @@ steps: image: node:20.9.0-alpine name: lint-frontend - commands: - - apk add --update git - |- make i18n-extract || (echo " Extraction failed. Make sure that you have no dynamic translation phrases, such as 't(\`preferences.theme.\$${themeID}\`, themeName)' and that no translation key is used twice. Search the output for '[warning]' to find the offending file." && false) @@ -1636,8 +1633,7 @@ steps: \ " depends_on: - yarn-install - failure: ignore - image: node:20.9.0-alpine + image: node:20-bookworm name: verify-i18n trigger: branch: main @@ -4923,3 +4919,8 @@ get: path: secret/data/common/gcr kind: secret name: gcr_credentials +--- +kind: signature +hmac: 7397697ccc703dc375a0f90ba8a12fd978c2972f37fdffbdca1f72ff3991b339 + +... diff --git a/Makefile b/Makefile index 14d68b2f7a6..0fbb59b9bba 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ ifeq ("$(wildcard $(ENTERPRISE_FE_EXT_FILE))","") ## if enterprise is not enable i18n-extract-enterprise: @echo "Skipping i18n extract for Enterprise: not enabled" else -i18n-extract-enterprise: $(SWAGGER) ## Generate API Swagger specification +i18n-extract-enterprise: @echo "Extracting i18n strings for Enterprise" yarn run i18next --config public/locales/i18next-parser-enterprise.config.cjs node ./public/locales/pseudo.mjs --mode enterprise diff --git a/public/app/core/utils/navBarItem-translations.ts b/public/app/core/utils/navBarItem-translations.ts index 5e010fb7a70..faafa9b00f9 100644 --- a/public/app/core/utils/navBarItem-translations.ts +++ b/public/app/core/utils/navBarItem-translations.ts @@ -265,7 +265,7 @@ export function getNavSubTitle(navId: string | undefined) { case 'admin': return t( 'nav.admin.subtitle', - 'Manage Alertmanager configurations and configure where alert instances generated from Grafana managed alert rules are sent' + 'Manage server-wide settings and access to resources such as organizations, users, and licenses' ); case 'cfg/general': return t('nav.config-general.subtitle', 'Manage default preferences and settings across Grafana'); diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index 200daaf3d90..dcba7b50053 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -887,8 +887,8 @@ "title": "Alerting" }, "alerting-admin": { - "title": "Settings", - "subtitle": "Manage Alertmanager configurations and configure where alert instances generated from Grafana managed alert rules are sent" + "subtitle": "Manage Alertmanager configurations and configure where alert instances generated from Grafana managed alert rules are sent", + "title": "Settings" }, "alerting-am-routes": { "subtitle": "Determine how alerts are routed to contact points", diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json index 4912c570e06..deb470d072b 100644 --- a/public/locales/pseudo-LOCALE/grafana.json +++ b/public/locales/pseudo-LOCALE/grafana.json @@ -887,6 +887,7 @@ "title": "Åľęřŧįʼnģ" }, "alerting-admin": { + "subtitle": "Mäʼnäģę Åľęřŧmäʼnäģęř čőʼnƒįģūřäŧįőʼnş äʼnđ čőʼnƒįģūřę ŵĥęřę äľęřŧ įʼnşŧäʼnčęş ģęʼnęřäŧęđ ƒřőm Ğřäƒäʼnä mäʼnäģęđ äľęřŧ řūľęş äřę şęʼnŧ", "title": "Ŝęŧŧįʼnģş" }, "alerting-am-routes": { diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 26070962065..0ab81fa57f0 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -644,13 +644,11 @@ def verify_i18n_step(): uncommited_error_message = "\nTranslation extraction has not been committed. Please run 'make i18n-extract', commit the changes and push again." return { "name": "verify-i18n", - "image": images["node"], + "image": images["node_deb"], "depends_on": [ "yarn-install", ], - "failure": "ignore", "commands": [ - "apk add --update git", "make i18n-extract || (echo \"{}\" && false)".format(extract_error_message), # Verify that translation extraction has been committed '''