Merge branch 'development' into feature/update-package

Author: NEKOYASAN

src/middleware/authenticated.ts

@@ -1,12 +1,12 @@
 import { Middleware } from '@nuxt/types'
 import { withSSRContext } from 'aws-amplify'
 
-const authenticated: Middleware = async ({ redirect }) => {
+const authenticated: Middleware = async ({ redirect, localePath }) => {
   const { Auth } = withSSRContext()
   const userInfo = await Auth.currentUserInfo()
 
   if (!userInfo) {
-    redirect('/user/login')
+    redirect(localePath('/user/login'))
   }
 }
 

src/middleware/checkClassData.ts

@@ -1,9 +1,9 @@
 import { Middleware } from '@nuxt/types'
 import { vxm } from '@/store'
 
-const checkClassData: Middleware = ({ redirect }) => {
+const checkClassData: Middleware = ({ redirect, localePath }) => {
   if (!vxm.classData.isLoaded) {
-    return redirect('/')
+    return redirect(localePath('/'))
   }
 }
 

src/pages/user/signup.vue

@@ -113,12 +113,12 @@ export default Vue.extend({
         const reg = /[ -~]{6,}$/
         const response = reg.test(this.password)
         if (!response) {
-          return 'パスワードが条件を満たしていません'
+          return this.$tc('common.user_data.labels.password_not_acceptable')
         }
       }
       if (this.password && this.confirmation) {
         if (this.password !== this.confirmation) {
-          return 'パスワードが一致していません'
+          return this.$tc('common.user_data.labels.password_not_same')
         }
         return ''
       }