Browse Source

Make confirm dialogs work with vue-i18n 9

Tusooa Zhu 2 years ago
parent
commit
ec957d4162

+ 8 - 7
src/components/account_actions/account_actions.vue

@@ -83,15 +83,16 @@
         @accepted="doBlockUser"
         @accepted="doBlockUser"
         @cancelled="hideConfirmBlock"
         @cancelled="hideConfirmBlock"
       >
       >
-        <i18n
-          path="user_card.block_confirm"
+        <i18n-t
+          keypath="user_card.block_confirm"
           tag="span"
           tag="span"
         >
         >
-          <span
-            place="user"
-            v-text="user.screen_name_ui"
-          />
-        </i18n>
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
       </confirm-modal>
       </confirm-modal>
     </teleport>
     </teleport>
   </div>
   </div>

+ 8 - 7
src/components/follow_button/follow_button.vue

@@ -16,15 +16,16 @@
         @accepted="doUnfollow"
         @accepted="doUnfollow"
         @cancelled="hideConfirmUnfollow"
         @cancelled="hideConfirmUnfollow"
       >
       >
-        <i18n
-          path="user_card.unfollow_confirm"
+        <i18n-t
+          keypath="user_card.unfollow_confirm"
           tag="span"
           tag="span"
         >
         >
-          <span
-            place="user"
-            v-text="user.screen_name_ui"
-          />
-        </i18n>
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
       </confirm-modal>
       </confirm-modal>
     </teleport>
     </teleport>
   </button>
   </button>

+ 8 - 7
src/components/user_card/user_card.vue

@@ -323,15 +323,16 @@
         @accepted="doMuteUser"
         @accepted="doMuteUser"
         @cancelled="hideConfirmMute"
         @cancelled="hideConfirmMute"
       >
       >
-        <i18n
-          path="user_card.mute_confirm"
+        <i18n-t
+          keypath="user_card.mute_confirm"
           tag="span"
           tag="span"
         >
         >
-          <span
-            place="user"
-            v-text="user.screen_name_ui"
-          />
-        </i18n>
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
       </confirm-modal>
       </confirm-modal>
     </teleport>
     </teleport>
   </div>
   </div>