Commit 6d5734cb authored by Amy Qualls's avatar Amy Qualls Committed by Andrew Fontaine

Revise 'once' to 'after' in UI messages

parent 8f59ae21
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
return sprintf( return sprintf(
s__(`AdminProjects| s__(`AdminProjects|
You’re about to permanently delete the project %{projectName}, its repository, You’re about to permanently delete the project %{projectName}, its repository,
and all related resources, including issues and merge requests. Once you confirm and press and all related resources, including issues and merge requests. After you confirm and press
%{strong_start}Delete project%{strong_end}, it cannot be undone or recovered.`), %{strong_start}Delete project%{strong_end}, it cannot be undone or recovered.`),
{ {
projectName: `<strong>${escape(this.projectName)}</strong>`, projectName: `<strong>${escape(this.projectName)}</strong>`,
......
...@@ -42,7 +42,7 @@ export default { ...@@ -42,7 +42,7 @@ export default {
strings: { strings: {
alertTitle: __('You are about to permanently delete this project'), alertTitle: __('You are about to permanently delete this project'),
alertBody: __( alertBody: __(
'Once a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its repositories and %{strongStart}all related resources%{strongEnd}, including issues, merge requests etc.', 'After a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its repositories and %{strongStart}all related resources%{strongEnd}, including issues, merge requests etc.',
), ),
isNotForkMessage: __( isNotForkMessage: __(
'This project is %{strongStart}NOT%{strongEnd} a fork, and has the following:', 'This project is %{strongStart}NOT%{strongEnd} a fork, and has the following:',
......
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
strings: { strings: {
alertTitle: __('You are about to permanently delete this project'), alertTitle: __('You are about to permanently delete this project'),
alertBody: __( alertBody: __(
"Once a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. You will lose this project's repository and %{strongStart}all related resources%{strongEnd}, including issues and merge requests.", "After a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. You will lose this project's repository and %{strongStart}all related resources%{strongEnd}, including issues and merge requests.",
), ),
helpLabel: __('Recovering projects'), helpLabel: __('Recovering projects'),
recoveryMessage: __('You can recover this project until %{date}'), recoveryMessage: __('You can recover this project until %{date}'),
......
...@@ -77,7 +77,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = ` ...@@ -77,7 +77,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = `
4 stars 4 stars
</li> </li>
</ul> </ul>
Once a project is permanently deleted, it After a project is permanently deleted, it
<strong> <strong>
cannot be recovered cannot be recovered
</strong> </strong>
......
...@@ -2397,7 +2397,7 @@ msgstr "" ...@@ -2397,7 +2397,7 @@ msgstr ""
msgid "AdminDashboard|Error loading the statistics. Please try again" msgid "AdminDashboard|Error loading the statistics. Please try again"
msgstr "" msgstr ""
msgid "AdminProjects| You’re about to permanently delete the project %{projectName}, its repository, and all related resources, including issues and merge requests. Once you confirm and press %{strong_start}Delete project%{strong_end}, it cannot be undone or recovered." msgid "AdminProjects| You’re about to permanently delete the project %{projectName}, its repository, and all related resources, including issues and merge requests. After you confirm and press %{strong_start}Delete project%{strong_end}, it cannot be undone or recovered."
msgstr "" msgstr ""
msgid "AdminProjects|Delete" msgid "AdminProjects|Delete"
...@@ -2937,6 +2937,12 @@ msgstr "" ...@@ -2937,6 +2937,12 @@ msgstr ""
msgid "AdvancedSearch|Reindex required" msgid "AdvancedSearch|Reindex required"
msgstr "" msgstr ""
msgid "After a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its repositories and %{strongStart}all related resources%{strongEnd}, including issues, merge requests etc."
msgstr ""
msgid "After a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. You will lose this project's repository and %{strongStart}all related resources%{strongEnd}, including issues and merge requests."
msgstr ""
msgid "After a successful password update you will be redirected to login screen." msgid "After a successful password update you will be redirected to login screen."
msgstr "" msgstr ""
...@@ -24182,12 +24188,6 @@ msgstr "" ...@@ -24182,12 +24188,6 @@ msgstr ""
msgid "OnDemandScans|You must create a repository within your project to run an on-demand scan." msgid "OnDemandScans|You must create a repository within your project to run an on-demand scan."
msgstr "" msgstr ""
msgid "Once a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its repositories and %{strongStart}all related resources%{strongEnd}, including issues, merge requests etc."
msgstr ""
msgid "Once a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. You will lose this project's repository and %{strongStart}all related resources%{strongEnd}, including issues and merge requests."
msgstr ""
msgid "Once imported, repositories can be mirrored over SSH. Read more %{link_start}here%{link_end}." msgid "Once imported, repositories can be mirrored over SSH. Read more %{link_start}here%{link_end}."
msgstr "" msgstr ""
......
...@@ -77,7 +77,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = ` ...@@ -77,7 +77,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = `
4 stars 4 stars
</li> </li>
</ul> </ul>
Once a project is permanently deleted, it After a project is permanently deleted, it
<strong> <strong>
cannot be recovered cannot be recovered
</strong> </strong>
......
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