Merge branch 'scootergrisen/gitlab-fix40'

app/assets/javascripts/behaviors/preview_markdown.js

@@ -81,7 +81,7 @@ MarkdownPreview.prototype.fetchMarkdownPreview = function (text, url, success) {
     })
     .catch(() =>
       createFlash({
-        message: __('An error occurred while fetching markdown preview'),
+        message: __('An error occurred while fetching Markdown preview'),
       }),
     );
 };

app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue

@@ -25,7 +25,7 @@ export default {
     lazy: true,
   },
   translations: {
-    cronPlaceholder: __('* * * * *'),
+    cronPlaceholder: '* * * * *',
     cronSyntaxInstructions: __(
       'Define a custom deploy freeze pattern with %{cronSyntaxStart}cron syntax%{cronSyntaxEnd}',
     ),

app/assets/javascripts/pipelines/components/pipelines_list/tokens/constants.js

@@ -2,51 +2,51 @@ import { s__ } from '~/locale';
 
 export const PIPELINE_SOURCES = [
   {
-    text: s__('Pipeline|Source|Push'),
+    text: s__('PipelineSource|Push'),
     value: 'push',
   },
   {
-    text: s__('Pipeline|Source|Web'),
+    text: s__('PipelineSource|Web'),
     value: 'web',
   },
   {
-    text: s__('Pipeline|Source|Trigger'),
+    text: s__('PipelineSource|Trigger'),
     value: 'trigger',
   },
   {
-    text: s__('Pipeline|Source|Schedule'),
+    text: s__('PipelineSource|Schedule'),
     value: 'schedule',
   },
   {
-    text: s__('Pipeline|Source|API'),
+    text: s__('PipelineSource|API'),
     value: 'api',
   },
   {
-    text: s__('Pipeline|Source|External'),
+    text: s__('PipelineSource|External'),
     value: 'external',
   },
   {
-    text: s__('Pipeline|Source|Pipeline'),
+    text: s__('PipelineSource|Pipeline'),
     value: 'pipeline',
   },
   {
-    text: s__('Pipeline|Source|Chat'),
+    text: s__('PipelineSource|Chat'),
     value: 'chat',
   },
   {
-    text: s__('Pipeline|Source|Web IDE'),
+    text: s__('PipelineSource|Web IDE'),
     value: 'webide',
   },
   {
-    text: s__('Pipeline|Source|Merge Request'),
+    text: s__('PipelineSource|Merge Request'),
     value: 'merge_request_event',
   },
   {
-    text: s__('Pipeline|Source|External Pull Request'),
+    text: s__('PipelineSource|External Pull Request'),
     value: 'external_pull_request_event',
   },
   {
-    text: s__('Pipeline|Source|Parent Pipeline'),
+    text: s__('PipelineSource|Parent Pipeline'),
     value: 'parent_pipeline',
   },
 ];

app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue

@@ -97,7 +97,7 @@ export default {
             });
           })
           .catch(() => {
-            this.previewContent = __('An error occurred while fetching markdown preview');
+            this.previewContent = __('An error occurred while fetching Markdown preview');
             this.isLoading = false;
           });
       }

app/assets/javascripts/vue_shared/components/markdown/field.vue

@@ -254,7 +254,7 @@ export default {
         .then(() => $(this.$refs['markdown-preview']).renderGFM())
         .catch(() =>
           createFlash({
-            message: __('Error rendering markdown preview'),
+            message: __('Error rendering Markdown preview'),
           }),
         );
     },

app/helpers/search_helper.rb

@@ -87,9 +87,9 @@ module SearchHelper
 
   def search_entries_info_template(collection)
     if collection.total_pages > 1
-      s_("SearchResults|Showing %{from} - %{to} of %{count} %{scope} for%{term_element}").html_safe
+      s_("SearchResults|Showing %{from} - %{to} of %{count} %{scope} for %{term_element}").html_safe
     else
-      s_("SearchResults|Showing %{count} %{scope} for%{term_element}").html_safe
+      s_("SearchResults|Showing %{count} %{scope} for %{term_element}").html_safe
     end
   end
 

app/views/devise/mailer/_confirmation_instructions_secondary.text.erb

-<%= _(" %{name},  confirm your email address now! ") % { name: @resource.user.name } %>
+<%= _("%{name}, confirm your email address now!") % { name: @resource.user.name } %>
 
 <%= _("Use the link below to confirm your email address (%{email})") % { email: @resource.email } %>
 

ee/app/assets/javascripts/pipelines/components/pipelines_list/tokens/constants.js

@@ -3,11 +3,11 @@ import { PIPELINE_SOURCES as CE_PIPELINE_SOURCES } from '~/pipelines/components/
 
 const EE_PIPELINE_SOURCES = [
   {
-    text: s__('Pipeline|Source|On-Demand DAST Scan'),
+    text: s__('PipelineSource|On-Demand DAST Scan'),
     value: 'ondemand_dast_scan',
   },
   {
-    text: s__('Pipeline|Source|On-Demand DAST Validation'),
+    text: s__('PipelineSource|On-Demand DAST Validation'),
     value: 'ondemand_dast_validation',
   },
   {

ee/app/helpers/ee/search_helper.rb

@@ -63,9 +63,9 @@ module EE
       return super unless gitlab_com_snippet_db_search?
 
       if collection.total_pages > 1
-        s_("SearchResults|Showing %{from} - %{to} of %{count} %{scope} for%{term_element} in your personal and project snippets").html_safe
+        s_("SearchResults|Showing %{from} - %{to} of %{count} %{scope} for %{term_element} in your personal and project snippets").html_safe
       else
-        s_("SearchResults|Showing %{count} %{scope} for%{term_element} in your personal and project snippets").html_safe
+        s_("SearchResults|Showing %{count} %{scope} for %{term_element} in your personal and project snippets").html_safe
       end
     end
 

ee/spec/helpers/search_helper_spec.rb

@@ -149,7 +149,7 @@ RSpec.describe SearchHelper do
     let(:show_snippets) { true }
     let(:collection) { Kaminari.paginate_array([:foo]).page(1).per(10) }
     let(:user) { create(:user) }
-    let(:message) { "Showing %{count} %{scope} for%{term_element}" }
+    let(:message) { "Showing %{count} %{scope} for %{term_element}" }
     let(:new_message) { message + " in your personal and project snippets" }
 
     subject { search_entries_info_template(collection) }

lib/gitlab/email/message/in_product_marketing/trial.rb

@@ -15,7 +15,7 @@ module Gitlab
 
           def tagline
             [
-              s_('InProductMarketing|Start a free trial of GitLab Ultimate – no CC required'),
+              s_('InProductMarketing|Start a free trial of GitLab Ultimate – no credit card required'),
               s_('InProductMarketing|Improve app security with a 30-day trial'),
               s_('InProductMarketing|Start with a GitLab Ultimate free trial')
             ][series]

locale/gitlab.pot

@@ -16,9 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-msgid " %{name},  confirm your email address now! "
-msgstr ""
-
 msgid " %{start} to %{end}"
 msgstr ""
 
@@ -1135,9 +1132,6 @@ msgstr ""
 msgid "(we need your current password to confirm your changes)"
 msgstr ""
 
-msgid "* * * * *"
-msgstr ""
-
 msgid "+ %{amount} more"
 msgstr ""
 
@@ -3581,6 +3575,9 @@ msgstr ""
 msgid "An error occurred while enabling Service Desk."
 msgstr ""
 
+msgid "An error occurred while fetching Markdown preview"
+msgstr ""
+
 msgid "An error occurred while fetching ancestors"
 msgstr ""
 
@@ -3611,9 +3608,6 @@ msgstr ""
 msgid "An error occurred while fetching label colors."
 msgstr ""
 
-msgid "An error occurred while fetching markdown preview"
-msgstr ""
-
 msgid "An error occurred while fetching participants"
 msgstr ""
 
@@ -13352,7 +13346,7 @@ msgstr ""
 msgid "Error parsing CSV file. Please make sure it has"
 msgstr ""
 
-msgid "Error rendering markdown preview"
+msgid "Error rendering Markdown preview"
 msgstr ""
 
 msgid "Error saving label update."
@@ -17589,7 +17583,7 @@ msgstr ""
 msgid "InProductMarketing|Start a GitLab Ultimate trial today in less than one minute, no credit card required."
 msgstr ""
 
-msgid "InProductMarketing|Start a free trial of GitLab Ultimate – no CC required"
+msgid "InProductMarketing|Start a free trial of GitLab Ultimate – no credit card required"
 msgstr ""
 
 msgid "InProductMarketing|Start a trial"
@@ -24833,6 +24827,48 @@ msgstr ""
 msgid "PipelineSchedules|Variables"
 msgstr ""
 
+msgid "PipelineSource|API"
+msgstr ""
+
+msgid "PipelineSource|Chat"
+msgstr ""
+
+msgid "PipelineSource|External"
+msgstr ""
+
+msgid "PipelineSource|External Pull Request"
+msgstr ""
+
+msgid "PipelineSource|Merge Request"
+msgstr ""
+
+msgid "PipelineSource|On-Demand DAST Scan"
+msgstr ""
+
+msgid "PipelineSource|On-Demand DAST Validation"
+msgstr ""
+
+msgid "PipelineSource|Parent Pipeline"
+msgstr ""
+
+msgid "PipelineSource|Pipeline"
+msgstr ""
+
+msgid "PipelineSource|Push"
+msgstr ""
+
+msgid "PipelineSource|Schedule"
+msgstr ""
+
+msgid "PipelineSource|Trigger"
+msgstr ""
+
+msgid "PipelineSource|Web"
+msgstr ""
+
+msgid "PipelineSource|Web IDE"
+msgstr ""
+
 msgid "PipelineStatusTooltip|Pipeline: %{ciStatus}"
 msgstr ""
 
@@ -25133,49 +25169,49 @@ msgstr ""
 msgid "Pipeline|Source"
 msgstr ""
 
-msgid "Pipeline|Source|API"
+msgid "PipelineSource|API"
 msgstr ""
 
-msgid "Pipeline|Source|Chat"
+msgid "PipelineSource|Chat"
 msgstr ""
 
-msgid "Pipeline|Source|External"
+msgid "PipelineSource|External"
 msgstr ""
 
-msgid "Pipeline|Source|External Pull Request"
+msgid "PipelineSource|External Pull Request"
 msgstr ""
 
-msgid "Pipeline|Source|Merge Request"
+msgid "PipelineSource|Merge Request"
 msgstr ""
 
-msgid "Pipeline|Source|On-Demand DAST Scan"
+msgid "PipelineSource|On-Demand DAST Scan"
 msgstr ""
 
-msgid "Pipeline|Source|On-Demand DAST Validation"
+msgid "PipelineSource|On-Demand DAST Validation"
 msgstr ""
 
-msgid "Pipeline|Source|Parent Pipeline"
+msgid "PipelineSource|Parent Pipeline"
 msgstr ""
 
-msgid "Pipeline|Source|Pipeline"
+msgid "PipelineSource|Pipeline"
 msgstr ""
 
-msgid "Pipeline|Source|Push"
+msgid "PipelineSource|Push"
 msgstr ""
 
-msgid "Pipeline|Source|Schedule"
+msgid "PipelineSource|Schedule"
 msgstr ""
 
-msgid "Pipeline|Source|Security Policy"
+msgid "PipelineSource|Security Policy"
 msgstr ""
 
-msgid "Pipeline|Source|Trigger"
+msgid "PipelineSource|Trigger"
 msgstr ""
 
-msgid "Pipeline|Source|Web"
+msgid "PipelineSource|Web"
 msgstr ""
 
-msgid "Pipeline|Source|Web IDE"
+msgid "PipelineSource|Web IDE"
 msgstr ""
 
 msgid "Pipeline|Specify variable values to be used in this run. The values specified in %{linkStart}CI/CD settings%{linkEnd} will be used by default."
@@ -29719,16 +29755,16 @@ msgstr ""
 msgid "SearchCodeResults|of %{link_to_project}"
 msgstr ""
 
-msgid "SearchResults|Showing %{count} %{scope} for%{term_element}"
+msgid "SearchResults|Showing %{count} %{scope} for %{term_element}"
 msgstr ""
 
-msgid "SearchResults|Showing %{count} %{scope} for%{term_element} in your personal and project snippets"
+msgid "SearchResults|Showing %{count} %{scope} for %{term_element} in your personal and project snippets"
 msgstr ""
 
-msgid "SearchResults|Showing %{from} - %{to} of %{count} %{scope} for%{term_element}"
+msgid "SearchResults|Showing %{from} - %{to} of %{count} %{scope} for %{term_element}"
 msgstr ""
 
-msgid "SearchResults|Showing %{from} - %{to} of %{count} %{scope} for%{term_element} in your personal and project snippets"
+msgid "SearchResults|Showing %{from} - %{to} of %{count} %{scope} for %{term_element} in your personal and project snippets"
 msgstr ""
 
 msgid "SearchResults|code result"

spec/helpers/search_helper_spec.rb

@@ -248,13 +248,13 @@ RSpec.describe SearchHelper do
       it 'uses the correct singular label' do
         collection = Kaminari.paginate_array([:foo]).page(1).per(10)
 
-        expect(search_entries_info(collection, scope, 'foo')).to eq("Showing 1 #{label} for<span>&nbsp;<code>foo</code>&nbsp;</span>")
+        expect(search_entries_info(collection, scope, 'foo')).to eq("Showing 1 #{label} for <span>&nbsp;<code>foo</code>&nbsp;</span>")
       end
 
       it 'uses the correct plural label' do
         collection = Kaminari.paginate_array([:foo] * 23).page(1).per(10)
 
-        expect(search_entries_info(collection, scope, 'foo')).to eq("Showing 1 - 10 of 23 #{label.pluralize} for<span>&nbsp;<code>foo</code>&nbsp;</span>")
+        expect(search_entries_info(collection, scope, 'foo')).to eq("Showing 1 - 10 of 23 #{label.pluralize} for <span>&nbsp;<code>foo</code>&nbsp;</span>")
       end
     end