diff --git a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue index b2e96471769c58a6669c55a2551b3253018ab2e0..21d4f6f615fef674b67ab9c2d3d3da50cf8d2b45 100644 --- a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue +++ b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue @@ -175,11 +175,11 @@ export default { <gl-alert v-if="noDataAvailable" variant="info" - :title="s__('Code Coverage| Empty code coverage data')" + :title="s__('Code Coverage|No code coverage data')" :dismissible="false" > <span> - {{ __('It seems that there is currently no available data for code coverage') }} + {{ __('Code coverage results are not yet available. Try again later.') }} </span> </gl-alert> <gl-collapsible-listbox diff --git a/ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue b/ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue index 74be0e626a7569fd9e0b6f3f254f6ca01ee79c7c..e6d005b57d35432e8fd0ad08c5696e209aa451af 100644 --- a/ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue +++ b/ee/app/assets/javascripts/analytics/code_review_analytics/components/app.vue @@ -68,7 +68,7 @@ export default { <template v-if="!isLoading"> <gl-empty-state v-if="!totalItems" - :title="__(`You don't have any open merge requests`)" + :title="__(`No open merge requests`)" :primary-button-text="__('New merge request')" :primary-button-link="newMergeRequestUrl" :svg-path="emptyStateSvgPath" @@ -76,13 +76,7 @@ export default { > <template #description> <div class="gl-text-center"> - <p> - {{ - __( - 'Code Review Analytics displays a table of open merge requests considered to be in code review. There are currently no merge requests in review for this project and/or filters.', - ) - }} - </p> + <p>{{ __('Create a merge request, or edit your criteria and try again.') }}</p> </div> </template> </gl-empty-state> diff --git a/ee/spec/features/analytics/code_analytics_spec.rb b/ee/spec/features/analytics/code_analytics_spec.rb index e9071e564a5f5fb29b6428c85370f45382619aa9..c29cf064ba68d8952cbb31d25cf24f667d77eb93 100644 --- a/ee/spec/features/analytics/code_analytics_spec.rb +++ b/ee/spec/features/analytics/code_analytics_spec.rb @@ -46,7 +46,7 @@ it "shows empty state #{expect_button ? 'with' : 'without'} \"New merge request\" button" do visit project_analytics_code_reviews_path(project) - expect(page).to have_content("You don't have any open merge requests") + expect(page).to have_content("No open merge requests") if expect_button expect(page).to have_link('New merge request') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 061390a3cb11ea2014f0f1271fdbb3ecd22b421d..9fd674b6547f45e00d4a2ed157e6f6b1b97c3246 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12728,10 +12728,10 @@ msgstr "" msgid "Code Coverage: %{coveragePercentage}%{percentSymbol}" msgstr "" -msgid "Code Coverage| Empty code coverage data" +msgid "Code Coverage|Couldn't fetch the code coverage data" msgstr "" -msgid "Code Coverage|Couldn't fetch the code coverage data" +msgid "Code Coverage|No code coverage data" msgstr "" msgid "Code Owner" @@ -12752,9 +12752,6 @@ msgstr "" msgid "Code Review" msgstr "" -msgid "Code Review Analytics displays a table of open merge requests considered to be in code review. There are currently no merge requests in review for this project and/or filters." -msgstr "" - msgid "Code block" msgstr "" @@ -12764,6 +12761,9 @@ msgstr "" msgid "Code completion test was successful" msgstr "" +msgid "Code coverage results are not yet available. Try again later." +msgstr "" + msgid "Code coverage statistics for %{ref} %{start_date} - %{end_date}" msgstr "" @@ -15422,6 +15422,9 @@ msgstr "" msgid "Create a merge request branch target." msgstr "" +msgid "Create a merge request, or edit your criteria and try again." +msgstr "" + msgid "Create a new %{codeStart}.gitlab-ci.yml%{codeEnd} file at the root of the repository to get started." msgstr "" @@ -29098,9 +29101,6 @@ msgstr "" msgid "It seems like the Dependency Scanning job ran successfully, but no dependencies have been detected in your project." msgstr "" -msgid "It seems that there is currently no available data for code coverage" -msgstr "" - msgid "It's you" msgstr "" @@ -35012,6 +35012,9 @@ msgstr "" msgid "No more than %{max_work_items} work items can be modified at the same time." msgstr "" +msgid "No open merge requests" +msgstr "" + msgid "No options found" msgstr "" @@ -61382,9 +61385,6 @@ msgstr "" msgid "You don't have any authorized applications." msgstr "" -msgid "You don't have any open merge requests" -msgstr "" - msgid "You don't have any recent searches" msgstr ""