Merge branch 'jivanvl-change-pod-logs-name' into 'master'

Rename pod logs to logs

See merge request gitlab-org/gitlab!26313

app/views/clusters/clusters/_namespace.html.haml

 - managed_namespace_help_text = s_('ClusterIntegration|Set a prefix for your namespaces. If not set, defaults to your project path. If modified, existing environments will use their current namespaces until the cluster cache is cleared.')
-- non_managed_namespace_help_text = s_('ClusterIntegration|The namespace associated with your project. This will be used for deploy boards, pod logs, and Web terminals.')
+- non_managed_namespace_help_text = s_('ClusterIntegration|The namespace associated with your project. This will be used for deploy boards, logs, and Web terminals.')
 - managed_namespace_help_link = link_to _('More information'), help_page_path('user/project/clusters/index.md',
   anchor: 'gitlab-managed-clusters'), target: '_blank'
 

changelogs/unreleased/jivanvl-change-pod-logs-name.yml

+---
+title: Rename pod logs to logs
+merge_request: 26313
+author:
+type: changed

ee/app/assets/javascripts/logs/components/environment_logs.vue

@@ -151,7 +151,7 @@ export default {
         </gl-form-group>
         <gl-form-group
           id="pods-dropdown-fg"
-          :label="s__('Environments|Pod logs from')"
+          :label="s__('Environments|Logs from')"
           label-size="sm"
           label-for="pods-dropdown"
           class="col-3 px-1"

ee/app/views/layouts/nav/sidebar/_pod_logs_link.html.haml

@@ -2,6 +2,6 @@
 - return unless project_nav_tab?(:environments)
 
 = nav_link(controller: :logs, action: [:index]) do
-  = link_to project_logs_path(@project), title: _('Pod logs') do
+  = link_to project_logs_path(@project), title: _('Logs') do
     %span
-      = _('Pod logs')
+      = _('Logs')

ee/app/views/projects/logs/empty_logs.html.haml

-- page_title _('Pod logs')
+- page_title _('Logs')
 
 .row.empty-state
   .col-sm-12
@@ -9,6 +9,6 @@
       %h4.text-center
         = s_('Environments|No deployed environments')
       %p.state-description.text-center
-        = s_('Logs|To see the pod logs, deploy your code to an environment.')
+        = s_('Logs|To see the logs, deploy your code to an environment.')
       .text-center
         = link_to s_('Environments|Learn about environments'), help_page_path('ci/environments'), class: 'btn btn-success'

ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

@@ -106,7 +106,7 @@ describe 'layouts/nav/sidebar/_project' do
       let(:can_read_pod_logs) { true }
 
       it 'link is visible ' do
-        expect(rendered).to have_link('Pod logs', href: project_logs_path(project))
+        expect(rendered).to have_link('Logs', href: project_logs_path(project))
       end
     end
 
@@ -115,7 +115,7 @@ describe 'layouts/nav/sidebar/_project' do
       let(:can_read_pod_logs) { false }
 
       it 'link is not visible ' do
-        expect(rendered).not_to have_link 'Pod logs'
+        expect(rendered).not_to have_link 'Logs'
       end
     end
 
@@ -124,7 +124,7 @@ describe 'layouts/nav/sidebar/_project' do
       let(:can_read_pod_logs) { false }
 
       it 'link is not visible ' do
-        expect(rendered).not_to have_link 'Pod logs'
+        expect(rendered).not_to have_link 'Logs'
       end
     end
   end

locale/gitlab.pot

@@ -4732,7 +4732,7 @@ msgstr ""
 msgid "ClusterIntegration|The endpoint is in the process of being assigned. Please check your Kubernetes cluster or Quotas on Google Kubernetes Engine if it takes a long time."
 msgstr ""
 
-msgid "ClusterIntegration|The namespace associated with your project. This will be used for deploy boards, pod logs, and Web terminals."
+msgid "ClusterIntegration|The namespace associated with your project. This will be used for deploy boards, logs, and Web terminals."
 msgstr ""
 
 msgid "ClusterIntegration|There was a problem authenticating with your cluster. Please ensure your CA Certificate and Token are valid."
@@ -7600,6 +7600,9 @@ msgstr ""
 msgid "Environments|Learn more about stopping environments"
 msgstr ""
 
+msgid "Environments|Logs from"
+msgstr ""
+
 msgid "Environments|New environment"
 msgstr ""
 
@@ -7621,9 +7624,6 @@ msgstr ""
 msgid "Environments|Open live environment"
 msgstr ""
 
-msgid "Environments|Pod logs from"
-msgstr ""
-
 msgid "Environments|Re-deploy"
 msgstr ""
 
@@ -11819,7 +11819,7 @@ msgstr ""
 msgid "Logs"
 msgstr ""
 
-msgid "Logs|To see the pod logs, deploy your code to an environment."
+msgid "Logs|To see the logs, deploy your code to an environment."
 msgstr ""
 
 msgid "Low vulnerabilities present"
@@ -14381,9 +14381,6 @@ msgstr ""
 msgid "Pod does not exist"
 msgstr ""
 
-msgid "Pod logs"
-msgstr ""
-
 msgid "Pod not found"
 msgstr ""