Merge branch 'main' into 'master'

Fix address requires string literal i18n helpers See merge request gitlab-org/gitlab!70767

Merge branch 'main' into 'master'
Fix address requires string literal i18n helpers See merge request gitlab-org/gitlab!70767
2939a1c3 · Nicolò Maria Mezzopera · c16e6b76 · ee4394c4 · 2939a1c3
Commit 2939a1c3 authored Sep 21, 2021 by Nicolò Maria Mezzopera
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

app/assets/javascripts/packages_and_registries/package_registry/constants.js ...pts/packages_and_registries/package_registry/constants.js +2 -3

No files found.
--- a/app/assets/javascripts/packages_and_registries/package_registry/constants.js
+++ b/app/assets/javascripts/packages_and_registries/package_registry/constants.js
-/* eslint-disable @gitlab/require-string-literal-i18n-helpers */
-import { __, s__ } from '~/locale';
+import { s__ } from '~/locale';

 export const PACKAGE_TYPE_CONAN = 'CONAN';
 export const PACKAGE_TYPE_MAVEN = 'MAVEN';
@@ -71,7 +70,7 @@ export const DELETE_PACKAGE_ERROR_MESSAGE = s__(
  'PackageRegistry|Something went wrong while deleting the package.',
 );
 export const DELETE_PACKAGE_FILE_ERROR_MESSAGE = s__(
-  __('PackageRegistry|Something went wrong while deleting the package file.'),
+  'PackageRegistry|Something went wrong while deleting the package file.',
 );
 export const DELETE_PACKAGE_FILE_SUCCESS_MESSAGE = s__(
  'PackageRegistry|Package file deleted successfully',