Merge branch 'fe-ide-minor-improvements-for-commit-options' into 'master'

Web IDE commit option components minor improvements

Closes #35428

See merge request gitlab-org/gitlab!24521

app/assets/javascripts/ide/components/commit_sidebar/actions.vue

 <script>
 import _ from 'underscore';
 import { mapState, mapGetters, createNamespacedHelpers } from 'vuex';
-import { sprintf, __ } from '~/locale';
+import { sprintf, s__ } from '~/locale';
 import consts from '../../stores/modules/commit/constants';
 import RadioGroup from './radio_group.vue';
 import NewMergeRequestOption from './new_merge_request_option.vue';
@@ -21,7 +21,7 @@ export default {
     ...mapGetters(['currentBranch']),
     commitToCurrentBranchText() {
       return sprintf(
-        __('Commit to %{branchName} branch'),
+        s__('IDE|Commit to %{branchName} branch'),
         { branchName: `<strong class="monospace">${_.escape(this.currentBranchId)}</strong>` },
         false,
       );
@@ -56,8 +56,8 @@ export default {
   },
   commitToCurrentBranch: consts.COMMIT_TO_CURRENT_BRANCH,
   commitToNewBranch: consts.COMMIT_TO_NEW_BRANCH,
-  currentBranchPermissionsTooltip: __(
-    "This option is disabled as you don't have write permissions for the current branch",
+  currentBranchPermissionsTooltip: s__(
+    "IDE|This option is disabled because you don't have write permissions for the current branch.",
   ),
 };
 </script>

app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue

 <script>
 import { mapActions, mapState, mapGetters } from 'vuex';
-import tooltip from '~/vue_shared/directives/tooltip';
+import { GlTooltipDirective } from '@gitlab/ui';
 
 export default {
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
   },
   props: {
     value: {
@@ -53,8 +53,7 @@ export default {
 <template>
   <fieldset>
     <label
-      v-tooltip
-      :title="tooltipTitle"
+      v-gl-tooltip="tooltipTitle"
       :class="{
         'is-disabled': disabled,
       }"

changelogs/unreleased/fe-ide-minor-improvements-for-commit-options.yml

+---
+title: Minor text update to IDE commit to branch disabled tooltip
+merge_request: 24521
+author:
+type: other

locale/gitlab.pot

@@ -10064,6 +10064,9 @@ msgstr ""
 msgid "IDE|Commit"
 msgstr ""
 
+msgid "IDE|Commit to %{branchName} branch"
+msgstr ""
+
 msgid "IDE|Edit"
 msgstr ""
 
@@ -10091,6 +10094,9 @@ msgstr ""
 msgid "IDE|Successful commit"
 msgstr ""
 
+msgid "IDE|This option is disabled because you don't have write permissions for the current branch."
+msgstr ""
+
 msgid "IP Address"
 msgstr ""
 
@@ -19527,9 +19533,6 @@ msgstr ""
 msgid "This namespace has already been taken! Please choose another one."
 msgstr ""
 
-msgid "This option is disabled as you don't have write permissions for the current branch"
-msgstr ""
-
 msgid "This option is only available on GitLab.com"
 msgstr ""