Merge branch 'fix41' into 'master'

Remove "::" from namespace part of translation strings

See merge request gitlab-org/gitlab!70201

app/models/metrics/dashboard/annotation.rb

@@ -32,19 +32,19 @@ module Metrics
       def ending_at_after_starting_at
         return if ending_at.blank? || starting_at.blank? || starting_at <= ending_at
 
-        errors.add(:ending_at, s_("Metrics::Dashboard::Annotation|can't be before starting_at time"))
+        errors.add(:ending_at, s_("MetricsDashboardAnnotation|can't be before starting_at time"))
       end
 
       def single_ownership
         return if cluster.nil? ^ environment.nil?
 
-        errors.add(:base, s_("Metrics::Dashboard::Annotation|Annotation can't belong to both a cluster and an environment at the same time"))
+        errors.add(:base, s_("MetricsDashboardAnnotation|Annotation can't belong to both a cluster and an environment at the same time"))
       end
 
       def orphaned_annotation
         return if cluster.present? || environment.present?
 
-        errors.add(:base, s_("Metrics::Dashboard::Annotation|Annotation must belong to a cluster or an environment"))
+        errors.add(:base, s_("MetricsDashboardAnnotation|Annotation must belong to a cluster or an environment"))
       end
     end
   end

app/services/metrics/dashboard/annotations/create_service.rb

@@ -30,7 +30,7 @@ module Metrics
             options[:environment] = environment
             success(options)
           else
-            error(s_('Metrics::Dashboard::Annotation|You are not authorized to create annotation for selected environment'))
+            error(s_('MetricsDashboardAnnotation|You are not authorized to create annotation for selected environment'))
           end
         end
 
@@ -39,7 +39,7 @@ module Metrics
             options[:cluster] = cluster
             success(options)
           else
-            error(s_('Metrics::Dashboard::Annotation|You are not authorized to create annotation for selected cluster'))
+            error(s_('MetricsDashboardAnnotation|You are not authorized to create annotation for selected cluster'))
           end
         end
 
@@ -51,7 +51,7 @@ module Metrics
 
           success(options)
         rescue Gitlab::Template::Finders::RepoTemplateFinder::FileNotFoundError
-          error(s_('Metrics::Dashboard::Annotation|Dashboard with requested path can not be found'))
+          error(s_('MetricsDashboardAnnotation|Dashboard with requested path can not be found'))
         end
 
         def create(options)

app/services/metrics/dashboard/annotations/delete_service.rb

@@ -27,7 +27,7 @@ module Metrics
           if Ability.allowed?(user, :delete_metrics_dashboard_annotation, annotation)
             success
           else
-            error(s_('Metrics::Dashboard::Annotation|You are not authorized to delete this annotation'))
+            error(s_('MetricsDashboardAnnotation|You are not authorized to delete this annotation'))
           end
         end
 
@@ -35,7 +35,7 @@ module Metrics
           if annotation.destroy
             success
           else
-            error(s_('Metrics::Dashboard::Annotation|Annotation has not been deleted'))
+            error(s_('MetricsDashboardAnnotation|Annotation has not been deleted'))
           end
         end
       end

app/services/metrics/users_starred_dashboards/create_service.rb

@@ -35,7 +35,7 @@ module Metrics
         if Ability.allowed?(user, :create_metrics_user_starred_dashboard, project)
           success(user: user, project: project)
         else
-          error(s_('Metrics::UsersStarredDashboards|You are not authorized to add star to this dashboard'))
+          error(s_('MetricsUsersStarredDashboards|You are not authorized to add star to this dashboard'))
         end
       end
 
@@ -44,7 +44,7 @@ module Metrics
           options[:dashboard_path] = dashboard_path
           success(options)
         else
-          error(s_('Metrics::UsersStarredDashboards|Dashboard with requested path can not be found'))
+          error(s_('MetricsUsersStarredDashboards|Dashboard with requested path can not be found'))
         end
       end
 

locale/gitlab.pot

@@ -21670,34 +21670,28 @@ msgstr ""
 msgid "Metrics and profiling"
 msgstr ""
 
-msgid "Metrics::Dashboard::Annotation|Annotation can't belong to both a cluster and an environment at the same time"
+msgid "MetricsDashboardAnnotation|Annotation can't belong to both a cluster and an environment at the same time"
 msgstr ""
 
-msgid "Metrics::Dashboard::Annotation|Annotation has not been deleted"
+msgid "MetricsDashboardAnnotation|Annotation has not been deleted"
 msgstr ""
 
-msgid "Metrics::Dashboard::Annotation|Annotation must belong to a cluster or an environment"
+msgid "MetricsDashboardAnnotation|Annotation must belong to a cluster or an environment"
 msgstr ""
 
-msgid "Metrics::Dashboard::Annotation|Dashboard with requested path can not be found"
+msgid "MetricsDashboardAnnotation|Dashboard with requested path can not be found"
 msgstr ""
 
-msgid "Metrics::Dashboard::Annotation|You are not authorized to create annotation for selected cluster"
+msgid "MetricsDashboardAnnotation|You are not authorized to create annotation for selected cluster"
 msgstr ""
 
-msgid "Metrics::Dashboard::Annotation|You are not authorized to create annotation for selected environment"
+msgid "MetricsDashboardAnnotation|You are not authorized to create annotation for selected environment"
 msgstr ""
 
-msgid "Metrics::Dashboard::Annotation|You are not authorized to delete this annotation"
+msgid "MetricsDashboardAnnotation|You are not authorized to delete this annotation"
 msgstr ""
 
-msgid "Metrics::Dashboard::Annotation|can't be before starting_at time"
-msgstr ""
-
-msgid "Metrics::UsersStarredDashboards|Dashboard with requested path can not be found"
-msgstr ""
-
-msgid "Metrics::UsersStarredDashboards|You are not authorized to add star to this dashboard"
+msgid "MetricsDashboardAnnotation|can't be before starting_at time"
 msgstr ""
 
 msgid "MetricsSettings|Add a button to the metrics dashboard linking directly to your existing external dashboard."
@@ -21724,6 +21718,12 @@ msgstr ""
 msgid "MetricsSettings|User's local timezone"
 msgstr ""
 
+msgid "MetricsUsersStarredDashboards|Dashboard with requested path can not be found"
+msgstr ""
+
+msgid "MetricsUsersStarredDashboards|You are not authorized to add star to this dashboard"
+msgstr ""
+
 msgid "Metrics|1. Define and preview panel"
 msgstr ""