Merge branch 'development' into translations_src-assets-locales-ja-json--development_zh_TW

Author: kaizumaki

nuxt-i18n.config.js

@@ -2,6 +2,7 @@ const defaultLocale = 'ja'
 
 const options = {
   strategy: 'prefix_except_default',
+  seo: false,
   detectBrowserLanguage: false,
   defaultLocale,
   vueI18n: {

nuxt.config.js

@@ -5,7 +5,7 @@ const environment = process.env.NODE_ENV || 'development'
 
 export default {
   telemetry: false,
-  ssr: false,
+  ssr: true,
   srcDir: 'src',
   /*
    ** Headers of the page
@@ -14,63 +14,16 @@ export default {
     htmlAttrs: {
       prefix: 'og: http://ogp.me/ns#',
     },
-    title: 'おうちで時間割',
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      {
-        hid: 'keyword',
-        name: 'keyword',
-        content: 'CodeforJapan, おうちで時間割, デジタル, 学び, 今後の学習',
-      },
       {
         hid: 'author',
         name: 'author',
         content: 'Code for Japan',
       },
-      {
-        hid: 'og:site_name',
-        property: 'og:site_name',
-        content: 'おうちで時間割',
-      },
-      {
-        hid: 'og:url',
-        property: 'og:url',
-        content: `https://app.studyathome.jp/`,
-      },
-      {
-        hid: 'og:title',
-        property: 'og:title',
-        content: 'おうちで時間割',
-      },
-      {
-        hid: 'og:description',
-        property: 'og:description',
-        content:
-          '子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。',
-      },
-      {
-        hid: 'apple-mobile-web-app-title',
-        name: 'apple-mobile-web-app-title',
-        content: 'おうちで時間割',
-      },
-      {
-        hid: 'description',
-        name: 'description',
-        content:
-          '子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。',
-      },
       { hid: 'og:type', property: 'og:type', content: 'website' },
-      {
-        hid: 'og:image',
-        property: 'og:image',
-        content: 'https://app.studyathome.jp/ogp.png',
-      },
-      {
-        hid: 'twitter:image',
-        name: 'twitter:image',
-        content: 'https://app.studyathome.jp/ogp.png',
-      },
+      { name: 'twitter:card', content: 'summary_large_image' },
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },

src/assets/locales/en.json

@@ -8,12 +8,19 @@
         "login": "Sign In",
         "logout": "Sign Out",
         "ok": "OK",
-        "save": "Save"
+        "save": "Save",
+        "change": "Modify",
+        "verify": "Verification"
       },
       "error": {
         "default": "An error occurred, please try again later."
       }
     },
+    "calender": {
+      "prev_week": "Previous week",
+      "next_week": "Next week",
+      "to_today": "Move to today"
+    },
     "footer": {
       "about": "About StayAtHome",
       "contact": "Contact Us",
@@ -40,7 +47,8 @@
         "password": "Password",
         "password_rules": "Password Must be At Least 6 Characters",
         "password_not_acceptable": "The Password Does Not Meet the Password Requirements",
-        "password_not_same": "Inconsistent Passwords"
+        "password_not_same": "Inconsistent Passwords",
+        "verification_code":"Verification code"
       }
     },
     "agree_terms": {
@@ -69,15 +77,15 @@
         "date": "Date Setting",
         "time": "Time Setting",
         "subject_label_color": "Label Color",
-        "video_keyword": "(Optional function) Video Search",
+        "video_keyword": "Optional feature: Video search of {source}",
         "video_url": "Reference Video URL",
         "video_thumbnail": "Video Thumbnail/Caption Display",
         "textbook_page": "Textbook Page",
         "material_title": "Learning Material Title",
         "material_url": "Learning Material URL"
       },
       "placeholder": {
-        "video_keyword": "EX) Science"
+        "video_keyword": "Keyword"
       },
       "required": "*Items Marked with Are Required",
       "search_videos": {
@@ -134,7 +142,9 @@
         "label": "To the Teacher Who Made the Timetable",
         "buttons": {
           "signup": "Register As A User",
-          "login": "Log In"
+          "login": "Log In",
+          "registerLessons": "Create Timetable",
+          "logout": "Sign Out"
         }
       }
     },
@@ -145,10 +155,28 @@
       "no_classes": "There Are No Editable Courses. Please Register Your Course."
     },
     "user_edit_user_data": {
-      "title": "Change User Information",
+      "title": "Change User Information"
+    },
+    "user_edit_user_name": {
+      "title": "Change name (display name)",
+      "labels": {
+        "current_nickname": "Current name (display name)",
+        "new_nickname": "Name to be used (display name)"
+      }
+    },
+    "user_edit_user_email": {
+      "title": "Change email address",
       "labels": {
-        "new_password": "Change Password",
-        "new_password_confirm": "Change Password (for confirmation)"
+        "current_email": "Current email address",
+        "new_email": "Email address to be used"
+      }
+    },
+    "user_edit_user_password": {
+      "title": "Change password",
+      "labels": {
+        "current_password": "Please enter your current password",
+        "new_password": "New password",
+        "new_password_confirm": "Password (for confirmation)"
       }
     },
     "user_login": {
@@ -192,6 +220,12 @@
         "go_back_to_top": "Back to Top",
         "message": "A Confirmation Email Has Been Sent to the Email Address You Entered. Please Authenticate from the URL Described in the Email."
       }
+    },
+    "user_verify": {
+      "title": "Confirm email address"
+    },
+    "user_verify_new_email": {
+      "title": "Confirm changing email address"
     }
   }
 }

src/assets/locales/ja.json

@@ -1,4 +1,6 @@
 {
+  "title": "おうちで時間割",
+  "description": "子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。",
   "common": {
     "general": {
       "buttons": {
@@ -77,7 +79,7 @@
         "date": "日付設定",
         "time": "時間設定",
         "subject_label_color": "ラベル色",
-        "video_keyword": "オプション機能：{source}の動画検索",
+        "video_keyword": "オプション機能：動画検索",
         "video_url": "参考動画URL",
         "video_thumbnail": "動画サムネイル・キャプション表示",
         "textbook_page": "教科書ページ",
@@ -90,7 +92,7 @@
       "required": "*マークのあるものは必須項目です",
       "search_videos": {
         "search": "検索",
-        "search_result": "{source}の動画検索結果",
+        "search_result": "動画検索結果",
         "add_to_video_urls": "参考動画URLに登録する"
       }
     },

src/assets/locales/zh_TW.json

@@ -1,6 +1,6 @@
 {
   "title": "在家學習時間表",
-  "description": "為孩子的學習活用數位轉型 - 不論是現在的停課不停學或者是未來的線上學習，就讓我們一起建構一個可以讓孩子輕鬆愉快學習的環境吧。",
+  "description": "「在家學習時間表」是你的數位學習好夥伴！我們創造了線上學習環境，讓你在家也可以輕鬆的上線學習，不管是老師或學生，歡迎一起來發掘更多上課的樂趣！",
   "common": {
     "general": {
       "buttons": {
@@ -58,7 +58,7 @@
         "agree": "我同意使用條款"
       },
       "buttons": {
-        "agree": "前往註冊",
+        "agree": "繼續註冊",
         "disagree": "不同意"
       }
     },

src/components/BaseInputField.vue

@@ -142,7 +142,7 @@ export default Vue.extend({
   },
   computed: {
     prependIconColor(): string {
-      const classIdPattern = /^[あ-ん]{6}$/
+      const classIdPattern = /^[あ-んa-zㄅ-ㄩ]{6}$/
       if (this.type === 'classId') {
         if (!this.value || !classIdPattern.test(this.value)) return '#C01B61'
       }
@@ -162,7 +162,7 @@ export default Vue.extend({
       return '#BDBDBD'
     },
     textFieldColor(): string {
-      const classIdPattern = /^[あ-ん]{6}$/
+      const classIdPattern = /^[あ-んa-zㄅ-ㄩ]{6}$/
       if (this.type === 'classId') {
         if (!this.value || !classIdPattern.test(this.value)) return '#C01B61'
       }
@@ -179,7 +179,7 @@ export default Vue.extend({
       return '#0071C2'
     },
     prependIcon(): string {
-      const classIdPattern = /^[あ-ん]{6}$/
+      const classIdPattern = /^[あ-んa-zㄅ-ㄩ]{6}$/
       if (this.type === 'classId') {
         if (!this.value || !classIdPattern.test(this.value))
           return 'mdi-alert-circle'

src/components/EditLessonScreen.vue

@@ -59,6 +59,7 @@ import EditLessonScreenInner2 from '@/components/EditLessonScreenInner2.vue'
 import EditLessonScreenInner3 from '@/components/EditLessonScreenInner3.vue'
 import EditLessonScreenInner4 from '@/components/EditLessonScreenInner4.vue'
 import classData from '@/types/store/classData'
+import { removeEmpty } from '@/utils/remove'
 
 type LessonDataType = {
   lessonId: string
@@ -234,7 +235,7 @@ export default Vue.extend({
       try {
         const lessonData: classData.Lesson = await this.buildLessonData()
         await vxm.classData.changeLesson({
-          editData: lessonData,
+          editData: removeEmpty(lessonData),
           id: this.lessonData.lessonId,
         })
         await this.$emit('collapse')