Merge branch 'eread/improve-badges-ui-text' into 'master'

Improve badges UI text

See merge request gitlab-org/gitlab!50351

app/assets/javascripts/badges/components/badge_form.vue

@@ -51,7 +51,7 @@ export default {
         .map(placeholder => `<code>%{${placeholder}}</code>`)
         .join(', ');
       return sprintf(
-        s__('Badges|The %{docsLinkStart}variables%{docsLinkEnd} GitLab supports: %{placeholders}'),
+        s__('Badges|Supported %{docsLinkStart}variables%{docsLinkEnd}: %{placeholders}'),
         {
           docsLinkEnd: '</a>',
           docsLinkStart: `<a href="${escape(this.docsUrl)}">`,
@@ -105,13 +105,13 @@ export default {
     badgeImageUrlExample() {
       const exampleUrl =
         'https://example.gitlab.com/%{project_path}/badges/%{default_branch}/pipeline.svg';
-      return sprintf(s__('Badges|e.g. %{exampleUrl}'), {
+      return sprintf(s__('Badges|Example: %{exampleUrl}'), {
         exampleUrl,
       });
     },
     badgeLinkUrlExample() {
       const exampleUrl = 'https://example.gitlab.com/%{project_path}';
-      return sprintf(s__('Badges|e.g. %{exampleUrl}'), {
+      return sprintf(s__('Badges|Example: %{exampleUrl}'), {
         exampleUrl,
       });
     },
@@ -134,7 +134,7 @@ export default {
       if (this.isEditing) {
         return this.saveBadge()
           .then(() => {
-            createFlash(s__('Badges|The badge was saved.'), 'notice');
+            createFlash(s__('Badges|Badge saved.'), 'notice');
             this.wasValidated = false;
           })
           .catch(error => {
@@ -147,7 +147,7 @@ export default {
 
       return this.addBadge()
         .then(() => {
-          createFlash(s__('Badges|A new badge was added.'), 'notice');
+          createFlash(s__('Badges|New badge added.'), 'notice');
           this.wasValidated = false;
         })
         .catch(error => {
@@ -183,7 +183,7 @@ export default {
         required
         @input="debouncedPreview"
       />
-      <div class="invalid-feedback">{{ s__('Badges|Please fill in a valid URL') }}</div>
+      <div class="invalid-feedback">{{ s__('Badges|Enter a valid URL') }}</div>
       <span class="form-text text-muted">{{ badgeLinkUrlExample }}</span>
     </div>
 
@@ -198,7 +198,7 @@ export default {
         required
         @input="debouncedPreview"
       />
-      <div class="invalid-feedback">{{ s__('Badges|Please fill in a valid URL') }}</div>
+      <div class="invalid-feedback">{{ s__('Badges|Enter a valid URL') }}</div>
       <span class="form-text text-muted">{{ badgeImageUrlExample }}</span>
     </div>
 

app/views/groups/edit.html.haml

@@ -35,8 +35,8 @@
     %button.btn.gl-button.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = s_('GroupSettings|Customize your group badges.')
-      = link_to s_('GroupSettings|Learn more about badges.'), help_page_path('user/project/badges')
+      = s_('GroupSettings|Customize this group\'s badges.')
+      = link_to s_('GroupSettings|What are badges?'), help_page_path('user/project/badges')
   .settings-content
     = render 'shared/badges/badge_settings'
 

app/views/projects/edit.html.haml

@@ -52,8 +52,8 @@
     %button.btn.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = s_('ProjectSettings|Customize your project badges.')
-      = link_to s_('ProjectSettings|Learn more about badges.'), help_page_path('user/project/badges')
+      = s_('ProjectSettings|Customize this project\'s badges.')
+      = link_to s_('ProjectSettings|What are badges?'), help_page_path('user/project/badges')
   .settings-content
     = render 'shared/badges/badge_settings'
 

changelogs/unreleased/eread-improve-badges-ui-text.yml

+---
+title: Improve badges UI text
+merge_request: 50351
+author:
+type: other

locale/gitlab.pot

@@ -4283,9 +4283,6 @@ msgstr ""
 msgid "Badges"
 msgstr ""
 
-msgid "Badges|A new badge was added."
-msgstr ""
-
 msgid "Badges|Add badge"
 msgstr ""
 
@@ -4298,12 +4295,21 @@ msgstr ""
 msgid "Badges|Badge image preview"
 msgstr ""
 
+msgid "Badges|Badge saved."
+msgstr ""
+
 msgid "Badges|Delete badge?"
 msgstr ""
 
 msgid "Badges|Deleting the badge failed, please try again."
 msgstr ""
 
+msgid "Badges|Enter a valid URL"
+msgstr ""
+
+msgid "Badges|Example: %{exampleUrl}"
+msgstr ""
+
 msgid "Badges|Group Badge"
 msgstr ""
 
@@ -4313,13 +4319,13 @@ msgstr ""
 msgid "Badges|Name"
 msgstr ""
 
-msgid "Badges|No badge image"
+msgid "Badges|New badge added."
 msgstr ""
 
-msgid "Badges|No image to preview"
+msgid "Badges|No badge image"
 msgstr ""
 
-msgid "Badges|Please fill in a valid URL"
+msgid "Badges|No image to preview"
 msgstr ""
 
 msgid "Badges|Project Badge"
@@ -4334,15 +4340,12 @@ msgstr ""
 msgid "Badges|Saving the badge failed, please check the entered URLs and try again."
 msgstr ""
 
-msgid "Badges|The %{docsLinkStart}variables%{docsLinkEnd} GitLab supports: %{placeholders}"
+msgid "Badges|Supported %{docsLinkStart}variables%{docsLinkEnd}: %{placeholders}"
 msgstr ""
 
 msgid "Badges|The badge was deleted."
 msgstr ""
 
-msgid "Badges|The badge was saved."
-msgstr ""
-
 msgid "Badges|This group has no badges"
 msgstr ""
 
@@ -4355,9 +4358,6 @@ msgstr ""
 msgid "Badges|Your badges"
 msgstr ""
 
-msgid "Badges|e.g. %{exampleUrl}"
-msgstr ""
-
 msgid "Balsamiq file could not be loaded."
 msgstr ""
 
@@ -13793,7 +13793,7 @@ msgstr ""
 msgid "GroupSettings|Custom project templates"
 msgstr ""
 
-msgid "GroupSettings|Customize your group badges."
+msgid "GroupSettings|Customize this group's badges."
 msgstr ""
 
 msgid "GroupSettings|Default to Auto DevOps pipeline for all projects within this group"
@@ -13817,9 +13817,6 @@ msgstr ""
 msgid "GroupSettings|Integrations configured here will automatically apply to all projects in this group."
 msgstr ""
 
-msgid "GroupSettings|Learn more about badges."
-msgstr ""
-
 msgid "GroupSettings|Learn more about group-level project templates."
 msgstr ""
 
@@ -13880,6 +13877,9 @@ msgstr ""
 msgid "GroupSettings|Transfer group"
 msgstr ""
 
+msgid "GroupSettings|What are badges?"
+msgstr ""
+
 msgid "GroupSettings|You can only transfer the group to a group you manage."
 msgstr ""
 
@@ -21832,7 +21832,7 @@ msgstr ""
 msgid "ProjectSettings|Container registry"
 msgstr ""
 
-msgid "ProjectSettings|Customize your project badges."
+msgid "ProjectSettings|Customize this project's badges."
 msgstr ""
 
 msgid "ProjectSettings|Disable email notifications"
@@ -21901,9 +21901,6 @@ msgstr ""
 msgid "ProjectSettings|LFS objects from this repository are still available to forks. %{linkStart}How do I remove them?%{linkEnd}"
 msgstr ""
 
-msgid "ProjectSettings|Learn more about badges."
-msgstr ""
-
 msgid "ProjectSettings|Lightweight issue tracking system for this project"
 msgstr ""
 
@@ -22051,6 +22048,9 @@ msgstr ""
 msgid "ProjectSettings|View project analytics"
 msgstr ""
 
+msgid "ProjectSettings|What are badges?"
+msgstr ""
+
 msgid "ProjectSettings|When approved for merge, merge requests are queued and pipelines validate the combined results of the source and target branches before merge."
 msgstr ""