Commit 4b89322e authored by scootergrisen's avatar scootergrisen Committed by Martin Wortschack

Remove "::" from namespace part of translation strings

parent d59ee459
...@@ -32,19 +32,19 @@ module Metrics ...@@ -32,19 +32,19 @@ module Metrics
def ending_at_after_starting_at def ending_at_after_starting_at
return if ending_at.blank? || starting_at.blank? || starting_at <= ending_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 end
def single_ownership def single_ownership
return if cluster.nil? ^ environment.nil? 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 end
def orphaned_annotation def orphaned_annotation
return if cluster.present? || environment.present? 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 end
end end
......
...@@ -30,7 +30,7 @@ module Metrics ...@@ -30,7 +30,7 @@ module Metrics
options[:environment] = environment options[:environment] = environment
success(options) success(options)
else 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
end end
...@@ -39,7 +39,7 @@ module Metrics ...@@ -39,7 +39,7 @@ module Metrics
options[:cluster] = cluster options[:cluster] = cluster
success(options) success(options)
else 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
end end
...@@ -51,7 +51,7 @@ module Metrics ...@@ -51,7 +51,7 @@ module Metrics
success(options) success(options)
rescue Gitlab::Template::Finders::RepoTemplateFinder::FileNotFoundError 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 end
def create(options) def create(options)
......
...@@ -27,7 +27,7 @@ module Metrics ...@@ -27,7 +27,7 @@ module Metrics
if Ability.allowed?(user, :delete_metrics_dashboard_annotation, annotation) if Ability.allowed?(user, :delete_metrics_dashboard_annotation, annotation)
success success
else 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
end end
...@@ -35,7 +35,7 @@ module Metrics ...@@ -35,7 +35,7 @@ module Metrics
if annotation.destroy if annotation.destroy
success success
else else
error(s_('Metrics::Dashboard::Annotation|Annotation has not been deleted')) error(s_('MetricsDashboardAnnotation|Annotation has not been deleted'))
end end
end end
end end
......
...@@ -35,7 +35,7 @@ module Metrics ...@@ -35,7 +35,7 @@ module Metrics
if Ability.allowed?(user, :create_metrics_user_starred_dashboard, project) if Ability.allowed?(user, :create_metrics_user_starred_dashboard, project)
success(user: user, project: project) success(user: user, project: project)
else 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
end end
...@@ -44,7 +44,7 @@ module Metrics ...@@ -44,7 +44,7 @@ module Metrics
options[:dashboard_path] = dashboard_path options[:dashboard_path] = dashboard_path
success(options) success(options)
else 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
end end
......
...@@ -21670,34 +21670,28 @@ msgstr "" ...@@ -21670,34 +21670,28 @@ msgstr ""
msgid "Metrics and profiling" msgid "Metrics and profiling"
msgstr "" 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 "" msgstr ""
msgid "Metrics::Dashboard::Annotation|Annotation has not been deleted" msgid "MetricsDashboardAnnotation|Annotation has not been deleted"
msgstr "" 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 "" msgstr ""
msgid "Metrics::Dashboard::Annotation|Dashboard with requested path can not be found" msgid "MetricsDashboardAnnotation|Dashboard with requested path can not be found"
msgstr "" 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 "" 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 "" msgstr ""
msgid "Metrics::Dashboard::Annotation|You are not authorized to delete this annotation" msgid "MetricsDashboardAnnotation|You are not authorized to delete this annotation"
msgstr "" msgstr ""
msgid "Metrics::Dashboard::Annotation|can't be before starting_at time" msgid "MetricsDashboardAnnotation|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"
msgstr "" msgstr ""
msgid "MetricsSettings|Add a button to the metrics dashboard linking directly to your existing external dashboard." msgid "MetricsSettings|Add a button to the metrics dashboard linking directly to your existing external dashboard."
...@@ -21724,6 +21718,12 @@ msgstr "" ...@@ -21724,6 +21718,12 @@ msgstr ""
msgid "MetricsSettings|User's local timezone" msgid "MetricsSettings|User's local timezone"
msgstr "" 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" msgid "Metrics|1. Define and preview panel"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment