2fa polishing

resources/js/views/Platform.vue

@@ -14,6 +14,8 @@
         <CreateFolderPopup />
         <RenameItemPopup />
 
+		<TwoFactorSetupPopup />
+
         <MoveItemPopup />
 
         <!--Mobile components-->
@@ -29,15 +31,13 @@
 
         <!--Others-->
         <DragUI />
-        <TwoFactorAuthenticationConfirm />
-
 
         <router-view :class="{'is-scaled-down': isScaledDown}" />
     </div>
 </template>
 
 <script>
-    import TwoFactorAuthenticationConfirm from '@/components/Others/TwoFactorAuthenticationConfirm'
+    import TwoFactorSetupPopup from '@/components/Others/TwoFactorSetupPopup'
     import MultiSelectToolbarMobile from '@/components/FilesView/MultiSelectToolbarMobile'
     import FileSortingMobile from '@/components/FilesView/FileSortingMobile'
     import SidebarNavigation from '@/components/Sidebar/SidebarNavigation'
@@ -59,7 +59,7 @@
     export default {
         name: 'Platform',
         components: {
-            TwoFactorAuthenticationConfirm,
+            TwoFactorSetupPopup,
             MultiSelectToolbarMobile,
             CreateFolderPopup,
             FileSortingMobile,

resources/js/views/User/Password.vue

@@ -41,9 +41,9 @@
                         <div class="inline-wrapper">
                             <div class="switch-label">
                                 <label class="input-label">
-                                    Enable / Disable Two factor authentication
+                                    Enable / Disable Two Factor Authentication
                                 </label>
-                                <small class="input-help" v-html="$t('admin_settings.others.allow_registration_help')"></small>
+                                <small class="input-help" v-html="$t('popup_2fa.switch_info')"></small>
                             </div>
                             <SwitchInput @click.native.prevent.stop="open2faPopup"
                                          class="switch"