From 9f342f5f0678046bbea0b2dc931cd54b49f5643a Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Thu, 30 Mar 2023 15:04:50 -0600 Subject: [PATCH] Clarify error message --- app/assets/javascripts/diffs/i18n.js | 2 +- locale/gitlab.pot | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/diffs/i18n.js b/app/assets/javascripts/diffs/i18n.js index 95155181c78ccc..e233a0cef0a0a8 100644 --- a/app/assets/javascripts/diffs/i18n.js +++ b/app/assets/javascripts/diffs/i18n.js @@ -2,7 +2,7 @@ import { __, s__ } from '~/locale'; export const GENERIC_ERROR = __('Something went wrong on our end. Please try again!'); export const LOAD_SINGLE_DIFF_FAILED = s__( - 'MergeRequest|Encountered an issue while trying to fetch the single file diff.', + "MergeRequest|Can't fetch the diff needed to update this view. Please reload this page.", ); export const DISCUSSION_SINGLE_DIFF_FAILED = s__( "MergeRequest|Can't fetch the single file diff for the discussion. Please reload this page.", diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 390b550a29f637..57770c6c814276 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -27322,6 +27322,9 @@ msgstr "" msgid "MergeRequest|Approved by @%{username}" msgstr "" +msgid "MergeRequest|Can't fetch the diff needed to update this view. Please reload this page." +msgstr "" + msgid "MergeRequest|Can't fetch the single file diff for the discussion. Please reload this page." msgstr "" @@ -27340,9 +27343,6 @@ msgstr "" msgid "MergeRequest|Compare %{target} and %{source}" msgstr "" -msgid "MergeRequest|Encountered an issue while trying to fetch the single file diff." -msgstr "" - msgid "MergeRequest|Error dismissing suggestion popover. Please try again." msgstr "" -- GitLab